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/12/13 07:07:37 UTC
svn commit: r603830 -
/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
Author: dblevins
Date: Wed Dec 12 22:07:36 2007
New Revision: 603830
URL: http://svn.apache.org/viewvc?rev=603830&view=rev
Log:
Readding missing method so openejb-tomcat module compiles
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java?rev=603830&r1=603829&r2=603830&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java Wed Dec 12 22:07:36 2007
@@ -169,6 +169,18 @@
}
}
+ public WebModule deploy(WebModule webModule) throws OpenEJBException {
+ validationContext.set(webModule.getValidation());
+ try {
+ webModule = discoverAnnotatedBeans.deploy(webModule);
+ webModule = envEntriesPropertiesDeployer.deploy(webModule);
+ webModule = processAnnotatedBeans.deploy(webModule);
+ return webModule;
+ } finally {
+ validationContext.remove();
+ }
+ }
+
public static class DiscoverAnnotatedBeans implements DynamicDeployer {
public static final Set<String> knownResourceEnvTypes = new TreeSet<String>(Arrays.asList(
"javax.ejb.SessionContext",
@@ -195,16 +207,36 @@
public AppModule deploy(AppModule appModule) throws OpenEJBException {
for (EjbModule ejbModule : appModule.getEjbModules()) {
- deploy(ejbModule);
+ validationContext.set(ejbModule.getValidation());
+ try {
+ deploy(ejbModule);
+ } finally {
+ validationContext.remove();
+ }
}
for (ClientModule clientModule : appModule.getClientModules()) {
- deploy(clientModule);
+ validationContext.set(clientModule.getValidation());
+ try {
+ deploy(clientModule);
+ } finally {
+ validationContext.remove();
+ }
}
for (ConnectorModule connectorModule : appModule.getResourceModules()) {
- deploy(connectorModule);
+ validationContext.set(connectorModule.getValidation());
+ try {
+ deploy(connectorModule);
+ } finally {
+ validationContext.remove();
+ }
}
for (WebModule webModule : appModule.getWebModules()) {
- deploy(webModule);
+ validationContext.set(webModule.getValidation());
+ try {
+ deploy(webModule);
+ } finally {
+ validationContext.remove();
+ }
}
return appModule;
}
@@ -1512,9 +1544,9 @@
serviceRef.setWsdlFile(wsdlLocation);
}
}
-
+
if (System.getProperty("duct tape") != null) return;
-
+
if (serviceRef.getWsdlFile() == null && refType != null) {
serviceRef.setWsdlFile(JaxWsUtils.getServiceWsdlLocation(refType, classLoader));
}