JBossWS SVN: r18623 - stack/cxf/trunk/modules/dist/src/main/scripts.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-05-07 04:03:27 -0400 (Wed, 07 May 2014)
New Revision: 18623
Modified:
stack/cxf/trunk/modules/dist/src/main/scripts/assembly-bin-dist.xml
Log:
[JBWS-3791] Fixing bin dist
Modified: stack/cxf/trunk/modules/dist/src/main/scripts/assembly-bin-dist.xml
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/scripts/assembly-bin-dist.xml 2014-05-06 16:05:09 UTC (rev 18622)
+++ stack/cxf/trunk/modules/dist/src/main/scripts/assembly-bin-dist.xml 2014-05-07 08:03:27 UTC (rev 18623)
@@ -96,7 +96,7 @@
</fileSet>
<!-- Test utils -->
<fileSet>
- <directory>../testsuite/test-utils/src/main</directory>
+ <directory>../test-utils/src/main</directory>
<outputDirectory>jbossws-cxf-bin-dist/tests</outputDirectory>
<includes>
<include>java/org/jboss/wsf/test/**</include>
10 years, 7 months
JBossWS SVN: r18622 - in stack/cxf/trunk: modules and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-05-06 12:05:09 -0400 (Tue, 06 May 2014)
New Revision: 18622
Added:
stack/cxf/trunk/modules/test-utils/
stack/cxf/trunk/modules/test-utils/pom.xml
Removed:
stack/cxf/trunk/modules/test-utils/pom.xml
stack/cxf/trunk/modules/testsuite/test-utils/
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
stack/cxf/trunk/pom.xml
Log:
[JBWS-3791] Moving jbossws-cxf-test-utils out of modules/testsuite
Deleted: stack/cxf/trunk/modules/test-utils/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-utils/pom.xml 2014-04-29 14:08:32 UTC (rev 18598)
+++ stack/cxf/trunk/modules/test-utils/pom.xml 2014-05-06 16:05:09 UTC (rev 18622)
@@ -1,57 +0,0 @@
-<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 CXF Test utils</name>
- <artifactId>jbossws-cxf-test-utils</artifactId>
- <packaging>jar</packaging>
-
- <!-- Parent -->
- <parent>
- <groupId>org.jboss.ws.cxf</groupId>
- <artifactId>jbossws-cxf-testsuite</artifactId>
- <version>4.3.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <dependencies>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-common</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.2.1</version>
- <executions>
- <execution>
- <id>check-bc-and-unlimited-crypto</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>java</goal>
- </goals>
- <configuration>
- <mainClass>org.jboss.wsf.test.CryptoCheckMain</mainClass>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
Copied: stack/cxf/trunk/modules/test-utils/pom.xml (from rev 18599, stack/cxf/trunk/modules/testsuite/test-utils/pom.xml)
===================================================================
--- stack/cxf/trunk/modules/test-utils/pom.xml (rev 0)
+++ stack/cxf/trunk/modules/test-utils/pom.xml 2014-05-06 16:05:09 UTC (rev 18622)
@@ -0,0 +1,75 @@
+<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 CXF Test utils</name>
+ <artifactId>jbossws-cxf-test-utils</artifactId>
+ <packaging>jar</packaging>
+
+ <!-- Parent -->
+ <parent>
+ <groupId>org.jboss.ws.cxf</groupId>
+ <artifactId>jbossws-cxf</artifactId>
+ <version>5.0.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.ws.cxf</groupId>
+ <artifactId>jbossws-cxf-client</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws.cxf</groupId>
+ <artifactId>jbossws-cxf-factories</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-common</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.shrinkwrap</groupId>
+ <artifactId>shrinkwrap-depchain</artifactId>
+ <type>pom</type>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.2.1</version>
+ <executions>
+ <execution>
+ <id>check-bc-and-unlimited-crypto</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>java</goal>
+ </goals>
+ <configuration>
+ <mainClass>org.jboss.wsf.test.CryptoCheckMain</mainClass>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2014-05-06 15:05:52 UTC (rev 18621)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2014-05-06 16:05:09 UTC (rev 18622)
@@ -37,7 +37,6 @@
<!-- Modules -->
<modules>
- <module>test-utils</module>
<module>cxf-tests</module>
<module>shared-tests</module>
</modules>
@@ -45,6 +44,12 @@
<!-- Dependencies -->
<dependencies>
<dependency>
+ <groupId>org.jboss.ws.cxf</groupId>
+ <artifactId>jbossws-cxf-test-utils</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-common</artifactId>
</dependency>
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2014-05-06 15:05:52 UTC (rev 18621)
+++ stack/cxf/trunk/pom.xml 2014-05-06 16:05:09 UTC (rev 18622)
@@ -56,6 +56,7 @@
<module>modules/endorsed</module>
<module>modules/resources</module>
<module>modules/addons</module>
+ <module>modules/test-utils</module>
</modules>
<!-- Properties -->
10 years, 7 months
JBossWS SVN: r18621 - in common/branches/rsearls: src/main/java/org/jboss/ws/common/management and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: rsearls
Date: 2014-05-06 11:05:52 -0400 (Tue, 06 May 2014)
New Revision: 18621
Modified:
common/branches/rsearls/pom.xml
common/branches/rsearls/src/main/java/org/jboss/ws/common/management/AbstractServerConfig.java
Log:
[JBWS-3750] new code
Modified: common/branches/rsearls/pom.xml
===================================================================
--- common/branches/rsearls/pom.xml 2014-05-06 15:04:16 UTC (rev 18620)
+++ common/branches/rsearls/pom.xml 2014-05-06 15:05:52 UTC (rev 18621)
@@ -9,7 +9,7 @@
<packaging>jar</packaging>
<description>JBossWS Common</description>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
<!-- Parent -->
<parent>
@@ -27,7 +27,7 @@
<!-- Properties -->
<properties>
- <jbossws.spi.version>2.3.1-SNAPSHOT</jbossws.spi.version>
+ <jbossws.spi.version>2.3.2-SNAPSHOT</jbossws.spi.version>
<jboss.jaxbintros.version>1.0.2.GA</jboss.jaxbintros.version>
<jboss.common.core.version>2.2.17.GA</jboss.common.core.version>
<jboss-logging.version>3.1.2.GA</jboss-logging.version>
Modified: common/branches/rsearls/src/main/java/org/jboss/ws/common/management/AbstractServerConfig.java
===================================================================
--- common/branches/rsearls/src/main/java/org/jboss/ws/common/management/AbstractServerConfig.java 2014-05-06 15:04:16 UTC (rev 18620)
+++ common/branches/rsearls/src/main/java/org/jboss/ws/common/management/AbstractServerConfig.java 2014-05-06 15:05:52 UTC (rev 18621)
@@ -81,7 +81,11 @@
// Whether we should always modify the soap address to the deployed endpoint location
private volatile boolean modifySOAPAddress;
private final Object modifySOAPAddressLock = new Object();
-
+
+ // The SOAP address path component for substitution in the existing SOAP address.
+ private volatile String webServicePath;
+ private final Object webServicePathLock = new Object();
+
//The stack config
protected volatile StackConfig stackConfig;
@@ -249,7 +253,28 @@
return localPort;
}
}
-
+
+ public String getWebServicePath()
+ {
+ return webServicePath;
+ }
+
+ public void setWebServicePath(String path)
+ {
+ setWebServicePath(path, null);
+ }
+
+ public void setWebServicePath(String path, UpdateCallbackHandler uch)
+ {
+ synchronized (webServicePathLock) {
+ if (uch != null)
+ {
+ uch.onBeforeUpdate();
+ }
+ this.webServicePath = path;
+ }
+ }
+
private int getConnectorPort(boolean secure) {
final ClassLoader cl = ClassLoaderProvider.getDefaultProvider().getServerIntegrationClassLoader();
int port = 0;
10 years, 7 months
JBossWS SVN: r18620 - stack/cxf/trunk.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-05-06 11:04:16 -0400 (Tue, 06 May 2014)
New Revision: 18620
Modified:
stack/cxf/trunk/pom.xml
Log:
[JBWS-3686] Move to released WSS4J 2.0.0
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2014-05-06 15:03:45 UTC (rev 18619)
+++ stack/cxf/trunk/pom.xml 2014-05-06 15:04:16 UTC (rev 18620)
@@ -105,7 +105,7 @@
<velocity.version>1.7</velocity.version>
<xerces.version>2.9.1</xerces.version>
<xmlsec.version>2.0.0</xmlsec.version>
- <wss4j.version>2.0.0-SNAPSHOT</wss4j.version>
+ <wss4j.version>2.0.0</wss4j.version>
<wstx.version>4.2.0</wstx.version>
<spring.version>3.2.8.RELEASE</spring.version>
<shrinkwrap.version>1.1.3</shrinkwrap.version>
10 years, 7 months
JBossWS SVN: r18619 - stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-05-06 11:03:45 -0400 (Tue, 06 May 2014)
New Revision: 18619
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/PolicyAttachmentTestCase.java
Log:
Set receive timeout to cope with Hudson QA machine slowness
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/PolicyAttachmentTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/PolicyAttachmentTestCase.java 2014-05-06 15:03:39 UTC (rev 18618)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/PolicyAttachmentTestCase.java 2014-05-06 15:03:45 UTC (rev 18619)
@@ -34,6 +34,7 @@
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.interceptor.LoggingInInterceptor;
+import org.apache.cxf.message.Message;
import org.apache.cxf.ws.security.SecurityConstants;
import org.jboss.wsf.stack.cxf.client.UseThreadBusFeature;
import org.jboss.wsf.test.CryptoHelper;
@@ -114,5 +115,6 @@
proxy.getRequestContext().put(SecurityConstants.ENCRYPT_PROPERTIES, Thread.currentThread().getContextClassLoader().getResource("META-INF/alice.properties"));
proxy.getRequestContext().put(SecurityConstants.SIGNATURE_USERNAME, "alice");
proxy.getRequestContext().put(SecurityConstants.ENCRYPT_USERNAME, "bob");
+ proxy.getRequestContext().put(Message.RECEIVE_TIMEOUT, 120000);
}
}
10 years, 7 months
JBossWS SVN: r18618 - in spi/branches/rsearls: src/main/java/org/jboss/wsf/spi/management and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: rsearls
Date: 2014-05-06 11:03:39 -0400 (Tue, 06 May 2014)
New Revision: 18618
Modified:
spi/branches/rsearls/pom.xml
spi/branches/rsearls/src/main/java/org/jboss/wsf/spi/management/ServerConfig.java
Log:
[JBWS-3750] new code
Modified: spi/branches/rsearls/pom.xml
===================================================================
--- spi/branches/rsearls/pom.xml 2014-05-06 14:59:50 UTC (rev 18617)
+++ spi/branches/rsearls/pom.xml 2014-05-06 15:03:39 UTC (rev 18618)
@@ -7,7 +7,7 @@
<packaging>jar</packaging>
<description>JBossWS SPI</description>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
<!-- Parent -->
<parent>
Modified: spi/branches/rsearls/src/main/java/org/jboss/wsf/spi/management/ServerConfig.java
===================================================================
--- spi/branches/rsearls/src/main/java/org/jboss/wsf/spi/management/ServerConfig.java 2014-05-06 14:59:50 UTC (rev 18617)
+++ spi/branches/rsearls/src/main/java/org/jboss/wsf/spi/management/ServerConfig.java 2014-05-06 15:03:39 UTC (rev 18618)
@@ -60,6 +60,10 @@
int getWebServiceSecurePort();
void setWebServiceSecurePort(int port);
+
+ String getWebServicePath();
+
+ void setWebServicePath(String path);
boolean isModifySOAPAddress();
10 years, 7 months
JBossWS SVN: r18617 - in container/wildfly80/branches/rsearls: server-integration and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: rsearls
Date: 2014-05-06 10:59:50 -0400 (Tue, 06 May 2014)
New Revision: 18617
Modified:
container/wildfly80/branches/rsearls/pom.xml
container/wildfly80/branches/rsearls/server-integration/pom.xml
container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/config/ServerConfigImpl.java
container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/dmr/Attributes.java
container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/dmr/Constants.java
container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/dmr/Element.java
container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/dmr/WSSubsystemAdd.java
container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/dmr/WSSubsystemReader.java
container/wildfly80/branches/rsearls/server-integration/src/test/java/org/jboss/as/webservices/config/ServerConfigImplTestCase.java
container/wildfly80/branches/rsearls/tests-integration/pom.xml
Log:
[JBWS-3750] new code and corresponding tests
Modified: container/wildfly80/branches/rsearls/pom.xml
===================================================================
--- container/wildfly80/branches/rsearls/pom.xml 2014-05-06 13:46:44 UTC (rev 18616)
+++ container/wildfly80/branches/rsearls/pom.xml 2014-05-06 14:59:50 UTC (rev 18617)
@@ -35,7 +35,7 @@
<description>JBossWS WildFly 8.0.0.Final Integration Parent</description>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-wildfly800-parent</artifactId>
- <version>4.3.0.Final</version>
+ <version>4.3.1-SNAPSHOT</version>
<packaging>pom</packaging>
<scm>
@@ -51,8 +51,8 @@
<properties>
<jbossws.api.version>1.0.2.Final</jbossws.api.version>
- <jbossws.spi.version>2.3.0.Final</jbossws.spi.version>
- <jbossws.common.version>2.3.0.Final</jbossws.common.version>
+ <jbossws.spi.version>2.3.2-SNAPSHOT</jbossws.spi.version>
+ <jbossws.common.version>2.3.2-SNAPSHOT</jbossws.common.version>
<jboss.msc.version>1.2.0.Final</jboss.msc.version>
<wildfly.version>8.0.0.Final</wildfly.version>
<wildfly.security-manager.version>1.0.0.Final</wildfly.security-manager.version>
Modified: container/wildfly80/branches/rsearls/server-integration/pom.xml
===================================================================
--- container/wildfly80/branches/rsearls/server-integration/pom.xml 2014-05-06 13:46:44 UTC (rev 18616)
+++ container/wildfly80/branches/rsearls/server-integration/pom.xml 2014-05-06 14:59:50 UTC (rev 18617)
@@ -29,7 +29,7 @@
<parent>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-wildfly800-parent</artifactId>
- <version>4.3.0.Final</version>
+ <version>4.3.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/config/ServerConfigImpl.java
===================================================================
--- container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/config/ServerConfigImpl.java 2014-05-06 13:46:44 UTC (rev 18616)
+++ container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/config/ServerConfigImpl.java 2014-05-06 14:59:50 UTC (rev 18617)
@@ -52,6 +52,7 @@
private final DMRSynchCheckHandler webServicePortUCH = new DMRSynchCheckHandler();
private final DMRSynchCheckHandler webServiceSecurePortUCH = new DMRSynchCheckHandler();
private final DMRSynchCheckHandler modifySOAPAddressUCH = new DMRSynchCheckHandler();
+ private final DMRSynchCheckHandler webServicePathUCH = new DMRSynchCheckHandler();
private ServerConfigImpl() {
// forbidden inheritance
@@ -65,6 +66,7 @@
webServicePortUCH.reset();
webServiceSecurePortUCH.reset();
modifySOAPAddressUCH.reset();
+ webServicePathUCH.reset();
}
public void incrementWSDeploymentCount() {
@@ -89,6 +91,15 @@
setWebServiceHost(host, webServiceHostUCH);
}
+ public void setWebServicePath(String path, boolean forceUpdate) {
+ setWebServicePath(path, forceUpdate ? null : webServicePathUCH);
+ }
+
+ @Override
+ public void setWebServicePath(String path) {
+ setWebServicePath(path, webServicePathUCH);
+ }
+
public void setWebServicePort(int port, boolean forceUpdate) {
setWebServicePort(port, forceUpdate ? null : webServicePortUCH);
}
Modified: container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/dmr/Attributes.java
===================================================================
--- container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/dmr/Attributes.java 2014-05-06 13:46:44 UTC (rev 18616)
+++ container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/dmr/Attributes.java 2014-05-06 14:59:50 UTC (rev 18617)
@@ -27,6 +27,7 @@
import org.jboss.as.controller.SimpleAttributeDefinition;
import org.jboss.as.controller.SimpleAttributeDefinitionBuilder;
import org.jboss.as.controller.operations.validation.IntRangeValidator;
+import org.jboss.as.controller.operations.validation.StringLengthValidator;
import org.jboss.dmr.ModelNode;
import org.jboss.dmr.ModelType;
@@ -61,8 +62,16 @@
.setDefaultValue(new ModelNode(true))
.setAllowExpression(true)
.build();
- SimpleAttributeDefinition[] SUBSYSTEM_ATTRIBUTES = {MODIFY_WSDL_ADDRESS, WSDL_HOST, WSDL_PORT, WSDL_SECURE_PORT};
+ SimpleAttributeDefinition PATH = new SimpleAttributeDefinitionBuilder(Constants.PATH, ModelType.STRING)
+ .setAllowNull(true)
+ .setMinSize(1)
+ .setAllowExpression(false)
+ .setValidator(new StringLengthValidator(1, Integer.MAX_VALUE, true, true))
+ .build();
+
+ SimpleAttributeDefinition[] SUBSYSTEM_ATTRIBUTES = {MODIFY_WSDL_ADDRESS, WSDL_HOST, WSDL_PORT, WSDL_SECURE_PORT, PATH};
+
SimpleAttributeDefinition VALUE = new SimpleAttributeDefinitionBuilder(Constants.VALUE, ModelType.STRING)
.setAllowNull(true)
.setAllowExpression(true)
@@ -77,5 +86,4 @@
.setAllowExpression(true)
.build();
-
}
Modified: container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/dmr/Constants.java
===================================================================
--- container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/dmr/Constants.java 2014-05-06 13:46:44 UTC (rev 18616)
+++ container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/dmr/Constants.java 2014-05-06 14:59:50 UTC (rev 18617)
@@ -55,4 +55,5 @@
String HANDLER_NAME="handler-name";
String HANDLER_CLASS="handler-class";
String VALUE = "value";
+ String PATH = "path";
}
Modified: container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/dmr/Element.java
===================================================================
--- container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/dmr/Element.java 2014-05-06 13:46:44 UTC (rev 18616)
+++ container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/dmr/Element.java 2014-05-06 14:59:50 UTC (rev 18617)
@@ -39,6 +39,7 @@
WSDL_HOST(Constants.WSDL_HOST),
WSDL_PORT(Constants.WSDL_PORT),
WSDL_SECURE_PORT(Constants.WSDL_SECURE_PORT),
+ PATH(Constants.PATH),
CLIENT_CONFIG(Constants.CLIENT_CONFIG),
ENDPOINT_CONFIG(Constants.ENDPOINT_CONFIG),
CONFIG_NAME(Constants.CONFIG_NAME),
Modified: container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/dmr/WSSubsystemAdd.java
===================================================================
--- container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/dmr/WSSubsystemAdd.java 2014-05-06 13:46:44 UTC (rev 18616)
+++ container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/dmr/WSSubsystemAdd.java 2014-05-06 14:59:50 UTC (rev 18617)
@@ -26,6 +26,7 @@
import static org.jboss.as.webservices.dmr.Constants.WSDL_HOST;
import static org.jboss.as.webservices.dmr.Constants.WSDL_PORT;
import static org.jboss.as.webservices.dmr.Constants.WSDL_SECURE_PORT;
+import static org.jboss.as.webservices.dmr.Constants.PATH;
import java.net.UnknownHostException;
import java.util.ArrayList;
@@ -112,6 +113,9 @@
if (configuration.hasDefined(WSDL_SECURE_PORT)) {
config.setWebServiceSecurePort(Attributes.WSDL_SECURE_PORT.resolveModelAttribute(context, configuration).asInt());
}
+ if (configuration.hasDefined(PATH)) {
+ config.setWebServicePath(Attributes.PATH.resolveModelAttribute(context, configuration).asString());
+ }
return config;
}
Modified: container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/dmr/WSSubsystemReader.java
===================================================================
--- container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/dmr/WSSubsystemReader.java 2014-05-06 13:46:44 UTC (rev 18616)
+++ container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/dmr/WSSubsystemReader.java 2014-05-06 14:59:50 UTC (rev 18617)
@@ -140,6 +140,11 @@
Attributes.WSDL_SECURE_PORT.parseAndSetParameter(value, subsystem, reader);
break;
}
+ case PATH: {
+ final String value = parseElementNoAttributes(reader);
+ Attributes.PATH.parseAndSetParameter(value, subsystem, reader);
+ break;
+ }
case ENDPOINT_CONFIG: {
readConfig(reader, address, endpointConfigs, false);
break;
Modified: container/wildfly80/branches/rsearls/server-integration/src/test/java/org/jboss/as/webservices/config/ServerConfigImplTestCase.java
===================================================================
--- container/wildfly80/branches/rsearls/server-integration/src/test/java/org/jboss/as/webservices/config/ServerConfigImplTestCase.java 2014-05-06 13:46:44 UTC (rev 18616)
+++ container/wildfly80/branches/rsearls/server-integration/src/test/java/org/jboss/as/webservices/config/ServerConfigImplTestCase.java 2014-05-06 14:59:50 UTC (rev 18617)
@@ -92,6 +92,12 @@
sc.setWebServiceSecurePort(5435);
}
});
+ internalTestSingleAttributeUpdate(new Callback() {
+ @Override
+ public void setAttribute(ServerConfig sc) throws Exception {
+ sc.setWebServicePath("MY/TEST/PATH");
+ }
+ });
}
@Test
@@ -120,10 +126,17 @@
sc.setWebServiceSecurePort(5435);
}
};
- internalTestMultipleAttributeUpdate(cbA, new Callback[]{cbB, cbC, cbD});
- internalTestMultipleAttributeUpdate(cbB, new Callback[]{cbA, cbC, cbD});
- internalTestMultipleAttributeUpdate(cbC, new Callback[]{cbA, cbB, cbD});
- internalTestMultipleAttributeUpdate(cbD, new Callback[]{cbA, cbB, cbC});
+ Callback cbE = new Callback() {
+ @Override
+ public void setAttribute(ServerConfig sc) throws Exception {
+ sc.setWebServicePath("MY/TEST/PATH");
+ }
+ };
+ internalTestMultipleAttributeUpdate(cbA, new Callback[]{cbB, cbC, cbD, cbE});
+ internalTestMultipleAttributeUpdate(cbB, new Callback[]{cbA, cbC, cbD, cbE});
+ internalTestMultipleAttributeUpdate(cbC, new Callback[]{cbA, cbB, cbD, cbE});
+ internalTestMultipleAttributeUpdate(cbD, new Callback[]{cbA, cbB, cbC, cbE});
+ internalTestMultipleAttributeUpdate(cbE, new Callback[]{cbA, cbB, cbC, cbD});
}
protected void internalTestSingleAttributeUpdate(Callback cb) throws Exception {
Modified: container/wildfly80/branches/rsearls/tests-integration/pom.xml
===================================================================
--- container/wildfly80/branches/rsearls/tests-integration/pom.xml 2014-05-06 13:46:44 UTC (rev 18616)
+++ container/wildfly80/branches/rsearls/tests-integration/pom.xml 2014-05-06 14:59:50 UTC (rev 18617)
@@ -29,7 +29,7 @@
<parent>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-wildfly800-parent</artifactId>
- <version>4.3.0.Final</version>
+ <version>4.3.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
10 years, 7 months
JBossWS SVN: r18616 - stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/injection.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-05-06 09:46:44 -0400 (Tue, 06 May 2014)
New Revision: 18616
Modified:
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/injection/JBossWSResourceInjectionResolver.java
Log:
[JBWS-3786] Also ignore IllegalArgumentException in JBossWSResourceInjectionResolver#resolve, as that's thrown during AS shutdown
Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/injection/JBossWSResourceInjectionResolver.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/injection/JBossWSResourceInjectionResolver.java 2014-05-06 13:38:19 UTC (rev 18615)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/injection/JBossWSResourceInjectionResolver.java 2014-05-06 13:46:44 UTC (rev 18616)
@@ -54,6 +54,8 @@
return (T)new InitialContext().lookup("java:comp/env/" + resourceName);
} catch (NamingException ne) {
return null;
+ } catch (IllegalArgumentException iae) {
+ return null;
}
}
10 years, 7 months
JBossWS SVN: r18615 - in stack/cxf/trunk/modules/testsuite: cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-05-06 09:38:19 -0400 (Tue, 06 May 2014)
New Revision: 18615
Modified:
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/WSReliableMessagingWithAPITestCase.java
Log:
[JBWS-3686] Workaround for CXF-5726 (move oneway invocations to wsrm endpoints after req-res ones) + explicit close of client proxy in WS-RM testcases (unless the Bus is already being shutdown)
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocTestCase.java 2014-05-06 11:49:15 UTC (rev 18614)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocTestCase.java 2014-05-06 13:38:19 UTC (rev 18615)
@@ -28,6 +28,7 @@
import junit.framework.Test;
+import org.apache.cxf.endpoint.Client;
import org.jboss.ws.common.DOMUtils;
import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.test.JBossWSTest;
@@ -66,5 +67,6 @@
Object retObj = port.echo("Hello");
assertEquals("Hello", retObj);
+ ((Client)port).destroy();
}
}
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCTestCase.java 2014-05-06 11:49:15 UTC (rev 18614)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCTestCase.java 2014-05-06 13:38:19 UTC (rev 18615)
@@ -28,6 +28,7 @@
import junit.framework.Test;
+import org.apache.cxf.endpoint.Client;
import org.jboss.ws.common.DOMUtils;
import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.test.JBossWSTest;
@@ -66,5 +67,6 @@
Object retObj = port.echo("Hello");
assertEquals("Hello", retObj);
+ ((Client)port).destroy();
}
}
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java 2014-05-06 11:49:15 UTC (rev 18614)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java 2014-05-06 13:38:19 UTC (rev 18615)
@@ -28,6 +28,7 @@
import junit.framework.Test;
+import org.apache.cxf.endpoint.Client;
import org.jboss.test.ws.jaxws.samples.wsrm.generated.SimpleService;
import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.test.JBossWSTest;
@@ -57,11 +58,19 @@
Service service = Service.create(wsdlURL, serviceName);
proxy = (SimpleService)service.getPort(SimpleService.class);
}
+
+ @Override
+ protected void tearDown() throws Exception
+ {
+ if (proxy != null) {
+ ((Client)proxy).destroy();
+ }
+ }
public void test() throws Exception
{
+ assertEquals("Hello World!", proxy.echo("Hello World!")); // request responce call
proxy.ping(); // one way call
- assertEquals("Hello World!", proxy.echo("Hello World!")); // request responce call
}
}
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/WSReliableMessagingWithAPITestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/WSReliableMessagingWithAPITestCase.java 2014-05-06 11:49:15 UTC (rev 18614)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/WSReliableMessagingWithAPITestCase.java 2014-05-06 13:38:19 UTC (rev 18615)
@@ -62,8 +62,8 @@
SimpleService proxy = (SimpleService)service.getPort(SimpleService.class);
((BindingProvider)proxy).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, serviceURL);
+ assertEquals("Hello World!", proxy.echo("Hello World!")); // request response call
proxy.ping(); // one way call
- assertEquals("Hello World!", proxy.echo("Hello World!")); // request response call
} finally {
bus.shutdown(true);
}
10 years, 7 months
JBossWS SVN: r18614 - in stack/cxf/trunk/modules: testsuite and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-05-06 07:49:15 -0400 (Tue, 06 May 2014)
New Revision: 18614
Modified:
stack/cxf/trunk/modules/addons/transports/udp/pom.xml
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
[JBWS-3790] adding profile for excluding udp tests
Modified: stack/cxf/trunk/modules/addons/transports/udp/pom.xml
===================================================================
--- stack/cxf/trunk/modules/addons/transports/udp/pom.xml 2014-05-05 15:42:47 UTC (rev 18613)
+++ stack/cxf/trunk/modules/addons/transports/udp/pom.xml 2014-05-06 11:49:15 UTC (rev 18614)
@@ -33,4 +33,27 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>exclude-udp-unit-tests</id>
+ <activation>
+ <property>
+ <name>exclude-udp-tests</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes combine.children="append">
+ <exclude>org/jboss/wsf/stack/cxf/addons/transports/udp/UDPTransportTest*</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2014-05-05 15:42:47 UTC (rev 18613)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2014-05-06 11:49:15 UTC (rev 18614)
@@ -993,6 +993,31 @@
</profile>
<!--
+ Name: exclude-udp-integration-tests
+ Descr: Additional exclusions of integration tests which require a network environment properly setup for UDP tests
+ -->
+ <profile>
+ <id>exclude-udp-integration-tests</id>
+ <activation>
+ <property>
+ <name>exclude-udp-tests</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes combine.children="append">
+ <exclude>org/jboss/test/ws/jaxws/cxf/udp/UDPEndpointAPITestCase*</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!--
Name: no-jboss-bind-address
Descr: Set the default jboss.bind.address
10 years, 7 months