openejb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dblev...@apache.org
Subject svn commit: r454051 - in /incubator/openejb/trunk/openejb3/container/openejb-core/src: main/java/org/apache/openejb/assembler/spring/ main/resources/META-INF/org.apache.openejb/ test/java/org/apache/openejb/
Date Sun, 08 Oct 2006 00:45:50 GMT
Author: dblevins
Date: Sat Oct  7 17:45:49 2006
New Revision: 454051

URL: http://svn.apache.org/viewvc?view=rev&rev=454051
Log:
Revived the first set of spring tests.  Had to rename most of the 'name' attributes because
of a 'feature' in xbean-spring

Modified:
    incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/spring/AbstractDeploymentFactory.java
    incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/spring/EjbReferenceInfo.java
    incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/spring/EncBuilder.java
    incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/spring/EnvEntryInfo.java
    incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/spring/ResourceReferenceInfo.java
    incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/spring.xml
    incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/SpringAssemblerTest.java

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/spring/AbstractDeploymentFactory.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/spring/AbstractDeploymentFactory.java?view=diff&rev=454051&r1=454050&r2=454051
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/spring/AbstractDeploymentFactory.java
(original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/spring/AbstractDeploymentFactory.java
Sat Oct  7 17:45:49 2006
@@ -39,6 +39,8 @@
     protected String remoteInterface;
     protected String localHomeInterface;
     protected String localInterface;
+    protected String businessLocalInterface;
+    protected String businessRemoteInterface;
     protected String beanClass;
     protected ClassLoader classLoader;
     protected EncInfo jndiContext;
@@ -55,6 +57,22 @@
         this.id = id;
     }
 
+    public String getBusinessLocalInterface() {
+        return businessLocalInterface;
+    }
+
+    public void setBusinessLocalInterface(String businessLocalInterface) {
+        this.businessLocalInterface = businessLocalInterface;
+    }
+
+    public String getBusinessRemoteInterface() {
+        return businessRemoteInterface;
+    }
+
+    public void setBusinessRemoteInterface(String businessRemoteInterface) {
+        this.businessRemoteInterface = businessRemoteInterface;
+    }
+
     public String getHomeInterface() {
         return homeInterface;
     }
@@ -180,7 +198,9 @@
                 loadClass(remoteInterface, classLoader),
                 loadClass(localHomeInterface, classLoader),
                 loadClass(localInterface, classLoader),
