Repository: tomee Updated Branches: refs/heads/master 79b4b4752 -> 55089e1ad
few more debug dependencies + pojo webservices was not working anymore cause of a tomcat change + fixing style again Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/55089e1a Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/55089e1a Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/55089e1a Branch: refs/heads/master Commit: 55089e1ad530b397f957810f43787f84e52f44f9 Parents: 79b4b47 Author: Romain Manni-Bucau <[email protected]> Authored: Mon Mar 23 09:10:30 2015 +0100 Committer: Romain Manni-Bucau <[email protected]> Committed: Mon Mar 23 09:10:30 2015 +0100 ---------------------------------------------------------------------- .../openejb/assembler/classic/Assembler.java | 1 - tck/cdi-tomee/pom.xml | 22 ++++++++++++++++++-- tck/cdi-tomee/src/test/resources/failing.xml | 4 ++-- .../tomee/webservices/TomcatWsRegistry.java | 10 ++++++--- 4 files changed, 29 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/55089e1a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java index 0379fed..b25e70a 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java @@ -198,7 +198,6 @@ import java.io.InputStream; import java.io.InvalidObjectException; import java.io.ObjectStreamException; import java.io.Serializable; -import java.lang.annotation.Annotation; import java.lang.instrument.ClassFileTransformer; import java.lang.instrument.Instrumentation; import java.lang.reflect.Constructor; http://git-wip-us.apache.org/repos/asf/tomee/blob/55089e1a/tck/cdi-tomee/pom.xml ---------------------------------------------------------------------- diff --git a/tck/cdi-tomee/pom.xml b/tck/cdi-tomee/pom.xml index dd1cbe9..ba4345a 100644 --- a/tck/cdi-tomee/pom.xml +++ b/tck/cdi-tomee/pom.xml @@ -122,7 +122,7 @@ </exclusions> </dependency> - <!-- debugging --> + <!-- debugging: said otherwise you can remove them, kept to ease future debugging if needed --> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-jcs-jcache</artifactId> @@ -136,6 +136,18 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.apache.openejb</groupId> + <artifactId>tomee-webservices</artifactId> + <version>${tomee.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.openejb</groupId> + <artifactId>tomee-jaxrs</artifactId> + <version>${tomee.version}</version> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.apache.tomcat</groupId> <artifactId>tomcat-catalina</artifactId> <version>${tomcat.version}</version> @@ -143,7 +155,13 @@ </dependency> <dependency> <groupId>org.apache.openejb</groupId> - <artifactId>openejb-http</artifactId> + <artifactId>openejb-cxf</artifactId> + <version>${openejb.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.openejb</groupId> + <artifactId>openejb-cxf-rs</artifactId> <version>${openejb.version}</version> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/tomee/blob/55089e1a/tck/cdi-tomee/src/test/resources/failing.xml ---------------------------------------------------------------------- diff --git a/tck/cdi-tomee/src/test/resources/failing.xml b/tck/cdi-tomee/src/test/resources/failing.xml index 00ac1f6..6ec10c3 100644 --- a/tck/cdi-tomee/src/test/resources/failing.xml +++ b/tck/cdi-tomee/src/test/resources/failing.xml @@ -17,13 +17,13 @@ --> <suite name="CDI TCK" verbose="0"> <!-- - Before any run execute: + Before any (IDE) run execute: $ mvn test-compile --> <test name="CDI TCK for developers (debugging)"> <classes> - <class name="org.jboss.cdi.tck.tests.implementation.simple.resource.broken.type.env.ResourceDefinitionWithDifferentTypeTest" /> + <class name="org.jboss.cdi.tck.tests.context.request.ws.RequestContextTest" /> </classes> </test> </suite> http://git-wip-us.apache.org/repos/asf/tomee/blob/55089e1a/tomee/tomee-webservices/src/main/java/org/apache/tomee/webservices/TomcatWsRegistry.java ---------------------------------------------------------------------- diff --git a/tomee/tomee-webservices/src/main/java/org/apache/tomee/webservices/TomcatWsRegistry.java b/tomee/tomee-webservices/src/main/java/org/apache/tomee/webservices/TomcatWsRegistry.java index 22b1ee6..3d904d8 100644 --- a/tomee/tomee-webservices/src/main/java/org/apache/tomee/webservices/TomcatWsRegistry.java +++ b/tomee/tomee-webservices/src/main/java/org/apache/tomee/webservices/TomcatWsRegistry.java @@ -30,12 +30,14 @@ import org.apache.catalina.authenticator.SSLAuthenticator; import org.apache.catalina.connector.Connector; import org.apache.catalina.core.StandardContext; import org.apache.catalina.core.StandardServer; +import org.apache.catalina.core.StandardWrapper; import org.apache.openejb.assembler.classic.ServletInfo; import org.apache.openejb.assembler.classic.WebAppBuilder; import org.apache.openejb.loader.SystemInstance; import org.apache.openejb.server.httpd.HttpListener; import org.apache.openejb.server.webservices.WsRegistry; import org.apache.openejb.server.webservices.WsServlet; +import org.apache.openejb.util.reflection.Reflections; import org.apache.tomcat.util.descriptor.web.LoginConfig; import org.apache.tomcat.util.descriptor.web.SecurityCollection; import org.apache.tomcat.util.descriptor.web.SecurityConstraint; @@ -123,8 +125,10 @@ public class TomcatWsRegistry implements WsRegistry { // by the WsServler class wrapper.setServletClass(WsServlet.class.getName()); if (wrapper.getServlet() != null) { - wrapper.load(); - wrapper.unload(); + wrapper.unload(); // deallocate previous one + wrapper.load(); // reload this one withuot unloading it to keep the instance - unload is called during stop() + // boolean controlling this method call can't be set to false through API so let do it ourself + wrapper.getServlet().init(StandardWrapper.class.cast(wrapper)); // or Reflections.set(wrapper, "instanceInitialized", false); } setWsContainer(context, wrapper, httpListener); @@ -133,7 +137,7 @@ public class TomcatWsRegistry implements WsRegistry { final List<String> addresses = new ArrayList<String>(); for (final Connector connector : connectors) { for (final String mapping : wrapper.findMappings()) { - final URI address = new URI(connector.getScheme(), null, host.getName(), connector.getPort(), "/" + contextRoot + mapping, null, null); + final URI address = new URI(connector.getScheme(), null, host.getName(), connector.getPort(), (contextRoot.startsWith("/") ? "" : "/") + contextRoot + mapping, null, null); addresses.add(address.toString()); } }
