You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2008/03/24 22:44:09 UTC

svn commit: r640589 - in /openejb/branches/openejb-3.0: assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/resources/META-INF/org.apache.openejb.tomcat/ container/openejb-core/src/main/java/org/apache/openejb/core/cmp/ container/openejb-core/src/ma...

Author: dblevins
Date: Mon Mar 24 14:44:07 2008
New Revision: 640589

URL: http://svn.apache.org/viewvc?rev=640589&view=rev
Log:
Merging r639498 - http://svn.apache.org/viewvc?rev=639498&view=rev

svn merge -r 639497:639498 https://svn.apache.org/repos/asf/openejb/trunk/openejb3 .

------------------------------------------------------------------------
r639498 | dain | 2008-03-20 16:56:01 -0700 (Thu, 20 Mar 2008) | 1 line

Removed unused and confusing Engine and ConnectorName properties from the CmpContainer and CmpEngineFactory
------------------------------------------------------------------------

Modified:
    openejb/branches/openejb-3.0/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/resources/META-INF/org.apache.openejb.tomcat/service-jar.xml
    openejb/branches/openejb-3.0/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpContainer.java
    openejb/branches/openejb-3.0/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpEngineFactory.java
    openejb/branches/openejb-3.0/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/jpa/JpaCmpEngineFactory.java
    openejb/branches/openejb-3.0/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.embedded/service-jar.xml
    openejb/branches/openejb-3.0/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml
    openejb/branches/openejb-3.0/container/openejb-core/src/main/resources/default.openejb.conf

Modified: openejb/branches/openejb-3.0/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/resources/META-INF/org.apache.openejb.tomcat/service-jar.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.0/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/resources/META-INF/org.apache.openejb.tomcat/service-jar.xml?rev=640589&r1=640588&r2=640589&view=diff
==============================================================================
--- openejb/branches/openejb-3.0/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/resources/META-INF/org.apache.openejb.tomcat/service-jar.xml (original)
+++ openejb/branches/openejb-3.0/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/resources/META-INF/org.apache.openejb.tomcat/service-jar.xml Mon Mar 24 14:44:07 2008
@@ -51,15 +51,10 @@
   <ServiceProvider id="Default CMP Container"
                    service="Container"
                    types="CMP_ENTITY"
-                   constructor="id, transactionManager, securityService, CmpEngineFactory, Engine, ConnectorName"
+                   constructor="id, transactionManager, securityService, CmpEngineFactory"
                    class-name="org.apache.openejb.core.cmp.CmpContainer">
 
     CmpEngineFactory org.apache.openejb.core.cmp.jpa.JpaCmpEngineFactory
-
-    #Engine  derby
-    Engine  instantdb
-
-    ConnectorName  Default JDBC Database
   </ServiceProvider>
 
   <!--

Modified: openejb/branches/openejb-3.0/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpContainer.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.0/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpContainer.java?rev=640589&r1=640588&r2=640589&view=diff
==============================================================================
--- openejb/branches/openejb-3.0/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpContainer.java (original)
+++ openejb/branches/openejb-3.0/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpContainer.java Mon Mar 24 14:44:07 2008
@@ -103,7 +103,7 @@
         }
     };
 
-    public CmpContainer(Object id, TransactionManager transactionManager, SecurityService securityService, String cmpEngineFactory, String engine, String connectorName) throws OpenEJBException {
+    public CmpContainer(Object id, TransactionManager transactionManager, SecurityService securityService, String cmpEngineFactory) throws OpenEJBException {
         this.transactionManager = transactionManager;
         this.securityService = securityService;
         this.containerID = id;
@@ -123,10 +123,7 @@
         }
         factory.setTransactionManager(transactionManager);
         factory.setTransactionSynchronizationRegistry(synchronizationRegistry);
-        factory.setConnectorName(connectorName);
         factory.setCmpCallback(new ContainerCmpCallback());
-        factory.setEngine(engine);
-        factory.setClassLoader(classLoader);
         cmpEngine = factory.create();
     }
 

Modified: openejb/branches/openejb-3.0/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpEngineFactory.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.0/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpEngineFactory.java?rev=640589&r1=640588&r2=640589&view=diff
==============================================================================
--- openejb/branches/openejb-3.0/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpEngineFactory.java (original)
+++ openejb/branches/openejb-3.0/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpEngineFactory.java Mon Mar 24 14:44:07 2008
@@ -23,9 +23,6 @@
 import javax.transaction.TransactionSynchronizationRegistry;
 
 public interface CmpEngineFactory {
-    String getJarPath();
-
-    void setJarPath(String jarPath);
 
     TransactionManager getTransactionManager();
 
@@ -35,21 +32,9 @@
 
     void setTransactionSynchronizationRegistry(TransactionSynchronizationRegistry synchronizationRegistry);
 
-    String getEngine();
-
-    void setEngine(String engine);
-
-    String getConnectorName();
-
-    void setConnectorName(String connectorName);
-
     CmpCallback getCmpCallback();
 
     void setCmpCallback(CmpCallback cmpCallback);
-
-    ClassLoader getClassLoader();
-
-    void setClassLoader(ClassLoader classLoader);
 
     CmpEngine create() throws OpenEJBException;
 }

