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 2007/05/22 06:36:25 UTC
svn commit: r540418 - in /incubator/openejb/trunk/openejb3:
container/openejb-core/src/main/java/org/apache/openejb/config/
container/openejb-core/src/main/resources/META-INF/
container/openejb-jee/src/main/java/org/apache/openejb/jee/
itests/openejb-i...
Author: dblevins
Date: Mon May 21 21:36:24 2007
New Revision: 540418
URL: http://svn.apache.org/viewvc?view=rev&rev=540418
Log:
Respect the meta-data complete flag
Modified:
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/ejb-jar.xml
incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ApplicationClient.java
incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbJar.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/resources/META-INF/ejb-jar.xml
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java?view=diff&rev=540418&r1=540417&r2=540418
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java Mon May 21 21:36:24 2007
@@ -179,6 +179,8 @@
}
public EjbModule deploy(EjbModule ejbModule) throws OpenEJBException {
+ if (ejbModule.getEjbJar() != null && ejbModule.getEjbJar().isMetadataComplete()) return ejbModule;
+
ClassFinder finder;
if (ejbModule.getJarURI() != null) {
try {
@@ -287,6 +289,8 @@
}
public ClientModule deploy(ClientModule clientModule) throws OpenEJBException {
+ if (clientModule.getApplicationClient() != null && clientModule.getApplicationClient().isMetadataComplete()) return clientModule;
+
ClassLoader classLoader = clientModule.getClassLoader();
Class<?> clazz = null;
try {
@@ -302,6 +306,7 @@
}
public EjbModule deploy(EjbModule ejbModule) throws OpenEJBException {
+ if (ejbModule.getEjbJar() != null && ejbModule.getEjbJar().isMetadataComplete()) return ejbModule;
ClassLoader classLoader = ejbModule.getClassLoader();
EnterpriseBean[] enterpriseBeans = ejbModule.getEjbJar().getEnterpriseBeans();
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/ejb-jar.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/ejb-jar.xml?view=diff&rev=540418&r1=540417&r2=540418
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/ejb-jar.xml (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/ejb-jar.xml Mon May 21 21:36:24 2007
@@ -24,5 +24,5 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd"
- version="3.0" metadata-complete="true"/>
+ version="3.0" metadata-complete="false"/>
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ApplicationClient.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ApplicationClient.java?view=diff&rev=540418&r1=540417&r2=540418
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ApplicationClient.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ApplicationClient.java Mon May 21 21:36:24 2007
@@ -242,7 +242,7 @@
}
public Boolean isMetadataComplete() {
- return metadataComplete;
+ return metadataComplete != null && metadataComplete;
}
public void setMetadataComplete(Boolean value) {
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbJar.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbJar.java?view=diff&rev=540418&r1=540417&r2=540418
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbJar.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbJar.java Mon May 21 21:36:24 2007
@@ -220,7 +220,7 @@
}
public Boolean isMetadataComplete() {
- return metadataComplete;
+ return metadataComplete != null && metadataComplete;
}
public void setMetadataComplete(Boolean value) {
Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/resources/META-INF/ejb-jar.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/resources/META-INF/ejb-jar.xml?view=diff&rev=540418&r1=540417&r2=540418
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/resources/META-INF/ejb-jar.xml (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/resources/META-INF/ejb-jar.xml Mon May 21 21:36:24 2007
@@ -24,7 +24,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd"
- version="3.0" metadata-complete="true">
+ version="3.0" metadata-complete="false">
<description>
This ejb-jar file contains assembled enterprise beans that are