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 2014/08/07 23:13:13 UTC
svn commit: r1616596 - in /tomee/tomee/trunk:
arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/httpheaders/
server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/ tome...
Author: rmannibucau
Date: Thu Aug 7 21:13:12 2014
New Revision: 1616596
URL: http://svn.apache.org/r1616596
Log:
not sure why we were setting comp as jndi enc for webContext but should clearly be root + don't overwrite what we put in tomcat jndi - we for sure need to pass again tcks asap
Modified:
tomee/tomee/trunk/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/httpheaders/HttpHeadersMethodsResource.java
tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/OpenEJBPerRequestPojoResourceProvider.java
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatJndiBuilder.java
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
Modified: tomee/tomee/trunk/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/httpheaders/HttpHeadersMethodsResource.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/httpheaders/HttpHeadersMethodsResource.java?rev=1616596&r1=1616595&r2=1616596&view=diff
==============================================================================
--- tomee/tomee/trunk/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/httpheaders/HttpHeadersMethodsResource.java (original)
+++ tomee/tomee/trunk/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/httpheaders/HttpHeadersMethodsResource.java Thu Aug 7 21:13:12 2014
@@ -43,10 +43,10 @@ public class HttpHeadersMethodsResource
@GET
@Path("acceptablelanguages")
public String getLanguages() {
- List<Locale> languages = headersfield.getAcceptableLanguages();
- StringBuilder sb = new StringBuilder("acceptablelanguages:");
- for (Locale l : languages) {
- sb.append(l.getLanguage() + ":");
+ final List<Locale> languages = headersfield.getAcceptableLanguages();
+ final StringBuilder sb = new StringBuilder("acceptablelanguages:");
+ for (final Locale l : languages) {
+ sb.append(l.getLanguage()).append(":");
}
return sb.toString();
}
@@ -54,10 +54,10 @@ public class HttpHeadersMethodsResource
@GET
@Path("acceptablemediatypes")
public String getAcceptableMediaTypes() {
- List<MediaType> mediatypes = headersfield.getAcceptableMediaTypes();
- StringBuilder sb = new StringBuilder("acceptablemediatypes:");
- for (MediaType mt : mediatypes) {
- sb.append(mt.getType() + "/" + mt.getSubtype() + ":");
+ final List<MediaType> mediatypes = headersfield.getAcceptableMediaTypes();
+ final StringBuilder sb = new StringBuilder("acceptablemediatypes:");
+ for (final MediaType mt : mediatypes) {
+ sb.append(mt.getType()).append("/").append(mt.getSubtype()).append(":");
}
return sb.toString();
}
@@ -65,10 +65,10 @@ public class HttpHeadersMethodsResource
@POST
@Path("requestmediatype")
public String getRequestMediaType() {
- MediaType mt = headersfield.getMediaType();
- StringBuilder sb = new StringBuilder("mediatype:");
+ final MediaType mt = headersfield.getMediaType();
+ final StringBuilder sb = new StringBuilder("mediatype:");
if (mt != null) {
- sb.append(mt.getType() + "/" + mt.getSubtype() + ":");
+ sb.append(mt.getType()).append("/").append(mt.getSubtype()).append(":");
} else {
sb.append("null:");
}
@@ -78,10 +78,10 @@ public class HttpHeadersMethodsResource
@POST
@Path("language")
public String getLanguage() {
- Locale l = headersfield.getLanguage();
- StringBuilder sb = new StringBuilder("language:");
+ final Locale l = headersfield.getLanguage();
+ final StringBuilder sb = new StringBuilder("language:");
if (l != null) {
- sb.append(l.getLanguage() + ":");
+ sb.append(l.getLanguage()).append(":");
} else {
sb.append("null:");
}
@@ -91,15 +91,15 @@ public class HttpHeadersMethodsResource
@POST
@Path("cookies")
public String getCookies() {
- Map<String, Cookie> cookies = headersfield.getCookies();
- StringBuilder sb = new StringBuilder("cookies:");
+ final Map<String, Cookie> cookies = headersfield.getCookies();
+ final StringBuilder sb = new StringBuilder("cookies:");
if (cookies == null) {
sb.append("null:");
} else {
- List<String> cookieNames = new ArrayList<String>(cookies.keySet());
+ final List<String> cookieNames = new ArrayList<String>(cookies.keySet());
Collections.sort(cookieNames);
- for (String c : cookieNames) {
- sb.append(c + "=" + cookies.get(c).getValue() + ":");
+ for (final String c : cookieNames) {
+ sb.append(c).append("=").append(cookies.get(c).getValue()).append(":");
}
}
return sb.toString();
@@ -124,17 +124,17 @@ public class HttpHeadersMethodsResource
@GET
@Path("/requestheaders")
public String getHeaders(@Context HttpHeaders headers, @QueryParam("name") String headerName) {
- MultivaluedMap<String, String> requestHeaders = headers.getRequestHeaders();
- List<String> keys = new ArrayList<String>(requestHeaders.keySet());
+ final MultivaluedMap<String, String> requestHeaders = headers.getRequestHeaders();
+ final List<String> keys = new ArrayList<String>(requestHeaders.keySet());
Collections.sort(keys);
- StringBuilder sb = new StringBuilder("requestheaders:");
- for (String k : keys) {
- sb.append(k + "=");
+ final StringBuilder sb = new StringBuilder("requestheaders:");
+ for (final String k : keys) {
+ sb.append(k).append("=");
List<String> values = requestHeaders.get(k);
if (values != null) {
values = new ArrayList<String>(values);
Collections.sort(values);
- sb.append(values + ":");
+ sb.append(values).append(":");
}
}
return sb.toString();
Modified: tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java?rev=1616596&r1=1616595&r2=1616596&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java Thu Aug 7 21:13:12 2014
@@ -418,7 +418,8 @@ public class CxfRsHttpListener implement
final Object proxy = ProxyEJB.subclassProxy(restServiceInfo.context);
factory.setResourceProvider(clazz, new NoopResourceProvider(restServiceInfo.context.getBeanClass(), proxy));
} else {
- factory.setResourceProvider(clazz, new OpenEJBPerRequestPojoResourceProvider(classLoader, clazz, injections, context, owbCtx));
+ factory.setResourceProvider(clazz, new OpenEJBPerRequestPojoResourceProvider(
+ classLoader, clazz, injections, context, owbCtx));
}
}
Modified: tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/OpenEJBPerRequestPojoResourceProvider.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/OpenEJBPerRequestPojoResourceProvider.java?rev=1616596&r1=1616595&r2=1616596&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/OpenEJBPerRequestPojoResourceProvider.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/OpenEJBPerRequestPojoResourceProvider.java Thu Aug 7 21:13:12 2014
@@ -225,7 +225,11 @@ public class OpenEJBPerRequestPojoResour
}
}
}
- return method.invoke(ctx, args);
+ try {
+ return method.invoke(ctx, args);
+ } catch (final InvocationTargetException ite) {
+ throw ite.getCause();
+ }
}
}
Modified: tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatJndiBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatJndiBuilder.java?rev=1616596&r1=1616595&r2=1616596&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatJndiBuilder.java (original)
+++ tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatJndiBuilder.java Thu Aug 7 21:13:12 2014
@@ -158,7 +158,7 @@ public class TomcatJndiBuilder {
ContextAccessController.setWritable(name, namingToken);
Context root = null;
try {
- root = (Context) ContextBindings.getClassLoader().lookup("");
+ root = (Context) ContextBindings.getClassLoader();
} catch (final NamingException ignored) { // shouldn't occur
// no-op
}
@@ -629,16 +629,21 @@ public class TomcatJndiBuilder {
return;
}
- ContextResource resource = naming.findResource(ref.referenceName.replaceAll("^comp/env/", ""));
+ final String name = ref.referenceName.replaceAll("^comp/env/", "");
+ if (isOpenEjb(naming, name)) {
+ return;
+ }
+
+ ContextResource resource = naming.findResource(name);
boolean addEntry = false;
if (resource == null) {
resource = new ContextResource();
- resource.setName(ref.referenceName.replaceAll("^comp/env/", ""));
+ resource.setName(name);
addEntry = true;
}
resource.setProperty(Constants.FACTORY, ResourceFactory.class.getName());
- resource.setProperty(NamingUtil.NAME, ref.referenceName.replaceAll("^comp/env/", ""));
+ resource.setProperty(NamingUtil.NAME, name);
resource.setType(ref.referenceType);
resource.setAuth(ref.referenceAuth);
@@ -852,6 +857,11 @@ public class TomcatJndiBuilder {
return wsdlUrl;
}
+ private boolean isOpenEjb(final NamingResourcesImpl naming, final String name) {
+ final ContextResource resource = naming.findResource(name);
+ return resource != null && ResourceFactory.class.getName().equals(resource.getProperty("factory"));
+ }
+
private void setResource(final ContextResource resource, final String name, final Object object) {
NamingUtil.setStaticValue(new Resource(resource), name, object);
}
Modified: tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java?rev=1616596&r1=1616595&r2=1616596&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java (original)
+++ tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java Thu Aug 7 21:13:12 2014
@@ -1560,7 +1560,7 @@ public class TomcatWebAppBuilder impleme
if (currentWebAppInfo != null) {
final WebContext webContext = getContainerSystem().getWebContext(currentWebAppInfo.moduleId);
if (webContext != null) {
- webContext.setJndiEnc(comp);
+ webContext.setJndiEnc(root);
}
try {