JBossWS SVN: r18405 - stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/udp.
by jbossws-commits@lists.jboss.org
Author: asoldano
Date: 2014-02-21 11:03:51 -0500 (Fri, 21 Feb 2014)
New Revision: 18405
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/udp/UDPEndpointAPITestCase.java
Log:
[JBWS-3721] Fixing testcase
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/udp/UDPEndpointAPITestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/udp/UDPEndpointAPITestCase.java 2014-02-21 10:18:45 UTC (rev 18404)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/udp/UDPEndpointAPITestCase.java 2014-02-21 16:03:51 UTC (rev 18405)
@@ -23,7 +23,11 @@
import java.io.BufferedReader;
import java.io.InputStreamReader;
+import java.net.InetAddress;
+import java.net.InterfaceAddress;
+import java.net.NetworkInterface;
import java.net.URL;
+import java.util.Enumeration;
import javax.xml.namespace.QName;
import javax.xml.ws.Endpoint;
@@ -58,6 +62,10 @@
public void testClientSide() throws Exception
{
+ if (!isProperNetworkSetup()) {
+ System.out.println("Skipping broadcast test: no non-loopback IPv4 interface available");
+ return;
+ }
Bus bus = BusFactory.newInstance().createBus();
BusFactory.setThreadDefaultBus(bus);
Object implementor = new HelloWorldImpl();
@@ -78,4 +86,34 @@
}
}
+ private boolean isProperNetworkSetup() throws Exception {
+ Enumeration<NetworkInterface> interfaces = NetworkInterface.getNetworkInterfaces();
+ int count = 0;
+ while (interfaces.hasMoreElements())
+ {
+ NetworkInterface networkInterface = interfaces.nextElement();
+ if (!networkInterface.isUp() || networkInterface.isLoopback() || !isBroadcastAddressAvailable(networkInterface))
+ {
+ continue;
+ }
+ count++;
+ }
+ if (count == 0)
+ {
+ //no non-loopbacks, cannot do broadcasts
+ return false;
+ }
+ return true;
+ }
+
+ private boolean isBroadcastAddressAvailable(NetworkInterface networkInterface) {
+ for (InterfaceAddress interfaceAddress : networkInterface.getInterfaceAddresses()) {
+ InetAddress broadcast = interfaceAddress.getBroadcast();
+ if (broadcast != null) {
+ return true;
+ }
+ }
+ return false;
+ }
+
}
10 years, 2 months
JBossWS SVN: r18404 - stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1841.
by jbossws-commits@lists.jboss.org
Author: asoldano
Date: 2014-02-21 05:18:45 -0500 (Fri, 21 Feb 2014)
New Revision: 18404
Modified:
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1841/JBWS1841TestCase.java
Log:
Clean initial context only after the all the remote ejb3 calls have been performed
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1841/JBWS1841TestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1841/JBWS1841TestCase.java 2014-02-20 18:28:53 UTC (rev 18403)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1841/JBWS1841TestCase.java 2014-02-21 10:18:45 UTC (rev 18404)
@@ -30,6 +30,8 @@
import javax.xml.namespace.QName;
import javax.xml.ws.Service;
import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
import java.net.URL;
/**
@@ -53,6 +55,16 @@
public void cleanUp() {
port = null;
remote = null;
+ if (ctx != null)
+ {
+ final InitialContext c = ctx;
+ ctx = null;
+ try {
+ c.close();
+ } catch (NamingException ne) {
+ throw new RuntimeException(ne);
+ }
+ }
}
});
}
@@ -70,15 +82,6 @@
}
}
- protected void tearDown() throws Exception
- {
- if (ctx != null)
- {
- ctx.close();
- ctx = null;
- }
- }
-
public void testDirectWSInvocation() throws Exception
{
String result = port.echo("DirectWSInvocation");
10 years, 2 months
JBossWS SVN: r18402 - stack/cxf/trunk/modules/testsuite/cxf-tests/scripts.
by jbossws-commits@lists.jboss.org
Author: asoldano
Date: 2014-02-20 08:31:46 -0500 (Thu, 20 Feb 2014)
New Revision: 18402
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml
Log:
Fixing permission issue
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2014-02-20 10:43:16 UTC (rev 18401)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2014-02-20 13:31:46 UTC (rev 18402)
@@ -535,6 +535,7 @@
prefix="META-INF">
<include name="clientstore.jks"/>
<include name="clientKeystore.properties"/>
+ <include name="permissions.xml"/>
</zipfileset>
<manifest>
<attribute name="Dependencies"
10 years, 2 months
JBossWS SVN: r18401 - in stack/cxf/trunk/modules/testsuite: cxf-spring-tests and 2 other directories.
by jbossws-commits@lists.jboss.org
Author: asoldano
Date: 2014-02-20 05:43:16 -0500 (Thu, 20 Feb 2014)
New Revision: 18401
Modified:
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/
stack/cxf/trunk/modules/testsuite/cxf-tests/
stack/cxf/trunk/modules/testsuite/pom.xml
stack/cxf/trunk/modules/testsuite/shared-tests/
Log:
[JBWS-3765] Run integration tests in 'alphabetical' order by default; adding a 'fast' maven profile to run in 'balanced' order.
Property changes on: stack/cxf/trunk/modules/testsuite/cxf-spring-tests
___________________________________________________________________
Modified: svn:ignore
- target
.classpath
.project
.settings
+ target
.classpath
.project
.settings
.surefire*
Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests
___________________________________________________________________
Modified: svn:ignore
- target
.classpath
.project
.settings
+ target
.classpath
.project
.settings
.surefire*
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2014-02-20 02:53:11 UTC (rev 18400)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2014-02-20 10:43:16 UTC (rev 18401)
@@ -243,6 +243,7 @@
<configuration>
<skip>true</skip>
<failIfNoTests>false</failIfNoTests>
+ <runOrder>alphabetical</runOrder>
</configuration>
<executions>
<execution>
@@ -550,6 +551,24 @@
</profile>
<!--
+ Name: fast
+ Descr: Slightly faster testsuite execution, using 'balanced' surefire runOrder
+ -->
+ <profile>
+ <id>fast</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <runOrder>balanced</runOrder>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!--
Name: spring
Descr: Add SpringFramework dependencies to test classpath
-->
Property changes on: stack/cxf/trunk/modules/testsuite/shared-tests
___________________________________________________________________
Modified: svn:ignore
- .classpath
.project
.settings
target
+ .classpath
.project
.settings
target
.surefire*
10 years, 2 months
JBossWS SVN: r18400 - projects/wsi-bp-test/branches/wsi-bp-test-4.3.0.Beta2.
by jbossws-commits@lists.jboss.org
Author: jim.ma
Date: 2014-02-19 21:53:11 -0500 (Wed, 19 Feb 2014)
New Revision: 18400
Modified:
projects/wsi-bp-test/branches/wsi-bp-test-4.3.0.Beta2/pom.xml
Log:
Update dependency version
Modified: projects/wsi-bp-test/branches/wsi-bp-test-4.3.0.Beta2/pom.xml
===================================================================
--- projects/wsi-bp-test/branches/wsi-bp-test-4.3.0.Beta2/pom.xml 2014-02-20 02:37:26 UTC (rev 18399)
+++ projects/wsi-bp-test/branches/wsi-bp-test-4.3.0.Beta2/pom.xml 2014-02-20 02:53:11 UTC (rev 18400)
@@ -26,20 +26,20 @@
<test.classes.directory>${project.build.directory}/test-classes</test.classes.directory>
<test.resources.directory>${project.build.directory}/test-resources</test.resources.directory>
- <jbossws.cxf.version>4.2.2-SNAPSHOT</jbossws.cxf.version>
- <jbossws.shared.testsuite.version>4.2.0-SNAPSHOT</jbossws.shared.testsuite.version>
+ <jbossws.cxf.version>4.3.0.Beta2</jbossws.cxf.version>
+ <jbossws.shared.testsuite.version>4.3.0.Beta2</jbossws.shared.testsuite.version>
<junit.version>4.10</junit.version>
<log4j.version>1.2.14</log4j.version>
<jboss720.version>7.2.0.Final</jboss720.version>
- <wildfly800.version>8.0.0.Beta1-SNAPSHOT</wildfly800.version>
+ <wildfly800.version>8.0.1.Final-SNAPSHOT</wildfly800.version>
<ejb.api.version>1.0.1.Final</ejb.api.version>
<jaxb.api.version>1.0.3.Final</jaxb.api.version>
<jaxws.api.version>2.0.0.Final</jaxws.api.version>
<jsr181.api.version>1.0-MR1</jsr181.api.version>
- <picketlink.version>2.1.4.Final</picketlink.version>
+ <picketlink.version>2.1.7.Final</picketlink.version>
<org.slf4j.version>1.6.1</org.slf4j.version>
</properties>
@@ -53,8 +53,8 @@
<!-- Dependencies -->
<dependencies>
<dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-shared-testsuite</artifactId>
+ <groupId>org.jboss.ws.cxf</groupId>
+ <artifactId>jbossws-cxf-shared-tests</artifactId>
<version>${jbossws.shared.testsuite.version}</version>
<scope>test</scope>
</dependency>
@@ -64,9 +64,21 @@
<artifactId>jbossws-cxf-client</artifactId>
<version>${jbossws.cxf.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.jboss.ws.cxf</groupId>
+ <artifactId>jbossws-cxf-server</artifactId>
+ <version>${jbossws.cxf.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.jboss.ws.cxf</groupId>
+ <artifactId>jbossws-cxf-test-utils</artifactId>
+ <version>${jbossws.cxf.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-factories</artifactId>
<version>${jbossws.cxf.version}</version>
</dependency>
@@ -483,8 +495,8 @@
</properties>
<dependencies>
<dependency>
- <groupId>org.wildlfy</groupId>
- <artifactId>wildfly-webservices-server-integration</artifactId>
+ <groupId>org.wildfly</groupId>
+ <artifactId>wildfly-webservices-tests-integration</artifactId>
<version>${jboss.version}</version>
</dependency>
</dependencies>
10 years, 2 months
JBossWS SVN: r18399 - projects/wsi-bp-test/branches.
by jbossws-commits@lists.jboss.org
Author: jim.ma
Date: 2014-02-19 21:37:26 -0500 (Wed, 19 Feb 2014)
New Revision: 18399
Added:
projects/wsi-bp-test/branches/wsi-bp-test-4.3.0.Beta2/
Log:
Create branch for jbossws-cxf-4.3.2.Beta2 test
10 years, 2 months
JBossWS SVN: r18398 - stack/cxf/trunk/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test.
by jbossws-commits@lists.jboss.org
Author: asoldano
Date: 2014-02-19 13:37:09 -0500 (Wed, 19 Feb 2014)
New Revision: 18398
Modified:
stack/cxf/trunk/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java
Log:
Prevent transient failure due to https low level connection reuse (when different htts configurations are used by following tests)
Modified: stack/cxf/trunk/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java 2014-02-19 18:13:54 UTC (rev 18397)
+++ stack/cxf/trunk/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java 2014-02-19 18:37:09 UTC (rev 18398)
@@ -31,6 +31,7 @@
import java.util.List;
import java.util.Map;
import java.util.StringTokenizer;
+import java.util.concurrent.atomic.AtomicLong;
import javax.management.MBeanServerConnection;
import javax.naming.NamingException;
@@ -57,6 +58,8 @@
private static Logger log = Logger.getLogger(JBossWSTestSetup.class);
private static final String JBOSSWS_SEC_DOMAIN = "JBossWS";
+ private static final String SYSPROP_HTTPS_CONNECTION_REUSE_TIMEOUT = "test.https.connection.reuse.timeout";
+ private static final int HTTPS_CONNECTION_REUSE_TIMEOUT = Integer.getInteger(SYSPROP_HTTPS_CONNECTION_REUSE_TIMEOUT, 5000);
private String[] archives = new String[0];
private OutputStream appclientOutputStream;
@@ -66,6 +69,8 @@
private boolean defaultSecurityDomainRequirement = false;
private Map<String, String> httpsConnOptions;
private CleanupOperation cleanupOp;
+
+ private static volatile AtomicLong lastHttpsConnectorRemoval = new AtomicLong(0);
public JBossWSTestSetup(Class<?> testClass, String archiveList)
{
@@ -249,6 +254,17 @@
URLClassLoader cl = new URLClassLoader(urls, parent);
Thread.currentThread().setContextClassLoader(cl);
}
+ if (httpsConnOptions != null) {
+ final long lr = lastHttpsConnectorRemoval.get();
+ if (lr != 0) {
+ final long wait = HTTPS_CONNECTION_REUSE_TIMEOUT - (System.currentTimeMillis() - lr);
+ if (wait > 0) {
+ log.info("Will sleep for " + wait + " ms...");
+ Thread.sleep(wait);
+ log.debug("Going on!");
+ }
+ }
+ }
}
private static void performDeploy(String archive) throws Exception
@@ -311,6 +327,7 @@
if (httpsConnOptions != null)
{
JBossWSTestHelper.removeHttpsConnector();
+ lastHttpsConnectorRemoval.set(System.currentTimeMillis());
}
}
}
10 years, 2 months
JBossWS SVN: r18397 - stack/native/branches.
by jbossws-commits@lists.jboss.org
Author: klape
Date: 2014-02-19 13:13:54 -0500 (Wed, 19 Feb 2014)
New Revision: 18397
Added:
stack/native/branches/jbossws-native-3.1.2.SP15-patch-01_JBPAPP-10869/
Log:
[JBPAPP-10869] Creating one off branch
10 years, 2 months
JBossWS SVN: r18396 - stack/cxf/trunk/modules/dist/src/main/scripts.
by jbossws-commits@lists.jboss.org
Author: asoldano
Date: 2014-02-19 04:29:16 -0500 (Wed, 19 Feb 2014)
New Revision: 18396
Modified:
stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
Log:
Fixing typo
Modified: stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2014-02-18 17:01:52 UTC (rev 18395)
+++ stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2014-02-19 09:29:16 UTC (rev 18396)
@@ -97,7 +97,7 @@
<unpack>false</unpack>
<includes>
<include>org.jboss.ws:jbossws-jboss*-tests-integration:jar</include>
- <include>org.jboss.ws:jbossws-wildlfy*-tests-integration:jar</include>
+ <include>org.jboss.ws:jbossws-wildfly*-tests-integration:jar</include>
</includes>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
<scope>provided</scope>
10 years, 2 months
JBossWS SVN: r18395 - stack/cxf/trunk/modules/resources/src/main/resources/resources.
by jbossws-commits@lists.jboss.org
Author: asoldano
Date: 2014-02-18 12:01:52 -0500 (Tue, 18 Feb 2014)
New Revision: 18395
Modified:
stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
Log:
Remove wildfly-webservices-server-integration jar on WFLY800 target
Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2014-02-18 16:50:53 UTC (rev 18394)
+++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2014-02-18 17:01:52 UTC (rev 18395)
@@ -356,6 +356,7 @@
<delete verbose="true">
<fileset dir="${jboss.modules}">
<include name="**/org/jboss/as/webservices/main/jboss-as-webservices-server-integration*"/>
+ <include name="**/org/jboss/as/webservices/main/wildfly-webservices-server-integration*"/>
</fileset>
</delete>
</target>
10 years, 2 months