JBossWS SVN: r7231 - container/jboss50/branches/jbossws-jboss500.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-05-30 06:59:18 -0400 (Fri, 30 May 2008)
New Revision: 7231
Modified:
container/jboss50/branches/jbossws-jboss500/pom.xml
Log:
Cleanup dependencies
Modified: container/jboss50/branches/jbossws-jboss500/pom.xml
===================================================================
--- container/jboss50/branches/jbossws-jboss500/pom.xml 2008-05-30 10:08:18 UTC (rev 7230)
+++ container/jboss50/branches/jbossws-jboss500/pom.xml 2008-05-30 10:59:18 UTC (rev 7231)
@@ -28,26 +28,31 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-server</artifactId>
- <version>5.0.0.Beta4</version>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-spi</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-metadata</artifactId>
- <version>5.0.0.Beta4</version>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-common</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
</dependency>
<dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-framework</artifactId>
+ <version>3.0.2-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-vfs</artifactId>
<version>2.0.0.Beta9</version>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- <version>2.2.3.GA</version>
+ <artifactId>jbossxb</artifactId>
+ <version>2.0.0.CR5</version>
</dependency>
-
<dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-ejb3</artifactId>
@@ -63,91 +68,26 @@
<artifactId>jboss-as-ejb3-core</artifactId>
<version>0.1.2.Beta1</version>
</dependency>
-
<dependency>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop</artifactId>
- <version>2.0.0.CR7</version>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-server</artifactId>
+ <version>5.0.0.Beta4</version>
</dependency>
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-common-logging-spi</artifactId>
- <version>2.0.2.GA</version>
- </dependency>
- <dependency>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
- <version>1.6.1-brew</version>
- </dependency>
- <dependency>
- <groupId>jboss.jbossws</groupId>
- <artifactId>jboss-jaxrpc</artifactId>
- <version>2.0.3.GA</version>
- </dependency>
- <dependency>
<groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-j2se</artifactId>
+ <artifactId>jboss-metadata</artifactId>
<version>5.0.0.Beta4</version>
</dependency>
-
<dependency>
- <groupId>jboss.jbossws</groupId>
- <artifactId>jboss-jaxws</artifactId>
- <version>2.0.3.GA</version>
- </dependency>
- <dependency>
- <groupId>jboss.jbossws</groupId>
- <artifactId>jboss-saaj</artifactId>
- <version>2.0.3.GA</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-spi</artifactId>
- <version>3.0.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-common</artifactId>
- <version>3.0.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-framework</artifactId>
- <version>3.0.2-SNAPSHOT</version>
- </dependency>
-
- <dependency>
<groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-deployers-spi</artifactId>
- <version>2.0.0.Beta10</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-deployers-structure-spi</artifactId>
<version>2.0.0.Beta10</version>
</dependency>
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-deployers-client-spi</artifactId>
- <version>2.0.0.Beta10</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-deployers-core-spi</artifactId>
- <version>2.0.0.Beta10</version>
- </dependency>
-
- <dependency>
<groupId>org.jboss.security</groupId>
<artifactId>jbosssx-client</artifactId>
<version>2.0.2.Beta4</version>
</dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-deployers-vfs-spi</artifactId>
- <version>2.0.0.Beta10</version>
- </dependency>
</dependencies>
</dependencyManagement>
@@ -158,49 +98,68 @@
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-common</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-spi</artifactId>
+ <scope>provided</scope>
</dependency>
+ <!-- FIXME: container integration should not have a dependency on framework -->
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-framework</artifactId>
+ <scope>provided</scope>
+ </dependency>
- <!-- jboss provided dependencies -->
+ <!-- JBoss provided dependencies -->
<dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-server</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-metadata</artifactId>
- </dependency>
- <dependency>
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-deployers-structure-spi</artifactId>
<scope>provided</scope>
</dependency>
+
+ <!-- Transitive compile dependencies -->
<dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-vfs</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossxb</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-ejb3</artifactId>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-ejb3-ext-API</artifactId>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-ejb3-core</artifactId>
+ <scope>compile</scope>
</dependency>
<dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-metadata</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
<groupId>org.jboss.security</groupId>
<artifactId>jbosssx-client</artifactId>
+ <scope>compile</scope>
</dependency>
-
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-framework</artifactId>
- </dependency>
-
</dependencies>
<!-- Plugins -->
16 years, 7 months
JBossWS SVN: r7230 - stack/native/trunk/src/main/scripts.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-05-30 06:08:18 -0400 (Fri, 30 May 2008)
New Revision: 7230
Modified:
stack/native/trunk/src/main/scripts/assembly-bin-dist.xml
Log:
fix native distro build
Modified: stack/native/trunk/src/main/scripts/assembly-bin-dist.xml
===================================================================
--- stack/native/trunk/src/main/scripts/assembly-bin-dist.xml 2008-05-30 09:41:07 UTC (rev 7229)
+++ stack/native/trunk/src/main/scripts/assembly-bin-dist.xml 2008-05-30 10:08:18 UTC (rev 7230)
@@ -76,7 +76,7 @@
<dependencySet>
<outputDirectory>tests</outputDirectory>
<useStrictFiltering>true</useStrictFiltering>
- <scope>provided</scope>
+ <scope>runtime</scope>
<unpack>true</unpack>
<includes>
<include>*:jbossws-framework:zip:testsuite</include>
16 years, 7 months
JBossWS SVN: r7229 - container/jboss50/branches/jbossws-jboss500/src/main/resources/jbossws-jboss50-container.jar/META-INF.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-05-30 05:41:07 -0400 (Fri, 30 May 2008)
New Revision: 7229
Modified:
container/jboss50/branches/jbossws-jboss500/src/main/resources/jbossws-jboss50-container.jar/META-INF/jbossws-container-beans.xml
Log:
[JBWS-2174] WSModifyWebMetaDataDeploymentAspect must be in EJB transport as well
Modified: container/jboss50/branches/jbossws-jboss500/src/main/resources/jbossws-jboss50-container.jar/META-INF/jbossws-container-beans.xml
===================================================================
--- container/jboss50/branches/jbossws-jboss500/src/main/resources/jbossws-jboss50-container.jar/META-INF/jbossws-container-beans.xml 2008-05-30 09:40:54 UTC (rev 7228)
+++ container/jboss50/branches/jbossws-jboss500/src/main/resources/jbossws-jboss50-container.jar/META-INF/jbossws-container-beans.xml 2008-05-30 09:41:07 UTC (rev 7229)
@@ -200,8 +200,6 @@
<property name="sortAspectsOnCreate">false</property>
<property name="aspects">
<set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
-
- <!-- phase 1 -->
<inject bean="WSContainerMetaDataDeploymentAspect"/>
<inject bean="WSContextRootDeploymentAspect"/>
<inject bean="WSHttpTransportDeploymentAspect"/>
@@ -211,8 +209,6 @@
<inject bean="WSEndpointRegistryDeploymentAspect"/>
<inject bean="WSModifyWebMetaDataDeploymentAspect"/>
<inject bean="WSURLPatternDeploymentAspect"/>
-
- <!-- phase 2 -->
<inject bean="WSEndpointLifecycleDeploymentAspect"/>
<inject bean="WSRuntimeLoaderDeploymentAspect"/>
</set>
@@ -228,12 +224,12 @@
<inject bean="WSContextRootDeploymentAspect"/>
<inject bean="WSHttpTransportDeploymentAspect"/>
<inject bean="WSEndpointHandlerDeploymentAspect"/>
- <inject bean="WSEndpointLifecycleDeploymentAspect"/>
<inject bean="WSEndpointMetricsDeploymentAspect"/>
<inject bean="WSEndpointNameDeploymentAspect"/>
<inject bean="WSEndpointRegistryDeploymentAspect"/>
+ <inject bean="WSModifyWebMetaDataDeploymentAspect"/>
<inject bean="WSURLPatternDeploymentAspect"/>
-
+ <inject bean="WSEndpointLifecycleDeploymentAspect"/>
<inject bean="WSRuntimeLoaderDeploymentAspect"/>
</set>
</property>
16 years, 7 months
JBossWS SVN: r7228 - container/jboss50/branches/jbossws-jboss501/src/main/resources/jbossws-jboss50-container.jar/META-INF.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-05-30 05:40:54 -0400 (Fri, 30 May 2008)
New Revision: 7228
Modified:
container/jboss50/branches/jbossws-jboss501/src/main/resources/jbossws-jboss50-container.jar/META-INF/jbossws-container-beans.xml
Log:
[JBWS-2174] WSModifyWebMetaDataDeploymentAspect must be in EJB transport as well
Modified: container/jboss50/branches/jbossws-jboss501/src/main/resources/jbossws-jboss50-container.jar/META-INF/jbossws-container-beans.xml
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/resources/jbossws-jboss50-container.jar/META-INF/jbossws-container-beans.xml 2008-05-30 09:32:58 UTC (rev 7227)
+++ container/jboss50/branches/jbossws-jboss501/src/main/resources/jbossws-jboss50-container.jar/META-INF/jbossws-container-beans.xml 2008-05-30 09:40:54 UTC (rev 7228)
@@ -198,8 +198,6 @@
<property name="sortAspectsOnCreate">false</property>
<property name="aspects">
<set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
-
- <!-- phase 1 -->
<inject bean="WSContainerMetaDataDeploymentAspect"/>
<inject bean="WSContextRootDeploymentAspect"/>
<inject bean="WSHttpTransportDeploymentAspect"/>
@@ -209,8 +207,6 @@
<inject bean="WSEndpointRegistryDeploymentAspect"/>
<inject bean="WSModifyWebMetaDataDeploymentAspect"/>
<inject bean="WSURLPatternDeploymentAspect"/>
-
- <!-- phase 2 -->
<inject bean="WSEndpointLifecycleDeploymentAspect"/>
<inject bean="WSRuntimeLoaderDeploymentAspect"/>
</set>
@@ -230,8 +226,8 @@
<inject bean="WSEndpointMetricsDeploymentAspect"/>
<inject bean="WSEndpointNameDeploymentAspect"/>
<inject bean="WSEndpointRegistryDeploymentAspect"/>
+ <inject bean="WSModifyWebMetaDataDeploymentAspect"/>
<inject bean="WSURLPatternDeploymentAspect"/>
-
<inject bean="WSRuntimeLoaderDeploymentAspect"/>
</set>
</property>
16 years, 7 months
JBossWS SVN: r7227 - in stack/cxf/trunk/modules/testsuite/cxf-tests/src/test: resources/jaxws/samples/wsse/sign-encrypt/WEB-INF and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-05-30 05:32:58 -0400 (Fri, 30 May 2008)
New Revision: 7227
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/jbossws-cxf.xml
Log:
Shutting down custom test bus once the test is over
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocTestCase.java 2008-05-30 09:31:42 UTC (rev 7226)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocTestCase.java 2008-05-30 09:32:58 UTC (rev 7227)
@@ -81,19 +81,26 @@
SpringBusFactory bf = new SpringBusFactory();
URL cxfConfig = getResourceURL("jaxws/cxf/wsrm/wsrm-client-config.xml");
Bus bus = bf.createBus(cxfConfig);
- BusFactory.setDefaultBus(bus);
-
- URL wsdlURL = getResourceURL("jaxws/cxf/wsrm/basic-doc/wsrm-basic-doc.wsdl");
- QName serviceName = new QName(targetNS, "RMService");
-
- Service service = Service.create(wsdlURL, serviceName);
- BasicDocEndpoint port = (BasicDocEndpoint)service.getPort(BasicDocEndpoint.class);
-
- // Enable addressing
- BindingProvider bp = (BindingProvider)port;
- bp.getRequestContext().put("org.apache.cxf.ws.addressing.using", Boolean.TRUE);
-
- Object retObj = port.echo("Hello");
- assertEquals("Hello", retObj);
+ try
+ {
+ BusFactory.setDefaultBus(bus);
+
+ URL wsdlURL = getResourceURL("jaxws/cxf/wsrm/basic-doc/wsrm-basic-doc.wsdl");
+ QName serviceName = new QName(targetNS, "RMService");
+
+ Service service = Service.create(wsdlURL, serviceName);
+ BasicDocEndpoint port = (BasicDocEndpoint)service.getPort(BasicDocEndpoint.class);
+
+ // Enable addressing
+ BindingProvider bp = (BindingProvider)port;
+ bp.getRequestContext().put("org.apache.cxf.ws.addressing.using", Boolean.TRUE);
+
+ Object retObj = port.echo("Hello");
+ assertEquals("Hello", retObj);
+ }
+ finally
+ {
+ bus.shutdown(true);
+ }
}
}
\ No newline at end of file
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCTestCase.java 2008-05-30 09:31:42 UTC (rev 7226)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCTestCase.java 2008-05-30 09:32:58 UTC (rev 7227)
@@ -81,19 +81,26 @@
SpringBusFactory bf = new SpringBusFactory();
URL cxfConfig = getResourceURL("jaxws/cxf/wsrm/wsrm-client-config.xml");
Bus bus = bf.createBus(cxfConfig);
- BusFactory.setDefaultBus(bus);
-
- URL wsdlURL = getResourceURL("jaxws/cxf/wsrm/basic-rpc/wsrm-basic-rpc.wsdl");
- QName serviceName = new QName(targetNS, "RMService");
-
- Service service = Service.create(wsdlURL, serviceName);
- BasicRPCEndpoint port = (BasicRPCEndpoint)service.getPort(BasicRPCEndpoint.class);
-
- // Enable addressing
- BindingProvider bp = (BindingProvider)port;
- bp.getRequestContext().put("org.apache.cxf.ws.addressing.using", Boolean.TRUE);
-
- Object retObj = port.echo("Hello");
- assertEquals("Hello", retObj);
+ try
+ {
+ BusFactory.setDefaultBus(bus);
+
+ URL wsdlURL = getResourceURL("jaxws/cxf/wsrm/basic-rpc/wsrm-basic-rpc.wsdl");
+ QName serviceName = new QName(targetNS, "RMService");
+
+ Service service = Service.create(wsdlURL, serviceName);
+ BasicRPCEndpoint port = (BasicRPCEndpoint)service.getPort(BasicRPCEndpoint.class);
+
+ // Enable addressing
+ BindingProvider bp = (BindingProvider)port;
+ bp.getRequestContext().put("org.apache.cxf.ws.addressing.using", Boolean.TRUE);
+
+ Object retObj = port.echo("Hello");
+ assertEquals("Hello", retObj);
+ }
+ finally
+ {
+ bus.shutdown(true);
+ }
}
}
\ No newline at end of file
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/jbossws-cxf.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/jbossws-cxf.xml 2008-05-30 09:31:42 UTC (rev 7226)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/jbossws-cxf.xml 2008-05-30 09:32:58 UTC (rev 7227)
@@ -43,6 +43,9 @@
id='ServiceImpl'
address='http://@jboss.bind.address@:8080/jaxws-samples-wsse-sign-encrypt'
implementor='org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl'>
+ <jaxws:invoker>
+ <bean class='org.jboss.wsf.stack.cxf.InvokerJSE'/>
+ </jaxws:invoker>
<jaxws:outInterceptors>
<bean class="org.apache.cxf.binding.soap.saaj.SAAJOutInterceptor"/>
<ref bean="Sign_Response"/>
16 years, 7 months
JBossWS SVN: r7226 - in stack/native/trunk/modules: deployment and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-05-30 05:31:42 -0400 (Fri, 30 May 2008)
New Revision: 7226
Added:
stack/native/trunk/modules/deployment/
stack/native/trunk/modules/deployment/pom.xml
Log:
Add module deployment
Added: stack/native/trunk/modules/deployment/pom.xml
===================================================================
--- stack/native/trunk/modules/deployment/pom.xml (rev 0)
+++ stack/native/trunk/modules/deployment/pom.xml 2008-05-30 09:31:42 UTC (rev 7226)
@@ -0,0 +1,27 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <name>JBoss Web Services - Stack Native Deployment</name>
+ <artifactId>jbossws-native-deployment</artifactId>
+ <packaging>pom</packaging>
+
+ <!-- Parent -->
+ <parent>
+ <groupId>org.jboss.ws.native</groupId>
+ <artifactId>jbossws-native</artifactId>
+ <version>3.0.2-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+
+ <!-- Dependencies -->
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-framework</artifactId>
+ <classifier>scripts</classifier>
+ <type>zip</type>
+ </dependency>
+ </dependencies>
+
+</project>
Property changes on: stack/native/trunk/modules/deployment/pom.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
16 years, 7 months
JBossWS SVN: r7225 - stack/metro/trunk/src/main/scripts.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-05-30 04:44:26 -0400 (Fri, 30 May 2008)
New Revision: 7225
Modified:
stack/metro/trunk/src/main/scripts/assembly-bin-dist.xml
Log:
framework zip has runtime scope
Modified: stack/metro/trunk/src/main/scripts/assembly-bin-dist.xml
===================================================================
--- stack/metro/trunk/src/main/scripts/assembly-bin-dist.xml 2008-05-30 08:41:03 UTC (rev 7224)
+++ stack/metro/trunk/src/main/scripts/assembly-bin-dist.xml 2008-05-30 08:44:26 UTC (rev 7225)
@@ -76,7 +76,7 @@
<dependencySet>
<outputDirectory>tests</outputDirectory>
<useStrictFiltering>true</useStrictFiltering>
- <scope>provided</scope>
+ <scope>runtime</scope>
<unpack>true</unpack>
<includes>
<include>*:jbossws-framework:zip:testsuite</include>
16 years, 7 months
JBossWS SVN: r7224 - stack/cxf/trunk/src/main/scripts.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-05-30 04:41:03 -0400 (Fri, 30 May 2008)
New Revision: 7224
Modified:
stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml
Log:
fix
Modified: stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml
===================================================================
--- stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml 2008-05-30 08:08:07 UTC (rev 7223)
+++ stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml 2008-05-30 08:41:03 UTC (rev 7224)
@@ -76,8 +76,11 @@
<dependencySet>
<outputDirectory>tests</outputDirectory>
<useStrictFiltering>true</useStrictFiltering>
- <scope>provided</scope>
+ <scope>runtime</scope>
<unpack>true</unpack>
+ <includes>
+ <include>*:jbossws-framework:zip:testsuite</include>
+ </includes>
<unpackOptions>
<includes>
<include>ant-import/**</include>
@@ -90,15 +93,6 @@
</includes>
</unpackOptions>
</dependencySet>
- <dependencySet>
- <outputDirectory>tests</outputDirectory>
- <useStrictFiltering>true</useStrictFiltering>
- <scope>runtime</scope>
- <unpack>true</unpack>
- <includes>
- <include>*:jbossws-framework:zip:testsuite</include>
- </includes>
- </dependencySet>
</dependencySets>
</assembly>
\ No newline at end of file
16 years, 7 months
JBossWS SVN: r7223 - in stack/cxf/trunk/modules/testsuite/cxf-tests/src/test: resources/jaxws/samples/wsse/sign/WEB-INF and 1 other directories.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-05-30 04:08:07 -0400 (Fri, 30 May 2008)
New Revision: 7223
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/jbossws-cxf.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/jbossws-cxf.xml
Log:
[JBWS-2098] Fixing endpoint address
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.java 2008-05-30 07:36:26 UTC (rev 7222)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.java 2008-05-30 08:08:07 UTC (rev 7223)
@@ -65,7 +65,6 @@
URL wsdlURL = new URL(serviceURL + "?wsdl");
Service service = Service.create(wsdlURL, serviceName);
ServiceIface proxy = (ServiceIface)service.getPort(ServiceIface.class);
- ((BindingProvider)proxy).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, serviceURL);
setupWsse(proxy);
assertEquals("Secure Hello World!", proxy.sayHello());
}
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.java 2008-05-30 07:36:26 UTC (rev 7222)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.java 2008-05-30 08:08:07 UTC (rev 7223)
@@ -65,7 +65,6 @@
URL wsdlURL = new URL(serviceURL + "?wsdl");
Service service = Service.create(wsdlURL, serviceName);
ServiceIface proxy = (ServiceIface)service.getPort(ServiceIface.class);
- ((BindingProvider)proxy).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, serviceURL);
setupWsse(proxy);
assertEquals("Secure Hello World!", proxy.sayHello());
}
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/jbossws-cxf.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/jbossws-cxf.xml 2008-05-30 07:36:26 UTC (rev 7222)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/jbossws-cxf.xml 2008-05-30 08:08:07 UTC (rev 7223)
@@ -35,7 +35,7 @@
<jaxws:endpoint
id='ServiceImpl'
- address='http://@jboss.bind.address@:8080/jaxws-samples-wsse'
+ address='http://@jboss.bind.address@:8080/jaxws-samples-wsse-sign'
implementor='org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl'>
<jaxws:outInterceptors>
<bean class="org.apache.cxf.binding.soap.saaj.SAAJOutInterceptor"/>
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/jbossws-cxf.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/jbossws-cxf.xml 2008-05-30 07:36:26 UTC (rev 7222)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/jbossws-cxf.xml 2008-05-30 08:08:07 UTC (rev 7223)
@@ -41,7 +41,7 @@
<jaxws:endpoint
id='ServiceImpl'
- address='http://@jboss.bind.address@:8080/jaxws-samples-wsse'
+ address='http://@jboss.bind.address@:8080/jaxws-samples-wsse-sign-encrypt'
implementor='org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl'>
<jaxws:outInterceptors>
<bean class="org.apache.cxf.binding.soap.saaj.SAAJOutInterceptor"/>
16 years, 7 months
JBossWS SVN: r7222 - stack/native/trunk/modules/testsuite.
by jbossws-commits@lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-05-30 03:36:26 -0400 (Fri, 30 May 2008)
New Revision: 7222
Modified:
stack/native/trunk/modules/testsuite/test-excludes-jboss421.txt
stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt
stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt
stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt
stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt
Log:
Enable WSConsumer test case
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss421.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss421.txt 2008-05-30 07:27:27 UTC (rev 7221)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss421.txt 2008-05-30 07:36:26 UTC (rev 7222)
@@ -32,9 +32,6 @@
# [JBWS-2170] Fix embedded for maven build
org/jboss/test/ws/embedded/**
-# [JBWS-2175] wsconsume cannot run with jaxws-api from build output
-org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.*
-
# [JBWS-1911] Support the JMS transport with JAX-WS
org/jboss/test/ws/jaxws/samples/jmstransport/**
org/jboss/test/ws/jaxws/samples/dar/JMSClientTestCase.*
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-05-30 07:27:27 UTC (rev 7221)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-05-30 07:36:26 UTC (rev 7222)
@@ -29,6 +29,3 @@
# [JBWS-2170] Fix embedded for maven build
org/jboss/test/ws/embedded/**
-
-# [JBWS-2175] wsconsume cannot run with jaxws-api from build output
-org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.*
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-05-30 07:27:27 UTC (rev 7221)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-05-30 07:36:26 UTC (rev 7222)
@@ -13,5 +13,3 @@
# [JBWS-2170] Fix embedded for maven build
org/jboss/test/ws/embedded/**
-# [JBWS-2175] wsconsume cannot run with jaxws-api from build output
-org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.*
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-05-30 07:27:27 UTC (rev 7221)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-05-30 07:36:26 UTC (rev 7222)
@@ -26,5 +26,3 @@
# [JBWS-2170] Fix embedded for maven build
org/jboss/test/ws/embedded/**
-# [JBWS-2175] wsconsume cannot run with jaxws-api from build output
-org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.*
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-05-30 07:27:27 UTC (rev 7221)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-05-30 07:36:26 UTC (rev 7222)
@@ -47,8 +47,5 @@
# [JBWS-2171] ServiceRef injection in EJB3 clients
org/jboss/test/ws/jaxws/webserviceref/ServiceRefOverridesTestCase.*
-# [JBWS-2175] wsconsume cannot run with jaxws-api from build output
-org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.*
-
# [EJBTHREE-1377] Callback objects are improperly setup - ServiceRefMetaData.getServiceInterface() returns null
org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase.*
16 years, 7 months