Modified: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckPersistenceUnitUsageTest.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckPersistenceUnitUsageTest.java?rev=966758&r1=966757&r2=966758&view=diff ============================================================================== --- openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckPersistenceUnitUsageTest.java (original) +++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckPersistenceUnitUsageTest.java Thu Jul 22 17:16:27 2010 @@ -30,8 +30,8 @@ import org.junit.runner.RunWith; @RunWith(ValidationRunner.class) public class CheckPersistenceUnitUsageTest { - @Keys( { @Key(value = "persistenceUnitRef.noPersistenceUnits", count = 3), @Key("presistenceUnitAnnotation.onClassWithNoName"), - @Key("presistenceUnitAnnotation.onEntityManager"), @Key("presistenceUnitAnnotation.onNonEntityManagerFactory") }) + @Keys( { @Key(value = "persistenceUnitRef.noPersistenceUnits", count = 3), @Key("persistenceUnitAnnotation.onClassWithNoName"), + @Key("persistenceUnitAnnotation.onEntityManager"), @Key("persistenceUnitAnnotation.onNonEntityManagerFactory") }) public EjbJar wrongUsage() throws OpenEJBException { EjbJar ejbJar = new EjbJar(); ejbJar.addEnterpriseBean(new StatelessBean(FooStateless.class));
Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbLocalRef.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbLocalRef.java?rev=966758&r1=966757&r2=966758&view=diff ============================================================================== --- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbLocalRef.java (original) +++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbLocalRef.java Thu Jul 22 17:16:27 2010 @@ -119,7 +119,9 @@ public class EjbLocalRef implements EjbR } public String getKey() { - return getName(); + String name = getName(); + if (name == null || name.startsWith("java:")) return name; + return "java:comp/env/" + name; } public String getType() { Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbRef.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbRef.java?rev=966758&r1=966757&r2=966758&view=diff ============================================================================== --- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbRef.java (original) +++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbRef.java Thu Jul 22 17:16:27 2010 @@ -128,7 +128,9 @@ public class EjbRef implements EjbRefere } public String getKey() { - return getName(); + String name = getName(); + if (name == null || name.startsWith("java:")) return name; + return "java:comp/env/" + name; } public String getType() { Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EnvEntry.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EnvEntry.java?rev=966758&r1=966757&r2=966758&view=diff ============================================================================== --- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EnvEntry.java (original) +++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EnvEntry.java Thu Jul 22 17:16:27 2010 @@ -119,7 +119,9 @@ public class EnvEntry implements JndiRef } public String getKey() { - return getName(); + String name = getName(); + if (name == null || name.startsWith("java:")) return name; + return "java:comp/env/" + name; } public void setType(String type) { Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/JndiConsumer.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/JndiConsumer.java?rev=966758&r1=966757&r2=966758&view=diff ============================================================================== --- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/JndiConsumer.java (original) +++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/JndiConsumer.java Thu Jul 22 17:16:27 2010 @@ -20,6 +20,11 @@ import java.util.Collection; import java.util.Map; /** + * Interface for all components that have a java: jndi context or contribute to one such as the application. + * The get<foo>Map methods return maps keyed by normalized jndi name, that is any old-style <foo> entry is + * normalized to java:comp/env/<foo> to match entries that are explicitly defined in a comp, module, app, or global + * context. The Refs themselves do not have normalized referenceNames. + * * @version $Rev$ $Date$ */ public interface JndiConsumer { Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/PersistenceContextRef.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/PersistenceContextRef.java?rev=966758&r1=966757&r2=966758&view=diff ============================================================================== --- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/PersistenceContextRef.java (original) +++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/PersistenceContextRef.java Thu Jul 22 17:16:27 2010 @@ -114,7 +114,9 @@ public class PersistenceContextRef imple } public String getKey() { - return getName(); + String name = getName(); + if (name == null || name.startsWith("java:")) return name; + return "java:comp/env/" + name; } public String getType() { Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/PersistenceUnitRef.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/PersistenceUnitRef.java?rev=966758&r1=966757&r2=966758&view=diff ============================================================================== --- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/PersistenceUnitRef.java (original) +++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/PersistenceUnitRef.java Thu Jul 22 17:16:27 2010 @@ -108,7 +108,9 @@ public class PersistenceUnitRef implemen } public String getKey() { - return getName(); + String name = getName(); + if (name == null || name.startsWith("java:")) return name; + return "java:comp/env/" + name; } public void setType(String type) { Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceEnvRef.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceEnvRef.java?rev=966758&r1=966757&r2=966758&view=diff ============================================================================== --- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceEnvRef.java (original) +++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceEnvRef.java Thu Jul 22 17:16:27 2010 @@ -102,7 +102,9 @@ public class ResourceEnvRef implements J } public String getKey() { - return getName(); + String name = getName(); + if (name == null || name.startsWith("java:")) return name; + return "java:comp/env/" + name; } @XmlTransient Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceRef.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceRef.java?rev=966758&r1=966757&r2=966758&view=diff ============================================================================== --- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceRef.java (original) +++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceRef.java Thu Jul 22 17:16:27 2010 @@ -113,7 +113,9 @@ public class ResourceRef implements Jndi } public String getKey() { - return getName(); + String name = getName(); + if (name == null || name.startsWith("java:")) return name; + return "java:comp/env/" + name; } @XmlTransient Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ServiceRef.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ServiceRef.java?rev=966758&r1=966757&r2=966758&view=diff ============================================================================== --- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ServiceRef.java (original) +++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ServiceRef.java Thu Jul 22 17:16:27 2010 @@ -128,7 +128,9 @@ public class ServiceRef implements JndiR } public String getKey() { - return getName(); + String name = getName(); + if (name == null || name.startsWith("java:")) return name; + return "java:comp/env/" + name; } public String getType() { Modified: openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/resources/META-INF/ejb-jar.xml URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/resources/META-INF/ejb-jar.xml?rev=966758&r1=966757&r2=966758&view=diff ============================================================================== --- openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/resources/META-INF/ejb-jar.xml (original) +++ openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/resources/META-INF/ejb-jar.xml Thu Jul 22 17:16:27 2010 @@ -1528,7 +1528,7 @@ <prim-key-class>java.lang.Integer</prim-key-class> <reentrant>false</reentrant> <cmp-version>2.x</cmp-version> - <abstract-schema-name>Order</abstract-schema-name> + <abstract-schema-name>Order1</abstract-schema-name> <cmp-field> <field-name>id</field-name> </cmp-field> @@ -1536,6 +1536,7 @@ <field-name>field1</field-name> </cmp-field> <primkey-field>id</primkey-field> + <!-- suppresses testing --> <persistence-context-ref> <persistence-context-ref-name>openejb/cmp</persistence-context-ref-name> <persistence-unit-name>cmp</persistence-unit-name> @@ -1551,11 +1552,26 @@ <prim-key-class>java.lang.Integer</prim-key-class> <reentrant>false</reentrant> <cmp-version>2.x</cmp-version> - <abstract-schema-name>Order</abstract-schema-name> + <abstract-schema-name>Order2</abstract-schema-name> <cmp-field> <field-name>id</field-name> </cmp-field> <primkey-field>id</primkey-field> + <!-- suppresses testing --> + <!-- incorrect mapping generated --> + <!-- + <entity name="Order2" class="openejb.org.apache.openejb.test.entity.cmr.cmrmapping.Order2"> + <description>openejb-itests-beans-3.2-SNAPSHOT.jar#OneInverseSideBean</description> + <attributes> + <id name="id"/> + <one-to-many name="manyOwningSide" mapped-by="oneInverseSide"/> + <one-to-one name="oneOwningSide" mapped-by="oneInverseSide"/> + </attributes> + </entity> + --> + <!-- error message: + The type of field "openejb.org.apache.openejb.test.entity.cmr.cmrmapping.Order2.manyOwningSide" isn't supported by declared persistence strategy "OneToMany". Please choose a different strategy. + --> <persistence-context-ref> <persistence-context-ref-name>openejb/cmp</persistence-context-ref-name> <persistence-unit-name>cmp</persistence-unit-name> @@ -1572,7 +1588,7 @@ <prim-key-class>java.lang.Integer</prim-key-class> <reentrant>false</reentrant> <cmp-version>2.x</cmp-version> - <abstract-schema-name>Order</abstract-schema-name> + <abstract-schema-name>Order3</abstract-schema-name> <cmp-field> <field-name>id</field-name> </cmp-field> @@ -1589,6 +1605,7 @@ </query-method> <ejb-ql>SELECT m.oneInverseSide FROM Order m WHERE m.id = ?1</ejb-ql> </query> + <!-- suppresses testing --> <persistence-context-ref> <persistence-context-ref-name>openejb/cmp</persistence-context-ref-name> <persistence-unit-name>cmp</persistence-unit-name> Modified: openejb/trunk/openejb3/server/openejb-webadmin/src/main/java/org/apache/openejb/webadmin/main/DeploymentListBean.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-webadmin/src/main/java/org/apache/openejb/webadmin/main/DeploymentListBean.java?rev=966758&r1=966757&r2=966758&view=diff ============================================================================== --- openejb/trunk/openejb3/server/openejb-webadmin/src/main/java/org/apache/openejb/webadmin/main/DeploymentListBean.java (original) +++ openejb/trunk/openejb3/server/openejb-webadmin/src/main/java/org/apache/openejb/webadmin/main/DeploymentListBean.java Thu Jul 22 17:16:27 2010 @@ -188,7 +188,7 @@ public class DeploymentListBean extends body.println("</tr>"); for (EnvEntryInfo info : enc.envEntries) { - printRow(info.name, info.value, info.type, body); + printRow(info.referenceName, info.value, info.type, body); } for (EjbLocalReferenceInfo info : enc.ejbLocalReferences) { @@ -204,7 +204,7 @@ public class DeploymentListBean extends } for (ResourceEnvReferenceInfo info : enc.resourceEnvRefs) { - printRow(info.resourceEnvRefName, info.resourceID, info.resourceEnvRefType, body); + printRow(info.referenceName, info.resourceID, info.resourceEnvRefType, body); } for (PersistenceUnitReferenceInfo info : enc.persistenceUnitRefs) {