Modified: openejb/branches/openejb-3.0/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/jpa/JpaCmpEngineFactory.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.0/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/jpa/JpaCmpEngineFactory.java?rev=640589&r1=640588&r2=640589&view=diff
==============================================================================
--- openejb/branches/openejb-3.0/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/jpa/JpaCmpEngineFactory.java (original)
+++ openejb/branches/openejb-3.0/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/jpa/JpaCmpEngineFactory.java Mon Mar 24 14:44:07 2008
@@ -26,21 +26,9 @@
 import javax.transaction.TransactionSynchronizationRegistry;
 
 public class JpaCmpEngineFactory implements CmpEngineFactory {
-    private String jarPath;
     private TransactionManager transactionManager;
     private TransactionSynchronizationRegistry transactionSynchronizationRegistry;
-    private String engine;
-    private String connectorName;
     private CmpCallback cmpCallback;
-    private ClassLoader classLoader;
-
-    public String getJarPath() {
-        return jarPath;
-    }
-
-    public void setJarPath(String jarPath) {
-        this.jarPath = jarPath;
-    }
 
     public TransactionManager getTransactionManager() {
         return transactionManager;
@@ -58,36 +46,12 @@
         this.transactionSynchronizationRegistry = transactionSynchronizationRegistry;
     }
 
-    public String getEngine() {
-        return engine;
-    }
-
-    public void setEngine(String engine) {
-        this.engine = engine;
-    }
-
-    public String getConnectorName() {
-        return connectorName;
-    }
-
-    public void setConnectorName(String connectorName) {
-        this.connectorName = connectorName;
-    }
-
     public CmpCallback getCmpCallback() {
         return cmpCallback;
     }
 
     public void setCmpCallback(CmpCallback cmpCallback) {
         this.cmpCallback = cmpCallback;
-    }
-
-    public ClassLoader getClassLoader() {
-        return classLoader;
-    }
-
-    public void setClassLoader(ClassLoader classLoader) {
-        this.classLoader = classLoader;
     }
 
     public CmpEngine create() throws OpenEJBException {

Modified: openejb/branches/openejb-3.0/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.embedded/service-jar.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.0/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.embedded/service-jar.xml?rev=640589&r1=640588&r2=640589&view=diff
==============================================================================
--- openejb/branches/openejb-3.0/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.embedded/service-jar.xml (original)
+++ openejb/branches/openejb-3.0/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.embedded/service-jar.xml Mon Mar 24 14:44:07 2008
@@ -44,19 +44,10 @@
   <ServiceProvider id="Default CMP Container"
                    service="Container"
                    types="CMP_ENTITY"
-                   constructor="id, transactionManager, securityService, CmpEngineFactory, Engine, ConnectorName"
+                   constructor="id, transactionManager, securityService, CmpEngineFactory"
                    class-name="org.apache.openejb.core.cmp.CmpContainer">
 
     CmpEngineFactory org.apache.openejb.core.cmp.jpa.JpaCmpEngineFactory
-
-    #Engine  derby
-    Engine  instantdb
-
-
-    # ConnectorName is he id of the Connector element which
-    # should provide connectivity for this CMP Container
-
-    ConnectorName  Default JDBC Database
   </ServiceProvider>
 
   <!--

Modified: openejb/branches/openejb-3.0/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.0/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml?rev=640589&r1=640588&r2=640589&view=diff
==============================================================================
--- openejb/branches/openejb-3.0/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml (original)
+++ openejb/branches/openejb-3.0/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml Mon Mar 24 14:44:07 2008
@@ -46,22 +46,10 @@
   <ServiceProvider id="Default CMP Container"
                    service="Container"
                    types="CMP_ENTITY"
-                   constructor="id, transactionManager, securityService, CmpEngineFactory, Engine, ConnectorName"
+                   constructor="id, transactionManager, securityService, CmpEngineFactory"
                    class-name="org.apache.openejb.core.cmp.CmpContainer">
 
     CmpEngineFactory org.apache.openejb.core.cmp.jpa.JpaCmpEngineFactory
-
-    # Engine  derby
-    # @hidden
-
-    Engine  instantdb
-
-
-    # ConnectorName is he id of the Connector element which
-    # should provide connectivity for this CMP Container
-    # @hidden
-
-    ConnectorName  Default JDBC Database
   </ServiceProvider>
 
   <!--

Modified: openejb/branches/openejb-3.0/container/openejb-core/src/main/resources/default.openejb.conf
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.0/container/openejb-core/src/main/resources/default.openejb.conf?rev=640589&r1=640588&r2=640589&view=diff
==============================================================================
--- openejb/branches/openejb-3.0/container/openejb-core/src/main/resources/default.openejb.conf (original)
+++ openejb/branches/openejb-3.0/container/openejb-core/src/main/resources/default.openejb.conf Mon Mar 24 14:44:07 2008
@@ -35,11 +35,6 @@
   # us generate better documentation.
   # ---------
 
-  # ConnectorName is he id of the Connector element which
-  # should provide connectivity for this CMP Container
-
-  ConnectorName  My DataSource
-
 </Container>