Modified: cxf/trunk/systests/ws-specs/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-specs/pom.xml?rev=979132&r1=979131&r2=979132&view=diff ============================================================================== --- cxf/trunk/systests/ws-specs/pom.xml (original) +++ cxf/trunk/systests/ws-specs/pom.xml Mon Jul 26 01:43:35 2010 @@ -79,8 +79,8 @@ </build> <dependencies> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-servlet_2.5_spec</artifactId> + <groupId>${servlet-api.group}</groupId> + <artifactId>${servlet-api.artifact}</artifactId> </dependency> <dependency> <groupId>org.apache.cxf</groupId>
Modified: cxf/trunk/tools/wsdlto/test/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/test/pom.xml?rev=979132&r1=979131&r2=979132&view=diff ============================================================================== --- cxf/trunk/tools/wsdlto/test/pom.xml (original) +++ cxf/trunk/tools/wsdlto/test/pom.xml Mon Jul 26 01:43:35 2010 @@ -75,14 +75,14 @@ </dependency> <dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty</artifactId> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> <version>${jetty.version}</version> <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-servlet_2.5_spec</artifactId> + <groupId>${servlet-api.group}</groupId> + <artifactId>${servlet-api.artifact}</artifactId> <scope>test</scope> </dependency> Modified: cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java?rev=979132&r1=979131&r2=979132&view=diff ============================================================================== --- cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java (original) +++ cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java Mon Jul 26 01:43:35 2010 @@ -43,10 +43,11 @@ import org.apache.cxf.tools.wsdlto.WSDLT import org.apache.cxf.tools.wsdlto.frontend.jaxws.validator.UniqueBodyValidator; import org.apache.cxf.wsdl11.WSDLRuntimeException; +import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.server.handler.ResourceHandler; + import org.junit.Test; -import org.mortbay.jetty.Server; -import org.mortbay.jetty.handler.ResourceHandler; public class CodeGenBugTest extends AbstractCodeGenTest { @@ -464,7 +465,8 @@ public class CodeGenBugTest extends Abst ResourceHandler reshandler = new ResourceHandler(); reshandler.setResourceBase(getLocation("/wsdl2java_wsdl/")); - server.addHandler(reshandler); + // this is the only handler we're supposed to need, so we don't need to 'add' it. + server.setHandler(reshandler); server.start(); env.put(ToolConstants.CFG_WSDLURL, "http://localhost:8585/hello_world.wsdl";); env.put(ToolConstants.CFG_BINDING, "http://localhost:8585/remote-hello_world_binding.xsd";);
