JBossWS SVN: r13904 - in stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss: ws/common/main and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-03-18 03:56:41 -0400 (Fri, 18 Mar 2011)
New Revision: 13904
Modified:
stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml
stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/common/main/module.xml
Log:
fixing server side CP
Modified: stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml 2011-03-16 10:25:11 UTC (rev 13903)
+++ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml 2011-03-18 07:56:41 UTC (rev 13904)
@@ -38,8 +38,8 @@
<module name="org.jboss.metadata"/>
<module name="org.jboss.staxmapper"/>
<module name="org.jboss.as.controller"/>
- <module name="org.jboss.as.managed-beans"/>
<module name="org.jboss.as.server"/>
+ <module name="org.jboss.as.ejb3"/>
<module name="org.jboss.as.ee"/>
<module name="org.jboss.as.naming"/>
<module name="org.jboss.as.web"/>
Modified: stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/common/main/module.xml
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/common/main/module.xml 2011-03-16 10:25:11 UTC (rev 13903)
+++ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/common/main/module.xml 2011-03-18 07:56:41 UTC (rev 13904)
@@ -32,6 +32,7 @@
<module name="javax.api"/>
<module name="javax.annotation.api"/>
<module name="javax.ejb.api"/>
+ <module name="javax.jws.api"/>
<module name="javax.servlet.api"/>
<module name="javax.xml.ws.api"/>
<module name="org.jboss.jaxbintros"/>
13 years, 12 months
JBossWS SVN: r13903 - hudson/trunk.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-03-16 06:25:11 -0400 (Wed, 16 Mar 2011)
New Revision: 13903
Modified:
hudson/trunk/ant.properties.example
Log:
sync with AS7 upstream
Modified: hudson/trunk/ant.properties.example
===================================================================
--- hudson/trunk/ant.properties.example 2011-03-16 10:24:12 UTC (rev 13902)
+++ hudson/trunk/ant.properties.example 2011-03-16 10:25:11 UTC (rev 13903)
@@ -26,7 +26,7 @@
hudson.jboss600.rev=HEAD
hudson.jboss700.url=https://github.com/jbossas/jboss-as
-hudson.jboss700.build=jboss-7.0.0.Alpha2
+hudson.jboss700.build=jboss-7.0.0.Beta2
hudson.jboss700.rev=master
hudson.mail.recipients=
13 years, 12 months
JBossWS SVN: r13902 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-03-16 06:24:12 -0400 (Wed, 16 Mar 2011)
New Revision: 13902
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
updating testsuite dependencies
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2011-03-16 10:15:32 UTC (rev 13901)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-03-16 10:24:12 UTC (rev 13902)
@@ -818,7 +818,7 @@
<profile>
<id>jboss700</id>
<properties>
- <jboss.version>7.0.0.Alpha2-SNAPSHOT</jboss.version>
+ <jboss.version>7.0.0.Beta2-SNAPSHOT</jboss.version>
<jbossws.integration.target>jboss700</jbossws.integration.target>
</properties>
<dependencies>
13 years, 12 months
JBossWS SVN: r13901 - stack/native/trunk/modules/testsuite.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-03-16 06:15:32 -0400 (Wed, 16 Mar 2011)
New Revision: 13901
Modified:
stack/native/trunk/modules/testsuite/pom.xml
Log:
updating testsuite dependencies
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2011-03-14 16:18:02 UTC (rev 13900)
+++ stack/native/trunk/modules/testsuite/pom.xml 2011-03-16 10:15:32 UTC (rev 13901)
@@ -656,7 +656,7 @@
<profile>
<id>jboss700</id>
<properties>
- <jboss.version>7.0.0.Alpha2-SNAPSHOT</jboss.version>
+ <jboss.version>7.0.0.Beta2-SNAPSHOT</jboss.version>
<jbossws.integration.target>jboss700</jbossws.integration.target>
<endorsed.dirs>${project.build.directory}/endorsed</endorsed.dirs>
</properties>
13 years, 12 months
JBossWS SVN: r13900 - in stack/cxf/branches/spring-as7/modules: resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main and 3 other directories.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-03-14 12:18:02 -0400 (Mon, 14 Mar 2011)
New Revision: 13900
Modified:
stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/apache/cxf/main/module.xml
stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml
stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml
stack/cxf/branches/spring-as7/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java
stack/cxf/branches/spring-as7/modules/testsuite/pom.xml
Log:
Dealt with most of the ws-security related failures, excluded some tests due to isolated problems
Modified: stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/apache/cxf/main/module.xml
===================================================================
--- stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/apache/cxf/main/module.xml 2011-03-14 11:55:46 UTC (rev 13899)
+++ stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/apache/cxf/main/module.xml 2011-03-14 16:18:02 UTC (rev 13900)
@@ -42,6 +42,8 @@
<module name="org.apache.neethi" />
<module name="org.apache.ws.commons.xmlschema" />
<module name="wsdl4j.wsdl4j" />
+ <module name="org.apache.ws.security" />
+ <module name="org.apache.santuario.xmlsec" />
<module name="org.springframework.spring" optional="true"/>
</dependencies>
</module>
Modified: stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml
===================================================================
--- stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml 2011-03-14 11:55:46 UTC (rev 13899)
+++ stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml 2011-03-14 16:18:02 UTC (rev 13900)
@@ -68,6 +68,15 @@
<module name="org.jboss.as.webservices" services="export" export="true"/>
<module name="com.sun.xml.messaging.saaj" services="export" export="true"/>
<module name="wsdl4j.wsdl4j" export="true"/>
- <module name="org.springframework.spring" optional="true" export="true"/>
+ <module name="org.apache.ws.security" export="true"/>
+ <module name="org.apache.santuario.xmlsec" export="true"/>
+ <module name="org.springframework.spring" optional="true" export="true">
+ <imports>
+ <include path="META-INF"/>
+ </imports>
+ <exports>
+ <include path="META-INF"/>
+ </exports>
+ </module>
</dependencies>
</module>
Modified: stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml
===================================================================
--- stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml 2011-03-14 11:55:46 UTC (rev 13899)
+++ stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml 2011-03-14 16:18:02 UTC (rev 13900)
@@ -55,6 +55,7 @@
<module name="org.jboss.common-core" />
<module name="org.jboss.logging" />
<module name="wsdl4j.wsdl4j" />
+ <module name="org.apache.ws.security" />
<module name="org.springframework.spring" optional="true" />
</dependencies>
</module>
Modified: stack/cxf/branches/spring-as7/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java
===================================================================
--- stack/cxf/branches/spring-as7/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java 2011-03-14 11:55:46 UTC (rev 13899)
+++ stack/cxf/branches/spring-as7/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java 2011-03-14 16:18:02 UTC (rev 13900)
@@ -34,6 +34,7 @@
import org.apache.cxf.resource.ResourceResolver;
import org.apache.cxf.transport.DestinationFactory;
import org.apache.cxf.transport.servlet.ServletTransportFactory;
+import org.apache.ws.security.WSSConfig;
import org.jboss.logging.Logger;
import org.jboss.wsf.spi.binding.BindingCustomization;
import org.jboss.wsf.spi.deployment.Endpoint;
@@ -133,6 +134,20 @@
}
}
}
+ //try early configuration of xmlsec engine through WSS4J to avoid doing this
+ //later when the TCCL won't have visibility over the xmlsec internals
+ try
+ {
+ WSSConfig.getNewInstance();
+ }
+ catch (Exception e)
+ {
+ log.warn("Could not early initialize security engine!");
+ if (log.isTraceEnabled())
+ {
+ log.trace("Error while getting default WSSConfig: ", e);
+ }
+ }
configured = true;
}
Modified: stack/cxf/branches/spring-as7/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/branches/spring-as7/modules/testsuite/pom.xml 2011-03-14 11:55:46 UTC (rev 13899)
+++ stack/cxf/branches/spring-as7/modules/testsuite/pom.xml 2011-03-14 16:18:02 UTC (rev 13900)
@@ -980,6 +980,7 @@
<exclude>org/jboss/test/ws/jaxws/cxf/jbws3060/*EJB3*</exclude>
<exclude>org/jboss/test/ws/jaxws/cxf/logging/**</exclude>
<exclude>org/jboss/test/ws/projectGenerator/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/wsseEJB/WsseEjbTestCase*</exclude>
<!-- # [JBWS-3219] unexpected element 'security-domain' encountered -->
<exclude>org/jboss/test/ws/jaxws/jbws2307/**</exclude>
@@ -1002,6 +1003,7 @@
<!-- # [JBWS-3226] jboss-service.xml not matching AS7 format -->
<exclude>org/jboss/test/ws/jaxws/jbws1854/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/wsseDigest/UsernameDigestTestCase*</exclude>
<!-- # [JBWS-3227] handles config file not found on classpath -->
<exclude>org/jboss/test/ws/jaxws/jbws3034/**</exclude>
@@ -1018,9 +1020,18 @@
<!-- # [JBWS-3234] JNDI over RMI not available on AS7 -->
<exclude>org/jboss/test/ws/jaxws/samples/serviceref/**</exclude>
+
+ <!-- # [JBWS-3248] Unable to lookup AuthenticationManager using JNDI -->
+ <exclude>org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationTestCase*</exclude>
+
+ <!-- # [JBWS-3249] Restore UsernameAuthorizationCustomFileTestCase on AS7 -->
+ <exclude>org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationCustomFileTestCase*</exclude>
<!-- JAXR not available -->
<exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude>
+
+ <!-- @WebServiceRef not implemented yet on AS7 -->
+ <exclude>org/jboss/test/ws/jaxws/cxf/webserviceref/WebServiceRefServletTestCase*</exclude>
<!-- JAXRPC deployments -->
<exclude>org/jboss/test/ws/jaxrpc/**</exclude>
14 years
JBossWS SVN: r13899 - in stack/cxf/trunk/modules: testsuite/cxf-tests/scripts and 5 other directories.
by jbossws-commits@lists.jboss.org
Author: mageshbk(a)jboss.com
Date: 2011-03-14 07:55:46 -0400 (Mon, 14 Mar 2011)
New Revision: 13899
Added:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint/EndpointTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint/HelloWorld.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint/HelloWorldImpl.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint/TestServlet.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/endpoint/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/endpoint/WEB-INF/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/endpoint/WEB-INF/web.xml
Modified:
stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerDestination.java
stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
Log:
[JBWS-3247] - Endpoint TCCL is not updated after the enclosing deployment is redeployed.
Modified: stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerDestination.java
===================================================================
--- stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerDestination.java 2011-03-14 11:16:10 UTC (rev 13898)
+++ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerDestination.java 2011-03-14 11:55:46 UTC (rev 13899)
@@ -102,7 +102,7 @@
{
throw new Fault(e);
}
- engine.addHandler(addr, new Handler(this));
+ engine.addHandler(addr, new Handler(this, Thread.currentThread().getContextClassLoader()));
}
/**
@@ -124,16 +124,21 @@
class Handler extends HttpHandlerImpl implements HttpHandler
{
- public Handler(JAXWSHttpSpiDestination destination)
+ private ClassLoader classLoader;
+
+ public Handler(JAXWSHttpSpiDestination destination, ClassLoader classLoader)
{
super(destination);
+ this.classLoader = classLoader;
}
@Override
public void handle(HttpExchange ex) throws IOException
{
+ ClassLoader origClassLoader = Thread.currentThread().getContextClassLoader();
try
{
+ Thread.currentThread().setContextClassLoader(this.classLoader);
this.handle(new HttpExchangeDelegate(ex));
}
catch (Exception e)
@@ -148,6 +153,10 @@
throw new RuntimeException(e);
}
}
+ finally
+ {
+ Thread.currentThread().setContextClassLoader(origClassLoader);
+ }
}
}
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2011-03-14 11:16:10 UTC (rev 13898)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2011-03-14 11:55:46 UTC (rev 13899)
@@ -70,6 +70,15 @@
</classes>
</war>
+ <!-- jaxws-cxf-endpoint -->
+ <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-endpoint.war"
+ webxml="${tests.output.dir}/test-resources/jaxws/cxf/endpoint/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/cxf/endpoint/TestServlet.class"/>
+ <include name="org/jboss/test/ws/jaxws/cxf/endpoint/HelloWorld*.class"/>
+ </classes>
+ </war>
+
<!-- jaxws-cxf-gzip -->
<war warfile="${tests.output.dir}/test-libs/jaxws-cxf-gzip.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/gzip/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint/EndpointTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint/EndpointTestCase.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint/EndpointTestCase.java 2011-03-14 11:55:46 UTC (rev 13899)
@@ -0,0 +1,70 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.cxf.endpoint;
+
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * @author Magesh Kumar B <mageshbk(a)jboss.com> (C) 2011 Red Hat Inc.
+ */
+public class EndpointTestCase extends JBossWSTest
+{
+ private static String publishURL = "http://" + getServerHost() + ":18080/HelloWorldService";
+
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(EndpointTestCase.class, "");
+ }
+
+ public void testClassLoader() throws Exception
+ {
+ deploy("jaxws-cxf-endpoint.war");
+ HelloWorld port = this.getProxy(publishURL);
+ String classLoader1 = port.getClassLoader();
+ String deploymentClassLoader1 = port.getDeploymentClassLoader();
+ undeploy("jaxws-cxf-endpoint.war");
+ assertEquals(classLoader1, deploymentClassLoader1);
+ deploy("jaxws-cxf-endpoint.war");
+ port = this.getProxy(publishURL);
+ String classLoader2 = port.getClassLoader();
+ String deploymentClassLoader2 = port.getDeploymentClassLoader();
+ undeploy("jaxws-cxf-endpoint.war");
+ assertEquals(classLoader2, deploymentClassLoader2);
+ assertFalse(classLoader1.equals(classLoader2));
+ }
+
+ private HelloWorld getProxy(String publishURL) throws Exception
+ {
+ URL wsdlURL = new URL(publishURL + "?wsdl");
+ QName qname = new QName("http://org.jboss.ws/jaxws/cxf/endpoint", "HelloWorldService");
+ Service service = Service.create(wsdlURL, qname);
+ return (HelloWorld)service.getPort(HelloWorld.class);
+ }
+}
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint/HelloWorld.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint/HelloWorld.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint/HelloWorld.java 2011-03-14 11:55:46 UTC (rev 13899)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.cxf.endpoint;
+
+import javax.jws.WebService;
+
+@WebService(targetNamespace = "http://org.jboss.ws/jaxws/cxf/endpoint")
+public interface HelloWorld
+{
+ String getClassLoader();
+
+ String getDeploymentClassLoader();
+}
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint/HelloWorldImpl.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint/HelloWorldImpl.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint/HelloWorldImpl.java 2011-03-14 11:55:46 UTC (rev 13899)
@@ -0,0 +1,51 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.cxf.endpoint;
+
+import javax.jws.WebService;
+
+
+@WebService
+(
+ serviceName = "HelloWorldService",
+ endpointInterface = "org.jboss.test.ws.jaxws.cxf.endpoint.HelloWorld",
+ targetNamespace = "http://org.jboss.ws/jaxws/cxf/endpoint"
+)
+public class HelloWorldImpl implements HelloWorld
+{
+ private ClassLoader _deploymentClassLoader;
+
+ public HelloWorldImpl(ClassLoader classloader)
+ {
+ _deploymentClassLoader = classloader;
+ }
+
+ public String getClassLoader()
+ {
+ return Thread.currentThread().getContextClassLoader().toString();
+ }
+
+ public String getDeploymentClassLoader()
+ {
+ return _deploymentClassLoader.toString();
+ }
+}
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint/TestServlet.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint/TestServlet.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint/TestServlet.java 2011-03-14 11:55:46 UTC (rev 13899)
@@ -0,0 +1,51 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.cxf.endpoint;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.xml.ws.Endpoint;
+
+/**
+ * @author Magesh Kumar B <mageshbk(a)jboss.com> (C) 2011 Red Hat Inc.
+ */
+public class TestServlet extends HttpServlet
+{
+ private Endpoint _endpoint;
+
+ @Override
+ public void init(ServletConfig config) throws ServletException
+ {
+ String serviceURL = "http://localhost:18080/HelloWorldService";
+ _endpoint = Endpoint.publish(serviceURL, new HelloWorldImpl(Thread.currentThread().getContextClassLoader()));
+ }
+
+ @Override
+ public void destroy()
+ {
+ _endpoint.stop();
+ }
+
+}
\ No newline at end of file
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/endpoint/WEB-INF/web.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/endpoint/WEB-INF/web.xml (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/endpoint/WEB-INF/web.xml 2011-03-14 11:55:46 UTC (rev 13899)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/j2ee/web-app_2_5.xsd">
+
+ <servlet>
+ <servlet-name>TestServlet</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.cxf.endpoint.TestServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>TestServlet</servlet-name>
+ <url-pattern>/TestServlet</url-pattern>
+ </servlet-mapping>
+</web-app>
\ No newline at end of file
14 years
JBossWS SVN: r13898 - stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-03-14 07:16:10 -0400 (Mon, 14 Mar 2011)
New Revision: 13898
Modified:
stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml
Log:
svn merge -r 13889:13890 https://svn.jboss.org/repos/jbossws/stack/cxf/trunk .
Modified: stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml
===================================================================
--- stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml 2011-03-14 10:53:14 UTC (rev 13897)
+++ stack/cxf/branches/spring-as7/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml 2011-03-14 11:16:10 UTC (rev 13898)
@@ -39,6 +39,7 @@
<module name="org.jboss.as.managed-beans"/>
<module name="org.jboss.as.server"/>
<module name="org.jboss.as.ee"/>
+ <module name="org.jboss.as.naming"/>
<module name="org.jboss.as.web"/>
<module name="org.jboss.threads"/>
<module name="org.jboss.modules"/>
14 years
JBossWS SVN: r13897 - stack/native/trunk/modules/testsuite.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-03-14 06:53:14 -0400 (Mon, 14 Mar 2011)
New Revision: 13897
Modified:
stack/native/trunk/modules/testsuite/pom.xml
Log:
splitting DD vs. Annotation driven EJB3 tests excludes
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2011-03-14 10:32:37 UTC (rev 13896)
+++ stack/native/trunk/modules/testsuite/pom.xml 2011-03-14 10:53:14 UTC (rev 13897)
@@ -759,9 +759,8 @@
<exclude>org/jboss/test/ws/jaxws/samples/webservicerefsec/**</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/securityDomain/**</exclude>
- <!-- EJB3 endpoint deployments -->
+ <!-- EJB3 Ann driven deployments -->
<exclude>org/jboss/test/ws/jaxws/jbws771/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1309/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1283/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1422/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1446/**</exclude>
@@ -776,7 +775,6 @@
<exclude>org/jboss/test/ws/jaxws/jbws1813/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1815/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1822/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1841/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1845/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1850/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1872/**</exclude>
@@ -785,12 +783,9 @@
<exclude>org/jboss/test/ws/jaxws/jbws1969/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1991/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2000/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws2011/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2014/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws2074/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2116/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2166/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws2182/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2183/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2218/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2221/**</exclude>
@@ -799,15 +794,22 @@
<exclude>org/jboss/test/ws/jaxws/jbws2437/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2449/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2565/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws2701/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws2934/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws3026/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws3182/**</exclude>
+
+ <!-- EJB3 DD driven deployments -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1309/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1841/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws2011/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws2074/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws2182/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2630/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2634/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws2701/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws2934/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2937/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2957/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2999/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws3026/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws3182/**</exclude>
<exclude>org/jboss/test/ws/jaxws/benchmark/**</exclude>
<exclude>org/jboss/test/ws/jaxws/epr/EndpointReferenceTestCase*</exclude>
<exclude>org/jboss/test/ws/jaxws/endpointReference/**</exclude>
14 years
JBossWS SVN: r13896 - stack/native/trunk/modules/testsuite.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-03-14 06:32:37 -0400 (Mon, 14 Mar 2011)
New Revision: 13896
Modified:
stack/native/trunk/modules/testsuite/pom.xml
Log:
removing CXF tests exclusion from native
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2011-03-14 08:52:47 UTC (rev 13895)
+++ stack/native/trunk/modules/testsuite/pom.xml 2011-03-14 10:32:37 UTC (rev 13896)
@@ -822,12 +822,6 @@
<exclude>org/jboss/test/ws/jaxws/samples/webservice/**/*EJB3TestCase*</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**/*EJB3TestCase*</exclude>
<exclude>org/jboss/test/ws/management/recording/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/cxf/bus/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/cxf/gzip/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/cxf/jaxbintros/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/cxf/jbws3060/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/cxf/jbws3098/ClientServerLifeCycleTestCase*</exclude>
- <exclude>org/jboss/test/ws/jaxws/cxf/logging/**</exclude>
<!-- # [JBWS-3219] unexpected element 'security-domain' encountered -->
<exclude>org/jboss/test/ws/jaxws/jbws2307/**</exclude>
14 years
JBossWS SVN: r13895 - in stack/native: tags and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-03-14 04:52:47 -0400 (Mon, 14 Mar 2011)
New Revision: 13895
Added:
stack/native/tags/jbossws-native-3.4.1.SP1/
Removed:
stack/native/branches/jbossws-native-3.4.1.SP1/
Log:
Tagging jbossws-native-3.4.1.SP1
14 years