svn commit: r431383 - in /incubator/ode/trunk/axis2: .classpath pom.xml src/main/java/org/apache/ode/axis2/ODEConfigProperties.java src/main/java/org/apache/ode/axis2/ODEServer.java

[mszefler]

Author: mszefler
Date: Mon Aug 14 10:12:54 2006
New Revision: 431383

URL: http://svn.apache.org/viewvc?rev=431383&view=rev
Log:
Added JCA connector startup.

Modified:
    incubator/ode/trunk/axis2/.classpath
    incubator/ode/trunk/axis2/pom.xml
    
incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEConfigProperties.java
    incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java

Modified: incubator/ode/trunk/axis2/.classpath
URL: 
http://svn.apache.org/viewvc/incubator/ode/trunk/axis2/.classpath?rev=431383&r1=431382&r2=431383&view=diff
==============================================================================
--- incubator/ode/trunk/axis2/.classpath (original)
+++ incubator/ode/trunk/axis2/.classpath Mon Aug 14 10:12:54 2006
@@ -57,5 +57,6 @@
        <classpathentry kind="var" 
path="M2_REPO/org/apache/geronimo/specs/geronimo-servlet_2.4_spec/1.0/geronimo-servlet_2.4_spec-1.0.jar"/>
        <classpathentry kind="src" path="/ode-bpel-parser"/>
        <classpathentry kind="src" path="/ode-bpel-dd"/>
+       <classpathentry combineaccessrules="false" kind="src" 
path="/ode-bpel-connector"/>
        <classpathentry kind="output" path="target/classes"/>
 </classpath>

Modified: incubator/ode/trunk/axis2/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/ode/trunk/axis2/pom.xml?rev=431383&r1=431382&r2=431383&view=diff
==============================================================================
--- incubator/ode/trunk/axis2/pom.xml (original)
+++ incubator/ode/trunk/axis2/pom.xml Mon Aug 14 10:12:54 2006
@@ -59,6 +59,11 @@
       <artifactId>ode-bpel-api</artifactId>
     </dependency>
 
+             <dependency>
+      <groupId>ode</groupId>
+      <artifactId>ode-bpel-connector</artifactId>
+    </dependency>
+
     <dependency>
       <groupId>axis2</groupId>
       <artifactId>axis2</artifactId>

Modified: 
incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEConfigProperties.java
URL: 
http://svn.apache.org/viewvc/incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEConfigProperties.java?rev=431383&r1=431382&r2=431383&view=diff
==============================================================================
--- 
incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEConfigProperties.java
 (original)
+++ 
incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEConfigProperties.java
 Mon Aug 14 10:12:54 2006
@@ -40,6 +40,7 @@
   private static final String PROP_DB_EMBEDDED_NAME = "ode-axis2.db.emb.name";
   private static final String PROP_POOL_MAX = "ode-axis2.db.pool.max";
   private static final String PROP_POOL_MIN = "ode-axis2.db.pool.min";
+  private static final String PROP_CONNECTOR_PORT = "ode-axis2.jca.port";
 
   private File _installDir;
 
@@ -105,6 +106,10 @@
 
   public int getPoolMinSize() {
     return Integer.valueOf(getProperty(ODEConfigProperties.PROP_POOL_MIN, 
"1"));
+  }
+
+  public int getConnectorPort() {
+    return 
Integer.valueOf(getProperty(ODEConfigProperties.PROP_CONNECTOR_PORT,"0")); 
   }
 
 }

Modified: 
incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java
URL: 
http://svn.apache.org/viewvc/incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java?rev=431383&r1=431382&r2=431383&view=diff
==============================================================================
--- incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java 
(original)
+++ incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java 
Mon Aug 14 10:12:54 2006
@@ -30,6 +30,7 @@
 import org.apache.ode.axis2.hooks.ManagementService;
 import org.apache.ode.axis2.hooks.ODEAxisService;
 import org.apache.ode.axis2.hooks.ODEMessageReceiver;
+import org.apache.ode.bpel.connector.BpelServerConnector;
 import org.apache.ode.bpel.dao.BpelDAOConnectionFactory;
 import org.apache.ode.bpel.engine.BpelServerImpl;
 import org.apache.ode.bpel.scheduler.quartz.QuartzSchedulerImpl;
@@ -91,6 +92,7 @@
 
   private MultiKeyMap _services = new MultiKeyMap();
   private MultiKeyMap _externalServices = new MultiKeyMap();
+  private BpelConnector _connector;
 
 //  private HashMap<QName,ODEService> _services = new 
HashMap<QName,ODEService>();
 //  private HashMap<QName,ExternalService> _externalServices = new 
HashMap<QName,ExternalService>();
@@ -125,6 +127,9 @@
       throw new ServletException(errmsg, ex);
     }
 
+    __log.debug("Initializing JCA adapter.");
+    initConnector();
+    
     File deploymentDir = new File(_appRoot, "processes");
     _poller = new DeploymentPoller(deploymentDir, this);
     _poller.start();
@@ -279,6 +284,23 @@
     }
   }
 
+  private void initConnector() throws ServletException {
+      int port = _odeConfig.getConnectorPort();
+      if (port == 0) {
+        __log.info("Skipping connector initialization.");
+      } else {
+        _connector = new BpelServerConnector();
+        _connector.setBpelServer(_ode._server);
+        _connector.setPort(_ode._config.getConnectorPort());
+        _connector.setId(_ode._config.getConnectorName());
+        try {
+          _connector.start();
+        } catch (Exception e) {
+        __log.error("Failed to initialize JCA connector.",e);
+        }
+      }
+    }
+  
   private void initExternalDb() throws ServletException {
     try {
       _datasource = lookupInJndi(_odeConfig.getDbDataSource());