Author: rmannibucau
Date: Fri Dec 14 08:22:11 2012
New Revision: 1421719
URL: http://svn.apache.org/viewvc?rev=1421719&view=rev
Log:
TOMEE-650 eclipse lifecycle is not the default one so we need some enhancement
to manage context.xml resources
Modified:
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBNamingResource.java
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
Modified:
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBNamingResource.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBNamingResource.java?rev=1421719&r1=1421718&r2=1421719&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBNamingResource.java
(original)
+++
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBNamingResource.java
Fri Dec 14 08:22:11 2012
@@ -36,6 +36,41 @@ public class OpenEJBNamingResource exten
private boolean isTomcatResource = false;
private final Collection<ResourceBase> tomcatResources = new
ArrayList<ResourceBase>();
+ public OpenEJBNamingResource() {
+ // no-op
+ }
+
+ public OpenEJBNamingResource(final NamingResources namingResources) {
+ if (namingResources != null) {
+ isTomcatResource = true;
+ for (ContextResource resource : namingResources.findResources()) {
+ addResource(resource);
+ }
+ for (ContextResourceEnvRef resource :
namingResources.findResourceEnvRefs()) {
+ addResourceEnvRef(resource);
+ }
+ for (ContextEjb ejb : namingResources.findEjbs()) {
+ addEjb(ejb);
+ }
+ for (ContextLocalEjb ejb : namingResources.findLocalEjbs()) {
+ addLocalEjb(ejb);
+ }
+ for (ContextResourceLink link :
namingResources.findResourceLinks()) {
+ addResourceLink(link);
+ }
+ for (ContextService service : namingResources.findServices()) {
+ addService(service);
+ }
+ for (MessageDestinationRef ref :
namingResources.findMessageDestinationRefs()) {
+ addMessageDestinationRef(ref);
+ }
+ for (ContextEnvironment env : namingResources.findEnvironments()) {
+ addEnvironment(env);
+ }
+ isTomcatResource = false;
+ }
+ }
+
@Override
public void addEnvironment(ContextEnvironment environment) {
normalize(environment);
Modified:
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java?rev=1421719&r1=1421718&r2=1421719&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
(original)
+++
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
Fri Dec 14 08:22:11 2012
@@ -702,7 +702,7 @@ public class TomcatWebAppBuilder impleme
}
standardContext.setCrossContext(SystemInstance.get().getOptions().get(OPENEJB_CROSSCONTEXT_PROPERTY,
false));
- standardContext.setNamingResources(new OpenEJBNamingResource());
+ standardContext.setNamingResources(new
OpenEJBNamingResource(standardContext.getNamingResources()));
String sessionManager =
SystemInstance.get().getOptions().get(OPENEJB_SESSION_MANAGER_PROPERTY + "." +
standardContext.getName(), (String) null);
if (sessionManager == null) {
