Author: vanto
Date: Mon Nov 10 15:03:47 2008
New Revision: 712863
URL: http://svn.apache.org/viewvc?rev=712863&view=rev
Log:
Default config file for axis2 deployment added.
JCI configuration passed through.
Added:
ode/trunk/axis2-war/src/main/webapp/WEB-INF/conf/ode-axis2.properties
Modified:
ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java
Added: ode/trunk/axis2-war/src/main/webapp/WEB-INF/conf/ode-axis2.properties
URL:
http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/main/webapp/WEB-INF/conf/ode-axis2.properties?rev=712863&view=auto
==============================================================================
--- ode/trunk/axis2-war/src/main/webapp/WEB-INF/conf/ode-axis2.properties
(added)
+++ ode/trunk/axis2-war/src/main/webapp/WEB-INF/conf/ode-axis2.properties Mon
Nov 10 15:03:47 2008
@@ -0,0 +1,85 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+## ODE-AXIS2 Configuraiton Properties
+
+## Database Mode ("INTERNAL", "EXTERNAL", "EMBEDDED")
+## What kind of database should ODE use?
+## * "EMBEDDED" - ODE will create its own embbeded database (Derby)
+## and connection pool (Minerva).
+## * "EXTERNAL" - ODE will use an app-server provided database and pool.
+## The "ode-jbi.db.ext.dataSource" property will need to
+## be set.
+## * "INTERNAL" - ODE will create its own connection pool for a user-
+## specified JDBC URL and driver.
+#ode-axis2.db.mode=EMBEDDED
+
+## External Database [JNDI Name]
+## JNDI Name of the DataSource for the ODE database. This is only
+## used if the "ode-jbi.db.mode" property is set to "EXTERNAL"
+#ode-axis2.db.ext.dataSource=java:comp/env/jdbc/ode
+
+## Embedded Database Name [String]
+## Name of the embedded Derby database. This is only used if the
+## "ode-jbi.db.mode" property is set to "EMBEDDED".
+#ode-jbi.db.emb.name=hibdb
+#ode-jbi.db.emb.name=jpadb
+
+## Internal Database Configuration
+#ode-jbi.db.int.jdbcurl=jdbc:mysql://localhost/ode?user=sa
+#ode-jbi.db.int.driver=com.mysql.jdbc.Driver
+#ode-axis2.db.int.password =
+#ode-axis2.db.int.username =
+
+## DB Pool Configuration for internal DB
+#ode-axis2.db.pool.max = 10
+#ode-axis2.db.pool.min = 1
+
+## DAO Connection Factory class.
+## uncomment the following for hibernate.
+#ode-axis2.dao.factory=org.apache.ode.daohib.bpel.BpelDAOConnectionFactoryImpl
+
+## Transaction Factory
+## default is org.apache.ode.il.EmbeddedGeronimoFactory
+## available alternatives are:
+## org.apache.ode.axis2.util.GeronimoFactory
+## org.apache.ode.axis2.util.JBossFactory
+## org.apache.ode.axis2.util.TomcatFactory
+## org.apache.ode.axis2.util.WLSFactory
+#ode-axis2.tx.factory.class =
+
+## JCA connector port (default 2099), set to 0 to disable JCA connector
+#ode-axis2.jca.port =
+
+## JCA conncetor name (default 'ode')
+#ode-axis2.jca.name =
+
+## Working dir
+#ode-axis2.working.dir =
+
+## MEX Interceptors
+#ode-axis2.mex.interceptors =
+
+## Process dehydration
+#ode-axis2.process.dehydration =
+
+## Extension Bundles
+## FQCNs, comma separated.
+#ode-axis2.extension.bundles.runtime =
+#ode-axis2.extension.bundles.validation =
Modified: ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java
URL:
http://svn.apache.org/viewvc/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java?rev=712863&r1=712862&r2=712863&view=diff
==============================================================================
--- ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java (original)
+++ ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java Mon Nov
10 15:03:47 2008
@@ -420,7 +420,7 @@
_connector.setBpelServer(_server);
_connector.setProcessStore(_store);
_connector.setPort(_odeConfig.getConnectorPort());
- _connector.setId("jcaServer");
+ _connector.setId(_odeConfig.getConnectorName());
try {
_connector.start();
} catch (Exception e) {
