JBossWS SVN: r18552 - stack/cxf/trunk/modules/testsuite/cxf-tests.
by jbossws-commits＠lists.jboss.org
Author: rsearls
Date: 2014-03-31 12:44:53 -0400 (Mon, 31 Mar 2014)
New Revision: 18552
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml
Log:
Removed unneeded ver stmt in picketlink-common and picketlink-federation.
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml 2014-03-31 15:48:46 UTC (rev 18551)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml 2014-03-31 16:44:53 UTC (rev 18552)
@@ -38,13 +38,11 @@
<dependency>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-common</artifactId>
- <version>2.5.1.Final</version> <!-- rls -->
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-federation</artifactId>
- <version>2.5.2.Final</version>
<scope>test</scope>
</dependency>
<dependency>
10 years
JBossWS SVN: r18551 - in stack/cxf/branches/asoldano: modules/addons and 14 other directories.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-03-31 11:48:46 -0400 (Mon, 31 Mar 2014)
New Revision: 18551
Modified:
stack/cxf/branches/asoldano/modules/addons/pom.xml
stack/cxf/branches/asoldano/modules/addons/transports/http/httpserver/pom.xml
stack/cxf/branches/asoldano/modules/addons/transports/http/undertow/pom.xml
stack/cxf/branches/asoldano/modules/addons/transports/udp/pom.xml
stack/cxf/branches/asoldano/modules/client/pom.xml
stack/cxf/branches/asoldano/modules/dist/pom.xml
stack/cxf/branches/asoldano/modules/endorsed/pom.xml
stack/cxf/branches/asoldano/modules/jaspi/pom.xml
stack/cxf/branches/asoldano/modules/resources/pom.xml
stack/cxf/branches/asoldano/modules/server/pom.xml
stack/cxf/branches/asoldano/modules/testsuite/cxf-spring-tests/pom.xml
stack/cxf/branches/asoldano/modules/testsuite/cxf-tests/pom.xml
stack/cxf/branches/asoldano/modules/testsuite/pom.xml
stack/cxf/branches/asoldano/modules/testsuite/shared-tests/pom.xml
stack/cxf/branches/asoldano/modules/testsuite/test-utils/pom.xml
stack/cxf/branches/asoldano/pom.xml
Log:
build to 5.0.0-SNAPSHOT
Modified: stack/cxf/branches/asoldano/modules/addons/pom.xml
===================================================================
--- stack/cxf/branches/asoldano/modules/addons/pom.xml 2014-03-31 15:00:59 UTC (rev 18550)
+++ stack/cxf/branches/asoldano/modules/addons/pom.xml 2014-03-31 15:48:46 UTC (rev 18551)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.3.1-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/asoldano/modules/addons/transports/http/httpserver/pom.xml
===================================================================
--- stack/cxf/branches/asoldano/modules/addons/transports/http/httpserver/pom.xml 2014-03-31 15:00:59 UTC (rev 18550)
+++ stack/cxf/branches/asoldano/modules/addons/transports/http/httpserver/pom.xml 2014-03-31 15:48:46 UTC (rev 18551)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-addons</artifactId>
- <version>4.3.1-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/asoldano/modules/addons/transports/http/undertow/pom.xml
===================================================================
--- stack/cxf/branches/asoldano/modules/addons/transports/http/undertow/pom.xml 2014-03-31 15:00:59 UTC (rev 18550)
+++ stack/cxf/branches/asoldano/modules/addons/transports/http/undertow/pom.xml 2014-03-31 15:48:46 UTC (rev 18551)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-addons</artifactId>
- <version>4.3.1-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/asoldano/modules/addons/transports/udp/pom.xml
===================================================================
--- stack/cxf/branches/asoldano/modules/addons/transports/udp/pom.xml 2014-03-31 15:00:59 UTC (rev 18550)
+++ stack/cxf/branches/asoldano/modules/addons/transports/udp/pom.xml 2014-03-31 15:48:46 UTC (rev 18551)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-addons</artifactId>
- <version>4.3.1-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/asoldano/modules/client/pom.xml
===================================================================
--- stack/cxf/branches/asoldano/modules/client/pom.xml 2014-03-31 15:00:59 UTC (rev 18550)
+++ stack/cxf/branches/asoldano/modules/client/pom.xml 2014-03-31 15:48:46 UTC (rev 18551)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.3.1-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/asoldano/modules/dist/pom.xml
===================================================================
--- stack/cxf/branches/asoldano/modules/dist/pom.xml 2014-03-31 15:00:59 UTC (rev 18550)
+++ stack/cxf/branches/asoldano/modules/dist/pom.xml 2014-03-31 15:48:46 UTC (rev 18551)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.3.1-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/asoldano/modules/endorsed/pom.xml
===================================================================
--- stack/cxf/branches/asoldano/modules/endorsed/pom.xml 2014-03-31 15:00:59 UTC (rev 18550)
+++ stack/cxf/branches/asoldano/modules/endorsed/pom.xml 2014-03-31 15:48:46 UTC (rev 18551)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.3.1-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/asoldano/modules/jaspi/pom.xml
===================================================================
--- stack/cxf/branches/asoldano/modules/jaspi/pom.xml 2014-03-31 15:00:59 UTC (rev 18550)
+++ stack/cxf/branches/asoldano/modules/jaspi/pom.xml 2014-03-31 15:48:46 UTC (rev 18551)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.3.1-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/asoldano/modules/resources/pom.xml
===================================================================
--- stack/cxf/branches/asoldano/modules/resources/pom.xml 2014-03-31 15:00:59 UTC (rev 18550)
+++ stack/cxf/branches/asoldano/modules/resources/pom.xml 2014-03-31 15:48:46 UTC (rev 18551)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.3.1-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/asoldano/modules/server/pom.xml
===================================================================
--- stack/cxf/branches/asoldano/modules/server/pom.xml 2014-03-31 15:00:59 UTC (rev 18550)
+++ stack/cxf/branches/asoldano/modules/server/pom.xml 2014-03-31 15:48:46 UTC (rev 18551)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.3.1-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/asoldano/modules/testsuite/cxf-spring-tests/pom.xml
===================================================================
--- stack/cxf/branches/asoldano/modules/testsuite/cxf-spring-tests/pom.xml 2014-03-31 15:00:59 UTC (rev 18550)
+++ stack/cxf/branches/asoldano/modules/testsuite/cxf-spring-tests/pom.xml 2014-03-31 15:48:46 UTC (rev 18551)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-testsuite</artifactId>
- <version>4.3.1-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/asoldano/modules/testsuite/cxf-tests/pom.xml
===================================================================
--- stack/cxf/branches/asoldano/modules/testsuite/cxf-tests/pom.xml 2014-03-31 15:00:59 UTC (rev 18550)
+++ stack/cxf/branches/asoldano/modules/testsuite/cxf-tests/pom.xml 2014-03-31 15:48:46 UTC (rev 18551)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-testsuite</artifactId>
- <version>4.3.1-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/asoldano/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/branches/asoldano/modules/testsuite/pom.xml 2014-03-31 15:00:59 UTC (rev 18550)
+++ stack/cxf/branches/asoldano/modules/testsuite/pom.xml 2014-03-31 15:48:46 UTC (rev 18551)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.3.1-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/asoldano/modules/testsuite/shared-tests/pom.xml
===================================================================
--- stack/cxf/branches/asoldano/modules/testsuite/shared-tests/pom.xml 2014-03-31 15:00:59 UTC (rev 18550)
+++ stack/cxf/branches/asoldano/modules/testsuite/shared-tests/pom.xml 2014-03-31 15:48:46 UTC (rev 18551)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-testsuite</artifactId>
- <version>4.3.1-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/asoldano/modules/testsuite/test-utils/pom.xml
===================================================================
--- stack/cxf/branches/asoldano/modules/testsuite/test-utils/pom.xml 2014-03-31 15:00:59 UTC (rev 18550)
+++ stack/cxf/branches/asoldano/modules/testsuite/test-utils/pom.xml 2014-03-31 15:48:46 UTC (rev 18551)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-testsuite</artifactId>
- <version>4.3.1-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/asoldano/pom.xml
===================================================================
--- stack/cxf/branches/asoldano/pom.xml 2014-03-31 15:00:59 UTC (rev 18550)
+++ stack/cxf/branches/asoldano/pom.xml 2014-03-31 15:48:46 UTC (rev 18551)
@@ -32,7 +32,7 @@
<description>JBossWS CXF stack</description>
- <version>4.3.1-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
<!-- Parent -->
<parent>
10 years
JBossWS SVN: r18550 - stack/cxf/branches.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-03-31 11:00:59 -0400 (Mon, 31 Mar 2014)
New Revision: 18550
Added:
stack/cxf/branches/asoldano/
Log:
10 years
JBossWS SVN: r18549 - in stack/cxf/trunk/modules: testsuite/cxf-spring-tests/src/test/etc and 5 other directories.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-03-31 09:26:10 -0400 (Mon, 31 Mar 2014)
New Revision: 18549
Removed:
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/etc/appclient.jndi.properties
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/appclient.jndi.properties
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/etc/appclient.jndi.properties
stack/cxf/trunk/modules/testsuite/src/test/resources/jboss720/
stack/cxf/trunk/modules/testsuite/src/test/resources/wildfly800/
stack/cxf/trunk/modules/testsuite/src/test/resources/wildfly801/
Modified:
stack/cxf/trunk/modules/dist/src/main/distro/build-testsuite.xml
stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml
stack/cxf/trunk/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/AppclientHelper.java
stack/cxf/trunk/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTest.java
Log:
[JBWS-3784] Removing appclient-ws.xml usage
Modified: stack/cxf/trunk/modules/dist/src/main/distro/build-testsuite.xml
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/distro/build-testsuite.xml 2014-03-28 10:59:46 UTC (rev 18548)
+++ stack/cxf/trunk/modules/dist/src/main/distro/build-testsuite.xml 2014-03-31 13:26:10 UTC (rev 18549)
@@ -44,15 +44,6 @@
<!-- Verify required properties that must be set before this file is imported -->
<fail message="Tests output dir not set." unless="tests.output.dir"/>
- <!-- appclient patch -->
- <copy
- file="${basedir}/tests/etc/appclient/${jbossws.integration.target}/appclient-ws.xml"
- tofile="${jboss.home}/appclient/configuration/appclient-ws.xml"
- failonerror="false"
- overwrite="true"
- verbose="true"
- />
-
<!-- Verify availabililty of tools.jar -->
<condition property="tools.jar" value="${java.home}/lib/tools.jar">
<available file="${java.home}/lib/tools.jar"/>
Deleted: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/etc/appclient.jndi.properties
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/etc/appclient.jndi.properties 2014-03-28 10:59:46 UTC (rev 18548)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/etc/appclient.jndi.properties 2014-03-31 13:26:10 UTC (rev 18549)
@@ -1,7 +0,0 @@
-java.naming.factory.initial=org.jboss.naming.remote.client.InitialContextFactory
-java.naming.factory.url.pkgs=org.jboss.ejb.client.naming:org.jboss.naming.remote.client
-java.naming.provider.url=remote://@jboss.bind.address@:4448
-jboss.naming.client.connect.options.org.xnio.Options.SASL_POLICY_NOPLAINTEXT=false
-jboss.naming.client.security.callback.handler.class=org.jboss.wsf.test.CallbackHandler
-jboss.naming.client.endpoint.create.options.org.xnio.Options.WORKER_TASK_CORE_THREADS=1
-jboss.naming.client.endpoint.create.options.org.xnio.Options.WORKER_TASK_MAX_THREADS=4
Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/appclient.jndi.properties
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/appclient.jndi.properties 2014-03-28 10:59:46 UTC (rev 18548)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/appclient.jndi.properties 2014-03-31 13:26:10 UTC (rev 18549)
@@ -1,7 +0,0 @@
-java.naming.factory.initial=org.jboss.naming.remote.client.InitialContextFactory
-java.naming.factory.url.pkgs=org.jboss.ejb.client.naming:org.jboss.naming.remote.client
-java.naming.provider.url=remote://@jboss.bind.address@:4448
-jboss.naming.client.connect.options.org.xnio.Options.SASL_POLICY_NOPLAINTEXT=false
-jboss.naming.client.security.callback.handler.class=org.jboss.wsf.test.CallbackHandler
-jboss.naming.client.endpoint.create.options.org.xnio.Options.WORKER_TASK_CORE_THREADS=1
-jboss.naming.client.endpoint.create.options.org.xnio.Options.WORKER_TASK_MAX_THREADS=4
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml 2014-03-28 10:59:46 UTC (rev 18548)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml 2014-03-31 13:26:10 UTC (rev 18549)
@@ -94,24 +94,6 @@
</target>
</configuration>
</execution>
- <execution>
- <id>appclient-patch</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <target>
- <copy
- file="${project.build.directory}/../../src/test/resources/${jbossws.integration.target}/appclient-ws.xml"
- tofile="${jboss.home}/appclient/configuration/appclient-ws.xml"
- failonerror="false"
- verbose="true"
- overwrite="true"
- />
- </target>
- </configuration>
- </execution>
</executions>
</plugin>
<plugin> <!-- This copies jbossws-cxf-factories jar to endorsed dir before the integration-tests are run -->
Deleted: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/etc/appclient.jndi.properties
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/etc/appclient.jndi.properties 2014-03-28 10:59:46 UTC (rev 18548)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/etc/appclient.jndi.properties 2014-03-31 13:26:10 UTC (rev 18549)
@@ -1,7 +0,0 @@
-java.naming.factory.initial=org.jboss.naming.remote.client.InitialContextFactory
-java.naming.factory.url.pkgs=org.jboss.ejb.client.naming:org.jboss.naming.remote.client
-java.naming.provider.url=remote://@jboss.bind.address@:4448
-jboss.naming.client.connect.options.org.xnio.Options.SASL_POLICY_NOPLAINTEXT=false
-jboss.naming.client.security.callback.handler.class=org.jboss.wsf.test.CallbackHandler
-jboss.naming.client.endpoint.create.options.org.xnio.Options.WORKER_TASK_CORE_THREADS=1
-jboss.naming.client.endpoint.create.options.org.xnio.Options.WORKER_TASK_MAX_THREADS=4
Modified: stack/cxf/trunk/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/AppclientHelper.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/AppclientHelper.java 2014-03-28 10:59:46 UTC (rev 18548)
+++ stack/cxf/trunk/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/AppclientHelper.java 2014-03-31 13:26:10 UTC (rev 18549)
@@ -136,7 +136,7 @@
ap.output = new ByteArrayOutputStream();
final List<String> args = new LinkedList<String>();
args.add(appclientScript);
- String appclientConfigName = System.getProperty("APPCLIENT_CONFIG_NAME", "appclient-ws.xml");
+ String appclientConfigName = System.getProperty("APPCLIENT_CONFIG_NAME", "appclient.xml");
String configArg = "--appclient-config=" + appclientConfigName;
args.add(configArg);
args.add(appclientFullName);
Modified: stack/cxf/trunk/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTest.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2014-03-28 10:59:46 UTC (rev 18548)
+++ stack/cxf/trunk/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2014-03-31 13:26:10 UTC (rev 18549)
@@ -284,16 +284,6 @@
return env;
}
- /** Gets the appclient remote env context.
- * Every test calling this method have to ensure InitialContext.close()
- * method is called at end of test to clean up all associated caches.
- */
- public static InitialContext getAppclientInitialContext() throws NamingException, IOException
- {
- final Hashtable<String, String> env = getEnvironment("appclient.jndi.properties");
- return new InitialContext(env);
- }
-
/** Get the server remote env context
* Every test calling this method have to ensure InitialContext.close()
* method is called at end of test to clean up all associated caches.
10 years
JBossWS SVN: r18548 - stack/cxf/trunk/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test.
by jbossws-commits＠lists.jboss.org
Author: psakar
Date: 2014-03-28 06:59:46 -0400 (Fri, 28 Mar 2014)
New Revision: 18548
Modified:
stack/cxf/trunk/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/AppclientHelper.java
Log:
[JBWS-3782] Allow to specify config name and additional value for JAVA_OPTS for launched appclient
Modified: stack/cxf/trunk/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/AppclientHelper.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/AppclientHelper.java 2014-03-28 10:34:26 UTC (rev 18547)
+++ stack/cxf/trunk/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/AppclientHelper.java 2014-03-28 10:59:46 UTC (rev 18548)
@@ -28,6 +28,7 @@
import java.io.IOException;
import java.io.OutputStream;
import java.io.PrintWriter;
+import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedList;
@@ -135,7 +136,9 @@
ap.output = new ByteArrayOutputStream();
final List<String> args = new LinkedList<String>();
args.add(appclientScript);
- args.add("--appclient-config=appclient-ws.xml");
+ String appclientConfigName = System.getProperty("APPCLIENT_CONFIG_NAME", "appclient-ws.xml");
+ String configArg = "--appclient-config=" + appclientConfigName;
+ args.add(configArg);
args.add(appclientFullName);
if (appclientOS == null)
{
@@ -165,7 +168,12 @@
javaOptsValue.append("-Djboss.bind.address=").append(undoIPv6Brackets(System.getProperty("jboss.bind.address", "localhost"))).append(" ");
javaOptsValue.append("-Djava.net.preferIPv4Stack=").append(System.getProperty("java.net.preferIPv4Stack", "true")).append(" ");
javaOptsValue.append("-Djava.net.preferIPv6Addresses=").append(System.getProperty("java.net.preferIPv6Addresses", "false")).append(" ");
+ String appclientDebugOpts = System.getProperty("APPCLIENT_DEBUG_OPTS", null);
+ if (appclientDebugOpts != null && appclientDebugOpts.trim().length() > 0)
+ javaOptsValue.append(appclientDebugOpts).append(" ");
pb.environment().put("JAVA_OPTS", javaOptsValue.toString());
+ System.out.println("JAVA_OPTS=\"" + javaOptsValue.toString() + "\"");
+ System.out.println("Starting " + appclientScript + " " + configArg + " " + appclientFullName + (appclientArgs == null ? "" : " with args " + Arrays.asList(appclientArgs)));
ap.process = pb.start();
// appclient out
ap.outTask = new CopyJob(ap.process.getInputStream(), new TeeOutputStream(ap.output, logOutputStreams));
10 years, 1 month
JBossWS SVN: r18547 - in stack/cxf/trunk/modules/testsuite/cxf-tests/src/test: resources/jaxws/cxf/mixtype/WEB-INF and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2014-03-28 06:34:26 -0400 (Fri, 28 Mar 2014)
New Revision: 18547
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/MixedTypeTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/mixtype/WEB-INF/web.xml
Log:
Add test for deploy the same endpoint implementation with different url patterns
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/MixedTypeTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/MixedTypeTestCase.java 2014-03-27 12:11:50 UTC (rev 18546)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/MixedTypeTestCase.java 2014-03-28 10:34:26 UTC (rev 18547)
@@ -35,6 +35,7 @@
{
private final String endpointURL = "http://" + getServerHost() + ":8080/mixtype/ServiceOne/EndpointOne";
private final String endpoint2URL = "http://" + getServerHost() + ":8080/mixtype/ServiceOne/EndpointTwo";
+ private final String anotherEndpoint2URL = "http://" + getServerHost() + ":8080/mixtype/ServiceOne/AnotherEndpointTwo";
private final String ejbEndpointURL = "http://" + getServerHost() + ":8080/mixtype/EJBServiceOne/EndpointOneEJB3Impl";
private String targetNS = "http://org.jboss.ws.jaxws.cxf/mixtype";
@@ -77,5 +78,17 @@
assertEquals("mixedType", endpoint.echo("mixedType"));
assertEquals(1, endpoint.getCount() - initialCount);
}
+
+ public void testEndpoint2WithAnotherURLPattern() throws Exception
+ {
+ //verify everything works with an endpoint extending another one impl
+ URL wsdlOneURL = new URL(anotherEndpoint2URL + "?wsdl");
+ QName serviceOneName = new QName(targetNS, "ServiceOne");
+ Service service = Service.create(wsdlOneURL, serviceOneName);
+ EndpointOne endpoint = (EndpointOne)service.getPort(new QName(targetNS, "EndpointTwoPort"), EndpointOne.class);
+ int initialCount = endpoint.getCount();
+ assertEquals("mixedType", endpoint.echo("mixedType"));
+ assertEquals(1, endpoint.getCount() - initialCount);
+ }
}
\ No newline at end of file
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/mixtype/WEB-INF/web.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/mixtype/WEB-INF/web.xml 2014-03-27 12:11:50 UTC (rev 18546)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/mixtype/WEB-INF/web.xml 2014-03-28 10:34:26 UTC (rev 18547)
@@ -10,6 +10,10 @@
<servlet>
<servlet-name>Ep2Servlet</servlet-name>
<servlet-class>org.jboss.test.ws.jaxws.cxf.mixtype.EndpointTwoImpl</servlet-class>
+ </servlet>
+ <servlet>
+ <servlet-name>Ep2Servlet2</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.cxf.mixtype.EndpointTwoImpl</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>Ep1Servlet</servlet-name>
@@ -19,4 +23,8 @@
<servlet-name>Ep2Servlet</servlet-name>
<url-pattern>/ServiceOne/EndpointTwo</url-pattern>
</servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Ep2Servlet2</servlet-name>
+ <url-pattern>/ServiceOne/AnotherEndpointTwo</url-pattern>
+ </servlet-mapping>
</web-app>
10 years, 1 month
JBossWS SVN: r18546 - in stack/cxf/trunk: modules/jaspi/src/main/java/org/jboss/wsf/stack/cxf/jaspi/client/module and 6 other directories.
by jbossws-commits＠lists.jboss.org
Author: psakar
Date: 2014-03-27 08:11:50 -0400 (Thu, 27 Mar 2014)
New Revision: 18546
Modified:
stack/cxf/trunk/
stack/cxf/trunk/modules/jaspi/src/main/java/org/jboss/wsf/stack/cxf/jaspi/client/module/SOAPClientAuthModule.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustActAsTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustOnBehalfOfTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/actas/ActAsOutInterceptor.java
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerauth/SecureEndpointImpl.java
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerauth/SecureEndpointImpl2.java
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerauth/SecureEndpointImpl3.java
stack/cxf/trunk/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/AppclientHelper.java
Log:
Removed unused import stmts and fixed warnings
Property changes on: stack/cxf/trunk
___________________________________________________________________
Modified: svn:ignore
- ant.properties
clipboard.*
target
.classpath
.project
.settings
profiles.xml
target.properties
transaction.log
+ ant.properties
clipboard.*
target
.classpath
.project
.settings
profiles.xml
target.properties
transaction.log
.git
.gitignore
Modified: stack/cxf/trunk/modules/jaspi/src/main/java/org/jboss/wsf/stack/cxf/jaspi/client/module/SOAPClientAuthModule.java
===================================================================
--- stack/cxf/trunk/modules/jaspi/src/main/java/org/jboss/wsf/stack/cxf/jaspi/client/module/SOAPClientAuthModule.java 2014-03-27 11:41:32 UTC (rev 18545)
+++ stack/cxf/trunk/modules/jaspi/src/main/java/org/jboss/wsf/stack/cxf/jaspi/client/module/SOAPClientAuthModule.java 2014-03-27 12:11:50 UTC (rev 18546)
@@ -37,8 +37,8 @@
import org.jboss.security.SimplePrincipal;
/**
- * SOAPClientAuthModule
- * TODO: Investigate what we can do with this module
+ * SOAPClientAuthModule
+ * TODO: Investigate what we can do with this module
* @author <a href="mailto:ema@redhat.com">Jim Ma</a>
*/
public class SOAPClientAuthModule implements ClientAuthModule
@@ -62,7 +62,7 @@
private CallbackHandler handler = null;
@SuppressWarnings(
- {"rawtypes"})
+ {"rawtypes", "unused"})
private Map options = null;
public SOAPClientAuthModule()
@@ -87,12 +87,10 @@
this.options = options;
}
- @SuppressWarnings(
- {"unchecked"})
public AuthStatus secureRequest(MessageInfo messageInfo, Subject source) throws AuthException
{
log = "secureRequest";
- SOAPMessage soapMessage = (SOAPMessage) messageInfo.getRequestMessage();
+ messageInfo.getRequestMessage();
return AuthStatus.SUCCESS;
}
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java 2014-03-27 11:41:32 UTC (rev 18545)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java 2014-03-27 12:11:50 UTC (rev 18546)
@@ -29,8 +29,6 @@
import org.jboss.ws.api.annotation.EndpointConfig;
import org.jboss.ws.api.util.ServiceLoader;
import org.jboss.ws.common.management.AbstractServerConfig;
-import org.jboss.wsf.spi.SPIProvider;
-import org.jboss.wsf.spi.WSFException;
import org.jboss.wsf.spi.classloading.ClassLoaderProvider;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
@@ -47,7 +45,7 @@
import org.jboss.wsf.stack.cxf.security.authentication.AutenticationMgrSubjectCreatingInterceptor;
/**
- *
+ *
* @author alessio.soldano(a)jboss.com
* @since 16-Jun-2010
*/
@@ -56,13 +54,13 @@
private WSDLFilePublisher wsdlPublisher;
private List<Endpoint> depEndpoints;
-
+
private UnifiedVirtualFile deploymentRoot;
-
+
private String epConfigName;
-
+
private String epConfigFile;
-
+
@Override
public void customize(Object beanInstance)
{
@@ -107,11 +105,11 @@
// setup our invoker for http endpoints if invoker is not configured in jbossws-cxf.xml DD
boolean isHttpEndpoint = endpoint.getAddress() != null && endpoint.getAddress().substring(0, 5).toLowerCase().startsWith("http");
- if ((endpoint.getInvoker() == null) && isHttpEndpoint)
+ if ((endpoint.getInvoker() == null) && isHttpEndpoint)
{
endpoint.setInvoker(new JBossWSInvoker());
}
-
+
// ** Endpoint configuration setup **
// 1) default values
String configName = org.jboss.wsf.spi.metadata.config.EndpointConfig.STANDARD_ENDPOINT_CONFIG;
@@ -157,7 +155,7 @@
{
UnifiedVirtualFile vf = deploymentRoot.findChild(configFile);
ConfigRoot config = ConfigMetaDataParser.parse(vf.toURL());
- endpoint.setEndpointConfig(config.getEndpointConfigByName(configName));
+ endpoint.setEndpointConfig(config.getEndpointConfigByName(configName));
}
catch (IOException e)
{
@@ -180,14 +178,14 @@
}
}
}
-
+
private static ServerConfig getServerConfig() {
if(System.getSecurityManager() == null) {
return AbstractServerConfig.getServerIntegrationServerConfig();
}
return AccessController.doPrivileged(AbstractServerConfig.GET_SERVER_INTEGRATION_SERVER_CONFIG);
}
-
+
public void setDeploymentRoot(UnifiedVirtualFile deploymentRoot)
{
this.deploymentRoot = deploymentRoot;
@@ -202,7 +200,7 @@
{
this.depEndpoints = endpoints;
}
-
+
public void setEpConfigName(String epConfigName)
{
this.epConfigName = epConfigName;
@@ -212,7 +210,7 @@
{
this.epConfigFile = epConfigFile;
}
-
-
+
+
}
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java 2014-03-27 11:41:32 UTC (rev 18545)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java 2014-03-27 12:11:50 UTC (rev 18546)
@@ -27,7 +27,6 @@
import javax.xml.ws.spi.Provider;
-import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.configuration.Configurer;
import org.jboss.ws.api.binding.BindingCustomization;
@@ -56,7 +55,7 @@
*/
public final class BusDeploymentAspect extends AbstractDeploymentAspect
{
-
+
@Override
public void start(final Deployment dep)
{
@@ -68,7 +67,7 @@
}
startDeploymentBus(dep);
}
-
+
@Override
public void stop(final Deployment dep)
{
@@ -118,7 +117,7 @@
DDBeans metadata = dep.getAttachment(DDBeans.class);
holder = new NonSpringBusHolder(metadata);
}
-
+
String epConfigName = null;
String epConfigFile = null;
JSEArchiveMetaData jsemd = dep.getAttachment(JSEArchiveMetaData.class);
@@ -131,7 +130,7 @@
epConfigName = wsmd.getConfigName();
epConfigFile = wsmd.getConfigFile();
}
-
+
Configurer configurer = holder.createServerConfigurer(dep.getAttachment(BindingCustomization.class),
new WSDLFilePublisher(aDep), dep.getService().getEndpoints(), aDep.getRootFile(), epConfigName, epConfigFile);
holder.configure(resolver, configurer, wsmd, dep);
@@ -162,5 +161,5 @@
throw new RuntimeException(e);
}
}
-
+
}
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustActAsTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustActAsTestCase.java 2014-03-27 11:41:32 UTC (rev 18545)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustActAsTestCase.java 2014-03-27 12:11:50 UTC (rev 18546)
@@ -41,7 +41,6 @@
public class WSTrustActAsTestCase extends JBossWSTest
{
private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-samples-wsse-policy-trust-actas/ActAsService";
- private final String stsURL = "http://" + getServerHost() + ":8080/jaxws-samples-wsse-policy-trust-sts/SecurityTokenService";
public static Test suite()
{
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustOnBehalfOfTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustOnBehalfOfTestCase.java 2014-03-27 11:41:32 UTC (rev 18545)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustOnBehalfOfTestCase.java 2014-03-27 12:11:50 UTC (rev 18546)
@@ -41,7 +41,6 @@
public class WSTrustOnBehalfOfTestCase extends JBossWSTest
{
private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-samples-wsse-policy-trust-onbehalfof/OnBehalfOfService";
- private final String stsURL = "http://" + getServerHost() + ":8080/jaxws-samples-wsse-policy-trust-sts/SecurityTokenService";
public static Test suite()
{
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/actas/ActAsOutInterceptor.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/actas/ActAsOutInterceptor.java 2014-03-27 11:41:32 UTC (rev 18545)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/actas/ActAsOutInterceptor.java 2014-03-27 12:11:50 UTC (rev 18546)
@@ -64,7 +64,7 @@
dumpMsgInfo(key, mInfo);
} else if (o instanceof ArrayList) {
- for (Object obj: (ArrayList)o){
+ for (Object obj: (ArrayList<?>)o){
System.out.println("##ACTAS arrayItem: " + obj.getClass().getCanonicalName());
}
}
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerauth/SecureEndpointImpl.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerauth/SecureEndpointImpl.java 2014-03-27 11:41:32 UTC (rev 18545)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerauth/SecureEndpointImpl.java 2014-03-27 12:11:50 UTC (rev 18546)
@@ -21,35 +21,20 @@
*/
package org.jboss.test.ws.jaxws.handlerauth;
-import javax.jws.Oneway;
-import javax.jws.WebService;
-import javax.ejb.Stateless;
+import javax.annotation.Resource;
import javax.annotation.security.DeclareRoles;
import javax.annotation.security.DenyAll;
import javax.annotation.security.PermitAll;
import javax.annotation.security.RolesAllowed;
-
-import javax.jws.WebMethod;
-
-import java.util.Enumeration;
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-import javax.xml.ws.WebServiceContext;
-import javax.xml.ws.handler.MessageContext;
-import javax.xml.ws.handler.soap.SOAPMessageContext;
-import javax.xml.ws.handler.soap.SOAPHandler;
+import javax.ejb.Stateless;
import javax.jws.HandlerChain;
-import javax.xml.soap.SOAPMessage;
-import javax.annotation.PostConstruct;
+import javax.jws.Oneway;
+import javax.jws.WebService;
+import javax.xml.ws.WebServiceContext;
-import java.io.PrintStream;
-import java.util.Map;
-import java.util.Set;
-
-import org.jboss.ws.api.annotation.WebContext;
import org.jboss.ejb3.annotation.SecurityDomain;
import org.jboss.logging.Logger;
+import org.jboss.ws.api.annotation.WebContext;
@WebService(name = "SecureEndpoint", targetNamespace = "http://ws/")
@HandlerChain(file = "handlers.xml")
@@ -61,7 +46,7 @@
public class SecureEndpointImpl implements SecureEndpoint
{
private Logger log = Logger.getLogger(this.getClass());
-
+
@Resource
WebServiceContext context;
@@ -88,23 +73,23 @@
return "Mr. " + name + ", you authenticated as \'" + principalName + "\'";
}
}
-
+
public int getHandlerCounter() {
return SimpleHandler.counter.get();
}
-
-
+
+
@Oneway
@RolesAllowed("friend")
public void ping() {
//NOOP
}
-
+
@DenyAll
public void deniedMethod() {
//NOOP
}
-
+
@PermitAll
public String echo(String s) {
return s;
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerauth/SecureEndpointImpl2.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerauth/SecureEndpointImpl2.java 2014-03-27 11:41:32 UTC (rev 18545)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerauth/SecureEndpointImpl2.java 2014-03-27 12:11:50 UTC (rev 18546)
@@ -21,35 +21,20 @@
*/
package org.jboss.test.ws.jaxws.handlerauth;
-import javax.jws.Oneway;
-import javax.jws.WebService;
-import javax.ejb.Stateless;
+import javax.annotation.Resource;
import javax.annotation.security.DeclareRoles;
import javax.annotation.security.DenyAll;
import javax.annotation.security.PermitAll;
import javax.annotation.security.RolesAllowed;
-
-import javax.jws.WebMethod;
-
-import java.util.Enumeration;
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-import javax.xml.ws.WebServiceContext;
-import javax.xml.ws.handler.MessageContext;
-import javax.xml.ws.handler.soap.SOAPMessageContext;
-import javax.xml.ws.handler.soap.SOAPHandler;
+import javax.ejb.Stateless;
import javax.jws.HandlerChain;
-import javax.xml.soap.SOAPMessage;
-import javax.annotation.PostConstruct;
+import javax.jws.Oneway;
+import javax.jws.WebService;
+import javax.xml.ws.WebServiceContext;
-import java.io.PrintStream;
-import java.util.Map;
-import java.util.Set;
-
-import org.jboss.ws.api.annotation.WebContext;
import org.jboss.ejb3.annotation.SecurityDomain;
import org.jboss.logging.Logger;
+import org.jboss.ws.api.annotation.WebContext;
@WebService(name = "SecureEndpoint2", targetNamespace = "http://ws/")
@HandlerChain(file = "handlers2.xml")
@@ -61,7 +46,7 @@
public class SecureEndpointImpl2 implements SecureEndpoint
{
private Logger log = Logger.getLogger(this.getClass());
-
+
@Resource
WebServiceContext context;
@@ -88,23 +73,23 @@
return "Mr. " + name + ", you authenticated as \'" + principalName + "\'";
}
}
-
+
public int getHandlerCounter() {
return LogicalSimpleHandler.counter.get();
}
-
-
+
+
@Oneway
@RolesAllowed("friend")
public void ping() {
//NOOP
}
-
+
@DenyAll
public void deniedMethod() {
//NOOP
}
-
+
@PermitAll
public String echo(String s) {
return s;
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerauth/SecureEndpointImpl3.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerauth/SecureEndpointImpl3.java 2014-03-27 11:41:32 UTC (rev 18545)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerauth/SecureEndpointImpl3.java 2014-03-27 12:11:50 UTC (rev 18546)
@@ -21,35 +21,20 @@
*/
package org.jboss.test.ws.jaxws.handlerauth;
-import javax.jws.Oneway;
-import javax.jws.WebService;
-import javax.ejb.Stateless;
+import javax.annotation.Resource;
import javax.annotation.security.DeclareRoles;
import javax.annotation.security.DenyAll;
import javax.annotation.security.PermitAll;
import javax.annotation.security.RolesAllowed;
-
-import javax.jws.WebMethod;
-
-import java.util.Enumeration;
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-import javax.xml.ws.WebServiceContext;
-import javax.xml.ws.handler.MessageContext;
-import javax.xml.ws.handler.soap.SOAPMessageContext;
-import javax.xml.ws.handler.soap.SOAPHandler;
+import javax.ejb.Stateless;
import javax.jws.HandlerChain;
-import javax.xml.soap.SOAPMessage;
-import javax.annotation.PostConstruct;
+import javax.jws.Oneway;
+import javax.jws.WebService;
+import javax.xml.ws.WebServiceContext;
-import java.io.PrintStream;
-import java.util.Map;
-import java.util.Set;
-
-import org.jboss.ws.api.annotation.WebContext;
import org.jboss.ejb3.annotation.SecurityDomain;
import org.jboss.logging.Logger;
+import org.jboss.ws.api.annotation.WebContext;
@WebService(name = "SecureEndpoint3", targetNamespace = "http://ws/")
@HandlerChain(file = "handlers.xml")
@@ -61,7 +46,7 @@
public class SecureEndpointImpl3 implements SecureEndpoint
{
private Logger log = Logger.getLogger(this.getClass());
-
+
@Resource
WebServiceContext context;
@@ -88,23 +73,23 @@
return "Mr. " + name + ", you authenticated as \'" + principalName + "\'";
}
}
-
+
public int getHandlerCounter() {
return SimpleHandler.counter.get();
}
-
-
+
+
@Oneway
@RolesAllowed("friend")
public void ping() {
//NOOP
}
-
+
@DenyAll
public void deniedMethod() {
//NOOP
}
-
+
@PermitAll
public String echo(String s) {
return s;
Modified: stack/cxf/trunk/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/AppclientHelper.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/AppclientHelper.java 2014-03-27 11:41:32 UTC (rev 18545)
+++ stack/cxf/trunk/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/AppclientHelper.java 2014-03-27 12:11:50 UTC (rev 18546)
@@ -58,7 +58,7 @@
private static Map<String, AppclientProcess> appclients = Collections.synchronizedMap(new HashMap<String, AppclientProcess>(2));
private static ExecutorService executors = Executors.newCachedThreadPool(AppclientDaemonFactory.INSTANCE);
private static String appclientOutputDir;
-
+
private static class AppclientProcess {
public Process process;
public CopyJob outTask;
@@ -66,7 +66,7 @@
public OutputStream output;
public OutputStream log;
}
-
+
private AppclientHelper()
{
// forbidden instantiation
@@ -75,7 +75,7 @@
/**
* Triggers appclient deployment and returns the corresponding Process
* Please note the provided output stream (if any) is not automatically closed.
- *
+ *
* @param archive
* @param appclientOS
* @param appclientArgs
@@ -149,15 +149,16 @@
args.add(appclientArg);
}
}
-
+
//note on output streams closing: we're not caring about closing any here as it's quite a complex thing due to the TeeOutputStream nesting;
//we're however still safe, given the ap.output is a ByteArrayOutputStream (whose .close() does nothing), ap.log is explicitly closed at
//undeploy and closing appclientOS is a caller responsibility.
-
+
ap.log = new FileOutputStream(new File(getAppclientOutputDir(), appclientShortName + ".log-" + System.currentTimeMillis()));
+ @SuppressWarnings("resource")
final OutputStream logOutputStreams = (appclientOS == null) ? ap.log : new TeeOutputStream(ap.log, appclientOS);
printLogTrailer(logOutputStreams, appclientFullName);
-
+
final ProcessBuilder pb = new ProcessBuilder().command(args);
// always propagate IPv6 related properties
final StringBuilder javaOptsValue = new StringBuilder();
@@ -179,7 +180,7 @@
throw e;
}
}
-
+
private static void printLogTrailer(OutputStream logOutputStreams, String appclientFullName) {
final PrintWriter pw = new PrintWriter(logOutputStreams);
pw.write("Starting appclient process: " + appclientFullName + "...\n");
@@ -188,7 +189,7 @@
private static String undoIPv6Brackets(final String s)
{
- return s.startsWith("[") ? s.substring(1, s.length() - 1) : s;
+ return s.startsWith("[") ? s.substring(1, s.length() - 1) : s;
}
private static void shutdownAppclient(final String archive, final OutputStream os) throws IOException, InterruptedException
@@ -214,7 +215,7 @@
int countOfAttempts = 0;
final int maxCountOfAttempts = TIMEOUT * 2; // max wait time: default 2 minutes
while (!os.toString().contains(patternToMatch))
- {
+ {
Thread.sleep(500);
if (countOfAttempts++ == maxCountOfAttempts)
{
@@ -223,7 +224,7 @@
}
return true;
}
-
+
private static String getKillFileName(final String archive)
{
final int sharpIndex = archive.indexOf('#');
@@ -250,7 +251,7 @@
}
return appclientOutputDir;
}
-
+
private static String getAppclientFullName(final String archive)
{
final int sharpIndex = archive.indexOf('#');
@@ -269,7 +270,7 @@
final int sharpIndex = archive.indexOf('#');
return archive.substring(0, sharpIndex);
}
-
+
// [JBPAPP-10027] appclient threads are always daemons (to don't block JVM shutdown)
private static class AppclientDaemonFactory implements ThreadFactory {
static final AppclientDaemonFactory INSTANCE = new AppclientDaemonFactory();
@@ -289,5 +290,5 @@
return t;
}
}
-
+
}
10 years, 1 month
JBossWS SVN: r18545 - in stack/cxf/trunk/modules/testsuite: test-utils/src/main/java/org/jboss/wsf/test and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: psakar
Date: 2014-03-27 07:41:32 -0400 (Thu, 27 Mar 2014)
New Revision: 18545
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/shared/WSTrustAppUtils.java
stack/cxf/trunk/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java
Log:
fix toIPv6URLFormat to accept IPv6 address starting with : (default format when setting address using -b)
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/shared/WSTrustAppUtils.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/shared/WSTrustAppUtils.java 2014-03-26 19:15:27 UTC (rev 18544)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/shared/WSTrustAppUtils.java 2014-03-27 11:41:32 UTC (rev 18545)
@@ -41,12 +41,8 @@
{
try
{
- if (host.startsWith(":"))
+ if (host.startsWith("[") || host.startsWith(":"))
{
- throw new IllegalArgumentException("JBossWS test suite requires IPv6 addresses to be wrapped with [] brackets. Expected format is: [" + host + "]");
- }
- if (host.startsWith("["))
- {
if (System.getProperty("java.net.preferIPv4Stack") == null)
{
throw new IllegalStateException("always provide java.net.preferIPv4Stack JVM property when using IPv6 address format");
Modified: stack/cxf/trunk/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2014-03-26 19:15:27 UTC (rev 18544)
+++ stack/cxf/trunk/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2014-03-27 11:41:32 UTC (rev 18545)
@@ -71,10 +71,10 @@
private static final String testResourcesDir = System.getProperty(SYSPROP_TEST_RESOURCES_DIRECTORY);
private static final String integrationTarget;
private static final String implInfo;
-
+
private static volatile Deployer deployer;
private static volatile MBeanServerConnection server;
-
+
static {
integrationTarget = System.getProperty(SYSPROP_JBOSSWS_INTEGRATION_TARGET);
if (integrationTarget == null)
@@ -204,20 +204,16 @@
*/
public static String getServerHost()
{
- final String host = System.getProperty(SYSPROP_JBOSS_BIND_ADDRESS, "localhost");
+ final String host = System.getProperty(SYSPROP_JBOSS_BIND_ADDRESS, "localhost");
return toIPv6URLFormat(host);
}
-
+
private static String toIPv6URLFormat(final String host)
{
try
{
- if (host.startsWith(":"))
+ if (host.startsWith("[") || host.startsWith(":"))
{
- throw new IllegalArgumentException("JBossWS test suite requires IPv6 addresses to be wrapped with [] brackets. Expected format is: [" + host + "]");
- }
- if (host.startsWith("["))
- {
if (System.getProperty("java.net.preferIPv4Stack") == null)
{
throw new IllegalStateException("always provide java.net.preferIPv4Stack JVM property when using IPv6 address format");
@@ -263,7 +259,7 @@
}
return server;
}
-
+
private static MBeanServerConnection getServerConnection(String jmxServiceUrl)
{
final String urlString = System.getProperty("jmx.service.url", jmxServiceUrl);
@@ -310,7 +306,7 @@
throw new IllegalStateException("Cannot obtain MBeanServerConnection to: " + urlString, e);
}
}
-
+
public static String getIntegrationTarget()
{
return integrationTarget;
@@ -367,13 +363,13 @@
{
return testResourcesDir;
}
-
+
public static String getTestUsername() {
String prop = System.getProperty(TEST_USERNAME);
if (prop == null || "".equals(prop) || ("${" + TEST_USERNAME + "}").equals(prop)) {
prop = "kermit";
}
- return prop;
+ return prop;
}
public static String getTestPassword() {
@@ -381,31 +377,31 @@
if (prop == null || "".equals(prop) || ("${" + TEST_PASSWORD + "}").equals(prop)) {
prop = "thefrog";
}
- return prop;
+ return prop;
}
public static void addSecurityDomain(String name, Map<String,String> authenticationOptions) throws Exception
{
getDeployer().addSecurityDomain(name, authenticationOptions);
}
-
+
public static void addJaspiSecurityDomain(String name, String loginModuleStackName, Map<String, String> loginModuleOptions, String authModuleName,
Map<String, String> authModuleOptions) throws Exception
{
getDeployer().addJaspiSecurityDomain(name, loginModuleStackName, loginModuleOptions, authModuleName, authModuleOptions);
}
-
-
+
+
public static void removeSecurityDomain(String name) throws Exception
{
getDeployer().removeSecurityDomain(name);
}
-
+
public static void addHttpsConnector(Map<String, String> options) throws Exception
{
getDeployer().addHttpsConnector(options);
}
-
+
public static void removeHttpsConnector() throws Exception
{
getDeployer().removeHttpsConnector();
10 years, 1 month
JBossWS SVN: r18544 - stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsdd.
by jbossws-commits＠lists.jboss.org
Author: rsearls
Date: 2014-03-26 15:15:27 -0400 (Wed, 26 Mar 2014)
New Revision: 18544
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsdd/WSDiscoveryTestCase.java
Log:
[BZ-1012454] prev code change removed. This is tmp debugging to id multi endpoints.
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsdd/WSDiscoveryTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsdd/WSDiscoveryTestCase.java 2014-03-26 17:09:02 UTC (rev 18543)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsdd/WSDiscoveryTestCase.java 2014-03-26 19:15:27 UTC (rev 18544)
@@ -151,10 +151,31 @@
private void checkResolveMatches(List<ResolveMatchType> rmts, String address, QName type) {
List<ResolveMatchType> rmtList = getByAddress(rmts, address);
- assertTrue("Number of matches can not be 0.", (rmtList.size() > 0));
+
+ //assertTrue("Number of matches can not be 0.", (rmtList.size() > 0));
+ assertEquals(dbgDumpList(rmtList), 1, rmtList.size());
assertEquals(type, rmtList.get(0).getTypes().iterator().next());
}
-
+
+ // tmp method for debugging jenkins runs.
+ // report uuid of the endpoint
+ private String dbgDumpList(List<ResolveMatchType> rmtList){
+ StringBuilder dbgStr = new StringBuilder().append("\n");
+
+ if(rmtList.size() > 1){
+ for(ResolveMatchType rmt: rmtList){
+ String tmpStr = rmt.getEndpointReference().toString();
+ int start = tmpStr.indexOf("<Address>");
+ int end = tmpStr.indexOf("</Address>");
+ if (start > -1 && end > -1){
+ String uuidStr = tmpStr.substring(start+9, end);
+ dbgStr.append(rmt.getXAddrs().get(0) +" " + uuidStr + "\n");
+ }
+ }
+ }
+ return dbgStr.toString();
+ }
+
private List<ResolveMatchType> getByAddress(List<ResolveMatchType> rmts, String address)
{
List<ResolveMatchType> list = new LinkedList<ResolveMatchType>();
10 years, 1 month
JBossWS SVN: r18543 - in stack/cxf/trunk/modules/testsuite: shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934 and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-03-26 13:09:02 -0400 (Wed, 26 Mar 2014)
New Revision: 18543
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060Tests.java
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/AbstractTestCase.java
Log:
Few minor changes to prevent possible concurrency issues in the testsuite
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060Tests.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060Tests.java 2014-03-26 16:35:00 UTC (rev 18542)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060Tests.java 2014-03-26 17:09:02 UTC (rev 18543)
@@ -116,9 +116,9 @@
private static class CallableOne implements Callable<Boolean>
{
- private EndpointOne port;
- private boolean oneway;
- private int seqNum;
+ private final EndpointOne port;
+ private final boolean oneway;
+ private final int seqNum;
public CallableOne(EndpointOne port, boolean oneway, int seqNum)
{
@@ -145,9 +145,9 @@
private static class CallableTwo implements Callable<Boolean>
{
- private EndpointTwo port;
- private boolean oneway;
- private int seqNum;
+ private final EndpointTwo port;
+ private final boolean oneway;
+ private final int seqNum;
public CallableTwo(EndpointTwo port, boolean oneway, int seqNum)
{
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/AbstractTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/AbstractTestCase.java 2014-03-26 16:35:00 UTC (rev 18542)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/AbstractTestCase.java 2014-03-26 17:09:02 UTC (rev 18543)
@@ -55,8 +55,12 @@
URL wsdlURL = new URL(getEndpointAddress() + "?wsdl");
Service service = Service.create(wsdlURL, serviceName);
- for (int i = 0; i < THREADS_COUNT; i++)
+ for (int i = 0; i < THREADS_COUNT; i++) {
proxies[i] = service.getPort(Endpoint.class);
+ //Make the request context threadsafe as we'll be setting the ENDPOINT_ADDRESS_PROPERTY in it;
+ //see http://cxf.apache.org/faq.html#FAQ-AreJAX-WSclientproxiesthreadsafe? for more details
+ ((BindingProvider)proxies[i]).getRequestContext().put("thread.local.request.context", "true");
+ }
}
public void testEndpointConcurrently() throws Exception
@@ -92,7 +96,7 @@
private final String jobName;
private final Endpoint proxy;
private final int countOfRequests;
- private Exception exception;
+ private volatile Exception exception;
private final String endpointAddress;
private static final Logger log = Logger.getLogger(TestJob.class);
10 years, 1 month