JBossWS SVN: r15254 - in stack/native/trunk/modules/resources/src/main/resources/modules: jboss710/org/jboss/ws/jaxws-client/main and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-11-14 04:30:15 -0500 (Mon, 14 Nov 2011)
New Revision: 15254
Modified:
stack/native/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/ws/jaxws-client/main/module.xml
stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/jaxws-client/main/module.xml
Log:
[JBWS-3384] ADdding wsdl4j to jaxws-client module dependencies
Modified: stack/native/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/ws/jaxws-client/main/module.xml
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/ws/jaxws-client/main/module.xml 2011-11-14 09:28:30 UTC (rev 15253)
+++ stack/native/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/ws/jaxws-client/main/module.xml 2011-11-14 09:30:15 UTC (rev 15254)
@@ -38,5 +38,6 @@
<module name="org.jboss.ws.native.jbossws-native-factories" services="import"/>
<module name="org.jboss.ws.native.jbossws-native-core" services="import"/>
<module name="org.jboss.logging" />
+ <module name="javax.wsdl4j.api" />
</dependencies>
</module>
Modified: stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/jaxws-client/main/module.xml
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/jaxws-client/main/module.xml 2011-11-14 09:28:30 UTC (rev 15253)
+++ stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/jaxws-client/main/module.xml 2011-11-14 09:30:15 UTC (rev 15254)
@@ -38,5 +38,6 @@
<module name="org.jboss.ws.native.jbossws-native-factories" services="import"/>
<module name="org.jboss.ws.native.jbossws-native-core" services="import"/>
<module name="org.jboss.logging" />
+ <module name="javax.wsdl4j.api" />
</dependencies>
</module>
12 years, 10 months
JBossWS SVN: r15253 - in stack/cxf/trunk/modules/resources/src/main/resources/modules: jboss710/org/jboss/ws/jaxws-client/main and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-11-14 04:28:30 -0500 (Mon, 14 Nov 2011)
New Revision: 15253
Modified:
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/ws/jaxws-client/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/jaxws-client/main/module.xml
Log:
[JBWS-3384] Adding javax.wsdl4j.api to jaxws-client module
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/ws/jaxws-client/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/ws/jaxws-client/main/module.xml 2011-11-12 16:19:09 UTC (rev 15252)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/ws/jaxws-client/main/module.xml 2011-11-14 09:28:30 UTC (rev 15253)
@@ -53,5 +53,6 @@
<module name="org.apache.neethi" />
<module name="org.jboss.logging" />
<module name="org.springframework.spring" optional="true" />
+ <module name="javax.wsdl4j.api" />
</dependencies>
</module>
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/jaxws-client/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/jaxws-client/main/module.xml 2011-11-12 16:19:09 UTC (rev 15252)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/jaxws-client/main/module.xml 2011-11-14 09:28:30 UTC (rev 15253)
@@ -53,5 +53,6 @@
<module name="org.apache.neethi" />
<module name="org.jboss.logging" />
<module name="org.springframework.spring" optional="true" />
+ <module name="javax.wsdl4j.api" />
</dependencies>
</module>
12 years, 10 months
JBossWS SVN: r15252 - hudson/trunk/hudson-home/jobs/CXF-ALL.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-11-12 11:19:09 -0500 (Sat, 12 Nov 2011)
New Revision: 15252
Modified:
hudson/trunk/hudson-home/jobs/CXF-ALL/config.xml
Log:
Adding missing AS 7 / 7.1 src dist jobs to CXF-ALL
Modified: hudson/trunk/hudson-home/jobs/CXF-ALL/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-ALL/config.xml 2011-11-12 15:31:59 UTC (rev 15251)
+++ hudson/trunk/hudson-home/jobs/CXF-ALL/config.xml 2011-11-12 16:19:09 UTC (rev 15252)
@@ -20,17 +20,25 @@
, CXF-BINDIST-AS-6.0.0-SPRING-SUN-JDK-6
+, CXF-BINDIST-AS-7.0.0-SUN-JDK-6
+
+, CXF-BINDIST-AS-7.0.0-SPRING-SUN-JDK-6
+
+, CXF-BINDIST-AS-7.1.0-SUN-JDK-6
+
+, CXF-BINDIST-AS-7.1.0-SPRING-SUN-JDK-6
+
, CXF-SRCDIST-AS-6.0.0-SUN-JDK-6
, CXF-SRCDIST-AS-6.0.0-SPRING-SUN-JDK-6
-, CXF-BINDIST-AS-7.0.0-SUN-JDK-6
+, CXF-SRCDIST-AS-7.0.0-SUN-JDK-6
-, CXF-BINDIST-AS-7.0.0-SPRING-SUN-JDK-6
+, CXF-SRCDIST-AS-7.0.0-SPRING-SUN-JDK-6
-, CXF-BINDIST-AS-7.1.0-SUN-JDK-6
+, CXF-SRCDIST-AS-7.1.0-SUN-JDK-6
-, CXF-BINDIST-AS-7.1.0-SPRING-SUN-JDK-6
+, CXF-SRCDIST-AS-7.1.0-SPRING-SUN-JDK-6
</childProjects>
<threshold>
<name>UNSTABLE</name>
12 years, 10 months
JBossWS SVN: r15251 - stack/cxf/trunk/modules/dist/src/main/distro.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-11-12 10:31:59 -0500 (Sat, 12 Nov 2011)
New Revision: 15251
Modified:
stack/cxf/trunk/modules/dist/src/main/distro/ant.properties.example
Log:
[AS7-2520] Also default to admin/admin in binary distro
Modified: stack/cxf/trunk/modules/dist/src/main/distro/ant.properties.example
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/distro/ant.properties.example 2011-11-12 15:31:05 UTC (rev 15250)
+++ stack/cxf/trunk/modules/dist/src/main/distro/ant.properties.example 2011-11-12 15:31:59 UTC (rev 15251)
@@ -15,7 +15,11 @@
jboss.server.instance=default
jboss.bind.address=localhost
-# JBoss JMX invoker authentication
+# JBoss Management console authentication (AS 7.1.x)
+jbossws.deployer.authentication.username=admin
+jbossws.deployer.authentication.password=admin
+
+# JBoss JMX invoker authentication (AS 6 / AS 7.0.x)
#jmx.authentication.username=admin
#jmx.authentication.password=admin
12 years, 10 months
JBossWS SVN: r15250 - stack/native/trunk/modules/dist/src/main/distro.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-11-12 10:31:05 -0500 (Sat, 12 Nov 2011)
New Revision: 15250
Modified:
stack/native/trunk/modules/dist/src/main/distro/ant.properties.example
Log:
[AS7-2520] Also default to admin/admin in binary distro
Modified: stack/native/trunk/modules/dist/src/main/distro/ant.properties.example
===================================================================
--- stack/native/trunk/modules/dist/src/main/distro/ant.properties.example 2011-11-12 15:30:05 UTC (rev 15249)
+++ stack/native/trunk/modules/dist/src/main/distro/ant.properties.example 2011-11-12 15:31:05 UTC (rev 15250)
@@ -15,7 +15,11 @@
jboss.server.instance=default
jboss.bind.address=localhost
-# JBoss JMX invoker authentication
+# JBoss Management console authentication (AS 7.1.x)
+jbossws.deployer.authentication.username=admin
+jbossws.deployer.authentication.password=admin
+
+# JBoss JMX invoker authentication (AS 6 / AS 7.0.x)
#jmx.authentication.username=admin
#jmx.authentication.password=admin
12 years, 10 months
JBossWS SVN: r15249 - shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2934.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-11-12 10:30:05 -0500 (Sat, 12 Nov 2011)
New Revision: 15249
Modified:
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2934/AbstractEndpoint.java
Log:
Typo
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2934/AbstractEndpoint.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2934/AbstractEndpoint.java 2011-11-12 15:29:27 UTC (rev 15248)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2934/AbstractEndpoint.java 2011-11-12 15:30:05 UTC (rev 15249)
@@ -63,7 +63,7 @@
int ctx1Value = this.getValue(this.wsCtx1, key);
int ctx2Value = this.getValue(this.wsCtx2, key);
if (ctx1Value != ctx2Value)
- throw new WebServiceException("Values have to be equivalent, they're comming from the same request");
+ throw new WebServiceException("Values have to be equivalent, they're coming from the same request");
return ++ctx1Value;
}
12 years, 10 months
JBossWS SVN: r15248 - shared-testsuite/trunk/testsuite/src/test/ant-import.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-11-12 10:29:27 -0500 (Sat, 12 Nov 2011)
New Revision: 15248
Modified:
shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml
Log:
[AS7-2520] Also default to admin/admin in binary distro
Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml 2011-11-12 14:34:28 UTC (rev 15247)
+++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml 2011-11-12 15:29:27 UTC (rev 15248)
@@ -607,6 +607,8 @@
<sysproperty key="jboss.server.instance" value="${jboss.server.instance}"/>
<sysproperty key="jboss.bind.address" value="${node0}"/>
<sysproperty key="jbossws.integration.target" value="${jbossws.integration.target}"/>
+ <sysproperty key="jbossws.deployer.authentication.username" value="${jbossws.deployer.authentication.username}"/>
+ <sysproperty key="jbossws.deployer.authentication.password" value="${jbossws.deployer.authentication.password}"/>
<sysproperty key="jmx.authentication.username" value="${jmx.authentication.username}"/>
<sysproperty key="jmx.authentication.password" value="${jmx.authentication.password}"/>
<sysproperty key="org.jboss.ws.testsuite.securityDomain.users.propfile" value="${tests.output.dir}/test-classes/jbossws-users.properties"/>
@@ -660,6 +662,8 @@
<sysproperty key="jboss.server.instance" value="${jboss.server.instance}"/>
<sysproperty key="jboss.bind.address" value="${node0}"/>
<sysproperty key="jbossws.integration.target" value="${jbossws.integration.target}"/>
+ <sysproperty key="jbossws.deployer.authentication.username" value="${jbossws.deployer.authentication.username}"/>
+ <sysproperty key="jbossws.deployer.authentication.password" value="${jbossws.deployer.authentication.password}"/>
<sysproperty key="jmx.authentication.username" value="${jmx.authentication.username}"/>
<sysproperty key="jmx.authentication.password" value="${jmx.authentication.password}"/>
<!--
12 years, 10 months
JBossWS SVN: r15247 - stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-11-12 09:34:28 -0500 (Sat, 12 Nov 2011)
New Revision: 15247
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060Tests.java
Log:
Wait 3 secs before collecting count of @Oneway concurrent invocations in JBWS3060 testcases
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 2011-11-12 13:36:28 UTC (rev 15246)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060Tests.java 2011-11-12 14:34:28 UTC (rev 15247)
@@ -92,6 +92,9 @@
{
assertTrue(f.get());
}
+ if (oneway) {
+ Thread.sleep(3000);
+ }
assertEquals(size, portOne.getCount() - count1);
assertEquals(size, portTwo.getCount() - count2);
}
12 years, 10 months
JBossWS SVN: r15246 - in stack/cxf/trunk/modules: testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-11-12 08:36:28 -0500 (Sat, 12 Nov 2011)
New Revision: 15246
Modified:
stack/cxf/trunk/modules/addons/transports/http/httpserver/src/test/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerEngineTest.java
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/EndpointOneEJB3Impl.java
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/EndpointOneImpl.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointOneEJB3Impl.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointOneImpl.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointTwoEJB3Impl.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointTwoImpl.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060ServletTestCase.java
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/logging/CustomInInterceptor.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/EndpointOneEJB3Impl.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/EndpointOneImpl.java
Log:
Fixing some tests: x++ on volatile attributes is not atomic
Modified: stack/cxf/trunk/modules/addons/transports/http/httpserver/src/test/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerEngineTest.java
===================================================================
--- stack/cxf/trunk/modules/addons/transports/http/httpserver/src/test/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerEngineTest.java 2011-11-11 18:41:49 UTC (rev 15245)
+++ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/test/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerEngineTest.java 2011-11-12 13:36:28 UTC (rev 15246)
@@ -28,13 +28,13 @@
import java.util.Collections;
import java.util.ArrayList;
import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
import junit.framework.TestCase;
import org.apache.cxf.Bus;
import org.apache.cxf.configuration.Configurer;
import org.apache.cxf.configuration.spring.ConfigurerImpl;
-import org.apache.cxf.service.model.EndpointInfo;
import org.easymock.classextension.EasyMock;
import org.easymock.classextension.IMocksControl;
@@ -135,8 +135,8 @@
engine.addHandler(urlStr2, handler2);
pingServer(new URL(urlStr1));
pingServer(new URL(urlStr2));
- assertEquals(1, handler1.count);
- assertEquals(1, handler2.count);
+ assertEquals(1, handler1.count.get());
+ assertEquals(1, handler2.count.get());
engine.removeHandler(urlStr1);
engine.removeHandler(urlStr2);
engine.shutdown();
@@ -161,7 +161,7 @@
private class MyTestHandler implements org.jboss.com.sun.net.httpserver.HttpHandler
{
- volatile int count;
+ AtomicInteger count = new AtomicInteger(0);
public MyTestHandler()
{
@@ -170,7 +170,7 @@
@Override
public void handle(org.jboss.com.sun.net.httpserver.HttpExchange exchange) throws IOException {
- count++;
+ count.incrementAndGet();
exchange.sendResponseHeaders(200, 0);
OutputStream os = exchange.getResponseBody();
os.write("Hello".getBytes());
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/EndpointOneEJB3Impl.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/EndpointOneEJB3Impl.java 2011-11-11 18:41:49 UTC (rev 15245)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/EndpointOneEJB3Impl.java 2011-11-12 13:36:28 UTC (rev 15246)
@@ -21,6 +21,8 @@
*/
package org.jboss.test.ws.jaxws.cxf.mixtype;
+import java.util.concurrent.atomic.AtomicInteger;
+
import javax.ejb.Stateless;
import javax.jws.Oneway;
import javax.jws.WebMethod;
@@ -34,13 +36,13 @@
@Stateless
public class EndpointOneEJB3Impl
{
- private volatile static int count = 0;
+ private static AtomicInteger count = new AtomicInteger(0);
@WebMethod
public String echo(String input)
{
Logger.getLogger(this.getClass()).info("echo: " + input);
- count++;
+ count.incrementAndGet();
return input;
}
@@ -49,13 +51,13 @@
public void echoOneWay(String input)
{
Logger.getLogger(this.getClass()).info("echoOneWay: " + input);
- count++;
+ count.incrementAndGet();
}
@WebMethod
public int getCount()
{
- return count;
+ return count.get();
}
}
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/EndpointOneImpl.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/EndpointOneImpl.java 2011-11-11 18:41:49 UTC (rev 15245)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/EndpointOneImpl.java 2011-11-12 13:36:28 UTC (rev 15246)
@@ -22,6 +22,8 @@
package org.jboss.test.ws.jaxws.cxf.mixtype;
+import java.util.concurrent.atomic.AtomicInteger;
+
import javax.jws.Oneway;
import javax.jws.WebMethod;
import javax.jws.WebService;
@@ -33,13 +35,13 @@
@SOAPBinding(style = SOAPBinding.Style.RPC)
public class EndpointOneImpl
{
- private volatile static int count = 0;
+ private static AtomicInteger count = new AtomicInteger(0);
@WebMethod
public String echo(String input)
{
Logger.getLogger(this.getClass()).info("echo: " + input);
- count++;
+ count.incrementAndGet();
return input;
}
@@ -48,13 +50,13 @@
public void echoOneWay(String input)
{
Logger.getLogger(this.getClass()).info("echoOneWay: " + input);
- count++;
+ count.incrementAndGet();
}
@WebMethod
public int getCount()
{
- return count;
+ return count.get();
}
}
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointOneEJB3Impl.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointOneEJB3Impl.java 2011-11-11 18:41:49 UTC (rev 15245)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointOneEJB3Impl.java 2011-11-12 13:36:28 UTC (rev 15246)
@@ -21,6 +21,8 @@
*/
package org.jboss.test.ws.jaxws.cxf.jbws3060;
+import java.util.concurrent.atomic.AtomicInteger;
+
import javax.ejb.Stateless;
import javax.jws.Oneway;
import javax.jws.WebMethod;
@@ -34,13 +36,13 @@
@Stateless
public class EndpointOneEJB3Impl
{
- private volatile static int count = 0;
+ private static AtomicInteger count = new AtomicInteger(0);
@WebMethod
public String echo(String input)
{
Logger.getLogger(this.getClass()).info("echo: " + input);
- count++;
+ count.incrementAndGet();
return input;
}
@@ -49,12 +51,12 @@
public void echoOneWay(String input)
{
Logger.getLogger(this.getClass()).info("echoOneWay: " + input);
- count++;
+ count.incrementAndGet();
}
@WebMethod
public int getCount()
{
- return count;
+ return count.get();
}
}
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointOneImpl.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointOneImpl.java 2011-11-11 18:41:49 UTC (rev 15245)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointOneImpl.java 2011-11-12 13:36:28 UTC (rev 15246)
@@ -21,6 +21,8 @@
*/
package org.jboss.test.ws.jaxws.cxf.jbws3060;
+import java.util.concurrent.atomic.AtomicInteger;
+
import javax.jws.Oneway;
import javax.jws.WebMethod;
import javax.jws.WebService;
@@ -32,13 +34,13 @@
@SOAPBinding(style = SOAPBinding.Style.RPC)
public class EndpointOneImpl
{
- private volatile static int count = 0;
+ private static AtomicInteger count = new AtomicInteger(0);
@WebMethod
public String echo(String input)
{
Logger.getLogger(this.getClass()).info("echo: " + input);
- count++;
+ count.incrementAndGet();
return input;
}
@@ -47,12 +49,12 @@
public void echoOneWay(String input)
{
Logger.getLogger(this.getClass()).info("echoOneWay: " + input);
- count++;
+ count.incrementAndGet();
}
@WebMethod
public int getCount()
{
- return count;
+ return count.get();
}
}
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointTwoEJB3Impl.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointTwoEJB3Impl.java 2011-11-11 18:41:49 UTC (rev 15245)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointTwoEJB3Impl.java 2011-11-12 13:36:28 UTC (rev 15246)
@@ -21,6 +21,8 @@
*/
package org.jboss.test.ws.jaxws.cxf.jbws3060;
+import java.util.concurrent.atomic.AtomicInteger;
+
import javax.ejb.Stateless;
import javax.jws.Oneway;
import javax.jws.WebMethod;
@@ -34,13 +36,13 @@
@Stateless
public class EndpointTwoEJB3Impl
{
- private volatile static int count = 0;
+ private static AtomicInteger count = new AtomicInteger(0);
@WebMethod
public String sayHello(String input)
{
Logger.getLogger(this.getClass()).info("sayHello: " + input);
- count++;
+ count.incrementAndGet();
return "Hi " + input;
}
@@ -49,12 +51,12 @@
public void sayHelloOneWay(String input)
{
Logger.getLogger(this.getClass()).info("sayHelloOneWay: " + input);
- count++;
+ count.incrementAndGet();
}
@WebMethod
public int getCount()
{
- return count;
+ return count.get();
}
}
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointTwoImpl.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointTwoImpl.java 2011-11-11 18:41:49 UTC (rev 15245)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointTwoImpl.java 2011-11-12 13:36:28 UTC (rev 15246)
@@ -21,6 +21,8 @@
*/
package org.jboss.test.ws.jaxws.cxf.jbws3060;
+import java.util.concurrent.atomic.AtomicInteger;
+
import javax.jws.Oneway;
import javax.jws.WebMethod;
import javax.jws.WebService;
@@ -32,13 +34,13 @@
@SOAPBinding(style = SOAPBinding.Style.RPC)
public class EndpointTwoImpl
{
- private volatile static int count = 0;
+ private static AtomicInteger count = new AtomicInteger(0);
@WebMethod
public String sayHello(String input)
{
Logger.getLogger(this.getClass()).info("sayHello: " + input);
- count++;
+ count.incrementAndGet();
return "Hi " + input;
}
@@ -47,12 +49,12 @@
public void sayHelloOneWay(String input)
{
Logger.getLogger(this.getClass()).info("sayHelloOneWay: " + input);
- count++;
+ count.incrementAndGet();
}
@WebMethod
public int getCount()
{
- return count;
+ return count.get();
}
}
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060ServletTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060ServletTestCase.java 2011-11-11 18:41:49 UTC (rev 15245)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060ServletTestCase.java 2011-11-12 13:36:28 UTC (rev 15246)
@@ -37,10 +37,4 @@
return new JBossWSCXFTestSetup(JBWS3060ServletTestCase.class, "jaxws-cxf-jbws3060.war");
}
- @Override
- protected void setUp() throws Exception {
- System.out.println("FIXME: JBWS3060ServletTestCase temporarly running with limited concurrency, investigate load issue.");
- this.defaultSize = 10;
- }
-
}
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 2011-11-11 18:41:49 UTC (rev 15245)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060Tests.java 2011-11-12 13:36:28 UTC (rev 15246)
@@ -84,8 +84,8 @@
List<Callable<Boolean>> callables = new ArrayList<Callable<Boolean>>(size*2);
for (int i = 0; i < size; i++)
{
- callables.add(new CallableOne(portOne, oneway));
- callables.add(new CallableTwo(portTwo, oneway));
+ callables.add(new CallableOne(portOne, oneway, i));
+ callables.add(new CallableTwo(portTwo, oneway, i));
}
List<Future<Boolean>> futures = es.invokeAll(callables);
for (Future<Boolean> f : futures)
@@ -113,16 +113,18 @@
{
private EndpointOne port;
private boolean oneway;
+ private int seqNum;
- public CallableOne(EndpointOne port, boolean oneway)
+ public CallableOne(EndpointOne port, boolean oneway, int seqNum)
{
this.port = port;
this.oneway = oneway;
+ this.seqNum = seqNum;
}
public Boolean call() throws Exception
{
- String arg = "Foo";
+ String arg = "Foo" + seqNum;
if (oneway)
{
port.echoOneWay(arg);
@@ -140,16 +142,18 @@
{
private EndpointTwo port;
private boolean oneway;
+ private int seqNum;
- public CallableTwo(EndpointTwo port, boolean oneway)
+ public CallableTwo(EndpointTwo port, boolean oneway, int seqNum)
{
this.port = port;
this.oneway = oneway;
+ this.seqNum = seqNum;
}
public Boolean call() throws Exception
{
- String arg = "John";
+ String arg = "John" + seqNum;
if (oneway)
{
port.sayHelloOneWay(arg);
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/CustomInInterceptor.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/CustomInInterceptor.java 2011-11-11 18:41:49 UTC (rev 15245)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/CustomInInterceptor.java 2011-11-12 13:36:28 UTC (rev 15246)
@@ -1,21 +1,23 @@
package org.jboss.test.ws.jaxws.cxf.logging;
+import java.util.concurrent.atomic.AtomicInteger;
+
import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.interceptor.LoggingInInterceptor;
import org.apache.cxf.message.Message;
public class CustomInInterceptor extends LoggingInInterceptor
{
- private static volatile int count = 0;
+ private static AtomicInteger count = new AtomicInteger(0);
public void handleMessage(Message message) throws Fault {
- count++;
+ count.incrementAndGet();
super.handleMessage(message);
}
public static int getCount()
{
- System.out.println("COUNT = "+count);
- return count;
+ System.out.println("COUNT = "+count.get());
+ return count.get();
}
}
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/EndpointOneEJB3Impl.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/EndpointOneEJB3Impl.java 2011-11-11 18:41:49 UTC (rev 15245)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/EndpointOneEJB3Impl.java 2011-11-12 13:36:28 UTC (rev 15246)
@@ -21,6 +21,8 @@
*/
package org.jboss.test.ws.jaxws.cxf.mixtype;
+import java.util.concurrent.atomic.AtomicInteger;
+
import javax.ejb.Stateless;
import javax.jws.Oneway;
import javax.jws.WebMethod;
@@ -34,13 +36,13 @@
@Stateless
public class EndpointOneEJB3Impl implements EndpointOne
{
- private volatile static int count = 0;
+ private static AtomicInteger count = new AtomicInteger(0);
@WebMethod
public String echo(String input)
{
Logger.getLogger(this.getClass()).info("echo: " + input);
- count = count + 5;
+ count.addAndGet(5);
return input;
}
@@ -49,13 +51,13 @@
public void echoOneWay(String input)
{
Logger.getLogger(this.getClass()).info("echoOneWay: " + input);
- count = count + 5;
+ count.addAndGet(5);
}
@WebMethod
public int getCount()
{
- return count;
+ return count.get();
}
}
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/EndpointOneImpl.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/EndpointOneImpl.java 2011-11-11 18:41:49 UTC (rev 15245)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/EndpointOneImpl.java 2011-11-12 13:36:28 UTC (rev 15246)
@@ -22,6 +22,8 @@
package org.jboss.test.ws.jaxws.cxf.mixtype;
+import java.util.concurrent.atomic.AtomicInteger;
+
import javax.jws.Oneway;
import javax.jws.WebMethod;
import javax.jws.WebService;
@@ -33,13 +35,13 @@
@SOAPBinding(style = SOAPBinding.Style.RPC)
public class EndpointOneImpl implements EndpointOne
{
- private volatile static int count = 0;
+ private static AtomicInteger count = new AtomicInteger(0);
@WebMethod
public String echo(String input)
{
Logger.getLogger(this.getClass()).info("echo: " + input);
- count++;
+ count.incrementAndGet();
return input;
}
@@ -48,13 +50,13 @@
public void echoOneWay(String input)
{
Logger.getLogger(this.getClass()).info("echoOneWay: " + input);
- count++;
+ count.incrementAndGet();
}
@WebMethod
public int getCount()
{
- return count;
+ return count.get();
}
}
12 years, 10 months
JBossWS SVN: r15245 - in stack/native/trunk: etc and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-11-11 13:41:49 -0500 (Fri, 11 Nov 2011)
New Revision: 15245
Added:
stack/native/trunk/etc/
stack/native/trunk/etc/mgmt-users.properties
Log:
Added: stack/native/trunk/etc/mgmt-users.properties
===================================================================
--- stack/native/trunk/etc/mgmt-users.properties (rev 0)
+++ stack/native/trunk/etc/mgmt-users.properties 2011-11-11 18:41:49 UTC (rev 15245)
@@ -0,0 +1 @@
+admin=c22052286cd5d72239a90fe193737253
12 years, 10 months