svn commit: r606526 - in /openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config: ConfigurationFactory.java sys/Openejb.java

[dblevins]

Author: dblevins
Date: Sat Dec 22 17:52:26 2007
New Revision: 606526

URL: http://svn.apache.org/viewvc?rev=606526&view=rev
Log:
Moved Connector->Resource element conversion code into the Openejb jaxb object

Modified:
    
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
    
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Openejb.java

Modified: 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java?rev=606526&r1=606525&r2=606526&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
 (original)
+++ 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
 Sat Dec 22 17:52:26 2007
@@ -250,19 +250,6 @@
 
         sys.facilities.transactionService = 
configureService(openejb.getTransactionManager(), TransactionServiceInfo.class);
 
-        // convert legacy connector declarations to resource declarations
-        for (org.apache.openejb.config.sys.Connector connector : 
openejb.getConnector()) {
-            Resource resource = JaxbOpenejb.createResource();
-            resource.setJar(connector.getJar());
-            resource.setId(connector.getId());
-            resource.setProvider(connector.getProvider());
-
-            resource.getProperties().clear();
-            resource.getProperties().putAll(connector.getProperties());
-
-            openejb.getResource().add(resource);
-        }
-
         for (Resource resource : openejb.getResource()) {
             ResourceInfo resourceInfo = configureService(resource, 
ResourceInfo.class);
             sys.facilities.resources.add(resourceInfo);

Modified: 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Openejb.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Openejb.java?rev=606526&r1=606525&r2=606526&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Openejb.java
 (original)
+++ 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Openejb.java
 Sat Dec 22 17:52:26 2007
@@ -228,7 +228,7 @@
      * Objects of the following type(s) are allowed in the list
      * [EMAIL PROTECTED] Connector }
      */
-    public List<Connector> getConnector() {
+    private List<Connector> getConnector() {
         if (connector == null) {
             connector = new ArrayList<Connector>();
         }
@@ -258,6 +258,19 @@
     public List<Resource> getResource() {
         if (resource == null) {
             resource = new ArrayList<Resource>();
+        }
+
+        List<Connector> connectors = getConnector();
+        if (connectors.size() > 0){
+            for (Connector connector : connectors) {
+                Resource resource = new Resource();
+                resource.setJar(connector.getJar());
+                resource.setId(connector.getId());
+                resource.setProvider(connector.getProvider());
+                resource.getProperties().putAll(connector.getProperties());
+                this.resource.add(resource);
+            }
+            connectors.clear();
         }
         return this.resource;
     }