-                null, null, loadClass(getPkClass(), classLoader),
+                loadClass(businessLocalInterface, classLoader),
+                loadClass(businessRemoteInterface, classLoader),
+                loadClass(getPkClass(), classLoader),
                 getComponentType(),
                 null);
         deploymentInfo.setJarPath(getJarPath());

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/spring/EjbReferenceInfo.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/spring/EjbReferenceInfo.java?view=diff&rev=454051&r1=454050&r2=454051
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/spring/EjbReferenceInfo.java
(original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/spring/EjbReferenceInfo.java
Sat Oct  7 17:45:49 2006
@@ -22,18 +22,18 @@
  * @org.apache.xbean.XBean element="ejbRef"
  */
 public class EjbReferenceInfo extends InfoObject {
-    private String name;
+    private String jndiName;
     private boolean local;
     private String ejbId;
     private String remoteName;
     private String remoteContextId;
 
-    public String getName() {
-        return name;
+    public String getJndiName() {
+        return jndiName;
     }
 
-    public void setName(String name) {
-        this.name = name;
+    public void setJndiName(String jndiName) {
+        this.jndiName = jndiName;
     }
 
     public boolean isLocal() {

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/spring/EncBuilder.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/spring/EncBuilder.java?view=diff&rev=454051&r1=454050&r2=454051
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/spring/EncBuilder.java
(original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/spring/EncBuilder.java
Sat Oct  7 17:45:49 2006
@@ -112,7 +112,7 @@
                 String openEjbSubContextName = "java:openejb/remote_jndi_contexts/" + referenceInfo.getRemoteContextId();
                 reference = new JndiReference(openEjbSubContextName, referenceInfo.getRemoteName());
             }
-            bindings.put(normalize(referenceInfo.getName()), wrapReference(reference));
+            bindings.put(normalize(referenceInfo.getJndiName()), wrapReference(reference));
         }
 
         for (EnvEntryInfo entry : encInfo.envEntries) {
@@ -139,11 +139,11 @@
                     throw new IllegalArgumentException("Invalid env-ref-type " + type);
                 }
 
-                bindings.put(normalize(entry.getName()), obj);
+                bindings.put(normalize(entry.getJndiName()), obj);
             } catch (ClassNotFoundException e) {
-                throw new IllegalArgumentException("Invalid environment entry type: " + entry.getType().trim()
+ " for entry: " + entry.getName());
+                throw new IllegalArgumentException("Invalid environment entry type: " + entry.getType().trim()
+ " for entry: " + entry.getJndiName());
             } catch (NumberFormatException e) {
-                throw new IllegalArgumentException("The env-entry-value for entry " + entry.getName()
+ " was not recognizable as type " + entry.getType() + ". Received Message: " + e.getLocalizedMessage());
+                throw new IllegalArgumentException("The env-entry-value for entry " + entry.getJndiName()
+ " was not recognizable as type " + entry.getType() + ". Received Message: " + e.getLocalizedMessage());
             }
         }
 
@@ -157,7 +157,7 @@
                 String jndiName2 = referenceInfo.getRemoteName();
                 reference = new JndiReference(openEjbSubContextName1, jndiName2);
             }
-            bindings.put(normalize(referenceInfo.getName()), wrapReference(reference));
+            bindings.put(normalize(referenceInfo.getJndiName()), wrapReference(reference));
         }
 
         IvmContext enc = new IvmContext(new NameNode(null, new ParsedName("comp"), null));

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/spring/EnvEntryInfo.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/spring/EnvEntryInfo.java?view=diff&rev=454051&r1=454050&r2=454051
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/spring/EnvEntryInfo.java
(original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/spring/EnvEntryInfo.java
Sat Oct  7 17:45:49 2006
@@ -22,16 +22,16 @@
  * @org.apache.xbean.XBean element="envEntry"
  */
 public class EnvEntryInfo extends InfoObject {
-    private String name;
+    private String jndiName;
     private String type;
     private String value;
 
-    public String getName() {
-        return name;
+    public String getJndiName() {
+        return jndiName;
     }
 
-    public void setName(String name) {
-        this.name = name;
+    public void setJndiName(String jndiName) {
+        this.jndiName = jndiName;
     }
 
     public String getType() {

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/spring/ResourceReferenceInfo.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/spring/ResourceReferenceInfo.java?view=diff&rev=454051&r1=454050&r2=454051
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/spring/ResourceReferenceInfo.java
(original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/spring/ResourceReferenceInfo.java
Sat Oct  7 17:45:49 2006
@@ -22,17 +22,17 @@
  * @org.apache.xbean.XBean element="resourceRef"
  */
 public class ResourceReferenceInfo extends InfoObject {
-    private String name;
+    private String jndiName;
     private String resourceId;
     private String remoteContextId;
     private String remoteName;
 
-    public String getName() {
-        return name;
+    public String getJndiName() {
+        return jndiName;
     }
 
-    public void setName(String name) {
-        this.name = name;
+    public void setJndiName(String jndiName) {
+        this.jndiName = jndiName;
     }
 
     public String getResourceId() {

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/spring.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/spring.xml?view=diff&rev=454051&r1=454050&r2=454051
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/spring.xml
(original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/spring.xml
Sat Oct  7 17:45:49 2006
@@ -219,7 +219,7 @@
               pkClass="java.lang.Integer" primKeyField="primaryKey">
             <o:jndiContext>
               <o:enc>
-                <o:ejbRef name="cmp/rmi-iiop/home" local="false" ejbId="client/tests/entity/cmp/EncBean"/>
+                <o:ejbRef jndiName="cmp/rmi-iiop/home" local="false" ejbId="client/tests/entity/cmp/EncBean"/>
               </o:enc>
             </o:jndiContext>
           </o:cmpDeployment>
@@ -233,22 +233,22 @@
               pkClass="java.lang.Integer" primKeyField="primaryKey">
             <o:jndiContext>
               <o:enc>
-                <o:envEntry name="entity/cmp/references/Boolean" type="java.lang.Boolean"
value="true"/>
-                <o:envEntry name="entity/cmp/references/String" type="java.lang.String"
value="1"/>
-                <o:envEntry name="entity/cmp/references/Double" type="java.lang.Double"
value="1"/>
-                <o:envEntry name="entity/cmp/references/Long" type="java.lang.Long" value="1"/>
-                <o:envEntry name="entity/cmp/references/Float" type="java.lang.Float"
value="1"/>
-                <o:envEntry name="entity/cmp/references/Integer" type="java.lang.Integer"
value="1"/>
-                <o:envEntry name="entity/cmp/references/Short" type="java.lang.Short"
value="1"/>
-                <o:envEntry name="entity/cmp/references/Byte" type="java.lang.Byte" value="1"/>
-                <o:ejbRef name="entity/cmp/beanReferences/cmp_entity" local="false"
+                <o:envEntry jndiName="entity/cmp/references/Boolean" type="java.lang.Boolean"
value="true"/>
+                <o:envEntry jndiName="entity/cmp/references/String" type="java.lang.String"
value="1"/>
+                <o:envEntry jndiName="entity/cmp/references/Double" type="java.lang.Double"
value="1"/>
+                <o:envEntry jndiName="entity/cmp/references/Long" type="java.lang.Long"
value="1"/>
+                <o:envEntry jndiName="entity/cmp/references/Float" type="java.lang.Float"
value="1"/>
+                <o:envEntry jndiName="entity/cmp/references/Integer" type="java.lang.Integer"
value="1"/>
+                <o:envEntry jndiName="entity/cmp/references/Short" type="java.lang.Short"
value="1"/>
+                <o:envEntry jndiName="entity/cmp/references/Byte" type="java.lang.Byte"
value="1"/>
+                <o:ejbRef jndiName="entity/cmp/beanReferences/cmp_entity" local="false"
                     ejbId="client/tests/entity/cmp/BasicCmpHome"/>
-                <o:ejbRef name="entity/cmp/beanReferences/stateful" local="false"
+                <o:ejbRef jndiName="entity/cmp/beanReferences/stateful" local="false"
                     ejbId="client/tests/stateful/BasicStatefulHome"/>
-                <o:ejbRef name="entity/cmp/beanReferences/stateless" local="false"
+                <o:ejbRef jndiName="entity/cmp/beanReferences/stateless" local="false"
                     ejbId="client/tests/stateless/BasicStatelessHome"/>
-                <o:resourceRef name="datasource" resourceId="Default JDBC Database"/>
-                <o:resourceRef name="jdbc/basic/entityDatabase" resourceId="Default JDBC
Database"/>
+                <o:resourceRef jndiName="datasource" resourceId="Default JDBC Database"/>
+                <o:resourceRef jndiName="jdbc/basic/entityDatabase" resourceId="Default
JDBC Database"/>
               </o:enc>
             </o:jndiContext>
           </o:cmpDeployment>
@@ -263,7 +263,7 @@
               pkClass="java.lang.Integer" primKeyField="primaryKey">
             <o:jndiContext>
               <o:enc>
-                <o:resourceRef name="jdbc/basic/entityDatabase" resourceId="Default JDBC
Database"/>
+                <o:resourceRef jndiName="jdbc/basic/entityDatabase" resourceId="Default
JDBC Database"/>
               </o:enc>
             </o:jndiContext>
           </o:cmpDeployment>
@@ -282,7 +282,7 @@
             </o:queries>
             <o:jndiContext>
               <o:enc>
-                <o:resourceRef name="jdbc/basic/entityDatabase" resourceId="Default JDBC
Database"/>
+                <o:resourceRef jndiName="jdbc/basic/entityDatabase" resourceId="Default
JDBC Database"/>
               </o:enc>
             </o:jndiContext>
           </o:cmpDeployment>
@@ -303,7 +303,7 @@
               pkClass="java.lang.Integer">
             <o:jndiContext>
               <o:enc>
-                <o:ejbRef name="bmp/rmi-iiop/home" local="false" ejbId="client/tests/entity/bmp/EncBean"/>
+                <o:ejbRef jndiName="bmp/rmi-iiop/home" local="false" ejbId="client/tests/entity/bmp/EncBean"/>
               </o:enc>
             </o:jndiContext>
           </o:bmpDeployment>
@@ -317,22 +317,22 @@
               pkClass="java.lang.Integer">
             <o:jndiContext>
               <o:enc>
-                <o:envEntry name="entity/bmp/references/Boolean" type="java.lang.Boolean"
value="true"/>
-                <o:envEntry name="entity/bmp/references/String" type="java.lang.String"
value="1"/>
-                <o:envEntry name="entity/bmp/references/Double" type="java.lang.Double"
value="1"/>
-                <o:envEntry name="entity/bmp/references/Long" type="java.lang.Long" value="1"/>
-                <o:envEntry name="entity/bmp/references/Float" type="java.lang.Float"
value="1"/>
-                <o:envEntry name="entity/bmp/references/Integer" type="java.lang.Integer"
value="1"/>
-                <o:envEntry name="entity/bmp/references/Short" type="java.lang.Short"
value="1"/>
-                <o:envEntry name="entity/bmp/references/Byte" type="java.lang.Byte" value="1"/>
-                <o:ejbRef name="entity/bmp/beanReferences/bmp_entity" local="false"
+                <o:envEntry jndiName="entity/bmp/references/Boolean" type="java.lang.Boolean"
value="true"/>
+                <o:envEntry jndiName="entity/bmp/references/String" type="java.lang.String"
value="1"/>
+                <o:envEntry jndiName="entity/bmp/references/Double" type="java.lang.Double"
value="1"/>
+                <o:envEntry jndiName="entity/bmp/references/Long" type="java.lang.Long"
value="1"/>
+                <o:envEntry jndiName="entity/bmp/references/Float" type="java.lang.Float"
value="1"/>
+                <o:envEntry jndiName="entity/bmp/references/Integer" type="java.lang.Integer"
value="1"/>
+                <o:envEntry jndiName="entity/bmp/references/Short" type="java.lang.Short"
value="1"/>
+                <o:envEntry jndiName="entity/bmp/references/Byte" type="java.lang.Byte"
value="1"/>
+                <o:ejbRef jndiName="entity/bmp/beanReferences/bmp_entity" local="false"
                     ejbId="client/tests/entity/bmp/BasicBmpHome"/>
-                <o:ejbRef name="entity/bmp/beanReferences/stateful" local="false"
+                <o:ejbRef jndiName="entity/bmp/beanReferences/stateful" local="false"
                     ejbId="client/tests/stateful/BasicStatefulHome"/>
-                <o:ejbRef name="entity/bmp/beanReferences/stateless" local="false"
+                <o:ejbRef jndiName="entity/bmp/beanReferences/stateless" local="false"
                     ejbId="client/tests/stateless/BasicStatelessHome"/>
-                <o:resourceRef name="datasource" resourceId="Default JDBC Database"/>
-                <o:resourceRef name="jdbc/basic/entityDatabase" resourceId="Default JDBC
Database"/>
+                <o:resourceRef jndiName="datasource" resourceId="Default JDBC Database"/>
+                <o:resourceRef jndiName="jdbc/basic/entityDatabase" resourceId="Default
JDBC Database"/>
               </o:enc>
             </o:jndiContext>
           </o:bmpDeployment>
@@ -347,12 +347,12 @@
               pkClass="java.lang.Integer">
             <o:jndiContext>
               <o:enc>
-                <o:envEntry name="stateless/references/JNDI_access_to_java_comp_env" type="java.lang.String"
+                <o:envEntry jndiName="stateless/references/JNDI_access_to_java_comp_env"
type="java.lang.String"
                     value="Success"/>
-                <o:ejbRef name="stateless/beanReferences/Enterprise_bean_access" local="false"
+                <o:ejbRef jndiName="stateless/beanReferences/Enterprise_bean_access" local="false"
                     ejbId="client/tests/stateful/BasicStatefulHome"/>
-                <o:resourceRef name="jdbc/basic/entityDatabase" resourceId="Default JDBC
Database"/>
-                <o:resourceRef name="stateless/references/Resource_manager_access" resourceId="Default
JDBC Database"/>
+                <o:resourceRef jndiName="jdbc/basic/entityDatabase" resourceId="Default
JDBC Database"/>
+                <o:resourceRef jndiName="stateless/references/Resource_manager_access"
resourceId="Default JDBC Database"/>
               </o:enc>
             </o:jndiContext>
           </o:bmpDeployment>
@@ -367,7 +367,7 @@
               pkClass="java.lang.Integer">
             <o:jndiContext>
               <o:enc>
-                <o:resourceRef name="jdbc/basic/entityDatabase" resourceId="Default JDBC
Database"/>
+                <o:resourceRef jndiName="jdbc/basic/entityDatabase" resourceId="Default
JDBC Database"/>
               </o:enc>
             </o:jndiContext>
           </o:bmpDeployment>
@@ -387,7 +387,7 @@
               transactionManager="#transactionManager" assembly="#assembly" beanManagedTransaction="true">
             <o:jndiContext>
               <o:enc>
-                <o:ejbRef name="stateful/rmi-iiop/home" local="false" ejbId="client/tests/stateful/EncBean"/>
+                <o:ejbRef jndiName="stateful/rmi-iiop/home" local="false" ejbId="client/tests/stateful/EncBean"/>
               </o:enc>
             </o:jndiContext>
           </o:statefulDeployment>
@@ -401,21 +401,21 @@
               transactionManager="#transactionManager" assembly="#assembly" beanManagedTransaction="true">
             <o:jndiContext>
               <o:enc>
-                <o:envEntry name="stateful/references/Boolean" type="java.lang.Boolean"
value="true"/>
-                <o:envEntry name="stateful/references/String" type="java.lang.String"
value="1"/>
-                <o:envEntry name="stateful/references/Double" type="java.lang.Double"
value="1"/>
-                <o:envEntry name="stateful/references/Long" type="java.lang.Long" value="1"/>
-                <o:envEntry name="stateful/references/Float" type="java.lang.Float" value="1"/>
-                <o:envEntry name="stateful/references/Integer" type="java.lang.Integer"
value="1"/>
-                <o:envEntry name="stateful/references/Short" type="java.lang.Short" value="1"/>
-                <o:envEntry name="stateful/references/Byte" type="java.lang.Byte" value="1"/>
-                <o:ejbRef name="stateful/beanReferences/bmp_entity" local="false"
+                <o:envEntry jndiName="stateful/references/Boolean" type="java.lang.Boolean"
value="true"/>
+                <o:envEntry jndiName="stateful/references/String" type="java.lang.String"
value="1"/>
+                <o:envEntry jndiName="stateful/references/Double" type="java.lang.Double"
value="1"/>
+                <o:envEntry jndiName="stateful/references/Long" type="java.lang.Long"
value="1"/>
+                <o:envEntry jndiName="stateful/references/Float" type="java.lang.Float"
value="1"/>
+                <o:envEntry jndiName="stateful/references/Integer" type="java.lang.Integer"
value="1"/>
+                <o:envEntry jndiName="stateful/references/Short" type="java.lang.Short"
value="1"/>
+                <o:envEntry jndiName="stateful/references/Byte" type="java.lang.Byte"
value="1"/>
+                <o:ejbRef jndiName="stateful/beanReferences/bmp_entity" local="false"
                     ejbId="client/tests/entity/bmp/BasicBmpHome"/>
-                <o:ejbRef name="stateful/beanReferences/stateful" local="false"
+                <o:ejbRef jndiName="stateful/beanReferences/stateful" local="false"
                     ejbId="client/tests/stateful/BasicStatefulHome"/>
-                <o:ejbRef name="stateful/beanReferences/stateless" local="false"
+                <o:ejbRef jndiName="stateful/beanReferences/stateless" local="false"
                     ejbId="client/tests/stateless/BasicStatelessHome"/>
-                <o:resourceRef name="datasource" resourceId="Default JDBC Database"/>
+                <o:resourceRef jndiName="datasource" resourceId="Default JDBC Database"/>
               </o:enc>
             </o:jndiContext>
           </o:statefulDeployment>
@@ -429,7 +429,7 @@
               transactionManager="#transactionManager" assembly="#assembly" beanManagedTransaction="true">
             <o:jndiContext>
               <o:enc>
-                <o:resourceRef name="datasource" resourceId="Default JDBC Database"/>
+                <o:resourceRef jndiName="datasource" resourceId="Default JDBC Database"/>
               </o:enc>
             </o:jndiContext>
           </o:statefulDeployment>
@@ -464,6 +464,7 @@
               remoteInterface="org.apache.openejb.test.stateful.BasicStatefulObject"
               localHomeInterface="org.apache.openejb.test.stateful.BasicStatefulLocalHome"
               localInterface="org.apache.openejb.test.stateful.BasicStatefulLocalObject"
+              businessLocalInterface="org.apache.openejb.test.stateful.BasicStatefulBusinessLocal"
               beanClass="org.apache.openejb.test.stateful.BasicStatefulPojoBean"
               jarPath="../../../../openejb-itests/target/classes/" classLoader="#classLoader"
               transactionManager="#transactionManager" assembly="#assembly">
@@ -487,7 +488,7 @@
               transactionManager="#transactionManager" assembly="#assembly" beanManagedTransaction="true">
             <o:jndiContext>
               <o:enc>
-                <o:ejbRef name="stateless/rmi-iiop/home" local="false" ejbId="client/tests/stateless/EncBean"/>
+                <o:ejbRef jndiName="stateless/rmi-iiop/home" local="false" ejbId="client/tests/stateless/EncBean"/>
               </o:enc>
             </o:jndiContext>
           </o:statelessDeployment>
@@ -501,25 +502,25 @@
               transactionManager="#transactionManager" assembly="#assembly" beanManagedTransaction="true">
             <o:jndiContext>
               <o:enc>
-                <o:envEntry name="stateless/references/JNDI_access_to_java_comp_env" type="java.lang.String"
+                <o:envEntry jndiName="stateless/references/JNDI_access_to_java_comp_env"
type="java.lang.String"
                     value="Success"/>
-                <o:envEntry name="stateless/references/Boolean" type="java.lang.Boolean"
value="true"/>
-                <o:envEntry name="stateless/references/String" type="java.lang.String"
value="1"/>
-                <o:envEntry name="stateless/references/Double" type="java.lang.Double"
value="1"/>
-                <o:envEntry name="stateless/references/Long" type="java.lang.Long" value="1"/>
-                <o:envEntry name="stateless/references/Float" type="java.lang.Float" value="1"/>
-                <o:envEntry name="stateless/references/Integer" type="java.lang.Integer"
value="1"/>
-                <o:envEntry name="stateless/references/Short" type="java.lang.Short" value="1"/>
-                <o:envEntry name="stateless/references/Byte" type="java.lang.Byte" value="1"/>
-                <o:ejbRef name="stateless/beanReferences/Enterprise_bean_access" local="false"
+                <o:envEntry jndiName="stateless/references/Boolean" type="java.lang.Boolean"
value="true"/>
+                <o:envEntry jndiName="stateless/references/String" type="java.lang.String"
value="1"/>
+                <o:envEntry jndiName="stateless/references/Double" type="java.lang.Double"
value="1"/>
+                <o:envEntry jndiName="stateless/references/Long" type="java.lang.Long"
value="1"/>
+                <o:envEntry jndiName="stateless/references/Float" type="java.lang.Float"
value="1"/>
+                <o:envEntry jndiName="stateless/references/Integer" type="java.lang.Integer"
value="1"/>
+                <o:envEntry jndiName="stateless/references/Short" type="java.lang.Short"
value="1"/>
+                <o:envEntry jndiName="stateless/references/Byte" type="java.lang.Byte"
value="1"/>
+                <o:ejbRef jndiName="stateless/beanReferences/Enterprise_bean_access" local="false"
                     ejbId="client/tests/stateful/BasicStatefulHome"/>
-                <o:ejbRef name="stateless/beanReferences/bmp_entity" local="false"
+                <o:ejbRef jndiName="stateless/beanReferences/bmp_entity" local="false"
                     ejbId="client/tests/entity/bmp/BasicBmpHome"/>
-                <o:ejbRef name="stateless/beanReferences/stateful" local="false"
+                <o:ejbRef jndiName="stateless/beanReferences/stateful" local="false"
                     ejbId="client/tests/stateful/BasicStatefulHome"/>
-                <o:ejbRef name="stateless/beanReferences/stateless" local="false"
+                <o:ejbRef jndiName="stateless/beanReferences/stateless" local="false"
                     ejbId="client/tests/stateless/BasicStatelessHome"/>
-                <o:resourceRef name="datasource" resourceId="Default JDBC Database"/>
+                <o:resourceRef jndiName="datasource" resourceId="Default JDBC Database"/>
               </o:enc>
             </o:jndiContext>
           </o:statelessDeployment>
@@ -533,7 +534,7 @@
               transactionManager="#transactionManager" assembly="#assembly" beanManagedTransaction="true">
             <o:jndiContext>
               <o:enc>
-                <o:resourceRef name="database" resourceId="Default JDBC Database"/>
+                <o:resourceRef jndiName="database" resourceId="Default JDBC Database"/>
               </o:enc>
             </o:jndiContext>
           </o:statelessDeployment>
@@ -545,7 +546,7 @@
               transactionManager="#transactionManager" assembly="#assembly" beanManagedTransaction="true">
             <o:jndiContext>
               <o:enc>
-                <o:resourceRef name="database" resourceId="Default JDBC Database"/>
+                <o:resourceRef jndiName="database" resourceId="Default JDBC Database"/>
               </o:enc>
             </o:jndiContext>
           </o:statelessDeployment>
@@ -559,11 +560,11 @@
               transactionManager="#transactionManager" assembly="#assembly" beanManagedTransaction="true">
             <o:jndiContext>
               <o:enc>
-                <o:envEntry name="stateless/references/JNDI_access_to_java_comp_env" type="java.lang.String"
+                <o:envEntry jndiName="stateless/references/JNDI_access_to_java_comp_env"
type="java.lang.String"
                     value="Success"/>
-                <o:ejbRef name="stateless/beanReferences/Enterprise_bean_access" local="false"
+                <o:ejbRef jndiName="stateless/beanReferences/Enterprise_bean_access" local="false"
                     ejbId="client/tests/stateful/BasicStatefulHome"/>
-                <o:resourceRef name="stateless/references/Resource_manager_access" resourceId="Default
JDBC Database"/>
+                <o:resourceRef jndiName="stateless/references/Resource_manager_access"
resourceId="Default JDBC Database"/>
               </o:enc>
             </o:jndiContext>
           </o:statelessDeployment>
@@ -577,11 +578,11 @@
               transactionManager="#transactionManager" assembly="#assembly">
             <o:jndiContext>
               <o:enc>
-                <o:envEntry name="stateless/references/JNDI_access_to_java_comp_env" type="java.lang.String"
+                <o:envEntry jndiName="stateless/references/JNDI_access_to_java_comp_env"
type="java.lang.String"
                     value="Success"/>
-                <o:ejbRef name="stateless/beanReferences/Enterprise_bean_access" local="false"
+                <o:ejbRef jndiName="stateless/beanReferences/Enterprise_bean_access" local="false"
                     ejbId="client/tests/stateful/BasicStatefulHome"/>
-                <o:resourceRef name="stateless/references/Resource_manager_access" resourceId="Default
JDBC Database"/>
+                <o:resourceRef jndiName="stateless/references/Resource_manager_access"
resourceId="Default JDBC Database"/>
               </o:enc>
             </o:jndiContext>
           </o:statelessDeployment>
@@ -592,16 +593,17 @@
               remoteInterface="org.apache.openejb.test.stateless.BasicStatelessObject"
               localHomeInterface="org.apache.openejb.test.stateless.BasicStatelessLocalHome"
               localInterface="org.apache.openejb.test.stateless.BasicStatelessLocalObject"
+              businessLocalInterface="org.apache.openejb.test.stateless.BasicStatelessBusinessLocal"
               beanClass="org.apache.openejb.test.stateless.BasicStatelessPojoBean"
               jarPath="../../../../openejb-itests/target/classes/" classLoader="#classLoader"
               transactionManager="#transactionManager" assembly="#assembly">
             <o:jndiContext>
               <o:enc>
-                <o:envEntry name="stateless/references/JNDI_access_to_java_comp_env" type="java.lang.String"
+                <o:envEntry jndiName="stateless/references/JNDI_access_to_java_comp_env"
type="java.lang.String"
                     value="Success"/>
-                <o:ejbRef name="stateless/beanReferences/Enterprise_bean_access" local="false"
+                <o:ejbRef jndiName="stateless/beanReferences/Enterprise_bean_access" local="false"
                     ejbId="client/tests/stateful/BasicStatefulHome"/>
-                <o:resourceRef name="stateless/references/Resource_manager_access" resourceId="Default
JDBC Database"/>
+                <o:resourceRef jndiName="stateless/references/Resource_manager_access"
resourceId="Default JDBC Database"/>
               </o:enc>
             </o:jndiContext>
           </o:statelessDeployment>

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/SpringAssemblerTest.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/SpringAssemblerTest.java?view=diff&rev=454051&r1=454050&r2=454051
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/SpringAssemblerTest.java
(original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/SpringAssemblerTest.java
Sat Oct  7 17:45:49 2006
@@ -23,11 +23,7 @@
  * @version $Revision$ $Date$
  */
 public class SpringAssemblerTest extends TestCase {
-    public void testNothing(){
-        // The spring.xml file points to files in the form of ../../../
-        // this does not work in Continuum as *all* modules are side-by-side
-    }
-    public static Test _suite() {
+    public static Test suite() {
         System.setProperty("openejb.assembler", org.apache.openejb.assembler.spring.Assembler.class.getName());
         System.setProperty("openejb.spring.conf", "META-INF/org.apache.openejb/spring.xml");
         return org.apache.openejb.iTest.suite();



Mime
View raw message