JBossWS SVN: r18176 - common/trunk/src/main/java/org/jboss/ws/common/management.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2013-12-13 04:57:24 -0500 (Fri, 13 Dec 2013)
New Revision: 18176
Modified:
common/trunk/src/main/java/org/jboss/ws/common/management/EndpointMetricsImpl.java
Log:
[JBWS-3747] Use System.nanoTime() instead of System.currentTimeMillis()
Modified: common/trunk/src/main/java/org/jboss/ws/common/management/EndpointMetricsImpl.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/management/EndpointMetricsImpl.java 2013-12-12 17:46:21 UTC (rev 18175)
+++ common/trunk/src/main/java/org/jboss/ws/common/management/EndpointMetricsImpl.java 2013-12-13 09:57:24 UTC (rev 18176)
@@ -71,13 +71,13 @@
return 0;
}
requestCount.incrementAndGet();
- return System.currentTimeMillis();
+ return System.nanoTime();
}
public void processResponseMessage(long beginTime)
{
if (beginTime > 0) {
- final long procTime = System.currentTimeMillis() - beginTime;
+ final long procTime = System.nanoTime() - beginTime;
r.lock();
try {
responseCount.incrementAndGet();
@@ -94,7 +94,7 @@
public void processFaultMessage(long beginTime)
{
if (beginTime > 0) {
- final long procTime = System.currentTimeMillis() - beginTime;
+ final long procTime = System.nanoTime() - beginTime;
r.lock();
try {
faultCount.incrementAndGet();
@@ -132,12 +132,12 @@
public long getMinProcessingTime()
{
- return minProcessingTime.longValue();
+ return minProcessingTime.longValue() / 1000000;
}
public long getMaxProcessingTime()
{
- return maxProcessingTime.longValue();
+ return maxProcessingTime.longValue() / 1000000;
}
public long getAverageProcessingTime()
@@ -145,7 +145,7 @@
w.lock();
try {
final long totResponses = responseCount.get() + faultCount.get();
- return totResponses != 0 ? totalProcessingTime.get() / totResponses : 0;
+ return totResponses != 0 ? totalProcessingTime.get() / (totResponses * 1000000) : 0;
} finally {
w.unlock();
}
@@ -153,7 +153,7 @@
public long getTotalProcessingTime()
{
- return totalProcessingTime.get();
+ return totalProcessingTime.get() / 1000000;
}
public long getRequestCount()
10 years, 4 months
JBossWS SVN: r18175 - in hudson/trunk: hudson-home and 22 other directories.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2013-12-12 12:46:21 -0500 (Thu, 12 Dec 2013)
New Revision: 18175
Added:
hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.2.0-SPRING/
hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.2.0/
hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-8.0.0-SPRING/
hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-8.0.0/
hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.2.0-SPRING/
hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.2.0/
hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.0.0-SPRING/
hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.0.0/
hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.2.0-SPRING/
hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.2.0/
hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-8.0.0-SPRING/
hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-8.0.0/
Removed:
hudson/trunk/hudson-home/jobs/AS-7.1.2/
hudson/trunk/hudson-home/jobs/AS-7.1.3/
hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.1.2-SPRING-SUN-JDK-6/
hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.1.2-SUN-JDK-6/
hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.1.3-SPRING-SUN-JDK-6/
hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.1.3-SUN-JDK-6/
hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.2.0-SPRING-SUN-JDK-6/
hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.2.0-SUN-JDK-6/
hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-8.0.0-SPRING-SUN-JDK-6/
hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-8.0.0-SUN-JDK-6/
hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.1.2-SPRING-SUN-JDK-6/
hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.1.2-SUN-JDK-6/
hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.1.3-SPRING-SUN-JDK-6/
hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.1.3-SUN-JDK-6/
hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.2.0-SPRING-SUN-JDK-6/
hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.2.0-SUN-JDK-6/
hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.0.0-SPRING-SUN-JDK-6/
hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.0.0-SUN-JDK-6/
hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.1.2-SPRING-SUN-JDK-6/
hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.1.2-SUN-JDK-6/
hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.1.3-SPRING-SUN-JDK-6/
hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.1.3-SUN-JDK-6/
hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.2.0-SPRING-SUN-JDK-6/
hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.2.0-SUN-JDK-6/
hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-8.0.0-SPRING-SUN-JDK-6/
hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-8.0.0-SUN-JDK-6/
hudson/trunk/hudson-home/jobs/NATIVE-CORE-AS-7.2.0-SUN-JDK-6/
hudson/trunk/hudson-home/jobs/NATIVE-LIGHT/
hudson/trunk/hudson-home/jobs/SWITCH-ALL/
Modified:
hudson/trunk/ant.properties.example
hudson/trunk/hudson-home/config.xml
hudson/trunk/hudson-home/jobs/AS-8.0.0-SECMGR/config.xml
hudson/trunk/hudson-home/jobs/AS-8.0.0/config.xml
hudson/trunk/hudson-home/jobs/AS-ALL/config.xml
hudson/trunk/hudson-home/jobs/AS-LIGHT/config.xml
hudson/trunk/hudson-home/jobs/CXF-ALL/config.xml
hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.2.0-SPRING/config.xml
hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.2.0/config.xml
hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-8.0.0-SPRING/config.xml
hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-8.0.0/config.xml
hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.2.0-SPRING/config.xml
hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.2.0/config.xml
hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.0.0-SPRING/config.xml
hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.0.0/config.xml
hudson/trunk/hudson-home/jobs/CXF-LIGHT/config.xml
hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.2.0-SPRING/config.xml
hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.2.0/config.xml
hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-8.0.0-SPRING/config.xml
hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-8.0.0/config.xml
hudson/trunk/hudson-home/jobs/WEEKEND-MATRIX/config.xml
hudson/trunk/hudson-home/jobs/WORKING-DAYS-MATRIX/config.xml
hudson/trunk/pom.xml
hudson/trunk/scripts/jboss.sh
Log:
[JBWS-3746] Removing AS 7.1.x jobs, removing references to Sun JDK, removing native job, etc.
Modified: hudson/trunk/ant.properties.example
===================================================================
--- hudson/trunk/ant.properties.example 2013-12-12 16:32:34 UTC (rev 18174)
+++ hudson/trunk/ant.properties.example 2013-12-12 17:46:21 UTC (rev 18175)
@@ -17,17 +17,8 @@
hudson.admin.port=8150
hudson.http.port=8180
-hudson.native.url=http://anonsvn.jboss.org/repos/jbossws/stack/native/trunk
hudson.cxf.url=http://anonsvn.jboss.org/repos/jbossws/stack/cxf/trunk
-hudson.jboss712.url=https://github.com/jbossas/jboss-as
-hudson.jboss712.build=jboss-as-7.1.2.Final
-hudson.jboss712.rev=7.1.2.Final
-
-hudson.jboss713.url=https://github.com/jbossas/jboss-as
-hudson.jboss713.build=jboss-as-7.1.3.Final
-hudson.jboss713.rev=7.1.3.Final
-
hudson.jboss720.url=https://github.com/jbossas/jboss-as
hudson.jboss720.build=jboss-as-7.2.0.Final
hudson.jboss720.rev=7.2.0.Final-prerelease1
Modified: hudson/trunk/hudson-home/config.xml
===================================================================
--- hudson/trunk/hudson-home/config.xml 2013-12-12 16:32:34 UTC (rev 18174)
+++ hudson/trunk/hudson-home/config.xml 2013-12-12 17:46:21 UTC (rev 18175)
@@ -33,11 +33,8 @@
<table>
<tr><th align=left>JBossWS Hudson:</th><td>@jbossws.hudson.url@</td></tr>
<tr><td colspan=2></td></tr>
- <tr><th align=left>JBossWS Native:</th><td>@hudson.native.url@</td></tr>
<tr><th align=left>JBossWS CXF:</th><td>@hudson.cxf.url@</td></tr>
<tr><td colspan=2></td></tr>
- <tr><th align=left>@hudson.jboss712.build@</th><td>-r(a)hudson.jboss712.rev@ @hudson.jboss712.url@</td></tr>
- <tr><th align=left>@hudson.jboss713.build@</th><td>-r(a)hudson.jboss713.rev@ @hudson.jboss713.url@</td></tr>
<tr><th align=left>@hudson.jboss720.build@</th><td>-r(a)hudson.jboss720.rev@ @hudson.jboss720.url@</td></tr>
<tr><th align=left>@hudson.jboss800.build@</th><td>-r(a)hudson.jboss800.rev@ @hudson.jboss800.url@</td></tr>
<tr><td colspan=2></td></tr>
@@ -56,8 +53,6 @@
<no-comparator/>
<string>AS-ALL</string>
<string>AS-LIGHT</string>
- <string>AS-7.1.2</string>
- <string>AS-7.1.3</string>
<string>AS-7.2.0</string>
<string>AS-8.0.0</string>
<string>AS-8.0.0-SECMGR</string>
@@ -70,24 +65,6 @@
</description>
</view>
- <!-- Native Tests -->
- <view>
- <owner reference="../../.."/>
- <jobNames class="tree-set">
- <no-comparator/>
- <string>NATIVE-LIGHT</string>
- <string>NATIVE-CORE-AS-7.2.0-SUN-JDK-6</string>
- </jobNames>
- <name>Native Tests</name>
- <description>
- <![CDATA[
- Run the JBossWS testsuite.
- <p/>
- Make sure you have sucessfuly build the <a href="/hudson/view/Target%20Container">Target Container</a>
-]]>
- </description>
- </view>
-
<!-- CXF Tests-->
<view>
<owner reference="../../.."/>
@@ -95,29 +72,17 @@
<no-comparator/>
<string>CXF-ALL</string>
<string>CXF-LIGHT</string>
- <string>CXF-CORE-AS-7.1.2-SUN-JDK-6</string>
- <string>CXF-CORE-AS-7.1.3-SUN-JDK-6</string>
<string>CXF-CORE-AS-7.2.0-SUN-JDK-6</string>
<string>CXF-CORE-AS-8.0.0-SUN-JDK-6</string>
<string>CXF-CORE-AS-8.0.0-SECMGR</string>
- <string>CXF-CORE-AS-7.1.2-SPRING-SUN-JDK-6</string>
- <string>CXF-CORE-AS-7.1.3-SPRING-SUN-JDK-6</string>
<string>CXF-CORE-AS-7.2.0-SPRING-SUN-JDK-6</string>
<string>CXF-CORE-AS-8.0.0-SPRING-SUN-JDK-6</string>
- <string>CXF-BINDIST-AS-7.1.2-SUN-JDK-6</string>
- <string>CXF-BINDIST-AS-7.1.3-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-7.2.0-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-8.0.0-SUN-JDK-6</string>
- <string>CXF-BINDIST-AS-7.1.2-SPRING-SUN-JDK-6</string>
- <string>CXF-BINDIST-AS-7.1.3-SPRING-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-7.2.0-SPRING-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-8.0.0-SPRING-SUN-JDK-6</string>
- <string>CXF-SRCDIST-AS-7.1.2-SUN-JDK-6</string>
- <string>CXF-SRCDIST-AS-7.1.3-SUN-JDK-6</string>
<string>CXF-SRCDIST-AS-7.2.0-SUN-JDK-6</string>
<string>CXF-SRCDIST-AS-8.0.0-SUN-JDK-6</string>
- <string>CXF-SRCDIST-AS-7.1.2-SPRING-SUN-JDK-6</string>
- <string>CXF-SRCDIST-AS-7.1.3-SPRING-SUN-JDK-6</string>
<string>CXF-SRCDIST-AS-7.2.0-SPRING-SUN-JDK-6</string>
<string>CXF-SRCDIST-AS-8.0.0-SPRING-SUN-JDK-6</string>
</jobNames>
@@ -137,25 +102,15 @@
<jobNames class="tree-set">
<no-comparator/>
<string>CXF-LIGHT</string>
- <string>CXF-CORE-AS-7.1.2-SUN-JDK-6</string>
- <string>CXF-CORE-AS-7.1.3-SUN-JDK-6</string>
<string>CXF-CORE-AS-7.2.0-SUN-JDK-6</string>
<string>CXF-CORE-AS-8.0.0-SUN-JDK-6</string>
<string>CXF-CORE-AS-8.0.0-SECMGR</string>
- <string>CXF-CORE-AS-7.1.2-SPRING-SUN-JDK-6</string>
- <string>CXF-CORE-AS-7.1.3-SPRING-SUN-JDK-6</string>
<string>CXF-CORE-AS-7.2.0-SPRING-SUN-JDK-6</string>
<string>CXF-CORE-AS-8.0.0-SPRING-SUN-JDK-6</string>
- <string>CXF-BINDIST-AS-7.1.2-SUN-JDK-6</string>
- <string>CXF-BINDIST-AS-7.1.3-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-7.2.0-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-8.0.0-SUN-JDK-6</string>
- <string>CXF-BINDIST-AS-7.1.2-SPRING-SUN-JDK-6</string>
- <string>CXF-BINDIST-AS-7.1.3-SPRING-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-7.2.0-SPRING-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-8.0.0-SPRING-SUN-JDK-6</string>
- <string>NATIVE-LIGHT</string>
- <string>NATIVE-CORE-AS-7.2.0-SUN-JDK-6</string>
</jobNames>
<name>Working Days Tests</name>
<description>
Modified: hudson/trunk/hudson-home/jobs/AS-8.0.0/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/AS-8.0.0/config.xml 2013-12-12 16:32:34 UTC (rev 18174)
+++ hudson/trunk/hudson-home/jobs/AS-8.0.0/config.xml 2013-12-12 17:46:21 UTC (rev 18175)
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?>
<project>
<actions/>
- <description>Builds JBoss AS 8.0.0</description>
+ <description>Builds WildFly 8.0.0</description>
<logRotator>
<daysToKeep>-1</daysToKeep>
<numToKeep>20</numToKeep>
Modified: hudson/trunk/hudson-home/jobs/AS-8.0.0-SECMGR/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/AS-8.0.0-SECMGR/config.xml 2013-12-12 16:32:34 UTC (rev 18174)
+++ hudson/trunk/hudson-home/jobs/AS-8.0.0-SECMGR/config.xml 2013-12-12 17:46:21 UTC (rev 18175)
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?>
<project>
<actions/>
- <description>Builds JBoss AS 8.0.0 with security manager enabled</description>
+ <description>Builds WildFly 8.0.0 with security manager enabled</description>
<logRotator>
<daysToKeep>-1</daysToKeep>
<numToKeep>20</numToKeep>
Modified: hudson/trunk/hudson-home/jobs/AS-ALL/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/AS-ALL/config.xml 2013-12-12 16:32:34 UTC (rev 18174)
+++ hudson/trunk/hudson-home/jobs/AS-ALL/config.xml 2013-12-12 17:46:21 UTC (rev 18175)
@@ -3,7 +3,7 @@
<builders class="vector"/>
<publishers class="vector">
<hudson.tasks.BuildTrigger>
- <childProjects>AS-7.1.2, AS-7.1.3, AS-7.2.0, AS-8.0.0, AS-8.0.0-SECMGR</childProjects>
+ <childProjects>AS-7.2.0, AS-8.0.0, AS-8.0.0-SECMGR</childProjects>
<threshold>
<name>UNSTABLE</name>
<ordinal>1</ordinal>
@@ -25,6 +25,6 @@
</logRotator>
<keepDependencies>false</keepDependencies>
<properties/>
- <description>Builds all AS servers</description>
+ <description>Builds all application servers</description>
<actions class="vector"/>
</project>
Modified: hudson/trunk/hudson-home/jobs/AS-LIGHT/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/AS-LIGHT/config.xml 2013-12-12 16:32:34 UTC (rev 18174)
+++ hudson/trunk/hudson-home/jobs/AS-LIGHT/config.xml 2013-12-12 17:46:21 UTC (rev 18175)
@@ -25,6 +25,6 @@
</logRotator>
<keepDependencies>false</keepDependencies>
<properties/>
- <description>Builds all AS servers that have not been tagged yet (hence might have daily changes)</description>
+ <description>Builds all application servers that have not been tagged yet (hence might have daily changes)</description>
<actions class="vector"/>
</project>
Modified: hudson/trunk/hudson-home/jobs/CXF-ALL/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-ALL/config.xml 2013-12-12 16:32:34 UTC (rev 18174)
+++ hudson/trunk/hudson-home/jobs/CXF-ALL/config.xml 2013-12-12 17:46:21 UTC (rev 18175)
@@ -4,55 +4,31 @@
<publishers class="vector">
<hudson.tasks.BuildTrigger>
<childProjects>
-CXF-CORE-AS-7.1.2-SUN-JDK-6
+CXF-CORE-AS-7.2.0
-, CXF-CORE-AS-7.1.3-SUN-JDK-6
+, CXF-CORE-AS-8.0.0
-, CXF-CORE-AS-7.2.0-SUN-JDK-6
+, CXF-CORE-AS-7.2.0-SPRING
-, CXF-CORE-AS-8.0.0-SUN-JDK-6
+, CXF-CORE-AS-8.0.0-SPRING
-, CXF-CORE-AS-7.1.2-SPRING-SUN-JDK-6
-
-, CXF-CORE-AS-7.1.3-SPRING-SUN-JDK-6
-
-, CXF-CORE-AS-7.2.0-SPRING-SUN-JDK-6
-
-, CXF-CORE-AS-8.0.0-SPRING-SUN-JDK-6
-
, CXF-CORE-AS-8.0.0-SECMGR
-, CXF-BINDIST-AS-7.1.2-SUN-JDK-6
+, CXF-BINDIST-AS-7.2.0
-, CXF-BINDIST-AS-7.1.3-SUN-JDK-6
+, CXF-BINDIST-AS-8.0.0
-, CXF-BINDIST-AS-7.2.0-SUN-JDK-6
+, CXF-BINDIST-AS-7.2.0-SPRING
-, CXF-BINDIST-AS-8.0.0-SUN-JDK-6
+, CXF-BINDIST-AS-8.0.0-SPRING
-, CXF-BINDIST-AS-7.1.2-SPRING-SUN-JDK-6
+, CXF-SRCDIST-AS-7.2.0
-, CXF-BINDIST-AS-7.1.3-SPRING-SUN-JDK-6
+, CXF-SRCDIST-AS-8.0.0
-, CXF-BINDIST-AS-7.2.0-SPRING-SUN-JDK-6
+, CXF-SRCDIST-AS-7.2.0-SPRING
-, CXF-BINDIST-AS-8.0.0-SPRING-SUN-JDK-6
-
-, CXF-SRCDIST-AS-7.1.2-SUN-JDK-6
-
-, CXF-SRCDIST-AS-7.1.3-SUN-JDK-6
-
-, CXF-SRCDIST-AS-7.2.0-SUN-JDK-6
-
-, CXF-SRCDIST-AS-8.0.0-SUN-JDK-6
-
-, CXF-SRCDIST-AS-7.1.2-SPRING-SUN-JDK-6
-
-, CXF-SRCDIST-AS-7.1.3-SPRING-SUN-JDK-6
-
-, CXF-SRCDIST-AS-7.2.0-SPRING-SUN-JDK-6
-
-, CXF-SRCDIST-AS-8.0.0-SPRING-SUN-JDK-6
+, CXF-SRCDIST-AS-8.0.0-SPRING
</childProjects>
<threshold>
<name>UNSTABLE</name>
Modified: hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.2.0/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.2.0-SUN-JDK-6/config.xml 2013-09-05 13:32:34 UTC (rev 17904)
+++ hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.2.0/config.xml 2013-12-12 17:46:21 UTC (rev 18175)
@@ -6,7 +6,7 @@
#
# Module settings
#
-MODULE=CXF-BINDIST-AS-7.2.0-SUN-JDK-6
+MODULE=CXF-BINDIST-AS-7.2.0
WORKSPACE=`pwd`
STACK_ID=cxf
@@ -69,6 +69,6 @@
</logRotator>
<keepDependencies>false</keepDependencies>
<properties/>
- <description>Build and test jbossws-cxf-(a)version.id@ binary distribution against AS-7.2.0 with Sun JDK 6</description>
+ <description>Build and test jbossws-cxf-(a)version.id@ binary distribution against AS-7.2.0</description>
<actions class="vector"/>
</project>
Modified: hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.2.0-SPRING/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.2.0-SPRING-SUN-JDK-6/config.xml 2013-09-05 13:32:34 UTC (rev 17904)
+++ hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.2.0-SPRING/config.xml 2013-12-12 17:46:21 UTC (rev 18175)
@@ -6,7 +6,7 @@
#
# Module settings
#
-MODULE=CXF-BINDIST-AS-7.2.0-SPRING-SUN-JDK-6
+MODULE=CXF-BINDIST-AS-7.2.0-SPRING
WORKSPACE=`pwd`
STACK_ID=cxf
@@ -69,6 +69,6 @@
</logRotator>
<keepDependencies>false</keepDependencies>
<properties/>
- <description>Build and test jbossws-cxf-(a)version.id@ binary distribution against AS-7.2.0 with SpringFramework libraries available and Sun JDK 6</description>
+ <description>Build and test jbossws-cxf-(a)version.id@ binary distribution against AS-7.2.0 with SpringFramework libraries available</description>
<actions class="vector"/>
</project>
Modified: hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-8.0.0/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-8.0.0-SUN-JDK-6/config.xml 2013-09-05 13:32:34 UTC (rev 17904)
+++ hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-8.0.0/config.xml 2013-12-12 17:46:21 UTC (rev 18175)
@@ -6,7 +6,7 @@
#
# Module settings
#
-MODULE=CXF-BINDIST-AS-8.0.0-SUN-JDK-6
+MODULE=CXF-BINDIST-AS-8.0.0
WORKSPACE=`pwd`
STACK_ID=cxf
@@ -69,6 +69,6 @@
</logRotator>
<keepDependencies>false</keepDependencies>
<properties/>
- <description>Build and test jbossws-cxf-(a)version.id@ binary distribution against AS-8.0.0 with Sun JDK 6</description>
+ <description>Build and test jbossws-cxf-(a)version.id@ binary distribution against WildFly 8.0.0</description>
<actions class="vector"/>
</project>
Modified: hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-8.0.0-SPRING/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-8.0.0-SPRING-SUN-JDK-6/config.xml 2013-09-05 13:32:34 UTC (rev 17904)
+++ hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-8.0.0-SPRING/config.xml 2013-12-12 17:46:21 UTC (rev 18175)
@@ -6,7 +6,7 @@
#
# Module settings
#
-MODULE=CXF-BINDIST-AS-8.0.0-SPRING-SUN-JDK-6
+MODULE=CXF-BINDIST-AS-8.0.0-SPRING
WORKSPACE=`pwd`
STACK_ID=cxf
@@ -69,6 +69,6 @@
</logRotator>
<keepDependencies>false</keepDependencies>
<properties/>
- <description>Build and test jbossws-cxf-(a)version.id@ binary distribution against AS-8.0.0 with SpringFramework libraries available and Sun JDK 6</description>
+ <description>Build and test jbossws-cxf-(a)version.id@ binary distribution against WildFly 8.0.0 with SpringFramework libraries available</description>
<actions class="vector"/>
</project>
Modified: hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.2.0/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.2.0-SUN-JDK-6/config.xml 2013-09-05 13:32:34 UTC (rev 17904)
+++ hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.2.0/config.xml 2013-12-12 17:46:21 UTC (rev 18175)
@@ -6,7 +6,7 @@
#
# Module settings
#
-MODULE=CXF-CORE-AS-7.2.0-SUN-JDK-6
+MODULE=CXF-CORE-AS-7.2.0
WORKSPACE=`pwd`
STACK_ID=cxf
@@ -69,6 +69,6 @@
</logRotator>
<keepDependencies>false</keepDependencies>
<properties/>
- <description>Build and test jbossws-cxf-(a)version.id@ against @hudson.jboss720.build@ with Sun JDK 6</description>
+ <description>Build and test jbossws-cxf-(a)version.id@ against @hudson.jboss720.build@</description>
<actions class="vector"/>
</project>
Modified: hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.2.0-SPRING/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.2.0-SPRING-SUN-JDK-6/config.xml 2013-09-05 13:32:34 UTC (rev 17904)
+++ hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.2.0-SPRING/config.xml 2013-12-12 17:46:21 UTC (rev 18175)
@@ -6,7 +6,7 @@
#
# Module settings
#
-MODULE=CXF-CORE-AS-7.2.0-SPRING-SUN-JDK-6
+MODULE=CXF-CORE-AS-7.2.0-SPRING
WORKSPACE=`pwd`
STACK_ID=cxf
@@ -69,6 +69,6 @@
</logRotator>
<keepDependencies>false</keepDependencies>
<properties/>
- <description>Build and test jbossws-cxf-(a)version.id@ against @hudson.jboss720.build@ with SpringFramework libraires available and Sun JDK 6</description>
+ <description>Build and test jbossws-cxf-(a)version.id@ against @hudson.jboss720.build@ with SpringFramework libraires available</description>
<actions class="vector"/>
</project>
Modified: hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.0.0/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.0.0-SUN-JDK-6/config.xml 2013-09-05 13:32:34 UTC (rev 17904)
+++ hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.0.0/config.xml 2013-12-12 17:46:21 UTC (rev 18175)
@@ -6,7 +6,7 @@
#
# Module settings
#
-MODULE=CXF-CORE-AS-8.0.0-SUN-JDK-6
+MODULE=CXF-CORE-AS-8.0.0
WORKSPACE=`pwd`
STACK_ID=cxf
@@ -69,6 +69,6 @@
</logRotator>
<keepDependencies>false</keepDependencies>
<properties/>
- <description>Build and test jbossws-cxf-(a)version.id@ against @hudson.jboss800.build@ with Sun JDK 6</description>
+ <description>Build and test jbossws-cxf-(a)version.id@ against @hudson.jboss800.build@</description>
<actions class="vector"/>
</project>
Modified: hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.0.0-SPRING/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.0.0-SPRING-SUN-JDK-6/config.xml 2013-09-05 13:32:34 UTC (rev 17904)
+++ hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.0.0-SPRING/config.xml 2013-12-12 17:46:21 UTC (rev 18175)
@@ -6,7 +6,7 @@
#
# Module settings
#
-MODULE=CXF-CORE-AS-8.0.0-SPRING-SUN-JDK-6
+MODULE=CXF-CORE-AS-8.0.0-SPRING
WORKSPACE=`pwd`
STACK_ID=cxf
@@ -69,6 +69,6 @@
</logRotator>
<keepDependencies>false</keepDependencies>
<properties/>
- <description>Build and test jbossws-cxf-(a)version.id@ against @hudson.jboss800.build@ with SpringFramework libraires available and Sun JDK 6</description>
+ <description>Build and test jbossws-cxf-(a)version.id@ against @hudson.jboss800.build@ with SpringFramework libraires available</description>
<actions class="vector"/>
</project>
Modified: hudson/trunk/hudson-home/jobs/CXF-LIGHT/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-LIGHT/config.xml 2013-12-12 16:32:34 UTC (rev 18174)
+++ hudson/trunk/hudson-home/jobs/CXF-LIGHT/config.xml 2013-12-12 17:46:21 UTC (rev 18175)
@@ -4,39 +4,23 @@
<publishers class="vector">
<hudson.tasks.BuildTrigger>
<childProjects>
-CXF-CORE-AS-7.1.2-SUN-JDK-6
+CXF-CORE-AS-7.2.0
-, CXF-CORE-AS-7.1.2-SPRING-SUN-JDK-6
+, CXF-CORE-AS-7.2.0-SPRING
-, CXF-CORE-AS-7.1.3-SUN-JDK-6
+, CXF-CORE-AS-8.0.0
-, CXF-CORE-AS-7.1.3-SPRING-SUN-JDK-6
+, CXF-CORE-AS-8.0.0-SPRING
-, CXF-CORE-AS-7.2.0-SUN-JDK-6
-
-, CXF-CORE-AS-7.2.0-SPRING-SUN-JDK-6
-
-, CXF-CORE-AS-8.0.0-SUN-JDK-6
-
-, CXF-CORE-AS-8.0.0-SPRING-SUN-JDK-6
-
, CXF-CORE-AS-8.0.0-SECMGR
-, CXF-BINDIST-AS-7.1.2-SUN-JDK-6
+, CXF-BINDIST-AS-7.2.0
-, CXF-BINDIST-AS-7.1.2-SPRING-SUN-JDK-6
+, CXF-BINDIST-AS-7.2.0-SPRING
-, CXF-BINDIST-AS-7.1.3-SUN-JDK-6
+, CXF-BINDIST-AS-8.0.0
-, CXF-BINDIST-AS-7.1.3-SPRING-SUN-JDK-6
-
-, CXF-BINDIST-AS-7.2.0-SUN-JDK-6
-
-, CXF-BINDIST-AS-7.2.0-SPRING-SUN-JDK-6
-
-, CXF-BINDIST-AS-8.0.0-SUN-JDK-6
-
-, CXF-BINDIST-AS-8.0.0-SPRING-SUN-JDK-6
+, CXF-BINDIST-AS-8.0.0-SPRING
</childProjects>
<threshold>
<name>UNSTABLE</name>
Modified: hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.2.0/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.2.0-SUN-JDK-6/config.xml 2013-09-05 13:32:34 UTC (rev 17904)
+++ hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.2.0/config.xml 2013-12-12 17:46:21 UTC (rev 18175)
@@ -6,7 +6,7 @@
#
# Module settings
#
-MODULE=CXF-SRCDIST-AS-7.2.0-SUN-JDK-6
+MODULE=CXF-SRCDIST-AS-7.2.0
WORKSPACE=`pwd`
STACK_ID=cxf
@@ -69,6 +69,6 @@
</logRotator>
<keepDependencies>false</keepDependencies>
<properties/>
- <description>Build and test jbossws-cxf-(a)version.id@ source distribution against AS-7.2.0 with Sun JDK 6</description>
+ <description>Build and test jbossws-cxf-(a)version.id@ source distribution against AS-7.2.0</description>
<actions class="vector"/>
</project>
Modified: hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.2.0-SPRING/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.2.0-SPRING-SUN-JDK-6/config.xml 2013-09-05 13:32:34 UTC (rev 17904)
+++ hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.2.0-SPRING/config.xml 2013-12-12 17:46:21 UTC (rev 18175)
@@ -6,7 +6,7 @@
#
# Module settings
#
-MODULE=CXF-SRCDIST-AS-7.2.0-SPRING-SUN-JDK-6
+MODULE=CXF-SRCDIST-AS-7.2.0-SPRING
WORKSPACE=`pwd`
STACK_ID=cxf
@@ -69,6 +69,6 @@
</logRotator>
<keepDependencies>false</keepDependencies>
<properties/>
- <description>Build and test jbossws-cxf-(a)version.id@ source distribution against AS-7.2.0 with SpringFramework libraries available and Sun JDK 6</description>
+ <description>Build and test jbossws-cxf-(a)version.id@ source distribution against AS-7.2.0 with SpringFramework libraries available</description>
<actions class="vector"/>
</project>
Modified: hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-8.0.0/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-8.0.0-SUN-JDK-6/config.xml 2013-09-05 13:32:34 UTC (rev 17904)
+++ hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-8.0.0/config.xml 2013-12-12 17:46:21 UTC (rev 18175)
@@ -6,7 +6,7 @@
#
# Module settings
#
-MODULE=CXF-SRCDIST-AS-8.0.0-SUN-JDK-6
+MODULE=CXF-SRCDIST-AS-8.0.0
WORKSPACE=`pwd`
STACK_ID=cxf
@@ -69,6 +69,6 @@
</logRotator>
<keepDependencies>false</keepDependencies>
<properties/>
- <description>Build and test jbossws-cxf-(a)version.id@ source distribution against AS-8.0.0 with Sun JDK 6</description>
+ <description>Build and test jbossws-cxf-(a)version.id@ source distribution against AS-8.0.0</description>
<actions class="vector"/>
</project>
Modified: hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-8.0.0-SPRING/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-8.0.0-SPRING-SUN-JDK-6/config.xml 2013-09-05 13:32:34 UTC (rev 17904)
+++ hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-8.0.0-SPRING/config.xml 2013-12-12 17:46:21 UTC (rev 18175)
@@ -6,7 +6,7 @@
#
# Module settings
#
-MODULE=CXF-SRCDIST-AS-8.0.0-SPRING-SUN-JDK-6
+MODULE=CXF-SRCDIST-AS-8.0.0
WORKSPACE=`pwd`
STACK_ID=cxf
@@ -69,6 +69,6 @@
</logRotator>
<keepDependencies>false</keepDependencies>
<properties/>
- <description>Build and test jbossws-cxf-(a)version.id@ source distribution against AS-8.0.0 with SpringFramework libraries available and Sun JDK 6</description>
+ <description>Build and test jbossws-cxf-(a)version.id@ source distribution against AS-8.0.0 with SpringFramework libraries available</description>
<actions class="vector"/>
</project>
Modified: hudson/trunk/hudson-home/jobs/WEEKEND-MATRIX/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/WEEKEND-MATRIX/config.xml 2013-12-12 16:32:34 UTC (rev 18174)
+++ hudson/trunk/hudson-home/jobs/WEEKEND-MATRIX/config.xml 2013-12-12 17:46:21 UTC (rev 18175)
@@ -3,7 +3,7 @@
<builders class="vector"/>
<publishers class="vector">
<hudson.tasks.BuildTrigger>
- <childProjects>AS-ALL, NATIVE-LIGHT, CXF-ALL, SWITCH-ALL</childProjects>
+ <childProjects>AS-ALL, CXF-ALL</childProjects>
<threshold>
<name>UNSTABLE</name>
<ordinal>1</ordinal>
Modified: hudson/trunk/hudson-home/jobs/WORKING-DAYS-MATRIX/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/WORKING-DAYS-MATRIX/config.xml 2013-12-12 16:32:34 UTC (rev 18174)
+++ hudson/trunk/hudson-home/jobs/WORKING-DAYS-MATRIX/config.xml 2013-12-12 17:46:21 UTC (rev 18175)
@@ -3,7 +3,7 @@
<builders class="vector"/>
<publishers class="vector">
<hudson.tasks.BuildTrigger>
- <childProjects>AS-LIGHT, NATIVE-LIGHT, CXF-LIGHT</childProjects>
+ <childProjects>AS-LIGHT, CXF-LIGHT</childProjects>
<threshold>
<name>UNSTABLE</name>
<ordinal>1</ordinal>
Modified: hudson/trunk/pom.xml
===================================================================
--- hudson/trunk/pom.xml 2013-12-12 16:32:34 UTC (rev 18174)
+++ hudson/trunk/pom.xml 2013-12-12 17:46:21 UTC (rev 18175)
@@ -20,7 +20,7 @@
<artifactId>jbossws-hudson</artifactId>
<packaging>pom</packaging>
<description>JBossWS Hudson Integration</description>
- <version>4.2.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<!-- Parent -->
<parent>
Modified: hudson/trunk/scripts/jboss.sh
===================================================================
--- hudson/trunk/scripts/jboss.sh 2013-12-12 16:32:34 UTC (rev 18174)
+++ hudson/trunk/scripts/jboss.sh 2013-12-12 17:46:21 UTC (rev 18175)
@@ -9,12 +9,7 @@
export JBOSS_HOME
PIDFILE="$JBOSS_HOME/bin/jboss.pid"
-# Overwrite standalone.xml with standalone-preview.xml if available (AS 7.0.x)
-if [ -f "$JBOSS_HOME/standalone/configuration/standalone-preview.xml" ]; then
- cp $JBOSS_HOME/standalone/configuration/standalone-preview.xml $JBOSS_HOME/standalone/configuration/standalone.xml
-fi
-
-# Overwrite standalone.xml with standalone-preview.xml if available (AS 7.1.x since https://github.com/jbossas/jboss-as/commit/641a75718909fbe04f80a15740ecb2... )
+# Overwrite standalone.xml with standalone-full.xml if available (AS 7.1.x since https://github.com/jbossas/jboss-as/commit/641a75718909fbe04f80a15740ecb2... )
if [ -f "$JBOSS_HOME/standalone/configuration/standalone-full.xml" ]; then
cp $JBOSS_HOME/standalone/configuration/standalone-full.xml $JBOSS_HOME/standalone/configuration/standalone.xml
fi
10 years, 4 months
JBossWS SVN: r18174 - hudson/branches.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2013-12-12 11:32:34 -0500 (Thu, 12 Dec 2013)
New Revision: 18174
Added:
hudson/branches/jbossws-hudson-4.2.x/
Log:
Creatin 4.2.x branch to move trunk to 4.3
10 years, 4 months
JBossWS SVN: r18172 - in stack/cxf/branches/jbossws-cxf-3.1.2: modules/testsuite and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2013-12-12 10:54:29 -0500 (Thu, 12 Dec 2013)
New Revision: 18172
Modified:
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/pom.xml
stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml
Log:
- Fixing testsuite pom to allow running testsuite against current EAP 5.3
- Use same JAXWS api jar as in native stack
- Fix some log file issues
- Use latest jbossws-common and framework snapshots
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/pom.xml 2013-12-12 14:49:01 UTC (rev 18171)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/pom.xml 2013-12-12 15:54:29 UTC (rev 18172)
@@ -27,6 +27,7 @@
<asm.version>2.2.3</asm.version>
<endpoint.servlet>org.jboss.wsf.stack.cxf.CXFServletExt</endpoint.servlet>
<jboss.javaee.version>5.0.0.GA</jboss.javaee.version>
+ <log4j.output.dir>${project.build.directory}</log4j.output.dir>
</properties>
<!-- Modules -->
@@ -302,18 +303,78 @@
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-webservices</artifactId>
<version>${jboss.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>sun-jaxws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>sun-jaxws</groupId>
+ <artifactId>jsr181-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>quartz</groupId>
+ <artifactId>quartz</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- END -->
<dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-ejb3</artifactId>
<version>${jboss.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-server</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>sun-jaxws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>sun-jaxws</groupId>
+ <artifactId>jsr181-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.security</groupId>
+ <artifactId>jacc</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.security</groupId>
+ <artifactId>jaas</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>quartz</groupId>
+ <artifactId>quartz</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-security</artifactId>
<version>${jboss.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.security</groupId>
+ <artifactId>jaas</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
+ <dependency>
+ <groupId>org.jboss.naming</groupId>
+ <artifactId>jnp-client</artifactId>
+ <version>5.0.3.GA_CP02</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.naming</groupId>
+ <artifactId>jnpserver</artifactId>
+ <version>5.0.3.GA_CP02</version>
+ </dependency>
</dependencies>
<build>
<plugins>
@@ -321,6 +382,11 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss510.home}/lib/endorsed</argLine>
+ <!-- TODO: replace with maven dependencies -->
+ <additionalClasspathElements>
+ <additionalClasspathElement>${jboss.home}/client/jbossall-client.jar</additionalClasspathElement>
+ <additionalClasspathElement>${jboss.home}/common/lib/jboss-ejb3-core.jar</additionalClasspathElement>
+ </additionalClasspathElements>
<excludes>
<!-- # UsernameTestCase requires trustore in jboss-web tomcat configuration -->
<exclude>org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.*</exclude>
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml 2013-12-12 14:49:01 UTC (rev 18171)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml 2013-12-12 15:54:29 UTC (rev 18172)
@@ -44,8 +44,8 @@
<!-- Properties -->
<properties>
- <jbossws.common.version>1.1.0.SP9</jbossws.common.version>
- <jbossws.framework.version>3.1.2.SP12</jbossws.framework.version>
+ <jbossws.common.version>1.1.0-SNAPSHOT</jbossws.common.version>
+ <jbossws.framework.version>3.1.2-SNAPSHOT</jbossws.framework.version>
<jbossws.spi.version>1.1.2.SP8</jbossws.spi.version>
<!-- JBWS-2505 -->
<!-- START -->
@@ -65,7 +65,7 @@
<jaxb.api.version>2.1</jaxb.api.version>
<jaxb.impl.version>2.1.12.patch01</jaxb.impl.version>
<jaxrpc.api.version>1.1</jaxrpc.api.version>
- <jaxws.api.version>2.1</jaxws.api.version>
+ <jaxws.api.version>2.1-1</jaxws.api.version>
<juddi.version>2.0.1</juddi.version>
<jboss.jaxr.version>2.0.1</jboss.jaxr.version>
<apache.scout.version>1.1.1</apache.scout.version>
10 years, 4 months
JBossWS SVN: r18171 - framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/operationDispatch.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2013-12-12 09:49:01 -0500 (Thu, 12 Dec 2013)
New Revision: 18171
Modified:
framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/operationDispatch/SOAPActionDispatchTestCase.java
Log:
[JBPAPP-10922] Excluding the JAXWS Dispatch test when running on CXF stack
Modified: framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/operationDispatch/SOAPActionDispatchTestCase.java
===================================================================
--- framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/operationDispatch/SOAPActionDispatchTestCase.java 2013-12-11 13:32:51 UTC (rev 18170)
+++ framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/operationDispatch/SOAPActionDispatchTestCase.java 2013-12-12 14:49:01 UTC (rev 18171)
@@ -74,12 +74,16 @@
public void testJAXWSDispatchInvocation() throws Exception
{
- URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-operationDispatch/SampleWS?wsdl");
+ if (isIntegrationCXF()) {
+ System.out.println("[FIXME] SOAPAction not set using JAXWS Dispatch");
+ return;
+ }
+ URL url = new URL("http://" + getServerHost() + ":8080/jaxws-operationDispatch/SampleWS");
QName serviceName = new QName("http://operationDispatch.jaxws.ws.test.jboss.org/", "SampleWSService");
QName portName = new QName("http://operationDispatch.jaxws.ws.test.jboss.org/", "SampleWSPort");
Service service = Service.create(serviceName);
- service.addPort(portName, SOAPBinding.SOAP11HTTP_BINDING, wsdlURL.toExternalForm());
+ service.addPort(portName, SOAPBinding.SOAP11HTTP_BINDING, url.toExternalForm());
Dispatch<SOAPMessage> dispatch = service.createDispatch(portName, SOAPMessage.class, Mode.MESSAGE);
10 years, 4 months
JBossWS SVN: r18170 - stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/rpc/WEB-INF/wsdl.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2013-12-11 08:32:51 -0500 (Wed, 11 Dec 2013)
New Revision: 18170
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/rpc/WEB-INF/wsdl/HelloService.wsdl
Log:
[JBPAPP-10905] Fixing testcase adding SOAPAction value to each operation
Modified: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/rpc/WEB-INF/wsdl/HelloService.wsdl
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/rpc/WEB-INF/wsdl/HelloService.wsdl 2013-12-11 13:32:02 UTC (rev 18169)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/rpc/WEB-INF/wsdl/HelloService.wsdl 2013-12-11 13:32:51 UTC (rev 18170)
@@ -45,7 +45,7 @@
<binding name='HelloBinding' type='tns:Hello'>
<soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
<operation name='echoUserType'>
- <soap:operation soapAction=''/>
+ <soap:operation soapAction='echoUserType'/>
<input>
<soap:body namespace='http://org.jboss.test.ws/wsse' use='literal'/>
</input>
@@ -54,7 +54,7 @@
</output>
</operation>
<operation name='triggerException'>
- <soap:operation soapAction=''/>
+ <soap:operation soapAction='triggerException'/>
<input>
<soap:body namespace='http://org.jboss.test.ws/wsse' use='literal'/>
</input>
10 years, 4 months
JBossWS SVN: r18169 - in stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests: src/test/java/org/jboss/test/ws/jaxws and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2013-12-11 08:32:02 -0500 (Wed, 11 Dec 2013)
New Revision: 18169
Added:
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbpapp10905/
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbpapp10905/Dto.java
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbpapp10905/Hello.java
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbpapp10905/HelloJavaBean.java
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbpapp10905/OperationSpecificWSSETestCase.java
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbpapp10905/
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbpapp10905/META-INF/
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbpapp10905/META-INF/jboss-wsse-client.xml
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbpapp10905/META-INF/jboss-wsse-server.xml
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbpapp10905/wsse.keystore
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbpapp10905/wsse.truststore
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
Log:
[JBPAPP-10905] Adding testcase
Modified: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2013-12-11 13:30:58 UTC (rev 18168)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2013-12-11 13:32:02 UTC (rev 18169)
@@ -142,6 +142,27 @@
</webinf>
</war>
+ <!-- jaxws-jbpapp10905-->
+ <jar destfile="${tests.output.dir}/test-libs/jaxws-jbpapp10905.jar">
+ <fileset dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/jbpapp10905/*.class" />
+ <exclude name="org/jboss/test/ws/jaxws/jbpapp10905/*TestCase.class" />
+ </fileset>
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/jbpapp10905/META-INF">
+ <include name="jboss-wsse-server.xml" />
+ </metainf>
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/jbpapp10905/">
+ <include name="wsse.truststore" />
+ <include name="wsse.keystore" />
+ </metainf>
+ </jar>
+ <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbpapp10905-client.jar">
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/jbpapp10905">
+ <include name="wsse.truststore" />
+ <include name="wsse.keystore" />
+ </metainf>
+ </jar>
+
<!-- jaxws-jbpapp2143 -->
<war warfile="${tests.output.dir}/test-libs/jaxws-jbpapp2143.war" webxml="${tests.output.dir}/test-resources/jaxws/jbpapp2143/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
Added: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbpapp10905/Dto.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbpapp10905/Dto.java (rev 0)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbpapp10905/Dto.java 2013-12-11 13:32:02 UTC (rev 18169)
@@ -0,0 +1,52 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2013, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.jbpapp10905;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+
+(a)XmlAccessorType(XmlAccessType.FIELD)
+public class Dto
+{
+ @XmlElement(namespace="http://org.jboss.ws/jbpapp10905")
+ private String par1;
+ @XmlElement(namespace="http://org.jboss.ws/jbpapp10905")
+ private String par2;
+
+ public String getPar1()
+ {
+ return par1;
+ }
+ public void setPar1(String par1)
+ {
+ this.par1 = par1;
+ }
+ public String getPar2()
+ {
+ return par2;
+ }
+ public void setPar2(String par2)
+ {
+ this.par2 = par2;
+ }
+}
Property changes on: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbpapp10905/Dto.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbpapp10905/Hello.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbpapp10905/Hello.java (rev 0)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbpapp10905/Hello.java 2013-12-11 13:32:02 UTC (rev 18169)
@@ -0,0 +1,40 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2013, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.jbpapp10905;
+
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+@WebService(name = "Hello")
+@SOAPBinding(style = SOAPBinding.Style.DOCUMENT)
+public interface Hello
+{
+ @WebMethod(action = "echoOp")
+ public Dto echo(Dto dto);
+
+ @WebMethod
+ public Dto echo2(Dto dto);
+
+ @WebMethod(action = "echo3Op")
+ public Dto echo3(Dto dto);
+}
Property changes on: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbpapp10905/Hello.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbpapp10905/HelloJavaBean.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbpapp10905/HelloJavaBean.java (rev 0)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbpapp10905/HelloJavaBean.java 2013-12-11 13:32:02 UTC (rev 18169)
@@ -0,0 +1,63 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2013, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.jbpapp10905;
+
+import javax.ejb.Stateless;
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+import org.jboss.ws.annotation.EndpointConfig;
+import org.jboss.wsf.spi.annotation.WebContext;
+
+
+@Stateless
+@WebService(name = "Hello", serviceName = "HelloService", targetNamespace = "http://org.jboss.ws/jbpapp10905")
+@SOAPBinding(style = SOAPBinding.Style.DOCUMENT)
+@WebContext(contextRoot = "/jaxws-jbpapp10905", urlPattern = "/*")
+@EndpointConfig(configName = "Standard WSSecurity Endpoint")
+public class HelloJavaBean
+{
+ @WebMethod(action = "echoOp")
+ public Dto echo(Dto dto)
+ {
+ return dto;
+ }
+
+ @WebMethod
+ public Dto echo2(Dto dto)
+ {
+ Dto res = new Dto();
+ res.setPar1(dto.getPar1() + "2");
+ res.setPar2(dto.getPar2() + "2");
+ return res;
+ }
+
+ @WebMethod(action = "echo3Op")
+ public Dto echo3(Dto dto)
+ {
+ Dto res = new Dto();
+ res.setPar1(dto.getPar1() + "3");
+ res.setPar2(dto.getPar2() + "3");
+ return res;
+ }
+}
Property changes on: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbpapp10905/HelloJavaBean.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbpapp10905/OperationSpecificWSSETestCase.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbpapp10905/OperationSpecificWSSETestCase.java (rev 0)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbpapp10905/OperationSpecificWSSETestCase.java 2013-12-11 13:32:02 UTC (rev 18169)
@@ -0,0 +1,124 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2013, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.jbpapp10905;
+
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+
+import junit.framework.Test;
+
+import org.jboss.ws.core.StubExt;
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * http://jira.jboss.org/jira/browse/JBPAPP-10905
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 10-Dec-2013
+ */
+public class OperationSpecificWSSETestCase extends JBossWSTest
+{
+ private final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbpapp10905";
+
+ public static Test suite() throws Exception
+ {
+ return new JBossWSTestSetup(OperationSpecificWSSETestCase.class, "jaxws-jbpapp10905-client.jar,jaxws-jbpapp10905.jar");
+ }
+
+ public void testEcho() throws Exception
+ {
+ Hello port = getPort();
+ Dto dto = new Dto();
+ dto.setPar1("first parameter");
+ dto.setPar2("second parameter");
+ try
+ {
+ Dto result = port.echo(dto);
+ assertEquals(dto.getPar1(), result.getPar1());
+ assertEquals(dto.getPar2(), result.getPar2());
+ }
+ catch (Exception e)
+ {
+ fail();
+ }
+ }
+
+ /**
+ * 'echo2' operation invocation, which must fail because the operation has no explicit
+ * SOAPAction assigned, we're sending an encrypted payload and WS-Addressing is not enabled
+ *
+ * @throws Exception
+ */
+ public void testEcho2() throws Exception
+ {
+ Hello port = getPort();
+ Dto dto = new Dto();
+ dto.setPar1("first parameter");
+ dto.setPar2("second parameter");
+ try
+ {
+ port.echo2(dto);
+ fail();
+ }
+ catch (Exception e)
+ {
+ assertTrue(e.getMessage().contains("Could not determine the operation configuration"));
+ }
+ }
+
+ /**
+ * 'echo3' operation invocation, which must fail because we're not signing the message
+ * and the server requires signature for invocations to this operation
+ *
+ * @throws Exception
+ */
+ public void testEcho3() throws Exception
+ {
+ Hello port = getPort();
+ Dto dto = new Dto();
+ dto.setPar1("first parameter");
+ dto.setPar2("second parameter");
+ try
+ {
+ port.echo3(dto);
+ fail();
+ }
+ catch (Exception e)
+ {
+ assertTrue(e.getMessage().contains("WS-Security"));
+ }
+ }
+
+ private Hello getPort() throws Exception
+ {
+ URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
+ QName serviceName = new QName("http://org.jboss.ws/jbpapp10905", "HelloService");
+ Hello port = Service.create(wsdlURL, serviceName).getPort(Hello.class);
+ URL securityURL = getResourceURL("jaxws/jbpapp10905/META-INF/jboss-wsse-client.xml");
+ ((StubExt)port).setSecurityConfig(securityURL.toExternalForm());
+ ((StubExt)port).setConfigName("Standard WSSecurity Client");
+ return port;
+ }
+}
Property changes on: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbpapp10905/OperationSpecificWSSETestCase.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbpapp10905/META-INF/jboss-wsse-client.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbpapp10905/META-INF/jboss-wsse-client.xml (rev 0)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbpapp10905/META-INF/jboss-wsse-client.xml 2013-12-11 13:32:02 UTC (rev 18169)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<jboss-ws-security xmlns="http://www.jboss.com/ws-security/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.com/ws-security/config http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd">
+ <key-store-file>META-INF/wsse.keystore</key-store-file>
+ <key-store-password>jbossws</key-store-password>
+ <trust-store-file>META-INF/wsse.truststore</trust-store-file>
+ <trust-store-password>jbossws</trust-store-password>
+
+ <config>
+ <encrypt type="x509v3" alias="wsse"/>
+ <requires>
+ <encryption/>
+ </requires>
+ </config>
+
+</jboss-ws-security>
\ No newline at end of file
Property changes on: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbpapp10905/META-INF/jboss-wsse-client.xml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbpapp10905/META-INF/jboss-wsse-server.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbpapp10905/META-INF/jboss-wsse-server.xml (rev 0)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbpapp10905/META-INF/jboss-wsse-server.xml 2013-12-11 13:32:02 UTC (rev 18169)
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<jboss-ws-security xmlns="http://www.jboss.com/ws-security/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.com/ws-security/config http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd">
+ <key-store-file>META-INF/wsse.keystore</key-store-file>
+ <key-store-password>jbossws</key-store-password>
+ <trust-store-file>META-INF/wsse.truststore</trust-store-file>
+ <trust-store-password>jbossws</trust-store-password>
+
+ <port name="HelloPort">
+ <operation name="{http://org.jboss.ws/jbpapp10905}echo">
+ <config>
+ <encrypt type="x509v3" alias="wsse"/>
+ <requires>
+ <encryption/>
+ </requires>
+ </config>
+ </operation>
+ <operation name="{http://org.jboss.ws/jbpapp10905}echo3">
+ <config>
+ <encrypt type="x509v3" alias="wsse"/>
+ <requires>
+ <encryption/>
+ <signature/>
+ </requires>
+ </config>
+ </operation>
+ </port>
+</jboss-ws-security>
\ No newline at end of file
Property changes on: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbpapp10905/META-INF/jboss-wsse-server.xml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbpapp10905/wsse.keystore
===================================================================
(Binary files differ)
Property changes on: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbpapp10905/wsse.keystore
___________________________________________________________________
Added: svn:mime-type
+ application/x-java-keystore
Added: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbpapp10905/wsse.truststore
===================================================================
(Binary files differ)
Property changes on: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbpapp10905/wsse.truststore
___________________________________________________________________
Added: svn:mime-type
+ application/x-java-keystore
10 years, 4 months
JBossWS SVN: r18168 - stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/extensions/security.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2013-12-11 08:30:58 -0500 (Wed, 11 Dec 2013)
New Revision: 18168
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java
Log:
[JBPAPP-10905] Return fault when processing encrypted requests that do not match any operationMetadata
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java 2013-12-11 13:27:25 UTC (rev 18167)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java 2013-12-11 13:30:58 UTC (rev 18168)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2013, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -361,9 +361,10 @@
private Config getActualConfig(WSSecurityConfiguration configuration, Config operationConfig)
{
- if (operationConfig == null)
+ if (operationConfig == null && hasSubConfigs(configuration))
{
- //if no configuration override, we try getting the right operation config
+ //if no configuration override and the provided configuration has port /
+ //operation configs, we try getting the right operation config
//according to the invoked operation that can be found using the context
CommonMessageContext ctx = MessageContextAssociation.peekMessageContext();
if (ctx != null)
@@ -387,13 +388,27 @@
}
}
if (opMetaData != null)
+ {
operationConfig = selectOperationConfig(configuration, port, opMetaData.getQName());
+ }
+ else
+ {
+ //No operation metadata matched, meaning we don't know what operationConfig to use.
+ //This is to be solved either by removing useless operation configs or by requiring
+ //WS-Addressing to be used for telling the server which operation is being invoked
+ throw new WebServiceException("Could not determine the operation configuration to be used for processing the request");
+ }
}
}
//null operationConfig means default behavior
return operationConfig != null ? operationConfig : configuration.getDefaultConfig();
}
+ private boolean hasSubConfigs(WSSecurityConfiguration configuration)
+ {
+ return !configuration.getPorts().isEmpty();
+ }
+
private Config selectOperationConfig(WSSecurityConfiguration configuration, QName portName, QName opName)
{
Port port = configuration.getPorts().get(portName != null ? portName.getLocalPart() : null);
10 years, 4 months
JBossWS SVN: r18167 - stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2013-12-11 08:27:25 -0500 (Wed, 11 Dec 2013)
New Revision: 18167
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java
Log:
[JBPAPP-10922] Fallback to SOAPAction based operation selection also when resolution using first body child did not match any operation
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java 2013-12-10 21:43:53 UTC (rev 18166)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java 2013-12-11 13:27:25 UTC (rev 18167)
@@ -85,6 +85,7 @@
SOAPBody soapBody = soapMessage.getSOAPBody();
SOAPBodyElement soapBodyElement = null;
+ @SuppressWarnings("rawtypes")
Iterator bodyChildren = soapBody.getChildElements();
while (bodyChildren.hasNext() && soapBodyElement == null)
{
@@ -101,28 +102,7 @@
if (epMetaData.getStyle() == Style.RPC)
throw new SOAPException("Empty SOAP body with no child element not supported for RPC");
-
- String soapAction = null;
- final MimeHeaders mh = soapMessage.getMimeHeaders();
- if (mh != null) {
- final String[] array = mh.getHeader("SOAPAction");
- if (array != null && array.length > 0) {
- soapAction = array[0];
- if (soapAction != null && soapAction.startsWith("\"") && soapAction.endsWith("\"")) {
- soapAction = soapAction.substring(1, soapAction.length() - 1);
- }
- }
- }
-
- if (soapAction != null && soapAction.length() > 0) {
- for (OperationMetaData opAux : epMetaData.getOperations())
- {
- if (soapAction.equals(opAux.getSOAPAction())) {
- opMetaData = opAux;
- break;
- }
- }
- }
+ opMetaData = matchUsingSOAPAction(epMetaData, soapMessage);
if (opMetaData == null) {
// [JBWS-1125] Support empty soap body elements
@@ -142,6 +122,10 @@
Name soapName = soapBodyElement.getElementName();
QName xmlElementName = new QName(soapName.getURI(), soapName.getLocalName());
opMetaData = epMetaData.getOperation(xmlElementName);
+
+ if (opMetaData == null) {
+ opMetaData = matchUsingSOAPAction(epMetaData, soapMessage);
+ }
}
}
@@ -162,4 +146,28 @@
log.debug("getDispatchDestination: " + (opMetaData != null ? opMetaData.getQName() : null));
return opMetaData;
}
+
+ private OperationMetaData matchUsingSOAPAction(final EndpointMetaData epMetaData, final SOAPMessage soapMessage) {
+ String soapAction = null;
+ final MimeHeaders mh = soapMessage.getMimeHeaders();
+ if (mh != null) {
+ final String[] array = mh.getHeader("SOAPAction");
+ if (array != null && array.length > 0) {
+ soapAction = array[0];
+ if (soapAction != null && soapAction.startsWith("\"") && soapAction.endsWith("\"")) {
+ soapAction = soapAction.substring(1, soapAction.length() - 1);
+ }
+ }
+ }
+
+ if (soapAction != null && soapAction.length() > 0) {
+ for (OperationMetaData opAux : epMetaData.getOperations())
+ {
+ if (soapAction.equals(opAux.getSOAPAction())) {
+ return opAux;
+ }
+ }
+ }
+ return null;
+ }
}
10 years, 4 months