JBossWS SVN: r13965 - stack/cxf/branches/jbossws-cxf-4.0.0.Alpha3/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-03-30 04:51:29 -0400 (Wed, 30 Mar 2011)
New Revision: 13965
Modified:
stack/cxf/branches/jbossws-cxf-4.0.0.Alpha3/modules/testsuite/pom.xml
Log:
Enabling passing ejb3 tests
Modified: stack/cxf/branches/jbossws-cxf-4.0.0.Alpha3/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.0.Alpha3/modules/testsuite/pom.xml 2011-03-29 20:08:33 UTC (rev 13964)
+++ stack/cxf/branches/jbossws-cxf-4.0.0.Alpha3/modules/testsuite/pom.xml 2011-03-30 08:51:29 UTC (rev 13965)
@@ -930,33 +930,23 @@
<!-- EJB3 endpoint deployments -->
<exclude>org/jboss/test/ws/jaxws/jbws1283/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1422/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1446/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1505/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1556/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1566/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1581/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1665/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1694/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1799/**</exclude>
<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/jbws1872/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1904/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1969/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws2000/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2074/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws2183/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2218/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2241/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2257/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws2449/**</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>
13 years, 4 months
JBossWS SVN: r13964 - hudson/branches/jbossws-cxf-4.0.0.Alpha3.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-03-29 16:08:33 -0400 (Tue, 29 Mar 2011)
New Revision: 13964
Modified:
hudson/branches/jbossws-cxf-4.0.0.Alpha3/pom.xml
Log:
Updating pom.xml
Modified: hudson/branches/jbossws-cxf-4.0.0.Alpha3/pom.xml
===================================================================
--- hudson/branches/jbossws-cxf-4.0.0.Alpha3/pom.xml 2011-03-29 20:05:55 UTC (rev 13963)
+++ hudson/branches/jbossws-cxf-4.0.0.Alpha3/pom.xml 2011-03-29 20:08:33 UTC (rev 13964)
@@ -20,7 +20,7 @@
<artifactId>jbossws-hudson</artifactId>
<packaging>pom</packaging>
<description>JBossWS Hudson Integration</description>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0Alpha3</version>
<!-- Parent -->
<parent>
13 years, 4 months
JBossWS SVN: r13963 - hudson/branches/jbossws-cxf-4.0.0.Alpha3.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-03-29 16:05:55 -0400 (Tue, 29 Mar 2011)
New Revision: 13963
Modified:
hudson/branches/jbossws-cxf-4.0.0.Alpha3/ant.properties.example
Log:
Updating ant.properties.example
Modified: hudson/branches/jbossws-cxf-4.0.0.Alpha3/ant.properties.example
===================================================================
--- hudson/branches/jbossws-cxf-4.0.0.Alpha3/ant.properties.example 2011-03-29 20:04:38 UTC (rev 13962)
+++ hudson/branches/jbossws-cxf-4.0.0.Alpha3/ant.properties.example 2011-03-29 20:05:55 UTC (rev 13963)
@@ -19,15 +19,15 @@
hudson.http.port=8180
hudson.native.url=http://anonsvn.jboss.org/repos/jbossws/stack/native/trunk
-hudson.cxf.url=http://anonsvn.jboss.org/repos/jbossws/stack/cxf/trunk
+hudson.cxf.url=http://anonsvn.jboss.org/repos/jbossws/stack/cxf/branches/jbossws-cxf-4.0.0.Alpha3
hudson.jboss600.url=http://anonsvn.jboss.org/repos/jbossas/tags/6.0.0.Final
hudson.jboss600.build=jboss-6.0.0.Final
hudson.jboss600.rev=HEAD
-hudson.jboss700.url=https://github.com/jbossas/jboss-as
+hudson.jboss700.url=https://github.com/asoldano/jboss-as
hudson.jboss700.build=jboss-7.0.0.Beta2
-hudson.jboss700.rev=master
+hudson.jboss700.rev=wsintegration
hudson.mail.recipients=
hudson.smtp.host=localhost
13 years, 4 months
JBossWS SVN: r13962 - hudson/branches.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-03-29 16:04:38 -0400 (Tue, 29 Mar 2011)
New Revision: 13962
Added:
hudson/branches/jbossws-cxf-4.0.0.Alpha3/
Log:
Branching for testing jbossws-cxf-4.0.0.Alpha3 against asoldano/wsintegration github fork
13 years, 4 months
JBossWS SVN: r13961 - in stack/cxf/branches/jbossws-cxf-4.0.0.Alpha3/modules/resources/src/main/resources/modules/org: jboss/as/webservices/main and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-03-29 16:00:29 -0400 (Tue, 29 Mar 2011)
New Revision: 13961
Modified:
stack/cxf/branches/jbossws-cxf-4.0.0.Alpha3/modules/resources/src/main/resources/modules/org/apache/cxf/main/module.xml
stack/cxf/branches/jbossws-cxf-4.0.0.Alpha3/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml
stack/cxf/branches/jbossws-cxf-4.0.0.Alpha3/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml
stack/cxf/branches/jbossws-cxf-4.0.0.Alpha3/modules/resources/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml
stack/cxf/branches/jbossws-cxf-4.0.0.Alpha3/modules/resources/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main/module.xml
stack/cxf/branches/jbossws-cxf-4.0.0.Alpha3/modules/resources/src/main/resources/modules/org/jboss/ws/jaxws-client/main/module.xml
Log:
Restore optional spring dependencies in modules
Modified: stack/cxf/branches/jbossws-cxf-4.0.0.Alpha3/modules/resources/src/main/resources/modules/org/apache/cxf/main/module.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.0.Alpha3/modules/resources/src/main/resources/modules/org/apache/cxf/main/module.xml 2011-03-29 19:57:08 UTC (rev 13960)
+++ stack/cxf/branches/jbossws-cxf-4.0.0.Alpha3/modules/resources/src/main/resources/modules/org/apache/cxf/main/module.xml 2011-03-29 20:00:29 UTC (rev 13961)
@@ -44,6 +44,6 @@
<module name="org.apache.ws.commons.xmlschema" />
<module name="org.apache.ws.security" />
<module name="org.apache.santuario.xmlsec" />
-<!-- <module name="org.springframework.spring" optional="true"/> -->
+ <module name="org.springframework.spring" optional="true"/>
</dependencies>
</module>
Modified: stack/cxf/branches/jbossws-cxf-4.0.0.Alpha3/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.0.Alpha3/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml 2011-03-29 19:57:08 UTC (rev 13960)
+++ stack/cxf/branches/jbossws-cxf-4.0.0.Alpha3/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml 2011-03-29 20:00:29 UTC (rev 13961)
@@ -53,6 +53,6 @@
<module name="org.jboss.ws.jaxws-client" services="import"/>
<module name="org.jboss.ws.cxf.jbossws-cxf-server" services="import"/>
<module name="org.jboss.ws.spi" />
-<!-- <module name="org.springframework.spring" optional="true" /> -->
+ <module name="org.springframework.spring" optional="true" />
</dependencies>
</module>
Modified: stack/cxf/branches/jbossws-cxf-4.0.0.Alpha3/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.0.Alpha3/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml 2011-03-29 19:57:08 UTC (rev 13960)
+++ stack/cxf/branches/jbossws-cxf-4.0.0.Alpha3/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml 2011-03-29 20:00:29 UTC (rev 13961)
@@ -71,13 +71,13 @@
<module name="com.sun.xml.messaging.saaj" services="export" 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">
+ <module name="org.springframework.spring" optional="true" export="true">
<imports>
<include path="META-INF"/>
</imports>
<exports>
<include path="META-INF"/>
</exports>
- </module> -->
+ </module>
</dependencies>
</module>
Modified: stack/cxf/branches/jbossws-cxf-4.0.0.Alpha3/modules/resources/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.0.Alpha3/modules/resources/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml 2011-03-29 19:57:08 UTC (rev 13960)
+++ stack/cxf/branches/jbossws-cxf-4.0.0.Alpha3/modules/resources/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml 2011-03-29 20:00:29 UTC (rev 13961)
@@ -56,6 +56,6 @@
<module name="org.jboss.common-core" />
<module name="org.jboss.logging" />
<module name="org.apache.ws.security" />
-<!-- <module name="org.springframework.spring" optional="true" /> -->
+ <module name="org.springframework.spring" optional="true" />
</dependencies>
</module>
Modified: stack/cxf/branches/jbossws-cxf-4.0.0.Alpha3/modules/resources/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main/module.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.0.Alpha3/modules/resources/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main/module.xml 2011-03-29 19:57:08 UTC (rev 13960)
+++ stack/cxf/branches/jbossws-cxf-4.0.0.Alpha3/modules/resources/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main/module.xml 2011-03-29 20:00:29 UTC (rev 13961)
@@ -37,7 +37,7 @@
<module name="org.apache.cxf" services="import">
<imports>
<include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
- <include path="META-INF/spring.*"/>
+ <include path="META-INF/"/>
</imports>
</module>
<module name="com.sun.httpserver"/>
Modified: stack/cxf/branches/jbossws-cxf-4.0.0.Alpha3/modules/resources/src/main/resources/modules/org/jboss/ws/jaxws-client/main/module.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.0.Alpha3/modules/resources/src/main/resources/modules/org/jboss/ws/jaxws-client/main/module.xml 2011-03-29 19:57:08 UTC (rev 13960)
+++ stack/cxf/branches/jbossws-cxf-4.0.0.Alpha3/modules/resources/src/main/resources/modules/org/jboss/ws/jaxws-client/main/module.xml 2011-03-29 20:00:29 UTC (rev 13961)
@@ -51,6 +51,6 @@
</module>
<module name="org.apache.neethi" />
<module name="org.jboss.logging" />
-<!-- <module name="org.springframework.spring" optional="true" /> -->
+ <module name="org.springframework.spring" optional="true" />
</dependencies>
</module>
13 years, 4 months
JBossWS SVN: r13960 - stack/cxf/branches.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-03-29 15:57:08 -0400 (Tue, 29 Mar 2011)
New Revision: 13960
Added:
stack/cxf/branches/jbossws-cxf-4.0.0.Alpha3/
Log:
Branching for jbossws-cxf-4.0.0.Alpha3 release
13 years, 4 months
JBossWS SVN: r13959 - stack/cxf/branches.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-03-29 15:55:08 -0400 (Tue, 29 Mar 2011)
New Revision: 13959
Removed:
stack/cxf/branches/spring-as7/
Log:
Removing spring-as7 branch
13 years, 4 months
JBossWS SVN: r13958 - stack/native/trunk/modules/dist.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-03-29 13:45:55 -0400 (Tue, 29 Mar 2011)
New Revision: 13958
Modified:
stack/native/trunk/modules/dist/pom.xml
Log:
[JBWS-3210] Generate exclude files for bin-dist
Modified: stack/native/trunk/modules/dist/pom.xml
===================================================================
--- stack/native/trunk/modules/dist/pom.xml 2011-03-29 17:29:43 UTC (rev 13957)
+++ stack/native/trunk/modules/dist/pom.xml 2011-03-29 17:45:55 UTC (rev 13958)
@@ -159,6 +159,11 @@
out="${basedir}/target/exclude-file/test-excludes-jboss601.txt">
<param name="targetName" expression="jboss601" />
</xslt>
+ <xslt style="${basedir}/src/main/distro/test-exclude.xsl"
+ in="../testsuite/pom.xml"
+ out="${basedir}/target/exclude-file/test-excludes-jboss700.txt">
+ <param name="targetName" expression="jboss700" />
+ </xslt>
</tasks>
</configuration>
<goals>
13 years, 4 months
JBossWS SVN: r13957 - stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-03-29 13:29:43 -0400 (Tue, 29 Mar 2011)
New Revision: 13957
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/ServletClient.java
Log:
Commenting out usage of @WebServiceRef which is not working yet on AS7 and restoring erroneously commented subtests
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/ServletClient.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/ServletClient.java 2011-03-29 16:58:17 UTC (rev 13956)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/ServletClient.java 2011-03-29 17:29:43 UTC (rev 13957)
@@ -42,8 +42,8 @@
{
private static final long serialVersionUID = 1L;
- @WebServiceRef(value = EndpointService.class, type = Endpoint.class, wsdlLocation = "WEB-INF/wsdl/Endpoint.wsdl")
- public Endpoint port;
+// @WebServiceRef(value = EndpointService.class, type = Endpoint.class, wsdlLocation = "WEB-INF/wsdl/Endpoint.wsdl")
+// public Endpoint port;
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException
@@ -82,24 +82,25 @@
throw new IOException(e);
}
}
-
+
public void testBusCreation() throws BusTestException
{
-// AbstractClient.testBusCreation();
+ AbstractClient.testBusCreation();
}
-
+
public void testSOAPConnection(String host) throws BusTestException, Exception
{
AbstractClient.testSOAPConnection(host);
}
-
+
public void testWebServiceRef() throws BusTestException
{
+ System.out.println("FIXME: @WebServiceRef not working yet on AS7");
// AbstractClient.testWebServiceRef(port);
}
-
+
public void testWebServiceClient(String host) throws BusTestException, Exception
{
-// AbstractClient.testWebServiceClient(host);
+ AbstractClient.testWebServiceClient(host);
}
}
13 years, 4 months
JBossWS SVN: r13956 - stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-03-29 12:58:17 -0400 (Tue, 29 Mar 2011)
New Revision: 13956
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint/HelloWorldImpl.java
Log:
[JBWS-3247] Fixing testcase to run on AS7 (due to JBWS-3223)
Modified: 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 2011-03-29 16:12:23 UTC (rev 13955)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint/HelloWorldImpl.java 2011-03-29 16:58:17 UTC (rev 13956)
@@ -23,29 +23,29 @@
import javax.jws.WebService;
-
-@WebService
-(
- serviceName = "HelloWorldService",
- endpointInterface = "org.jboss.test.ws.jaxws.cxf.endpoint.HelloWorld",
- targetNamespace = "http://org.jboss.ws/jaxws/cxf/endpoint"
-)
+@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;
+ private ClassLoader _deploymentClassLoader;
- public HelloWorldImpl(ClassLoader classloader)
- {
- _deploymentClassLoader = classloader;
- }
+ public HelloWorldImpl(ClassLoader classloader)
+ {
+ _deploymentClassLoader = classloader;
+ }
- public String getClassLoader()
- {
- return Thread.currentThread().getContextClassLoader().toString();
- }
+ public String getClassLoader()
+ {
+ ClassLoader cl = Thread.currentThread().getContextClassLoader();
+ //JBWS-3223
+ //use check on class to avoid dependency declaration in MANIFEST for AS7
+ if (cl.getClass().getName().equals("org.jboss.wsf.stack.cxf.client.util.DelegateClassLoader")) {
+ cl = cl.getParent();
+ }
+ return cl.toString() + cl.hashCode();
+ }
- public String getDeploymentClassLoader()
- {
- return _deploymentClassLoader.toString();
- }
+ public String getDeploymentClassLoader()
+ {
+ return _deploymentClassLoader.toString() + _deploymentClassLoader.hashCode();
+ }
}
13 years, 4 months