You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2011/07/25 20:50:47 UTC
svn commit: r1150844 - in
/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic:
Assembler.java JndiEncBuilder.java
Author: rmannibucau
Date: Mon Jul 25 18:50:46 2011
New Revision: 1150844
URL: http://svn.apache.org/viewvc?rev=1150844&view=rev
Log:
quick fix to force rest context proxies
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java?rev=1150844&r1=1150843&r2=1150844&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java Mon Jul 25 18:50:46 2011
@@ -778,13 +778,17 @@ public class Assembler extends Assembler
}
// REST context resources
- containerSystemContext.bind("openejb/Resource/rest/context/Request", ThreadLocalContextManager.REQUEST);
- containerSystemContext.bind("openejb/Resource/rest/context/UriInfo", ThreadLocalContextManager.URI_INFO);
- containerSystemContext.bind("openejb/Resource/rest/context/HttpHeaders", ThreadLocalContextManager.HTTP_HEADERS);
- containerSystemContext.bind("openejb/Resource/rest/context/SecurityContext", ThreadLocalContextManager.SECURITY_CONTEXT);
- // TODO:
- // containerSystemContext.bind("openejb/Resource/rest/context/ContextResolver", ThreadLocalContextManager.CONTEXT_RESOLVER);
- // containerSystemContext.bind("openejb/Resource/rest/context/Application", ThreadLocalContextManager.APPLICATION);
+ try {
+ containerSystemContext.bind("openejb/Resource/rest/context/Request", ThreadLocalContextManager.REQUEST);
+ containerSystemContext.bind("openejb/Resource/rest/context/UriInfo", ThreadLocalContextManager.URI_INFO);
+ containerSystemContext.bind("openejb/Resource/rest/context/HttpHeaders", ThreadLocalContextManager.HTTP_HEADERS);
+ containerSystemContext.bind("openejb/Resource/rest/context/SecurityContext", ThreadLocalContextManager.SECURITY_CONTEXT);
+ // TODO:
+ // containerSystemContext.bind("openejb/Resource/rest/context/ContextResolver", ThreadLocalContextManager.CONTEXT_RESOLVER);
+ // containerSystemContext.bind("openejb/Resource/rest/context/Application", ThreadLocalContextManager.APPLICATION);
+ } catch (NameAlreadyBoundException ignored) {
+ // no-op
+ }
SystemInstance systemInstance = SystemInstance.get();
@@ -1082,6 +1086,19 @@ public class Assembler extends Assembler
}
}
+ // REST context resources
+ try {
+ globalContext.unbind("openejb/Resource/rest/context/Request");
+ globalContext.unbind("openejb/Resource/rest/context/UriInfo");
+ globalContext.unbind("openejb/Resource/rest/context/HttpHeaders");
+ globalContext.unbind("openejb/Resource/rest/context/SecurityContext");
+ // TODO:
+ // globalContext.unbind("openejb/Resource/rest/context/ContextResolver");
+ // globalContext.unbind("openejb/Resource/rest/context/Application");
+ } catch (Throwable ignored) {
+ // no-op
+ }
+
for (PersistenceUnitInfo unitInfo : appInfo.persistenceUnits) {
try {
Object object = globalContext.lookup("openejb/PersistenceUnit/" + unitInfo.id);
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java?rev=1150844&r1=1150843&r2=1150844&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java Mon Jul 25 18:50:46 2011
@@ -18,12 +18,11 @@ package org.apache.openejb.assembler.cla
import org.apache.openejb.AppContext;
import org.apache.openejb.Injection;
-import org.apache.openejb.OpenEJBException;
import org.apache.openejb.InterfaceType;
-import org.apache.openejb.spi.ContainerSystem;
+import org.apache.openejb.OpenEJBException;
import org.apache.openejb.core.CoreUserTransaction;
-import org.apache.openejb.core.TransactionSynchronizationRegistryWrapper;
import org.apache.openejb.core.JndiFactory;
+import org.apache.openejb.core.TransactionSynchronizationRegistryWrapper;
import org.apache.openejb.core.ivm.naming.ClassReference;
import org.apache.openejb.core.ivm.naming.CrossClassLoaderJndiReference;
import org.apache.openejb.core.ivm.naming.IntraVmJndiReference;
@@ -40,6 +39,7 @@ import org.apache.openejb.core.webservic
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.persistence.JtaEntityManager;
import org.apache.openejb.persistence.JtaEntityManagerRegistry;
+import org.apache.openejb.spi.ContainerSystem;
import org.apache.openejb.util.Classes;
import org.apache.openejb.util.IntrospectionSupport;
import org.apache.openejb.util.LogCategory;
@@ -61,15 +61,14 @@ import javax.validation.Validator;
import javax.validation.ValidatorFactory;
import javax.xml.ws.Service;
import javax.xml.ws.WebServiceContext;
+import java.io.Serializable;
import java.net.MalformedURLException;
import java.net.URI;
-import java.net.URISyntaxException;
import java.net.URL;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.ArrayList;
-import java.io.Serializable;
/**
* TODO: This class is essentially an over glorified sym-linker. The names
@@ -316,10 +315,6 @@ public class JndiEncBuilder {
bindings.put(normalize(referenceInfo.referenceName), reference);
}
- String moduleId = null;
- if (moduleUri != null) {
- moduleId = moduleUri.toString();
- }
for (PersistenceUnitReferenceInfo referenceInfo : jndiEnc.persistenceUnitRefs) {
if (referenceInfo.location != null){
Reference reference = buildReferenceLocation(referenceInfo.location);