JBossWS SVN: r14893 - in hudson/trunk: hudson-home and 20 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-08-17 15:22:09 -0400 (Wed, 17 Aug 2011)
New Revision: 14893
Added:
hudson/trunk/hudson-home/jobs/AS-6.1.0/
hudson/trunk/hudson-home/jobs/AS-6.1.0/config.xml
hudson/trunk/hudson-home/jobs/AS-TESTS-AS-6.1.0/
hudson/trunk/hudson-home/jobs/AS-TESTS-AS-6.1.0/config.xml
hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-6.1.0-SPRING-SUN-JDK-6/
hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-6.1.0-SPRING-SUN-JDK-6/config.xml
hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-6.1.0-SUN-JDK-6/
hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-6.1.0-SUN-JDK-6/config.xml
hudson/trunk/hudson-home/jobs/CXF-CORE-AS-6.1.0-SPRING-SUN-JDK-6/
hudson/trunk/hudson-home/jobs/CXF-CORE-AS-6.1.0-SPRING-SUN-JDK-6/config.xml
hudson/trunk/hudson-home/jobs/CXF-CORE-AS-6.1.0-SUN-JDK-6/
hudson/trunk/hudson-home/jobs/CXF-CORE-AS-6.1.0-SUN-JDK-6/config.xml
hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-6.1.0-SPRING-SUN-JDK-6/
hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-6.1.0-SPRING-SUN-JDK-6/config.xml
hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-6.1.0-SUN-JDK-6/
hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-6.1.0-SUN-JDK-6/config.xml
hudson/trunk/hudson-home/jobs/NATIVE-BINDIST-AS-6.1.0-SUN-JDK-6/
hudson/trunk/hudson-home/jobs/NATIVE-BINDIST-AS-6.1.0-SUN-JDK-6/config.xml
hudson/trunk/hudson-home/jobs/NATIVE-CORE-AS-6.1.0-SUN-JDK-6/
hudson/trunk/hudson-home/jobs/NATIVE-CORE-AS-6.1.0-SUN-JDK-6/config.xml
hudson/trunk/hudson-home/jobs/NATIVE-SRCDIST-AS-6.1.0-SUN-JDK-6/
hudson/trunk/hudson-home/jobs/NATIVE-SRCDIST-AS-6.1.0-SUN-JDK-6/config.xml
hudson/trunk/hudson-home/jobs/SWITCH-BINDIST-AS-6.1.0/
hudson/trunk/hudson-home/jobs/SWITCH-BINDIST-AS-6.1.0/config.xml
Modified:
hudson/trunk/ant.properties.example
hudson/trunk/hudson-home/config.xml
hudson/trunk/hudson-home/jobs/AS-ALL/config.xml
hudson/trunk/hudson-home/jobs/AS-TESTS-ALL/config.xml
hudson/trunk/hudson-home/jobs/CXF-ALL/config.xml
hudson/trunk/hudson-home/jobs/CXF-LIGHT/config.xml
hudson/trunk/hudson-home/jobs/NATIVE-ALL/config.xml
hudson/trunk/hudson-home/jobs/NATIVE-LIGHT/config.xml
hudson/trunk/hudson-home/jobs/SWITCH-ALL/config.xml
Log:
adding support for AS 6.1.0
Modified: hudson/trunk/ant.properties.example
===================================================================
--- hudson/trunk/ant.properties.example 2011-08-17 12:14:24 UTC (rev 14892)
+++ hudson/trunk/ant.properties.example 2011-08-17 19:22:09 UTC (rev 14893)
@@ -25,6 +25,10 @@
hudson.jboss600.build=jboss-6.0.0.Final
hudson.jboss600.rev=HEAD
+hudson.jboss610.url=http://anonsvn.jboss.org/repos/jbossas/tags/6.1.0.Final
+hudson.jboss610.build=jboss-6.1.0.Final
+hudson.jboss610.rev=HEAD
+
hudson.jboss700.url=https://github.com/jbossas/jboss-as
hudson.jboss700.build=jboss-as-7.0.0.Final
hudson.jboss700.rev=7.0.0.Final
Modified: hudson/trunk/hudson-home/config.xml
===================================================================
--- hudson/trunk/hudson-home/config.xml 2011-08-17 12:14:24 UTC (rev 14892)
+++ hudson/trunk/hudson-home/config.xml 2011-08-17 19:22:09 UTC (rev 14893)
@@ -37,7 +37,9 @@
<tr><th align=left>JBossWS CXF:</th><td>@hudson.cxf.url@</td></tr>
<tr><td colspan=2></td></tr>
<tr><th align=left>@hudson.jboss600.build@</th><td>-r(a)hudson.jboss600.rev@ @hudson.jboss600.url@</td></tr>
+ <tr><th align=left>@hudson.jboss610.build@</th><td>-r(a)hudson.jboss610.rev@ @hudson.jboss610.url@</td></tr>
<tr><th align=left>@hudson.jboss700.build@</th><td>-r(a)hudson.jboss700.rev@ @hudson.jboss700.url@</td></tr>
+ <tr><th align=left>@hudson.jboss710.build@</th><td>-r(a)hudson.jboss710.rev@ @hudson.jboss710.url@</td></tr>
<tr><td colspan=2></td></tr>
</table>
]]>
@@ -54,7 +56,9 @@
<no-comparator/>
<string>AS-ALL</string>
<string>AS-6.0.0</string>
+ <string>AS-6.1.0</string>
<string>AS-7.0.0</string>
+ <string>AS-7.1.0</string>
</jobNames>
<name>AS Builds</name>
<description>
@@ -71,6 +75,7 @@
<no-comparator/>
<string>AS-TESTS-ALL</string>
<string>AS-TESTS-AS-6.0.0</string>
+ <string>AS-TESTS-AS-6.1.0</string>
</jobNames>
<name>AS Tests</name>
<description>
@@ -90,11 +95,17 @@
<string>NATIVE-ALL</string>
<string>NATIVE-LIGHT</string>
<string>NATIVE-CORE-AS-6.0.0-SUN-JDK-6</string>
+ <string>NATIVE-CORE-AS-6.1.0-SUN-JDK-6</string>
<string>NATIVE-CORE-AS-7.0.0-SUN-JDK-6</string>
+ <string>NATIVE-CORE-AS-7.1.0-SUN-JDK-6</string>
<string>NATIVE-BINDIST-AS-6.0.0-SUN-JDK-6</string>
+ <string>NATIVE-BINDIST-AS-6.1.0-SUN-JDK-6</string>
<string>NATIVE-BINDIST-AS-7.0.0-SUN-JDK-6</string>
+ <string>NATIVE-BINDIST-AS-7.1.0-SUN-JDK-6</string>
<string>NATIVE-SRCDIST-AS-6.0.0-SUN-JDK-6</string>
+ <string>NATIVE-SRCDIST-AS-6.1.0-SUN-JDK-6</string>
<string>NATIVE-SRCDIST-AS-7.0.0-SUN-JDK-6</string>
+ <string>NATIVE-SRCDIST-AS-7.1.0-SUN-JDK-6</string>
</jobNames>
<name>Native Tests</name>
<description>
@@ -114,17 +125,29 @@
<string>CXF-ALL</string>
<string>CXF-LIGHT</string>
<string>CXF-CORE-AS-6.0.0-SUN-JDK-6</string>
+ <string>CXF-CORE-AS-6.1.0-SUN-JDK-6</string>
<string>CXF-CORE-AS-7.0.0-SUN-JDK-6</string>
+ <string>CXF-CORE-AS-7.1.0-SUN-JDK-6</string>
<string>CXF-CORE-AS-6.0.0-SPRING-SUN-JDK-6</string>
+ <string>CXF-CORE-AS-6.1.0-SPRING-SUN-JDK-6</string>
<string>CXF-CORE-AS-7.0.0-SPRING-SUN-JDK-6</string>
+ <string>CXF-CORE-AS-7.1.0-SPRING-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-6.0.0-SUN-JDK-6</string>
+ <string>CXF-BINDIST-AS-6.1.0-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-7.0.0-SUN-JDK-6</string>
+ <string>CXF-BINDIST-AS-7.1.0-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-6.0.0-SPRING-SUN-JDK-6</string>
+ <string>CXF-BINDIST-AS-6.1.0-SPRING-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-7.0.0-SPRING-SUN-JDK-6</string>
+ <string>CXF-BINDIST-AS-7.1.0-SPRING-SUN-JDK-6</string>
<string>CXF-SRCDIST-AS-6.0.0-SUN-JDK-6</string>
+ <string>CXF-SRCDIST-AS-6.1.0-SUN-JDK-6</string>
<string>CXF-SRCDIST-AS-7.0.0-SUN-JDK-6</string>
+ <string>CXF-SRCDIST-AS-7.1.0-SUN-JDK-6</string>
<string>CXF-SRCDIST-AS-6.0.0-SPRING-SUN-JDK-6</string>
+ <string>CXF-SRCDIST-AS-6.1.0-SPRING-SUN-JDK-6</string>
<string>CXF-SRCDIST-AS-7.0.0-SPRING-SUN-JDK-6</string>
+ <string>CXF-SRCDIST-AS-7.1.0-SPRING-SUN-JDK-6</string>
</jobNames>
<name>CXF Tests</name>
<description>
@@ -143,18 +166,30 @@
<no-comparator/>
<string>CXF-LIGHT</string>
<string>CXF-CORE-AS-6.0.0-SUN-JDK-6</string>
+ <string>CXF-CORE-AS-6.1.0-SUN-JDK-6</string>
<string>CXF-CORE-AS-7.0.0-SUN-JDK-6</string>
+ <string>CXF-CORE-AS-7.1.0-SUN-JDK-6</string>
<string>CXF-CORE-AS-6.0.0-SPRING-SUN-JDK-6</string>
+ <string>CXF-CORE-AS-6.1.0-SPRING-SUN-JDK-6</string>
<string>CXF-CORE-AS-7.0.0-SPRING-SUN-JDK-6</string>
+ <string>CXF-CORE-AS-7.1.0-SPRING-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-6.0.0-SUN-JDK-6</string>
+ <string>CXF-BINDIST-AS-6.1.0-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-7.0.0-SUN-JDK-6</string>
+ <string>CXF-BINDIST-AS-7.1.0-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-6.0.0-SPRING-SUN-JDK-6</string>
+ <string>CXF-BINDIST-AS-6.1.0-SPRING-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-7.0.0-SPRING-SUN-JDK-6</string>
+ <string>CXF-BINDIST-AS-7.1.0-SPRING-SUN-JDK-6</string>
<string>NATIVE-LIGHT</string>
<string>NATIVE-CORE-AS-6.0.0-SUN-JDK-6</string>
+ <string>NATIVE-CORE-AS-6.1.0-SUN-JDK-6</string>
<string>NATIVE-CORE-AS-7.0.0-SUN-JDK-6</string>
+ <string>NATIVE-CORE-AS-7.1.0-SUN-JDK-6</string>
<string>NATIVE-BINDIST-AS-6.0.0-SUN-JDK-6</string>
+ <string>NATIVE-BINDIST-AS-6.1.0-SUN-JDK-6</string>
<string>NATIVE-BINDIST-AS-7.0.0-SUN-JDK-6</string>
+ <string>NATIVE-BINDIST-AS-7.1.0-SUN-JDK-6</string>
</jobNames>
<name>Working Days Tests</name>
<description>
Added: hudson/trunk/hudson-home/jobs/AS-6.1.0/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/AS-6.1.0/config.xml (rev 0)
+++ hudson/trunk/hudson-home/jobs/AS-6.1.0/config.xml 2011-08-17 19:22:09 UTC (rev 14893)
@@ -0,0 +1,70 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+SVNBASE=JBossAS-6.1.0
+
+#
+# checkout with an explicit version
+#
+#if [ -d "$SVNBASE" ]; then
+# svn up -r(a)hudson.jboss610.rev@ $SVNBASE
+#else
+# svn co -r(a)hudson.jboss610.rev@ @hudson.jboss610.url@
+#fi
+
+#
+# build jboss
+#
+cd $SVNBASE
+./build.sh clean
+./build.sh -Dskip-download-sources
+
+#
+# Verify build
+#
+if [ ! -d ./build/target/(a)hudson.jboss610.build@ ]; then
+ echo "Cannot find expected build: @hudson.jboss610.build@"
+ exit 1
+fi
+ </command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.jboss610.url@</remote>
+ <local>JBossAS-6.1.0</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossAS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>14</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build AS-6.1.0</description>
+ <actions class="vector"/>
+</project>
Modified: hudson/trunk/hudson-home/jobs/AS-ALL/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/AS-ALL/config.xml 2011-08-17 12:14:24 UTC (rev 14892)
+++ hudson/trunk/hudson-home/jobs/AS-ALL/config.xml 2011-08-17 19:22:09 UTC (rev 14893)
@@ -3,7 +3,7 @@
<builders class="vector"/>
<publishers class="vector">
<hudson.tasks.BuildTrigger>
- <childProjects>AS-6.0.0, AS-7.0.0, AS-7.1.0</childProjects>
+ <childProjects>AS-6.0.0, AS-6.1.0, AS-7.0.0, AS-7.1.0</childProjects>
<threshold>
<name>UNSTABLE</name>
<ordinal>1</ordinal>
Modified: hudson/trunk/hudson-home/jobs/AS-TESTS-ALL/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/AS-TESTS-ALL/config.xml 2011-08-17 12:14:24 UTC (rev 14892)
+++ hudson/trunk/hudson-home/jobs/AS-TESTS-ALL/config.xml 2011-08-17 19:22:09 UTC (rev 14893)
@@ -3,7 +3,7 @@
<builders class="vector"/>
<publishers class="vector">
<hudson.tasks.BuildTrigger>
- <childProjects>AS-TESTS-AS-6.0.0</childProjects>
+ <childProjects>AS-TESTS-AS-6.0.0, AS-TESTS-AS-6.1.0</childProjects>
<threshold>
<name>UNSTABLE</name>
<ordinal>1</ordinal>
Added: hudson/trunk/hudson-home/jobs/AS-TESTS-AS-6.1.0/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/AS-TESTS-AS-6.1.0/config.xml (rev 0)
+++ hudson/trunk/hudson-home/jobs/AS-TESTS-AS-6.1.0/config.xml 2011-08-17 19:22:09 UTC (rev 14893)
@@ -0,0 +1,123 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=AS-TESTS-AS-6.1.0
+
+WORKSPACE=`pwd`
+SCRIPTS_DIR=$WORKSPACE/hudson-scripts
+STACK_DIR=$WORKSPACE/stack-cxf
+JBOSS_TARGET=jboss610
+JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.1.0/workspace/JBossAS-6.1.0/build/target/(a)hudson.jboss610.build@
+
+rm -rf $WORKSPACE/jboss-copy
+cp -r $JBOSS_INSTANCE $WORKSPACE/jboss-copy
+export JBOSS_HOME=$JBOSS_INSTANCE
+
+ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss610.home=$JBOSS_HOME"
+
+#
+# stop jbossas
+#
+$SCRIPTS_DIR/jboss.sh $JBOSS_HOME stop
+
+#
+# build and deploy
+#
+cd $STACK_DIR
+mvn -Ptestsuite clean
+ant $ENVIRONMENT deploy-jboss610
+
+# remove obsolete logs
+rm -f $JBOSS_HOME/server/@jboss.server.instance(a)/log/boot.log
+rm -f $JBOSS_HOME/server/@jboss.server.instance(a)/log/server.log
+
+#
+# start jbossas
+#
+$SCRIPTS_DIR/jboss.sh $JBOSS_HOME start $JBOSS_BIND_ADDRESS
+
+# Was it successfully started?
+$SCRIPTS_DIR/http-spider.sh $JBOSS_BIND_ADDRESS:8080 $WORKSPACE
+if [ -e $WORKSPACE/spider.failed ]; then
+ tail -n 100 $JBOSS_HOME/server/@jboss.server.instance(a)/log/server.log
+ $SCRIPTS_DIR/jboss.sh $JBOSS_HOME stop $JBOSS_BIND_ADDRESS
+ exit 1
+fi
+
+#
+# build the testsuite
+#
+cd $JBOSS_HOME/../../../testsuite
+./build.sh -Dnode0=$JBOSS_BIND_ADDRESS clean main
+
+#
+# execute tests
+#
+./build.sh -Dnode0=$JBOSS_BIND_ADDRESS init tests-webservice tests-ws tests-report 2>&1 | tee $WORKSPACE/tests.log
+cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt
+
+#
+# copy the test reports
+#
+rm -rf $WORKSPACE/test-reports
+mkdir $WORKSPACE/test-reports
+cp -r ./output/reports/*.xml $WORKSPACE/test-reports
+
+#
+# stop jbossas
+#
+$SCRIPTS_DIR/jboss.sh $JBOSS_HOME stop
+cp $JBOSS_HOME/server/@jboss.server.instance(a)/log/boot.log $WORKSPACE/jboss-boot.log
+cp $JBOSS_HOME/server/@jboss.server.instance(a)/log/server.log $WORKSPACE/jboss-server.log
+rm -rf $JBOSS_HOME
+mv $WORKSPACE/jboss-copy $JBOSS_HOME
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>test-reports/TEST-*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@jbossws.hudson.url@/scripts</remote>
+ <local>hudson-scripts</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>14</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Run the AS-6.1.0 webservice testsuite agains jbossws-(a)version.id@</description>
+ <actions class="vector"/>
+</project>
Modified: hudson/trunk/hudson-home/jobs/CXF-ALL/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-ALL/config.xml 2011-08-17 12:14:24 UTC (rev 14892)
+++ hudson/trunk/hudson-home/jobs/CXF-ALL/config.xml 2011-08-17 19:22:09 UTC (rev 14893)
@@ -8,6 +8,10 @@
, CXF-CORE-AS-6.0.0-SPRING-SUN-JDK-6
+, CXF-CORE-AS-6.1.0-SUN-JDK-6
+
+, CXF-CORE-AS-6.1.0-SPRING-SUN-JDK-6
+
, CXF-CORE-AS-7.0.0-SUN-JDK-6
, CXF-CORE-AS-7.0.0-SPRING-SUN-JDK-6
@@ -20,25 +24,25 @@
, CXF-BINDIST-AS-6.0.0-SPRING-SUN-JDK-6
+, CXF-BINDIST-AS-6.1.0-SUN-JDK-6
+
+, CXF-BINDIST-AS-6.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-SRCDIST-AS-6.1.0-SUN-JDK-6
+
+, CXF-SRCDIST-AS-6.1.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-SRCDIST-AS-7.0.0-SUN-JDK-6
-
-, CXF-SRCDIST-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-7.1.0-SUN-JDK-6
-
-, CXF-SRCDIST-AS-7.1.0-SPRING-SUN-JDK-6
</childProjects>
<threshold>
<name>UNSTABLE</name>
Added: hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-6.1.0-SPRING-SUN-JDK-6/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-6.1.0-SPRING-SUN-JDK-6/config.xml (rev 0)
+++ hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-6.1.0-SPRING-SUN-JDK-6/config.xml 2011-08-17 19:22:09 UTC (rev 14893)
@@ -0,0 +1,75 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=CXF-BINDIST-AS-6.1.0-SPRING-SUN-JDK-6
+
+WORKSPACE=`pwd`
+STACK_ID=cxf
+JAVA_HOME=(a)java.home.sun.jdk6@
+SCRIPTS_DIR=$WORKSPACE/hudson-scripts
+STACK_DIR=$WORKSPACE/stack-cxf
+TEST_OPTS=
+JBOSS_TARGET=jboss610
+JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
+JBOSS_CONFIG=(a)jboss.server.instance@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.1.0/workspace/JBossAS-6.1.0/build/target/(a)hudson.jboss610.build@
+
+#
+# load test functions
+#
+. $SCRIPTS_DIR/jbossws-qa.sh
+
+#
+# execute binary distribution tests
+#
+binaryDistributionTestWithSpring
+
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>stack-cxf/target/jbossws-cxf-bin-dist/output/test-reports/TEST-*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@jbossws.hudson.url@/scripts</remote>
+ <local>hudson-scripts</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>14</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-cxf-(a)version.id@ binary distribution against AS-6.1.0 with SpringFramework libraries available and Sun JDK 6</description>
+ <actions class="vector"/>
+</project>
Added: hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-6.1.0-SUN-JDK-6/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-6.1.0-SUN-JDK-6/config.xml (rev 0)
+++ hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-6.1.0-SUN-JDK-6/config.xml 2011-08-17 19:22:09 UTC (rev 14893)
@@ -0,0 +1,75 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=CXF-BINDIST-AS-6.1.0-SUN-JDK-6
+
+WORKSPACE=`pwd`
+STACK_ID=cxf
+JAVA_HOME=(a)java.home.sun.jdk6@
+SCRIPTS_DIR=$WORKSPACE/hudson-scripts
+STACK_DIR=$WORKSPACE/stack-cxf
+TEST_OPTS=
+JBOSS_TARGET=jboss610
+JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
+JBOSS_CONFIG=(a)jboss.server.instance@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.1.0/workspace/JBossAS-6.1.0/build/target/(a)hudson.jboss610.build@
+
+#
+# load test functions
+#
+. $SCRIPTS_DIR/jbossws-qa.sh
+
+#
+# execute binary distribution tests
+#
+binaryDistributionTest
+
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>stack-cxf/target/jbossws-cxf-bin-dist/output/test-reports/TEST-*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@jbossws.hudson.url@/scripts</remote>
+ <local>hudson-scripts</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>14</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-cxf-(a)version.id@ binary distribution against AS-6.1.0 with Sun JDK 6</description>
+ <actions class="vector"/>
+</project>
Added: hudson/trunk/hudson-home/jobs/CXF-CORE-AS-6.1.0-SPRING-SUN-JDK-6/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-CORE-AS-6.1.0-SPRING-SUN-JDK-6/config.xml (rev 0)
+++ hudson/trunk/hudson-home/jobs/CXF-CORE-AS-6.1.0-SPRING-SUN-JDK-6/config.xml 2011-08-17 19:22:09 UTC (rev 14893)
@@ -0,0 +1,75 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=CXF-CORE-AS-6.1.0-SPRING-SUN-JDK-6
+
+WORKSPACE=`pwd`
+STACK_ID=cxf
+JAVA_HOME=(a)java.home.sun.jdk6@
+SCRIPTS_DIR=$WORKSPACE/hudson-scripts
+STACK_DIR=$WORKSPACE/stack-cxf
+TEST_OPTS=
+JBOSS_TARGET=jboss610
+JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
+JBOSS_CONFIG=(a)jboss.server.instance@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.1.0/workspace/JBossAS-6.1.0/build/target/(a)hudson.jboss610.build@
+
+#
+# load test functions
+#
+. $SCRIPTS_DIR/jbossws-qa.sh
+
+#
+# execute core tests
+#
+coreTestWithSpring
+
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>stack-cxf/**/target/surefire-reports/*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@jbossws.hudson.url@/scripts</remote>
+ <local>hudson-scripts</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>14</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-cxf-(a)version.id@ against AS-6.1.0 with SpringFramework libraires available and Sun JDK 6</description>
+ <actions class="vector"/>
+</project>
Added: hudson/trunk/hudson-home/jobs/CXF-CORE-AS-6.1.0-SUN-JDK-6/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-CORE-AS-6.1.0-SUN-JDK-6/config.xml (rev 0)
+++ hudson/trunk/hudson-home/jobs/CXF-CORE-AS-6.1.0-SUN-JDK-6/config.xml 2011-08-17 19:22:09 UTC (rev 14893)
@@ -0,0 +1,75 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=CXF-CORE-AS-6.1.0-SUN-JDK-6
+
+WORKSPACE=`pwd`
+STACK_ID=cxf
+JAVA_HOME=(a)java.home.sun.jdk6@
+SCRIPTS_DIR=$WORKSPACE/hudson-scripts
+STACK_DIR=$WORKSPACE/stack-cxf
+TEST_OPTS=
+JBOSS_TARGET=jboss610
+JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
+JBOSS_CONFIG=(a)jboss.server.instance@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.1.0/workspace/JBossAS-6.1.0/build/target/(a)hudson.jboss610.build@
+
+#
+# load test functions
+#
+. $SCRIPTS_DIR/jbossws-qa.sh
+
+#
+# execute core tests
+#
+coreTest
+
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>stack-cxf/**/target/surefire-reports/*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@jbossws.hudson.url@/scripts</remote>
+ <local>hudson-scripts</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>14</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-cxf-(a)version.id@ against AS-6.1.0 with Sun JDK 6</description>
+ <actions class="vector"/>
+</project>
Modified: hudson/trunk/hudson-home/jobs/CXF-LIGHT/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-LIGHT/config.xml 2011-08-17 12:14:24 UTC (rev 14892)
+++ hudson/trunk/hudson-home/jobs/CXF-LIGHT/config.xml 2011-08-17 19:22:09 UTC (rev 14893)
@@ -8,6 +8,10 @@
, CXF-CORE-AS-6.0.0-SPRING-SUN-JDK-6
+, CXF-CORE-AS-6.1.0-SUN-JDK-6
+
+, CXF-CORE-AS-6.1.0-SPRING-SUN-JDK-6
+
, CXF-CORE-AS-7.0.0-SUN-JDK-6
, CXF-CORE-AS-7.0.0-SPRING-SUN-JDK-6
@@ -20,6 +24,10 @@
, CXF-BINDIST-AS-6.0.0-SPRING-SUN-JDK-6
+, CXF-BINDIST-AS-6.1.0-SUN-JDK-6
+
+, CXF-BINDIST-AS-6.1.0-SPRING-SUN-JDK-6
+
, CXF-BINDIST-AS-7.0.0-SUN-JDK-6
, CXF-BINDIST-AS-7.0.0-SPRING-SUN-JDK-6
Added: hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-6.1.0-SPRING-SUN-JDK-6/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-6.1.0-SPRING-SUN-JDK-6/config.xml (rev 0)
+++ hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-6.1.0-SPRING-SUN-JDK-6/config.xml 2011-08-17 19:22:09 UTC (rev 14893)
@@ -0,0 +1,75 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=CXF-SRCDIST-AS-6.1.0-SPRING-SUN-JDK-6
+
+WORKSPACE=`pwd`
+STACK_ID=cxf
+JAVA_HOME=(a)java.home.sun.jdk6@
+SCRIPTS_DIR=$WORKSPACE/hudson-scripts
+STACK_DIR=$WORKSPACE/stack-cxf
+TEST_OPTS=
+JBOSS_TARGET=jboss610
+JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
+JBOSS_CONFIG=(a)jboss.server.instance@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.1.0/workspace/JBossAS-6.1.0/build/target/(a)hudson.jboss610.build@
+
+#
+# load test functions
+#
+. $SCRIPTS_DIR/jbossws-qa.sh
+
+#
+# execute source distribution tests
+#
+sourceDistributionTestWithSpring
+
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>stack-cxf/target/jbossws-cxf-src-dist/modules/testsuite/**/target/surefire-reports/TEST-*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@jbossws.hudson.url@/scripts</remote>
+ <local>hudson-scripts</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>14</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-cxf-(a)version.id@ source distribution against AS-6.1.0 with SpringFramework libraries available and Sun JDK 6</description>
+ <actions class="vector"/>
+</project>
Added: hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-6.1.0-SUN-JDK-6/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-6.1.0-SUN-JDK-6/config.xml (rev 0)
+++ hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-6.1.0-SUN-JDK-6/config.xml 2011-08-17 19:22:09 UTC (rev 14893)
@@ -0,0 +1,75 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=CXF-SRCDIST-AS-6.1.0-SUN-JDK-6
+
+WORKSPACE=`pwd`
+STACK_ID=cxf
+JAVA_HOME=(a)java.home.sun.jdk6@
+SCRIPTS_DIR=$WORKSPACE/hudson-scripts
+STACK_DIR=$WORKSPACE/stack-cxf
+TEST_OPTS=
+JBOSS_TARGET=jboss610
+JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
+JBOSS_CONFIG=(a)jboss.server.instance@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.1.0/workspace/JBossAS-6.1.0/build/target/(a)hudson.jboss610.build@
+
+#
+# load test functions
+#
+. $SCRIPTS_DIR/jbossws-qa.sh
+
+#
+# execute source distribution tests
+#
+sourceDistributionTest
+
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>stack-cxf/target/jbossws-cxf-src-dist/modules/testsuite/**/target/surefire-reports/TEST-*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@jbossws.hudson.url@/scripts</remote>
+ <local>hudson-scripts</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>14</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-cxf-(a)version.id@ source distribution against AS-6.1.0 with Sun JDK 6</description>
+ <actions class="vector"/>
+</project>
Modified: hudson/trunk/hudson-home/jobs/NATIVE-ALL/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/NATIVE-ALL/config.xml 2011-08-17 12:14:24 UTC (rev 14892)
+++ hudson/trunk/hudson-home/jobs/NATIVE-ALL/config.xml 2011-08-17 19:22:09 UTC (rev 14893)
@@ -10,6 +10,12 @@
, NATIVE-SRCDIST-AS-6.0.0-SUN-JDK-6
+, NATIVE-CORE-AS-6.1.0-SUN-JDK-6
+
+, NATIVE-BINDIST-AS-6.1.0-SUN-JDK-6
+
+, NATIVE-SRCDIST-AS-6.1.0-SUN-JDK-6
+
, NATIVE-CORE-AS-7.0.0-SUN-JDK-6
, NATIVE-BINDIST-AS-7.0.0-SUN-JDK-6
Added: hudson/trunk/hudson-home/jobs/NATIVE-BINDIST-AS-6.1.0-SUN-JDK-6/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/NATIVE-BINDIST-AS-6.1.0-SUN-JDK-6/config.xml (rev 0)
+++ hudson/trunk/hudson-home/jobs/NATIVE-BINDIST-AS-6.1.0-SUN-JDK-6/config.xml 2011-08-17 19:22:09 UTC (rev 14893)
@@ -0,0 +1,75 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=NATIVE-BINDIST-AS-6.1.0-SUN-JDK-6
+
+WORKSPACE=`pwd`
+STACK_ID=native
+JAVA_HOME=(a)java.home.sun.jdk6@
+SCRIPTS_DIR=$WORKSPACE/hudson-scripts
+STACK_DIR=$WORKSPACE/stack-native
+TEST_OPTS=
+JBOSS_TARGET=jboss610
+JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
+JBOSS_CONFIG=(a)jboss.server.instance@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.1.0/workspace/JBossAS-6.1.0/build/target/(a)hudson.jboss610.build@
+
+#
+# load test functions
+#
+. $SCRIPTS_DIR/jbossws-qa.sh
+
+#
+# execute binary distribution tests
+#
+binaryDistributionTest
+
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>stack-native/target/jbossws-native-bin-dist/output/test-reports/TEST-*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@jbossws.hudson.url@/scripts</remote>
+ <local>hudson-scripts</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.native.url@</remote>
+ <local>stack-native</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>14</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-native-(a)version.id@ binary distribution against AS-6.1.0 with Sun JDK 6</description>
+ <actions class="vector"/>
+</project>
Added: hudson/trunk/hudson-home/jobs/NATIVE-CORE-AS-6.1.0-SUN-JDK-6/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/NATIVE-CORE-AS-6.1.0-SUN-JDK-6/config.xml (rev 0)
+++ hudson/trunk/hudson-home/jobs/NATIVE-CORE-AS-6.1.0-SUN-JDK-6/config.xml 2011-08-17 19:22:09 UTC (rev 14893)
@@ -0,0 +1,75 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=NATIVE-CORE-AS-6.1.0-SUN-JDK-6
+
+WORKSPACE=`pwd`
+STACK_ID=native
+JAVA_HOME=(a)java.home.sun.jdk6@
+SCRIPTS_DIR=$WORKSPACE/hudson-scripts
+STACK_DIR=$WORKSPACE/stack-native
+TEST_OPTS="-Dinterop=true"
+JBOSS_TARGET=jboss610
+JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
+JBOSS_CONFIG=(a)jboss.server.instance@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.1.0/workspace/JBossAS-6.1.0/build/target/(a)hudson.jboss610.build@
+
+#
+# load test functions
+#
+. $SCRIPTS_DIR/jbossws-qa.sh
+
+#
+# execute core tests
+#
+coreTest
+
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>stack-native/**/target/surefire-reports/*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@jbossws.hudson.url@/scripts</remote>
+ <local>hudson-scripts</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.native.url@</remote>
+ <local>stack-native</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>14</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-native-(a)version.id@ against AS-6.1.0 with Sun JDK 6</description>
+ <actions class="vector"/>
+</project>
Modified: hudson/trunk/hudson-home/jobs/NATIVE-LIGHT/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/NATIVE-LIGHT/config.xml 2011-08-17 12:14:24 UTC (rev 14892)
+++ hudson/trunk/hudson-home/jobs/NATIVE-LIGHT/config.xml 2011-08-17 19:22:09 UTC (rev 14893)
@@ -8,6 +8,10 @@
, NATIVE-BINDIST-AS-6.0.0-SUN-JDK-6
+, NATIVE-CORE-AS-6.1.0-SUN-JDK-6
+
+, NATIVE-BINDIST-AS-6.1.0-SUN-JDK-6
+
, NATIVE-CORE-AS-7.0.0-SUN-JDK-6
, NATIVE-BINDIST-AS-7.0.0-SUN-JDK-6
Added: hudson/trunk/hudson-home/jobs/NATIVE-SRCDIST-AS-6.1.0-SUN-JDK-6/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/NATIVE-SRCDIST-AS-6.1.0-SUN-JDK-6/config.xml (rev 0)
+++ hudson/trunk/hudson-home/jobs/NATIVE-SRCDIST-AS-6.1.0-SUN-JDK-6/config.xml 2011-08-17 19:22:09 UTC (rev 14893)
@@ -0,0 +1,75 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=NATIVE-SRCDIST-AS-6.1.0-SUN-JDK-6
+
+WORKSPACE=`pwd`
+STACK_ID=native
+JAVA_HOME=(a)java.home.sun.jdk6@
+SCRIPTS_DIR=$WORKSPACE/hudson-scripts
+STACK_DIR=$WORKSPACE/stack-native
+TEST_OPTS=
+JBOSS_TARGET=jboss610
+JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
+JBOSS_CONFIG=(a)jboss.server.instance@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.1.0/workspace/JBossAS-6.1.0/build/target/(a)hudson.jboss610.build@
+
+#
+# load test functions
+#
+. $SCRIPTS_DIR/jbossws-qa.sh
+
+#
+# execute source distribution tests
+#
+sourceDistributionTest
+
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>stack-native/target/jbossws-native-src-dist/modules/testsuite/**/target/surefire-reports/TEST-*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@jbossws.hudson.url@/scripts</remote>
+ <local>hudson-scripts</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.native.url@</remote>
+ <local>stack-native</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>14</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-native-(a)version.id@ source distribution against AS-6.1.0 with Sun JDK 6</description>
+ <actions class="vector"/>
+</project>
Modified: hudson/trunk/hudson-home/jobs/SWITCH-ALL/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/SWITCH-ALL/config.xml 2011-08-17 12:14:24 UTC (rev 14892)
+++ hudson/trunk/hudson-home/jobs/SWITCH-ALL/config.xml 2011-08-17 19:22:09 UTC (rev 14893)
@@ -3,7 +3,7 @@
<builders class="vector"/>
<publishers class="vector">
<hudson.tasks.BuildTrigger>
- <childProjects>SWITCH-BINDIST-AS-6.0.0</childProjects>
+ <childProjects>SWITCH-BINDIST-AS-6.0.0, SWITCH-BINDIST-AS-6.1.0</childProjects>
<threshold>
<name>UNSTABLE</name>
<ordinal>1</ordinal>
Added: hudson/trunk/hudson-home/jobs/SWITCH-BINDIST-AS-6.1.0/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/SWITCH-BINDIST-AS-6.1.0/config.xml (rev 0)
+++ hudson/trunk/hudson-home/jobs/SWITCH-BINDIST-AS-6.1.0/config.xml 2011-08-17 19:22:09 UTC (rev 14893)
@@ -0,0 +1,112 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=SWITCH-BINDIST-AS-6.1.0
+
+WORKSPACE=`pwd`
+JAVA_HOME=(a)java.home.sun.jdk6@
+SCRIPTS_DIR=$WORKSPACE/hudson-scripts
+TEST_OPTS=
+JBOSS_TARGET=jboss610
+JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
+JBOSS_CONFIG=(a)jboss.server.instance@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.1.0/workspace/JBossAS-6.1.0/build/target/(a)hudson.jboss610.build@
+CXF_BIN_DIST_DIR=@hudson.home(a)/jobs/CXF-BINDIST-AS-6.1.0-SUN-JDK-6/workspace/stack-cxf/
+NATIVE_BIN_DIST_DIR=@hudson.home(a)/jobs/NATIVE-BINDIST-AS-6.1.0-SUN-JDK-6/workspace/stack-native/
+CXF_AS_HOME=$WORKSPACE/cxf-as
+NATIVE_AS_HOME=$WORKSPACE/native-as
+
+#
+# load test functions
+#
+. $SCRIPTS_DIR/jbossws-qa.sh
+
+
+rm -rf $WORKSPACE/*.diff
+rm -rf $WORKSPACE/modified-as
+
+rm -rf $CXF_AS_HOME
+cp -r $JBOSS_INSTANCE $CXF_AS_HOME
+JBOSS_HOME=$CXF_AS_HOME
+STACK_DIR=$CXF_BIN_DIST_DIR
+STACK_ID=cxf
+setupEnv
+redeployBinaryDistribution
+
+rm -rf $NATIVE_AS_HOME
+cp -r $JBOSS_INSTANCE $NATIVE_AS_HOME
+JBOSS_HOME=$NATIVE_AS_HOME
+STACK_DIR=$NATIVE_BIN_DIST_DIR
+STACK_ID=native
+setupEnv
+redeployBinaryDistribution
+
+JBOSS_HOME=$WORKSPACE/modified-as
+
+#------------------------------------- CXF stack checks -------------------------------------
+
+cp -r $NATIVE_AS_HOME $JBOSS_HOME
+STACK_DIR=$CXF_BIN_DIST_DIR
+STACK_ID=cxf
+setupEnv
+redeployBinaryDistribution
+diff -r $CXF_AS_HOME $JBOSS_HOME -x jbossws-native-core.jar -x netty.jar > $WORKSPACE/cxf_vs_cxfOverNative.diff
+rm -rf $JBOSS_HOME
+
+
+#------------------------------------- NATIVE stack checks -------------------------------------
+
+cp -r $CXF_AS_HOME $JBOSS_HOME
+STACK_DIR=$NATIVE_BIN_DIST_DIR
+STACK_ID=native
+setupEnv
+redeployBinaryDistribution
+diff -r $NATIVE_AS_HOME $JBOSS_HOME > $WORKSPACE/native_vs_nativeOverCxf.diff
+rm -rf $JBOSS_HOME
+
+
+rm -rf $CXF_AS_HOME
+rm -rf $NATIVE_AS_HOME
+
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@jbossws.hudson.url@/scripts</remote>
+ <local>hudson-scripts</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>14</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Test jbossws bindist stack switch against AS 6.1.0</description>
+ <actions class="vector"/>
+</project>
13 years, 4 months
- 1
- 0
JBossWS SVN: r14892 - in stack/cxf/trunk: modules/dist and 5 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-08-17 08:14:24 -0400 (Wed, 17 Aug 2011)
New Revision: 14892
Modified:
stack/cxf/trunk/build.xml
stack/cxf/trunk/modules/dist/pom.xml
stack/cxf/trunk/modules/dist/src/main/distro/Install.txt
stack/cxf/trunk/modules/dist/src/main/distro/ant.properties.example
stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml
stack/cxf/trunk/modules/dist/src/main/distro/build-setup.xml
stack/cxf/trunk/modules/dist/src/main/distro/build.xml
stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
stack/cxf/trunk/modules/server/pom.xml
stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml
stack/cxf/trunk/modules/testsuite/pom.xml
stack/cxf/trunk/pom.xml
Log:
support for AS 6.1.0.Final
Modified: stack/cxf/trunk/build.xml
===================================================================
--- stack/cxf/trunk/build.xml 2011-08-17 10:54:00 UTC (rev 14891)
+++ stack/cxf/trunk/build.xml 2011-08-17 12:14:24 UTC (rev 14892)
@@ -61,8 +61,8 @@
<condition property="jboss600.home" value="${profiles.profile.properties.jboss600.home}">
<isset property="profiles.profile.properties.jboss600.home"/>
</condition>
- <condition property="jboss601.home" value="${profiles.profile.properties.jboss601.home}">
- <isset property="profiles.profile.properties.jboss601.home"/>
+ <condition property="jboss610.home" value="${profiles.profile.properties.jboss610.home}">
+ <isset property="profiles.profile.properties.jboss610.home"/>
</condition>
<condition property="jboss700.home" value="${profiles.profile.properties.jboss700.home}">
<isset property="profiles.profile.properties.jboss700.home"/>
@@ -72,14 +72,14 @@
</condition>
- <fail message="jboss home not set, use jboss601.home=value, jboss600.home=value, jboss700.home=value or jboss710.home=value to set">
+ <fail message="jboss home not set, use jboss600.home=value, jboss610.home=value, jboss700.home=value or jboss710.home=value to set">
<condition>
<and>
<not>
- <isset property="jboss601.home"/>
+ <isset property="jboss600.home"/>
</not>
<not>
- <isset property="jboss600.home"/>
+ <isset property="jboss610.home"/>
</not>
<not>
<isset property="jboss700.home"/>
@@ -93,7 +93,7 @@
<echo/>
<echo message="jboss600.home=${jboss600.home}"/>
- <echo message="jboss601.home=${jboss601.home}"/>
+ <echo message="jboss610.home=${jboss610.home}"/>
<echo message="jboss700.home=${jboss700.home}"/>
<echo message="jboss710.home=${jboss710.home}"/>
</target>
Modified: stack/cxf/trunk/modules/dist/pom.xml
===================================================================
--- stack/cxf/trunk/modules/dist/pom.xml 2011-08-17 10:54:00 UTC (rev 14891)
+++ stack/cxf/trunk/modules/dist/pom.xml 2011-08-17 12:14:24 UTC (rev 14892)
@@ -118,8 +118,7 @@
<artifactId>juddi</artifactId>
<scope>provided</scope>
</dependency>
-
- <!--jboss600-->
+
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss600</artifactId>
@@ -136,6 +135,22 @@
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss610</artifactId>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>sun-jaxb</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
<!--junit-->
<dependency>
<groupId>junit</groupId>
@@ -189,8 +204,8 @@
<xslt style="${basedir}/src/main/distro/test-exclude.xsl" in="../testsuite/pom.xml" out="${basedir}/target/exclude-file/test-excludes-jboss600.txt">
<param name="targetName" expression="jboss600" />
</xslt>
- <xslt style="${basedir}/src/main/distro/test-exclude.xsl" in="../testsuite/pom.xml" out="${basedir}/target/exclude-file/test-excludes-jboss601.txt">
- <param name="targetName" expression="jboss601" />
+ <xslt style="${basedir}/src/main/distro/test-exclude.xsl" in="../testsuite/pom.xml" out="${basedir}/target/exclude-file/test-excludes-jboss610.txt">
+ <param name="targetName" expression="jboss610" />
</xslt>
<xslt style="${basedir}/src/main/distro/test-exclude.xsl" in="../testsuite/pom.xml" out="${basedir}/target/exclude-file/test-excludes-jboss700.txt">
<param name="targetName" expression="jboss700" />
Modified: stack/cxf/trunk/modules/dist/src/main/distro/Install.txt
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/distro/Install.txt 2011-08-17 10:54:00 UTC (rev 14891)
+++ stack/cxf/trunk/modules/dist/src/main/distro/Install.txt 2011-08-17 12:14:24 UTC (rev 14892)
@@ -14,20 +14,20 @@
3.) Execute one of the following
ant deploy-jboss600
- ant deploy-jboss601
+ ant deploy-jboss610
By default the SOAP stack will be installed to 'default' configuration.
If users want to install SOAP stack to different JBossAS configuration then
they have to specify -Djboss.server.instance=foo JVM property.
Supported configurations of the installer are 'default', 'all' and 'standard'.
- ant -Djboss.server.instance=standard deploy-jboss600
+ ant -Djboss.server.instance=standard deploy-jboss610
By default Spring Framework libraries are not installed to application
server. In order to do that, please add the -Dspring=true property option when
running the ant script:
- ant -Dspring=true deploy-jboss600
+ ant -Dspring=true deploy-jboss610
Please note Spring is required for advanced configuration only, whenever users
want to provide their own jbossws-cxf.xml Spring configuration file.
Modified: stack/cxf/trunk/modules/dist/src/main/distro/ant.properties.example
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/distro/ant.properties.example 2011-08-17 10:54:00 UTC (rev 14891)
+++ stack/cxf/trunk/modules/dist/src/main/distro/ant.properties.example 2011-08-17 12:14:24 UTC (rev 14892)
@@ -4,12 +4,12 @@
# Optional JBoss Home
jboss600.home=(a)jboss600.home@
-jboss601.home=(a)jboss601.home@
+jboss610.home=(a)jboss610.home@
jboss700.home=(a)jboss700.home@
jboss710.home=(a)jboss710.home@
-# The JBoss server under test. This can be [jboss600|jboss601|jboss700|jboss710]
-jbossws.integration.target=jboss601
+# The JBoss server under test. This can be [jboss600|jboss610|jboss700|jboss710]
+jbossws.integration.target=jboss610
# The JBoss settings
jboss.server.instance=default
Modified: stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml 2011-08-17 10:54:00 UTC (rev 14891)
+++ stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml 2011-08-17 12:14:24 UTC (rev 14892)
@@ -54,44 +54,44 @@
</target>
<!-- ================================================================== -->
- <!-- Prepare Deployment Structure JBoss-6.0.1 -->
+ <!-- Prepare Deployment Structure JBoss-6.1.0 -->
<!-- ================================================================== -->
- <target name="deploy-structure-jboss601" depends="prepare-deploy">
+ <target name="deploy-structure-jboss610" depends="prepare-deploy">
<delete dir="${deploy.structure}"/>
<antcall target="deploy-jbossws-cxf-with-jaxrpc" inheritall="false">
<param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/>
<param name="jbossid" value="${jbossws.integration.target}"/>
<param name="artifactsdir" value="${deploy.artifacts.dir}"/>
<param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
- <param name="modifyjbossintegration" value="false"/><!-- [JBWS-2505] -->
+ <param name="modifyjbossintegration" value="true"/><!-- [JBWS-2505] -->
</antcall>
</target>
<!-- ================================================================== -->
- <!-- Deployment JBoss601 -->
+ <!-- Deployment JBoss610 -->
<!-- ================================================================== -->
- <target name="target-jboss601">
- <property name="jbossws.integration.target" value="jboss601"/>
+ <target name="target-jboss610">
+ <property name="jbossws.integration.target" value="jboss610"/>
<echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
</target>
- <target name="deploy-jboss601" depends="undeploy-jboss601,deploy-structure-jboss601,check-spring,install-spring" description="Deploy jbossws to jboss601">
+ <target name="deploy-jboss610" depends="undeploy-jboss610,deploy-structure-jboss610,check-spring,install-spring" description="Deploy jbossws to jboss610">
<macro-create-deploy-conf deploystructure="${deploy.structure}"/>
- <fail message="Not available: ${jboss601.available.file}" unless="jboss601.available"/>
- <copy todir="${jboss601.home}" overwrite="true" verbose="true">
+ <fail message="Not available: ${jboss610.available.file}" unless="jboss610.available"/>
+ <copy todir="${jboss610.home}" overwrite="true" verbose="true">
<fileset dir="${deploy.structure}"/>
</copy>
- <chmod dir="${jboss601.home}/bin" perm="+x" includes="*.sh"/>
+ <chmod dir="${jboss610.home}/bin" perm="+x" includes="*.sh"/>
</target>
- <target name="undeploy-jboss601" depends="target-jboss601,init" description="Remove jbossws from jboss601">
- <fail message="Not available: ${jboss601.available.file}" unless="jboss601.available"/>
- <macro-undeploy-jbossws targetdir="${jboss601.server}"
+ <target name="undeploy-jboss610" depends="target-jboss610,init" description="Remove jbossws from jboss610">
+ <fail message="Not available: ${jboss610.available.file}" unless="jboss610.available"/>
+ <macro-undeploy-jbossws targetdir="${jboss610.server}"
defaultconf="${jbossws.default.deploy.conf}"
defaultserverconf="${jbossws.default.server.deploy.conf}"
- modifyjbossintegration="false"
+ modifyjbossintegration="true"
removenativecore="false"/><!-- [JBWS-2505][JBWS-2895] -->
</target>
Modified: stack/cxf/trunk/modules/dist/src/main/distro/build-setup.xml
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/distro/build-setup.xml 2011-08-17 10:54:00 UTC (rev 14891)
+++ stack/cxf/trunk/modules/dist/src/main/distro/build-setup.xml 2011-08-17 12:14:24 UTC (rev 14892)
@@ -28,23 +28,23 @@
<property name="jboss600.server.deploy" value="${jboss600.server}/deploy"/>
<property name="jboss600.server.deployers" value="${jboss600.server}/deployers"/>
- <property name="jboss601.lib" value="${jboss601.home}/lib"/>
- <property name="jboss601.client" value="${jboss601.home}/client"/>
- <property name="jboss601.server" value="${jboss601.home}/server/${jboss.server.instance}"/>
- <property name="jboss601.server.lib" value="${jboss601.home}/common/lib"/>
- <property name="jboss601.server.deploy" value="${jboss601.server}/deploy"/>
- <property name="jboss601.server.deployers" value="${jboss601.server}/deployers"/>
+ <property name="jboss610.lib" value="${jboss610.home}/lib"/>
+ <property name="jboss610.client" value="${jboss610.home}/client"/>
+ <property name="jboss610.server" value="${jboss610.home}/server/${jboss.server.instance}"/>
+ <property name="jboss610.server.lib" value="${jboss610.home}/common/lib"/>
+ <property name="jboss610.server.deploy" value="${jboss610.server}/deploy"/>
+ <property name="jboss610.server.deployers" value="${jboss610.server}/deployers"/>
<property name="jboss700.modules" value="${jboss700.home}/modules"/>
<property name="jboss710.modules" value="${jboss710.home}/modules"/>
<property name="jboss600.available.file" value="${jboss600.client}/jboss-client.jar"/>
- <property name="jboss601.available.file" value="${jboss601.client}/jboss-client.jar"/>
+ <property name="jboss610.available.file" value="${jboss610.client}/jboss-client.jar"/>
<property name="jboss700.available.file" value="${jboss700.home}/jboss-modules.jar"/>
<property name="jboss710.available.file" value="${jboss710.home}/jboss-modules.jar"/>
<available property="jboss600.available" file="${jboss600.available.file}"/>
- <available property="jboss601.available" file="${jboss601.available.file}"/>
+ <available property="jboss610.available" file="${jboss610.available.file}"/>
<available property="jboss700.available" file="${jboss700.available.file}"/>
<available property="jboss710.available" file="${jboss710.available.file}"/>
Modified: stack/cxf/trunk/modules/dist/src/main/distro/build.xml
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/distro/build.xml 2011-08-17 10:54:00 UTC (rev 14891)
+++ stack/cxf/trunk/modules/dist/src/main/distro/build.xml 2011-08-17 12:14:24 UTC (rev 14892)
@@ -50,7 +50,7 @@
<condition property="jbossws.integration.jboss60" value="true">
<or>
<equals arg1="${jbossws.integration.target}" arg2="jboss600"/>
- <equals arg1="${jbossws.integration.target}" arg2="jboss601"/>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss610"/>
</or>
</condition>
<condition property="jbossws.integration.jboss70" value="true">
Modified: stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2011-08-17 10:54:00 UTC (rev 14891)
+++ stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2011-08-17 12:14:24 UTC (rev 14892)
@@ -96,6 +96,7 @@
<include>juddi:juddi:jar</include>
<include>org.jboss.ws:jbossws-common-tools:jar</include>
<include>org.jboss.ws:jbossws-jboss600:jar</include>
+ <include>org.jboss.ws:jbossws-jboss610:jar</include>
<include>org.jboss.as:jboss-as-webservices-tests-integration:jar</include>
</includes>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
Modified: stack/cxf/trunk/modules/server/pom.xml
===================================================================
--- stack/cxf/trunk/modules/server/pom.xml 2011-08-17 10:54:00 UTC (rev 14891)
+++ stack/cxf/trunk/modules/server/pom.xml 2011-08-17 12:14:24 UTC (rev 14892)
@@ -290,41 +290,19 @@
<type>zip</type>
<outputDirectory>${project.build.directory}/resources/jbossws-jboss600</outputDirectory>
</artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <!-- JBWS-2505 -->
- <!-- START -->
- <!--
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-dependencies</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>org.jboss.ws:jbossws-jboss*:zip:resources</artifactItems>
- <artifactItems>
<artifactItem>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss600x</artifactId>
- <version>${jbossws.jboss601.version}</version>
+ <artifactId>jbossws-jboss610</artifactId>
+ <version>${jbossws.jboss610.version}</version>
<classifier>resources</classifier>
<type>zip</type>
- <outputDirectory>${project.build.directory}/resources/jbossws-jboss601</outputDirectory>
+ <outputDirectory>${project.build.directory}/resources/jbossws-jboss610</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
- -->
- <!-- END -->
<!-- http://jira.codehaus.org/browse/MANTRUN-89 -->
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
Modified: stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2011-08-17 10:54:00 UTC (rev 14891)
+++ stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2011-08-17 12:14:24 UTC (rev 14892)
@@ -23,7 +23,7 @@
<copy
file="${src.dir}/jbossws-cxf-config-as6.xml"
- tofile="${dest.dir}/jbossws-jboss601/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
+ tofile="${dest.dir}/jbossws-jboss610/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
/>
<copy
@@ -33,7 +33,7 @@
<copy
file="${src.dir}/jbossws-jaxrpc-config-as6.xml"
- tofile="${dest.dir}/jbossws-jaxrpc-jboss601/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
+ tofile="${dest.dir}/jbossws-jaxrpc-jboss610/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
/>
<copy
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2011-08-17 10:54:00 UTC (rev 14891)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-08-17 12:14:24 UTC (rev 14892)
@@ -744,20 +744,20 @@
</profile>
<!--
- Name: jboss601
- Descr: JBoss-6.0.1 specific options
+ Name: jboss610
+ Descr: JBoss-6.1.0 specific options
-->
<profile>
- <id>jboss601</id>
+ <id>jboss610</id>
<properties>
- <jboss.version>6.0.1-SNAPSHOT</jboss.version>
- <jbossws.integration.target>jboss601</jbossws.integration.target>
+ <jboss.version>6.1.0.Final</jboss.version>
+ <jbossws.integration.target>jboss610</jbossws.integration.target>
</properties>
<dependencies>
<dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-depchain</artifactId>
- <scope>import</scope>
+ <scope>test</scope>
<type>pom</type>
<version>${jboss.version}</version>
<exclusions>
@@ -766,7 +766,7 @@
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-webservices</artifactId>
</exclusion>
- <!-- Exclusions for preventing cyclic dependency on JBossWS-CXF (AS 6.0.0) -->
+ <!-- Exclusions for preventing cyclic dependency on JBossWS-CXF -->
<exclusion>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-client</artifactId>
@@ -787,20 +787,37 @@
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-resources</artifactId>
</exclusion>
+ <!-- Exclusions for preventing cyclic dependency on JBossWS-Native -->
<exclusion>
<groupId>org.jboss.ws.native</groupId>
+ <artifactId>jbossws-native-client</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.ws.native</groupId>
+ <artifactId>jbossws-native-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-factories</artifactId>
</exclusion>
<exclusion>
<groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-client</artifactId>
+ <artifactId>jbossws-native-jaxrpc</artifactId>
</exclusion>
<exclusion>
<groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-core</artifactId>
+ <artifactId>jbossws-native-saaj</artifactId>
</exclusion>
<exclusion>
<groupId>org.jboss.ws.native</groupId>
+ <artifactId>jbossws-native-management</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.ws.native</groupId>
+ <artifactId>jbossws-native-resources</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-services</artifactId>
</exclusion>
<exclusion>
@@ -833,7 +850,7 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <compilerArgument>-Djava.endorsed.dirs=${jboss601.home}/lib/endorsed</compilerArgument>
+ <compilerArgument>-Djava.endorsed.dirs=${jboss610.home}/lib/endorsed</compilerArgument>
</configuration>
<executions>
<execution>
@@ -848,50 +865,50 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${jboss601.home}/lib/endorsed</argLine>
+ <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${jboss610.home}/lib/endorsed -Dorg.jboss.wsf.spi.deployer.Deployer=org.jboss.wsf.test.DeployerJBoss6</argLine>
<!-- TODO: replace with maven dependencies -->
<additionalClasspathElements>
<!-- Lib below required just for jaxrpc tests; listed here to prevent CXF stack from depending on Native stack -->
<additionalClasspathElement>${jboss.home}/common/lib/jbossws-native-core.jar</additionalClasspathElement>
</additionalClasspathElements>
<excludes>
- <!--# UsernameTestCase requires trustore in jboss-web tomcat configuration-->
- <exclude>org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.*</exclude>
- <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/basic/UsernameOverTransportTestCase.*</exclude>
+ <!-- # UsernameTestCase requires trustore in jboss-web tomcat configuration-->
+ <exclude>org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.*</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/basic/UsernameOverTransportTestCase.*</exclude>
- <!--# [CXF-1519] Explicitly set the namespace of a WebFault-->
- <exclude>org/jboss/test/ws/jaxws/jbws1904/**</exclude>
+ <!--# [CXF-1519] Explicitly set the namespace of a WebFault-->
+ <exclude>org/jboss/test/ws/jaxws/jbws1904/**</exclude>
- <!--# [CXF-2006] RespectBinding feature and not understood required extensibility elements-->
- <exclude>org/jboss/test/ws/jaxws/jbws2449/**</exclude>
+ <!--# [CXF-2006] RespectBinding feature and not understood required extensibility elements-->
+ <exclude>org/jboss/test/ws/jaxws/jbws2449/**</exclude>
- <!--# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored-->
- <exclude>org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*</exclude>
+ <!--# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored-->
+ <exclude>org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*</exclude>
- <!--# [JBWS-2561] XOP request not properly inlined-->
- <exclude>org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*</exclude>
+ <!--# [JBWS-2561] XOP request not properly inlined-->
+ <exclude>org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*</exclude>
- <!--# [JBWS-2480] Soap attachments are dropped on server response-->
- <exclude>org/jboss/test/ws/jaxws/jbws1283/**</exclude>
+ <!--# [JBWS-2480] Soap attachments are dropped on server response-->
+ <exclude>org/jboss/test/ws/jaxws/jbws1283/**</exclude>
- <!--# [JBWS-2397] Fix jbws1797 testcase-->
- <exclude>org/jboss/test/ws/jaxws/jbws1797/**</exclude>
+ <!--# [JBWS-2397] Fix jbws1797 testcase-->
+ <exclude>org/jboss/test/ws/jaxws/jbws1797/**</exclude>
- <!--# [JBAS-8363] Virtual host issue in JBossWeb-->
- <exclude>org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*</exclude>
+ <!--# [JBAS-8363] Virtual host issue in JBossWeb-->
+ <exclude>org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*</exclude>
- <!--# Seems MSFT interop. endpoints are down :(-->
- <exclude>org/jboss/test/ws/jaxws/cxf/interop/wstrust10/**</exclude>
+ <!--# Seems MSFT interop. endpoints are down :(-->
+ <exclude>org/jboss/test/ws/jaxws/cxf/interop/wstrust10/**</exclude>
- <!-- # [JBWS-3205] JDKLogManager not used -->
- <exclude>org/jboss/test/ws/jaxws/cxf/logging/JDKLoggingTestCase*</exclude>
+ <!-- # [JBWS-3205] JDKLogManager not used -->
+ <exclude>org/jboss/test/ws/jaxws/cxf/logging/JDKLoggingTestCase*</exclude>
- <!-- # [JBWS-3125] SOAP over JMS 1.0 deployment support available on AS 7 only -->
- <exclude>org/jboss/test/ws/jaxws/cxf/jms/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/cxf/jms_http/**</exclude>
+ <!-- # [JBWS-3125] SOAP over JMS 1.0 deployment support available on AS 7 only -->
+ <exclude>org/jboss/test/ws/jaxws/cxf/jms/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/cxf/jms_http/**</exclude>
- <!-- # [AS7-1322] Implemented on AS 7.0.1 or greater only -->
- <exclude>org/jboss/test/ws/publish/EndpointPublishTestCase*</exclude>
+ <!-- # [AS7-1322] Implemented on AS 7.0.1 or greater only -->
+ <exclude>org/jboss/test/ws/publish/EndpointPublishTestCase*</exclude>
</excludes>
</configuration>
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2011-08-17 10:54:00 UTC (rev 14891)
+++ stack/cxf/trunk/pom.xml 2011-08-17 12:14:24 UTC (rev 14892)
@@ -51,14 +51,9 @@
<jbossws.common.tools.version>1.0.0-SNAPSHOT</jbossws.common.tools.version>
<jbossws.shared.testsuite.version>4.0.0-SNAPSHOT</jbossws.shared.testsuite.version>
<jbossws.jboss600.version>4.0.0-SNAPSHOT</jbossws.jboss600.version>
- <!-- JBWS-2505 -->
- <!-- START -->
- <!--
- <jbossws.jboss601.version>3.2.1.GA</jbossws.jboss601.version>
- -->
- <!-- END -->
+ <jbossws.jboss610.version>4.0.0-SNAPSHOT</jbossws.jboss610.version>
<jboss700.version>7.0.0.Final</jboss700.version>
- <cxf.version>2.4.2-SNAPSHOT</cxf.version>
+ <cxf.version>2.4.3-SNAPSHOT</cxf.version>
<cxf.asm.version>3.3</cxf.asm.version>
<cxf.xjcplugins.version>2.3.2</cxf.xjcplugins.version>
<fastinfoset.api.version>1.2.7</fastinfoset.api.version>
@@ -141,28 +136,23 @@
<type>zip</type>
</dependency>
<dependency>
- <groupId>org.jboss.as</groupId>
- <artifactId>jboss-as-webservices-tests-integration</artifactId>
- <version>${jboss700.version}</version>
- </dependency>
- <!-- JBWS-2505 -->
- <!-- START -->
- <!--
- <dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss600x</artifactId>
- <version>${jbossws.jboss601.version}</version>
+ <artifactId>jbossws-jboss610</artifactId>
+ <version>${jbossws.jboss610.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss600x</artifactId>
- <version>${jbossws.jboss601.version}</version>
+ <artifactId>jbossws-jboss610</artifactId>
+ <version>${jbossws.jboss610.version}</version>
<classifier>resources</classifier>
<type>zip</type>
</dependency>
- -->
- <!-- END -->
<dependency>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-webservices-tests-integration</artifactId>
+ <version>${jboss700.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.jboss.ws.projects</groupId>
<artifactId>jaxws-jboss-httpserver-httpspi</artifactId>
<version>${jaxws-jboss-httpserver-httpspi.version}</version>
@@ -1290,14 +1280,14 @@
</profile>
<!--
- Name: jboss601
- Descr: JBoss-6.0.1 specific options
+ Name: jboss610
+ Descr: JBoss-6.1.0 specific options
-->
<profile>
- <id>jboss601</id>
+ <id>jboss610</id>
<properties>
- <jbossws.integration.target>jboss601</jbossws.integration.target>
- <jboss.home>${jboss601.home}</jboss.home>
+ <jbossws.integration.target>jboss610</jbossws.integration.target>
+ <jboss.home>${jboss610.home}</jboss.home>
</properties>
</profile>
13 years, 4 months
- 1
- 0
JBossWS SVN: r14891 - in stack/native/trunk: modules/core and 6 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-08-17 06:54:00 -0400 (Wed, 17 Aug 2011)
New Revision: 14891
Modified:
stack/native/trunk/build.xml
stack/native/trunk/modules/core/pom.xml
stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml
stack/native/trunk/modules/dist/management/pom.xml
stack/native/trunk/modules/dist/pom.xml
stack/native/trunk/modules/dist/src/main/distro/Install.txt
stack/native/trunk/modules/dist/src/main/distro/ant.properties.example
stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml
stack/native/trunk/modules/dist/src/main/distro/build-setup.xml
stack/native/trunk/modules/dist/src/main/distro/build.xml
stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
stack/native/trunk/modules/testsuite/pom.xml
stack/native/trunk/pom.xml
Log:
support for AS 6.1.0.Final
Modified: stack/native/trunk/build.xml
===================================================================
--- stack/native/trunk/build.xml 2011-08-17 10:11:09 UTC (rev 14890)
+++ stack/native/trunk/build.xml 2011-08-17 10:54:00 UTC (rev 14891)
@@ -57,8 +57,8 @@
<condition property="jboss600.home" value="${profiles.profile.properties.jboss600.home}">
<isset property="profiles.profile.properties.jboss600.home"/>
</condition>
- <condition property="jboss601.home" value="${profiles.profile.properties.jboss601.home}">
- <isset property="profiles.profile.properties.jboss601.home"/>
+ <condition property="jboss610.home" value="${profiles.profile.properties.jboss610.home}">
+ <isset property="profiles.profile.properties.jboss610.home"/>
</condition>
<condition property="jboss700.home" value="${profiles.profile.properties.jboss700.home}">
<isset property="profiles.profile.properties.jboss700.home"/>
@@ -68,14 +68,14 @@
<isset property="profiles.profile.properties.jboss710.home"/>
</condition>
- <fail message="jboss home not set, use -Djboss600.home=value or -Djboss601.home=value, -Djboss700.home=value or -Djboss710.home=value to set">
+ <fail message="jboss home not set, use -Djboss600.home=value or -Djboss610.home=value, -Djboss700.home=value or -Djboss710.home=value to set">
<condition>
<and>
<not>
<isset property="jboss600.home"/>
</not>
<not>
- <isset property="jboss601.home"/>
+ <isset property="jboss610.home"/>
</not>
<not>
<isset property="jboss700.home"/>
@@ -89,7 +89,7 @@
<echo/>
<echo message="jboss600.home=${jboss600.home}"/>
- <echo message="jboss601.home=${jboss601.home}"/>
+ <echo message="jboss610.home=${jboss610.home}"/>
<echo message="jboss700.home=${jboss700.home}"/>
<echo message="jboss710.home=${jboss710.home}"/>
</target>
Modified: stack/native/trunk/modules/core/pom.xml
===================================================================
--- stack/native/trunk/modules/core/pom.xml 2011-08-17 10:11:09 UTC (rev 14890)
+++ stack/native/trunk/modules/core/pom.xml 2011-08-17 10:54:00 UTC (rev 14891)
@@ -221,34 +221,17 @@
<type>zip</type>
<outputDirectory>${project.build.directory}/resources/jbossws-jboss600</outputDirectory>
</artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- <!-- [JBWS-2505] -->
- <!-- START -->
- <!--
- <execution>
- <id>copy-dependencies</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>org.jboss.ws:jbossws-jboss*:zip:resources</artifactItems>
- <artifactItems>
<artifactItem>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss600x</artifactId>
- <version>${jbossws.jboss601.version}</version>
+ <artifactId>jbossws-jboss610</artifactId>
+ <version>${jbossws.jboss610.version}</version>
<classifier>resources</classifier>
<type>zip</type>
- <outputDirectory>${project.build.directory}/resources/jbossws-jboss601</outputDirectory>
+ <outputDirectory>${project.build.directory}/resources/jbossws-jboss610</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
- -->
- <!-- END -->
</executions>
</plugin>
<!-- http://jira.codehaus.org/browse/MANTRUN-89 -->
Modified: stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml
===================================================================
--- stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml 2011-08-17 10:11:09 UTC (rev 14890)
+++ stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml 2011-08-17 10:54:00 UTC (rev 14891)
@@ -23,7 +23,7 @@
<copy
file="${src.dir}/jbossws-native-config-as6.xml"
- tofile="${dest.dir}/jbossws-jboss601/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
+ tofile="${dest.dir}/jbossws-jboss610/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
/>
<copy
Modified: stack/native/trunk/modules/dist/management/pom.xml
===================================================================
--- stack/native/trunk/modules/dist/management/pom.xml 2011-08-17 10:11:09 UTC (rev 14890)
+++ stack/native/trunk/modules/dist/management/pom.xml 2011-08-17 10:54:00 UTC (rev 14891)
@@ -43,16 +43,21 @@
</exclusion>
</exclusions>
</dependency>
- <!-- [JBWS-2505] -->
- <!-- START -->
- <!--
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss600x</artifactId>
+ <artifactId>jbossws-jboss610</artifactId>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>sun-jaxb</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
- -->
- <!-- END -->
<dependency>
<groupId>org.jboss.jaxr</groupId>
<artifactId>juddi-service</artifactId>
Modified: stack/native/trunk/modules/dist/pom.xml
===================================================================
--- stack/native/trunk/modules/dist/pom.xml 2011-08-17 10:11:09 UTC (rev 14890)
+++ stack/native/trunk/modules/dist/pom.xml 2011-08-17 10:54:00 UTC (rev 14891)
@@ -92,7 +92,6 @@
<scope>provided</scope>
</dependency>
- <!--jboss600-->
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss600</artifactId>
@@ -109,6 +108,22 @@
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss610</artifactId>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>sun-jaxb</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
<!--junit-->
<dependency>
<groupId>junit</groupId>
@@ -167,8 +182,8 @@
</xslt>
<xslt style="${basedir}/src/main/distro/test-exclude.xsl"
in="../testsuite/pom.xml"
- out="${basedir}/target/exclude-file/test-excludes-jboss601.txt">
- <param name="targetName" expression="jboss601" />
+ out="${basedir}/target/exclude-file/test-excludes-jboss610.txt">
+ <param name="targetName" expression="jboss610" />
</xslt>
<xslt style="${basedir}/src/main/distro/test-exclude.xsl"
in="../testsuite/pom.xml"
Modified: stack/native/trunk/modules/dist/src/main/distro/Install.txt
===================================================================
--- stack/native/trunk/modules/dist/src/main/distro/Install.txt 2011-08-17 10:11:09 UTC (rev 14890)
+++ stack/native/trunk/modules/dist/src/main/distro/Install.txt 2011-08-17 10:54:00 UTC (rev 14891)
@@ -14,14 +14,14 @@
3.) Execute one of the following
ant deploy-jboss600
- ant deploy-jboss601
+ ant deploy-jboss610
By default the SOAP stack will be installed to 'default' configuration.
If users want to install SOAP stack to different JBossAS configuration then
they have to specify -Djboss.server.instance=foo JVM property.
Supported configurations of the installer are 'default', 'all' and 'standard'.
- ant -Djboss.server.instance=standard deploy-jboss600
+ ant -Djboss.server.instance=standard deploy-jboss610
4.) Execute the samples to verify your installation
Modified: stack/native/trunk/modules/dist/src/main/distro/ant.properties.example
===================================================================
--- stack/native/trunk/modules/dist/src/main/distro/ant.properties.example 2011-08-17 10:11:09 UTC (rev 14890)
+++ stack/native/trunk/modules/dist/src/main/distro/ant.properties.example 2011-08-17 10:54:00 UTC (rev 14891)
@@ -4,12 +4,12 @@
# Optional JBoss Home
jboss600.home=(a)jboss600.home@
-jboss601.home=(a)jboss601.home@
+jboss610.home=(a)jboss610.home@
jboss700.home=(a)jboss700.home@
jboss710.home=(a)jboss710.home@
-# The JBoss server under test. This can be [jboss600|jboss601|jboss700|jboss710]
-jbossws.integration.target=jboss601
+# The JBoss server under test. This can be [jboss600|jboss610|jboss700|jboss710]
+jbossws.integration.target=jboss610
# The JBoss settings
jboss.server.instance=default
Modified: stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml
===================================================================
--- stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml 2011-08-17 10:11:09 UTC (rev 14890)
+++ stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml 2011-08-17 10:54:00 UTC (rev 14891)
@@ -53,44 +53,44 @@
</target>
<!-- ================================================================== -->
- <!-- Prepare Deployment Structure JBoss-6.0.x -->
+ <!-- Prepare Deployment Structure JBoss-6.1.0 -->
<!-- ================================================================== -->
- <target name="deploy-structure-jboss601" depends="prepare-deploy">
+ <target name="deploy-structure-jboss610" depends="prepare-deploy">
<delete dir="${deploy.structure}"/>
<antcall target="deploy-jbossws-native" inheritall="false">
<param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/>
<param name="jbossid" value="${jbossws.integration.target}"/>
<param name="artifactsdir" value="${deploy.artifacts.dir}"/>
<param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
- <param name="modifyjbossintegration" value="false"/><!-- [JBWS-2505] -->
+ <param name="modifyjbossintegration" value="true"/><!-- [JBWS-2505] -->
</antcall>
<macro-create-deploy-conf deploystructure="${deploy.structure}"/>
</target>
<!-- ================================================================== -->
- <!-- Deployment JBoss601 -->
+ <!-- Deployment JBoss610 -->
<!-- ================================================================== -->
- <target name="target-jboss601">
- <property name="jbossws.integration.target" value="jboss601"/>
+ <target name="target-jboss610">
+ <property name="jbossws.integration.target" value="jboss610"/>
<echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
</target>
- <target name="deploy-jboss601" depends="undeploy-jboss601,deploy-structure-jboss601" description="Deploy jbossws to jboss601">
- <fail message="Not available: ${jboss601.available.file}" unless="jboss601.available"/>
- <copy todir="${jboss601.home}" overwrite="true" verbose="true">
+ <target name="deploy-jboss610" depends="undeploy-jboss610,deploy-structure-jboss610" description="Deploy jbossws to jboss610">
+ <fail message="Not available: ${jboss610.available.file}" unless="jboss610.available"/>
+ <copy todir="${jboss610.home}" overwrite="true" verbose="true">
<fileset dir="${deploy.structure}"/>
</copy>
- <chmod dir="${jboss601.home}/bin" perm="+x" includes="*.sh"/>
+ <chmod dir="${jboss610.home}/bin" perm="+x" includes="*.sh"/>
</target>
- <target name="undeploy-jboss601" depends="target-jboss601,init" description="Remove jbossws from jboss601">
- <fail message="Not available: ${jboss601.available.file}" unless="jboss601.available"/>
- <macro-undeploy-jbossws targetdir="${jboss601.server}"
+ <target name="undeploy-jboss610" depends="target-jboss610,init" description="Remove jbossws from jboss610">
+ <fail message="Not available: ${jboss610.available.file}" unless="jboss610.available"/>
+ <macro-undeploy-jbossws targetdir="${jboss610.server}"
defaultconf="${jbossws.default.deploy.conf}"
defaultserverconf="${jbossws.default.server.deploy.conf}"
- modifyjbossintegration="false"/><!-- [JBWS-2505] -->
+ modifyjbossintegration="true"/><!-- [JBWS-2505] -->
</target>
<!-- ================================================================== -->
Modified: stack/native/trunk/modules/dist/src/main/distro/build-setup.xml
===================================================================
--- stack/native/trunk/modules/dist/src/main/distro/build-setup.xml 2011-08-17 10:11:09 UTC (rev 14890)
+++ stack/native/trunk/modules/dist/src/main/distro/build-setup.xml 2011-08-17 10:54:00 UTC (rev 14891)
@@ -28,24 +28,24 @@
<property name="jboss600.server.deploy" value="${jboss600.server}/deploy"/>
<property name="jboss600.server.deployers" value="${jboss600.server}/deployers"/>
- <property name="jboss601.lib" value="${jboss601.home}/lib"/>
- <property name="jboss601.client" value="${jboss601.home}/client"/>
- <property name="jboss601.server" value="${jboss601.home}/server/${jboss.server.instance}"/>
- <property name="jboss601.server.lib" value="${jboss601.home}/common/lib"/>
- <property name="jboss601.server.deploy" value="${jboss601.server}/deploy"/>
- <property name="jboss601.server.deployers" value="${jboss601.server}/deployers"/>
+ <property name="jboss610.lib" value="${jboss610.home}/lib"/>
+ <property name="jboss610.client" value="${jboss610.home}/client"/>
+ <property name="jboss610.server" value="${jboss610.home}/server/${jboss.server.instance}"/>
+ <property name="jboss610.server.lib" value="${jboss610.home}/common/lib"/>
+ <property name="jboss610.server.deploy" value="${jboss610.server}/deploy"/>
+ <property name="jboss610.server.deployers" value="${jboss610.server}/deployers"/>
<property name="jboss700.modules" value="${jboss700.home}/modules"/>
<property name="jboss710.modules" value="${jboss710.home}/modules"/>
<property name="jboss600.available.file" value="${jboss600.client}/jboss-client.jar"/>
- <property name="jboss601.available.file" value="${jboss601.client}/jboss-client.jar"/>
+ <property name="jboss610.available.file" value="${jboss610.client}/jboss-client.jar"/>
<property name="jboss700.available.file" value="${jboss700.home}/jboss-modules.jar"/>
<property name="jboss710.available.file" value="${jboss710.home}/jboss-modules.jar"/>
<available property="jboss600.available" file="${jboss600.available.file}"/>
- <available property="jboss601.available" file="${jboss601.available.file}"/>
+ <available property="jboss610.available" file="${jboss610.available.file}"/>
<available property="jboss700.available" file="${jboss700.available.file}"/>
<available property="jboss710.available" file="${jboss710.available.file}"/>
Modified: stack/native/trunk/modules/dist/src/main/distro/build.xml
===================================================================
--- stack/native/trunk/modules/dist/src/main/distro/build.xml 2011-08-17 10:11:09 UTC (rev 14890)
+++ stack/native/trunk/modules/dist/src/main/distro/build.xml 2011-08-17 10:54:00 UTC (rev 14891)
@@ -50,7 +50,7 @@
<condition property="jbossws.integration.jboss60" value="true">
<or>
<equals arg1="${jbossws.integration.target}" arg2="jboss600"/>
- <equals arg1="${jbossws.integration.target}" arg2="jboss601"/>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss610"/>
</or>
</condition>
<condition property="jbossws.integration.jboss70" value="true">
Modified: stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2011-08-17 10:11:09 UTC (rev 14890)
+++ stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2011-08-17 10:54:00 UTC (rev 14891)
@@ -91,6 +91,7 @@
<include>juddi:juddi:jar</include>
<include>org.jboss.ws:jbossws-common-tools:jar</include>
<include>org.jboss.ws:jbossws-jboss600:jar</include>
+ <include>org.jboss.ws:jbossws-jboss610:jar</include>
<include>org.jboss:jbossxb:jar</include>
<include>org.jboss.as:jboss-as-webservices-tests-integration:jar</include>
</includes>
@@ -194,18 +195,6 @@
<useProjectArtifact>false</useProjectArtifact>
</dependencySet>
- <!-- [JBWS-2505] -->
- <!-- START -->
- <!--
- <dependencySet>
- <outputDirectory>deploy-artifacts/lib</outputDirectory>
- <outputFileNameMapping>jbossws-jboss601.${module.extension}</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
- <scope>provided</scope> <unpack>false</unpack> <includes>
- <include>org.jboss.ws:jbossws-jboss600x:jar</include> </includes>
- </dependencySet>
- -->
- <!-- END -->
</dependencySets>
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2011-08-17 10:11:09 UTC (rev 14890)
+++ stack/native/trunk/modules/testsuite/pom.xml 2011-08-17 10:54:00 UTC (rev 14891)
@@ -513,7 +513,6 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
-
<!-- Exclude Sun's stax implementation : com.sun.xml.stream:sjsxp:jar:1.0.1 -->
<exclusion>
<groupId>org.jboss.resteasy</groupId>
@@ -561,15 +560,15 @@
</profile>
<!--
- Name: jboss601
- Descr: JBoss-6.0.1 specific options
+ Name: jboss610
+ Descr: JBoss-6.1.0 specific options
-->
<profile>
- <id>jboss601</id>
+ <id>jboss610</id>
<properties>
- <jboss.version>6.0.1-SNAPSHOT</jboss.version>
- <jbossws.integration.target>jboss601</jbossws.integration.target>
- <endorsed.dirs>${jboss601.home}/lib/endorsed</endorsed.dirs>
+ <jboss.version>6.1.0.Final</jboss.version>
+ <jbossws.integration.target>jboss610</jbossws.integration.target>
+ <endorsed.dirs>${jboss610.home}/lib/endorsed</endorsed.dirs>
</properties>
<dependencies>
<dependency>
@@ -584,7 +583,7 @@
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-webservices</artifactId>
</exclusion>
- <!-- Exclusions for preventing cyclic dependency on JBossWS-CXF (AS 6.0.0) -->
+ <!-- Exclusions for preventing cyclic dependency on JBossWS-CXF -->
<exclusion>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-client</artifactId>
@@ -605,20 +604,37 @@
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-resources</artifactId>
</exclusion>
+ <!-- Exclusions for preventing cyclic dependency on JBossWS-Native -->
<exclusion>
<groupId>org.jboss.ws.native</groupId>
+ <artifactId>jbossws-native-client</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.ws.native</groupId>
+ <artifactId>jbossws-native-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-factories</artifactId>
</exclusion>
<exclusion>
<groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-client</artifactId>
+ <artifactId>jbossws-native-jaxrpc</artifactId>
</exclusion>
<exclusion>
<groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-core</artifactId>
+ <artifactId>jbossws-native-saaj</artifactId>
</exclusion>
<exclusion>
<groupId>org.jboss.ws.native</groupId>
+ <artifactId>jbossws-native-management</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.ws.native</groupId>
+ <artifactId>jbossws-native-resources</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-services</artifactId>
</exclusion>
<exclusion>
@@ -657,7 +673,7 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${endorsed.dirs}</argLine>
+ <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${endorsed.dirs} -Dorg.jboss.wsf.spi.deployer.Deployer=org.jboss.wsf.test.DeployerJBoss6</argLine>
<excludes>
<!--# UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration-->
<exclude>org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.*</exclude>
Modified: stack/native/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml 2011-08-17 10:11:09 UTC (rev 14890)
+++ stack/native/trunk/pom.xml 2011-08-17 10:54:00 UTC (rev 14891)
@@ -50,12 +50,7 @@
<jbossws.common.tools.version>1.0.0-SNAPSHOT</jbossws.common.tools.version>
<jbossws.shared.testsuite.version>4.0.0-SNAPSHOT</jbossws.shared.testsuite.version>
<jbossws.jboss600.version>4.0.0-SNAPSHOT</jbossws.jboss600.version>
- <!-- [JBWS-2505] -->
- <!-- START -->
- <!--
- <jbossws.jboss601.version>3.2.1.GA</jbossws.jboss601.version>
- -->
- <!-- END -->
+ <jbossws.jboss610.version>4.0.0-SNAPSHOT</jbossws.jboss610.version>
<jboss700.version>7.0.0.Final</jboss700.version>
<ant.version>1.7.1</ant.version>
<codehaus.jettison.version>1.0-RC2</codehaus.jettison.version>
@@ -118,27 +113,22 @@
<type>zip</type>
</dependency>
<dependency>
- <groupId>org.jboss.as</groupId>
- <artifactId>jboss-as-webservices-tests-integration</artifactId>
- <version>${jboss700.version}</version>
- </dependency>
- <!-- [JBWS-2505] -->
- <!-- START -->
- <!--
- <dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss600x</artifactId>
- <version>${jbossws.jboss601.version}</version>
+ <artifactId>jbossws-jboss610</artifactId>
+ <version>${jbossws.jboss610.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss600x</artifactId>
- <version>${jbossws.jboss601.version}</version>
+ <artifactId>jbossws-jboss610</artifactId>
+ <version>${jbossws.jboss610.version}</version>
<classifier>resources</classifier>
<type>zip</type>
</dependency>
- -->
- <!-- END -->
+ <dependency>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-webservices-tests-integration</artifactId>
+ <version>${jboss700.version}</version>
+ </dependency>
<!-- provided apis -->
<dependency>
<groupId>org.apache.ant</groupId>
@@ -546,14 +536,14 @@
</profile>
<!--
- Name: jboss601
- Descr: JBoss-6.0.1 specific options
+ Name: jboss610
+ Descr: JBoss-6.1.0 specific options
-->
<profile>
- <id>jboss601</id>
+ <id>jboss610</id>
<properties>
- <jbossws.integration.target>jboss601</jbossws.integration.target>
- <jboss.home>${jboss601.home}</jboss.home>
+ <jbossws.integration.target>jboss610</jbossws.integration.target>
+ <jboss.home>${jboss610.home}</jboss.home>
</properties>
</profile>
13 years, 4 months
- 1
- 0
JBossWS SVN: r14890 - shared-testsuite/trunk/testsuite/src/test/ant-import.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-08-17 06:11:09 -0400 (Wed, 17 Aug 2011)
New Revision: 14890
Modified:
shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml
Log:
support for AS 610
Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml 2011-08-17 09:32:38 UTC (rev 14889)
+++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml 2011-08-17 10:11:09 UTC (rev 14890)
@@ -18,8 +18,8 @@
<condition property="jboss.home" value="${jboss600.home}">
<equals arg1="${jbossws.integration.target}" arg2="jboss600"/>
</condition>
- <condition property="jboss.home" value="${jboss601.home}">
- <equals arg1="${jbossws.integration.target}" arg2="jboss601"/>
+ <condition property="jboss.home" value="${jboss610.home}">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss610"/>
</condition>
<condition property="jboss.home" value="${jboss700.home}">
<equals arg1="${jbossws.integration.target}" arg2="jboss700"/>
13 years, 4 months
- 1
- 0
JBossWS SVN: r14889 - in container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration: deployers and 9 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-08-17 05:32:38 -0400 (Wed, 17 Aug 2011)
New Revision: 14889
Added:
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/config/Message.properties
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/Message.properties
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/Message.properties
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/endpoint/Message.properties
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/injection/Message.properties
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/Message.properties
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/security/Message.properties
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/security/SecurityDomainContextAdaptor.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/security/SecurityDomainContextDeploymentAspect.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/Message.properties
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/util/Message.properties
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/weld/Message.properties
Modified:
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/config/ServerConfigImpl.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/AbstractDescriptorDeployer.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCIntegrationClassPathDeployer.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WSDescriptorDeployer.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WSEJBAdapterDeployer.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WSTypeDeployer.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/AbstractDeploymentModelBuilder.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_EJB21.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/WSDeploymentBuilder.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/endpoint/HornetQJMSResolver.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/injection/EJBBeanReferenceResolver.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/injection/InjectionMetaDataDeploymentAspect.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/injection/ServiceRefResourceProvider.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/injection/VirtualFileAdaptor.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/injection/WebServiceContextResourceProvider.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerEJB21.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerEJB3.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerFactoryImpl.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/ServiceEndpointInterceptorEJB21.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/ContainerMetaDataDeploymentAspect.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/security/JACCPermissionsDeploymentAspect.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/security/JaasSecurityDomainAdaptorResolverImpl.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/security/SecurityAdapterImpl.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/SecurityMetaDataAccessorEJB3.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreatingDeploymentAspect.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreator.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifier.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/util/ASHelper.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/weld/WeldInvocationHandler.java
Log:
logging support
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/config/Message.properties
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/config/Message.properties (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/config/Message.properties 2011-08-17 09:32:38 UTC (rev 14889)
@@ -0,0 +1,2 @@
+COULD_NOT_OBTAIN_ATTRIBUTE_FROM=Could not obtain attribute {0} from {1}
+COULD_NOT_DESIRED_DIRECTORY_FROM_URL=Could not desired directory from URL: {0}
Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/config/ServerConfigImpl.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/config/ServerConfigImpl.java 2011-08-17 09:14:23 UTC (rev 14888)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/config/ServerConfigImpl.java 2011-08-17 09:32:38 UTC (rev 14889)
@@ -24,10 +24,12 @@
import java.io.File;
import java.net.URISyntaxException;
import java.net.URL;
+import java.util.ResourceBundle;
import javax.management.JMException;
import javax.management.ObjectName;
+import org.jboss.ws.api.util.BundleUtils;
import org.jboss.ws.common.management.AbstractServerConfig;
import org.jboss.ws.common.management.AbstractServerConfigMBean;
@@ -40,6 +42,7 @@
*/
public final class ServerConfigImpl extends AbstractServerConfig implements AbstractServerConfigMBean
{
+ private static final ResourceBundle bundle = BundleUtils.getBundle(ServerConfigImpl.class);
/**
* Constructor.
*/
@@ -97,7 +100,7 @@
}
catch (final JMException e)
{
- throw new RuntimeException("Could not obtain attribute " + attributeName + " from " + on, e);
+ throw new RuntimeException(BundleUtils.getMessage(bundle, "COULD_NOT_OBTAIN_ATTRIBUTE_FROM", new Object[]{ attributeName , on}), e);
}
// Represent as a File
@@ -108,7 +111,7 @@
}
catch (final URISyntaxException urise)
{
- throw new RuntimeException("Could not desired directory from URL: " + location, urise);
+ throw new RuntimeException(BundleUtils.getMessage(bundle, "COULD_NOT_DESIRED_DIRECTORY_FROM_URL", location), urise);
}
return dir;
Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/AbstractDescriptorDeployer.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/AbstractDescriptorDeployer.java 2011-08-17 09:14:23 UTC (rev 14888)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/AbstractDescriptorDeployer.java 2011-08-17 09:32:38 UTC (rev 14889)
@@ -21,9 +21,12 @@
*/
package org.jboss.webservices.integration.deployers;
+import java.util.ResourceBundle;
+
import org.jboss.deployers.vfs.spi.deployer.AbstractVFSParsingDeployer;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.vfs.VirtualFile;
+import org.jboss.ws.api.util.BundleUtils;
import org.jboss.wsf.spi.metadata.DescriptorParser;
/**
@@ -33,6 +36,7 @@
*/
abstract class AbstractDescriptorDeployer<P extends DescriptorParser<T>, T> extends AbstractVFSParsingDeployer<T>
{
+ private static final ResourceBundle bundle = BundleUtils.getBundle(AbstractDescriptorDeployer.class);
private P ddParser;
AbstractDescriptorDeployer(Class<T> output)
@@ -45,7 +49,7 @@
@Override
protected T parse(final VFSDeploymentUnit unit, final VirtualFile file, final T root) throws Exception
{
- if (this.ddParser != null) //default to using new parsers if available
+ if (this.ddParser != null)
{
return this.ddParser.parse(file.toURL());
}
@@ -59,7 +63,7 @@
protected void setParser(final P ddParser)
{
if (this.ddParser != null)
- throw new IllegalStateException("Only one " + this.ddParser.getClass() + " instance can be installed in MC");
+ throw new IllegalStateException(BundleUtils.getMessage(bundle, "ONLY_ONE_INSTANCE_CAN_BE_INSTALLED_IN_MC", this.ddParser.getClass() ));
this.ddParser = ddParser;
this.setName(this.ddParser.getDescriptorName());
Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCIntegrationClassPathDeployer.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCIntegrationClassPathDeployer.java 2011-08-17 09:14:23 UTC (rev 14888)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCIntegrationClassPathDeployer.java 2011-08-17 09:32:38 UTC (rev 14889)
@@ -23,6 +23,7 @@
import java.net.URL;
import java.util.HashSet;
+import java.util.ResourceBundle;
import java.util.Set;
import org.jboss.deployers.vfs.plugins.classloader.UrlIntegrationDeployer;
@@ -30,6 +31,7 @@
import org.jboss.util.StringPropertyReplacer;
import org.jboss.vfs.VFS;
import org.jboss.vfs.VirtualFile;
+import org.jboss.ws.api.util.BundleUtils;
import org.jboss.wsf.spi.management.ServerConfig;
/**
@@ -42,6 +44,7 @@
*/
public abstract class JAXRPCIntegrationClassPathDeployer<T> extends UrlIntegrationDeployer<T>
{
+ private static final ResourceBundle bundle = BundleUtils.getBundle(JAXRPCIntegrationClassPathDeployer.class);
private Set<String> libs;
private boolean integrationLibsFound = false;
private ServerConfig wsServerConfig;
@@ -90,7 +93,7 @@
}
catch (Exception e)
{
- throw new IllegalArgumentException("Unexpected error: " + e);
+ throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "UNEXPECTED_ERROR", e));
}
return result;
}
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/Message.properties
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/Message.properties (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/Message.properties 2011-08-17 09:32:38 UTC (rev 14889)
@@ -0,0 +1,4 @@
+ONLY_ONE_INSTANCE_CAN_BE_INSTALLED_IN_MC=Only one {0} instance can be installed in MC
+INGORING_EJB_DEPLOYMENT_WITH_NULL_CLASSNAME=Ingoring EJB deployment with null classname: {0}
+FAILED_TO_LOAD_COMPONENT_CLASS=Failed to load component class {0} from {1}
+UNEXPECTED_ERROR=Unexpected error: {0}
Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WSDescriptorDeployer.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WSDescriptorDeployer.java 2011-08-17 09:14:23 UTC (rev 14888)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WSDescriptorDeployer.java 2011-08-17 09:32:38 UTC (rev 14889)
@@ -31,6 +31,7 @@
*/
public final class WSDescriptorDeployer extends AbstractDescriptorDeployer<WebservicesDescriptorParser, WebservicesMetaData>
{
+
/**
* Constructor.
*/
@@ -48,4 +49,5 @@
{
super.setParser(parser);
}
+
}
Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WSEJBAdapterDeployer.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WSEJBAdapterDeployer.java 2011-08-17 09:14:23 UTC (rev 14888)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WSEJBAdapterDeployer.java 2011-08-17 09:32:38 UTC (rev 14889)
@@ -24,6 +24,7 @@
import java.lang.annotation.Annotation;
import java.util.ArrayList;
import java.util.List;
+import java.util.ResourceBundle;
import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
@@ -38,6 +39,7 @@
import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
import org.jboss.metadata.ejb.jboss.JBossMetaData;
import org.jboss.webservices.integration.util.ASHelper;
+import org.jboss.ws.api.util.BundleUtils;
import org.jboss.webservices.integration.WebServiceDeclaration;
import org.jboss.webservices.integration.WebServiceDeployment;
import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData;
@@ -49,6 +51,7 @@
*/
public final class WSEJBAdapterDeployer extends AbstractRealDeployer
{
+ private static final ResourceBundle bundle = BundleUtils.getBundle(WSEJBAdapterDeployer.class);
/**
* Constructor.
*/
@@ -96,7 +99,7 @@
}
else
{
- this.log.warn("Ingoring EJB deployment with null classname: " + ejbName);
+ this.log.warn(BundleUtils.getMessage(bundle, "INGORING_EJB_DEPLOYMENT_WITH_NULL_CLASSNAME", ejbName));
}
}
@@ -229,8 +232,7 @@
}
catch (ClassNotFoundException cnfe)
{
- throw new RuntimeException("Failed to load component class: " + this.getComponentClassName()
- + " from loader: " + this.loader);
+ throw new RuntimeException(BundleUtils.getMessage(bundle, "FAILED_TO_LOAD_COMPONENT_CLASS", new Object[]{this.getComponentClassName(), this.loader}));
}
}
}
Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WSTypeDeployer.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WSTypeDeployer.java 2011-08-17 09:14:23 UTC (rev 14888)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WSTypeDeployer.java 2011-08-17 09:32:38 UTC (rev 14889)
@@ -27,9 +27,8 @@
import org.jboss.metadata.ejb.jboss.JBossMetaData;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
import org.jboss.webservices.integration.util.ASHelper;
-import org.jboss.webservices.integration.WebServiceDeployment;
import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
-import org.jboss.wsf.spi.metadata.jms.JMSEndpointsMetaData;
+import org.jboss.webservices.integration.WebServiceDeployment;
import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData;
/**
@@ -85,11 +84,6 @@
this.log.debug("Detected JAXRPC EJB21 deployment");
unit.addAttachment(DeploymentType.class, DeploymentType.JAXRPC_EJB21);
}
- else if (this.isJaxwsJmsDeployment(unit))
- {
- this.log.debug("Detected JAXWS JMS deployment");
- unit.addAttachment(DeploymentType.class, DeploymentType.JAXWS_JMS);
- }
}
/**
@@ -160,15 +154,4 @@
return false;
}
-
- /**
- * Returns true if JAXWS JMS deployment is detected.
- *
- * @param unit deployment unit
- * @return true if JAXWS JMS, false otherwise
- */
- private boolean isJaxwsJmsDeployment(final DeploymentUnit unit)
- {
- return ASHelper.hasAttachment(unit, JMSEndpointsMetaData.class);
- }
}
Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/AbstractDeploymentModelBuilder.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/AbstractDeploymentModelBuilder.java 2011-08-17 09:14:23 UTC (rev 14888)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/AbstractDeploymentModelBuilder.java 2011-08-17 09:32:38 UTC (rev 14889)
@@ -24,6 +24,7 @@
import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
+import java.util.ResourceBundle;
import java.util.Set;
import org.jboss.deployers.structure.spi.DeploymentUnit;
@@ -32,6 +33,7 @@
import org.jboss.vfs.VirtualFile;
import org.jboss.webservices.integration.injection.VirtualFileAdaptor;
import org.jboss.webservices.integration.util.ASHelper;
+import org.jboss.ws.api.util.BundleUtils;
import org.jboss.ws.common.ResourceLoaderAdapter;
import org.jboss.wsf.spi.SPIProvider;
import org.jboss.wsf.spi.SPIProviderResolver;
@@ -49,6 +51,7 @@
*/
abstract class AbstractDeploymentModelBuilder implements DeploymentModelBuilder
{
+ private static final ResourceBundle bundle = BundleUtils.getBundle(AbstractDeploymentModelBuilder.class);
/** WSDL, XSD and XML files filter. */
private static final WSVirtualFileFilter WS_FILE_FILTER = new WSVirtualFileFilter();
@@ -105,12 +108,12 @@
{
if (endpointName == null)
{
- throw new NullPointerException("Null endpoint name");
+ throw new NullPointerException(BundleUtils.getMessage(bundle, "NULL_ENDPOINT_NAME"));
}
if (endpointClass == null)
{
- throw new NullPointerException("Null endpoint class");
+ throw new NullPointerException(BundleUtils.getMessage(bundle, "NULL_ENDPOINT_CLASS"));
}
final Endpoint endpoint = this.deploymentModelFactory.newHttpEndpoint(endpointClass);
@@ -132,12 +135,12 @@
{
if (endpointName == null)
{
- throw new NullPointerException("Null endpoint name");
+ throw new NullPointerException(BundleUtils.getMessage(bundle, "NULL_ENDPOINT_NAME"));
}
if (endpointClass == null)
{
- throw new NullPointerException("Null endpoint class");
+ throw new NullPointerException(BundleUtils.getMessage(bundle, "NULL_ENDPOINT_CLASS"));
}
final Endpoint endpoint = this.deploymentModelFactory.newJMSEndpoint(endpointClass);
@@ -230,6 +233,6 @@
return attachmentValue;
}
- throw new IllegalStateException("Deployment unit does not contain " + attachment);
+ throw new IllegalStateException(BundleUtils.getMessage(bundle, "DEPLOYMENT_UNIT_DOES_NOT_CONTAIN", attachment));
}
}
Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_EJB21.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_EJB21.java 2011-08-17 09:14:23 UTC (rev 14888)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_EJB21.java 2011-08-17 09:32:38 UTC (rev 14889)
@@ -24,8 +24,8 @@
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
import org.jboss.metadata.ejb.jboss.JBossMetaData;
+import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.webservices.integration.WebServiceDeployment;
-import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData;
import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaData;
import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData;
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/Message.properties
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/Message.properties (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/Message.properties 2011-08-17 09:32:38 UTC (rev 14889)
@@ -0,0 +1,3 @@
+NULL_ENDPOINT_NAME=Null endpoint name
+NULL_ENDPOINT_CLASS=Null endpoint class
+DEPLOYMENT_UNIT_DOES_NOT_CONTAIN=Deployment unit does not contain {0}
Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/WSDeploymentBuilder.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/WSDeploymentBuilder.java 2011-08-17 09:14:23 UTC (rev 14888)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/WSDeploymentBuilder.java 2011-08-17 09:32:38 UTC (rev 14889)
@@ -47,7 +47,6 @@
WSDeploymentBuilder.builders.put(DeploymentType.JAXRPC_JSE, new DeploymentModelBuilderJAXRPC_JSE());
WSDeploymentBuilder.builders.put(DeploymentType.JAXWS_EJB3, new DeploymentModelBuilderJAXWS_EJB3());
WSDeploymentBuilder.builders.put(DeploymentType.JAXRPC_EJB21, new DeploymentModelBuilderJAXRPC_EJB21());
- WSDeploymentBuilder.builders.put(DeploymentType.JAXWS_JMS, new DeploymentModelBuilderJAXWS_JMS());
}
/**
Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/endpoint/HornetQJMSResolver.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/endpoint/HornetQJMSResolver.java 2011-08-17 09:14:23 UTC (rev 14888)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/endpoint/HornetQJMSResolver.java 2011-08-17 09:32:38 UTC (rev 14889)
@@ -21,10 +21,13 @@
*/
package org.jboss.webservices.integration.endpoint;
+import java.util.ResourceBundle;
+
import javax.jms.Destination;
import org.apache.log4j.Logger;
import org.hornetq.jms.client.HornetQDestination;
+import org.jboss.ws.api.util.BundleUtils;
import org.jboss.ws.common.management.DefaultJMSEndpointResolver;
/**
@@ -34,14 +37,14 @@
*/
public class HornetQJMSResolver extends DefaultJMSEndpointResolver
{
+ private static final ResourceBundle bundle = BundleUtils.getBundle(HornetQJMSResolver.class);
public void setDestination(Destination destination)
{
if (destination instanceof HornetQDestination)
setFromName(destination, ((HornetQDestination)destination).isQueue());
else
{
- Logger.getLogger(HornetQJMSResolver.class).warn(
- "Destination '" + destination + "' is not a org.hornetq.jms.client.HornetQDestination instance, falling back to default JMS endpoint resolution");
+ Logger.getLogger(HornetQJMSResolver.class).warn(BundleUtils.getMessage(bundle, "DESTINATION_IS_NOT_HQDES", destination));
super.setDestination(destination);
}
}
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/endpoint/Message.properties
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/endpoint/Message.properties (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/endpoint/Message.properties 2011-08-17 09:32:38 UTC (rev 14889)
@@ -0,0 +1 @@
+DESTINATION_IS_NOT_HQDES=Destination {0}is not a org.hornetq.jms.client.HornetQDestination instance, falling back to default JMS endpoint resolution=
Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/injection/EJBBeanReferenceResolver.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/injection/EJBBeanReferenceResolver.java 2011-08-17 09:14:23 UTC (rev 14888)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/injection/EJBBeanReferenceResolver.java 2011-08-17 09:32:38 UTC (rev 14889)
@@ -23,12 +23,14 @@
import java.lang.reflect.Field;
import java.lang.reflect.Method;
+import java.util.ResourceBundle;
import javax.ejb.EJB;
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.ejb3.ejbref.resolver.spi.EjbReference;
import org.jboss.ejb3.ejbref.resolver.spi.EjbReferenceResolver;
+import org.jboss.ws.api.util.BundleUtils;
import org.jboss.ws.common.injection.resolvers.AbstractReferenceResolver;
/**
@@ -38,6 +40,7 @@
*/
final class EJBBeanReferenceResolver extends AbstractReferenceResolver<EJB>
{
+ private static final ResourceBundle bundle = BundleUtils.getBundle(EJBBeanReferenceResolver.class);
/**
* Deployment unit used for resolving process.
*/
@@ -60,11 +63,11 @@
if (unit == null)
{
- throw new IllegalArgumentException("Deployment unit cannot be null");
+ throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "DEPLOYMENT_UNIT_CANNOT_BE_NULL"));
}
if (delegate == null)
{
- throw new IllegalArgumentException("Ejb reference resolver cannot be null");
+ throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "EJB_REFERENCE_RESOLVER_CANNOT_BE_NULL"));
}
this.unit = unit;
Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/injection/InjectionMetaDataDeploymentAspect.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/injection/InjectionMetaDataDeploymentAspect.java 2011-08-17 09:14:23 UTC (rev 14888)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/injection/InjectionMetaDataDeploymentAspect.java 2011-08-17 09:32:38 UTC (rev 14889)
@@ -27,6 +27,7 @@
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import java.util.ResourceBundle;
import java.util.Set;
import javax.annotation.Resource;
@@ -41,7 +42,9 @@
import org.jboss.metadata.javaee.spec.ResourceInjectionTargetMetaData;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
import org.jboss.webservices.integration.util.ASHelper;
+import org.jboss.ws.api.util.BundleUtils;
import org.jboss.ws.common.injection.resolvers.ResourceReferenceResolver;
+import org.jboss.ws.common.integration.AbstractDeploymentAspect;
import org.jboss.ws.common.integration.WSHelper;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Endpoint;
@@ -51,7 +54,6 @@
import org.jboss.wsf.spi.metadata.injection.InjectionMetaData;
import org.jboss.wsf.spi.metadata.injection.InjectionsMetaData;
import org.jboss.wsf.spi.metadata.injection.ReferenceResolver;
-import org.jboss.ws.common.integration.AbstractDeploymentAspect;
/**
* Deployment aspect that builds injection meta data.
@@ -60,6 +62,7 @@
*/
public final class InjectionMetaDataDeploymentAspect extends AbstractDeploymentAspect
{
+ private static final ResourceBundle bundle = BundleUtils.getBundle(InjectionMetaDataDeploymentAspect.class);
/** Resolver handling @Resource injections. */
private static final ReferenceResolver RESOURCE_RESOLVER = new ResourceReferenceResolver();
@@ -94,7 +97,7 @@
{
if (this.ejbReferenceResolver == null)
{
- throw new IllegalStateException("No EjbReferenceResolver set by MC");
+ throw new IllegalStateException(BundleUtils.getMessage(bundle, "NO_EJBREFERENCERESOLVER_SET_BY_MC"));
}
return this.ejbReferenceResolver;
@@ -240,7 +243,7 @@
{
// prepare injection target meta data
targetClass = resourceInjectionTargetMD.getInjectionTargetClass();
- targetName = resourceInjectionTargetMD.getInjectionTargetName();
+ targetName = getTargetName(resourceInjectionTargetMD);
// build injection meta data for injection target
final InjectionMetaData injectionMD = new InjectionMetaData(targetClass, targetName, envEntryValueClass,
@@ -253,4 +256,15 @@
return retVal;
}
+
+ private String getTargetName(final ResourceInjectionTargetMetaData resourceInjectionTargetMD)
+ {
+ final String targetName = resourceInjectionTargetMD.getInjectionTargetName();
+ if (targetName.startsWith("set"))
+ {
+ final String propertyName = targetName.substring(3);
+ return propertyName.substring(0, 1).toLowerCase() + propertyName.substring(1);
+ }
+ return targetName;
+ }
}
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/injection/Message.properties
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/injection/Message.properties (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/injection/Message.properties 2011-08-17 09:32:38 UTC (rev 14889)
@@ -0,0 +1,13 @@
+NO_EJBREFERENCERESOLVER_SET_BY_MC=No EjbReferenceResolver set by MC
+CAN_ONLY_HANDLE_REAL_VFS_DEPLOYMENTS=Can only handle real VFS deployments: {0}
+IGNORING_PORT_REF=Ignoring <port-component-ref> without <service-endpoint-interface> and <port-qname>: {0}
+INJECTION_TARGET_CLASS_NOT_FOUND=<injection-target> class: {0} was not found in deployment
+INJECTION_TARGET_NOT_FOUND=<injection-target> could not be found: {0}.
+DEPLOYMENT_UNIT_CANNOT_BE_NULL=Deployment unit cannot be null
+EJB_REFERENCE_RESOLVER_CANNOT_BE_NULL=Ejb reference resolver cannot be null
+NULL_ROOT_URL=Null root url
+NULL_PATH=Null path
+UNABLE_TO_GET_VIRTUALFILE_FROM_URL=Unable to get Virtualfile from URL: {0}
+VIRTUALFILE_DOES_NOT_EXIST=VirtualFile {0} does not exist
+VIRTUALFILE_IS_NOT_MOUNTED=VirtualFile {0} is not mounted
+CHILD_NOT_FOUND=Child {0} not found for VirtualFile {1}
\ No newline at end of file
Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/injection/ServiceRefResourceProvider.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/injection/ServiceRefResourceProvider.java 2011-08-17 09:14:23 UTC (rev 14888)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/injection/ServiceRefResourceProvider.java 2011-08-17 09:32:38 UTC (rev 14889)
@@ -32,6 +32,7 @@
import java.util.Collection;
import java.util.List;
import java.util.Map;
+import java.util.ResourceBundle;
import javax.naming.Referenceable;
import javax.xml.namespace.QName;
@@ -53,6 +54,7 @@
import org.jboss.switchboard.javaee.jboss.environment.JBossServiceRefType;
import org.jboss.switchboard.mc.spi.MCBasedResourceProvider;
import org.jboss.switchboard.spi.Resource;
+import org.jboss.ws.api.util.BundleUtils;
import org.jboss.wsf.spi.SPIProvider;
import org.jboss.wsf.spi.SPIProviderResolver;
import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
@@ -65,8 +67,8 @@
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedStubPropertyMetaData;
import org.jboss.wsf.spi.serviceref.ServiceRefHandler;
+import org.jboss.wsf.spi.serviceref.ServiceRefHandler.Type;
import org.jboss.wsf.spi.serviceref.ServiceRefHandlerFactory;
-import org.jboss.wsf.spi.serviceref.ServiceRefHandler.Type;
/**
* Service reference resource provider.
@@ -82,6 +84,7 @@
*/
public final class ServiceRefResourceProvider implements MCBasedResourceProvider<ServiceRefType>
{
+ private static final ResourceBundle bundle = BundleUtils.getBundle(ServiceRefResourceProvider.class);
private static final Logger log = Logger.getLogger(ServiceRefResourceProvider.class);
@@ -151,7 +154,7 @@
}
else
{
- throw new IllegalArgumentException("Can only handle real VFS deployments: " + tempDeploymentUnit);
+ throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "CAN_ONLY_HANDLE_REAL_VFS_DEPLOYMENTS", tempDeploymentUnit));
}
}
@@ -219,8 +222,7 @@
}
else
{
- log.warn("Ignoring <port-component-ref> without <service-endpoint-interface> and <port-qname>: "
- + portComponentUMDM);
+ log.warn(BundleUtils.getMessage(bundle, "IGNORING_PORT_REF", portComponentUMDM));
}
}
}
@@ -384,7 +386,7 @@
final Addressing addressingSBMD = portComponentSBMD.getAddressing();
if (addressingSBMD != null)
{
- portComponentUMDM.setAddressingAnnotationSpecified(true);
+ portComponentUMDM.setAddressingAnnotationSpecified(true);
portComponentUMDM.setAddressingEnabled(addressingSBMD.isEnabled());
portComponentUMDM.setAddressingRequired(addressingSBMD.isRequired());
portComponentUMDM.setAddressingResponses(addressingSBMD.getResponses());
@@ -393,7 +395,7 @@
// propagate respect binding properties
if (portComponentSBMD.isRespectBindingEnabled())
{
- portComponentUMDM.setRespectBindingAnnotationSpecified(true);
+ portComponentUMDM.setRespectBindingAnnotationSpecified(true);
portComponentUMDM.setRespectBindingEnabled(true);
}
@@ -682,8 +684,7 @@
}
catch (ClassNotFoundException e)
{
- throw new RuntimeException("<injection-target> class: " + target.getTargetClass()
- + " was not found in deployment");
+ throw new RuntimeException(BundleUtils.getMessage(bundle, "INJECTION_TARGET_CLASS_NOT_FOUND", target.getTargetClass()));
}
for (Field field : clazz.getDeclaredFields())
@@ -692,14 +693,28 @@
return field;
}
+ final String targetName = getMethodName(target);
for (Method method : clazz.getDeclaredMethods())
{
- if (method.getName().equals(target.getTargetName()))
+ if (method.getName().equals(targetName))
return method;
}
- throw new RuntimeException("<injection-target> could not be found: " + target.getTargetClass() + "."
- + target.getTargetName());
+ throw new RuntimeException(BundleUtils.getMessage(bundle, "INJECTION_TARGET_NOT_FOUND", target.getTargetClass()+ "." +target.getTargetName()));
+ }
+
+ private String getMethodName(final InjectionTarget target)
+ {
+ if (target.getTargetName() == null)
+ {
+ return null;
+ }
+ if (target.getTargetName().startsWith("set"))
+ {
+ return target.getTargetName();
+ }
+
+ return "set" + target.getTargetName().substring(0, 1).toUpperCase() + target.getTargetName().substring(1);
+ }
- }
}
Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/injection/VirtualFileAdaptor.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/injection/VirtualFileAdaptor.java 2011-08-17 09:14:23 UTC (rev 14888)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/injection/VirtualFileAdaptor.java 2011-08-17 09:32:38 UTC (rev 14889)
@@ -31,6 +31,7 @@
import java.net.URL;
import java.util.LinkedList;
import java.util.List;
+import java.util.ResourceBundle;
import java.util.jar.JarEntry;
import java.util.jar.JarInputStream;
import java.util.jar.JarOutputStream;
@@ -38,6 +39,7 @@
import org.jboss.vfs.VFS;
import org.jboss.vfs.VFSUtils;
import org.jboss.vfs.VirtualFile;
+import org.jboss.ws.api.util.BundleUtils;
import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
import org.jboss.wsf.spi.deployment.WritableUnifiedVirtualFile;
@@ -50,6 +52,7 @@
*/
public final class VirtualFileAdaptor implements WritableUnifiedVirtualFile
{
+ private static final ResourceBundle bundle = BundleUtils.getBundle(VirtualFileAdaptor.class);
private static final long serialVersionUID = -4509594124653184348L;
private static final ObjectStreamField[] serialPersistentFields =
@@ -79,9 +82,9 @@
protected VirtualFileAdaptor(URL rootUrl, String path, boolean requiresMount)
{
if (rootUrl == null)
- throw new IllegalArgumentException("Null root url");
+ throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "NULL_ROOT_URL"));
if (path == null)
- throw new IllegalArgumentException("Null path");
+ throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "NULL_PATH"));
this.rootUrl = rootUrl;
this.path = path;
@@ -106,17 +109,17 @@
}
catch (URISyntaxException e)
{
- throw new IOException("Unable to get Virtualfile from URL: " + rootUrl, e);
+ throw new IOException(BundleUtils.getMessage(bundle, "UNABLE_TO_GET_VIRTUALFILE_FROM_URL", rootUrl), e);
}
file = root.getChild(path);
if (!file.exists())
{
- throw new IOException("VirtualFile " + file + " does not exist");
+ throw new IOException(BundleUtils.getMessage(bundle, "VIRTUALFILE_DOES_NOT_EXIST", file ));
}
else if (requiresMount && !isMounted(root, file))
{
- throw new IOException("VirtualFile " + file + " is not mounted");
+ throw new IOException(BundleUtils.getMessage(bundle, "VIRTUALFILE_IS_NOT_MOUNTED", file ));
}
}
return file;
@@ -132,7 +135,7 @@
final VirtualFile virtualFile = getFile();
final VirtualFile childFile = file.getChild(child);
if(!childFile.exists())
- throw new IOException("Child '" + child + "' not found for VirtualFile " + virtualFile);
+ throw new IOException(BundleUtils.getMessage(bundle, "CHILD_NOT_FOUND", new Object[]{ child , virtualFile}));
return new VirtualFileAdaptor(childFile);
}
Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/injection/WebServiceContextResourceProvider.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/injection/WebServiceContextResourceProvider.java 2011-08-17 09:14:23 UTC (rev 14888)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/injection/WebServiceContextResourceProvider.java 2011-08-17 09:32:38 UTC (rev 14889)
@@ -74,7 +74,7 @@
{
return this.target;
}
-
+
@Override
public Collection<?> getInvocationDependencies()
{
Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerEJB21.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerEJB21.java 2011-08-17 09:14:23 UTC (rev 14888)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerEJB21.java 2011-08-17 09:32:38 UTC (rev 14889)
@@ -23,6 +23,7 @@
import java.lang.reflect.Method;
import java.security.Principal;
+import java.util.ResourceBundle;
import javax.management.MBeanServer;
import javax.management.ObjectName;
@@ -37,6 +38,7 @@
import org.jboss.invocation.InvocationType;
import org.jboss.invocation.PayloadKey;
import org.jboss.mx.util.MBeanServerLocator;
+import org.jboss.ws.api.util.BundleUtils;
import org.jboss.ws.common.ObjectNameFactory;
import org.jboss.ws.common.integration.WSHelper;
import org.jboss.ws.common.invocation.AbstractInvocationHandler;
@@ -59,6 +61,7 @@
*/
final class InvocationHandlerEJB21 extends AbstractInvocationHandler
{
+ private static final ResourceBundle bundle = BundleUtils.getBundle(InvocationHandlerEJB21.class);
/** EJB21 JNDI name. */
private String jndiName;
@@ -90,7 +93,7 @@
if (ejbMD == null)
{
- throw new WebServiceException("Cannot obtain ejb meta data for: " + ejbName);
+ throw new WebServiceException(BundleUtils.getMessage(bundle, "CANNOT_OBTAIN_EJB_META_DATA", ejbName));
}
// get the bean's JNDI name
@@ -98,7 +101,7 @@
if (this.jndiName == null)
{
- throw new WebServiceException("Cannot obtain JNDI name for: " + ejbName);
+ throw new WebServiceException(BundleUtils.getMessage(bundle, "CANNOT_OBTAIN_JNDI_NAME", ejbName));
}
}
@@ -118,7 +121,7 @@
final boolean ejb21NotRegistered = !this.server.isRegistered(this.ejb21ContainerName);
if (ejb21NotRegistered)
{
- throw new IllegalArgumentException("Cannot find service endpoint target: " + this.ejb21ContainerName);
+ throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "CANNOT_FIND_SERVICE_ENDPOINT_TARGET", this.ejb21ContainerName));
}
// Inject the Service endpoint interceptor
@@ -154,7 +157,7 @@
}
catch (Exception e)
{
- this.log.error("Method invocation failed with exception: " + e.getMessage(), e);
+ this.log.error(BundleUtils.getMessage(bundle, "METHOD_INVOCATION_FAILED", e.getMessage()), e);
this.handleInvocationException(e);
}
}
@@ -171,13 +174,13 @@
final MessageContext msgContext = wsInvocation.getInvocationContext().getAttachment(MessageContext.class);
if (msgContext == null)
{
- throw new IllegalStateException("Cannot obtain MessageContext");
+ throw new IllegalStateException(BundleUtils.getMessage(bundle, "CANNOT_OBTAIN_MESSAGECONTEXT"));
}
final HandlerCallback callback = wsInvocation.getInvocationContext().getAttachment(HandlerCallback.class);
if (callback == null)
{
- throw new IllegalStateException("Cannot obtain HandlerCallback");
+ throw new IllegalStateException(BundleUtils.getMessage(bundle, "CANNOT_OBTAIN_HANDLERCALLBACK"));
}
// prepare security data
@@ -234,11 +237,11 @@
currentInterceptor = nextInterceptor;
}
- this.log.warn("Cannot find EJB 21 service endpoint interceptor insert point");
+ this.log.warn(BundleUtils.getMessage(bundle, "CANNOT_FIND_EJB21_INSERT_POINT"));
}
catch (Exception ex)
{
- this.log.warn("Cannot register EJB 21 service endpoint interceptor: ", ex);
+ this.log.warn(BundleUtils.getMessage(bundle, "CANNOT_REGISTER_EJB21_INTERCEPTOR"), ex);
}
}
}
Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerEJB3.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerEJB3.java 2011-08-17 09:14:23 UTC (rev 14888)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerEJB3.java 2011-08-17 09:32:38 UTC (rev 14889)
@@ -22,18 +22,16 @@
package org.jboss.webservices.integration.invocation;
import java.lang.reflect.Method;
-import java.security.Principal;
+import java.util.ResourceBundle;
import javax.naming.Context;
import javax.naming.NamingException;
-import javax.xml.ws.EndpointReference;
import javax.xml.ws.WebServiceContext;
import javax.xml.ws.WebServiceException;
-import javax.xml.ws.handler.MessageContext;
import org.jboss.ejb3.EJBContainer;
-import org.jboss.ejb3.context.CurrentEJBContext;
import org.jboss.webservices.integration.util.ASHelper;
+import org.jboss.ws.api.util.BundleUtils;
import org.jboss.ws.common.injection.ThreadLocalAwareWebServiceContext;
import org.jboss.ws.common.invocation.AbstractInvocationHandler;
import org.jboss.wsf.spi.SPIProvider;
@@ -45,7 +43,6 @@
import org.jboss.wsf.spi.invocation.integration.ServiceEndpointContainer;
import org.jboss.wsf.spi.ioc.IoCContainerProxy;
import org.jboss.wsf.spi.ioc.IoCContainerProxyFactory;
-import org.w3c.dom.Element;
/**
* Handles invocations on EJB3 endpoints.
@@ -55,6 +52,7 @@
*/
final class InvocationHandlerEJB3 extends AbstractInvocationHandler
{
+ private static final ResourceBundle bundle = BundleUtils.getBundle(InvocationHandlerEJB3.class);
/** EJB3 JNDI context. */
private static final String EJB3_JNDI_PREFIX = "java:env/";
@@ -88,7 +86,7 @@
if (this.containerName == null)
{
- throw new IllegalArgumentException("Container name cannot be null");
+ throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "CONTAINER_NAME_CANNOT_BE_NULL"));
}
}
@@ -106,7 +104,7 @@
this.serviceEndpointContainer = this.iocContainer.getBean(this.containerName, ServiceEndpointContainer.class);
if (this.serviceEndpointContainer == null)
{
- throw new WebServiceException("Cannot find service endpoint target: " + this.containerName);
+ throw new WebServiceException(BundleUtils.getMessage(bundle, "CANNOT_FIND_SERVICE_ENDPOINT_TARGET", this.containerName));
}
}
@@ -139,7 +137,7 @@
}
catch (Throwable t)
{
- this.log.error("Method invocation failed with exception: " + t.getMessage(), t);
+ this.log.error(BundleUtils.getMessage(bundle, "METHOD_INVOCATION_FAILED", t.getMessage()), t);
this.handleInvocationException(t);
}
finally
@@ -187,44 +185,9 @@
{
final InvocationContext invocationContext = invocation.getInvocationContext();
- return new WebServiceContextAdapter(invocationContext.getAttachment(WebServiceContext.class));
+ return invocationContext.getAttachment(WebServiceContext.class);
}
- private static final class WebServiceContextAdapter implements WebServiceContext
- {
- private final WebServiceContext delegate;
-
- private WebServiceContextAdapter(final WebServiceContext delegate)
- {
- this.delegate = delegate;
- }
-
- public MessageContext getMessageContext()
- {
- return this.delegate.getMessageContext();
- }
-
- public Principal getUserPrincipal()
- {
- return CurrentEJBContext.get().getCallerPrincipal();
- }
-
- public boolean isUserInRole(final String role)
- {
- return CurrentEJBContext.get().isCallerInRole(role);
- }
-
- public EndpointReference getEndpointReference(final Element... referenceParameters)
- {
- return delegate.getEndpointReference(referenceParameters);
- }
-
- public <T extends EndpointReference> T getEndpointReference(final Class<T> clazz, final Element... referenceParameters)
- {
- return delegate.getEndpointReference(clazz, referenceParameters);
- }
- }
-
/**
* EJB3 invocation callback allowing EJB 3 beans to access Web Service invocation properties.
*/
Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerFactoryImpl.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerFactoryImpl.java 2011-08-17 09:14:23 UTC (rev 14888)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerFactoryImpl.java 2011-08-17 09:32:38 UTC (rev 14889)
@@ -21,6 +21,9 @@
*/
package org.jboss.webservices.integration.invocation;
+import java.util.ResourceBundle;
+
+import org.jboss.ws.api.util.BundleUtils;
import org.jboss.ws.common.invocation.InvocationHandlerJAXRPC;
import org.jboss.ws.common.invocation.InvocationHandlerJAXWS;
import org.jboss.wsf.spi.invocation.InvocationHandler;
@@ -35,6 +38,7 @@
*/
public final class InvocationHandlerFactoryImpl extends InvocationHandlerFactory
{
+ private static final ResourceBundle bundle = BundleUtils.getBundle(InvocationHandlerFactoryImpl.class);
/**
* Constructor.
*/
@@ -74,7 +78,7 @@
handler = new InvocationHandlerMDB3();
break;
default :
- throw new IllegalArgumentException("Unable to resolve spi.invocation.InvocationHandler for type " + type);
+ throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "UNABLE_TO_RESOLVE", type));
}
return handler;
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/Message.properties
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/Message.properties (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/Message.properties 2011-08-17 09:32:38 UTC (rev 14889)
@@ -0,0 +1,14 @@
+CONTAINER_NAME_CANNOT_BE_NULL=Container name cannot be null
+CANNOT_FIND_SERVICE_ENDPOINT_TARGET=Cannot find service endpoint target: {0}
+METHOD_INVOCATION_FAILED_WITH_EXCEPTION=Method invocation failed with exception: {0}
+HANDLER_CALLBACK_NOT_AVAILABLE=Handler callback not available
+CANNOT_PROCESS_HANDLEFAULT=Cannot process handlerChain.handleFault:
+CANNOT_OBTAIN_EJB_META_DATA=Cannot obtain ejb meta data for: {0}
+CANNOT_OBTAIN_JNDI_NAME=Cannot obtain JNDI name for: {0}
+CANNOT_FIND_SERVICE_ENDPOINT_TARGET=Cannot find service endpoint target: {0}
+METHOD_INVOCATION_FAILED=Method invocation failed with exception: {0}
+CANNOT_OBTAIN_MESSAGECONTEXT=Cannot obtain MessageContext
+CANNOT_OBTAIN_HANDLERCALLBACK=Cannot obtain HandlerCallback
+CANNOT_FIND_EJB21_INSERT_POINT=Cannot find EJB 21 service endpoint interceptor insert point
+CANNOT_REGISTER_EJB21_INTERCEPTOR=Cannot register EJB 21 service endpoint interceptor:
+UNABLE_TO_RESOLVE=Unable to resolve spi.invocation.InvocationHandler for type {0}
Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/ServiceEndpointInterceptorEJB21.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/ServiceEndpointInterceptorEJB21.java 2011-08-17 09:14:23 UTC (rev 14888)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/ServiceEndpointInterceptorEJB21.java 2011-08-17 09:32:38 UTC (rev 14889)
@@ -21,10 +21,13 @@
*/
package org.jboss.webservices.integration.invocation;
+import java.util.ResourceBundle;
+
import javax.xml.rpc.handler.soap.SOAPMessageContext;
import org.jboss.ejb.plugins.AbstractInterceptor;
import org.jboss.invocation.InvocationKey;
+import org.jboss.ws.api.util.BundleUtils;
import org.jboss.wsf.spi.invocation.HandlerCallback;
import org.jboss.wsf.spi.invocation.Invocation;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
@@ -40,6 +43,7 @@
*/
final class ServiceEndpointInterceptorEJB21 extends AbstractInterceptor
{
+ private static final ResourceBundle bundle = BundleUtils.getBundle(ServiceEndpointInterceptorEJB21.class);
/**
* Constructor.
*/
@@ -71,7 +75,7 @@
if (callback == null || wsInvocation == null)
{
- log.warn("Handler callback not available");
+ log.warn(BundleUtils.getMessage(bundle, "HANDLER_CALLBACK_NOT_AVAILABLE"));
return this.getNext().invoke(jbossInvocation);
}
@@ -114,7 +118,7 @@
}
catch (Exception e)
{
- log.warn("Cannot process handlerChain.handleFault, ignoring: ", e);
+ log.warn(BundleUtils.getMessage(bundle, "CANNOT_PROCESS_HANDLEFAULT"), e);
}
throw ex;
}
Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/ContainerMetaDataDeploymentAspect.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/ContainerMetaDataDeploymentAspect.java 2011-08-17 09:14:23 UTC (rev 14888)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/ContainerMetaDataDeploymentAspect.java 2011-08-17 09:32:38 UTC (rev 14889)
@@ -22,10 +22,10 @@
package org.jboss.webservices.integration.metadata;
import org.jboss.ws.common.integration.WSHelper;
-import org.jboss.ws.common.integration.AbstractDeploymentAspect;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData;
import org.jboss.wsf.spi.metadata.j2ee.JSEArchiveMetaData;
+import org.jboss.ws.common.integration.AbstractDeploymentAspect;
/**
* An aspect that builds container independent meta data.
Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/security/JACCPermissionsDeploymentAspect.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/security/JACCPermissionsDeploymentAspect.java 2011-08-17 09:14:23 UTC (rev 14888)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/security/JACCPermissionsDeploymentAspect.java 2011-08-17 09:32:38 UTC (rev 14889)
@@ -21,13 +21,16 @@
*/
package org.jboss.webservices.integration.security;
+import java.util.ResourceBundle;
+
import javax.security.jacc.PolicyConfiguration;
import javax.security.jacc.PolicyConfigurationFactory;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
import org.jboss.web.WebPermissionMapping;
+import org.jboss.ws.api.util.BundleUtils;
+import org.jboss.ws.common.integration.AbstractDeploymentAspect;
import org.jboss.ws.common.integration.WSHelper;
-import org.jboss.ws.common.integration.AbstractDeploymentAspect;
import org.jboss.wsf.spi.deployment.Deployment;
/**
@@ -41,6 +44,7 @@
*/
public final class JACCPermissionsDeploymentAspect extends AbstractDeploymentAspect
{
+ private static final ResourceBundle bundle = BundleUtils.getBundle(JACCPermissionsDeploymentAspect.class);
/**
* Constructor.
*/
@@ -74,7 +78,7 @@
}
catch (Exception e)
{
- throw new RuntimeException("Exception generating JACC perms: ", e);
+ throw new RuntimeException(BundleUtils.getMessage(bundle, "EXCEPTION_GENERATING_JACC_PERMS"), e);
}
}
}
Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/security/JaasSecurityDomainAdaptorResolverImpl.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/security/JaasSecurityDomainAdaptorResolverImpl.java 2011-08-17 09:14:23 UTC (rev 14888)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/security/JaasSecurityDomainAdaptorResolverImpl.java 2011-08-17 09:32:38 UTC (rev 14889)
@@ -21,11 +21,14 @@
*/
package org.jboss.webservices.integration.security;
+import java.util.ResourceBundle;
+
import javax.naming.InitialContext;
import javax.naming.NamingException;
import org.jboss.logging.Logger;
import org.jboss.security.plugins.JaasSecurityDomain;
+import org.jboss.ws.api.util.BundleUtils;
import org.jboss.wsf.spi.security.JAASSecurityDomainAdaptor;
import org.jboss.wsf.spi.security.JAASSecurityDomainAdaptorResolver;
@@ -37,6 +40,7 @@
*/
public class JaasSecurityDomainAdaptorResolverImpl implements JAASSecurityDomainAdaptorResolver
{
+ private static final ResourceBundle bundle = BundleUtils.getBundle(JaasSecurityDomainAdaptorResolverImpl.class);
public JAASSecurityDomainAdaptor lookup(String jndi) throws Exception
{
InitialContext ic = null;
@@ -46,13 +50,13 @@
Object o = ic.lookup(jndi);
if (!(o instanceof JaasSecurityDomain))
{
- throw new Exception(jndi + " not bound to a JaasSecurityDomain but to a " + o.getClass().getName() + " instance");
+ throw new Exception(BundleUtils.getMessage(bundle, "NOT_BUNDTO_JAASSECURITYDOMAIN", new Object[] {jndi,o.getClass().getName()}));
}
return new JaasSecurityDomainAdaptorImpl((JaasSecurityDomain)o);
}
catch (NamingException e)
{
- throw new Exception("JNDI failure handling " + jndi, e);
+ throw new Exception(BundleUtils.getMessage(bundle, "JNDI_FAILURE_HANDLING", jndi), e);
}
finally
{
@@ -64,7 +68,7 @@
}
catch (NamingException e)
{
- Logger.getLogger(JaasSecurityDomainAdaptorImpl.class).warn(this + " failed to close InitialContext", e);
+ Logger.getLogger(JaasSecurityDomainAdaptorImpl.class).warn(BundleUtils.getMessage(bundle, "FAILED_TO_CLOSE_INITIALCONTEXT", this), e);
}
}
}
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/security/Message.properties
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/security/Message.properties (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/security/Message.properties 2011-08-17 09:32:38 UTC (rev 14889)
@@ -0,0 +1,6 @@
+UNABLE_TO_LOOKUP_AUTHENTICATIONMANAGER=Unable to lookup AuthenticationManager
+SECURITY_CONTEXT_IS_NULL=Security Context is null
+JNDI_FAILURE_HANDLING=JNDI failure handling {0}
+FAILED_TO_CLOSE_INITIALCONTEXT= {0} failed to close InitialContext
+EXCEPTION_GENERATING_JACC_PERMS=Exception generating JACC perms:
+NOT_BUNDTO_JAASSECURITYDOMAIN={0} not bound to a JaasSecurityDomain but to a {1} instance
\ No newline at end of file
Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/security/SecurityAdapterImpl.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/security/SecurityAdapterImpl.java 2011-08-17 09:14:23 UTC (rev 14888)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/security/SecurityAdapterImpl.java 2011-08-17 09:32:38 UTC (rev 14889)
@@ -21,15 +21,9 @@
*/
package org.jboss.webservices.integration.security;
-import java.security.AccessController;
import java.security.Principal;
-import java.security.PrivilegedAction;
-import javax.security.auth.Subject;
-
import org.jboss.security.SecurityAssociation;
-import org.jboss.security.SecurityContext;
-import org.jboss.security.SecurityContextAssociation;
import org.jboss.wsf.spi.invocation.SecurityAdaptor;
/**
@@ -87,31 +81,4 @@
{
SecurityAssociation.setCredential(credential);
}
-
- /**
- * @see org.jboss.wsf.spi.invocation.SecurityAdaptor#pushSubjectContext(Subject, Principal, Object)
- *
- * @param subject subject
- * @param principal principal
- * @param credential credential
- */
- public void pushSubjectContext(final Subject subject, final Principal principal, final Object credential)
- {
- AccessController.doPrivileged(new PrivilegedAction<Void>()
- {
-
- public Void run()
- {
- final SecurityContext securityContext = SecurityContextAssociation.getSecurityContext();
- if (securityContext == null)
- {
- throw new IllegalStateException("Security Context is null");
- }
-
- securityContext.getUtil().createSubjectInfo(principal, credential, subject);
-
- return null;
- }
- });
- }
}
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/security/SecurityDomainContextAdaptor.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/security/SecurityDomainContextAdaptor.java (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/security/SecurityDomainContextAdaptor.java 2011-08-17 09:32:38 UTC (rev 14889)
@@ -0,0 +1,111 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, 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.webservices.integration.security;
+
+import java.security.AccessController;
+import java.security.Principal;
+import java.security.PrivilegedAction;
+import java.util.ResourceBundle;
+import java.util.Set;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.security.auth.Subject;
+
+import org.jboss.security.AuthenticationManager;
+import org.jboss.security.RealmMapping;
+import org.jboss.security.SecurityContext;
+import org.jboss.security.SecurityContextAssociation;
+import org.jboss.ws.api.util.BundleUtils;
+
+/**
+ * org.jboss.wsf.spi.security.SecurityDomainContext implementation relying on AuthenticationManager
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 18-May-2011
+ */
+public final class SecurityDomainContextAdaptor implements org.jboss.wsf.spi.security.SecurityDomainContext {
+ private static final ResourceBundle bundle = BundleUtils.getBundle(SecurityDomainContextAdaptor.class);
+
+ private AuthenticationManager authenticationManager;
+ private RealmMapping realmMapping;
+
+
+ public SecurityDomainContextAdaptor() {
+ //NOOP
+ }
+
+ private void setupAuthenticationManager() {
+ if (authenticationManager == null) {
+ try
+ {
+ Context ctx = new InitialContext();
+ Object obj = ctx.lookup("java:comp/env/security/securityMgr");
+ authenticationManager = (AuthenticationManager)obj;
+ realmMapping = (RealmMapping)authenticationManager;
+ }
+ catch (NamingException ne)
+ {
+ throw new RuntimeException(BundleUtils.getMessage(bundle, "UNABLE_TO_LOOKUP_AUTHENTICATIONMANAGER"), ne);
+ }
+ }
+ }
+
+ @Override
+ public boolean isValid(Principal principal, Object credential, Subject activeSubject) {
+ setupAuthenticationManager();
+ return authenticationManager.isValid(principal, credential, activeSubject);
+ }
+
+ @Override
+ public boolean doesUserHaveRole(Principal principal, Set<Principal> roles) {
+ setupAuthenticationManager();
+ return realmMapping.doesUserHaveRole(principal, roles);
+ }
+
+ @Override
+ public String getSecurityDomain() {
+ setupAuthenticationManager();
+ return authenticationManager.getSecurityDomain();
+ }
+
+ @Override
+ public Set<Principal> getUserRoles(Principal principal) {
+ setupAuthenticationManager();
+ return realmMapping.getUserRoles(principal);
+ }
+
+ @Override
+ public void pushSubjectContext(final Subject subject, final Principal principal, final Object credential) {
+ AccessController.doPrivileged(new PrivilegedAction<Void>() {
+ public Void run() {
+ SecurityContext securityContext = SecurityContextAssociation.getSecurityContext();
+ if (securityContext == null) {
+ throw new IllegalStateException(BundleUtils.getMessage(bundle, "SECURITY_CONTEXT_IS_NULL"));
+ }
+ securityContext.getUtil().createSubjectInfo(principal, credential, subject);
+ return null;
+ }
+ });
+ }
+}
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/security/SecurityDomainContextDeploymentAspect.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/security/SecurityDomainContextDeploymentAspect.java (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/security/SecurityDomainContextDeploymentAspect.java 2011-08-17 09:32:38 UTC (rev 14889)
@@ -0,0 +1,53 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.webservices.integration.security;
+
+import org.jboss.ws.common.deployment.EndpointLifecycleDeploymentAspect;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.security.SecurityDomainContext;
+
+/**
+ * Extends EndpointLifecycleDeploymentAspect to setup the SecurityDomainContext
+ *
+ * @author <a href="mailto:alessio.soldano@jboss.com">Alessio Soldano/a>
+ */
+public final class SecurityDomainContextDeploymentAspect extends EndpointLifecycleDeploymentAspect
+{
+ /**
+ * Constructor.
+ */
+ public SecurityDomainContextDeploymentAspect()
+ {
+ super();
+ }
+
+ @Override
+ public void start(final Deployment dep)
+ {
+ super.start(dep);
+ SecurityDomainContext context = new SecurityDomainContextAdaptor();
+ for (Endpoint ep : dep.getService().getEndpoints()) {
+ ep.setSecurityDomainContext(context);
+ }
+ }
+}
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/Message.properties
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/Message.properties (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/Message.properties 2011-08-17 09:32:38 UTC (rev 14889)
@@ -0,0 +1 @@
+CANNOT_OBTAIN_DEPLOYMENT_PROPERTY=Cannot obtain deployment property : {0}
Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/SecurityMetaDataAccessorEJB3.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/SecurityMetaDataAccessorEJB3.java 2011-08-17 09:14:23 UTC (rev 14888)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/SecurityMetaDataAccessorEJB3.java 2011-08-17 09:32:38 UTC (rev 14889)
@@ -28,8 +28,8 @@
import org.jboss.ejb3.annotation.SecurityDomain;
import org.jboss.metadata.javaee.spec.SecurityRoleMetaData;
import org.jboss.metadata.javaee.spec.SecurityRolesMetaData;
+import org.jboss.ws.api.annotation.WebContext;
import org.jboss.ws.common.integration.WSHelper;
-import org.jboss.ws.api.annotation.WebContext;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.webservices.integration.WebServiceDeclaration;
Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreatingDeploymentAspect.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreatingDeploymentAspect.java 2011-08-17 09:14:23 UTC (rev 14888)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreatingDeploymentAspect.java 2011-08-17 09:32:38 UTC (rev 14889)
@@ -22,8 +22,8 @@
package org.jboss.webservices.integration.tomcat;
import org.jboss.ws.common.integration.WSHelper;
+import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.ws.common.integration.AbstractDeploymentAspect;
-import org.jboss.wsf.spi.deployment.Deployment;
/**
* A deployment aspect that generates web app meta data for EJB endpoints.
Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreator.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreator.java 2011-08-17 09:14:23 UTC (rev 14888)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreator.java 2011-08-17 09:32:38 UTC (rev 14889)
@@ -189,11 +189,14 @@
for (final Endpoint ep : dep.getService().getEndpoints())
{
- final String endpointName = ep.getShortName();
- final List<String> urlPatterns = WebMetaDataHelper.getUrlPatterns(((HttpEndpoint)ep).getURLPattern());
+ if (ep instanceof HttpEndpoint)
+ {
+ final String endpointName = ep.getShortName();
+ final List<String> urlPatterns = WebMetaDataHelper.getUrlPatterns(((HttpEndpoint)ep).getURLPattern());
- this.log.debug("Servlet name: " + endpointName + ", URL patterns: " + urlPatterns);
- WebMetaDataHelper.newServletMapping(endpointName, urlPatterns, servletMappings);
+ this.log.debug("Servlet name: " + endpointName + ", URL patterns: " + urlPatterns);
+ WebMetaDataHelper.newServletMapping(endpointName, urlPatterns, servletMappings);
+ }
}
}
@@ -233,7 +236,7 @@
final String authMethod = ejbMDAccessor.getAuthMethod(ejbEndpoint);
final boolean hasAuthMethod = authMethod != null;
- if (hasAuthMethod || hasTransportGuarantee)
+ if (ejbEndpoint instanceof HttpEndpoint && (hasAuthMethod || hasTransportGuarantee))
{
final List<SecurityConstraintMetaData> securityConstraints = WebMetaDataHelper
.getSecurityConstraints(jbossWebMD);
Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifier.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifier.java 2011-08-17 09:14:23 UTC (rev 14888)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifier.java 2011-08-17 09:32:38 UTC (rev 14889)
@@ -22,6 +22,7 @@
package org.jboss.webservices.integration.tomcat;
import java.util.List;
+import java.util.ResourceBundle;
import org.jboss.logging.Logger;
import org.jboss.metadata.javaee.spec.ParamValueMetaData;
@@ -29,6 +30,7 @@
import org.jboss.metadata.web.spec.ServletMetaData;
import org.jboss.webservices.integration.util.ASHelper;
import org.jboss.webservices.integration.util.WebMetaDataHelper;
+import org.jboss.ws.api.util.BundleUtils;
import org.jboss.ws.common.integration.WSConstants;
import org.jboss.ws.common.integration.WSHelper;
import org.jboss.wsf.spi.deployment.Deployment;
@@ -44,6 +46,7 @@
*/
final class WebMetaDataModifier
{
+ private static final ResourceBundle bundle = BundleUtils.getBundle(WebMetaDataModifier.class);
/** Logger. */
private final Logger log = Logger.getLogger(WebMetaDataModifier.class);
@@ -124,7 +127,7 @@
if (transportClassName == null)
{
- throw new IllegalStateException("Cannot obtain deployment property:" + WSConstants.STACK_TRANSPORT_CLASS);
+ throw new IllegalStateException(BundleUtils.getMessage(bundle, "CANNOT_OBTAIN_DEPLOYMENT_PROPERTY", WSConstants.STACK_TRANSPORT_CLASS));
}
return transportClassName;
Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/util/ASHelper.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/util/ASHelper.java 2011-08-17 09:14:23 UTC (rev 14888)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/util/ASHelper.java 2011-08-17 09:32:38 UTC (rev 14889)
@@ -24,6 +24,7 @@
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import java.util.ResourceBundle;
import javax.jws.WebService;
import javax.servlet.Servlet;
@@ -36,6 +37,7 @@
import org.jboss.metadata.web.jboss.JBossServletMetaData;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
import org.jboss.metadata.web.spec.ServletMetaData;
+import org.jboss.ws.api.util.BundleUtils;
import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
import org.jboss.webservices.integration.WebServiceDeclaration;
import org.jboss.webservices.integration.WebServiceDeployment;
@@ -47,6 +49,7 @@
*/
public final class ASHelper
{
+ private static final ResourceBundle bundle = BundleUtils.getBundle(ASHelper.class);
/**
* EJB invocation property.
*/
@@ -272,7 +275,7 @@
}
}
- throw new IllegalStateException("Cannot find servlet for link: " + servletName);
+ throw new IllegalStateException(BundleUtils.getMessage(bundle, "CANNOT_FIND_SERVLET_FOR_LINK", servletName));
}
/**
@@ -301,7 +304,7 @@
}
catch (ClassNotFoundException cnfe)
{
- ASHelper.LOGGER.warn("Cannot load servlet class: " + endpointClassName, cnfe);
+ ASHelper.LOGGER.warn(BundleUtils.getMessage(bundle, "CANNOT_LOAD_SERVLET_CLASS", endpointClassName), cnfe);
}
}
@@ -322,7 +325,7 @@
final A value = unit.getAttachment(key);
if (value == null)
{
- ASHelper.LOGGER.error("Cannot find attachment in deployment unit: " + key);
+ ASHelper.LOGGER.error(BundleUtils.getMessage(bundle, "CANNOT_FIND_ATTACHMENT_IN_DEPLOYMENT_UNIT", key));
throw new IllegalStateException();
}
@@ -367,7 +370,7 @@
{
if (wsDescriptionsMD.size() > 1)
{
- ASHelper.LOGGER.warn("Multiple <webservice-description> elements not supported");
+ ASHelper.LOGGER.warn(BundleUtils.getMessage(bundle, "MULTIPLE_WS_DESP_ELEMENTS_NOT_SUPPORTED"));
}
if (wsDescriptionsMD.size() > 0)
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/util/Message.properties
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/util/Message.properties (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/util/Message.properties 2011-08-17 09:32:38 UTC (rev 14889)
@@ -0,0 +1,4 @@
+CANNOT_FIND_SERVLET_FOR_LINK=Cannot find servlet for link: {0}
+CANNOT_LOAD_SERVLET_CLASS=Cannot load servlet class: {0}
+CANNOT_FIND_ATTACHMENT_IN_DEPLOYMENT_UNIT=Cannot find attachment in deployment unit: {0}
+MULTIPLE_WS_DESP_ELEMENTS_NOT_SUPPORTED=Multiple <webservice-description> elements not supported
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/weld/Message.properties
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/weld/Message.properties (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/weld/Message.properties 2011-08-17 09:32:38 UTC (rev 14889)
@@ -0,0 +1 @@
+UNABLE_TO_LOCATE_BEANMANAGER=Unable to locate BeanManager
Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/weld/WeldInvocationHandler.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/weld/WeldInvocationHandler.java 2011-08-17 09:14:23 UTC (rev 14888)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/weld/WeldInvocationHandler.java 2011-08-17 09:32:38 UTC (rev 14889)
@@ -21,11 +21,14 @@
*/
package org.jboss.webservices.integration.weld;
+import java.util.ResourceBundle;
+
import javax.naming.InitialContext;
import javax.naming.NamingException;
import org.jboss.weld.integration.injection.NonContextualObjectInjectionHelper;
import org.jboss.weld.manager.api.WeldManager;
+import org.jboss.ws.api.util.BundleUtils;
import org.jboss.ws.common.invocation.AbstractInvocationHandlerJSE;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.invocation.Invocation;
@@ -39,6 +42,7 @@
*/
public final class WeldInvocationHandler extends AbstractInvocationHandlerJSE
{
+ private static final ResourceBundle bundle = BundleUtils.getBundle(WeldInvocationHandler.class);
private static final String BEAN_MANAGER_JNDI_NAME = "java:comp/BeanManager";
@@ -81,7 +85,7 @@
WeldManager beanManager = (WeldManager) new InitialContext().lookup(BEAN_MANAGER_JNDI_NAME);
NonContextualObjectInjectionHelper.injectNonContextualInstance(instance, beanManager);
} catch (NamingException e) {
- throw new IllegalStateException("Unable to locate BeanManager");
+ throw new IllegalStateException(BundleUtils.getMessage(bundle, "UNABLE_TO_LOCATE_BEANMANAGER"));
}
}
13 years, 4 months
- 1
- 0
JBossWS SVN: r14888 - container/jboss60/branches/jbossws-jboss610.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-08-17 05:14:23 -0400 (Wed, 17 Aug 2011)
New Revision: 14888
Modified:
container/jboss60/branches/jbossws-jboss610/
Log:
updating svn:ignore properties
Property changes on: container/jboss60/branches/jbossws-jboss610
___________________________________________________________________
Added: svn:ignore
+ .classpath
.project
.settings
target
13 years, 4 months
- 1
- 0
JBossWS SVN: r14887 - in container/jboss60/branches/jbossws-jboss610: src/main/java/org/jboss/webservices/integration and 11 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-08-17 05:11:01 -0400 (Wed, 17 Aug 2011)
New Revision: 14887
Added:
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/WebServiceDeclaration.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/WebServiceDeployment.java
Removed:
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/JMSDescriptorDeployer.java
Modified:
container/jboss60/branches/jbossws-jboss610/pom.xml
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/config/ServerConfigImpl.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/AbstractDescriptorDeployer.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentAspectDeployer.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WSDescriptorDeployer.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WSEJBAdapterDeployer.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WSTypeDeployer.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/AbstractDeploymentModelBuilder.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_EJB21.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_EJB3.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/endpoint/HornetQJMSResolver.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/injection/EJBBeanReferenceResolver.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/injection/InjectionMetaDataDeploymentAspect.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/injection/WebServiceContextResourceProvider.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerEJB21.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerEJB3.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerFactoryImpl.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerMDB21.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerMDB3.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/AbstractMetaDataBuilderEJB.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/ContainerMetaDataDeploymentAspect.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB21.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB3.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderJSE.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/security/JACCPermissionsDeploymentAspect.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/AbstractSecurityMetaDataAccessorEJB.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/SecurityMetaDataAccessorEJB21.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/SecurityMetaDataAccessorEJB3.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreatingDeploymentAspect.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreator.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifier.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifyingDeploymentAspect.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/util/ASHelper.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/weld/WeldDeploymentAspect.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/weld/WeldInvocationHandler.java
Log:
fixing compilation issues
Modified: container/jboss60/branches/jbossws-jboss610/pom.xml
===================================================================
--- container/jboss60/branches/jbossws-jboss610/pom.xml 2011-08-17 08:18:10 UTC (rev 14886)
+++ container/jboss60/branches/jbossws-jboss610/pom.xml 2011-08-17 09:11:01 UTC (rev 14887)
@@ -35,7 +35,7 @@
<jboss.picketbox.version>3.0.0.CR2</jboss.picketbox.version>
<jboss.vfs.version>3.0.1.GA</jboss.vfs.version>
<jboss.cl.version>2.2.1.GA</jboss.cl.version>
- <jboss.weld.version>1.1.2.Final</jboss.weld.version>
+ <jboss.weld.version>1.1.Beta2</jboss.weld.version>
<jboss.hornetq.version>2.2.5.Final</jboss.hornetq.version>
<jboss.jaxws.api.version>1.0.0.Final</jboss.jaxws.api.version>
</properties>
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/WebServiceDeclaration.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/WebServiceDeclaration.java (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/WebServiceDeclaration.java 2011-08-17 09:11:01 UTC (rev 14887)
@@ -0,0 +1,60 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, 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.webservices.integration;
+
+import javax.naming.Context;
+
+/**
+ * A minimum web service meta data representation that offers a generic
+ * way to access more fine grained meta data through {@link #getAnnotation(Class)}
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public interface WebServiceDeclaration
+{
+ /**
+ * A distinct identifier across deployments.<br>
+ * In case of EJB3 this would be the <code>ObjectName</code> under which get's registered with the MC.
+ * @return
+ */
+ String getContainerName();
+
+ /**
+ * An identifier within a deployment.
+ * In case of EJB3 this would be the <code>ejb-name</code>.
+ * @return a name, that can be used to susequently address the service impl.
+ */
+ String getComponentName();
+
+ /**
+ * Web service endpoint implementation class
+ * @return
+ */
+ String getComponentClassName();
+
+ /**
+ * Get a unified meta data view represented by an annotation.
+ *
+ * @param t
+ * @return
+ */
+ <T extends java.lang.annotation.Annotation> T getAnnotation(Class<T> t);
+}
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/WebServiceDeployment.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/WebServiceDeployment.java (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/WebServiceDeployment.java 2011-08-17 09:11:01 UTC (rev 14887)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, 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.webservices.integration;
+
+import java.util.List;
+
+/**
+ * A web service deployment contains {@link WebServiceDeclaration} declarations.
+ *
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public interface WebServiceDeployment
+{
+ List<WebServiceDeclaration> getServiceEndpoints();
+}
Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/config/ServerConfigImpl.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/config/ServerConfigImpl.java 2011-08-17 08:18:10 UTC (rev 14886)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/config/ServerConfigImpl.java 2011-08-17 09:11:01 UTC (rev 14887)
@@ -28,8 +28,8 @@
import javax.management.JMException;
import javax.management.ObjectName;
-import org.jboss.wsf.common.management.AbstractServerConfig;
-import org.jboss.wsf.common.management.AbstractServerConfigMBean;
+import org.jboss.ws.common.management.AbstractServerConfig;
+import org.jboss.ws.common.management.AbstractServerConfigMBean;
/**
* AS specific ServerConfig.
Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/AbstractDescriptorDeployer.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/AbstractDescriptorDeployer.java 2011-08-17 08:18:10 UTC (rev 14886)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/AbstractDescriptorDeployer.java 2011-08-17 09:11:01 UTC (rev 14887)
@@ -23,24 +23,17 @@
import org.jboss.deployers.vfs.spi.deployer.AbstractVFSParsingDeployer;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
-import org.jboss.vfs.VFSInputSource;
import org.jboss.vfs.VirtualFile;
import org.jboss.wsf.spi.metadata.DescriptorParser;
-import org.jboss.wsf.spi.metadata.DescriptorProcessor;
-import org.jboss.xb.binding.ObjectModelFactory;
-import org.jboss.xb.binding.Unmarshaller;
-import org.jboss.xb.binding.UnmarshallerFactory;
-import org.xml.sax.InputSource;
/**
* Abstract descriptor deployer which deploys only if particular DD processor is available.
*
* @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
*/
-abstract class AbstractDescriptorDeployer<P extends DescriptorProcessor<T>, Q extends DescriptorParser<T>, T> extends AbstractVFSParsingDeployer<T>
+abstract class AbstractDescriptorDeployer<P extends DescriptorParser<T>, T> extends AbstractVFSParsingDeployer<T>
{
- private P ddProcessor;
- private Q ddParser;
+ private P ddParser;
AbstractDescriptorDeployer(Class<T> output)
{
@@ -56,35 +49,14 @@
{
return this.ddParser.parse(file.toURL());
}
- else if (this.ddProcessor != null)
- {
- InputSource source = new VFSInputSource(file);
- Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller();
- unmarshaller.setValidation(this.ddProcessor.isValidating());
- ObjectModelFactory factory = this.ddProcessor.getFactory(file.toURL());
- return (T)unmarshaller.unmarshal(source, factory, root);
- }
return null;
}
/**
- * MC incallback method. It will be invoked each time subclass specific DescriptorProcessor bean will be installed.
- */
- @Deprecated
- protected void setProcessor(final P ddProcessor)
- {
- if (this.ddProcessor != null)
- throw new IllegalStateException("Only one " + this.ddProcessor.getClass() + " instance can be installed in MC");
-
- this.ddProcessor = ddProcessor;
- this.setName(this.ddProcessor.getDescriptorName());
- }
-
- /**
* MC incallback method. It will be invoked each time subclass specific DescriptorParser bean will be installed.
*/
- protected void setParser(final Q ddParser)
+ protected void setParser(final P ddParser)
{
if (this.ddParser != null)
throw new IllegalStateException("Only one " + this.ddParser.getClass() + " instance can be installed in MC");
Deleted: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/JMSDescriptorDeployer.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/JMSDescriptorDeployer.java 2011-08-17 08:18:10 UTC (rev 14886)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/JMSDescriptorDeployer.java 2011-08-17 09:11:01 UTC (rev 14887)
@@ -1,63 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2010, 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.webservices.integration.deployers;
-
-import org.jboss.wsf.spi.metadata.jms.JMSDescriptorParser;
-import org.jboss.wsf.spi.metadata.jms.JMSDescriptorProcessor;
-import org.jboss.wsf.spi.metadata.jms.JMSEndpointsMetaData;
-
-/**
- * Stack agnostic JMS descriptor deployer.
- *
- * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
- */
-public final class JMSDescriptorDeployer extends AbstractDescriptorDeployer<JMSDescriptorProcessor, JMSDescriptorParser, JMSEndpointsMetaData>
-{
- /**
- * Constructor.
- */
- public JMSDescriptorDeployer()
- {
- super(JMSEndpointsMetaData.class);
- }
-
- /**
- * MC incallback method. It will be invoked each time JMSDescriptorProcessor bean will be installed.
- * @param processor the processor
- */
- @Override
- @Deprecated
- public void setProcessor(final JMSDescriptorProcessor processor)
- {
- super.setProcessor(processor);
- }
-
- /**
- * MC incallback method. It will be invoked each time JMSDescriptorParser bean will be installed.
- * @param parser the parser
- */
- @Override
- public void setParser(final JMSDescriptorParser parser)
- {
- super.setParser(parser);
- }
-}
Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentAspectDeployer.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentAspectDeployer.java 2011-08-17 08:18:10 UTC (rev 14886)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentAspectDeployer.java 2011-08-17 09:11:01 UTC (rev 14887)
@@ -29,7 +29,7 @@
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
import org.jboss.webservices.integration.util.ASHelper;
-import org.jboss.wsf.common.integration.JMSDeploymentAspect;
+import org.jboss.ws.common.integration.JMSDeploymentAspect;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.DeploymentAspect;
Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WSDescriptorDeployer.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WSDescriptorDeployer.java 2011-08-17 08:18:10 UTC (rev 14886)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WSDescriptorDeployer.java 2011-08-17 09:11:01 UTC (rev 14887)
@@ -22,7 +22,6 @@
package org.jboss.webservices.integration.deployers;
import org.jboss.wsf.spi.metadata.webservices.WebservicesDescriptorParser;
-import org.jboss.wsf.spi.metadata.webservices.WebservicesDescriptorProcessor;
import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData;
/**
@@ -30,7 +29,7 @@
*
* @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
*/
-public final class WSDescriptorDeployer extends AbstractDescriptorDeployer<WebservicesDescriptorProcessor, WebservicesDescriptorParser, WebservicesMetaData>
+public final class WSDescriptorDeployer extends AbstractDescriptorDeployer<WebservicesDescriptorParser, WebservicesMetaData>
{
/**
* Constructor.
@@ -41,17 +40,6 @@
}
/**
- * MC incallback method. It will be invoked each time WebservicesDescriptorProcessor bean will be installed.
- * @param processor the processor
- */
- @Override
- @Deprecated
- public void setProcessor(final WebservicesDescriptorProcessor processor)
- {
- super.setProcessor(processor);
- }
-
- /**
* MC incallback method. It will be invoked each time WebservicesDescriptorParser bean will be installed.
* @param parser the parser
*/
Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WSEJBAdapterDeployer.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WSEJBAdapterDeployer.java 2011-08-17 08:18:10 UTC (rev 14886)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WSEJBAdapterDeployer.java 2011-08-17 09:11:01 UTC (rev 14887)
@@ -38,8 +38,8 @@
import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
import org.jboss.metadata.ejb.jboss.JBossMetaData;
import org.jboss.webservices.integration.util.ASHelper;
-import org.jboss.wsf.spi.deployment.integration.WebServiceDeclaration;
-import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment;
+import org.jboss.webservices.integration.WebServiceDeclaration;
+import org.jboss.webservices.integration.WebServiceDeployment;
import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData;
/**
Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WSTypeDeployer.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WSTypeDeployer.java 2011-08-17 08:18:10 UTC (rev 14886)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WSTypeDeployer.java 2011-08-17 09:11:01 UTC (rev 14887)
@@ -27,8 +27,8 @@
import org.jboss.metadata.ejb.jboss.JBossMetaData;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
import org.jboss.webservices.integration.util.ASHelper;
+import org.jboss.webservices.integration.WebServiceDeployment;
import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
-import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment;
import org.jboss.wsf.spi.metadata.jms.JMSEndpointsMetaData;
import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData;
Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/AbstractDeploymentModelBuilder.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/AbstractDeploymentModelBuilder.java 2011-08-17 08:18:10 UTC (rev 14886)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/AbstractDeploymentModelBuilder.java 2011-08-17 09:11:01 UTC (rev 14887)
@@ -32,7 +32,7 @@
import org.jboss.vfs.VirtualFile;
import org.jboss.webservices.integration.injection.VirtualFileAdaptor;
import org.jboss.webservices.integration.util.ASHelper;
-import org.jboss.wsf.common.ResourceLoaderAdapter;
+import org.jboss.ws.common.ResourceLoaderAdapter;
import org.jboss.wsf.spi.SPIProvider;
import org.jboss.wsf.spi.SPIProviderResolver;
import org.jboss.wsf.spi.deployment.ArchiveDeployment;
Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_EJB21.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_EJB21.java 2011-08-17 08:18:10 UTC (rev 14886)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_EJB21.java 2011-08-17 09:11:01 UTC (rev 14887)
@@ -24,8 +24,8 @@
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
import org.jboss.metadata.ejb.jboss.JBossMetaData;
+import org.jboss.webservices.integration.WebServiceDeployment;
import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment;
import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData;
import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaData;
import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData;
Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_EJB3.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_EJB3.java 2011-08-17 08:18:10 UTC (rev 14886)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_EJB3.java 2011-08-17 09:11:01 UTC (rev 14887)
@@ -26,8 +26,8 @@
import org.jboss.webservices.integration.util.ASHelper;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.spi.deployment.integration.WebServiceDeclaration;
-import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment;
+import org.jboss.webservices.integration.WebServiceDeclaration;
+import org.jboss.webservices.integration.WebServiceDeployment;
/**
* Creates new JAXWS EJB3 deployment.
Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/endpoint/HornetQJMSResolver.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/endpoint/HornetQJMSResolver.java 2011-08-17 08:18:10 UTC (rev 14886)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/endpoint/HornetQJMSResolver.java 2011-08-17 09:11:01 UTC (rev 14887)
@@ -25,7 +25,7 @@
import org.apache.log4j.Logger;
import org.hornetq.jms.client.HornetQDestination;
-import org.jboss.wsf.framework.management.DefaultJMSEndpointResolver;
+import org.jboss.ws.common.management.DefaultJMSEndpointResolver;
/**
* A JMS endpoint resolver meant for working with HornetQ destination implementation
Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/injection/EJBBeanReferenceResolver.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/injection/EJBBeanReferenceResolver.java 2011-08-17 08:18:10 UTC (rev 14886)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/injection/EJBBeanReferenceResolver.java 2011-08-17 09:11:01 UTC (rev 14887)
@@ -29,7 +29,7 @@
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.ejb3.ejbref.resolver.spi.EjbReference;
import org.jboss.ejb3.ejbref.resolver.spi.EjbReferenceResolver;
-import org.jboss.wsf.common.injection.resolvers.AbstractReferenceResolver;
+import org.jboss.ws.common.injection.resolvers.AbstractReferenceResolver;
/**
* EJB reference resolver.
@@ -72,7 +72,7 @@
}
/**
- * @see org.jboss.wsf.common.injection.resolvers.AbstractReferenceResolver#resolveField(java.lang.reflect.Field)
+ * @see org.jboss.ws.common.injection.resolvers.AbstractReferenceResolver#resolveField(java.lang.reflect.Field)
*
* @param field to be resolved
* @return JNDI name of referenced EJB object
@@ -88,7 +88,7 @@
}
/**
- * @see org.jboss.wsf.common.injection.resolvers.AbstractReferenceResolver#resolveMethod(java.lang.reflect.Method)
+ * @see org.jboss.ws.common.injection.resolvers.AbstractReferenceResolver#resolveMethod(java.lang.reflect.Method)
*
* @param method to be resolved
* @return JNDI name of referenced EJB object
Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/injection/InjectionMetaDataDeploymentAspect.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/injection/InjectionMetaDataDeploymentAspect.java 2011-08-17 08:18:10 UTC (rev 14886)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/injection/InjectionMetaDataDeploymentAspect.java 2011-08-17 09:11:01 UTC (rev 14887)
@@ -41,17 +41,17 @@
import org.jboss.metadata.javaee.spec.ResourceInjectionTargetMetaData;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
import org.jboss.webservices.integration.util.ASHelper;
-import org.jboss.wsf.common.injection.resolvers.ResourceReferenceResolver;
-import org.jboss.wsf.common.integration.WSHelper;
+import org.jboss.ws.common.injection.resolvers.ResourceReferenceResolver;
+import org.jboss.ws.common.integration.WSHelper;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.Service;
-import org.jboss.wsf.spi.deployment.integration.WebServiceDeclaration;
-import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment;
+import org.jboss.webservices.integration.WebServiceDeclaration;
+import org.jboss.webservices.integration.WebServiceDeployment;
import org.jboss.wsf.spi.metadata.injection.InjectionMetaData;
import org.jboss.wsf.spi.metadata.injection.InjectionsMetaData;
import org.jboss.wsf.spi.metadata.injection.ReferenceResolver;
-import org.jboss.wsf.common.integration.AbstractDeploymentAspect;
+import org.jboss.ws.common.integration.AbstractDeploymentAspect;
/**
* Deployment aspect that builds injection meta data.
Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/injection/WebServiceContextResourceProvider.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/injection/WebServiceContextResourceProvider.java 2011-08-17 08:18:10 UTC (rev 14886)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/injection/WebServiceContextResourceProvider.java 2011-08-17 09:11:01 UTC (rev 14887)
@@ -29,7 +29,7 @@
import org.jboss.switchboard.javaee.jboss.environment.JBossResourceEnvRefType;
import org.jboss.switchboard.mc.spi.MCBasedResourceProvider;
import org.jboss.switchboard.spi.Resource;
-import org.jboss.wsf.common.injection.ThreadLocalAwareWebServiceContext;
+import org.jboss.ws.common.injection.ThreadLocalAwareWebServiceContext;
/**
* WebServiceContext resource provider.
@@ -74,7 +74,7 @@
{
return this.target;
}
-
+
@Override
public Collection<?> getInvocationDependencies()
{
Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerEJB21.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerEJB21.java 2011-08-17 08:18:10 UTC (rev 14886)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerEJB21.java 2011-08-17 09:11:01 UTC (rev 14887)
@@ -37,9 +37,9 @@
import org.jboss.invocation.InvocationType;
import org.jboss.invocation.PayloadKey;
import org.jboss.mx.util.MBeanServerLocator;
-import org.jboss.wsf.common.ObjectNameFactory;
-import org.jboss.wsf.common.integration.WSHelper;
-import org.jboss.wsf.common.invocation.AbstractInvocationHandler;
+import org.jboss.ws.common.ObjectNameFactory;
+import org.jboss.ws.common.integration.WSHelper;
+import org.jboss.ws.common.invocation.AbstractInvocationHandler;
import org.jboss.wsf.spi.SPIProvider;
import org.jboss.wsf.spi.SPIProviderResolver;
import org.jboss.wsf.spi.deployment.Deployment;
Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerEJB3.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerEJB3.java 2011-08-17 08:18:10 UTC (rev 14886)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerEJB3.java 2011-08-17 09:11:01 UTC (rev 14887)
@@ -34,8 +34,8 @@
import org.jboss.ejb3.EJBContainer;
import org.jboss.ejb3.context.CurrentEJBContext;
import org.jboss.webservices.integration.util.ASHelper;
-import org.jboss.wsf.common.injection.ThreadLocalAwareWebServiceContext;
-import org.jboss.wsf.common.invocation.AbstractInvocationHandler;
+import org.jboss.ws.common.injection.ThreadLocalAwareWebServiceContext;
+import org.jboss.ws.common.invocation.AbstractInvocationHandler;
import org.jboss.wsf.spi.SPIProvider;
import org.jboss.wsf.spi.SPIProviderResolver;
import org.jboss.wsf.spi.deployment.Endpoint;
Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerFactoryImpl.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerFactoryImpl.java 2011-08-17 08:18:10 UTC (rev 14886)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerFactoryImpl.java 2011-08-17 09:11:01 UTC (rev 14887)
@@ -21,8 +21,8 @@
*/
package org.jboss.webservices.integration.invocation;
-import org.jboss.wsf.common.invocation.InvocationHandlerJAXRPC;
-import org.jboss.wsf.common.invocation.InvocationHandlerJAXWS;
+import org.jboss.ws.common.invocation.InvocationHandlerJAXRPC;
+import org.jboss.ws.common.invocation.InvocationHandlerJAXWS;
import org.jboss.wsf.spi.invocation.InvocationHandler;
import org.jboss.wsf.spi.invocation.InvocationHandlerFactory;
import org.jboss.wsf.spi.invocation.InvocationType;
Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerMDB21.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerMDB21.java 2011-08-17 08:18:10 UTC (rev 14886)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerMDB21.java 2011-08-17 09:11:01 UTC (rev 14887)
@@ -21,7 +21,7 @@
*/
package org.jboss.webservices.integration.invocation;
-import org.jboss.wsf.common.invocation.AbstractInvocationHandlerJSE;
+import org.jboss.ws.common.invocation.AbstractInvocationHandlerJSE;
/**
* Handles invocations on MDB EJB21 endpoints.
Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerMDB3.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerMDB3.java 2011-08-17 08:18:10 UTC (rev 14886)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerMDB3.java 2011-08-17 09:11:01 UTC (rev 14887)
@@ -21,7 +21,7 @@
*/
package org.jboss.webservices.integration.invocation;
-import org.jboss.wsf.common.invocation.AbstractInvocationHandlerJSE;
+import org.jboss.ws.common.invocation.AbstractInvocationHandlerJSE;
/**
* Handles invocations on MDB EJB3 endpoints.
Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/AbstractMetaDataBuilderEJB.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/AbstractMetaDataBuilderEJB.java 2011-08-17 08:18:10 UTC (rev 14886)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/AbstractMetaDataBuilderEJB.java 2011-08-17 09:11:01 UTC (rev 14887)
@@ -29,8 +29,8 @@
import org.jboss.metadata.ejb.jboss.JBossMetaData;
import org.jboss.metadata.ejb.jboss.WebservicesMetaData;
import org.jboss.webservices.integration.util.ASHelper;
-import org.jboss.ws.Constants;
-import org.jboss.wsf.common.integration.WSHelper;
+import org.jboss.ws.common.Constants;
+import org.jboss.ws.common.integration.WSHelper;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData;
import org.jboss.wsf.spi.metadata.j2ee.EJBMetaData;
Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/ContainerMetaDataDeploymentAspect.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/ContainerMetaDataDeploymentAspect.java 2011-08-17 08:18:10 UTC (rev 14886)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/ContainerMetaDataDeploymentAspect.java 2011-08-17 09:11:01 UTC (rev 14887)
@@ -21,11 +21,11 @@
*/
package org.jboss.webservices.integration.metadata;
-import org.jboss.wsf.common.integration.WSHelper;
+import org.jboss.ws.common.integration.WSHelper;
+import org.jboss.ws.common.integration.AbstractDeploymentAspect;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData;
import org.jboss.wsf.spi.metadata.j2ee.JSEArchiveMetaData;
-import org.jboss.wsf.common.integration.AbstractDeploymentAspect;
/**
* An aspect that builds container independent meta data.
Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB21.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB21.java 2011-08-17 08:18:10 UTC (rev 14886)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB21.java 2011-08-17 09:11:01 UTC (rev 14887)
@@ -29,7 +29,7 @@
import org.jboss.metadata.ejb.jboss.JBossMetaData;
import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
import org.jboss.metadata.javaee.spec.PortComponent;
-import org.jboss.wsf.common.integration.WSHelper;
+import org.jboss.ws.common.integration.WSHelper;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData;
import org.jboss.wsf.spi.metadata.j2ee.EJBMetaData;
Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB3.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB3.java 2011-08-17 08:18:10 UTC (rev 14886)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB3.java 2011-08-17 09:11:01 UTC (rev 14887)
@@ -27,10 +27,10 @@
import javax.ejb.ActivationConfigProperty;
import javax.ejb.MessageDriven;
-import org.jboss.wsf.common.integration.WSHelper;
+import org.jboss.ws.common.integration.WSHelper;
import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.integration.WebServiceDeclaration;
-import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment;
+import org.jboss.webservices.integration.WebServiceDeclaration;
+import org.jboss.webservices.integration.WebServiceDeployment;
import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData;
import org.jboss.wsf.spi.metadata.j2ee.EJBMetaData;
import org.jboss.wsf.spi.metadata.j2ee.EJBSecurityMetaData;
Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderJSE.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderJSE.java 2011-08-17 08:18:10 UTC (rev 14886)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderJSE.java 2011-08-17 09:11:01 UTC (rev 14887)
@@ -42,8 +42,8 @@
import org.jboss.metadata.web.spec.WebResourceCollectionMetaData;
import org.jboss.metadata.web.spec.WebResourceCollectionsMetaData;
import org.jboss.webservices.integration.util.ASHelper;
-import org.jboss.wsf.common.integration.WSConstants;
-import org.jboss.wsf.common.integration.WSHelper;
+import org.jboss.ws.common.integration.WSConstants;
+import org.jboss.ws.common.integration.WSHelper;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.metadata.j2ee.JSEArchiveMetaData;
import org.jboss.wsf.spi.metadata.j2ee.JSESecurityMetaData;
Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/security/JACCPermissionsDeploymentAspect.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/security/JACCPermissionsDeploymentAspect.java 2011-08-17 08:18:10 UTC (rev 14886)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/security/JACCPermissionsDeploymentAspect.java 2011-08-17 09:11:01 UTC (rev 14887)
@@ -26,9 +26,9 @@
import org.jboss.metadata.web.jboss.JBossWebMetaData;
import org.jboss.web.WebPermissionMapping;
-import org.jboss.wsf.common.integration.WSHelper;
+import org.jboss.ws.common.integration.WSHelper;
+import org.jboss.ws.common.integration.AbstractDeploymentAspect;
import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.common.integration.AbstractDeploymentAspect;
/**
* Generates JACC permissions. (This is temporary and really hacky solution).
Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/AbstractSecurityMetaDataAccessorEJB.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/AbstractSecurityMetaDataAccessorEJB.java 2011-08-17 08:18:10 UTC (rev 14886)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/AbstractSecurityMetaDataAccessorEJB.java 2011-08-17 09:11:01 UTC (rev 14887)
@@ -21,7 +21,7 @@
*/
package org.jboss.webservices.integration.tomcat;
-import org.jboss.wsf.common.integration.WSHelper;
+import org.jboss.ws.common.integration.WSHelper;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData;
Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/SecurityMetaDataAccessorEJB21.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/SecurityMetaDataAccessorEJB21.java 2011-08-17 08:18:10 UTC (rev 14886)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/SecurityMetaDataAccessorEJB21.java 2011-08-17 09:11:01 UTC (rev 14887)
@@ -24,7 +24,7 @@
import org.jboss.metadata.common.ejb.IAssemblyDescriptorMetaData;
import org.jboss.metadata.ejb.jboss.JBossMetaData;
import org.jboss.metadata.javaee.spec.SecurityRolesMetaData;
-import org.jboss.wsf.common.integration.WSHelper;
+import org.jboss.ws.common.integration.WSHelper;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData;
Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/SecurityMetaDataAccessorEJB3.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/SecurityMetaDataAccessorEJB3.java 2011-08-17 08:18:10 UTC (rev 14886)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/SecurityMetaDataAccessorEJB3.java 2011-08-17 09:11:01 UTC (rev 14887)
@@ -28,12 +28,12 @@
import org.jboss.ejb3.annotation.SecurityDomain;
import org.jboss.metadata.javaee.spec.SecurityRoleMetaData;
import org.jboss.metadata.javaee.spec.SecurityRolesMetaData;
-import org.jboss.wsf.common.integration.WSHelper;
-import org.jboss.wsf.spi.annotation.WebContext;
+import org.jboss.ws.common.integration.WSHelper;
+import org.jboss.ws.api.annotation.WebContext;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.spi.deployment.integration.WebServiceDeclaration;
-import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment;
+import org.jboss.webservices.integration.WebServiceDeclaration;
+import org.jboss.webservices.integration.WebServiceDeployment;
/**
* Creates web app security meta data for EJB 3 deployment.
Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreatingDeploymentAspect.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreatingDeploymentAspect.java 2011-08-17 08:18:10 UTC (rev 14886)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreatingDeploymentAspect.java 2011-08-17 09:11:01 UTC (rev 14887)
@@ -21,9 +21,9 @@
*/
package org.jboss.webservices.integration.tomcat;
-import org.jboss.wsf.common.integration.WSHelper;
+import org.jboss.ws.common.integration.WSHelper;
+import org.jboss.ws.common.integration.AbstractDeploymentAspect;
import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.common.integration.AbstractDeploymentAspect;
/**
* A deployment aspect that generates web app meta data for EJB endpoints.
Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreator.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreator.java 2011-08-17 08:18:10 UTC (rev 14886)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreator.java 2011-08-17 09:11:01 UTC (rev 14887)
@@ -34,9 +34,10 @@
import org.jboss.metadata.web.spec.WebResourceCollectionsMetaData;
import org.jboss.webservices.integration.util.ASHelper;
import org.jboss.webservices.integration.util.WebMetaDataHelper;
-import org.jboss.wsf.common.integration.WSHelper;
+import org.jboss.ws.common.integration.WSHelper;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.deployment.HttpEndpoint;
/**
* Creator of web app meta data for EJB endpoints.
@@ -189,7 +190,7 @@
for (final Endpoint ep : dep.getService().getEndpoints())
{
final String endpointName = ep.getShortName();
- final List<String> urlPatterns = WebMetaDataHelper.getUrlPatterns(ep.getURLPattern());
+ final List<String> urlPatterns = WebMetaDataHelper.getUrlPatterns(((HttpEndpoint)ep).getURLPattern());
this.log.debug("Servlet name: " + endpointName + ", URL patterns: " + urlPatterns);
WebMetaDataHelper.newServletMapping(endpointName, urlPatterns, servletMappings);
@@ -245,7 +246,7 @@
final WebResourceCollectionsMetaData webResourceCollections = WebMetaDataHelper
.getWebResourceCollections(securityConstraint);
final String endpointName = ejbEndpoint.getShortName();
- final String urlPattern = ejbEndpoint.getURLPattern();
+ final String urlPattern = ((HttpEndpoint)ejbEndpoint).getURLPattern();
this.log.debug("Creating web resource collection for endpoint: " + endpointName + ", URL pattern: "
+ urlPattern);
WebMetaDataHelper.newWebResourceCollection(endpointName, urlPattern, secureWsdlAccess,
Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifier.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifier.java 2011-08-17 08:18:10 UTC (rev 14886)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifier.java 2011-08-17 09:11:01 UTC (rev 14887)
@@ -29,11 +29,10 @@
import org.jboss.metadata.web.spec.ServletMetaData;
import org.jboss.webservices.integration.util.ASHelper;
import org.jboss.webservices.integration.util.WebMetaDataHelper;
-import org.jboss.wsf.common.integration.WSConstants;
-import org.jboss.wsf.common.integration.WSHelper;
+import org.jboss.ws.common.integration.WSConstants;
+import org.jboss.ws.common.integration.WSHelper;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.spi.deployment.ServletClassProvider;
/**
* The modifier of jboss web meta data.
@@ -121,31 +120,13 @@
*/
private String getTransportClassName(final Deployment dep)
{
- String transportClassName = null;
- String transportClassProviderName = (String) dep.getProperty(WSConstants.STACK_TRANSPORT_CLASS_PROVIDER);
- if (transportClassProviderName != null)
- {
- try
- {
- ServletClassProvider scp = (ServletClassProvider)(Class.forName(transportClassProviderName).newInstance());
- transportClassName = scp.getServletClassName();
- }
- catch (Exception e)
- {
- log.warn("Cannot get transport class name from " + WSConstants.STACK_TRANSPORT_CLASS_PROVIDER, e);
- }
- }
+ String transportClassName = (String) dep.getProperty(WSConstants.STACK_TRANSPORT_CLASS);
if (transportClassName == null)
{
- transportClassName = (String) dep.getProperty(WSConstants.STACK_TRANSPORT_CLASS);
+ throw new IllegalStateException("Cannot obtain deployment property:" + WSConstants.STACK_TRANSPORT_CLASS);
}
- if (transportClassName == null)
- {
- throw new IllegalStateException("Cannot obtain deployment property : " + WSConstants.STACK_TRANSPORT_CLASS);
- }
-
return transportClassName;
}
}
Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifyingDeploymentAspect.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifyingDeploymentAspect.java 2011-08-17 08:18:10 UTC (rev 14886)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifyingDeploymentAspect.java 2011-08-17 09:11:01 UTC (rev 14887)
@@ -22,7 +22,7 @@
package org.jboss.webservices.integration.tomcat;
import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.common.integration.AbstractDeploymentAspect;
+import org.jboss.ws.common.integration.AbstractDeploymentAspect;
/**
* Modifies web meta data to configure webservice stack endpoints and properties.
Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/util/ASHelper.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/util/ASHelper.java 2011-08-17 08:18:10 UTC (rev 14886)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/util/ASHelper.java 2011-08-17 09:11:01 UTC (rev 14887)
@@ -37,8 +37,8 @@
import org.jboss.metadata.web.jboss.JBossWebMetaData;
import org.jboss.metadata.web.spec.ServletMetaData;
import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
-import org.jboss.wsf.spi.deployment.integration.WebServiceDeclaration;
-import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment;
+import org.jboss.webservices.integration.WebServiceDeclaration;
+import org.jboss.webservices.integration.WebServiceDeployment;
/**
* JBoss AS integration helper class.
Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/weld/WeldDeploymentAspect.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/weld/WeldDeploymentAspect.java 2011-08-17 08:18:10 UTC (rev 14886)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/weld/WeldDeploymentAspect.java 2011-08-17 09:11:01 UTC (rev 14887)
@@ -23,8 +23,8 @@
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.weld.integration.deployer.DeployersUtils;
-import org.jboss.wsf.common.integration.AbstractDeploymentAspect;
-import org.jboss.wsf.common.integration.WSHelper;
+import org.jboss.ws.common.integration.AbstractDeploymentAspect;
+import org.jboss.ws.common.integration.WSHelper;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Endpoint;
Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/weld/WeldInvocationHandler.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/weld/WeldInvocationHandler.java 2011-08-17 08:18:10 UTC (rev 14886)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/weld/WeldInvocationHandler.java 2011-08-17 09:11:01 UTC (rev 14887)
@@ -26,7 +26,7 @@
import org.jboss.weld.integration.injection.NonContextualObjectInjectionHelper;
import org.jboss.weld.manager.api.WeldManager;
-import org.jboss.wsf.common.invocation.AbstractInvocationHandlerJSE;
+import org.jboss.ws.common.invocation.AbstractInvocationHandlerJSE;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.invocation.Invocation;
import org.jboss.wsf.spi.invocation.InvocationHandler;
13 years, 4 months
- 1
- 0
JBossWS SVN: r14886 - in container/jboss60/branches: jbossws-jboss610 and 29 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-08-17 04:18:10 -0400 (Wed, 17 Aug 2011)
New Revision: 14886
Added:
container/jboss60/branches/jbossws-jboss610/
container/jboss60/branches/jbossws-jboss610/.gitignore
container/jboss60/branches/jbossws-jboss610/README-COMMITTERS
container/jboss60/branches/jbossws-jboss610/eclipse/
container/jboss60/branches/jbossws-jboss610/eclipse/jboss-format.xml
container/jboss60/branches/jbossws-jboss610/eclipse/jboss-style.xml
container/jboss60/branches/jbossws-jboss610/pom.xml
container/jboss60/branches/jbossws-jboss610/src/
container/jboss60/branches/jbossws-jboss610/src/main/
container/jboss60/branches/jbossws-jboss610/src/main/java/
container/jboss60/branches/jbossws-jboss610/src/main/java/org/
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/config/
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/config/ServerConfigFactoryImpl.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/config/ServerConfigImpl.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/AbstractDescriptorDeployer.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCAppClientClassPathDeployer.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCClientClassPathDeployer.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCEjbClientClassPathDeployer.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCIntegrationClassPathDeployer.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCServerClassPathDeployer.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCServletClientClassPathDeployer.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/JMSDescriptorDeployer.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/SecurityActions.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WSAspectizedDeployersFactory.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentAspectDeployer.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentDeployer.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WSDescriptorDeployer.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WSEJBAdapterDeployer.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WSTypeDeployer.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/AbstractDeploymentModelBuilder.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilder.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_EJB21.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_JSE.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_EJB3.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_JMS.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_JSE.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/WSDeploymentBuilder.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/WSVirtualFileFilter.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/endpoint/
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/endpoint/HornetQJMSResolver.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/injection/
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/injection/EJBBeanReferenceResolver.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/injection/InjectionMetaDataDeploymentAspect.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/injection/ServiceRefResourceProvider.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/injection/VirtualFileAdaptor.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/injection/WebServiceContextResourceProvider.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerEJB21.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerEJB3.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerFactoryImpl.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerMDB21.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerMDB3.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/ServiceEndpointInterceptorEJB21.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/ioc/
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/ioc/IoCContainerProxyFactoryImpl.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/ioc/IoCContainerProxyImpl.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/AbstractMetaDataBuilderEJB.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/ContainerMetaDataDeploymentAspect.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB21.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB3.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderJSE.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/PublishLocationAdapterImpl.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/security/
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/security/JACCPermissionsDeploymentAspect.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/security/JaasSecurityDomainAdaptorImpl.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/security/JaasSecurityDomainAdaptorResolverImpl.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/security/SecurityAdapterFactoryImpl.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/security/SecurityAdapterImpl.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/AbstractSecurityMetaDataAccessorEJB.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/SecurityMetaDataAccessorEJB.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/SecurityMetaDataAccessorEJB21.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/SecurityMetaDataAccessorEJB3.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreatingDeploymentAspect.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreator.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifier.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifyingDeploymentAspect.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/util/
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/util/ASHelper.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/util/WebMetaDataHelper.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/weld/
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/weld/WeldDeploymentAspect.java
container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/weld/WeldInvocationHandler.java
container/jboss60/branches/jbossws-jboss610/src/main/resources/
container/jboss60/branches/jbossws-jboss610/src/main/resources/jbossws-jaxrpc-jboss.deployer/
container/jboss60/branches/jbossws-jboss610/src/main/resources/jbossws-jaxrpc-jboss.deployer/META-INF/
container/jboss60/branches/jbossws-jboss610/src/main/resources/jbossws-jaxrpc-jboss.deployer/META-INF/jboss-classloading.xml
container/jboss60/branches/jbossws-jboss610/src/main/resources/jbossws-jaxrpc-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml
container/jboss60/branches/jbossws-jboss610/src/main/resources/jbossws-jboss.deployer/
container/jboss60/branches/jbossws-jboss610/src/main/resources/jbossws-jboss.deployer/META-INF/
container/jboss60/branches/jbossws-jboss610/src/main/resources/jbossws-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml
container/jboss60/branches/jbossws-jboss610/src/main/resources/jbossws-jboss.jar/
container/jboss60/branches/jbossws-jboss610/src/main/resources/jbossws-jboss.jar/META-INF/
container/jboss60/branches/jbossws-jboss610/src/main/resources/jbossws-jboss.jar/META-INF/services/
container/jboss60/branches/jbossws-jboss610/src/main/resources/jbossws-jboss.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentModelFactory
container/jboss60/branches/jbossws-jboss610/src/main/resources/jbossws-jboss.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory
container/jboss60/branches/jbossws-jboss610/src/main/resources/jbossws-jboss.jar/META-INF/services/org.jboss.wsf.spi.invocation.SecurityAdaptorFactory
container/jboss60/branches/jbossws-jboss610/src/main/resources/jbossws-jboss.jar/META-INF/services/org.jboss.wsf.spi.ioc.IoCContainerProxyFactory
container/jboss60/branches/jbossws-jboss610/src/main/resources/jbossws-jboss.jar/META-INF/services/org.jboss.wsf.spi.management.JMSEndpointResolver
container/jboss60/branches/jbossws-jboss610/src/main/resources/jbossws-jboss.jar/META-INF/services/org.jboss.wsf.spi.management.ServerConfigFactory
container/jboss60/branches/jbossws-jboss610/src/main/resources/jbossws-jboss.jar/META-INF/services/org.jboss.wsf.spi.security.JAASSecurityDomainAdaptorResolver
container/jboss60/branches/jbossws-jboss610/src/main/scripts/
container/jboss60/branches/jbossws-jboss610/src/main/scripts/assembly-resources.xml
Log:
importing sources from AS 6.1.0.Final
Added: container/jboss60/branches/jbossws-jboss610/.gitignore
===================================================================
--- container/jboss60/branches/jbossws-jboss610/.gitignore (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/.gitignore 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1,4 @@
+
+# /
+/.settings
+/target
Added: container/jboss60/branches/jbossws-jboss610/README-COMMITTERS
===================================================================
--- container/jboss60/branches/jbossws-jboss610/README-COMMITTERS (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/README-COMMITTERS 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1,4 @@
+ * If you are using Eclipse then set your code style to eclipse/jboss-style.xml.
+ * If you are using Eclipse then set your check style to eclipse/jboss-format.xml.
+ * According to http://community.jboss.org/wiki/CopyrightOwnershipandLicenses
+ ensure you're putting correct license headers to Java and XML files.
Added: container/jboss60/branches/jbossws-jboss610/eclipse/jboss-format.xml
===================================================================
--- container/jboss60/branches/jbossws-jboss610/eclipse/jboss-format.xml (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/eclipse/jboss-format.xml 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Downloaded JBoss Eclipse Format from http://docs.jboss.org/process-guide/en/html/coding.html -->
+<profiles version="6">
+<profile name="JBoss" version="6">
+<setting id="comment_clear_blank_lines" value="false"/>
+<setting id="comment_format_comments" value="false"/>
+<setting id="comment_format_header" value="false"/>
+<setting id="comment_format_html" value="true"/>
+<setting id="comment_format_source_code" value="true"/>
+<setting id="comment_indent_parameter_description" value="true"/>
+<setting id="comment_indent_root_tags" value="true"/>
+<setting id="comment_line_length" value="80"/>
+<setting id="comment_new_line_for_parameter" value="true"/>
+<setting id="comment_separate_root_tags" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="52"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="48"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="64"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="64"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="next_line"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="next_line"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="next_line"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="next_line"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="next_line"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="next_line"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="next_line"/>
+<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
+<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
+<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="120"/>
+<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/>
+<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="3"/>
+</profile>
+</profiles>
Added: container/jboss60/branches/jbossws-jboss610/eclipse/jboss-style.xml
===================================================================
--- container/jboss60/branches/jbossws-jboss610/eclipse/jboss-style.xml (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/eclipse/jboss-style.xml 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ This configuration file was written by the eclipse-cs plugin configuration editor
+-->
+<!--
+ Checkstyle-Configuration: jboss-checkstyle
+ Description: none
+-->
+<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.2//EN" "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
+<module name="Checker">
+ <property name="severity" value="warning"/>
+ <module name="TreeWalker">
+ <module name="ModifierOrder"/>
+ <module name="RedundantModifier"/>
+ <module name="AnonInnerLength"/>
+ <module name="ExecutableStatementCount">
+ <property name="max" value="60"/>
+ <property name="tokens" value="INSTANCE_INIT,STATIC_INIT,METHOD_DEF,CTOR_DEF"/>
+ </module>
+ <module name="LineLength">
+ <property name="max" value="168"/>
+ <property name="tabWidth" value="3"/>
+ </module>
+ <module name="MethodLength"/>
+ <module name="ParameterNumber"/>
+ <module name="AvoidStarImport"/>
+ <module name="IllegalImport"/>
+ <module name="ImportOrder"/>
+ <module name="RedundantImport"/>
+ <module name="UnusedImports"/>
+ <module name="AbstractClassName"/>
+ <module name="ConstantName"/>
+ <module name="LocalFinalVariableName"/>
+ <module name="LocalVariableName"/>
+ <module name="MemberName"/>
+ <module name="MethodName"/>
+ <module name="PackageName"/>
+ <module name="ParameterName"/>
+ <module name="StaticVariableName"/>
+ <module name="TypeName"/>
+ <module name="CovariantEquals"/>
+ <module name="DefaultComesLast"/>
+ <module name="DeclarationOrder"/>
+ <module name="DoubleCheckedLocking"/>
+ <module name="EqualsHashCode"/>
+ <module name="ExplicitInitialization"/>
+ <module name="FallThrough"/>
+ <module name="FinalLocalVariable"/>
+ <module name="IllegalInstantiation"/>
+ <module name="IllegalType">
+ <property name="tokens" value="METHOD_DEF,PARAMETER_DEF"/>
+ </module>
+ <module name="InnerAssignment"/>
+ <module name="MagicNumber">
+ <property name="ignoreNumbers" value="-1, 0, 1"/>
+ </module>
+ <module name="MissingCtor"/>
+ <module name="MissingSwitchDefault"/>
+ <module name="ModifiedControlVariable"/>
+ <module name="MultipleStringLiterals"/>
+ <module name="MultipleVariableDeclarations"/>
+ <module name="NestedIfDepth"/>
+ <module name="NestedTryDepth"/>
+ <module name="PackageDeclaration"/>
+ <module name="ParameterAssignment"/>
+ <module name="RedundantThrows">
+ <property name="logLoadErrors" value="true"/>
+ <property name="suppressLoadErrors" value="true"/>
+ </module>
+ <module name="RequireThis"/>
+ <module name="ReturnCount">
+ <property name="max" value="5"/>
+ </module>
+ <module name="SimplifyBooleanExpression"/>
+ <module name="SimplifyBooleanReturn"/>
+ <module name="StringLiteralEquality"/>
+ <module name="SuperClone"/>
+ <module name="SuperFinalize"/>
+ <module name="ArrayTrailingComma"/>
+ <module name="UnnecessaryParentheses"/>
+ <module name="DesignForExtension"/>
+ <module name="FinalClass"/>
+ <module name="HideUtilityClassConstructor"/>
+ <module name="InterfaceIsType"/>
+ <module name="ThrowsCount"/>
+ <module name="VisibilityModifier"/>
+ <module name="MutableException"/>
+ <module name="EmptyBlock"/>
+ <module name="LeftCurly">
+ <property name="option" value="nl"/>
+ <property name="maxLineLength" value="120"/>
+ </module>
+ <module name="RightCurly">
+ <property name="option" value="alone"/>
+ </module>
+ <module name="EmptyForInitializerPad">
+ <property name="option" value="space"/>
+ </module>
+ <module name="EmptyForIteratorPad">
+ <property name="option" value="space"/>
+ </module>
+ <module name="NoWhitespaceAfter"/>
+ <module name="NoWhitespaceBefore"/>
+ <module name="OperatorWrap">
+ <property name="option" value="eol"/>
+ <property name="tokens" value="ASSIGN,BAND,BAND_ASSIGN,BOR,BOR_ASSIGN,BSR,BSR_ASSIGN,BXOR,BXOR_ASSIGN,DIV,DIV_ASSIGN,EQUAL,GE,GT,LAND,LE,LITERAL_INSTANCEOF,LOR,LT,MINUS,MINUS_ASSIGN,MOD,MOD_ASSIGN,NOT_EQUAL,PLUS,PLUS_ASSIGN,SL,SL_ASSIGN,SR,SR_ASSIGN,STAR,STAR_ASSIGN"/>
+ </module>
+ <module name="MethodParamPad">
+ <property name="allowLineBreaks" value="true"/>
+ </module>
+ <module name="TabCharacter"/>
+ <module name="TypecastParenPad">
+ <property name="tokens" value="RPAREN,TYPECAST"/>
+ </module>
+ <module name="WhitespaceAround">
+ <property name="tokens" value="ASSIGN,BAND,BAND_ASSIGN,BOR,BOR_ASSIGN,BSR,BSR_ASSIGN,BXOR,BXOR_ASSIGN,DIV,DIV_ASSIGN,EQUAL,GE,GT,LAND,LE,LITERAL_ASSERT,LITERAL_CATCH,LITERAL_DO,LITERAL_ELSE,LITERAL_FINALLY,LITERAL_FOR,LITERAL_IF,LITERAL_RETURN,LITERAL_SYNCHRONIZED,LITERAL_TRY,LITERAL_WHILE,LOR,LT,MINUS,MINUS_ASSIGN,MOD,MOD_ASSIGN,NOT_EQUAL,PLUS,PLUS_ASSIGN,SL,SLIST,SL_ASSIGN,SR,SR_ASSIGN,STAR,STAR_ASSIGN,LITERAL_ASSERT,TYPE_EXTENSION_AND"/>
+ </module>
+ <module name="NeedBraces"/>
+ <module name="WhitespaceAfter">
+ <property name="tokens" value="COMMA,SEMI"/>
+ </module>
+ <module name="BooleanExpressionComplexity"/>
+ <module name="ClassDataAbstractionCoupling"/>
+ <module name="ClassFanOutComplexity"/>
+ <module name="CyclomaticComplexity"/>
+ <module name="JavaNCSS"/>
+ <module name="NPathComplexity"/>
+ <module name="UncommentedMain"/>
+ <module name="TodoComment"/>
+ <module name="TrailingComment"/>
+ <module name="Indentation">
+ <property name="basicOffset" value="3"/>
+ <property name="caseIndent" value="3"/>
+ </module>
+ <module name="FinalParameters"/>
+ <module name="ArrayTypeStyle"/>
+ <module name="JavadocMethod">
+ <property name="allowUndeclaredRTE" value="true"/>
+ <property name="logLoadErrors" value="true"/>
+ </module>
+ <module name="JavadocStyle"/>
+ <module name="JavadocType"/>
+ <module name="JavadocVariable"/>
+ <module name="WriteTag"/>
+ <module name="SuperFinalize"/>
+ </module>
+ <module name="NewlineAtEndOfFile"/>
+</module>
Added: container/jboss60/branches/jbossws-jboss610/pom.xml
===================================================================
--- container/jboss60/branches/jbossws-jboss610/pom.xml (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/pom.xml 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1,314 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <name>JBoss Web Services - Container JBoss-6.1.0.Final</name>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss610</artifactId>
+ <description>JBossWS Container integration for JBoss AS 6.1.0.Final</description>
+
+ <version>4.0.0-SNAPSHOT</version>
+
+ <!-- Parent -->
+ <parent>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-parent</artifactId>
+ <version>1.0.10-SNAPSHOT</version>
+ </parent>
+
+ <!-- Source Control Management -->
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/container/jboss60/branches...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/container/jboss60/branches/jb...</developerConnection>
+ <url>http://fisheye.jboss.com/viewrep/JBossWS/container/jboss60/branches/jboss...</url>
+ </scm>
+
+ <!-- Properties -->
+ <properties>
+ <jbossws.common.version>2.0.0-SNAPSHOT</jbossws.common.version>
+ <jbossws.spi.version>2.0.0-SNAPSHOT</jbossws.spi.version>
+ <jboss.version>6.1.0.Final</jboss.version>
+ <jboss.deployers.version>2.2.2.GA</jboss.deployers.version>
+ <jboss.jbossxb.version>2.0.3.GA</jboss.jbossxb.version>
+ <jboss.metadata.version>2.0.0.Alpha25</jboss.metadata.version>
+ <jboss.reflect.version>2.2.1.SP1</jboss.reflect.version>
+ <jboss.picketbox.version>3.0.0.CR2</jboss.picketbox.version>
+ <jboss.vfs.version>3.0.1.GA</jboss.vfs.version>
+ <jboss.cl.version>2.2.1.GA</jboss.cl.version>
+ <jboss.weld.version>1.1.2.Final</jboss.weld.version>
+ <jboss.hornetq.version>2.2.5.Final</jboss.hornetq.version>
+ <jboss.jaxws.api.version>1.0.0.Final</jboss.jaxws.api.version>
+ </properties>
+
+ <!-- DependencyManagement -->
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.spec.javax.xml.ws</groupId>
+ <artifactId>jboss-jaxws-api_2.2_spec</artifactId>
+ <version>${jboss.jaxws.api.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-common</artifactId>
+ <version>${jbossws.common.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-spi</artifactId>
+ <version>${jbossws.spi.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.cl</groupId>
+ <artifactId>jboss-classloading</artifactId>
+ <version>${jboss.cl.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-reflect</artifactId>
+ <version>${jboss.reflect.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-vfs</artifactId>
+ <version>${jboss.vfs.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossxb</artifactId>
+ <version>${jboss.jbossxb.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-structure-spi</artifactId>
+ <version>${jboss.deployers.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ejb3.depchain</groupId>
+ <artifactId>jboss-ejb3-depchain-as6</artifactId>
+ <version>1.0.0-alpha-43</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-server</artifactId>
+ <version>${jboss.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-system-jmx</artifactId>
+ <version>${jboss.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata-common</artifactId>
+ <version>${jboss.metadata.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-jaxws</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-jaxrpc</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.picketbox</groupId>
+ <artifactId>jboss-security-spi</artifactId>
+ <version>${jboss.picketbox.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-jms-client</artifactId>
+ <version>${jboss.hornetq.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-jms</artifactId>
+ <version>${jboss.hornetq.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>weld-int-deployer</artifactId>
+ <version>${jboss.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.ws.native</groupId>
+ <artifactId>jbossws-native-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-spi</artifactId>
+ <version>${jboss.weld.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <!-- Dependencies -->
+ <dependencies>
+
+ <!-- jbossws dependencies -->
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-spi</artifactId>
+ </dependency>
+
+ <!-- jboss provided dependencies -->
+ <dependency>
+ <groupId>org.jboss.spec.javax.xml.ws</groupId>
+ <artifactId>jboss-jaxws-api_2.2_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.jws</groupId>
+ <artifactId>jsr181-api</artifactId>
+ <version>1.0-MR1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-server</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-system-jmx</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-structure-spi</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.picketbox</groupId>
+ <artifactId>jboss-security-spi</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>weld-int-deployer</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-spi</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- transitive dependencies -->
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-vfs</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.cl</groupId>
+ <artifactId>jboss-classloading</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-reflect</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossxb</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-jms-client</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-jms</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata-common</artifactId>
+ </dependency>
+ </dependencies>
+
+ <!-- Plugins -->
+ <build>
+ <resources>
+ <resource>
+ <targetPath>../etc</targetPath>
+ <directory>src/main/etc</directory>
+ <filtering>true</filtering>
+ </resource>
+ <resource>
+ <directory>src/main/resources/jbossws-jboss.jar</directory>
+ </resource>
+ <resource>
+ <directory>src/main/java</directory>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <compilerArguments>
+ <endorseddirs>${project.build.directory}/endorsed</endorseddirs>
+ </compilerArguments>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.jboss.spec.javax.xml.ws</groupId>
+ <artifactId>jboss-jaxws-api_2.2_spec</artifactId>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>${project.build.directory}/endorsed</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/scripts/assembly-resources.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/config/ServerConfigFactoryImpl.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/config/ServerConfigFactoryImpl.java (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/config/ServerConfigFactoryImpl.java 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1,63 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.webservices.integration.config;
+
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
+import org.jboss.wsf.spi.ioc.IoCContainerProxy;
+import org.jboss.wsf.spi.ioc.IoCContainerProxyFactory;
+import org.jboss.wsf.spi.management.ServerConfig;
+import org.jboss.wsf.spi.management.ServerConfigFactory;
+
+/**
+ * Retrieves webservices stack specific config from MC kernel.
+ *
+ * @author <a href="mailto:hbraun@redhat.com">Heiko Braun</a>
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+public final class ServerConfigFactoryImpl extends ServerConfigFactory
+{
+ /** The bean name in the kernel registry. */
+ private static final String BEAN_NAME = "WSServerConfig";
+
+ /**
+ * Constructor.
+ */
+ public ServerConfigFactoryImpl()
+ {
+ super();
+ }
+
+ /**
+ * Returns config registered in MC kernel.
+ *
+ * @return config
+ */
+ public ServerConfig getServerConfig()
+ {
+ final SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ final IoCContainerProxyFactory iocContainerFactory = spiProvider.getSPI(IoCContainerProxyFactory.class);
+ final IoCContainerProxy iocContainer = iocContainerFactory.getContainer();
+
+ return iocContainer.getBean(ServerConfigFactoryImpl.BEAN_NAME, ServerConfig.class);
+ }
+}
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/config/ServerConfigImpl.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/config/ServerConfigImpl.java (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/config/ServerConfigImpl.java 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1,116 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.webservices.integration.config;
+
+import java.io.File;
+import java.net.URISyntaxException;
+import java.net.URL;
+
+import javax.management.JMException;
+import javax.management.ObjectName;
+
+import org.jboss.wsf.common.management.AbstractServerConfig;
+import org.jboss.wsf.common.management.AbstractServerConfigMBean;
+
+/**
+ * AS specific ServerConfig.
+ *
+ * @author <a href="mailto:asoldano@redhat.com">Alessio Soldano</a>
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ * @author <a href="mailto:tdiesler@redhat.com">Thomas Diesler</a>
+ */
+public final class ServerConfigImpl extends AbstractServerConfig implements AbstractServerConfigMBean
+{
+ /**
+ * Constructor.
+ */
+ public ServerConfigImpl()
+ {
+ super();
+ }
+
+ /**
+ * Gets server temp directory.
+ *
+ * @return temp directory
+ */
+ public File getServerTempDir()
+ {
+ return this.getDirFromServerConfig("ServerTempLocation");
+ }
+
+ /**
+ * Gets server home directory.
+ *
+ * @return home directory
+ */
+ public File getHomeDir()
+ {
+ return this.getDirFromServerConfig("JBossHome");
+ }
+
+ /**
+ * Gets server data directory.
+ *
+ * @return data directory
+ */
+ public File getServerDataDir()
+ {
+ return this.getDirFromServerConfig("ServerDataLocation");
+ }
+
+ /**
+ * Obtains the requested directory from the server configuration.
+ *
+ * @param attributeName directory attribute name
+ * @return requested directory
+ */
+ private File getDirFromServerConfig(final String attributeName)
+ {
+ // Define the ON to invoke upon
+ final ObjectName on = OBJECT_NAME_SERVER_CONFIG;
+
+ // Get the URL location
+ URL location = null;
+ try
+ {
+ location = (URL) this.getMbeanServer().getAttribute(on, attributeName);
+ }
+ catch (final JMException e)
+ {
+ throw new RuntimeException("Could not obtain attribute " + attributeName + " from " + on, e);
+ }
+
+ // Represent as a File
+ File dir = null;
+ try
+ {
+ dir = new File(location.toURI());
+ }
+ catch (final URISyntaxException urise)
+ {
+ throw new RuntimeException("Could not desired directory from URL: " + location, urise);
+ }
+
+ return dir;
+ }
+}
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/AbstractDescriptorDeployer.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/AbstractDescriptorDeployer.java (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/AbstractDescriptorDeployer.java 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1,96 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, 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.webservices.integration.deployers;
+
+import org.jboss.deployers.vfs.spi.deployer.AbstractVFSParsingDeployer;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.vfs.VFSInputSource;
+import org.jboss.vfs.VirtualFile;
+import org.jboss.wsf.spi.metadata.DescriptorParser;
+import org.jboss.wsf.spi.metadata.DescriptorProcessor;
+import org.jboss.xb.binding.ObjectModelFactory;
+import org.jboss.xb.binding.Unmarshaller;
+import org.jboss.xb.binding.UnmarshallerFactory;
+import org.xml.sax.InputSource;
+
+/**
+ * Abstract descriptor deployer which deploys only if particular DD processor is available.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+abstract class AbstractDescriptorDeployer<P extends DescriptorProcessor<T>, Q extends DescriptorParser<T>, T> extends AbstractVFSParsingDeployer<T>
+{
+ private P ddProcessor;
+ private Q ddParser;
+
+ AbstractDescriptorDeployer(Class<T> output)
+ {
+ super(output);
+ this.setName("UNSPECIFIED");
+ }
+
+ @SuppressWarnings({"deprecation", "unchecked"})
+ @Override
+ protected T parse(final VFSDeploymentUnit unit, final VirtualFile file, final T root) throws Exception
+ {
+ if (this.ddParser != null) //default to using new parsers if available
+ {
+ return this.ddParser.parse(file.toURL());
+ }
+ else if (this.ddProcessor != null)
+ {
+ InputSource source = new VFSInputSource(file);
+ Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller();
+ unmarshaller.setValidation(this.ddProcessor.isValidating());
+ ObjectModelFactory factory = this.ddProcessor.getFactory(file.toURL());
+ return (T)unmarshaller.unmarshal(source, factory, root);
+ }
+
+ return null;
+ }
+
+ /**
+ * MC incallback method. It will be invoked each time subclass specific DescriptorProcessor bean will be installed.
+ */
+ @Deprecated
+ protected void setProcessor(final P ddProcessor)
+ {
+ if (this.ddProcessor != null)
+ throw new IllegalStateException("Only one " + this.ddProcessor.getClass() + " instance can be installed in MC");
+
+ this.ddProcessor = ddProcessor;
+ this.setName(this.ddProcessor.getDescriptorName());
+ }
+
+ /**
+ * MC incallback method. It will be invoked each time subclass specific DescriptorParser bean will be installed.
+ */
+ protected void setParser(final Q ddParser)
+ {
+ if (this.ddParser != null)
+ throw new IllegalStateException("Only one " + this.ddParser.getClass() + " instance can be installed in MC");
+
+ this.ddParser = ddParser;
+ this.setName(this.ddParser.getDescriptorName());
+ }
+
+}
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCAppClientClassPathDeployer.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCAppClientClassPathDeployer.java (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCAppClientClassPathDeployer.java 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1,51 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, 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.webservices.integration.deployers;
+
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.metadata.client.spec.ApplicationClientMetaData;
+import org.jboss.webservices.integration.util.ASHelper;
+
+/**
+ * A deployer for properly setting the classpath for jaxrpc client deployments;
+ * it's triggered by the ApplicationClientMetaData which is attached to the unit
+ * when a application-client.xml descriptor file is found in the deployment.
+ * This deployer then actually enables classpath modification when a jaxrpc-mapping
+ * is specified in the descriptor.
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 03-Feb-2010
+ */
+public class JAXRPCAppClientClassPathDeployer extends JAXRPCClientClassPathDeployer<ApplicationClientMetaData>
+{
+ public JAXRPCAppClientClassPathDeployer()
+ {
+ super(ApplicationClientMetaData.class);
+ }
+
+ @Override
+ protected boolean isClassPathChangeRequired(VFSDeploymentUnit unit)
+ {
+ ApplicationClientMetaData applicationClientMetaData = ASHelper.getRequiredAttachment(unit, ApplicationClientMetaData.class);
+ return hasJaxRpcMappingReference(applicationClientMetaData.getServiceReferences());
+ }
+}
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCClientClassPathDeployer.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCClientClassPathDeployer.java (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCClientClassPathDeployer.java 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1,62 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, 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.webservices.integration.deployers;
+
+import java.util.Iterator;
+
+import org.jboss.metadata.javaee.spec.ServiceReferenceMetaData;
+import org.jboss.metadata.javaee.spec.ServiceReferencesMetaData;
+
+/**
+ * A deployer for properly setting the classpath for jaxrpc client deployments;
+ * it's triggered by the ApplicationClientMetaData which is attached to the unit
+ * when a application-client.xml descriptor file is found in the deployment.
+ * This deployer then actually enables classpath modification when a jaxrpc-mapping
+ * is specified in the descriptor.
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 03-Feb-2010
+ */
+public abstract class JAXRPCClientClassPathDeployer<T> extends JAXRPCIntegrationClassPathDeployer<T>
+{
+ public JAXRPCClientClassPathDeployer(Class<T> input)
+ {
+ super(input);
+ setInput(input); //makes the input mandatory instead of optional
+ }
+
+ protected static boolean hasJaxRpcMappingReference(ServiceReferencesMetaData serviceReferences)
+ {
+ if (serviceReferences != null)
+ {
+ for (Iterator<ServiceReferenceMetaData> it = serviceReferences.iterator(); it.hasNext();)
+ {
+ ServiceReferenceMetaData serviceReference = it.next();
+ if (serviceReference.getJaxrpcMappingFile() != null)
+ {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+}
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCEjbClientClassPathDeployer.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCEjbClientClassPathDeployer.java (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCEjbClientClassPathDeployer.java 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1,67 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, 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.webservices.integration.deployers;
+
+import java.util.Iterator;
+
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.metadata.ejb.spec.EjbJarMetaData;
+import org.jboss.metadata.ejb.spec.EnterpriseBeanMetaData;
+import org.jboss.metadata.ejb.spec.EnterpriseBeansMetaData;
+import org.jboss.webservices.integration.util.ASHelper;
+
+/**
+ * A deployer for properly setting the classpath for jaxrpc client deployments;
+ * it's triggered by the ApplicationClientMetaData which is attached to the unit
+ * when a ejb-jar.xml descriptor file is found in the deployment.
+ * This deployer then actually enables classpath modification when a jaxrpc-mapping
+ * is specified in the descriptor.
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 03-Feb-2010
+ */
+public class JAXRPCEjbClientClassPathDeployer extends JAXRPCClientClassPathDeployer<EjbJarMetaData>
+{
+ public JAXRPCEjbClientClassPathDeployer()
+ {
+ super(EjbJarMetaData.class);
+ }
+
+ @Override
+ protected boolean isClassPathChangeRequired(VFSDeploymentUnit unit)
+ {
+ EjbJarMetaData ejbMetaData = ASHelper.getRequiredAttachment(unit, EjbJarMetaData.class);
+ EnterpriseBeansMetaData beansMetaData = ejbMetaData.getEnterpriseBeans();
+ if (beansMetaData != null)
+ {
+ for (Iterator<EnterpriseBeanMetaData> beanIt = beansMetaData.iterator(); beanIt.hasNext(); )
+ {
+ EnterpriseBeanMetaData beanMetaData = beanIt.next();
+ if (hasJaxRpcMappingReference(beanMetaData.getServiceReferences()))
+ {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+}
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCIntegrationClassPathDeployer.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCIntegrationClassPathDeployer.java (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCIntegrationClassPathDeployer.java 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1,125 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, 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.webservices.integration.deployers;
+
+import java.net.URL;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.jboss.deployers.vfs.plugins.classloader.UrlIntegrationDeployer;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.util.StringPropertyReplacer;
+import org.jboss.vfs.VFS;
+import org.jboss.vfs.VirtualFile;
+import org.jboss.wsf.spi.management.ServerConfig;
+
+/**
+ * An abstract deployer that properly set the classpath for JAX-RPC deployments.
+ * This is performed adding a reference to an integration lib from the jaxrpc
+ * deployers to the deployment unit's classpath.
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 02-Feb-2010
+ */
+public abstract class JAXRPCIntegrationClassPathDeployer<T> extends UrlIntegrationDeployer<T>
+{
+ private Set<String> libs;
+ private boolean integrationLibsFound = false;
+ private ServerConfig wsServerConfig;
+ private boolean stackRequiresIntegration;
+
+ public JAXRPCIntegrationClassPathDeployer(Class<T> input)
+ {
+ super(input);
+ }
+
+ protected abstract boolean isClassPathChangeRequired(VFSDeploymentUnit unit);
+
+ @Override
+ protected boolean isIntegrationDeployment(VFSDeploymentUnit unit)
+ {
+ return stackRequiresIntegration && integrationLibsFound && isClassPathChangeRequired(unit);
+ }
+
+ @Override
+ public void start()
+ {
+ //NOOP
+ }
+
+ protected Set<URL> getJBossWSIntegrationUrls()
+ {
+ Set<URL> result = new HashSet<URL>();
+ try
+ {
+ for (String file : libs)
+ {
+ String url = getServerHome() + file;
+ url = StringPropertyReplacer.replaceProperties(url);
+ VirtualFile integrationLib = VFS.getChild(new URL(url));
+
+ if (integrationLib != null && integrationLib.exists())
+ {
+ integrationLibsFound = true;
+ result.add(integrationLib.toURL());
+ }
+ else
+ {
+ log.debug("Could not find JAX-RPC integration lib: " + url);
+ }
+ }
+ }
+ catch (Exception e)
+ {
+ throw new IllegalArgumentException("Unexpected error: " + e);
+ }
+ return result;
+ }
+
+ protected String getServerHome()
+ {
+ return "${jboss.server.home.url}";
+ }
+
+ public Set<String> getLibs()
+ {
+ return libs;
+ }
+
+ public void setLibs(Set<String> libs)
+ {
+ this.libs = libs;
+ setIntegrationURLs(getJBossWSIntegrationUrls());
+ }
+
+ public ServerConfig getWsServerConfig()
+ {
+ return wsServerConfig;
+ }
+
+ public void setWsServerConfig(ServerConfig wsServerConfig)
+ {
+ this.wsServerConfig = wsServerConfig;
+ //the Native stack does not requires the JAXRPC additional integration
+ stackRequiresIntegration = !wsServerConfig.getImplementationTitle().toLowerCase().contains("native");
+ }
+}
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCServerClassPathDeployer.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCServerClassPathDeployer.java (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCServerClassPathDeployer.java 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1,59 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, 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.webservices.integration.deployers;
+
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.webservices.integration.util.ASHelper;
+import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaData;
+import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData;
+
+/**
+ * A deployer for properly setting the classpath for jaxrpc endpoint deployments;
+ * it's triggered by the WebservicesMetaData which is attached to the unit
+ * when a webservice.xml descriptor file is found in the deployment.
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 03-Feb-2010
+ */
+public class JAXRPCServerClassPathDeployer extends JAXRPCIntegrationClassPathDeployer<WebservicesMetaData>
+{
+ public JAXRPCServerClassPathDeployer()
+ {
+ super(WebservicesMetaData.class);
+ setInput(WebservicesMetaData.class); //makes the input mandatory instead of optional
+ }
+
+ @Override
+ protected boolean isClassPathChangeRequired(VFSDeploymentUnit unit)
+ {
+ WebservicesMetaData wsmd = ASHelper.getRequiredAttachment(unit, WebservicesMetaData.class);
+ WebserviceDescriptionMetaData[] descriptions = wsmd.getWebserviceDescriptions();
+ for (WebserviceDescriptionMetaData description : descriptions)
+ {
+ if (description.getJaxrpcMappingFile() != null)
+ {
+ return true;
+ }
+ }
+ return false;
+ }
+}
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCServletClientClassPathDeployer.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCServletClientClassPathDeployer.java (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCServletClientClassPathDeployer.java 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1,51 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, 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.webservices.integration.deployers;
+
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.metadata.web.spec.WebMetaData;
+import org.jboss.webservices.integration.util.ASHelper;
+
+/**
+ * A deployer for properly setting the classpath for jaxrpc client deployments;
+ * it's triggered by the ApplicationClientMetaData which is attached to the unit
+ * when a web.xml descriptor file is found in the deployment.
+ * This deployer then actually enables classpath modification when a jaxrpc-mapping
+ * is specified in the descriptor.
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 03-Feb-2010
+ */
+public class JAXRPCServletClientClassPathDeployer extends JAXRPCClientClassPathDeployer<WebMetaData>
+{
+ public JAXRPCServletClientClassPathDeployer()
+ {
+ super(WebMetaData.class);
+ }
+
+ @Override
+ protected boolean isClassPathChangeRequired(VFSDeploymentUnit unit)
+ {
+ WebMetaData webMetaData = ASHelper.getRequiredAttachment(unit, WebMetaData.class);
+ return hasJaxRpcMappingReference(webMetaData.getServiceReferences());
+ }
+}
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/JMSDescriptorDeployer.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/JMSDescriptorDeployer.java (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/JMSDescriptorDeployer.java 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1,63 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, 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.webservices.integration.deployers;
+
+import org.jboss.wsf.spi.metadata.jms.JMSDescriptorParser;
+import org.jboss.wsf.spi.metadata.jms.JMSDescriptorProcessor;
+import org.jboss.wsf.spi.metadata.jms.JMSEndpointsMetaData;
+
+/**
+ * Stack agnostic JMS descriptor deployer.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+public final class JMSDescriptorDeployer extends AbstractDescriptorDeployer<JMSDescriptorProcessor, JMSDescriptorParser, JMSEndpointsMetaData>
+{
+ /**
+ * Constructor.
+ */
+ public JMSDescriptorDeployer()
+ {
+ super(JMSEndpointsMetaData.class);
+ }
+
+ /**
+ * MC incallback method. It will be invoked each time JMSDescriptorProcessor bean will be installed.
+ * @param processor the processor
+ */
+ @Override
+ @Deprecated
+ public void setProcessor(final JMSDescriptorProcessor processor)
+ {
+ super.setProcessor(processor);
+ }
+
+ /**
+ * MC incallback method. It will be invoked each time JMSDescriptorParser bean will be installed.
+ * @param parser the parser
+ */
+ @Override
+ public void setParser(final JMSDescriptorParser parser)
+ {
+ super.setParser(parser);
+ }
+}
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/SecurityActions.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/SecurityActions.java (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/SecurityActions.java 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1,81 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, 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.webservices.integration.deployers;
+
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+
+/**
+ * Security actions helper.
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 17-Feb-2010
+ */
+class SecurityActions
+{
+ /**
+ * Get context classloader.
+ *
+ * @return the current context classloader
+ */
+ static ClassLoader getContextClassLoader()
+ {
+ SecurityManager sm = System.getSecurityManager();
+ if (sm == null)
+ {
+ return Thread.currentThread().getContextClassLoader();
+ }
+ else
+ {
+ return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() {
+ public ClassLoader run()
+ {
+ return Thread.currentThread().getContextClassLoader();
+ }
+ });
+ }
+ }
+
+ /**
+ * Set context classloader.
+ *
+ * @param classLoader the classloader
+ */
+ static void setContextClassLoader(final ClassLoader classLoader)
+ {
+ if (System.getSecurityManager() == null)
+ {
+ Thread.currentThread().setContextClassLoader(classLoader);
+ }
+ else
+ {
+ AccessController.doPrivileged(new PrivilegedAction<Object>()
+ {
+ public Object run()
+ {
+ Thread.currentThread().setContextClassLoader(classLoader);
+ return null;
+ }
+ });
+ }
+ }
+}
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WSAspectizedDeployersFactory.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WSAspectizedDeployersFactory.java (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WSAspectizedDeployersFactory.java 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1,91 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.webservices.integration.deployers;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.jboss.deployers.plugins.deployers.DeployersImpl;
+import org.jboss.deployers.spi.deployer.Deployer;
+import org.jboss.logging.Logger;
+import org.jboss.wsf.spi.deployment.DeploymentAspect;
+
+/**
+ * WSDeploymentAspectDeployer factory.
+ *
+ * @author <a href="ropalka(a)redhat.com">Richard Opalka</a>
+ */
+public final class WSAspectizedDeployersFactory
+{
+ /** Logger. */
+ private static final Logger LOGGER = Logger.getLogger(WSAspectizedDeployersFactory.class);
+
+ /** Real deployers registry. */
+ private final DeployersImpl delegee;
+
+ /** Our deployers regitry. */
+ private final Map<DeploymentAspect, Deployer> deployersRegistry = new HashMap<DeploymentAspect, Deployer>();
+
+ /**
+ * Constructor.
+ *
+ * @param realDeployers real deployers registry
+ */
+ public WSAspectizedDeployersFactory(final DeployersImpl realDeployers)
+ {
+ this.delegee = realDeployers;
+ }
+
+ /**
+ * MC incallback method. It will be called each time DeploymentAspect bean will be installed.
+ *
+ * @param aspect to create real WS aspectized deployer for
+ */
+ public void addDeployer(final DeploymentAspect aspect)
+ {
+ if (WSAspectizedDeployersFactory.LOGGER.isTraceEnabled())
+ {
+ WSAspectizedDeployersFactory.LOGGER.trace("Adding deployer for: " + aspect);
+ }
+ final Deployer wsAspectizedDeployer = new WSDeploymentAspectDeployer(aspect);
+
+ this.delegee.addDeployer(wsAspectizedDeployer);
+ this.deployersRegistry.put(aspect, wsAspectizedDeployer);
+ }
+
+ /**
+ * MC uncallback method. It will be called each time DeploymentAspect bean will be removed.
+ *
+ * @param aspect to remove real WS aspectized deployer for
+ */
+ public void removeDeployer(final DeploymentAspect aspect)
+ {
+ if (WSAspectizedDeployersFactory.LOGGER.isTraceEnabled())
+ {
+ WSAspectizedDeployersFactory.LOGGER.trace("Removing deployer for: " + aspect);
+ }
+ final Deployer wsAspectizedDeployer = this.deployersRegistry.get(aspect);
+
+ this.deployersRegistry.remove(aspect);
+ this.delegee.removeDeployer(wsAspectizedDeployer);
+ }
+}
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentAspectDeployer.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentAspectDeployer.java (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentAspectDeployer.java 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1,175 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.webservices.integration.deployers;
+
+import java.util.Set;
+
+import org.jboss.beans.metadata.spi.BeanMetaData;
+import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.deployers.spi.deployer.helpers.AbstractRealDeployer;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.metadata.web.jboss.JBossWebMetaData;
+import org.jboss.webservices.integration.util.ASHelper;
+import org.jboss.wsf.common.integration.JMSDeploymentAspect;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.DeploymentAspect;
+
+/**
+ * A deployer that delegates to JBossWS deployment aspect.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+final class WSDeploymentAspectDeployer extends AbstractRealDeployer
+{
+
+ /** JBossWS specific inputs/outputs prefix. */
+ private static final String JBOSSWS_ATTACHMENT_PREFIX = "jbossws.";
+
+ /** JBossWS specific metadata. */
+ private static final String JBOSSWS_METADATA = WSDeploymentAspectDeployer.JBOSSWS_ATTACHMENT_PREFIX + "metadata";
+
+ /** Delegee. */
+ private final DeploymentAspect aspect;
+
+ /**
+ * Constructor.
+ *
+ * @param aspect deployment aspect
+ */
+ WSDeploymentAspectDeployer(final DeploymentAspect aspect)
+ {
+ super();
+ if (aspect instanceof JMSDeploymentAspect)
+ {
+ // inputs
+ this.addInput(org.jboss.system.metadata.ServiceDeployment.class);
+ this.addInput(org.jboss.system.metadata.ServiceMetaData.class);
+ }
+ else
+ {
+ // inputs
+ this.addInput(JBossWebMetaData.class);
+ this.addInput(Deployment.class);
+ if (aspect.isLast())
+ {
+ this.addInput(WSDeploymentAspectDeployer.JBOSSWS_METADATA);
+ }
+
+ // outputs
+ this.addOutput(JBossWebMetaData.class);
+ if (!aspect.isLast())
+ {
+ this.addOutput(WSDeploymentAspectDeployer.JBOSSWS_METADATA);
+ }
+ }
+ // propagate DA requirements and map them to deployer inputs
+ final Set<String> inputs = aspect.getRequiresAsSet();
+ for (String input : inputs)
+ {
+ this.addInput(WSDeploymentAspectDeployer.JBOSSWS_ATTACHMENT_PREFIX + input);
+ }
+
+ // propagate DA provides and map them to deployer outputs
+ final Set<String> outputs = aspect.getProvidesAsSet();
+ for (String output : outputs)
+ {
+ this.addOutput(WSDeploymentAspectDeployer.JBOSSWS_ATTACHMENT_PREFIX + output);
+ }
+
+ this.setRelativeOrder(aspect.getRelativeOrder());
+ this.aspect = aspect;
+ }
+
+ /**
+ * If deployed unit is related to web services this method delegates
+ * to deployment aspect and calls its create() and start() methods.
+ *
+ * @param unit deployment unit
+ * @throws DeploymentException on deployment failure
+ */
+ @Override
+ protected void internalDeploy(final DeploymentUnit unit) throws DeploymentException
+ {
+ if (ASHelper.isWebServiceDeployment(unit))
+ {
+ this.log.debug(this.aspect + " start: " + unit.getName());
+ final Deployment dep = ASHelper.getRequiredAttachment(unit, Deployment.class);
+ if (this.aspect.canHandle(dep))
+ {
+ //set the context classloader using the proper one from the deployment aspect
+ ClassLoader deployerClassLoader = SecurityActions.getContextClassLoader();
+ try
+ {
+ SecurityActions.setContextClassLoader(this.aspect.getLoader());
+ this.aspect.start(dep);
+ }
+ finally
+ {
+ SecurityActions.setContextClassLoader(deployerClassLoader);
+ }
+ }
+ }
+ }
+
+ /**
+ * If undeployed unit is related to web services this method delegates
+ * to deployment aspect and calls its stop() and destroy() methods.
+ *
+ * @param unit deployment unit
+ */
+ @Override
+ protected void internalUndeploy(final DeploymentUnit unit)
+ {
+ if (ASHelper.isWebServiceDeployment(unit))
+ {
+ this.log.debug(this.aspect + " stop: " + unit.getName());
+ final Deployment dep = ASHelper.getRequiredAttachment(unit, Deployment.class);
+ if (this.aspect.canHandle(dep))
+ {
+ //set the context classloader using the proper one from the deployment aspect
+ ClassLoader deployerClassLoader = SecurityActions.getContextClassLoader();
+ try
+ {
+ SecurityActions.setContextClassLoader(this.aspect.getLoader());
+ this.aspect.stop(dep);
+ }
+ finally
+ {
+ SecurityActions.setContextClassLoader(deployerClassLoader);
+ }
+ }
+ }
+ }
+
+ /**
+ * Displays also WS deployment aspect being wrapped.
+ *
+ * @return deployer instance id including wrapped deployment aspect id.
+ */
+ @Override
+ public String toString()
+ {
+ final StringBuilder sb = new StringBuilder();
+ sb.append(super.toString()).append('(').append(this.aspect).append(')');
+ return sb.toString();
+ }
+}
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentDeployer.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentDeployer.java (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentDeployer.java 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1,67 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.webservices.integration.deployers;
+
+import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.deployers.spi.deployer.helpers.AbstractRealDeployer;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.metadata.web.jboss.JBossWebMetaData;
+import org.jboss.webservices.integration.deployers.deployment.WSDeploymentBuilder;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
+
+/**
+ * This deployer initializes JBossWS deployment meta data.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+public final class WSDeploymentDeployer extends AbstractRealDeployer
+{
+ /**
+ * Constructor.
+ */
+ public WSDeploymentDeployer()
+ {
+ super();
+
+ // inputs
+ this.addInput(JBossWebMetaData.class);
+ this.addInput(DeploymentType.class);
+
+ // outputs
+ this.addOutput(JBossWebMetaData.class);
+ this.addOutput(Deployment.class);
+ }
+
+ /**
+ * Creates new Web Service deployment and registers it with deployment unit.
+ *
+ * @param unit deployment unit
+ * @throws DeploymentException if any error occurs
+ */
+ @Override
+ protected void internalDeploy(final DeploymentUnit unit) throws DeploymentException
+ {
+ this.log.trace("Building JBoss agnostic webservices meta data model");
+ WSDeploymentBuilder.getInstance().build(unit);
+ }
+}
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WSDescriptorDeployer.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WSDescriptorDeployer.java (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WSDescriptorDeployer.java 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1,63 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.webservices.integration.deployers;
+
+import org.jboss.wsf.spi.metadata.webservices.WebservicesDescriptorParser;
+import org.jboss.wsf.spi.metadata.webservices.WebservicesDescriptorProcessor;
+import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData;
+
+/**
+ * webservices.xml deployer.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+public final class WSDescriptorDeployer extends AbstractDescriptorDeployer<WebservicesDescriptorProcessor, WebservicesDescriptorParser, WebservicesMetaData>
+{
+ /**
+ * Constructor.
+ */
+ public WSDescriptorDeployer()
+ {
+ super(WebservicesMetaData.class);
+ }
+
+ /**
+ * MC incallback method. It will be invoked each time WebservicesDescriptorProcessor bean will be installed.
+ * @param processor the processor
+ */
+ @Override
+ @Deprecated
+ public void setProcessor(final WebservicesDescriptorProcessor processor)
+ {
+ super.setProcessor(processor);
+ }
+
+ /**
+ * MC incallback method. It will be invoked each time WebservicesDescriptorParser bean will be installed.
+ * @param parser the parser
+ */
+ @Override
+ public void setParser(final WebservicesDescriptorParser parser)
+ {
+ super.setParser(parser);
+ }
+}
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WSEJBAdapterDeployer.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WSEJBAdapterDeployer.java (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WSEJBAdapterDeployer.java 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1,265 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.webservices.integration.deployers;
+
+import java.lang.annotation.Annotation;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+
+import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.deployers.spi.deployer.helpers.AbstractRealDeployer;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.ejb.deployers.EjbDeployment;
+import org.jboss.ejb.deployers.MergedJBossMetaDataDeployer;
+import org.jboss.ejb3.EJBContainer;
+import org.jboss.ejb3.Ejb3Deployment;
+import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
+import org.jboss.metadata.ejb.jboss.JBossMetaData;
+import org.jboss.webservices.integration.util.ASHelper;
+import org.jboss.wsf.spi.deployment.integration.WebServiceDeclaration;
+import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment;
+import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData;
+
+/**
+ * WebServiceDeployment deployer processes EJB containers and its metadata and creates WS adapters wrapping it.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+public final class WSEJBAdapterDeployer extends AbstractRealDeployer
+{
+ /**
+ * Constructor.
+ */
+ public WSEJBAdapterDeployer()
+ {
+ super();
+
+ // inputs
+ this.addInput(MergedJBossMetaDataDeployer.EJB_MERGED_ATTACHMENT_NAME);
+ this.addInput(EjbDeployment.class);
+ this.addInput(Ejb3Deployment.class);
+ this.addInput(WebservicesMetaData.class);
+
+ // outputs
+ this.addOutput(WebServiceDeployment.class);
+ }
+
+ /**
+ * Deploys WebServiceDeployment meta data.
+ *
+ * @param unit deployment unit
+ * @throws DeploymentException exception
+ */
+ @Override
+ protected void internalDeploy(final DeploymentUnit unit) throws DeploymentException
+ {
+ final JBossMetaData mergedMD = (JBossMetaData) unit
+ .getAttachment(MergedJBossMetaDataDeployer.EJB_MERGED_ATTACHMENT_NAME);
+ final Ejb3Deployment ejb3Deployment = ASHelper.getOptionalAttachment(unit, Ejb3Deployment.class);
+
+ if (mergedMD != null)
+ {
+ final WebServiceDeploymentAdapter wsDeploymentAdapter = new WebServiceDeploymentAdapter();
+ final List<WebServiceDeclaration> endpoints = wsDeploymentAdapter.getServiceEndpoints();
+
+ for (final JBossEnterpriseBeanMetaData ejbMD : mergedMD.getEnterpriseBeans())
+ {
+ final String ejbName = ejbMD.determineContainerName();
+
+ if (ejbMD.getEjbClass() != null)
+ {
+ this.log.debug("Creating webservice EJB adapter for: " + ejbName);
+ final EJBContainer ejbContainer = this.getContainer(ejb3Deployment, ejbMD);
+ endpoints.add(new WebServiceDeclarationAdapter(ejbMD, ejbContainer, unit.getClassLoader()));
+ }
+ else
+ {
+ this.log.warn("Ingoring EJB deployment with null classname: " + ejbName);
+ }
+ }
+
+ unit.addAttachment(WebServiceDeployment.class, wsDeploymentAdapter);
+ }
+ }
+
+ /**
+ * Returns EJB container if EJB3 deployment is detected and EJB meta data does not represent entity bean.
+ *
+ * @param ejb3Deployment EJB3 deployment meta data
+ * @param ejbMD EJB meta data
+ * @return EJB container or null if not EJB3 stateless bean
+ * @throws DeploymentException if some error occurs
+ */
+ private EJBContainer getContainer(final Ejb3Deployment ejb3Deployment, final JBossEnterpriseBeanMetaData ejbMD)
+ throws DeploymentException
+ {
+ if ((ejb3Deployment != null) && (!ejbMD.isEntity()))
+ {
+ try
+ {
+ final ObjectName objName = new ObjectName(ejbMD.determineContainerName());
+ return (EJBContainer) ejb3Deployment.getContainer(objName);
+ }
+ catch (MalformedObjectNameException e)
+ {
+ throw new DeploymentException(e);
+ }
+ }
+
+ return null;
+ }
+
+ /**
+ * Adopts EJB3 bean meta data to a
+ * {@link org.jboss.wsf.spi.deployment.integration.WebServiceDeclaration}.
+ */
+ private static final class WebServiceDeclarationAdapter implements WebServiceDeclaration
+ {
+
+ /** EJB meta data. */
+ private final JBossEnterpriseBeanMetaData ejbMetaData;
+
+ /** EJB container. */
+ private final EJBContainer ejbContainer;
+
+ /** Class loader. */
+ private final ClassLoader loader;
+
+ /**
+ * Constructor.
+ *
+ * @param ejbMetaData EJB metadata
+ * @param ejbContainer EJB container
+ * @param loader class loader
+ */
+ private WebServiceDeclarationAdapter(final JBossEnterpriseBeanMetaData ejbMetaData,
+ final EJBContainer ejbContainer, final ClassLoader loader)
+ {
+ super();
+
+ this.ejbMetaData = ejbMetaData;
+ this.ejbContainer = ejbContainer;
+ this.loader = loader;
+ }
+
+ /**
+ * Returns EJB container name.
+ *
+ * @return container name
+ */
+ public String getContainerName()
+ {
+ return this.ejbMetaData.determineContainerName();
+ }
+
+ /**
+ * Returns EJB name.
+ *
+ * @return name
+ */
+ public String getComponentName()
+ {
+ return this.ejbMetaData.getName();
+ }
+
+ /**
+ * Returns EJB class name.
+ *
+ * @return class name
+ */
+ public String getComponentClassName()
+ {
+ return this.ejbMetaData.getEjbClass();
+ }
+
+ /**
+ * Returns requested annotation associated with EJB container or EJB bean.
+ *
+ * @param annotationType annotation type
+ * @param <T> annotation class type
+ * @return requested annotation or null if not found
+ */
+ public <T extends Annotation> T getAnnotation(final Class<T> annotationType)
+ {
+ final boolean haveEjbContainer = this.ejbContainer != null;
+
+ if (haveEjbContainer)
+ {
+ return this.ejbContainer.getAnnotation(annotationType);
+ }
+ else
+ {
+ final Class<?> bean = this.getComponentClass();
+ return (T) bean.getAnnotation(annotationType);
+ }
+ }
+
+ /**
+ * Loads ejb class from associated loader.
+ *
+ * @return ejb class instance
+ */
+ private Class<?> getComponentClass()
+ {
+ try
+ {
+ return this.loader.loadClass(this.getComponentClassName());
+ }
+ catch (ClassNotFoundException cnfe)
+ {
+ throw new RuntimeException("Failed to load component class: " + this.getComponentClassName()
+ + " from loader: " + this.loader);
+ }
+ }
+ }
+
+ /**
+ * Adopts an EJB deployment to a
+ * {@link org.jboss.wsf.spi.deployment.integration.WebServiceDeployment}.
+ */
+ private static final class WebServiceDeploymentAdapter implements WebServiceDeployment
+ {
+ /** List of endpoints. */
+ private final List<WebServiceDeclaration> endpoints = new ArrayList<WebServiceDeclaration>();
+
+ /**
+ * Constructor.
+ */
+ private WebServiceDeploymentAdapter()
+ {
+ super();
+ }
+
+ /**
+ * Returns endpoints list.
+ *
+ * @return endpoints list
+ */
+ public List<WebServiceDeclaration> getServiceEndpoints()
+ {
+ return this.endpoints;
+ }
+ }
+}
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WSTypeDeployer.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WSTypeDeployer.java (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WSTypeDeployer.java 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1,174 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.webservices.integration.deployers;
+
+import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.deployers.spi.deployer.helpers.AbstractRealDeployer;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.metadata.ejb.jboss.JBossMetaData;
+import org.jboss.metadata.web.jboss.JBossWebMetaData;
+import org.jboss.webservices.integration.util.ASHelper;
+import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
+import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment;
+import org.jboss.wsf.spi.metadata.jms.JMSEndpointsMetaData;
+import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData;
+
+/**
+ * Detects Web Service deployment type.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+public final class WSTypeDeployer extends AbstractRealDeployer
+{
+ /**
+ * Constructor.
+ */
+ public WSTypeDeployer()
+ {
+ super();
+
+ // inputs
+ this.addInput(JBossWebMetaData.class);
+ this.addInput(WebservicesMetaData.class);
+ this.addInput(WebServiceDeployment.class);
+
+ // outputs
+ this.addOutput(DeploymentType.class);
+ this.addOutput(JBossWebMetaData.class);
+ }
+
+ /**
+ * Detects WS deployment type and puts it to the deployment unit attachments.
+ *
+ * @param unit deployment unit
+ * @throws DeploymentException on failure
+ */
+ @Override
+ protected void internalDeploy(final DeploymentUnit unit) throws DeploymentException
+ {
+ if (this.isJaxwsJseDeployment(unit))
+ {
+ this.log.debug("Detected JAXWS JSE deployment");
+ unit.addAttachment(DeploymentType.class, DeploymentType.JAXWS_JSE);
+ }
+ else if (this.isJaxwsEjbDeployment(unit))
+ {
+ this.log.debug("Detected JAXWS EJB3 deployment");
+ unit.addAttachment(DeploymentType.class, DeploymentType.JAXWS_EJB3);
+ }
+ else if (this.isJaxrpcJseDeployment(unit))
+ {
+ this.log.debug("Detected JAXRPC JSE deployment");
+ unit.addAttachment(DeploymentType.class, DeploymentType.JAXRPC_JSE);
+ }
+ else if (this.isJaxrpcEjbDeployment(unit))
+ {
+ this.log.debug("Detected JAXRPC EJB21 deployment");
+ unit.addAttachment(DeploymentType.class, DeploymentType.JAXRPC_EJB21);
+ }
+ else if (this.isJaxwsJmsDeployment(unit))
+ {
+ this.log.debug("Detected JAXWS JMS deployment");
+ unit.addAttachment(DeploymentType.class, DeploymentType.JAXWS_JMS);
+ }
+ }
+
+ /**
+ * Returns true if JAXRPC EJB deployment is detected.
+ *
+ * @param unit deployment unit
+ * @return true if JAXRPC EJB, false otherwise
+ */
+ private boolean isJaxrpcEjbDeployment(final DeploymentUnit unit)
+ {
+ final boolean hasWebservicesMD = ASHelper.hasAttachment(unit, WebservicesMetaData.class);
+ final boolean hasJBossMD = unit.getAllMetaData(JBossMetaData.class).size() > 0;
+
+ return hasWebservicesMD && hasJBossMD;
+ }
+
+ /**
+ * Returns true if JAXRPC JSE deployment is detected.
+ *
+ * @param unit deployment unit
+ * @return true if JAXRPC JSE, false otherwise
+ */
+ private boolean isJaxrpcJseDeployment(final DeploymentUnit unit)
+ {
+ final boolean hasWebservicesMD = ASHelper.hasAttachment(unit, WebservicesMetaData.class);
+ final boolean hasJBossWebMD = ASHelper.hasAttachment(unit, JBossWebMetaData.class);
+
+ if (hasWebservicesMD && hasJBossWebMD)
+ {
+ return ASHelper.getJaxrpcServlets(unit).size() > 0;
+ }
+
+ return false;
+ }
+
+ /**
+ * Returns true if JAXWS EJB deployment is detected.
+ *
+ * @param unit deployment unit
+ * @return true if JAXWS EJB, false otherwise
+ */
+ private boolean isJaxwsEjbDeployment(final DeploymentUnit unit)
+ {
+ final boolean hasWSDeployment = ASHelper.hasAttachment(unit, WebServiceDeployment.class);
+
+ if (hasWSDeployment)
+ {
+ return ASHelper.getJaxwsEjbs(unit).size() > 0;
+ }
+
+ return false;
+ }
+
+ /**
+ * Returns true if JAXWS JSE deployment is detected.
+ *
+ * @param unit deployment unit
+ * @return true if JAXWS JSE, false otherwise
+ */
+ private boolean isJaxwsJseDeployment(final DeploymentUnit unit)
+ {
+ final boolean hasJBossWebMD = ASHelper.hasAttachment(unit, JBossWebMetaData.class);
+
+ if (hasJBossWebMD)
+ {
+ return ASHelper.getJaxwsServlets(unit).size() > 0;
+ }
+
+ return false;
+ }
+
+ /**
+ * Returns true if JAXWS JMS deployment is detected.
+ *
+ * @param unit deployment unit
+ * @return true if JAXWS JMS, false otherwise
+ */
+ private boolean isJaxwsJmsDeployment(final DeploymentUnit unit)
+ {
+ return ASHelper.hasAttachment(unit, JMSEndpointsMetaData.class);
+ }
+}
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/AbstractDeploymentModelBuilder.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/AbstractDeploymentModelBuilder.java (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/AbstractDeploymentModelBuilder.java 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1,235 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.webservices.integration.deployers.deployment;
+
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.logging.Logger;
+import org.jboss.vfs.VirtualFile;
+import org.jboss.webservices.integration.injection.VirtualFileAdaptor;
+import org.jboss.webservices.integration.util.ASHelper;
+import org.jboss.wsf.common.ResourceLoaderAdapter;
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
+import org.jboss.wsf.spi.deployment.ArchiveDeployment;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
+import org.jboss.wsf.spi.deployment.DeploymentModelFactory;
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
+
+/**
+ * Base class for all deployment model builders.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+abstract class AbstractDeploymentModelBuilder implements DeploymentModelBuilder
+{
+ /** WSDL, XSD and XML files filter. */
+ private static final WSVirtualFileFilter WS_FILE_FILTER = new WSVirtualFileFilter();
+
+ /** Logger. */
+ protected final Logger log = Logger.getLogger(this.getClass());
+
+ /** Deployment model factory. */
+ private final DeploymentModelFactory deploymentModelFactory;
+
+ /**
+ * Constructor.
+ */
+ protected AbstractDeploymentModelBuilder()
+ {
+ super();
+
+ // deployment factory
+ final SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ this.deploymentModelFactory = spiProvider.getSPI(DeploymentModelFactory.class);
+ }
+
+ /**
+ * @see org.jboss.webservices.integration.deployers.deployment.DeploymentModelBuilder#newDeploymentModel(DeploymentUnit)
+ *
+ * @param unit deployment unit
+ */
+ public final void newDeploymentModel(final DeploymentUnit unit)
+ {
+ final ArchiveDeployment dep = this.newDeployment(unit);
+
+ this.build(dep, unit);
+
+ dep.addAttachment(DeploymentUnit.class, unit);
+ unit.addAttachment(Deployment.class, dep);
+ }
+
+ /**
+ * Template method for subclasses to implement.
+ *
+ * @param dep webservice deployment
+ * @param unit deployment unit
+ */
+ protected abstract void build(Deployment dep, DeploymentUnit unit);
+
+ /**
+ * Creates new Http Web Service endpoint.
+ *
+ * @param endpointClass endpoint class name
+ * @param endpointName endpoint name
+ * @param dep deployment
+ * @return WS endpoint
+ */
+ protected final Endpoint newHttpEndpoint(final String endpointClass, final String endpointName, final Deployment dep)
+ {
+ if (endpointName == null)
+ {
+ throw new NullPointerException("Null endpoint name");
+ }
+
+ if (endpointClass == null)
+ {
+ throw new NullPointerException("Null endpoint class");
+ }
+
+ final Endpoint endpoint = this.deploymentModelFactory.newHttpEndpoint(endpointClass);
+ endpoint.setShortName(endpointName);
+ dep.getService().addEndpoint(endpoint);
+
+ return endpoint;
+ }
+
+ /**
+ * Creates new JMS Web Service endpoint.
+ *
+ * @param endpointClass endpoint class name
+ * @param endpointName endpoint name
+ * @param dep deployment
+ * @return WS endpoint
+ */
+ protected final Endpoint newJMSEndpoint(final String endpointClass, final String endpointName, final Deployment dep)
+ {
+ if (endpointName == null)
+ {
+ throw new NullPointerException("Null endpoint name");
+ }
+
+ if (endpointClass == null)
+ {
+ throw new NullPointerException("Null endpoint class");
+ }
+
+ final Endpoint endpoint = this.deploymentModelFactory.newJMSEndpoint(endpointClass);
+ endpoint.setShortName(endpointName);
+ dep.getService().addEndpoint(endpoint);
+
+ return endpoint;
+ }
+
+ /**
+ * Creates new Web Service deployment.
+ *
+ * @param unit deployment unit
+ * @return archive deployment
+ */
+ private ArchiveDeployment newDeployment(final DeploymentUnit unit)
+ {
+ this.log.debug("Creating new WS deployment model for: " + unit);
+ final ArchiveDeployment dep = this.newDeployment(unit.getSimpleName(), unit.getClassLoader());
+
+ if (unit instanceof VFSDeploymentUnit)
+ {
+ final VFSDeploymentUnit vfsUnit = (VFSDeploymentUnit) unit;
+ final List<VirtualFile> virtualFiles = vfsUnit.getMetaDataFiles(AbstractDeploymentModelBuilder.WS_FILE_FILTER);
+ final Set<UnifiedVirtualFile> uVirtualFiles = new HashSet<UnifiedVirtualFile>();
+ for (VirtualFile vf : virtualFiles)
+ {
+ // Adding the roots of the virtual files.
+ uVirtualFiles.add(new VirtualFileAdaptor(vf));
+ }
+ dep.setMetadataFiles(new LinkedList<UnifiedVirtualFile>(uVirtualFiles));
+ }
+
+ if (unit.getParent() != null)
+ {
+ final String parentDeploymentName = unit.getParent().getSimpleName();
+ final ClassLoader parentClassLoader = unit.getParent().getClassLoader();
+
+ this.log.debug("Creating new WS deployment model for parent: " + unit.getParent());
+ final ArchiveDeployment parentDep = this.newDeployment(parentDeploymentName, parentClassLoader);
+ dep.setParent(parentDep);
+ }
+
+ if (unit instanceof VFSDeploymentUnit)
+ {
+ dep.setRootFile(new VirtualFileAdaptor(((VFSDeploymentUnit) unit).getRoot()));
+ }
+ else
+ {
+ dep.setRootFile(new ResourceLoaderAdapter(unit.getClassLoader()));
+ }
+ dep.setRuntimeClassLoader(unit.getClassLoader());
+ final DeploymentType deploymentType = ASHelper.getRequiredAttachment(unit, DeploymentType.class);
+ dep.setType(deploymentType);
+
+ return dep;
+ }
+
+ /**
+ * Creates new archive deployment.
+ *
+ * @param name deployment name
+ * @param loader deployment loader
+ * @return new archive deployment
+ */
+ private ArchiveDeployment newDeployment(final String name, final ClassLoader loader)
+ {
+ return (ArchiveDeployment) this.deploymentModelFactory.newDeployment(name, loader);
+ }
+
+ /**
+ * Gets specified attachment from deployment unit.
+ * Checks it's not null and then propagates it to <b>dep</b>
+ * attachments. Finally it returns attachment value.
+ *
+ * @param <A> class type
+ * @param attachment attachment
+ * @param unit deployment unit
+ * @param dep deployment
+ * @return attachment value if found in unit
+ */
+ protected final <A> A getAndPropagateAttachment(final Class<A> attachment, final DeploymentUnit unit,
+ final Deployment dep)
+ {
+ final A attachmentValue = ASHelper.getOptionalAttachment(unit, attachment);
+
+ if (attachmentValue != null)
+ {
+ dep.addAttachment(attachment, attachmentValue);
+ return attachmentValue;
+ }
+
+ throw new IllegalStateException("Deployment unit does not contain " + attachment);
+ }
+}
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilder.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilder.java (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilder.java 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.webservices.integration.deployers.deployment;
+
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+
+/**
+ * Deployment builder interface.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+interface DeploymentModelBuilder
+{
+ /**
+ * Creates Web Service deployment model and associates it with deployment.
+ *
+ * @param unit deployment unit
+ */
+ void newDeploymentModel(DeploymentUnit unit);
+}
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_EJB21.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_EJB21.java (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_EJB21.java 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1,76 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.webservices.integration.deployers.deployment;
+
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
+import org.jboss.metadata.ejb.jboss.JBossMetaData;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment;
+import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData;
+import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaData;
+import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData;
+
+/**
+ * Creates new JAXRPC EJB21 deployment.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+final class DeploymentModelBuilderJAXRPC_EJB21 extends AbstractDeploymentModelBuilder
+{
+ /**
+ * Constructor.
+ */
+ DeploymentModelBuilderJAXRPC_EJB21()
+ {
+ super();
+ }
+
+ /**
+ * Creates new JAXRPC EJB21 deployment and registers it with deployment unit.
+ *
+ * @param dep webservice deployment
+ * @param unit deployment unit
+ */
+ @Override
+ protected void build(final Deployment dep, final DeploymentUnit unit)
+ {
+ final JBossMetaData jbmd = this.getAndPropagateAttachment(JBossMetaData.class, unit, dep);
+ final WebservicesMetaData wsMetaData = this.getAndPropagateAttachment(WebservicesMetaData.class, unit, dep);
+ this.getAndPropagateAttachment(WebServiceDeployment.class, unit, dep);
+
+ this.log.debug("Creating JAXRPC EJB21 endpoints meta data model");
+ for (final WebserviceDescriptionMetaData webserviceDescriptionMD : wsMetaData.getWebserviceDescriptions())
+ {
+ for (final PortComponentMetaData portComponentMD : webserviceDescriptionMD.getPortComponents())
+ {
+ final String ejbName = portComponentMD.getEjbLink();
+ this.log.debug("EJB21 name: " + ejbName);
+ final JBossEnterpriseBeanMetaData beanMetaData = jbmd.getEnterpriseBean(ejbName);
+ final String ejbClass = beanMetaData.getEjbClass();
+ this.log.debug("EJB21 class: " + ejbClass);
+
+ this.newHttpEndpoint(ejbClass, ejbName, dep);
+ }
+ }
+ }
+}
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_JSE.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_JSE.java (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_JSE.java 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1,75 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.webservices.integration.deployers.deployment;
+
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.metadata.web.jboss.JBossWebMetaData;
+import org.jboss.metadata.web.spec.ServletMetaData;
+import org.jboss.webservices.integration.util.ASHelper;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData;
+import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaData;
+import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData;
+
+/**
+ * Creates new JAXRPC JSE deployment.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+final class DeploymentModelBuilderJAXRPC_JSE extends AbstractDeploymentModelBuilder
+{
+ /**
+ * Constructor.
+ */
+ DeploymentModelBuilderJAXRPC_JSE()
+ {
+ super();
+ }
+
+ /**
+ * Creates new JAXRPC JSE deployment and registers it with deployment unit.
+ *
+ * @param dep webservice deployment
+ * @param unit deployment unit
+ */
+ @Override
+ protected void build(final Deployment dep, final DeploymentUnit unit)
+ {
+ final JBossWebMetaData webMetaData = this.getAndPropagateAttachment(JBossWebMetaData.class, unit, dep);
+ final WebservicesMetaData wsMetaData = this.getAndPropagateAttachment(WebservicesMetaData.class, unit, dep);
+
+ this.log.debug("Creating JAXRPC JSE endpoints meta data model");
+ for (WebserviceDescriptionMetaData wsd : wsMetaData.getWebserviceDescriptions())
+ {
+ for (PortComponentMetaData pcmd : wsd.getPortComponents())
+ {
+ final String servletName = pcmd.getServletLink();
+ this.log.debug("JSE name: " + servletName);
+ final ServletMetaData servletMD = ASHelper.getServletForName(webMetaData, servletName);
+ final String servletClass = ASHelper.getEndpointName(servletMD);
+ this.log.debug("JSE class: " + servletClass);
+
+ this.newHttpEndpoint(servletClass, servletName, dep);
+ }
+ }
+ }
+}
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_EJB3.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_EJB3.java (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_EJB3.java 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1,71 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.webservices.integration.deployers.deployment;
+
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.metadata.ejb.jboss.JBossMetaData;
+import org.jboss.webservices.integration.util.ASHelper;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.deployment.integration.WebServiceDeclaration;
+import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment;
+
+/**
+ * Creates new JAXWS EJB3 deployment.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+final class DeploymentModelBuilderJAXWS_EJB3 extends AbstractDeploymentModelBuilder
+{
+ /**
+ * Constructor.
+ */
+ DeploymentModelBuilderJAXWS_EJB3()
+ {
+ super();
+ }
+
+ /**
+ * Creates new JAXWS EJB3 deployment and registers it with deployment unit.
+ *
+ * @param dep webservice deployment
+ * @param unit deployment unit
+ */
+ @Override
+ protected void build(final Deployment dep, final DeploymentUnit unit)
+ {
+ this.getAndPropagateAttachment(WebServiceDeployment.class, unit, dep);
+ this.getAndPropagateAttachment(JBossMetaData.class, unit, dep);
+
+ this.log.debug("Creating JAXWS EJB3 endpoints meta data model");
+ for (final WebServiceDeclaration container : ASHelper.getJaxwsEjbs(unit))
+ {
+ final String ejbName = container.getComponentName();
+ this.log.debug("EJB3 name: " + ejbName);
+ final String ejbClass = container.getComponentClassName();
+ this.log.debug("EJB3 class: " + ejbClass);
+
+ final Endpoint ep = this.newHttpEndpoint(ejbClass, ejbName, dep);
+ ep.setProperty(ASHelper.CONTAINER_NAME, container.getContainerName());
+ }
+ }
+}
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_JMS.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_JMS.java (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_JMS.java 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1,69 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, 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.webservices.integration.deployers.deployment;
+
+import java.util.List;
+
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.metadata.web.jboss.JBossWebMetaData;
+import org.jboss.metadata.web.spec.ServletMetaData;
+import org.jboss.webservices.integration.util.ASHelper;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.metadata.jms.JMSEndpointMetaData;
+import org.jboss.wsf.spi.metadata.jms.JMSEndpointsMetaData;
+
+/**
+ * Create JAXWS SPI Deployment for JAXWS_JMS type deployment.
+ *
+ * @author <a herf="ema(a)redhat.com>Jim Ma</a>
+ */
+public class DeploymentModelBuilderJAXWS_JMS extends AbstractDeploymentModelBuilder
+{
+ /**
+ * Constructor.
+ */
+ DeploymentModelBuilderJAXWS_JMS()
+ {
+ super();
+ }
+
+ /**
+ * Creates new JAXWS JMS deployment and registers it with deployment unit.
+ *
+ * @param dep webservice deployment
+ * @param unit deployment unit
+ */
+ @Override
+ protected void build(final Deployment dep, final DeploymentUnit unit)
+ {
+ this.getAndPropagateAttachment(JMSEndpointsMetaData.class, unit, dep);
+ JMSEndpointsMetaData jmsEndpointsMD = dep.getAttachment(JMSEndpointsMetaData.class);
+ for (JMSEndpointMetaData endpoint : jmsEndpointsMD.getEndpointsMetaData())
+ {
+ if (endpoint.getName() == null)
+ {
+ endpoint.setName(endpoint.getImplementor());
+ }
+ this.newJMSEndpoint(endpoint.getImplementor(), endpoint.getName(), dep);
+ }
+ }
+}
\ No newline at end of file
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_JSE.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_JSE.java (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_JSE.java 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1,70 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.webservices.integration.deployers.deployment;
+
+import java.util.List;
+
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.metadata.web.jboss.JBossWebMetaData;
+import org.jboss.metadata.web.spec.ServletMetaData;
+import org.jboss.webservices.integration.util.ASHelper;
+import org.jboss.wsf.spi.deployment.Deployment;
+
+/**
+ * Creates new JAXWS JSE deployment.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+final class DeploymentModelBuilderJAXWS_JSE extends AbstractDeploymentModelBuilder
+{
+ /**
+ * Constructor.
+ */
+ DeploymentModelBuilderJAXWS_JSE()
+ {
+ super();
+ }
+
+ /**
+ * Creates new JAXWS JSE deployment and registers it with deployment unit.
+ *
+ * @param dep webservice deployment
+ * @param unit deployment unit
+ */
+ @Override
+ protected void build(final Deployment dep, final DeploymentUnit unit)
+ {
+ this.getAndPropagateAttachment(JBossWebMetaData.class, unit, dep);
+
+ this.log.debug("Creating JAXWS JSE endpoints meta data model");
+ final List<ServletMetaData> servlets = ASHelper.getJaxwsServlets(unit);
+ for (ServletMetaData servlet : servlets)
+ {
+ final String servletName = servlet.getName();
+ this.log.debug("JSE name: " + servletName);
+ final String servletClass = ASHelper.getEndpointName(servlet);
+ this.log.debug("JSE class: " + servletClass);
+
+ this.newHttpEndpoint(servletClass, servletName, dep);
+ }
+ }
+}
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/WSDeploymentBuilder.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/WSDeploymentBuilder.java (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/WSDeploymentBuilder.java 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1,85 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.webservices.integration.deployers.deployment;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.webservices.integration.util.ASHelper;
+import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
+
+/**
+ * JBossWS deployment model builder.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+public final class WSDeploymentBuilder
+{
+ /** Builder instance. */
+ private static final WSDeploymentBuilder SINGLETON = new WSDeploymentBuilder();
+
+ /** Builders registry. */
+ private static final Map<DeploymentType, DeploymentModelBuilder> builders = new HashMap<DeploymentType, DeploymentModelBuilder>();;
+
+ static
+ {
+ WSDeploymentBuilder.builders.put(DeploymentType.JAXWS_JSE, new DeploymentModelBuilderJAXWS_JSE());
+ WSDeploymentBuilder.builders.put(DeploymentType.JAXRPC_JSE, new DeploymentModelBuilderJAXRPC_JSE());
+ WSDeploymentBuilder.builders.put(DeploymentType.JAXWS_EJB3, new DeploymentModelBuilderJAXWS_EJB3());
+ WSDeploymentBuilder.builders.put(DeploymentType.JAXRPC_EJB21, new DeploymentModelBuilderJAXRPC_EJB21());
+ WSDeploymentBuilder.builders.put(DeploymentType.JAXWS_JMS, new DeploymentModelBuilderJAXWS_JMS());
+ }
+
+ /**
+ * Constructor.
+ */
+ private WSDeploymentBuilder()
+ {
+ super();
+ }
+
+ /**
+ * Factory method for obtaining builder instance.
+ *
+ * @return builder instance
+ */
+ public static WSDeploymentBuilder getInstance()
+ {
+ return WSDeploymentBuilder.SINGLETON;
+ }
+
+ /**
+ * Builds JBossWS deployment model if web service deployment is detected.
+ *
+ * @param unit deployment unit
+ */
+ public void build(final DeploymentUnit unit)
+ {
+ final DeploymentType deploymentType = ASHelper.getOptionalAttachment(unit, DeploymentType.class);
+
+ if (deploymentType != null)
+ {
+ WSDeploymentBuilder.builders.get(deploymentType).newDeploymentModel(unit);
+ }
+ }
+}
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/WSVirtualFileFilter.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/WSVirtualFileFilter.java (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/WSVirtualFileFilter.java 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1,87 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.webservices.integration.deployers.deployment;
+
+import org.jboss.vfs.VirtualFile;
+import org.jboss.vfs.VirtualFileFilterWithAttributes;
+import org.jboss.vfs.VisitorAttributes;
+
+/**
+ * WS file filter for files with the '.wsdl', or '.xsd' or '.xml' suffix.
+ *
+ * @author <a href="mailto:dbevenius@jboss.com">Daniel Bevenius</a>
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+final class WSVirtualFileFilter implements VirtualFileFilterWithAttributes
+{
+ /** The tree walking attributes. */
+ private VisitorAttributes attributes;
+
+ /**
+ * Constructor.
+ */
+ WSVirtualFileFilter()
+ {
+ this(VisitorAttributes.RECURSE_LEAVES_ONLY);
+ }
+
+ /**
+ * Constructor.
+ *
+ * @param attributes visit attributes
+ */
+ WSVirtualFileFilter(final VisitorAttributes attributes)
+ {
+ this.attributes = attributes;
+ }
+
+ /**
+ * Gets VisitorAttributes for this instance.
+ *
+ * @return visitor attributes
+ */
+ public VisitorAttributes getAttributes()
+ {
+ return this.attributes;
+ }
+
+ /**
+ * Accepts files that end with '.wsdl' or '.xsd' or '.xml'.
+ *
+ * @param file to analyze
+ * @return true if expected file extension, false otherwise
+ */
+ public boolean accepts(final VirtualFile file)
+ {
+ if (file == null)
+ {
+ return false;
+ }
+
+ final String fileName = file.getName().toLowerCase();
+ final boolean hasWsdlSuffix = fileName.endsWith(".wsdl");
+ final boolean hasXsdSuffix = fileName.endsWith(".xsd");
+ final boolean hasXmlSuffix = fileName.endsWith(".xml");
+
+ return hasWsdlSuffix || hasXsdSuffix || hasXmlSuffix;
+ }
+}
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/endpoint/HornetQJMSResolver.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/endpoint/HornetQJMSResolver.java (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/endpoint/HornetQJMSResolver.java 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1,48 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, 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.webservices.integration.endpoint;
+
+import javax.jms.Destination;
+
+import org.apache.log4j.Logger;
+import org.hornetq.jms.client.HornetQDestination;
+import org.jboss.wsf.framework.management.DefaultJMSEndpointResolver;
+
+/**
+ * A JMS endpoint resolver meant for working with HornetQ destination implementation
+ *
+ * @author alessio.soldano(a)jboss.com
+ */
+public class HornetQJMSResolver extends DefaultJMSEndpointResolver
+{
+ public void setDestination(Destination destination)
+ {
+ if (destination instanceof HornetQDestination)
+ setFromName(destination, ((HornetQDestination)destination).isQueue());
+ else
+ {
+ Logger.getLogger(HornetQJMSResolver.class).warn(
+ "Destination '" + destination + "' is not a org.hornetq.jms.client.HornetQDestination instance, falling back to default JMS endpoint resolution");
+ super.setDestination(destination);
+ }
+ }
+}
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/injection/EJBBeanReferenceResolver.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/injection/EJBBeanReferenceResolver.java (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/injection/EJBBeanReferenceResolver.java 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1,122 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.webservices.integration.injection;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+
+import javax.ejb.EJB;
+
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.ejb3.ejbref.resolver.spi.EjbReference;
+import org.jboss.ejb3.ejbref.resolver.spi.EjbReferenceResolver;
+import org.jboss.wsf.common.injection.resolvers.AbstractReferenceResolver;
+
+/**
+ * EJB reference resolver.
+ *
+ * @author <a href="mailto:richard.opalka@jboss.org">Richard Opalka</a>
+ */
+final class EJBBeanReferenceResolver extends AbstractReferenceResolver<EJB>
+{
+ /**
+ * Deployment unit used for resolving process.
+ */
+ private final DeploymentUnit unit;
+
+ /**
+ * Delegate used to resolve JNDI names.
+ */
+ private final EjbReferenceResolver delegate;
+
+ /**
+ * Constructor.
+ *
+ * @param unit deployment unit
+ * @param delegate EJB reference resolver
+ */
+ EJBBeanReferenceResolver(final DeploymentUnit unit, final EjbReferenceResolver delegate)
+ {
+ super(EJB.class);
+
+ if (unit == null)
+ {
+ throw new IllegalArgumentException("Deployment unit cannot be null");
+ }
+ if (delegate == null)
+ {
+ throw new IllegalArgumentException("Ejb reference resolver cannot be null");
+ }
+
+ this.unit = unit;
+ this.delegate = delegate;
+ }
+
+ /**
+ * @see org.jboss.wsf.common.injection.resolvers.AbstractReferenceResolver#resolveField(java.lang.reflect.Field)
+ *
+ * @param field to be resolved
+ * @return JNDI name of referenced EJB object
+ */
+ @Override
+ protected String resolveField(final Field field)
+ {
+ final EJB ejbAnnotation = field.getAnnotation(EJB.class);
+ final Class<?> type = field.getType();
+ final EjbReference reference = this.getEjbReference(ejbAnnotation, type);
+
+ return this.delegate.resolveEjb(this.unit, reference);
+ }
+
+ /**
+ * @see org.jboss.wsf.common.injection.resolvers.AbstractReferenceResolver#resolveMethod(java.lang.reflect.Method)
+ *
+ * @param method to be resolved
+ * @return JNDI name of referenced EJB object
+ */
+ @Override
+ protected String resolveMethod(final Method method)
+ {
+ final EJB ejbAnnotation = method.getAnnotation(EJB.class);
+ final Class<?> type = method.getParameterTypes()[0];
+ final EjbReference reference = this.getEjbReference(ejbAnnotation, type);
+
+ return this.delegate.resolveEjb(this.unit, reference);
+ }
+
+ /**
+ * Constructs EjbReference.
+ *
+ * @param ejbAnnotation ejb annotation
+ * @param type fall back type
+ * @return ejb reference instance
+ */
+ private EjbReference getEjbReference(final EJB ejbAnnotation, final Class<?> type)
+ {
+ String beanInterface = ejbAnnotation.beanInterface().getName();
+ if (java.lang.Object.class.getName().equals(beanInterface))
+ {
+ beanInterface = type.getName();
+ }
+ return new EjbReference(ejbAnnotation.beanName(), beanInterface, ejbAnnotation.mappedName());
+ }
+}
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/injection/InjectionMetaDataDeploymentAspect.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/injection/InjectionMetaDataDeploymentAspect.java (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/injection/InjectionMetaDataDeploymentAspect.java 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1,256 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.webservices.integration.injection;
+
+import java.lang.annotation.Annotation;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.annotation.Resource;
+import javax.ejb.EJB;
+
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.ejb3.ejbref.resolver.spi.EjbReferenceResolver;
+import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeansMetaData;
+import org.jboss.metadata.ejb.jboss.JBossMetaData;
+import org.jboss.metadata.javaee.spec.EnvironmentEntriesMetaData;
+import org.jboss.metadata.javaee.spec.EnvironmentEntryMetaData;
+import org.jboss.metadata.javaee.spec.ResourceInjectionTargetMetaData;
+import org.jboss.metadata.web.jboss.JBossWebMetaData;
+import org.jboss.webservices.integration.util.ASHelper;
+import org.jboss.wsf.common.injection.resolvers.ResourceReferenceResolver;
+import org.jboss.wsf.common.integration.WSHelper;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.deployment.Service;
+import org.jboss.wsf.spi.deployment.integration.WebServiceDeclaration;
+import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment;
+import org.jboss.wsf.spi.metadata.injection.InjectionMetaData;
+import org.jboss.wsf.spi.metadata.injection.InjectionsMetaData;
+import org.jboss.wsf.spi.metadata.injection.ReferenceResolver;
+import org.jboss.wsf.common.integration.AbstractDeploymentAspect;
+
+/**
+ * Deployment aspect that builds injection meta data.
+ *
+ * @author <a href="mailto:richard.opalka@jboss.org">Richard Opalka</a>
+ */
+public final class InjectionMetaDataDeploymentAspect extends AbstractDeploymentAspect
+{
+
+ /** Resolver handling @Resource injections. */
+ private static final ReferenceResolver RESOURCE_RESOLVER = new ResourceReferenceResolver();
+
+ /** EJB 3 reference resolver. */
+ private EjbReferenceResolver ejbReferenceResolver;
+
+ /**
+ * Constructor.
+ */
+ public InjectionMetaDataDeploymentAspect()
+ {
+ super();
+ }
+
+ /**
+ * Sets ejb reference resolver. This method is invoked by MC.
+ *
+ * @param resolver ejb reference resolver
+ */
+ public void setEjbReferenceResolver(final EjbReferenceResolver resolver)
+ {
+ this.ejbReferenceResolver = resolver;
+ }
+
+ /**
+ * Gets ejb reference resolver.
+ *
+ * @return ejb reference resolver
+ */
+ public EjbReferenceResolver getEjbReferenceResolver()
+ {
+ if (this.ejbReferenceResolver == null)
+ {
+ throw new IllegalStateException("No EjbReferenceResolver set by MC");
+ }
+
+ return this.ejbReferenceResolver;
+ }
+
+ /**
+ * Builds injection meta data for all endpoints in deployment.
+ *
+ * @param dep webservice deployment
+ */
+ @Override
+ public void start(final Deployment dep)
+ {
+ final DeploymentUnit unit = WSHelper.getRequiredAttachment(dep, DeploymentUnit.class);
+ final JBossWebMetaData jbossWebMD = WSHelper.getRequiredAttachment(dep, JBossWebMetaData.class);
+ final Map<Class<? extends Annotation>, ReferenceResolver> resolvers = this.getResolvers(unit);
+
+ if (WSHelper.isJaxwsJseDeployment(dep))
+ {
+ this.log.debug("Building injection meta data for JAXWS JSE webservice deployment: " + dep.getSimpleName());
+ final EnvironmentEntriesMetaData envEntriesMD = jbossWebMD.getEnvironmentEntries();
+
+ // iterate through all POJO endpoints
+ for (Endpoint endpoint : dep.getService().getEndpoints())
+ {
+ // build POJO injections meta data
+ final InjectionsMetaData injectionsMD = this.buildInjectionsMetaData(envEntriesMD, resolvers);
+
+ // associate injections meta data with POJO endpoint
+ endpoint.addAttachment(InjectionsMetaData.class, injectionsMD);
+ }
+ }
+ else if (WSHelper.isJaxwsEjbDeployment(dep))
+ {
+ this.log.debug("Building injection meta data for JAXWS EJB3 webservice deployment: " + dep.getSimpleName());
+ final WebServiceDeployment webServiceDeployment = ASHelper.getRequiredAttachment(unit,
+ WebServiceDeployment.class);
+ final Service service = dep.getService();
+
+ // iterate through all EJB3 endpoints
+ for (final WebServiceDeclaration container : webServiceDeployment.getServiceEndpoints())
+ {
+ final String ejbName = container.getComponentName();
+ final Endpoint endpoint = service.getEndpointByName(ejbName);
+ if (endpoint != null && ASHelper.isWebServiceBean(container))
+ {
+ // build EJB 3 injections meta data
+ final EnvironmentEntriesMetaData ejbEnvEntries = this.getEnvironmentEntries(ejbName, unit);
+ final InjectionsMetaData injectionsMD = this.buildInjectionsMetaData(ejbEnvEntries, resolvers);
+
+ // associate injections meta data with EJB 3 endpoint
+ endpoint.addAttachment(InjectionsMetaData.class, injectionsMD);
+ }
+ }
+ }
+ }
+
+ /**
+ * Returns environment entries meta data associated with specified EJB 3 bean.
+ *
+ * @param ejbName EJB 3 bean to lookup environment entries for
+ * @param unit deployment unit
+ * @return environment entries meta data
+ */
+ private EnvironmentEntriesMetaData getEnvironmentEntries(final String ejbName, final DeploymentUnit unit)
+ {
+ final JBossMetaData jbossMD = ASHelper.getRequiredAttachment(unit, JBossMetaData.class);
+ final JBossEnterpriseBeansMetaData enterpriseBeansMDs = jbossMD.getEnterpriseBeans();
+
+ return enterpriseBeansMDs.get(ejbName).getEnvironmentEntries();
+ }
+
+ /**
+ * Returns reference resolvers container.
+ *
+ * @param unit deployment unit
+ * @return reference resolvers
+ */
+ private Map<Class<? extends Annotation>, ReferenceResolver> getResolvers(final DeploymentUnit unit)
+ {
+ final Map<Class<? extends Annotation>, ReferenceResolver> resolvers = new HashMap<Class<? extends Annotation>, ReferenceResolver>();
+
+ resolvers.put(Resource.class, InjectionMetaDataDeploymentAspect.RESOURCE_RESOLVER);
+ resolvers.put(EJB.class, new EJBBeanReferenceResolver(unit, this.getEjbReferenceResolver()));
+
+ return resolvers;
+ }
+
+ /**
+ * Builds JBossWS specific injections meta data.
+ *
+ * @param envEntriesMD environment entries meta data
+ * @param resolvers known annotation resolvers
+ * @param jndiContext JNDI context to be propagated
+ */
+ private InjectionsMetaData buildInjectionsMetaData(final EnvironmentEntriesMetaData envEntriesMD,
+ final Map<Class<? extends Annotation>, ReferenceResolver> resolvers)
+ {
+ final List<InjectionMetaData> injectionMD = new LinkedList<InjectionMetaData>();
+ injectionMD.addAll(this.buildInjectionMetaData(envEntriesMD));
+
+ return new InjectionsMetaData(injectionMD, resolvers);
+ }
+
+ /**
+ * Builds JBossWS specific injection meta data.
+ *
+ * @param envEntriesMD environment entries meta data
+ * @return injection meta data
+ */
+ private List<InjectionMetaData> buildInjectionMetaData(final EnvironmentEntriesMetaData envEntriesMD)
+ {
+ if ((envEntriesMD == null) || (envEntriesMD.size() == 0))
+ {
+ return Collections.emptyList();
+ }
+
+ final LinkedList<InjectionMetaData> retVal = new LinkedList<InjectionMetaData>();
+
+ Set<ResourceInjectionTargetMetaData> injectionTargets;
+ String envEntryName;
+ String envEntryValue;
+ String targetClass;
+ String targetName;
+ String envEntryValueClass;
+ boolean hasInjectionTargets;
+
+ // iterate through defined environment entries
+ for (final EnvironmentEntryMetaData envEntryMD : envEntriesMD)
+ {
+ injectionTargets = envEntryMD.getInjectionTargets();
+ hasInjectionTargets = (injectionTargets != null) && (injectionTargets.size() > 0);
+
+ if (hasInjectionTargets)
+ {
+ // prepare env entry meta data
+ envEntryName = envEntryMD.getEnvEntryName();
+ envEntryValue = envEntryMD.getValue();
+ envEntryValueClass = envEntryMD.getType();
+
+ // env entry can specify multiple injection targets
+ for (final ResourceInjectionTargetMetaData resourceInjectionTargetMD : injectionTargets)
+ {
+ // prepare injection target meta data
+ targetClass = resourceInjectionTargetMD.getInjectionTargetClass();
+ targetName = resourceInjectionTargetMD.getInjectionTargetName();
+
+ // build injection meta data for injection target
+ final InjectionMetaData injectionMD = new InjectionMetaData(targetClass, targetName, envEntryValueClass,
+ envEntryName, envEntryValue != null);
+ this.log.debug(injectionMD);
+ retVal.add(injectionMD);
+ }
+ }
+ }
+
+ return retVal;
+ }
+}
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/injection/ServiceRefResourceProvider.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/injection/ServiceRefResourceProvider.java (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/injection/ServiceRefResourceProvider.java 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1,705 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, 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.webservices.integration.injection;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.AccessibleObject;
+import java.lang.reflect.AnnotatedElement;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+import javax.naming.Referenceable;
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+import javax.xml.ws.WebServiceRef;
+import javax.xml.ws.WebServiceRefs;
+import javax.xml.ws.soap.MTOM;
+
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.logging.Logger;
+import org.jboss.switchboard.javaee.environment.Addressing;
+import org.jboss.switchboard.javaee.environment.Handler;
+import org.jboss.switchboard.javaee.environment.HandlerChain;
+import org.jboss.switchboard.javaee.environment.InjectionTarget;
+import org.jboss.switchboard.javaee.environment.PortComponent;
+import org.jboss.switchboard.javaee.environment.ServiceRefType;
+import org.jboss.switchboard.javaee.jboss.environment.JBossPortComponent;
+import org.jboss.switchboard.javaee.jboss.environment.JBossServiceRefType;
+import org.jboss.switchboard.mc.spi.MCBasedResourceProvider;
+import org.jboss.switchboard.spi.Resource;
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
+import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
+import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedCallPropertyMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainsMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedInitParamMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedStubPropertyMetaData;
+import org.jboss.wsf.spi.serviceref.ServiceRefHandler;
+import org.jboss.wsf.spi.serviceref.ServiceRefHandlerFactory;
+import org.jboss.wsf.spi.serviceref.ServiceRefHandler.Type;
+
+/**
+ * Service reference resource provider.
+ *
+ * Conventions used in this source code are:
+ * <ul>
+ * <li>SBMD - switch board meta data</li>
+ * <li>UMDM - jbossws unified meta data model</li>
+ * </ul>
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+public final class ServiceRefResourceProvider implements MCBasedResourceProvider<ServiceRefType>
+{
+
+ private static final Logger log = Logger.getLogger(ServiceRefResourceProvider.class);
+
+ private final ServiceRefHandler delegate;
+
+ /**
+ * Constructor.
+ */
+ public ServiceRefResourceProvider()
+ {
+ final SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ this.delegate = spiProvider.getSPI(ServiceRefHandlerFactory.class).getServiceRefHandler();
+ }
+
+ /**
+ * Provides service ref resource.
+ */
+ @Override
+ public Resource provide(final DeploymentUnit deploymentUnit, final ServiceRefType serviceRefSBMD)
+ {
+ final ClassLoader newLoader = deploymentUnit.getClassLoader();
+ final ClassLoader oldLoader = Thread.currentThread().getContextClassLoader();
+
+ try
+ {
+ Thread.currentThread().setContextClassLoader(newLoader);
+ final UnifiedVirtualFile vfsRoot = this.getUnifiedVirtualFile(deploymentUnit);
+ final UnifiedServiceRefMetaData serviceRefUMDM = this.getUnifiedServiceRefMetaData(vfsRoot, serviceRefSBMD,
+ newLoader);
+ final Referenceable jndiReferenceable = this.delegate.createReferenceable(serviceRefUMDM);
+
+ return new ServiceRefResource(jndiReferenceable);
+ }
+ finally
+ {
+ Thread.currentThread().setContextClassLoader(oldLoader);
+ }
+ }
+
+ /**
+ * Inform about type this resource handler can handle.
+ *
+ * @return handled type
+ */
+ @Override
+ public Class<ServiceRefType> getEnvironmentEntryType()
+ {
+ return ServiceRefType.class;
+ }
+
+ /**
+ * Constructs vfs root from deployment unit.
+ *
+ * @param deploymentUnit
+ * @return vfs root
+ */
+ private UnifiedVirtualFile getUnifiedVirtualFile(final DeploymentUnit deploymentUnit)
+ {
+ DeploymentUnit tempDeploymentUnit = deploymentUnit;
+ while (tempDeploymentUnit.isComponent())
+ tempDeploymentUnit = tempDeploymentUnit.getParent();
+
+ if (tempDeploymentUnit instanceof VFSDeploymentUnit)
+ {
+ VFSDeploymentUnit vdu = (VFSDeploymentUnit) tempDeploymentUnit;
+ return new VirtualFileAdaptor(vdu.getRoot());
+ }
+ else
+ {
+ throw new IllegalArgumentException("Can only handle real VFS deployments: " + tempDeploymentUnit);
+ }
+ }
+
+ /**
+ * Translates service ref switchboard meta data to JBossWS unified service ref meta data.
+ *
+ * @param vfsRoot virtual file system root
+ * @param serviceRefSBMD service reference switchboard meta data
+ * @return unified jbossws service reference meta data
+ */
+ private UnifiedServiceRefMetaData getUnifiedServiceRefMetaData(final UnifiedVirtualFile vfsRoot,
+ final ServiceRefType serviceRefSBMD, final ClassLoader loader)
+ {
+ final UnifiedServiceRefMetaData serviceRefUMDM = new UnifiedServiceRefMetaData(vfsRoot);
+ serviceRefUMDM.setServiceRefName(serviceRefSBMD.getName());
+ serviceRefUMDM.setServiceRefType(serviceRefSBMD.getType());
+ serviceRefUMDM.setServiceInterface(serviceRefSBMD.getServiceInterface());
+ serviceRefUMDM.setWsdlFile(serviceRefSBMD.getWsdlFile());
+ serviceRefUMDM.setMappingFile(serviceRefSBMD.getMappingFile());
+ serviceRefUMDM.setServiceQName(serviceRefSBMD.getQName());
+ serviceRefUMDM.setHandlerChain(serviceRefSBMD.getHandlerChain());
+
+ // propagate addressing properties
+ serviceRefUMDM.setAddressingAnnotationSpecified(serviceRefSBMD.isAddressingFeatureEnabled());
+ serviceRefUMDM.setAddressingEnabled(serviceRefSBMD.isAddressingEnabled());
+ serviceRefUMDM.setAddressingRequired(serviceRefSBMD.isAddressingRequired());
+ serviceRefUMDM.setAddressingResponses(serviceRefSBMD.getAddressingResponses());
+
+ // propagate MTOM properties
+ serviceRefUMDM.setMtomAnnotationSpecified(serviceRefSBMD.isMtomFeatureEnabled());
+ serviceRefUMDM.setMtomEnabled(serviceRefSBMD.isMtomEnabled());
+ serviceRefUMDM.setMtomThreshold(serviceRefSBMD.getMtomThreshold());
+
+ // propagate respect binding properties
+ serviceRefUMDM.setRespectBindingAnnotationSpecified(serviceRefSBMD.isRespectBindingFeatureEnabled());
+ serviceRefUMDM.setRespectBindingEnabled(serviceRefSBMD.isRespectBindingEnabled());
+
+ // process injection targets
+ if (serviceRefSBMD.getInjectionTargets() != null && serviceRefSBMD.getInjectionTargets().size() > 0)
+ {
+ if (serviceRefSBMD.getInjectionTargets().size() > 1)
+ {
+ // TODO: We should validate all the injection targets whether they're compatible.
+ // This means all the injection targets must be assignable or equivalent.
+ // If there are @Addressing, @RespectBinding or @MTOM annotations present on injection targets,
+ // these annotations must be equivalent for all the injection targets.
+ }
+ final InjectionTarget injectionTarget = serviceRefSBMD.getInjectionTargets().iterator().next();
+
+ AccessibleObject anAlement = this.findInjectionTarget(loader, injectionTarget);
+ this.processAnnotatedElement(anAlement, serviceRefUMDM);
+ }
+
+ // propagate port compoments
+ final Collection<? extends PortComponent> portComponentsSBMD = serviceRefSBMD.getPortComponents();
+ if (portComponentsSBMD != null)
+ {
+ for (final PortComponent portComponentSBMD : portComponentsSBMD)
+ {
+ final UnifiedPortComponentRefMetaData portComponentUMDM = this.getUnifiedPortComponentRefMetaData(
+ serviceRefUMDM, portComponentSBMD);
+ if (portComponentUMDM.getServiceEndpointInterface() != null || portComponentUMDM.getPortQName() != null)
+ {
+ serviceRefUMDM.addPortComponentRef(portComponentUMDM);
+ }
+ else
+ {
+ log.warn("Ignoring <port-component-ref> without <service-endpoint-interface> and <port-qname>: "
+ + portComponentUMDM);
+ }
+ }
+ }
+
+ // propagate handlers
+ final Collection<Handler> handlersSBMD = serviceRefSBMD.getHandlers();
+ if (handlersSBMD != null)
+ {
+ for (final Handler handlerSBMD : handlersSBMD)
+ {
+ final UnifiedHandlerMetaData handlerUMDM = this.getUnifiedHandlerMetaData(handlerSBMD);
+ serviceRefUMDM.addHandler(handlerUMDM);
+ }
+ }
+
+ // propagate handler chains
+ final List<HandlerChain> handlerChainsSBMD = serviceRefSBMD.getHandlerChains();
+ if (handlerChainsSBMD != null)
+ {
+ final UnifiedHandlerChainsMetaData handlerChainsUMDM = this.getUnifiedHandlerChainsMetaData(handlerChainsSBMD);
+ serviceRefUMDM.setHandlerChains(handlerChainsUMDM);
+ }
+
+ // propagate jboss specific MD
+ if (serviceRefSBMD instanceof JBossServiceRefType)
+ {
+ this.processUnifiedJBossServiceRefMetaData(serviceRefUMDM, serviceRefSBMD);
+ }
+
+ // detect JAXWS or JAXRPC type
+ this.processType(serviceRefUMDM);
+
+ return serviceRefUMDM;
+ }
+
+ /**
+ * Translates jboss service ref switchboard meta data to JBossWS unified service ref meta data.
+ *
+ * @param serviceRefUMDM service reference unified meta data
+ * @param serviceRefSBMD service reference switchboard meta data
+ */
+ private void processUnifiedJBossServiceRefMetaData(final UnifiedServiceRefMetaData serviceRefUMDM,
+ final ServiceRefType serviceRefSBMD)
+ {
+ final JBossServiceRefType jbossServiceRefSBMD = (JBossServiceRefType) serviceRefSBMD;
+ serviceRefUMDM.setServiceImplClass(jbossServiceRefSBMD.getServiceClass());
+ serviceRefUMDM.setConfigName(jbossServiceRefSBMD.getConfigName());
+ serviceRefUMDM.setConfigFile(jbossServiceRefSBMD.getConfigFile());
+ serviceRefUMDM.setWsdlOverride(jbossServiceRefSBMD.getWsdlOverride());
+ serviceRefUMDM.setHandlerChain(jbossServiceRefSBMD.getHandlerChain());
+ }
+
+ /**
+ * Translates handler chains switchboard meta data to JBossWS unified handler chains meta data.
+ *
+ * @param handlerChainsSBMD handler chains switchboard meta data
+ * @return handler chains JBossWS unified meta data
+ */
+ private UnifiedHandlerChainsMetaData getUnifiedHandlerChainsMetaData(final List<HandlerChain> handlerChainsSBMD)
+ {
+ final UnifiedHandlerChainsMetaData handlerChainsUMDM = new UnifiedHandlerChainsMetaData();
+
+ for (final HandlerChain handlerChainSBMD : handlerChainsSBMD)
+ {
+ final UnifiedHandlerChainMetaData handlerChainUMDM = new UnifiedHandlerChainMetaData();
+ handlerChainUMDM.setServiceNamePattern(handlerChainSBMD.getServiceNamePattern());
+ handlerChainUMDM.setPortNamePattern(handlerChainSBMD.getPortNamePattern());
+ handlerChainUMDM.setProtocolBindings(handlerChainSBMD.getProtocolBindings());
+
+ final List<Handler> handlersSBMD = handlerChainSBMD.getHandlers();
+ for (final Handler handlerSBMD : handlersSBMD)
+ {
+ final UnifiedHandlerMetaData handlerUMDM = getUnifiedHandlerMetaData(handlerSBMD);
+ handlerChainUMDM.addHandler(handlerUMDM);
+ }
+
+ handlerChainsUMDM.addHandlerChain(handlerChainUMDM);
+ }
+
+ return handlerChainsUMDM;
+ }
+
+ /**
+ * Translates handler switchboard meta data to JBossWS unified handler meta data.
+ *
+ * @param handlerSBMD handler switchboard meta data
+ * @return handler JBossWS unified meta data
+ */
+ private UnifiedHandlerMetaData getUnifiedHandlerMetaData(final Handler handlerSBMD)
+ {
+ final UnifiedHandlerMetaData handlerUMDM = new UnifiedHandlerMetaData();
+ handlerUMDM.setHandlerName(handlerSBMD.getHandlerName());
+ handlerUMDM.setHandlerClass(handlerSBMD.getHandlerClass());
+
+ // translate handler init params
+ final Map<String, String> handlerInitParamsSBMD = handlerSBMD.getInitParams();
+ if (handlerInitParamsSBMD != null)
+ {
+ for (final String initParamName : handlerInitParamsSBMD.keySet())
+ {
+ final UnifiedInitParamMetaData handlerInitParamUMDM = new UnifiedInitParamMetaData();
+ handlerInitParamUMDM.setParamName(initParamName);
+ handlerInitParamUMDM.setParamValue(handlerInitParamsSBMD.get(initParamName));
+ handlerUMDM.addInitParam(handlerInitParamUMDM);
+ }
+ }
+
+ // translate handler soap headers
+ final Collection<QName> handlerSoapHeadersSBDM = handlerSBMD.getSoapHeaders();
+ if (handlerSoapHeadersSBDM != null)
+ {
+ for (final QName soapHeader : handlerSoapHeadersSBDM)
+ {
+ handlerUMDM.addSoapHeader(soapHeader);
+ }
+ }
+
+ // translate handler soap roles
+ final Collection<String> handlerSoapRolesSBMD = handlerSBMD.getSoapRoles();
+ if (handlerSoapRolesSBMD != null)
+ {
+ for (final String soapRole : handlerSoapRolesSBMD)
+ {
+ handlerUMDM.addSoapRole(soapRole);
+ }
+ }
+
+ // translate handler port names
+ final Collection<String> handlerPortNamesSBMD = handlerSBMD.getPortNames();
+ if (handlerPortNamesSBMD != null)
+ {
+ for (final String portName : handlerPortNamesSBMD)
+ {
+ handlerUMDM.addPortName(portName);
+ }
+ }
+
+ return handlerUMDM;
+ }
+
+ /**
+ * Translates port component ref switchboard meta data to JBossWS unified port component ref meta data.
+ *
+ * @param serviceRefUMDM service ref unified meta data
+ * @param portComponentSBMD port component ref switchboard meta data
+ * @return port component ref unified meta data
+ */
+ private UnifiedPortComponentRefMetaData getUnifiedPortComponentRefMetaData(
+ final UnifiedServiceRefMetaData serviceRefUMDM, final PortComponent portComponentSBMD)
+ {
+ final UnifiedPortComponentRefMetaData portComponentUMDM = new UnifiedPortComponentRefMetaData(serviceRefUMDM);
+
+ // propagate service endpoint interface
+ portComponentUMDM.setServiceEndpointInterface(portComponentSBMD.getEndpointInterface());
+
+ // propagate MTOM properties
+ portComponentUMDM.setMtomEnabled(portComponentSBMD.isMtomEnabled());
+ portComponentUMDM.setMtomThreshold(portComponentSBMD.getMtomThreshold());
+
+ // propagate addressing properties
+ final Addressing addressingSBMD = portComponentSBMD.getAddressing();
+ if (addressingSBMD != null)
+ {
+ portComponentUMDM.setAddressingAnnotationSpecified(true);
+ portComponentUMDM.setAddressingEnabled(addressingSBMD.isEnabled());
+ portComponentUMDM.setAddressingRequired(addressingSBMD.isRequired());
+ portComponentUMDM.setAddressingResponses(addressingSBMD.getResponses());
+ }
+
+ // propagate respect binding properties
+ if (portComponentSBMD.isRespectBindingEnabled())
+ {
+ portComponentUMDM.setRespectBindingAnnotationSpecified(true);
+ portComponentUMDM.setRespectBindingEnabled(true);
+ }
+
+ // propagate link
+ portComponentUMDM.setPortComponentLink(portComponentSBMD.getLink());
+
+ // propagate jboss specific MD
+ if (portComponentSBMD instanceof JBossPortComponent)
+ {
+ this.processUnifiedJBossPortComponentRefMetaData(portComponentUMDM, portComponentSBMD);
+ }
+
+ return portComponentUMDM;
+ }
+
+ /**
+ * Translates jboss port component ref switchboard meta data to JBossWS unified port component ref meta data.
+ *
+ * @param portComponentUMDM port component unified meta data
+ * @param portComponentSBMD port component switchboard meta data
+ */
+ private void processUnifiedJBossPortComponentRefMetaData(final UnifiedPortComponentRefMetaData portComponentUMDM,
+ final PortComponent portComponentSBMD)
+ {
+ final JBossPortComponent jbossPortComponentSBMD = (JBossPortComponent) portComponentSBMD;
+
+ // propagate port QName
+ portComponentUMDM.setPortQName(jbossPortComponentSBMD.getPortQName());
+
+ // propagate configuration properties
+ portComponentUMDM.setConfigName(jbossPortComponentSBMD.getConfigName());
+ portComponentUMDM.setConfigFile(jbossPortComponentSBMD.getConfigFile());
+
+ // propagate stub properties
+ final Map<String, String> stubPropertiesSBMD = jbossPortComponentSBMD.getStubProperties();
+ if (stubPropertiesSBMD != null)
+ {
+ for (final String propertyName : stubPropertiesSBMD.keySet())
+ {
+ final UnifiedStubPropertyMetaData stubPropertyUMDM = new UnifiedStubPropertyMetaData();
+ stubPropertyUMDM.setPropName(propertyName);
+ stubPropertyUMDM.setPropValue(stubPropertiesSBMD.get(propertyName));
+ portComponentUMDM.addStubProperty(stubPropertyUMDM);
+ }
+ }
+
+ // propagate call properties
+ final Map<String, String> callPropertiesSBMD = jbossPortComponentSBMD.getCallProperties();
+ if (callPropertiesSBMD != null)
+ {
+ for (final String propertyName : callPropertiesSBMD.keySet())
+ {
+ final UnifiedCallPropertyMetaData callPropertyUMDM = new UnifiedCallPropertyMetaData();
+ callPropertyUMDM.setPropName(propertyName);
+ callPropertyUMDM.setPropValue(callPropertiesSBMD.get(propertyName));
+ portComponentUMDM.addCallProperty(callPropertyUMDM);
+ }
+ }
+ }
+
+ /**
+ * Switchboard service ref resource.
+ */
+ private static final class ServiceRefResource implements Resource
+ {
+ private final Referenceable target;
+
+ private ServiceRefResource(final Referenceable target)
+ {
+ this.target = target;
+ }
+
+ @Override
+ public Object getDependency()
+ {
+ return null;
+ }
+
+ @Override
+ public Object getTarget()
+ {
+ return this.target;
+ }
+
+ @Override
+ public Collection<?> getInvocationDependencies()
+ {
+ return null;
+ }
+ }
+
+ private void processAnnotatedElement(final AnnotatedElement anElement, final UnifiedServiceRefMetaData serviceRefUMDM)
+ {
+ this.processAddressingAnnotation(anElement, serviceRefUMDM);
+ this.processMTOMAnnotation(anElement, serviceRefUMDM);
+ this.processRespectBindingAnnotation(anElement, serviceRefUMDM);
+ this.processHandlerChainAnnotation(anElement, serviceRefUMDM);
+ this.processServiceRefType(anElement, serviceRefUMDM);
+ }
+
+ // TODO: use classloader to detect service ref type
+ private void processType(final UnifiedServiceRefMetaData serviceRefUMDM)
+ {
+ final boolean isJAXRPC = serviceRefUMDM.getMappingFile() != null // TODO: is mappingFile check required?
+ || "javax.xml.rpc.Service".equals(serviceRefUMDM.getServiceInterface());
+
+ serviceRefUMDM.setType(isJAXRPC ? Type.JAXRPC : Type.JAXWS);
+ }
+
+ private void processAddressingAnnotation(final AnnotatedElement anElement,
+ final UnifiedServiceRefMetaData serviceRefUMDM)
+ {
+ final javax.xml.ws.soap.Addressing addressingAnnotation = this.getAnnotation(anElement,
+ javax.xml.ws.soap.Addressing.class);
+
+ if (addressingAnnotation != null)
+ {
+ serviceRefUMDM.setAddressingAnnotationSpecified(true);
+ serviceRefUMDM.setAddressingEnabled(addressingAnnotation.enabled());
+ serviceRefUMDM.setAddressingRequired(addressingAnnotation.required());
+ serviceRefUMDM.setAddressingResponses(addressingAnnotation.responses().toString());
+ }
+ }
+
+ private void processMTOMAnnotation(final AnnotatedElement anElement, final UnifiedServiceRefMetaData serviceRefUMDM)
+ {
+ final MTOM mtomAnnotation = this.getAnnotation(anElement, MTOM.class);
+
+ if (mtomAnnotation != null)
+ {
+ serviceRefUMDM.setMtomAnnotationSpecified(true);
+ serviceRefUMDM.setMtomEnabled(mtomAnnotation.enabled());
+ serviceRefUMDM.setMtomThreshold(mtomAnnotation.threshold());
+ }
+ }
+
+ private void processRespectBindingAnnotation(final AnnotatedElement anElement,
+ final UnifiedServiceRefMetaData serviceRefUMDM)
+ {
+ final javax.xml.ws.RespectBinding respectBindingAnnotation = this.getAnnotation(anElement,
+ javax.xml.ws.RespectBinding.class);
+
+ if (respectBindingAnnotation != null)
+ {
+ serviceRefUMDM.setRespectBindingAnnotationSpecified(true);
+ serviceRefUMDM.setRespectBindingEnabled(respectBindingAnnotation.enabled());
+ }
+ }
+
+ private void processServiceRefType(final AnnotatedElement anElement, final UnifiedServiceRefMetaData serviceRefUMDM)
+ {
+ if (anElement instanceof Field)
+ {
+ final Class<?> targetClass = ((Field) anElement).getType();
+ serviceRefUMDM.setServiceRefType(targetClass.getName());
+
+ if (Service.class.isAssignableFrom(targetClass))
+ serviceRefUMDM.setServiceInterface(targetClass.getName());
+ }
+ else if (anElement instanceof Method)
+ {
+ final Class<?> targetClass = ((Method) anElement).getParameterTypes()[0];
+ serviceRefUMDM.setServiceRefType(targetClass.getName());
+
+ if (Service.class.isAssignableFrom(targetClass))
+ serviceRefUMDM.setServiceInterface(targetClass.getName());
+ }
+ else
+ {
+ final WebServiceRef serviceRefAnnotation = this.getWebServiceRefAnnotation(anElement, serviceRefUMDM);
+ Class<?> targetClass = null;
+ if (serviceRefAnnotation != null && (serviceRefAnnotation.type() != Object.class))
+ {
+ targetClass = serviceRefAnnotation.type();
+ serviceRefUMDM.setServiceRefType(targetClass.getName());
+
+ if (Service.class.isAssignableFrom(targetClass))
+ serviceRefUMDM.setServiceInterface(targetClass.getName());
+ }
+ }
+ }
+
+ private void processHandlerChainAnnotation(final AnnotatedElement anElement,
+ final UnifiedServiceRefMetaData serviceRefUMDM)
+ {
+ final javax.jws.HandlerChain handlerChainAnnotation = this.getAnnotation(anElement, javax.jws.HandlerChain.class);
+
+ if (handlerChainAnnotation != null)
+ {
+ // Set the handlerChain from @HandlerChain on the annotated element
+ String handlerChain = null;
+ if (handlerChainAnnotation.file().length() > 0)
+ handlerChain = handlerChainAnnotation.file();
+
+ // Resolve path to handler chain
+ if (handlerChain != null)
+ {
+ try
+ {
+ new URL(handlerChain);
+ }
+ catch (MalformedURLException ignored)
+ {
+ final Class<?> declaringClass = getDeclaringClass(anElement);
+
+ handlerChain = declaringClass.getPackage().getName().replace('.', '/') + "/" + handlerChain;
+ }
+
+ serviceRefUMDM.setHandlerChain(handlerChain);
+ }
+ }
+ }
+
+ private Class<?> getDeclaringClass(final AnnotatedElement annotatedElement)
+ {
+ Class<?> declaringClass = null;
+ if (annotatedElement instanceof Field)
+ declaringClass = ((Field) annotatedElement).getDeclaringClass();
+ else if (annotatedElement instanceof Method)
+ declaringClass = ((Method) annotatedElement).getDeclaringClass();
+ else if (annotatedElement instanceof Class)
+ declaringClass = (Class<?>) annotatedElement;
+
+ return declaringClass;
+ }
+
+ private <T extends Annotation> T getAnnotation(final AnnotatedElement anElement, final Class<T> annotationClass)
+ {
+ return anElement != null ? (T) anElement.getAnnotation(annotationClass) : null;
+ }
+
+ private WebServiceRef getWebServiceRefAnnotation(final AnnotatedElement anElement,
+ final UnifiedServiceRefMetaData serviceRefUMDM)
+ {
+ final WebServiceRef webServiceRefAnnotation = this.getAnnotation(anElement, WebServiceRef.class);
+ final WebServiceRefs webServiceRefsAnnotation = this.getAnnotation(anElement, WebServiceRefs.class);
+
+ if (webServiceRefAnnotation == null && webServiceRefsAnnotation == null)
+ {
+ return null;
+ }
+
+ // Build the list of @WebServiceRef relevant annotations
+ final List<WebServiceRef> wsrefList = new ArrayList<WebServiceRef>();
+
+ if (webServiceRefAnnotation != null)
+ {
+ wsrefList.add(webServiceRefAnnotation);
+ }
+
+ if (webServiceRefsAnnotation != null)
+ {
+ for (final WebServiceRef webServiceRefAnn : webServiceRefsAnnotation.value())
+ {
+ wsrefList.add(webServiceRefAnn);
+ }
+ }
+
+ // Return effective @WebServiceRef annotation
+ WebServiceRef returnValue = null;
+ if (wsrefList.size() == 1)
+ {
+ returnValue = wsrefList.get(0);
+ }
+ else
+ {
+ for (WebServiceRef webServiceRefAnn : wsrefList)
+ {
+ if (serviceRefUMDM.getServiceRefName().endsWith(webServiceRefAnn.name()))
+ {
+ returnValue = webServiceRefAnn;
+ break;
+ }
+ }
+ }
+
+ return returnValue;
+ }
+
+ private AccessibleObject findInjectionTarget(ClassLoader loader, InjectionTarget target)
+ {
+ Class<?> clazz = null;
+ try
+ {
+ clazz = loader.loadClass(target.getTargetClass());
+ }
+ catch (ClassNotFoundException e)
+ {
+ throw new RuntimeException("<injection-target> class: " + target.getTargetClass()
+ + " was not found in deployment");
+ }
+
+ for (Field field : clazz.getDeclaredFields())
+ {
+ if (target.getTargetName().equals(field.getName()))
+ return field;
+ }
+
+ for (Method method : clazz.getDeclaredMethods())
+ {
+ if (method.getName().equals(target.getTargetName()))
+ return method;
+ }
+
+ throw new RuntimeException("<injection-target> could not be found: " + target.getTargetClass() + "."
+ + target.getTargetName());
+
+ }
+}
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/injection/VirtualFileAdaptor.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/injection/VirtualFileAdaptor.java (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/injection/VirtualFileAdaptor.java 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1,244 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.webservices.integration.injection;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.ObjectStreamField;
+import java.io.OutputStream;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.jar.JarEntry;
+import java.util.jar.JarInputStream;
+import java.util.jar.JarOutputStream;
+
+import org.jboss.vfs.VFS;
+import org.jboss.vfs.VFSUtils;
+import org.jboss.vfs.VirtualFile;
+import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
+import org.jboss.wsf.spi.deployment.WritableUnifiedVirtualFile;
+
+/**
+ * A VirtualFile adaptor.
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @author Ales.Justin(a)jboss.org
+ * @author alessio.soldano(a)jboss.com
+ */
+public final class VirtualFileAdaptor implements WritableUnifiedVirtualFile
+{
+ private static final long serialVersionUID = -4509594124653184348L;
+
+ private static final ObjectStreamField[] serialPersistentFields =
+ {
+ new ObjectStreamField("rootUrl", URL.class),
+ new ObjectStreamField("path", String.class),
+ new ObjectStreamField("requiresMount", boolean.class)
+ };
+
+ /** Minimal info to get full vfs file structure */
+ private URL rootUrl;
+ private String path;
+ private boolean requiresMount;
+ /** The virtual file */
+ private transient VirtualFile file;
+
+ public VirtualFileAdaptor(VirtualFile file)
+ {
+ this.file = file;
+ }
+
+ public VirtualFileAdaptor(URL rootUrl, String path)
+ {
+ this(rootUrl, path, false);
+ }
+
+ protected VirtualFileAdaptor(URL rootUrl, String path, boolean requiresMount)
+ {
+ if (rootUrl == null)
+ throw new IllegalArgumentException("Null root url");
+ if (path == null)
+ throw new IllegalArgumentException("Null path");
+
+ this.rootUrl = rootUrl;
+ this.path = path;
+ this.requiresMount = requiresMount;
+ }
+
+ /**
+ * Get the virtual file.
+ * Create file from root url and path if it doesn't exist yet.
+ *
+ * @return virtual file root
+ * @throws IOException for any error
+ */
+ protected VirtualFile getFile() throws IOException
+ {
+ if (file == null)
+ {
+ VirtualFile root;
+ try
+ {
+ root = VFS.getChild(rootUrl);
+ }
+ catch (URISyntaxException e)
+ {
+ throw new IOException("Unable to get Virtualfile from URL: " + rootUrl, e);
+ }
+ file = root.getChild(path);
+
+ if (!file.exists())
+ {
+ throw new IOException("VirtualFile " + file + " does not exist");
+ }
+ else if (requiresMount && !isMounted(root, file))
+ {
+ throw new IOException("VirtualFile " + file + " is not mounted");
+ }
+ }
+ return file;
+ }
+
+ private static boolean isMounted(VirtualFile root, VirtualFile child) throws IOException
+ {
+ return !(root.getPathName().equals(root.getPhysicalFile().getAbsolutePath()) && child.getPathName().equals(child.getPhysicalFile().getAbsolutePath()));
+ }
+
+ public UnifiedVirtualFile findChild(String child) throws IOException
+ {
+ final VirtualFile virtualFile = getFile();
+ final VirtualFile childFile = file.getChild(child);
+ if(!childFile.exists())
+ throw new IOException("Child '" + child + "' not found for VirtualFile " + virtualFile);
+ return new VirtualFileAdaptor(childFile);
+ }
+
+ public URL toURL()
+ {
+ try
+ {
+ return getFile().toURL();
+ }
+ catch (Exception e)
+ {
+ return null;
+ }
+ }
+
+ public void writeContent(OutputStream bos) throws IOException
+ {
+ writeContent(bos, null);
+ }
+
+ public void writeContent(OutputStream bos, NameFilter filter) throws IOException
+ {
+ InputStream is = null;
+ try
+ {
+ is = getFile().openStream();
+ if (is instanceof JarInputStream)
+ {
+ JarInputStream jis = (JarInputStream)is;
+ JarOutputStream os = new JarOutputStream(bos);
+ JarEntry je = null;
+ while ((je = jis.getNextJarEntry()) != null)
+ {
+ if (filter != null && filter.accept(je.getName()))
+ {
+ os.putNextEntry(je);
+ VFSUtils.copyStream(jis, os);
+ }
+ }
+ VFSUtils.safeClose(os);
+ }
+ else
+ {
+ VFSUtils.copyStream(is, bos);
+ }
+ }
+ finally
+ {
+ VFSUtils.safeClose(is);
+ }
+ }
+
+ private void writeObject(ObjectOutputStream out) throws IOException, URISyntaxException
+ {
+ VirtualFile file = getFile();
+ URL url = rootUrl;
+ if (url == null)
+ {
+ VirtualFile parentFile = file.getParent();
+ url = parentFile != null ? parentFile.toURL() : null;
+ }
+ String pathName = path;
+ if (pathName == null)
+ pathName = file.getName();
+
+ ObjectOutputStream.PutField fields = out.putFields();
+ fields.put("rootUrl", url);
+ fields.put("path", pathName);
+
+ VirtualFile newRoot = VFS.getChild(url);
+ VirtualFile newChild = newRoot.getChild(pathName);
+ fields.put("requiresMount", isMounted(newRoot, newChild));
+
+ out.writeFields();
+ }
+
+ private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException
+ {
+ ObjectInputStream.GetField fields = in.readFields();
+ rootUrl = (URL) fields.get("rootUrl", null);
+ path = (String) fields.get("path", null);
+ requiresMount = fields.get("requiresMount", false);
+ }
+
+ public List<UnifiedVirtualFile> getChildren() throws IOException
+ {
+ List<VirtualFile> vfList = getFile().getChildren();
+ if (vfList == null)
+ return null;
+ List<UnifiedVirtualFile> uvfList = new LinkedList<UnifiedVirtualFile>();
+ for (VirtualFile vf : vfList)
+ {
+ uvfList.add(new VirtualFileAdaptor(vf));
+ }
+ return uvfList;
+ }
+
+ public String getName()
+ {
+ try
+ {
+ return getFile().getName();
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+}
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/injection/WebServiceContextResourceProvider.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/injection/WebServiceContextResourceProvider.java (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/injection/WebServiceContextResourceProvider.java 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1,84 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.webservices.integration.injection;
+
+import java.util.Collection;
+
+import javax.xml.ws.WebServiceContext;
+
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.switchboard.javaee.jboss.environment.JBossResourceEnvRefType;
+import org.jboss.switchboard.mc.spi.MCBasedResourceProvider;
+import org.jboss.switchboard.spi.Resource;
+import org.jboss.wsf.common.injection.ThreadLocalAwareWebServiceContext;
+
+/**
+ * WebServiceContext resource provider.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+public final class WebServiceContextResourceProvider implements MCBasedResourceProvider<JBossResourceEnvRefType>
+{
+
+ @Override
+ public Resource provide(final DeploymentUnit unit, final JBossResourceEnvRefType resEnvRef)
+ {
+ return new WebServiceContextResource(ThreadLocalAwareWebServiceContext.getInstance());
+ }
+
+ @Override
+ public Class<JBossResourceEnvRefType> getEnvironmentEntryType()
+ {
+ return JBossResourceEnvRefType.class;
+ }
+
+ /**
+ * Switchboard web service context resource.
+ */
+ private static final class WebServiceContextResource implements Resource
+ {
+ private final WebServiceContext target;
+
+ private WebServiceContextResource(final WebServiceContext target)
+ {
+ this.target = target;
+ }
+
+ @Override
+ public Object getDependency()
+ {
+ return null;
+ }
+
+ @Override
+ public Object getTarget()
+ {
+ return this.target;
+ }
+
+ @Override
+ public Collection<?> getInvocationDependencies()
+ {
+ return null;
+ }
+ }
+}
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerEJB21.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerEJB21.java (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerEJB21.java 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1,244 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.webservices.integration.invocation;
+
+import java.lang.reflect.Method;
+import java.security.Principal;
+
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+import javax.xml.rpc.handler.MessageContext;
+import javax.xml.rpc.handler.soap.SOAPMessageContext;
+import javax.xml.ws.WebServiceException;
+
+import org.jboss.ejb.EjbModule;
+import org.jboss.ejb.Interceptor;
+import org.jboss.ejb.StatelessSessionContainer;
+import org.jboss.invocation.InvocationKey;
+import org.jboss.invocation.InvocationType;
+import org.jboss.invocation.PayloadKey;
+import org.jboss.mx.util.MBeanServerLocator;
+import org.jboss.wsf.common.ObjectNameFactory;
+import org.jboss.wsf.common.integration.WSHelper;
+import org.jboss.wsf.common.invocation.AbstractInvocationHandler;
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.invocation.HandlerCallback;
+import org.jboss.wsf.spi.invocation.Invocation;
+import org.jboss.wsf.spi.invocation.SecurityAdaptor;
+import org.jboss.wsf.spi.invocation.SecurityAdaptorFactory;
+import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.EJBMetaData;
+
+/**
+ * Handles invocations on EJB21 endpoints.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ * @author <a href="mailto:tdiesler@redhat.com">Thomas Diesler</a>
+ */
+final class InvocationHandlerEJB21 extends AbstractInvocationHandler
+{
+ /** EJB21 JNDI name. */
+ private String jndiName;
+
+ /** MBean server. */
+ private MBeanServer server;
+
+ /** Object name. */
+ private ObjectName ejb21ContainerName;
+
+ /**
+ * Consctructor.
+ */
+ InvocationHandlerEJB21()
+ {
+ this.server = MBeanServerLocator.locateJBoss();
+ }
+
+ /**
+ * Initializes EJB 21 endpoint.
+ *
+ * @param endpoint web service endpoint
+ */
+ public void init(final Endpoint endpoint)
+ {
+ final String ejbName = endpoint.getShortName();
+ final Deployment dep = endpoint.getService().getDeployment();
+ final EJBArchiveMetaData ejbArchiveMD = WSHelper.getRequiredAttachment(dep, EJBArchiveMetaData.class);
+ final EJBMetaData ejbMD = (EJBMetaData) ejbArchiveMD.getBeanByEjbName(ejbName);
+
+ if (ejbMD == null)
+ {
+ throw new WebServiceException("Cannot obtain ejb meta data for: " + ejbName);
+ }
+
+ // get the bean's JNDI name
+ this.jndiName = ejbMD.getContainerObjectNameJndiName();
+
+ if (this.jndiName == null)
+ {
+ throw new WebServiceException("Cannot obtain JNDI name for: " + ejbName);
+ }
+ }
+
+ /**
+ * Gets EJB 21 container name lazily.
+ *
+ * @param endpoint webservice endpoint
+ * @return EJB21 container name
+ */
+ private synchronized ObjectName getEjb21ContainerName(final Endpoint endpoint)
+ {
+ final boolean ejb21ContainerNotInitialized = this.ejb21ContainerName == null;
+
+ if (ejb21ContainerNotInitialized)
+ {
+ this.ejb21ContainerName = ObjectNameFactory.create("jboss.j2ee:jndiName=" + this.jndiName + ",service=EJB");
+ final boolean ejb21NotRegistered = !this.server.isRegistered(this.ejb21ContainerName);
+ if (ejb21NotRegistered)
+ {
+ throw new IllegalArgumentException("Cannot find service endpoint target: " + this.ejb21ContainerName);
+ }
+
+ // Inject the Service endpoint interceptor
+ this.insertEJB21ServiceEndpointInterceptor(this.ejb21ContainerName, endpoint.getShortName());
+ }
+
+ return this.ejb21ContainerName;
+ }
+
+ /**
+ * Invokes EJB 21 endpoint.
+ *
+ * @param endpoint EJB 21 endpoint
+ * @param wsInvocation web service invocation
+ * @throws Exception if any error occurs
+ */
+ public void invoke(final Endpoint endpoint, final Invocation wsInvocation) throws Exception
+ {
+ final ObjectName ejb21Name = this.getEjb21ContainerName(endpoint);
+
+ try
+ {
+ // prepare for invocation
+ final org.jboss.invocation.Invocation jbossInvocation = this.getMBeanInvocation(wsInvocation);
+ final String[] signature =
+ {org.jboss.invocation.Invocation.class.getName()};
+ final Object[] args = new Object[]
+ {jbossInvocation};
+
+ // invoke method
+ final Object retObj = this.server.invoke(ejb21Name, "invoke", args, signature);
+ wsInvocation.setReturnValue(retObj);
+ }
+ catch (Exception e)
+ {
+ this.log.error("Method invocation failed with exception: " + e.getMessage(), e);
+ this.handleInvocationException(e);
+ }
+ }
+
+ /**
+ * Returns configured EJB 21 JBoss MBean invocation.
+ *
+ * @param wsInvocation webservice invocation
+ * @return configured JBoss invocation
+ */
+ private org.jboss.invocation.Invocation getMBeanInvocation(final Invocation wsInvocation)
+ {
+ // ensure preconditions
+ final MessageContext msgContext = wsInvocation.getInvocationContext().getAttachment(MessageContext.class);
+ if (msgContext == null)
+ {
+ throw new IllegalStateException("Cannot obtain MessageContext");
+ }
+
+ final HandlerCallback callback = wsInvocation.getInvocationContext().getAttachment(HandlerCallback.class);
+ if (callback == null)
+ {
+ throw new IllegalStateException("Cannot obtain HandlerCallback");
+ }
+
+ // prepare security data
+ final SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ final SecurityAdaptor securityAdaptor = spiProvider.getSPI(SecurityAdaptorFactory.class).newSecurityAdapter();
+ final Principal principal = securityAdaptor.getPrincipal();
+ final Object credential = securityAdaptor.getCredential();
+
+ // prepare invocation data
+ final Method method = wsInvocation.getJavaMethod();
+ final Object[] args = wsInvocation.getArgs();
+ final org.jboss.invocation.Invocation jbossInvocation = new org.jboss.invocation.Invocation(null, method, args,
+ null, principal, credential);
+
+ // propagate values to JBoss invocation
+ jbossInvocation.setValue(InvocationKey.SOAP_MESSAGE_CONTEXT, msgContext);
+ jbossInvocation.setValue(InvocationKey.SOAP_MESSAGE, ((SOAPMessageContext) msgContext).getMessage());
+ jbossInvocation.setType(InvocationType.SERVICE_ENDPOINT);
+ jbossInvocation.setValue(HandlerCallback.class.getName(), callback, PayloadKey.TRANSIENT);
+ jbossInvocation.setValue(Invocation.class.getName(), wsInvocation, PayloadKey.TRANSIENT);
+
+ return jbossInvocation;
+ }
+
+ /**
+ * This method dynamically inserts EJB 21 webservice endpoint interceptor
+ * to the last but one position in EJB 21 processing chain. See [JBWS-756] for more info.
+ *
+ * @param objectName EJB 21 object name
+ * @param ejbName EJB 21 short name
+ */
+ private void insertEJB21ServiceEndpointInterceptor(final ObjectName objectName, final String ejbName)
+ {
+ try
+ {
+ final EjbModule ejbModule = (EjbModule) this.server.getAttribute(objectName, "EjbModule");
+ final StatelessSessionContainer container = (StatelessSessionContainer) ejbModule.getContainer(ejbName);
+
+ Interceptor currentInterceptor = container.getInterceptor();
+ while (currentInterceptor != null && currentInterceptor.getNext() != null)
+ {
+ final Interceptor nextInterceptor = currentInterceptor.getNext();
+
+ if (nextInterceptor.getNext() == null)
+ {
+ final ServiceEndpointInterceptorEJB21 sepInterceptor = new ServiceEndpointInterceptorEJB21();
+ currentInterceptor.setNext(sepInterceptor);
+ sepInterceptor.setNext(nextInterceptor);
+ this.log.debug("Injecting EJB 21 service endpoint interceptor after: "
+ + currentInterceptor.getClass().getName());
+
+ return;
+ }
+ currentInterceptor = nextInterceptor;
+ }
+
+ this.log.warn("Cannot find EJB 21 service endpoint interceptor insert point");
+ }
+ catch (Exception ex)
+ {
+ this.log.warn("Cannot register EJB 21 service endpoint interceptor: ", ex);
+ }
+ }
+}
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerEJB3.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerEJB3.java (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerEJB3.java 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1,258 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.webservices.integration.invocation;
+
+import java.lang.reflect.Method;
+import java.security.Principal;
+
+import javax.naming.Context;
+import javax.naming.NamingException;
+import javax.xml.ws.EndpointReference;
+import javax.xml.ws.WebServiceContext;
+import javax.xml.ws.WebServiceException;
+import javax.xml.ws.handler.MessageContext;
+
+import org.jboss.ejb3.EJBContainer;
+import org.jboss.ejb3.context.CurrentEJBContext;
+import org.jboss.webservices.integration.util.ASHelper;
+import org.jboss.wsf.common.injection.ThreadLocalAwareWebServiceContext;
+import org.jboss.wsf.common.invocation.AbstractInvocationHandler;
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.invocation.Invocation;
+import org.jboss.wsf.spi.invocation.InvocationContext;
+import org.jboss.wsf.spi.invocation.integration.InvocationContextCallback;
+import org.jboss.wsf.spi.invocation.integration.ServiceEndpointContainer;
+import org.jboss.wsf.spi.ioc.IoCContainerProxy;
+import org.jboss.wsf.spi.ioc.IoCContainerProxyFactory;
+import org.w3c.dom.Element;
+
+/**
+ * Handles invocations on EJB3 endpoints.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ * @author <a href="mailto:tdiesler@redhat.com">Thomas Diesler</a>
+ */
+final class InvocationHandlerEJB3 extends AbstractInvocationHandler
+{
+ /** EJB3 JNDI context. */
+ private static final String EJB3_JNDI_PREFIX = "java:env/";
+
+ /** MC kernel controller. */
+ private final IoCContainerProxy iocContainer;
+
+ /** EJB3 container name. */
+ private String containerName;
+
+ /** EJB3 container. */
+ private ServiceEndpointContainer serviceEndpointContainer;
+
+ /**
+ * Constructor.
+ */
+ InvocationHandlerEJB3()
+ {
+ final SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ final IoCContainerProxyFactory iocContainerFactory = spiProvider.getSPI(IoCContainerProxyFactory.class);
+ this.iocContainer = iocContainerFactory.getContainer();
+ }
+
+ /**
+ * Initializes EJB3 container name.
+ *
+ * @param endpoint web service endpoint
+ */
+ public void init(final Endpoint endpoint)
+ {
+ this.containerName = (String) endpoint.getProperty(ASHelper.CONTAINER_NAME);
+
+ if (this.containerName == null)
+ {
+ throw new IllegalArgumentException("Container name cannot be null");
+ }
+ }
+
+ /**
+ * Gets EJB 3 container lazily.
+ *
+ * @return EJB3 container
+ */
+ private synchronized ServiceEndpointContainer getEjb3Container()
+ {
+ final boolean ejb3ContainerNotInitialized = this.serviceEndpointContainer == null;
+
+ if (ejb3ContainerNotInitialized)
+ {
+ this.serviceEndpointContainer = this.iocContainer.getBean(this.containerName, ServiceEndpointContainer.class);
+ if (this.serviceEndpointContainer == null)
+ {
+ throw new WebServiceException("Cannot find service endpoint target: " + this.containerName);
+ }
+ }
+
+ return this.serviceEndpointContainer;
+ }
+
+ /**
+ * Invokes EJB 3 endpoint.
+ *
+ * @param endpoint EJB 3 endpoint
+ * @param wsInvocation web service invocation
+ * @throws Exception if any error occurs
+ */
+ public void invoke(final Endpoint endpoint, final Invocation wsInvocation) throws Exception
+ {
+ try
+ {
+ // prepare for invocation
+ this.onBeforeInvocation(wsInvocation);
+ final ServiceEndpointContainer ejbContainer = this.getEjb3Container();
+ final InvocationContextCallback invocationCallback = new EJB3InvocationContextCallback(wsInvocation);
+ final Class<?> implClass = ejbContainer.getServiceImplementationClass();
+ final Method seiMethod = wsInvocation.getJavaMethod();
+ final Method implMethod = this.getImplMethod(implClass, seiMethod);
+ final Object[] args = wsInvocation.getArgs();
+
+ // invoke method
+ final Object retObj = ejbContainer.invokeEndpoint(implMethod, args, invocationCallback);
+ wsInvocation.setReturnValue(retObj);
+ }
+ catch (Throwable t)
+ {
+ this.log.error("Method invocation failed with exception: " + t.getMessage(), t);
+ this.handleInvocationException(t);
+ }
+ finally
+ {
+ this.onAfterInvocation(wsInvocation);
+ }
+ }
+
+ public Context getJNDIContext(final Endpoint ep) throws NamingException
+ {
+ final EJBContainer ejb3Container = (EJBContainer) getEjb3Container();
+ return (Context) ejb3Container.getEnc().lookup(EJB3_JNDI_PREFIX);
+ }
+
+ /**
+ * Injects webservice context on target bean.
+ *
+ * @param invocation current invocation
+ */
+ @Override
+ public void onBeforeInvocation(final Invocation invocation)
+ {
+ final WebServiceContext wsContext = this.getWebServiceContext(invocation);
+ ThreadLocalAwareWebServiceContext.getInstance().setMessageContext(wsContext);
+ }
+
+ /**
+ * Cleanups injected webservice context on target bean.
+ *
+ * @param invocation current invocation
+ */
+ @Override
+ public void onAfterInvocation(final Invocation invocation)
+ {
+ ThreadLocalAwareWebServiceContext.getInstance().setMessageContext(null);
+ }
+
+ /**
+ * Returns WebServiceContext associated with this invocation.
+ *
+ * @param invocation current invocation
+ * @return web service context or null if not available
+ */
+ private WebServiceContext getWebServiceContext(final Invocation invocation)
+ {
+ final InvocationContext invocationContext = invocation.getInvocationContext();
+
+ return new WebServiceContextAdapter(invocationContext.getAttachment(WebServiceContext.class));
+ }
+
+ private static final class WebServiceContextAdapter implements WebServiceContext
+ {
+ private final WebServiceContext delegate;
+
+ private WebServiceContextAdapter(final WebServiceContext delegate)
+ {
+ this.delegate = delegate;
+ }
+
+ public MessageContext getMessageContext()
+ {
+ return this.delegate.getMessageContext();
+ }
+
+ public Principal getUserPrincipal()
+ {
+ return CurrentEJBContext.get().getCallerPrincipal();
+ }
+
+ public boolean isUserInRole(final String role)
+ {
+ return CurrentEJBContext.get().isCallerInRole(role);
+ }
+
+ public EndpointReference getEndpointReference(final Element... referenceParameters)
+ {
+ return delegate.getEndpointReference(referenceParameters);
+ }
+
+ public <T extends EndpointReference> T getEndpointReference(final Class<T> clazz, final Element... referenceParameters)
+ {
+ return delegate.getEndpointReference(clazz, referenceParameters);
+ }
+ }
+
+ /**
+ * EJB3 invocation callback allowing EJB 3 beans to access Web Service invocation properties.
+ */
+ private static final class EJB3InvocationContextCallback implements InvocationContextCallback
+ {
+ /** WebService invocation. */
+ private Invocation wsInvocation;
+
+ /**
+ * Constructor.
+ *
+ * @param wsInvocation delegee
+ */
+ public EJB3InvocationContextCallback(final Invocation wsInvocation)
+ {
+ this.wsInvocation = wsInvocation;
+ }
+
+ /**
+ * Retrieves attachment type from Web Service invocation context attachments.
+ *
+ * @param <T> attachment type
+ * @param attachmentType attachment class
+ * @return attachment value
+ */
+ public <T> T get(final Class<T> attachmentType)
+ {
+ return this.wsInvocation.getInvocationContext().getAttachment(attachmentType);
+ }
+ }
+}
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerFactoryImpl.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerFactoryImpl.java (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerFactoryImpl.java 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1,82 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.webservices.integration.invocation;
+
+import org.jboss.wsf.common.invocation.InvocationHandlerJAXRPC;
+import org.jboss.wsf.common.invocation.InvocationHandlerJAXWS;
+import org.jboss.wsf.spi.invocation.InvocationHandler;
+import org.jboss.wsf.spi.invocation.InvocationHandlerFactory;
+import org.jboss.wsf.spi.invocation.InvocationType;
+
+/**
+ * The default invocation model factory for JBoss AS.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ * @author <a href="mailto:tdiesler@redhat.com">Thomas Diesler</a>
+ */
+public final class InvocationHandlerFactoryImpl extends InvocationHandlerFactory
+{
+ /**
+ * Constructor.
+ */
+ public InvocationHandlerFactoryImpl()
+ {
+ super();
+ }
+
+ /**
+ * Returns invocation handler associated with invocation type.
+ *
+ * @param type invocation type
+ * @return invocation handler
+ */
+ public InvocationHandler newInvocationHandler(final InvocationType type)
+ {
+ InvocationHandler handler = null;
+
+ switch (type)
+ {
+ case JAXRPC_JSE :
+ handler = new InvocationHandlerJAXRPC();
+ break;
+ case JAXRPC_EJB21 :
+ handler = new InvocationHandlerEJB21();
+ break;
+ case JAXRPC_MDB21 :
+ handler = new InvocationHandlerMDB21();
+ break;
+ case JAXWS_JSE :
+ handler = new InvocationHandlerJAXWS();
+ break;
+ case JAXWS_EJB3 :
+ handler = new InvocationHandlerEJB3();
+ break;
+ case JAXWS_MDB3 :
+ handler = new InvocationHandlerMDB3();
+ break;
+ default :
+ throw new IllegalArgumentException("Unable to resolve spi.invocation.InvocationHandler for type " + type);
+ }
+
+ return handler;
+ }
+}
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerMDB21.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerMDB21.java (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerMDB21.java 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.webservices.integration.invocation;
+
+import org.jboss.wsf.common.invocation.AbstractInvocationHandlerJSE;
+
+/**
+ * Handles invocations on MDB EJB21 endpoints.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ * @author <a href="mailto:tdiesler@redhat.com">Thomas Diesler</a>
+ */
+final class InvocationHandlerMDB21 extends AbstractInvocationHandlerJSE
+{
+ /**
+ * Constructor.
+ */
+ InvocationHandlerMDB21()
+ {
+ super();
+ }
+}
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerMDB3.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerMDB3.java (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerMDB3.java 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.webservices.integration.invocation;
+
+import org.jboss.wsf.common.invocation.AbstractInvocationHandlerJSE;
+
+/**
+ * Handles invocations on MDB EJB3 endpoints.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ * @author <a href="mailto:tdiesler@redhat.com">Thomas Diesler</a>
+ */
+final class InvocationHandlerMDB3 extends AbstractInvocationHandlerJSE
+{
+ /**
+ * Constructor.
+ */
+ InvocationHandlerMDB3()
+ {
+ super();
+ }
+}
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/ServiceEndpointInterceptorEJB21.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/ServiceEndpointInterceptorEJB21.java (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/ServiceEndpointInterceptorEJB21.java 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1,122 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.webservices.integration.invocation;
+
+import javax.xml.rpc.handler.soap.SOAPMessageContext;
+
+import org.jboss.ejb.plugins.AbstractInterceptor;
+import org.jboss.invocation.InvocationKey;
+import org.jboss.wsf.spi.invocation.HandlerCallback;
+import org.jboss.wsf.spi.invocation.Invocation;
+import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
+
+/**
+ * This Interceptor does the ws4ee handler processing on EJB 21 endpoints.
+ *
+ * According to the ws4ee spec the handler logic must be invoked after the container
+ * applied method level security to the invocation.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ * @author <a href="mailto:tdiesler@redhat.com">Thomas Diesler</a>
+ */
+final class ServiceEndpointInterceptorEJB21 extends AbstractInterceptor
+{
+ /**
+ * Constructor.
+ */
+ ServiceEndpointInterceptorEJB21()
+ {
+ super();
+ }
+
+ /**
+ * Before and after we call the EJB 21 service endpoint bean, we process the handler chains.
+ *
+ * @param jbossInvocation jboss invocation
+ * @return ws invocation return value
+ * @throws Exception if any error occurs
+ */
+ @Override
+ public Object invoke(final org.jboss.invocation.Invocation jbossInvocation) throws Exception
+ {
+ final SOAPMessageContext msgContext = (SOAPMessageContext) jbossInvocation
+ .getPayloadValue(InvocationKey.SOAP_MESSAGE_CONTEXT);
+ if (msgContext == null)
+ {
+ // not for us
+ return this.getNext().invoke(jbossInvocation);
+ }
+
+ final Invocation wsInvocation = (Invocation) jbossInvocation.getValue(Invocation.class.getName());
+ final HandlerCallback callback = (HandlerCallback) jbossInvocation.getValue(HandlerCallback.class.getName());
+
+ if (callback == null || wsInvocation == null)
+ {
+ log.warn("Handler callback not available");
+ return this.getNext().invoke(jbossInvocation);
+ }
+
+ // Handlers need to be Tx. Therefore we must invoke the handler chain after the TransactionInterceptor.
+ try
+ {
+ // call the request handlers
+ boolean handlersPass = callback.callRequestHandlerChain(wsInvocation, HandlerType.ENDPOINT);
+ handlersPass = handlersPass && callback.callRequestHandlerChain(wsInvocation, HandlerType.POST);
+
+ // Call the next interceptor in the chain
+ if (handlersPass)
+ {
+ // The SOAPContentElements stored in the EndpointInvocation might have changed after
+ // handler processing. Get the updated request payload. This should be a noop if request
+ // handlers did not modify the incomming SOAP message.
+ final Object[] reqParams = wsInvocation.getArgs();
+ jbossInvocation.setArguments(reqParams);
+ final Object resObj = this.getNext().invoke(jbossInvocation);
+
+ // Setting the message to null should trigger binding of the response message
+ msgContext.setMessage(null);
+ wsInvocation.setReturnValue(resObj);
+ }
+
+ // call the response handlers
+ handlersPass = callback.callResponseHandlerChain(wsInvocation, HandlerType.POST);
+ handlersPass = handlersPass && callback.callResponseHandlerChain(wsInvocation, HandlerType.ENDPOINT);
+
+ // update the return value after response handler processing
+ return wsInvocation.getReturnValue();
+ }
+ catch (Exception ex)
+ {
+ try
+ {
+ // call the fault handlers
+ boolean handlersPass = callback.callFaultHandlerChain(wsInvocation, HandlerType.POST, ex);
+ handlersPass = handlersPass && callback.callFaultHandlerChain(wsInvocation, HandlerType.ENDPOINT, ex);
+ }
+ catch (Exception e)
+ {
+ log.warn("Cannot process handlerChain.handleFault, ignoring: ", e);
+ }
+ throw ex;
+ }
+ }
+}
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/ioc/IoCContainerProxyFactoryImpl.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/ioc/IoCContainerProxyFactoryImpl.java (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/ioc/IoCContainerProxyFactoryImpl.java 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1,54 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.webservices.integration.ioc;
+
+import org.jboss.wsf.spi.ioc.IoCContainerProxy;
+import org.jboss.wsf.spi.ioc.IoCContainerProxyFactory;
+
+/**
+ * @see org.jboss.wsf.spi.ioc.IoCContainerProxyFactory
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+public final class IoCContainerProxyFactoryImpl implements IoCContainerProxyFactory
+{
+ /** Container proxy singleton. */
+ private static final IoCContainerProxy CONTAINER = IoCContainerProxyImpl.getInstance();
+
+ /**
+ * Constructor.
+ */
+ public IoCContainerProxyFactoryImpl()
+ {
+ super();
+ }
+
+ /**
+ * @see org.jboss.wsf.spi.ioc.IoCContainerProxyFactory#getContainer()
+ *
+ * @return IoC container proxy
+ */
+ public IoCContainerProxy getContainer()
+ {
+ return IoCContainerProxyFactoryImpl.CONTAINER;
+ }
+}
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/ioc/IoCContainerProxyImpl.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/ioc/IoCContainerProxyImpl.java (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/ioc/IoCContainerProxyImpl.java 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1,86 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.webservices.integration.ioc;
+
+import org.jboss.dependency.spi.ControllerContext;
+import org.jboss.kernel.Kernel;
+import org.jboss.kernel.spi.dependency.KernelController;
+import org.jboss.wsf.spi.ioc.IoCContainerProxy;
+
+/**
+ * @see org.jboss.wsf.spi.ioc.IoCContainerProxy
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+public final class IoCContainerProxyImpl implements IoCContainerProxy
+{
+ /** Singleton. */
+ private static final IoCContainerProxy SINGLETON = new IoCContainerProxyImpl();
+ /** JBoss MC kernel. */
+ private static Kernel kernel;
+
+ /**
+ * Constructor.
+ */
+ public IoCContainerProxyImpl()
+ {
+ super();
+ }
+
+ /**
+ * Returns container proxy instance.
+ *
+ * @return container proxy instance
+ */
+ static IoCContainerProxy getInstance()
+ {
+ return IoCContainerProxyImpl.SINGLETON;
+ }
+
+ /**
+ * Sets JBoss kernel - invoked via MC injection.
+ *
+ * @param kernel JBoss kernel
+ */
+ public void setKernel(final Kernel kernel)
+ {
+ IoCContainerProxyImpl.kernel = kernel;
+ }
+
+ /**
+ * @see org.jboss.wsf.spi.ioc.IoCContainerProxy#getBean(java.lang.String, java.lang.Class)
+ *
+ * @param <T> bean type
+ * @param beanName bean name inside IoC registry
+ * @param clazz bean type class
+ * @return bean instance
+ * @throws IllegalArgumentException if bean is not found
+ */
+ @SuppressWarnings("unchecked")
+ public <T> T getBean(final String beanName, final Class<T> clazz)
+ {
+ final KernelController controller = IoCContainerProxyImpl.kernel.getController();
+ final ControllerContext ctx = controller.getInstalledContext(beanName);
+
+ return (T)ctx.getTarget();
+ }
+}
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/AbstractMetaDataBuilderEJB.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/AbstractMetaDataBuilderEJB.java (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/AbstractMetaDataBuilderEJB.java 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1,153 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.webservices.integration.metadata;
+
+import java.util.Iterator;
+
+import org.jboss.logging.Logger;
+import org.jboss.metadata.common.jboss.WebserviceDescriptionMetaData;
+import org.jboss.metadata.common.jboss.WebserviceDescriptionsMetaData;
+import org.jboss.metadata.ejb.jboss.JBossMetaData;
+import org.jboss.metadata.ejb.jboss.WebservicesMetaData;
+import org.jboss.webservices.integration.util.ASHelper;
+import org.jboss.ws.Constants;
+import org.jboss.wsf.common.integration.WSHelper;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.EJBMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.PublishLocationAdapter;
+
+/**
+ * Common class for EJB meta data builders.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ * @author <a href="mailto:tdiesler@redhat.com">Thomas Diesler</a>
+ */
+abstract class AbstractMetaDataBuilderEJB
+{
+ /** Logger. */
+ protected final Logger log = Logger.getLogger(this.getClass());
+
+ /**
+ * Builds universal EJB meta data model that is AS agnostic.
+ *
+ * @param dep webservice deployment
+ * @return universal EJB meta data model
+ */
+ final EJBArchiveMetaData create(final Deployment dep)
+ {
+ this.log.debug("Building JBoss agnostic meta data for EJB webservice deployment: " + dep.getSimpleName());
+
+ final EJBArchiveMetaData ejbArchiveMD = new EJBArchiveMetaData();
+
+ this.buildEnterpriseBeansMetaData(dep, ejbArchiveMD);
+ this.buildWebservicesMetaData(dep, ejbArchiveMD);
+
+ return ejbArchiveMD;
+ }
+
+ /**
+ * Template method for build enterprise beans meta data.
+ *
+ * @param dep webservice deployment
+ * @param ejbMetaData universal EJB meta data model
+ */
+ protected abstract void buildEnterpriseBeansMetaData(Deployment dep, EJBArchiveMetaData ejbMetaData);
+
+ /**
+ * Builds webservices meta data. This methods sets:
+ * <ul>
+ * <li>context root</li>
+ * <li>wsdl location resolver</li>
+ * <li>config name</li>
+ * <li>config file</li>
+ * </ul>
+ *
+ * @param dep webservice deployment
+ * @param ejbArchiveMD universal EJB meta data model
+ */
+ private void buildWebservicesMetaData(final Deployment dep, final EJBArchiveMetaData ejbArchiveMD)
+ {
+ final JBossMetaData jbossMD = WSHelper.getRequiredAttachment(dep, JBossMetaData.class);
+ final WebservicesMetaData webservicesMD = jbossMD.getWebservices();
+
+ if (webservicesMD == null)
+ {
+ return;
+ }
+
+ // set context root
+ String contextRoot = webservicesMD.getContextRoot();
+ final WebserviceDescriptionsMetaData wsDescriptionsMD = webservicesMD.getWebserviceDescriptions();
+
+ if (wsDescriptionsMD != null)
+ {
+ // set wsdl location resolver
+ final PublishLocationAdapter resolver = new PublishLocationAdapterImpl(wsDescriptionsMD);
+ ejbArchiveMD.setPublishLocationAdapter(resolver);
+
+ final WebserviceDescriptionMetaData wsDescriptionMD = ASHelper
+ .getWebserviceDescriptionMetaData(wsDescriptionsMD);
+ if (wsDescriptionMD != null)
+ {
+ if (!Constants.BC_CONTEXT_MODE && contextRoot == null && !hasContextRoot(ejbArchiveMD))
+ {
+ contextRoot = wsDescriptionMD.getWebserviceDescriptionName(); // TCK6 fallback
+ }
+
+ final String configName = wsDescriptionMD.getConfigName();
+ final String configFile = wsDescriptionMD.getConfigFile();
+
+ // set config name
+ this.log.debug("Setting config name: " + configName);
+ ejbArchiveMD.setConfigName(wsDescriptionMD.getConfigName());
+
+ // set config file
+ this.log.debug("Setting config file: " + configFile);
+ ejbArchiveMD.setConfigFile(wsDescriptionMD.getConfigFile());
+ }
+ }
+
+ ejbArchiveMD.setWebServiceContextRoot(contextRoot);
+ this.log.debug("Setting context root: " + contextRoot);
+ }
+
+ /**
+ * Returns true if has context root, false otherwise.
+ *
+ * @param ejbArchiveMD ejb archive MD
+ * @return true if has context root, false otherwise
+ */
+ private boolean hasContextRoot(final EJBArchiveMetaData ejbArchiveMD)
+ {
+ for (final Iterator<EJBMetaData> ejbMDs = ejbArchiveMD.getEnterpriseBeans(); ejbMDs.hasNext(); )
+ {
+ final EJBMetaData ejbMD = ejbMDs.next();
+ if (ejbMD.getPortComponentURI() != null)
+ {
+ return true;
+ }
+ }
+
+ return false;
+ }
+}
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/ContainerMetaDataDeploymentAspect.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/ContainerMetaDataDeploymentAspect.java (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/ContainerMetaDataDeploymentAspect.java 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1,82 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.webservices.integration.metadata;
+
+import org.jboss.wsf.common.integration.WSHelper;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.JSEArchiveMetaData;
+import org.jboss.wsf.common.integration.AbstractDeploymentAspect;
+
+/**
+ * An aspect that builds container independent meta data.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ * @author <a href="mailto:tdiesler@redhat.com">Thomas Diesler</a>
+ */
+public final class ContainerMetaDataDeploymentAspect extends AbstractDeploymentAspect
+{
+ /** JSE meta data builder. */
+ private final MetaDataBuilderJSE metaDataBuilderJSE = new MetaDataBuilderJSE();
+
+ /** EJB3 meta data builder. */
+ private final MetaDataBuilderEJB3 metaDataBuilderEJB3 = new MetaDataBuilderEJB3();
+
+ /** EJB21 meta data builder. */
+ private final MetaDataBuilderEJB21 metaDataBuilderEJB21 = new MetaDataBuilderEJB21();
+
+ /**
+ * Constructor.
+ */
+ public ContainerMetaDataDeploymentAspect()
+ {
+ super();
+ }
+
+ /**
+ * Build container independent meta data.
+ *
+ * @param dep webservice deployment
+ */
+ @Override
+ public void start(final Deployment dep)
+ {
+ if (WSHelper.isJseDeployment(dep))
+ {
+ this.log.debug("Creating JBoss agnostic JSE meta data for deployment: " + dep.getSimpleName());
+ final JSEArchiveMetaData jseMetaData = this.metaDataBuilderJSE.create(dep);
+ dep.addAttachment(JSEArchiveMetaData.class, jseMetaData);
+ }
+ else if (WSHelper.isJaxwsEjbDeployment(dep))
+ {
+ this.log.debug("Creating JBoss agnostic EJB3 meta data for deployment: " + dep.getSimpleName());
+ final EJBArchiveMetaData ejbMetaData = this.metaDataBuilderEJB3.create(dep);
+ dep.addAttachment(EJBArchiveMetaData.class, ejbMetaData);
+ }
+ else if (WSHelper.isJaxrpcEjbDeployment(dep))
+ {
+ this.log.debug("Creating JBoss agnostic EJB21 meta data for deployment: " + dep.getSimpleName());
+ final EJBArchiveMetaData ejbMetaData = this.metaDataBuilderEJB21.create(dep);
+ dep.addAttachment(EJBArchiveMetaData.class, ejbMetaData);
+ }
+ }
+}
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB21.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB21.java (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB21.java 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1,156 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.webservices.integration.metadata;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
+import org.jboss.metadata.ejb.jboss.JBossMessageDrivenBeanMetaData;
+import org.jboss.metadata.ejb.jboss.JBossMetaData;
+import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
+import org.jboss.metadata.javaee.spec.PortComponent;
+import org.jboss.wsf.common.integration.WSHelper;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.EJBMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.EJBSecurityMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.MDBMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.SLSBMetaData;
+
+/**
+ * Builds container independent meta data from EJB21 container meta data.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ * @author <a href="mailto:tdiesler@redhat.com">Thomas Diesler</a>
+ */
+final class MetaDataBuilderEJB21 extends AbstractMetaDataBuilderEJB
+{
+ /**
+ * Constructor.
+ */
+ MetaDataBuilderEJB21()
+ {
+ super();
+ }
+
+ /**
+ * @see AbstractMetaDataBuilderEJB#buildEnterpriseBeansMetaData(Deployment, EJBArchiveMetaData)
+ *
+ * @param dep webservice deployment
+ * @param ejbArchiveMD EJB archive meta data
+ */
+ @Override
+ protected void buildEnterpriseBeansMetaData(final Deployment dep, final EJBArchiveMetaData ejbArchiveMD)
+ {
+ final JBossMetaData jbossMetaData = WSHelper.getRequiredAttachment(dep, JBossMetaData.class);
+ final List<EJBMetaData> wsEjbsMD = new LinkedList<EJBMetaData>();
+
+ for (final JBossEnterpriseBeanMetaData jbossEjbMD : jbossMetaData.getEnterpriseBeans())
+ {
+ this.buildEnterpriseBeanMetaData(wsEjbsMD, jbossEjbMD);
+ }
+
+ ejbArchiveMD.setEnterpriseBeans(wsEjbsMD);
+
+ final String securityDomain = jbossMetaData.getSecurityDomain();
+ this.log.debug("Setting security domain: " + securityDomain);
+ ejbArchiveMD.setSecurityDomain(securityDomain);
+ }
+
+ /**
+ * Builds JBoss agnostic EJB meta data.
+ *
+ * @param wsEjbsMD jboss agnostic EJBs meta data
+ * @param jbossEjbMD jboss specific EJB meta data
+ */
+ private void buildEnterpriseBeanMetaData(final List<EJBMetaData> wsEjbsMD,
+ final JBossEnterpriseBeanMetaData jbossEjbMD)
+ {
+ final EJBMetaData wsEjbMD = this.newEjbMetaData(jbossEjbMD);
+
+ if (wsEjbMD != null)
+ {
+ // set EJB name and class
+ wsEjbMD.setEjbName(jbossEjbMD.getEjbName());
+ wsEjbMD.setEjbClass(jbossEjbMD.getEjbClass());
+
+ if (jbossEjbMD.isSession())
+ {
+ final JBossSessionBeanMetaData sessionEjbMD = (JBossSessionBeanMetaData) jbossEjbMD;
+
+ // set home interfaces
+ wsEjbMD.setServiceEndpointInterface(sessionEjbMD.getServiceEndpoint());
+ wsEjbMD.setHome(sessionEjbMD.getHome());
+ wsEjbMD.setLocalHome(sessionEjbMD.getLocalHome());
+
+ // set JNDI names
+ wsEjbMD.setJndiName(sessionEjbMD.determineJndiName());
+ wsEjbMD.setLocalJndiName(jbossEjbMD.determineLocalJndiName());
+
+ final PortComponent portComponentMD = sessionEjbMD.getPortComponent();
+ if (portComponentMD != null)
+ {
+ // set port component meta data
+ wsEjbMD.setPortComponentName(portComponentMD.getPortComponentName());
+ wsEjbMD.setPortComponentURI(portComponentMD.getPortComponentURI());
+
+ // set security meta data
+ final EJBSecurityMetaData smd = new EJBSecurityMetaData();
+ smd.setAuthMethod(portComponentMD.getAuthMethod());
+ smd.setTransportGuarantee(portComponentMD.getTransportGuarantee());
+ smd.setSecureWSDLAccess(portComponentMD.getSecureWSDLAccess());
+ wsEjbMD.setSecurityMetaData(smd);
+ }
+ }
+
+ wsEjbsMD.add(wsEjbMD);
+ }
+ }
+
+ /**
+ * Creates new JBoss agnostic EJB bean meta data model.
+ *
+ * @param jbossEjbMD jboss EJB meta data
+ * @return webservices EJB meta data
+ */
+ private EJBMetaData newEjbMetaData(final JBossEnterpriseBeanMetaData jbossEjbMD)
+ {
+ if (jbossEjbMD.isSession())
+ {
+ this.log.debug("Creating JBoss agnostic EJB21 meta data for session bean: " + jbossEjbMD.getEjbClass());
+ return new SLSBMetaData();
+ }
+ else if (jbossEjbMD.isMessageDriven())
+ {
+ this.log.debug("Creating JBoss agnostic EJB21 meta data for message driven bean: " + jbossEjbMD.getEjbClass());
+ final MDBMetaData mdbMD = new MDBMetaData();
+
+ final JBossMessageDrivenBeanMetaData jbossMessageBean = (JBossMessageDrivenBeanMetaData) jbossEjbMD;
+ ((MDBMetaData) mdbMD).setDestinationJndiName(jbossMessageBean.getDestinationJndiName());
+
+ return mdbMD;
+ }
+
+ return null;
+ }
+}
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB3.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB3.java (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB3.java 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1,164 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.webservices.integration.metadata;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import javax.ejb.ActivationConfigProperty;
+import javax.ejb.MessageDriven;
+
+import org.jboss.wsf.common.integration.WSHelper;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.integration.WebServiceDeclaration;
+import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment;
+import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.EJBMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.EJBSecurityMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.MDBMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.PortComponentSpec;
+import org.jboss.wsf.spi.metadata.j2ee.SLSBMetaData;
+
+/**
+ * Builds container independent meta data from EJB3 container meta data.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ * @author <a href="mailto:tdiesler@redhat.com">Thomas Diesler</a>
+ */
+final class MetaDataBuilderEJB3 extends AbstractMetaDataBuilderEJB
+{
+ /**
+ * Constructor.
+ */
+ MetaDataBuilderEJB3()
+ {
+ super();
+ }
+
+ /**
+ * @see AbstractMetaDataBuilderEJB#buildEnterpriseBeansMetaData(Deployment, EJBArchiveMetaData)
+ *
+ * @param dep webservice deployment
+ * @param ejbArchiveMD EJB archive meta data
+ */
+ @Override
+ protected void buildEnterpriseBeansMetaData(final Deployment dep, final EJBArchiveMetaData ejbArchiveMD)
+ {
+ final WebServiceDeployment ejb3Deployment = WSHelper.getRequiredAttachment(dep, WebServiceDeployment.class);
+ final List<EJBMetaData> wsEjbsMD = new LinkedList<EJBMetaData>();
+
+ for (final WebServiceDeclaration jbossEjbMD : ejb3Deployment.getServiceEndpoints())
+ {
+ this.buildEnterpriseBeanMetaData(wsEjbsMD, jbossEjbMD);
+ }
+
+ ejbArchiveMD.setEnterpriseBeans(wsEjbsMD);
+ }
+
+ /**
+ * Builds JBoss agnostic EJB meta data.
+ *
+ * @param wsEjbsMD jboss agnostic EJBs meta data
+ * @param jbossEjbMD jboss specific EJB meta data
+ */
+ private void buildEnterpriseBeanMetaData(final List<EJBMetaData> wsEjbsMD, final WebServiceDeclaration jbossEjbMD)
+ {
+ final EJBMetaData wsEjbMD = this.newEjbMetaData(jbossEjbMD);
+
+ if (wsEjbMD != null)
+ {
+ // set EJB name and class
+ wsEjbMD.setEjbName(jbossEjbMD.getComponentName());
+ wsEjbMD.setEjbClass(jbossEjbMD.getComponentClassName());
+
+ final PortComponentSpec portComponentAnnotation = jbossEjbMD.getAnnotation(PortComponentSpec.class);
+ if (portComponentAnnotation != null)
+ {
+ // set port component meta data
+ wsEjbMD.setPortComponentName(portComponentAnnotation.portComponentName());
+ wsEjbMD.setPortComponentURI(portComponentAnnotation.portComponentURI());
+
+ // set security meta data
+ final EJBSecurityMetaData wsEjbSecurityMD = new EJBSecurityMetaData();
+ wsEjbSecurityMD.setAuthMethod(portComponentAnnotation.authMethod());
+ wsEjbSecurityMD.setTransportGuarantee(portComponentAnnotation.transportGuarantee());
+ wsEjbSecurityMD.setSecureWSDLAccess(portComponentAnnotation.secureWSDLAccess());
+ wsEjbMD.setSecurityMetaData(wsEjbSecurityMD);
+ }
+
+ wsEjbsMD.add(wsEjbMD);
+ }
+
+ }
+
+ /**
+ * Creates new JBoss agnostic EJB bean meta data model.
+ *
+ * @param jbossEjbMD jboss EJB meta data
+ * @return webservices EJB meta data
+ */
+ private EJBMetaData newEjbMetaData(final WebServiceDeclaration jbossEjbMD)
+ {
+ final MessageDriven mdbAnnotation = jbossEjbMD.getAnnotation(MessageDriven.class);
+
+ if (mdbAnnotation == null)
+ {
+ this.log.debug("Creating JBoss agnostic EJB3 meta data for session bean: "
+ + jbossEjbMD.getComponentClassName());
+ return new SLSBMetaData();
+ }
+ else
+ {
+ this.log.debug("Creating JBoss agnostic EJB3 meta data for message driven bean: "
+ + jbossEjbMD.getComponentClassName());
+ final MDBMetaData mdbMD = new MDBMetaData();
+
+ final String destinationName = this.getActivationProperty("destination", mdbAnnotation.activationConfig());
+ mdbMD.setDestinationJndiName(destinationName);
+
+ return mdbMD;
+ }
+ }
+
+ /**
+ * Returns activation config property value or null if not found.
+ *
+ * @param name activation property name
+ * @param activationConfigProperties activation config properties
+ * @return activation config property value
+ */
+ private String getActivationProperty(final String name, final ActivationConfigProperty[] activationConfigProperties)
+ {
+ if (activationConfigProperties != null)
+ {
+ for (final ActivationConfigProperty activationConfigProperty : activationConfigProperties)
+ {
+ if (activationConfigProperty.propertyName().equals(name))
+ {
+ return activationConfigProperty.propertyValue();
+ }
+ }
+ }
+
+ return null;
+ }
+}
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderJSE.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderJSE.java (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderJSE.java 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1,286 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.webservices.integration.metadata;
+
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.logging.Logger;
+import org.jboss.metadata.common.jboss.WebserviceDescriptionMetaData;
+import org.jboss.metadata.common.jboss.WebserviceDescriptionsMetaData;
+import org.jboss.metadata.ear.jboss.JBossAppMetaData;
+import org.jboss.metadata.ear.spec.ModuleMetaData;
+import org.jboss.metadata.ear.spec.WebModuleMetaData;
+import org.jboss.metadata.javaee.spec.ParamValueMetaData;
+import org.jboss.metadata.web.jboss.JBossServletsMetaData;
+import org.jboss.metadata.web.jboss.JBossWebMetaData;
+import org.jboss.metadata.web.spec.SecurityConstraintMetaData;
+import org.jboss.metadata.web.spec.ServletMappingMetaData;
+import org.jboss.metadata.web.spec.ServletMetaData;
+import org.jboss.metadata.web.spec.WebResourceCollectionMetaData;
+import org.jboss.metadata.web.spec.WebResourceCollectionsMetaData;
+import org.jboss.webservices.integration.util.ASHelper;
+import org.jboss.wsf.common.integration.WSConstants;
+import org.jboss.wsf.common.integration.WSHelper;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.metadata.j2ee.JSEArchiveMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.JSESecurityMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.JSESecurityMetaData.JSEResourceCollection;
+import org.jboss.wsf.spi.metadata.j2ee.PublishLocationAdapter;
+
+/**
+ * Builds container independent meta data from WEB container meta data.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ * @author <a href="mailto:tdiesler@redhat.com">Thomas Diesler</a>
+ */
+final class MetaDataBuilderJSE
+{
+ /** Logger. */
+ private final Logger log = Logger.getLogger(MetaDataBuilderJSE.class);
+
+ /**
+ * Constructor.
+ */
+ MetaDataBuilderJSE()
+ {
+ super();
+ }
+
+ /**
+ * Builds universal JSE meta data model that is AS agnostic.
+ *
+ * @param dep webservice deployment
+ * @return universal JSE meta data model
+ */
+ JSEArchiveMetaData create(final Deployment dep)
+ {
+ final JBossWebMetaData jbossWebMD = WSHelper.getRequiredAttachment(dep, JBossWebMetaData.class);
+ final JSEArchiveMetaData jseArchiveMD = new JSEArchiveMetaData();
+
+ // set context root
+ final String contextRoot = this.getContextRoot(dep, jbossWebMD);
+ jseArchiveMD.setContextRoot(contextRoot);
+
+ // set servlet url patterns mappings
+ final Map<String, String> servletMappings = this.getServletUrlPatternsMappings(jbossWebMD);
+ jseArchiveMD.setServletMappings(servletMappings);
+
+ // set servlet class names mappings
+ final Map<String, String> servletClassNamesMappings = this.getServletClassMappings(jbossWebMD);
+ jseArchiveMD.setServletClassNames(servletClassNamesMappings);
+
+ // set security domain
+ final String securityDomain = jbossWebMD.getSecurityDomain();
+ jseArchiveMD.setSecurityDomain(securityDomain);
+
+ // set wsdl location resolver
+ final PublishLocationAdapter resolver = new PublishLocationAdapterImpl(jbossWebMD.getWebserviceDescriptions());
+ jseArchiveMD.setPublishLocationAdapter(resolver);
+
+ // set security meta data
+ final List<JSESecurityMetaData> jseSecurityMDs = this.getSecurityMetaData(jbossWebMD.getSecurityConstraints());
+ jseArchiveMD.setSecurityMetaData(jseSecurityMDs);
+
+ // set config name and file
+ this.setConfigNameAndFile(jseArchiveMD, jbossWebMD);
+
+ return jseArchiveMD;
+ }
+
+ /**
+ * Sets config name and config file.
+ *
+ * @param jseArchiveMD universal JSE meta data model
+ * @param jbossWebMD jboss web meta data
+ */
+ private void setConfigNameAndFile(final JSEArchiveMetaData jseArchiveMD, final JBossWebMetaData jbossWebMD)
+ {
+ final WebserviceDescriptionsMetaData wsDescriptionsMD = jbossWebMD.getWebserviceDescriptions();
+ final WebserviceDescriptionMetaData wsDescriptionMD = ASHelper.getWebserviceDescriptionMetaData(wsDescriptionsMD);
+ if (wsDescriptionMD != null)
+ {
+ if (wsDescriptionMD.getConfigName() != null)
+ {
+ jseArchiveMD.setConfigName(wsDescriptionMD.getConfigName());
+ jseArchiveMD.setConfigFile(wsDescriptionMD.getConfigFile());
+
+ // ensure higher priority against web.xml context parameters
+ return;
+ }
+ }
+
+ final List<ParamValueMetaData> contextParams = jbossWebMD.getContextParams();
+ if (contextParams != null)
+ {
+ for (final ParamValueMetaData contextParam : contextParams)
+ {
+ if (WSConstants.JBOSSWS_CONFIG_NAME.equals(contextParam.getParamName()))
+ {
+ jseArchiveMD.setConfigName(contextParam.getParamValue());
+ }
+ if (WSConstants.JBOSSWS_CONFIG_FILE.equals(contextParam.getParamName()))
+ {
+ jseArchiveMD.setConfigFile(contextParam.getParamValue());
+ }
+ }
+ }
+ }
+
+ /**
+ * Builds security meta data.
+ *
+ * @param securityConstraintsMD security constraints meta data
+ * @return universal JSE security meta data model
+ */
+ private List<JSESecurityMetaData> getSecurityMetaData(final List<SecurityConstraintMetaData> securityConstraintsMD)
+ {
+ final List<JSESecurityMetaData> jseSecurityMDs = new LinkedList<JSESecurityMetaData>();
+
+ if (securityConstraintsMD != null)
+ {
+ for (final SecurityConstraintMetaData securityConstraintMD : securityConstraintsMD)
+ {
+ final JSESecurityMetaData jseSecurityMD = new JSESecurityMetaData();
+
+ // transport guarantee
+ jseSecurityMD.setTransportGuarantee(securityConstraintMD.getTransportGuarantee().name());
+
+ // web resources
+ this.setWebResources(jseSecurityMD, securityConstraintMD);
+
+ jseSecurityMDs.add(jseSecurityMD);
+ }
+ }
+
+ return jseSecurityMDs;
+ }
+
+ /**
+ * Sets web resources in universal meta data model.
+ *
+ * @param jseSecurityMD universal JSE security meta data model
+ * @param securityConstraintMD security constraint meta data
+ */
+ private void setWebResources(final JSESecurityMetaData jseSecurityMD,
+ final SecurityConstraintMetaData securityConstraintMD)
+ {
+ final WebResourceCollectionsMetaData webResources = securityConstraintMD.getResourceCollections();
+
+ for (final WebResourceCollectionMetaData webResourceMD : webResources)
+ {
+ final JSEResourceCollection jseResource = jseSecurityMD.addWebResource(webResourceMD.getName());
+
+ for (final String webResourceUrlPatterns : webResourceMD.getUrlPatterns())
+ {
+ jseResource.addPattern(webResourceUrlPatterns);
+ }
+ }
+ }
+
+ /**
+ * Returns servlet name to url pattern mappings.
+ *
+ * @param jbossWebMD jboss web meta data
+ * @return servlet name to url pattern mappings
+ */
+ private Map<String, String> getServletUrlPatternsMappings(final JBossWebMetaData jbossWebMD)
+ {
+ final Map<String, String> mappings = new HashMap<String, String>();
+ final List<ServletMappingMetaData> servletMappings = jbossWebMD.getServletMappings();
+
+ if (servletMappings != null)
+ {
+ for (final ServletMappingMetaData mapping : servletMappings)
+ {
+ mappings.put(mapping.getServletName(), mapping.getUrlPatterns().get(0));
+ }
+ }
+
+ return mappings;
+ }
+
+ /**
+ * Returns servlet name to servlet class mappings.
+ *
+ * @param jbossWebMD jboss web meta data
+ * @return servlet name to servlet mappings
+ */
+ private Map<String, String> getServletClassMappings(final JBossWebMetaData jbossWebMD)
+ {
+ final Map<String, String> mappings = new HashMap<String, String>();
+ final JBossServletsMetaData servlets = jbossWebMD.getServlets();
+
+ if (servlets != null)
+ {
+ for (final ServletMetaData servlet : servlets)
+ {
+ if (servlet.getServletClass() == null || servlet.getServletClass().trim().length() == 0)
+ {
+ // Skip JSPs
+ continue;
+ }
+
+ this.log.debug("Creating JBoss agnostic JSE meta data for POJO bean: " + servlet.getServletClass());
+ mappings.put(servlet.getName(), servlet.getServletClass());
+ }
+ }
+
+ return mappings;
+ }
+
+ /**
+ * Returns context root associated with webservice deployment.
+ *
+ * If there's application.xml descriptor provided defining nested web module,
+ * then context root defined there will be returned.
+ * Otherwise context root defined in jboss-web.xml will be returned.
+ *
+ * @param dep webservice deployment
+ * @param jbossWebMD jboss web meta data
+ * @return context root
+ */
+ private String getContextRoot(final Deployment dep, final JBossWebMetaData jbossWebMD)
+ {
+ final DeploymentUnit unit = WSHelper.getRequiredAttachment(dep, DeploymentUnit.class);
+ final JBossAppMetaData jbossAppMD = unit.getParent() == null ? null : ASHelper.getOptionalAttachment(unit
+ .getParent(), JBossAppMetaData.class);
+
+ String contextRoot = null;
+
+ if (jbossAppMD != null)
+ {
+ final ModuleMetaData moduleMD = jbossAppMD.getModule(dep.getSimpleName());
+ if (moduleMD != null)
+ {
+ final WebModuleMetaData webModuleMD = (WebModuleMetaData) moduleMD.getValue();
+ contextRoot = webModuleMD.getContextRoot();
+ }
+ }
+
+ // prefer context root defined in application.xml over one defined in jboss-web.xml
+ return contextRoot != null ? contextRoot : jbossWebMD.getContextRoot();
+ }
+}
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/PublishLocationAdapterImpl.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/PublishLocationAdapterImpl.java (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/PublishLocationAdapterImpl.java 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1,71 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.webservices.integration.metadata;
+
+import org.jboss.metadata.common.jboss.WebserviceDescriptionMetaData;
+import org.jboss.metadata.common.jboss.WebserviceDescriptionsMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.PublishLocationAdapter;
+
+/**
+ * Publish location adapter implementation.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ * @author <a href="mailto:tdiesler@redhat.com">Thomas Diesler</a>
+ */
+final class PublishLocationAdapterImpl implements PublishLocationAdapter
+{
+ /** Webservice descriptions meta data. */
+ private final WebserviceDescriptionsMetaData wsDescriptionsMD;
+
+ /**
+ * Constructor.
+ *
+ * @param wsDescriptionsMD webservice descriptions meta data
+ */
+ PublishLocationAdapterImpl(final WebserviceDescriptionsMetaData wsDescriptionsMD)
+ {
+ super();
+
+ this.wsDescriptionsMD = wsDescriptionsMD;
+ }
+
+ /**
+ * @see org.jboss.wsf.spi.metadata.j2ee.PublishLocationAdapter#getWsdlPublishLocationByName(String)
+ *
+ * @param endpointName endpoint name
+ * @return publish location
+ */
+ public String getWsdlPublishLocationByName(final String endpointName)
+ {
+ if (this.wsDescriptionsMD != null)
+ {
+ final WebserviceDescriptionMetaData endpointMD = this.wsDescriptionsMD.get(endpointName);
+
+ if (endpointMD != null)
+ {
+ return endpointMD.getWsdlPublishLocation();
+ }
+ }
+
+ return null;
+ }
+}
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/security/JACCPermissionsDeploymentAspect.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/security/JACCPermissionsDeploymentAspect.java (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/security/JACCPermissionsDeploymentAspect.java 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1,80 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.webservices.integration.security;
+
+import javax.security.jacc.PolicyConfiguration;
+import javax.security.jacc.PolicyConfigurationFactory;
+
+import org.jboss.metadata.web.jboss.JBossWebMetaData;
+import org.jboss.web.WebPermissionMapping;
+import org.jboss.wsf.common.integration.WSHelper;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.common.integration.AbstractDeploymentAspect;
+
+/**
+ * Generates JACC permissions. (This is temporary and really hacky solution).
+ *
+ * TODO: remove this deployment aspect and update
+ * particular JACC deployer to execute after
+ * JBossWS has modified web meta data.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+public final class JACCPermissionsDeploymentAspect extends AbstractDeploymentAspect
+{
+ /**
+ * Constructor.
+ */
+ public JACCPermissionsDeploymentAspect()
+ {
+ super();
+ }
+
+ /**
+ * JBAS-5935: The dynamic web application generated by the JBossWS
+ * does not go through the war security deployer. Hence the JACC
+ * permissions are not created. There is a need to explicitly create
+ * the war jacc permissions.
+ *
+ * @param dep webservice deployment
+ */
+ @Override
+ public void start(final Deployment dep)
+ {
+ final JBossWebMetaData jbossWebMD = WSHelper.getRequiredAttachment(dep, JBossWebMetaData.class);
+
+ try
+ {
+ final PolicyConfigurationFactory policyConfigurationFactory = PolicyConfigurationFactory
+ .getPolicyConfigurationFactory();
+ final PolicyConfiguration policyConfiguration = policyConfigurationFactory.getPolicyConfiguration(dep
+ .getSimpleName(), false);
+
+ WebPermissionMapping.createPermissions(jbossWebMD, policyConfiguration);
+ policyConfiguration.commit();
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException("Exception generating JACC perms: ", e);
+ }
+ }
+}
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/security/JaasSecurityDomainAdaptorImpl.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/security/JaasSecurityDomainAdaptorImpl.java (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/security/JaasSecurityDomainAdaptorImpl.java 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1,67 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, 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.webservices.integration.security;
+
+import java.security.Key;
+import java.security.KeyStore;
+import java.util.Properties;
+
+import org.jboss.wsf.spi.security.JAASSecurityDomainAdaptor;
+import org.jboss.security.plugins.JaasSecurityDomain;
+
+/**
+ * Adapt JaasSecurityDomain to jbossws spi
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 14-Dec-2010
+ *
+ */
+public class JaasSecurityDomainAdaptorImpl implements JAASSecurityDomainAdaptor
+{
+ private JaasSecurityDomain delegate;
+
+ public JaasSecurityDomainAdaptorImpl(JaasSecurityDomain delegate)
+ {
+ this.delegate = delegate;
+ }
+
+ public KeyStore getKeyStore()
+ {
+ return delegate.getKeyStore();
+ }
+
+ public KeyStore getTrustStore()
+ {
+ return delegate.getTrustStore();
+ }
+
+ public Properties getAdditionalOptions()
+ {
+ return delegate.getAdditionalOptions();
+ }
+
+ public Key getKey(String alias, String serviceAuthToken) throws Exception
+ {
+ return delegate.getKey(alias, serviceAuthToken);
+ }
+
+}
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/security/JaasSecurityDomainAdaptorResolverImpl.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/security/JaasSecurityDomainAdaptorResolverImpl.java (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/security/JaasSecurityDomainAdaptorResolverImpl.java 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1,72 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, 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.webservices.integration.security;
+
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+import org.jboss.logging.Logger;
+import org.jboss.security.plugins.JaasSecurityDomain;
+import org.jboss.wsf.spi.security.JAASSecurityDomainAdaptor;
+import org.jboss.wsf.spi.security.JAASSecurityDomainAdaptorResolver;
+
+/**
+ * Lookup JAASSecurityAdaptor from given JNDI location
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 14-Dec-2010
+ */
+public class JaasSecurityDomainAdaptorResolverImpl implements JAASSecurityDomainAdaptorResolver
+{
+ public JAASSecurityDomainAdaptor lookup(String jndi) throws Exception
+ {
+ InitialContext ic = null;
+ try
+ {
+ ic = new InitialContext();
+ Object o = ic.lookup(jndi);
+ if (!(o instanceof JaasSecurityDomain))
+ {
+ throw new Exception(jndi + " not bound to a JaasSecurityDomain but to a " + o.getClass().getName() + " instance");
+ }
+ return new JaasSecurityDomainAdaptorImpl((JaasSecurityDomain)o);
+ }
+ catch (NamingException e)
+ {
+ throw new Exception("JNDI failure handling " + jndi, e);
+ }
+ finally
+ {
+ if (ic != null)
+ {
+ try
+ {
+ ic.close();
+ }
+ catch (NamingException e)
+ {
+ Logger.getLogger(JaasSecurityDomainAdaptorImpl.class).warn(this + " failed to close InitialContext", e);
+ }
+ }
+ }
+ }
+}
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/security/SecurityAdapterFactoryImpl.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/security/SecurityAdapterFactoryImpl.java (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/security/SecurityAdapterFactoryImpl.java 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1,52 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.webservices.integration.security;
+
+import org.jboss.wsf.spi.invocation.SecurityAdaptor;
+import org.jboss.wsf.spi.invocation.SecurityAdaptorFactory;
+
+/**
+ * Security adapters factory.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ * @author <a href="mailto:tdiesler@redhat.com">Thomas Diesler</a>
+ */
+public final class SecurityAdapterFactoryImpl extends SecurityAdaptorFactory
+{
+ /**
+ * Constructor.
+ */
+ public SecurityAdapterFactoryImpl()
+ {
+ super();
+ }
+
+ /**
+ * Creates new security adapter instance.
+ *
+ * @return security adapter
+ */
+ public SecurityAdaptor newSecurityAdapter()
+ {
+ return new SecurityAdapterImpl();
+ }
+}
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/security/SecurityAdapterImpl.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/security/SecurityAdapterImpl.java (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/security/SecurityAdapterImpl.java 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1,117 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.webservices.integration.security;
+
+import java.security.AccessController;
+import java.security.Principal;
+import java.security.PrivilegedAction;
+
+import javax.security.auth.Subject;
+
+import org.jboss.security.SecurityAssociation;
+import org.jboss.security.SecurityContext;
+import org.jboss.security.SecurityContextAssociation;
+import org.jboss.wsf.spi.invocation.SecurityAdaptor;
+
+/**
+ * The JBoss AS specific SecurityAssociation adapter.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ * @author <a href="mailto:tdiesler@redhat.com">Thomas Diesler</a>
+ */
+final class SecurityAdapterImpl implements SecurityAdaptor
+{
+ /**
+ * Constructor.
+ */
+ SecurityAdapterImpl()
+ {
+ super();
+ }
+
+ /**
+ * @see org.jboss.wsf.spi.invocation.SecurityAdaptor#getPrincipal()
+ *
+ * @return principal
+ */
+ public Principal getPrincipal()
+ {
+ return SecurityAssociation.getPrincipal();
+ }
+
+ /**
+ * @see org.jboss.wsf.spi.invocation.SecurityAdaptor#setPrincipal(Principal)
+ *
+ * @param principal principal
+ */
+ public void setPrincipal(final Principal principal)
+ {
+ SecurityAssociation.setPrincipal(principal);
+ }
+
+ /**
+ * @see org.jboss.wsf.spi.invocation.SecurityAdaptor#getCredential()
+ *
+ * @return credential
+ */
+ public Object getCredential()
+ {
+ return SecurityAssociation.getCredential();
+ }
+
+ /**
+ * @see org.jboss.wsf.spi.invocation.SecurityAdaptor#setCredential(Object)
+ *
+ * @param credential credential
+ */
+ public void setCredential(final Object credential)
+ {
+ SecurityAssociation.setCredential(credential);
+ }
+
+ /**
+ * @see org.jboss.wsf.spi.invocation.SecurityAdaptor#pushSubjectContext(Subject, Principal, Object)
+ *
+ * @param subject subject
+ * @param principal principal
+ * @param credential credential
+ */
+ public void pushSubjectContext(final Subject subject, final Principal principal, final Object credential)
+ {
+ AccessController.doPrivileged(new PrivilegedAction<Void>()
+ {
+
+ public Void run()
+ {
+ final SecurityContext securityContext = SecurityContextAssociation.getSecurityContext();
+ if (securityContext == null)
+ {
+ throw new IllegalStateException("Security Context is null");
+ }
+
+ securityContext.getUtil().createSubjectInfo(principal, credential, subject);
+
+ return null;
+ }
+ });
+ }
+}
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/AbstractSecurityMetaDataAccessorEJB.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/AbstractSecurityMetaDataAccessorEJB.java (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/AbstractSecurityMetaDataAccessorEJB.java 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1,128 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.webservices.integration.tomcat;
+
+import org.jboss.wsf.common.integration.WSHelper;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.EJBMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.EJBSecurityMetaData;
+
+/**
+ * Creates web app security meta data for EJB deployment.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ * @author <a href="mailto:tdiesler@redhat.com">Thomas Diesler</a>
+ */
+abstract class AbstractSecurityMetaDataAccessorEJB implements SecurityMetaDataAccessorEJB
+{
+ /** JAAS JNDI prefix. */
+ private static final String JAAS_JNDI_PREFIX = "java:/jaas/";
+
+ /**
+ * Constructor.
+ */
+ protected AbstractSecurityMetaDataAccessorEJB()
+ {
+ super();
+ }
+
+ /**
+ * Appends 'java:/jaas/' prefix to security domain if it's not prefixed with it.
+ *
+ * @param securityDomain security domain to be prefixed
+ * @return security domain prefixed with jaas JNDI prefix
+ */
+ protected final String appendJaasPrefix(final String securityDomain)
+ {
+ if (securityDomain != null)
+ {
+ final boolean hasJaasPrefix = securityDomain.startsWith(AbstractSecurityMetaDataAccessorEJB.JAAS_JNDI_PREFIX);
+
+ if (!hasJaasPrefix)
+ {
+ return AbstractSecurityMetaDataAccessorEJB.JAAS_JNDI_PREFIX + securityDomain;
+ }
+ }
+
+ return securityDomain;
+ }
+
+ /**
+ * @see org.jboss.webservices.integration.tomcat.SecurityMetaDataAccessorEJB#getAuthMethod(Endpoint)
+ *
+ * @param endpoint EJB webservice endpoint
+ * @return authentication method or null if not specified
+ */
+ public String getAuthMethod(final Endpoint endpoint)
+ {
+ final EJBSecurityMetaData ejbSecurityMD = this.getEjbSecurityMetaData(endpoint);
+ final boolean hasEjbSecurityMD = ejbSecurityMD != null;
+
+ return hasEjbSecurityMD ? ejbSecurityMD.getAuthMethod() : null;
+ }
+
+ /**
+ * @see org.jboss.webservices.integration.tomcat.SecurityMetaDataAccessorEJB#isSecureWsdlAccess(Endpoint)
+ *
+ * @param endpoint EJB webservice endpoint
+ * @return whether WSDL access have to be secured
+ */
+ public boolean isSecureWsdlAccess(final Endpoint endpoint)
+ {
+ final EJBSecurityMetaData ejbSecurityMD = this.getEjbSecurityMetaData(endpoint);
+ final boolean hasEjbSecurityMD = ejbSecurityMD != null;
+
+ return hasEjbSecurityMD ? ejbSecurityMD.getSecureWSDLAccess() : false;
+ }
+
+ /**
+ * @see org.jboss.webservices.integration.tomcat.SecurityMetaDataAccessorEJB#getTransportGuarantee(Endpoint)
+ *
+ * @param endpoint EJB webservice endpoint
+ * @return transport guarantee or null if not specified
+ */
+ public String getTransportGuarantee(final Endpoint endpoint)
+ {
+ final EJBSecurityMetaData ejbSecurityMD = this.getEjbSecurityMetaData(endpoint);
+ final boolean hasEjbSecurityMD = ejbSecurityMD != null;
+
+ return hasEjbSecurityMD ? ejbSecurityMD.getTransportGuarantee() : null;
+ }
+
+ /**
+ * Gets EJB security meta data if associated with EJB endpoint.
+ *
+ * @param endpoint EJB webservice endpoint
+ * @return EJB security meta data or null
+ */
+ private EJBSecurityMetaData getEjbSecurityMetaData(final Endpoint endpoint)
+ {
+ final String ejbName = endpoint.getShortName();
+ final Deployment dep = endpoint.getService().getDeployment();
+ final EJBArchiveMetaData ejbArchiveMD = WSHelper.getOptionalAttachment(dep, EJBArchiveMetaData.class);
+ final EJBMetaData ejbMD = ejbArchiveMD != null ? ejbArchiveMD.getBeanByEjbName(ejbName) : null;
+
+ return ejbMD != null ? ejbMD.getSecurityMetaData() : null;
+ }
+}
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/SecurityMetaDataAccessorEJB.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/SecurityMetaDataAccessorEJB.java (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/SecurityMetaDataAccessorEJB.java 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1,75 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.webservices.integration.tomcat;
+
+import org.jboss.metadata.javaee.spec.SecurityRolesMetaData;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.Endpoint;
+
+/**
+ * Creates web app security meta data for EJB deployments.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ * @author <a href="mailto:tdiesler@redhat.com">Thomas Diesler</a>
+ */
+interface SecurityMetaDataAccessorEJB
+{
+ /**
+ * Obtains security domain from EJB deployment.
+ *
+ * @param dep webservice deployment
+ * @return security domain associated with EJB deployment
+ */
+ String getSecurityDomain(Deployment dep);
+
+ /**
+ * Obtains security roles from EJB deployment.
+ *
+ * @param dep webservice deployment
+ * @return security roles associated with EJB deployment
+ */
+ SecurityRolesMetaData getSecurityRoles(Deployment dep);
+
+ /**
+ * Whether WSDL access have to be secured.
+ *
+ * @param endpoint webservice EJB endpoint
+ * @return authentication method or null if not specified
+ */
+ boolean isSecureWsdlAccess(Endpoint endpoint);
+
+ /**
+ * Gets EJB authentication method.
+ *
+ * @param endpoint webservice EJB endpoint
+ * @return authentication method or null if not specified
+ */
+ String getAuthMethod(Endpoint endpoint);
+
+ /**
+ * Gets EJB transport guarantee.
+ *
+ * @param endpoint webservice EJB endpoint
+ * @return transport guarantee or null if not specified
+ */
+ String getTransportGuarantee(Endpoint endpoint);
+}
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/SecurityMetaDataAccessorEJB21.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/SecurityMetaDataAccessorEJB21.java (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/SecurityMetaDataAccessorEJB21.java 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1,73 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.webservices.integration.tomcat;
+
+import org.jboss.metadata.common.ejb.IAssemblyDescriptorMetaData;
+import org.jboss.metadata.ejb.jboss.JBossMetaData;
+import org.jboss.metadata.javaee.spec.SecurityRolesMetaData;
+import org.jboss.wsf.common.integration.WSHelper;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData;
+
+/**
+ * Creates web app security meta data for EJB 21 deployment.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ * @author <a href="mailto:tdiesler@redhat.com">Thomas Diesler</a>
+ */
+final class SecurityMetaDataAccessorEJB21 extends AbstractSecurityMetaDataAccessorEJB
+{
+ /**
+ * Constructor.
+ */
+ SecurityMetaDataAccessorEJB21()
+ {
+ super();
+ }
+
+ /**
+ * @see org.jboss.webservices.integration.tomcat.AbstractSecurityMetaDataAccessorEJB#getSecurityDomain(Deployment)
+ *
+ * @param dep webservice deployment
+ * @return security domain associated with EJB 21 deployment
+ */
+ public String getSecurityDomain(final Deployment dep)
+ {
+ final EJBArchiveMetaData ejbMetaData = WSHelper.getRequiredAttachment(dep, EJBArchiveMetaData.class);
+
+ return super.appendJaasPrefix(ejbMetaData.getSecurityDomain());
+ }
+
+ /**
+ * @see org.jboss.webservices.integration.tomcat.AbstractSecurityMetaDataAccessorEJB#getSecurityRoles(Deployment)
+ *
+ * @param dep webservice deployment
+ * @return security roles associated with EJB 21 deployment
+ */
+ public SecurityRolesMetaData getSecurityRoles(final Deployment dep)
+ {
+ final JBossMetaData jbossWebMD = WSHelper.getRequiredAttachment(dep, JBossMetaData.class);
+ final IAssemblyDescriptorMetaData assemblyDescriptorMD = jbossWebMD.getAssemblyDescriptor();
+
+ return (assemblyDescriptorMD != null) ? assemblyDescriptorMD.getSecurityRoles() : null;
+ }
+}
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/SecurityMetaDataAccessorEJB3.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/SecurityMetaDataAccessorEJB3.java (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/SecurityMetaDataAccessorEJB3.java 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1,210 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.webservices.integration.tomcat;
+
+import java.util.Iterator;
+
+import javax.annotation.security.RolesAllowed;
+
+import org.jboss.ejb3.annotation.SecurityDomain;
+import org.jboss.metadata.javaee.spec.SecurityRoleMetaData;
+import org.jboss.metadata.javaee.spec.SecurityRolesMetaData;
+import org.jboss.wsf.common.integration.WSHelper;
+import org.jboss.wsf.spi.annotation.WebContext;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.deployment.integration.WebServiceDeclaration;
+import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment;
+
+/**
+ * Creates web app security meta data for EJB 3 deployment.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ * @author <a href="mailto:tdiesler@redhat.com">Thomas Diesler</a>
+ */
+final class SecurityMetaDataAccessorEJB3 extends AbstractSecurityMetaDataAccessorEJB
+{
+ /**
+ * Constructor.
+ */
+ SecurityMetaDataAccessorEJB3()
+ {
+ super();
+ }
+
+ /**
+ * @see org.jboss.webservices.integration.tomcat.AbstractSecurityMetaDataAccessorEJB#getSecurityDomain(Deployment)
+ *
+ * @param dep webservice deployment
+ * @return security domain associated with EJB 3 deployment
+ */
+ public String getSecurityDomain(final Deployment dep)
+ {
+ final WebServiceDeployment wsDeployment = WSHelper.getRequiredAttachment(dep, WebServiceDeployment.class);
+ String securityDomain = null;
+ final Iterator<WebServiceDeclaration> ejbContainers = wsDeployment.getServiceEndpoints().iterator();
+
+ while (ejbContainers.hasNext())
+ {
+ final WebServiceDeclaration ejbContainer = ejbContainers.next();
+ final SecurityDomain nextSecurityDomain = ejbContainer.getAnnotation(SecurityDomain.class);
+
+ securityDomain = this.getDomain(securityDomain, nextSecurityDomain);
+ }
+
+ return super.appendJaasPrefix(securityDomain);
+ }
+
+ /**
+ * @see org.jboss.webservices.integration.tomcat.AbstractSecurityMetaDataAccessorEJB#getSecurityRoles(Deployment)
+ *
+ * @param dep webservice deployment
+ * @return security roles associated with EJB 21 deployment
+ */
+ public SecurityRolesMetaData getSecurityRoles(final Deployment dep)
+ {
+ final WebServiceDeployment wsDeployment = WSHelper.getRequiredAttachment(dep, WebServiceDeployment.class);
+ final SecurityRolesMetaData securityRolesMD = new SecurityRolesMetaData();
+ final Iterator<WebServiceDeclaration> ejbContainers = wsDeployment.getServiceEndpoints().iterator();
+
+ while (ejbContainers.hasNext())
+ {
+ final WebServiceDeclaration ejbContainer = ejbContainers.next();
+ final RolesAllowed allowedRoles = ejbContainer.getAnnotation(RolesAllowed.class);
+ final boolean hasAllowedRoles = allowedRoles != null;
+
+ if (hasAllowedRoles)
+ {
+ for (final String roleName : allowedRoles.value())
+ {
+ final SecurityRoleMetaData securityRoleMD = new SecurityRoleMetaData();
+
+ securityRoleMD.setRoleName(roleName);
+ securityRolesMD.add(securityRoleMD);
+ }
+ }
+ }
+
+ return securityRolesMD;
+ }
+
+ /**
+ * @see org.jboss.webservices.integration.tomcat.SecurityMetaDataAccessorEJB#getAuthMethod(Endpoint)
+ *
+ * @param endpoint EJB webservice endpoint
+ * @return authentication method or null if not specified
+ */
+ public String getAuthMethod(final Endpoint endpoint)
+ {
+ final WebContext webContext = this.getWebContextAnnotation(endpoint);
+ final boolean hasAuthMethod = (webContext != null) && (webContext.authMethod().length() > 0);
+
+ return hasAuthMethod ? webContext.authMethod() : super.getAuthMethod(endpoint);
+ }
+
+ /**
+ * @see org.jboss.webservices.integration.tomcat.SecurityMetaDataAccessorEJB#isSecureWsdlAccess(Endpoint)
+ *
+ * @param endpoint EJB webservice endpoint
+ * @return whether WSDL access have to be secured
+ */
+ public boolean isSecureWsdlAccess(final Endpoint endpoint)
+ {
+ final WebContext webContext = this.getWebContextAnnotation(endpoint);
+ final boolean hasSecureWsdlAccess = (webContext != null) && (webContext.secureWSDLAccess());
+
+ return hasSecureWsdlAccess ? true : super.isSecureWsdlAccess(endpoint);
+ }
+
+ /**
+ * @see org.jboss.webservices.integration.tomcat.SecurityMetaDataAccessorEJB#getTransportGuarantee(Endpoint)
+ *
+ * @param endpoint EJB webservice endpoint
+ * @return transport guarantee or null if not specified
+ */
+ public String getTransportGuarantee(final Endpoint endpoint)
+ {
+ final WebContext webContext = this.getWebContextAnnotation(endpoint);
+ final boolean hasTransportGuarantee = (webContext != null) && (webContext.transportGuarantee().length() > 0);
+
+ return hasTransportGuarantee ? webContext.transportGuarantee() : super.getTransportGuarantee(endpoint);
+ }
+
+ /**
+ * Gets <b>WebContext</b> if associated with EJB endpoint.
+ *
+ * @param endpoint EJB webservice endpoint
+ * @return web context associated with EJB or null
+ */
+ @SuppressWarnings(
+ {"unchecked"})
+ private WebContext getWebContextAnnotation(final Endpoint endpoint)
+ {
+ return (WebContext) endpoint.getTargetBeanClass().getAnnotation(WebContext.class);
+ }
+
+ /**
+ * Returns security domain value. This method checks domain is the same for every EJB 3 endpoint.
+ *
+ * @param oldSecurityDomain our security domain
+ * @param nextSecurityDomain next security domain
+ * @return security domain value
+ * @throws IllegalStateException if domains have different values
+ */
+ private String getDomain(final String oldSecurityDomain, final SecurityDomain nextSecurityDomain)
+ {
+ if (nextSecurityDomain == null)
+ {
+ return oldSecurityDomain;
+ }
+
+ if (oldSecurityDomain == null)
+ {
+ return nextSecurityDomain.value();
+ }
+
+ this.ensureSameDomains(oldSecurityDomain, nextSecurityDomain.value());
+
+ return oldSecurityDomain;
+ }
+
+ /**
+ * This method ensures both passed domains contain the same value.
+ *
+ * @param oldSecurityDomain our security domain
+ * @param newSecurityDomain next security domain
+ * @throws IllegalStateException if domains have different values
+ */
+ private void ensureSameDomains(final String oldSecurityDomain, final String newSecurityDomain)
+ {
+ final boolean domainsDiffer = !oldSecurityDomain.equals(newSecurityDomain);
+
+ if (domainsDiffer)
+ {
+ final String errorMessage = "Multiple security domains not supported. ";
+ final String firstDomain = "First domain: '" + oldSecurityDomain + "' ";
+ final String secondDomain = "second domain: '" + newSecurityDomain + "'";
+
+ throw new IllegalStateException(errorMessage + firstDomain + secondDomain);
+ }
+ }
+}
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreatingDeploymentAspect.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreatingDeploymentAspect.java (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreatingDeploymentAspect.java 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1,63 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.webservices.integration.tomcat;
+
+import org.jboss.wsf.common.integration.WSHelper;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.common.integration.AbstractDeploymentAspect;
+
+/**
+ * A deployment aspect that generates web app meta data for EJB endpoints.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ * @author <a href="mailto:tdiesler@redhat.com">Thomas Diesler</a>
+ */
+public final class WebMetaDataCreatingDeploymentAspect extends AbstractDeploymentAspect
+{
+ /** Web meta data creator. */
+ private WebMetaDataCreator webMetaDataCreator = new WebMetaDataCreator();
+
+ /**
+ * Constructor.
+ */
+ public WebMetaDataCreatingDeploymentAspect()
+ {
+ super();
+ }
+
+ /**
+ * Creates web meta data for EJB deployments.
+ *
+ * @param dep webservice deployment
+ */
+ @Override
+ public void start(final Deployment dep)
+ {
+ final boolean isEjbDeployment = WSHelper.isEjbDeployment(dep);
+
+ if (isEjbDeployment)
+ {
+ this.log.debug("Creating web meta data for EJB webservice deployment: " + dep.getSimpleName());
+ this.webMetaDataCreator.create(dep);
+ }
+ }
+}
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreator.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreator.java (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreator.java 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1,370 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.webservices.integration.tomcat;
+
+import java.util.List;
+
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.logging.Logger;
+import org.jboss.metadata.javaee.spec.SecurityRolesMetaData;
+import org.jboss.metadata.web.jboss.JBossServletsMetaData;
+import org.jboss.metadata.web.jboss.JBossWebMetaData;
+import org.jboss.metadata.web.spec.LoginConfigMetaData;
+import org.jboss.metadata.web.spec.SecurityConstraintMetaData;
+import org.jboss.metadata.web.spec.ServletMappingMetaData;
+import org.jboss.metadata.web.spec.WebResourceCollectionsMetaData;
+import org.jboss.webservices.integration.util.ASHelper;
+import org.jboss.webservices.integration.util.WebMetaDataHelper;
+import org.jboss.wsf.common.integration.WSHelper;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.Endpoint;
+
+/**
+ * Creator of web app meta data for EJB endpoints.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ * @author <a href="mailto:tdiesler@redhat.com">Thomas Diesler</a>
+ */
+final class WebMetaDataCreator
+{
+ /** Our Realm. */
+ private static final String EJB_WEBSERVICE_REALM = "EJBWebServiceEndpointServlet Realm";
+
+ /** EJB 21 security meta data builder. */
+ private final SecurityMetaDataAccessorEJB ejb21SecurityAccessor = new SecurityMetaDataAccessorEJB21();
+
+ /** EJB 3 security meta data builder. */
+ private final SecurityMetaDataAccessorEJB ejb3SecurityAccessor = new SecurityMetaDataAccessorEJB3();
+
+ /** Logger. */
+ private final Logger log = Logger.getLogger(WebMetaDataCreator.class);
+
+ /**
+ * Constructor.
+ */
+ WebMetaDataCreator()
+ {
+ super();
+ }
+
+ /**
+ * Creates web meta data for EJB deployments.
+ *
+ * @param dep webservice deployment
+ */
+ void create(final Deployment dep)
+ {
+ final DeploymentUnit unit = WSHelper.getRequiredAttachment(dep, DeploymentUnit.class);
+ JBossWebMetaData jbossWebMD = ASHelper.getOptionalAttachment(unit, JBossWebMetaData.class);
+ if (jbossWebMD == null)
+ {
+ jbossWebMD = new JBossWebMetaData();
+ }
+
+ this.createWebAppDescriptor(dep, jbossWebMD);
+ this.createJBossWebAppDescriptor(dep, jbossWebMD);
+
+ dep.addAttachment(JBossWebMetaData.class, jbossWebMD);
+ unit.addAttachment(JBossWebMetaData.class, jbossWebMD);
+ }
+
+ /**
+ * Creates web.xml descriptor meta data.
+ *
+ * @param dep webservice deployment
+ * @param jbossWebMD jboss web meta data
+ */
+ private void createWebAppDescriptor(final Deployment dep, final JBossWebMetaData jbossWebMD)
+ {
+ this.log.debug("Creating web descriptor");
+ this.createServlets(dep, jbossWebMD);
+ this.createServletMappings(dep, jbossWebMD);
+ this.createSecurityConstraints(dep, jbossWebMD);
+ this.createLoginConfig(dep, jbossWebMD);
+ this.createSecurityRoles(dep, jbossWebMD);
+ }
+
+ /**
+ * Creates jboss-web.xml descriptor meta data.
+ *
+ * <pre>
+ * <jboss-web>
+ * <security-domain>java:/jaas/custom-security-domain</security-domain>
+ * <context-root>/custom-context-root</context-root>
+ * <virtual-host>host1</virtual-host>
+ * ...
+ * <virtual-host>hostN</virtual-host>
+ * </jboss-web>
+ * </pre>
+ *
+ * @param dep webservice deployment
+ * @param jbossWebMD jboss web meta data
+ */
+ private void createJBossWebAppDescriptor(final Deployment dep, final JBossWebMetaData jbossWebMD)
+ {
+ this.log.debug("Creating jboss web descriptor");
+ final SecurityMetaDataAccessorEJB ejbMDAccessor = this.getEjbSecurityMetaDataAccessor(dep);
+
+ // Set security domain
+ final String securityDomain = ejbMDAccessor.getSecurityDomain(dep);
+ final boolean hasSecurityDomain = securityDomain != null;
+
+ if (hasSecurityDomain)
+ {
+ this.log.debug("Setting security domain: " + securityDomain);
+ jbossWebMD.setSecurityDomain(securityDomain);
+ }
+
+ // Set virtual hosts
+ final List<String> virtualHosts = dep.getService().getVirtualHosts();
+ this.log.debug("Setting virtual hosts: " + virtualHosts);
+ jbossWebMD.setVirtualHosts(virtualHosts);
+ }
+
+ /**
+ * Creates servlets part of web.xml descriptor.
+ *
+ * <pre>
+ * <servlet>
+ * <servlet-name>EJBEndpointShortName</servlet-name>
+ * <servlet-class>EJBEndpointTargetBeanName</servlet-class>
+ * </servlet>
+ * </pre>
+ *
+ * @param dep webservice deployment
+ * @param jbossWebMD jboss web meta data
+ */
+ private void createServlets(final Deployment dep, final JBossWebMetaData jbossWebMD)
+ {
+ this.log.debug("Creating servlets");
+ final JBossServletsMetaData servlets = WebMetaDataHelper.getServlets(jbossWebMD);
+
+ for (final Endpoint endpoint : dep.getService().getEndpoints())
+ {
+ final String endpointName = endpoint.getShortName();
+ final String endpointClassName = endpoint.getTargetBeanName();
+
+ this.log.debug("Servlet name: " + endpointName + ", servlet class: " + endpointClassName);
+ WebMetaDataHelper.newServlet(endpointName, endpointClassName, servlets);
+ }
+ }
+
+ /**
+ * Creates servlet-mapping part of web.xml descriptor.
+ *
+ * <pre>
+ * <servlet-mapping>
+ * <servlet-name>EJBEndpointShortName</servlet-name>
+ * <url-pattern>EJBEndpointURLPattern</url-pattern>
+ * </servlet-mapping>
+ * </pre>
+ *
+ * @param dep webservice deployment
+ * @param jbossWebMD jboss web meta data
+ */
+ private void createServletMappings(final Deployment dep, final JBossWebMetaData jbossWebMD)
+ {
+ this.log.debug("Creating servlet mappings");
+ final List<ServletMappingMetaData> servletMappings = WebMetaDataHelper.getServletMappings(jbossWebMD);
+
+ for (final Endpoint ep : dep.getService().getEndpoints())
+ {
+ final String endpointName = ep.getShortName();
+ final List<String> urlPatterns = WebMetaDataHelper.getUrlPatterns(ep.getURLPattern());
+
+ this.log.debug("Servlet name: " + endpointName + ", URL patterns: " + urlPatterns);
+ WebMetaDataHelper.newServletMapping(endpointName, urlPatterns, servletMappings);
+ }
+ }
+
+ /**
+ * Creates security constraints part of web.xml descriptor.
+ *
+ * <pre>
+ * <security-constraint>
+ * <web-resource-collection>
+ * <web-resource-name>EJBEndpointShortName</web-resource-name>
+ * <url-pattern>EJBEndpointURLPattern</url-pattern>
+ * <http-method>GET</http-method>
+ * <http-method>POST</http-method>
+ * </web-resource-collection>
+ * <auth-constraint>
+ * <role-name>*</role-name>
+ * </auth-constraint>
+ * <user-data-constraint>
+ * <transport-guarantee>EjbTransportGuarantee</transport-guarantee>
+ * </user-data-constraint>
+ * </security-constraint>
+ * </pre>
+ *
+ * @param dep webservice deployemnt
+ * @param jbossWebMD jboss web meta data
+ */
+ private void createSecurityConstraints(final Deployment dep, final JBossWebMetaData jbossWebMD)
+ {
+ this.log.debug("Creating security constraints");
+ final SecurityMetaDataAccessorEJB ejbMDAccessor = this.getEjbSecurityMetaDataAccessor(dep);
+
+ for (final Endpoint ejbEndpoint : dep.getService().getEndpoints())
+ {
+ final boolean secureWsdlAccess = ejbMDAccessor.isSecureWsdlAccess(ejbEndpoint);
+ final String transportGuarantee = ejbMDAccessor.getTransportGuarantee(ejbEndpoint);
+ final boolean hasTransportGuarantee = transportGuarantee != null;
+ final String authMethod = ejbMDAccessor.getAuthMethod(ejbEndpoint);
+ final boolean hasAuthMethod = authMethod != null;
+
+ if (hasAuthMethod || hasTransportGuarantee)
+ {
+ final List<SecurityConstraintMetaData> securityConstraints = WebMetaDataHelper
+ .getSecurityConstraints(jbossWebMD);
+
+ // security-constraint
+ final SecurityConstraintMetaData securityConstraint = WebMetaDataHelper
+ .newSecurityConstraint(securityConstraints);
+
+ // web-resource-collection
+ final WebResourceCollectionsMetaData webResourceCollections = WebMetaDataHelper
+ .getWebResourceCollections(securityConstraint);
+ final String endpointName = ejbEndpoint.getShortName();
+ final String urlPattern = ejbEndpoint.getURLPattern();
+ this.log.debug("Creating web resource collection for endpoint: " + endpointName + ", URL pattern: "
+ + urlPattern);
+ WebMetaDataHelper.newWebResourceCollection(endpointName, urlPattern, secureWsdlAccess,
+ webResourceCollections);
+
+ // auth-constraint
+ if (hasAuthMethod)
+ {
+ this.log.debug("Creating auth constraint for endpoint: " + endpointName);
+ WebMetaDataHelper.newAuthConstraint(WebMetaDataHelper.getAllRoles(), securityConstraint);
+ }
+
+ // user-data-constraint
+ if (hasTransportGuarantee)
+ {
+ this.log.debug("Creating new user data constraint for endpoint: " + endpointName
+ + ", transport guarantee: " + transportGuarantee);
+ WebMetaDataHelper.newUserDataConstraint(transportGuarantee, securityConstraint);
+ }
+ }
+ }
+ }
+
+ /**
+ * Creates login-config part of web.xml descriptor.
+ *
+ * <pre>
+ * <login-config>
+ * <auth-method>EjbDeploymentAuthMethod</auth-method>
+ * <realm-name>EJBWebServiceEndpointServlet Realm</realm-name>
+ * </login-config>
+ * </pre>
+ *
+ * @param dep webservice deployment
+ * @param jbossWebMD jboss web meta data
+ */
+ private void createLoginConfig(final Deployment dep, final JBossWebMetaData jbossWebMD)
+ {
+ final String authMethod = this.getAuthMethod(dep);
+ final boolean hasAuthMethod = authMethod != null;
+
+ if (hasAuthMethod)
+ {
+ this.log.debug("Creating new login config: " + WebMetaDataCreator.EJB_WEBSERVICE_REALM + ", auth method: "
+ + authMethod);
+ final LoginConfigMetaData loginConfig = WebMetaDataHelper.getLoginConfig(jbossWebMD);
+ loginConfig.setRealmName(WebMetaDataCreator.EJB_WEBSERVICE_REALM);
+ loginConfig.setAuthMethod(authMethod);
+ }
+ }
+
+ /**
+ * Creates security roles part of web.xml descriptor.
+ *
+ * <pre>
+ * <security-role>
+ * <role-name>role1</role-name>
+ * ...
+ * <role-name>roleN</role-name>
+ * </security-role>
+ * </pre>
+ *
+ * @param dep webservice deployment
+ * @param jbossWebMD jboss web meta data
+ */
+ private void createSecurityRoles(final Deployment dep, final JBossWebMetaData jbossWebMD)
+ {
+ final String authMethod = this.getAuthMethod(dep);
+ final boolean hasAuthMethod = authMethod != null;
+
+ if (hasAuthMethod)
+ {
+ final SecurityMetaDataAccessorEJB ejbMDAccessor = this.getEjbSecurityMetaDataAccessor(dep);
+ final SecurityRolesMetaData securityRolesMD = ejbMDAccessor.getSecurityRoles(dep);
+ final boolean hasSecurityRolesMD = securityRolesMD != null;
+
+ if (hasSecurityRolesMD)
+ {
+ this.log.debug("Setting security roles: " + securityRolesMD);
+ jbossWebMD.setSecurityRoles(securityRolesMD);
+ }
+ }
+ }
+
+ /**
+ * Returns deployment authentication method.
+ *
+ * @param dep webservice deployment
+ * @return deployment authentication method
+ */
+ private String getAuthMethod(final Deployment dep)
+ {
+ final SecurityMetaDataAccessorEJB ejbMDAccessor = this.getEjbSecurityMetaDataAccessor(dep);
+
+ for (final Endpoint ejbEndpoint : dep.getService().getEndpoints())
+ {
+ final String beanAuthMethod = ejbMDAccessor.getAuthMethod(ejbEndpoint);
+ final boolean hasBeanAuthMethod = beanAuthMethod != null;
+
+ if (hasBeanAuthMethod)
+ {
+ // First found auth-method defines war login-config/auth-method
+ return beanAuthMethod;
+ }
+ }
+
+ return null;
+ }
+
+ /**
+ * Returns security builder associated with EJB deployment.
+ *
+ * @param dep webservice EJB deployment
+ * @return security builder for EJB deployment
+ */
+ private SecurityMetaDataAccessorEJB getEjbSecurityMetaDataAccessor(final Deployment dep)
+ {
+ final boolean isJaxws = WSHelper.isJaxwsDeployment(dep);
+
+ return isJaxws ? this.ejb3SecurityAccessor : this.ejb21SecurityAccessor;
+ }
+}
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifier.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifier.java (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifier.java 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1,151 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.webservices.integration.tomcat;
+
+import java.util.List;
+
+import org.jboss.logging.Logger;
+import org.jboss.metadata.javaee.spec.ParamValueMetaData;
+import org.jboss.metadata.web.jboss.JBossWebMetaData;
+import org.jboss.metadata.web.spec.ServletMetaData;
+import org.jboss.webservices.integration.util.ASHelper;
+import org.jboss.webservices.integration.util.WebMetaDataHelper;
+import org.jboss.wsf.common.integration.WSConstants;
+import org.jboss.wsf.common.integration.WSHelper;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.deployment.ServletClassProvider;
+
+/**
+ * The modifier of jboss web meta data.
+ * It configures WS transport for every webservice endpoint
+ * plus propagates WS stack specific context parameters if required.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ * @author <a href="mailto:tdiesler@redhat.com">Thomas Diesler</a>
+ */
+final class WebMetaDataModifier
+{
+ /** Logger. */
+ private final Logger log = Logger.getLogger(WebMetaDataModifier.class);
+
+ /**
+ * Constructor.
+ */
+ WebMetaDataModifier()
+ {
+ super();
+ }
+
+ /**
+ * Modifies web meta data to configure webservice stack transport and properties.
+ *
+ * @param dep webservice deployment
+ */
+ void modify(final Deployment dep)
+ {
+ final JBossWebMetaData jbossWebMD = WSHelper.getRequiredAttachment(dep, JBossWebMetaData.class);
+
+ this.configureEndpoints(dep, jbossWebMD);
+ this.modifyContextRoot(dep, jbossWebMD);
+ }
+
+ /**
+ * Configures transport servlet class for every found webservice endpoint.
+ *
+ * @param dep webservice deployment
+ * @param jbossWebMD web meta data
+ */
+ private void configureEndpoints(final Deployment dep, final JBossWebMetaData jbossWebMD)
+ {
+ final String transportClassName = this.getTransportClassName(dep);
+ final ClassLoader loader = dep.getInitialClassLoader();
+ this.log.trace("Modifying servlets");
+
+ for (final ServletMetaData servletMD : jbossWebMD.getServlets())
+ {
+ final boolean isWebserviceEndpoint = ASHelper.getEndpointClass(servletMD, loader) != null;
+
+ if (isWebserviceEndpoint)
+ {
+ // set transport servlet
+ servletMD.setServletClass(transportClassName);
+
+ // configure webservice endpoint
+ final String endpointClassName = servletMD.getServletClass();
+ this.log.debug("Setting transport class: " + transportClassName + " for servlet: " + endpointClassName);
+ final List<ParamValueMetaData> initParams = WebMetaDataHelper.getServletInitParams(servletMD);
+ WebMetaDataHelper.newParamValue(Endpoint.SEPID_DOMAIN_ENDPOINT, endpointClassName, initParams);
+ }
+ }
+ }
+
+ /**
+ * Modifies context root.
+ *
+ * @param dep webservice deployment
+ * @param jbossWebMD web meta data
+ */
+ private void modifyContextRoot(final Deployment dep, final JBossWebMetaData jbossWebMD)
+ {
+ final String contextRoot = dep.getService().getContextRoot();
+ this.log.debug("Setting context root: " + contextRoot + " for deployment: " + dep.getSimpleName());
+ jbossWebMD.setContextRoot(contextRoot);
+ }
+
+ /**
+ * Returns stack specific transport class name.
+ *
+ * @param dep webservice deployment
+ * @return stack specific transport class name
+ * @throws IllegalStateException if transport class name is not found in deployment properties map
+ */
+ private String getTransportClassName(final Deployment dep)
+ {
+ String transportClassName = null;
+ String transportClassProviderName = (String) dep.getProperty(WSConstants.STACK_TRANSPORT_CLASS_PROVIDER);
+ if (transportClassProviderName != null)
+ {
+ try
+ {
+ ServletClassProvider scp = (ServletClassProvider)(Class.forName(transportClassProviderName).newInstance());
+ transportClassName = scp.getServletClassName();
+ }
+ catch (Exception e)
+ {
+ log.warn("Cannot get transport class name from " + WSConstants.STACK_TRANSPORT_CLASS_PROVIDER, e);
+ }
+ }
+
+ if (transportClassName == null)
+ {
+ transportClassName = (String) dep.getProperty(WSConstants.STACK_TRANSPORT_CLASS);
+ }
+
+ if (transportClassName == null)
+ {
+ throw new IllegalStateException("Cannot obtain deployment property : " + WSConstants.STACK_TRANSPORT_CLASS);
+ }
+
+ return transportClassName;
+ }
+}
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifyingDeploymentAspect.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifyingDeploymentAspect.java (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifyingDeploymentAspect.java 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1,57 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.webservices.integration.tomcat;
+
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.common.integration.AbstractDeploymentAspect;
+
+/**
+ * Modifies web meta data to configure webservice stack endpoints and properties.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ * @author <a href="mailto:tdiesler@redhat.com">Thomas Diesler</a>
+ */
+public final class WebMetaDataModifyingDeploymentAspect extends AbstractDeploymentAspect
+{
+ /** Web meta data modifier. */
+ private WebMetaDataModifier webMetaDataModifier = new WebMetaDataModifier();
+
+ /**
+ * Constructor.
+ */
+ public WebMetaDataModifyingDeploymentAspect()
+ {
+ super();
+ }
+
+ /**
+ * Modifies web meta data.
+ *
+ * @param dep webservice deployment
+ */
+ @Override
+ public void start(final Deployment dep)
+ {
+ this.log.debug("Modifying web meta data for webservice deployment: " + dep.getSimpleName());
+ this.webMetaDataModifier.modify(dep);
+ }
+}
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/util/ASHelper.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/util/ASHelper.java (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/util/ASHelper.java 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1,417 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.webservices.integration.util;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.jws.WebService;
+import javax.servlet.Servlet;
+import javax.xml.ws.WebServiceProvider;
+
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.logging.Logger;
+import org.jboss.metadata.common.jboss.WebserviceDescriptionMetaData;
+import org.jboss.metadata.common.jboss.WebserviceDescriptionsMetaData;
+import org.jboss.metadata.web.jboss.JBossServletMetaData;
+import org.jboss.metadata.web.jboss.JBossWebMetaData;
+import org.jboss.metadata.web.spec.ServletMetaData;
+import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
+import org.jboss.wsf.spi.deployment.integration.WebServiceDeclaration;
+import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment;
+
+/**
+ * JBoss AS integration helper class.
+ *
+ * @author <a href="ropalka(a)redhat.com">Richard Opalka</a>
+ */
+public final class ASHelper
+{
+ /**
+ * EJB invocation property.
+ */
+ public static final String CONTAINER_NAME = "org.jboss.wsf.spi.invocation.ContainerName";
+
+ /** Logger. */
+ private static final Logger LOGGER = Logger.getLogger(ASHelper.class);
+
+ /**
+ * Forbidden constructor.
+ */
+ private ASHelper()
+ {
+ super();
+ }
+
+ /**
+ * Returns true if unit contains JAXWS JSE, JAXRPC JSE, JAXWS EJB or JAXRPC EJB deployment.
+ *
+ * @param unit deployment unit
+ * @return true if JAXWS JSE, JAXRPC JSE, JAXWS EJB or JAXRPC EJB deployment, false otherwise.
+ */
+ public static boolean isWebServiceDeployment(final DeploymentUnit unit)
+ {
+ return ASHelper.getOptionalAttachment(unit, DeploymentType.class) != null;
+ }
+
+ /**
+ * Returns true if unit contains JAXRPC EJB deployment.
+ *
+ * @param unit deployment unit
+ * @return true if JAXRPC EJB deployment, false otherwise
+ */
+ public static boolean isJaxrpcEjbDeployment(final DeploymentUnit unit)
+ {
+ final DeploymentType deploymentType = ASHelper.getOptionalAttachment(unit, DeploymentType.class);
+
+ return DeploymentType.JAXRPC_EJB21.equals(deploymentType);
+ }
+
+ /**
+ * Returns true if unit contains JAXRPC JSE deployment.
+ *
+ * @param unit deployment unit
+ * @return true if JAXRPC JSE deployment, false otherwise
+ */
+ public static boolean isJaxrpcJseDeployment(final DeploymentUnit unit)
+ {
+ final DeploymentType deploymentType = ASHelper.getOptionalAttachment(unit, DeploymentType.class);
+
+ return DeploymentType.JAXRPC_JSE.equals(deploymentType);
+ }
+
+ /**
+ * Returns true if unit contains JAXWS EJB deployment.
+ *
+ * @param unit deployment unit
+ * @return true if JAXWS EJB deployment, false otherwise
+ */
+ public static boolean isJaxwsEjbDeployment(final DeploymentUnit unit)
+ {
+ final DeploymentType deploymentType = ASHelper.getOptionalAttachment(unit, DeploymentType.class);
+
+ return DeploymentType.JAXWS_EJB3.equals(deploymentType);
+ }
+
+ /**
+ * Returns true if unit contains JAXWS JSE deployment.
+ *
+ * @param unit deployment unit
+ * @return true if JAXWS JSE deployment, false otherwise
+ */
+ public static boolean isJaxwsJseDeployment(final DeploymentUnit unit)
+ {
+ final DeploymentType deploymentType = ASHelper.getOptionalAttachment(unit, DeploymentType.class);
+
+ return DeploymentType.JAXWS_JSE.equals(deploymentType);
+ }
+
+ /**
+ * Returns true if unit contains either JAXWS JSE or JAXRPC JSE deployment.
+ *
+ * @param unit deployment unit
+ * @return true if either JAXWS JSE or JAXRPC JSE deployment, false otherwise.
+ */
+ public static boolean isJseDeployment(final DeploymentUnit unit)
+ {
+ final boolean isJaxwsJse = ASHelper.isJaxwsJseDeployment(unit);
+ final boolean isJaxrpcJse = ASHelper.isJaxrpcJseDeployment(unit);
+
+ return isJaxwsJse || isJaxrpcJse;
+ }
+
+ /**
+ * Returns true if unit contains either JAXWS EJB or JAXRPC EJB deployment.
+ *
+ * @param unit deployment unit
+ * @return true if either JAXWS EJB or JAXRPC EJB deployment, false otherwise
+ */
+ public static boolean isEjbDeployment(final DeploymentUnit unit)
+ {
+ final boolean isJaxwsEjb = ASHelper.isJaxwsEjbDeployment(unit);
+ final boolean isJaxrpcEjb = ASHelper.isJaxrpcEjbDeployment(unit);
+
+ return isJaxwsEjb || isJaxrpcEjb;
+ }
+
+ /**
+ * Returns true if unit contains either JAXWS EJB or JAXWS JSE deployment.
+ *
+ * @param unit deployment unit
+ * @return true if either JAXWS EJB or JAXWS JSE deployment, false otherwise
+ */
+ public static boolean isJaxwsDeployment(final DeploymentUnit unit)
+ {
+ final boolean isJaxwsEjb = ASHelper.isJaxwsEjbDeployment(unit);
+ final boolean isJaxwsJse = ASHelper.isJaxwsJseDeployment(unit);
+
+ return isJaxwsEjb || isJaxwsJse;
+ }
+
+ /**
+ * Returns true if unit contains either JAXRPC EJB or JAXRPC JSE deployment.
+ *
+ * @param unit deployment unit
+ * @return true if either JAXRPC EJB or JAXRPC JSE deployment, false otherwise
+ */
+ public static boolean isJaxrpcDeployment(final DeploymentUnit unit)
+ {
+ final boolean isJaxrpcEjb = ASHelper.isJaxrpcEjbDeployment(unit);
+ final boolean isJaxrpcJse = ASHelper.isJaxrpcJseDeployment(unit);
+
+ return isJaxrpcEjb || isJaxrpcJse;
+ }
+
+ /**
+ * Gets list of JAXWS servlets meta data.
+ *
+ * @param unit deployment unit
+ * @return list of JAXWS servlets meta data
+ */
+ public static List<ServletMetaData> getJaxwsServlets(final DeploymentUnit unit)
+ {
+ return ASHelper.getWebServiceServlets(unit, true);
+ }
+
+ /**
+ * Gets list of JAXRPC servlets meta data.
+ *
+ * @param unit deployment unit
+ * @return list of JAXRPC servlets meta data
+ */
+ public static List<ServletMetaData> getJaxrpcServlets(final DeploymentUnit unit)
+ {
+ return ASHelper.getWebServiceServlets(unit, false);
+ }
+
+ /**
+ * Gets list of JAXWS EJBs meta data.
+ *
+ * @param unit deployment unit
+ * @return list of JAXWS EJBs meta data
+ */
+ public static List<WebServiceDeclaration> getJaxwsEjbs(final DeploymentUnit unit)
+ {
+ final WebServiceDeployment wsDeployment = ASHelper.getRequiredAttachment(unit, WebServiceDeployment.class);
+ final List<WebServiceDeclaration> endpoints = new ArrayList<WebServiceDeclaration>();
+
+ final Iterator<WebServiceDeclaration> ejbIterator = wsDeployment.getServiceEndpoints().iterator();
+ while (ejbIterator.hasNext())
+ {
+ final WebServiceDeclaration ejbContainer = ejbIterator.next();
+ if (ASHelper.isWebServiceBean(ejbContainer))
+ {
+ endpoints.add(ejbContainer);
+ }
+ }
+
+ return endpoints;
+ }
+
+ /**
+ * Returns true if EJB container is webservice endpoint.
+ *
+ * @param ejbContainerAdapter EJB container adapter
+ * @return true if EJB container is webservice endpoint, false otherwise
+ */
+ public static boolean isWebServiceBean(final WebServiceDeclaration ejbContainerAdapter)
+ {
+ final boolean isWebService = ejbContainerAdapter.getAnnotation(WebService.class) != null;
+ final boolean isWebServiceProvider = ejbContainerAdapter.getAnnotation(WebServiceProvider.class) != null;
+
+ return isWebService || isWebServiceProvider;
+ }
+
+ /**
+ * Returns endpoint class name.
+ *
+ * @param servletMD servlet meta data
+ * @return endpoint class name
+ */
+ public static String getEndpointName(final ServletMetaData servletMD)
+ {
+ final String endpointClass = servletMD.getServletClass();
+
+ return endpointClass != null ? endpointClass.trim() : null;
+ }
+
+ /**
+ * Returns servlet meta data for requested servlet name.
+ *
+ * @param jbossWebMD jboss web meta data
+ * @param servletName servlet name
+ * @return servlet meta data
+ */
+ public static ServletMetaData getServletForName(final JBossWebMetaData jbossWebMD, final String servletName)
+ {
+ for (JBossServletMetaData servlet : jbossWebMD.getServlets())
+ {
+ if (servlet.getName().equals(servletName))
+ {
+ return servlet;
+ }
+ }
+
+ throw new IllegalStateException("Cannot find servlet for link: " + servletName);
+ }
+
+ /**
+ * Returns webservice endpoint class or null if passed servlet meta data belong to either JSP or servlet instance.
+ *
+ * @param servletMD servlet meta data
+ * @param loader class loader
+ * @return webservice endpoint class or null
+ */
+ public static Class<?> getEndpointClass(final ServletMetaData servletMD, final ClassLoader loader)
+ {
+ final String endpointClassName = ASHelper.getEndpointName(servletMD);
+ final boolean notJSP = endpointClassName != null && endpointClassName.length() > 0;
+
+ if (notJSP)
+ {
+ try
+ {
+ final Class<?> endpointClass = loader.loadClass(endpointClassName);
+ final boolean notServlet = !Servlet.class.isAssignableFrom(endpointClass);
+
+ if (notServlet)
+ {
+ return endpointClass;
+ }
+ }
+ catch (ClassNotFoundException cnfe)
+ {
+ ASHelper.LOGGER.warn("Cannot load servlet class: " + endpointClassName, cnfe);
+ }
+ }
+
+ return null;
+ }
+
+ /**
+ * Returns required attachment value from deployment unit.
+ *
+ * @param <A> expected value
+ * @param unit deployment unit
+ * @param key attachment key
+ * @return required attachment
+ * @throws IllegalStateException if attachment value is null
+ */
+ public static <A> A getRequiredAttachment(final DeploymentUnit unit, final Class<A> key)
+ {
+ final A value = unit.getAttachment(key);
+ if (value == null)
+ {
+ ASHelper.LOGGER.error("Cannot find attachment in deployment unit: " + key);
+ throw new IllegalStateException();
+ }
+
+ return value;
+ }
+
+ /**
+ * Returns optional attachment value from deployment unit or null if not bound.
+ *
+ * @param <A> expected value
+ * @param unit deployment unit
+ * @param key attachment key
+ * @return optional attachment value or null
+ */
+ public static <A> A getOptionalAttachment(final DeploymentUnit unit, final Class<A> key)
+ {
+ return unit.getAttachment(key);
+ }
+
+ /**
+ * Returns true if deployment unit have attachment value associated with the <b>key</b>.
+ *
+ * @param unit deployment unit
+ * @param key attachment key
+ * @return true if contains attachment, false otherwise
+ */
+ public static boolean hasAttachment(final DeploymentUnit unit, final Class<?> key)
+ {
+ return ASHelper.getOptionalAttachment(unit, key) != null;
+ }
+
+ /**
+ * Returns first webservice description meta data or null if not found.
+ *
+ * @param wsDescriptionsMD webservice descriptions
+ * @return webservice description
+ */
+ public static WebserviceDescriptionMetaData getWebserviceDescriptionMetaData(
+ final WebserviceDescriptionsMetaData wsDescriptionsMD)
+ {
+ if (wsDescriptionsMD != null)
+ {
+ if (wsDescriptionsMD.size() > 1)
+ {
+ ASHelper.LOGGER.warn("Multiple <webservice-description> elements not supported");
+ }
+
+ if (wsDescriptionsMD.size() > 0)
+ {
+ return wsDescriptionsMD.iterator().next();
+ }
+ }
+
+ return null;
+ }
+
+ /**
+ * Gets list of JAXRPC or JAXWS servlets meta data.
+ *
+ * @param unit deployment unit
+ * @param jaxws if passed value is <b>true</b> JAXWS servlets list will be returned, otherwise JAXRPC servlets list
+ * @return either JAXRPC or JAXWS servlets list
+ */
+ private static List<ServletMetaData> getWebServiceServlets(final DeploymentUnit unit, final boolean jaxws)
+ {
+ final JBossWebMetaData jbossWebMD = ASHelper.getRequiredAttachment(unit, JBossWebMetaData.class);
+ final ClassLoader loader = unit.getClassLoader();
+ final List<ServletMetaData> endpoints = new ArrayList<ServletMetaData>();
+
+ for (ServletMetaData servletMD : jbossWebMD.getServlets())
+ {
+ final Class<?> endpointClass = ASHelper.getEndpointClass(servletMD, loader);
+
+ if (endpointClass != null)
+ {
+ // check webservice annotations
+ final boolean isWebService = endpointClass.isAnnotationPresent(WebService.class);
+ final boolean isWebServiceProvider = endpointClass.isAnnotationPresent(WebServiceProvider.class);
+ // detect webservice type
+ final boolean isJaxwsEndpoint = jaxws && (isWebService || isWebServiceProvider);
+ final boolean isJaxrpcEndpoint = !jaxws && (!isWebService && !isWebServiceProvider);
+
+ if (isJaxwsEndpoint || isJaxrpcEndpoint)
+ {
+ endpoints.add(servletMD);
+ }
+ }
+ }
+
+ return endpoints;
+ }
+}
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/util/WebMetaDataHelper.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/util/WebMetaDataHelper.java (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/util/WebMetaDataHelper.java 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1,422 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.webservices.integration.util;
+
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.jboss.metadata.javaee.spec.ParamValueMetaData;
+import org.jboss.metadata.web.jboss.JBossServletMetaData;
+import org.jboss.metadata.web.jboss.JBossServletsMetaData;
+import org.jboss.metadata.web.jboss.JBossWebMetaData;
+import org.jboss.metadata.web.spec.AuthConstraintMetaData;
+import org.jboss.metadata.web.spec.LoginConfigMetaData;
+import org.jboss.metadata.web.spec.SecurityConstraintMetaData;
+import org.jboss.metadata.web.spec.ServletMappingMetaData;
+import org.jboss.metadata.web.spec.ServletMetaData;
+import org.jboss.metadata.web.spec.TransportGuaranteeType;
+import org.jboss.metadata.web.spec.UserDataConstraintMetaData;
+import org.jboss.metadata.web.spec.WebResourceCollectionMetaData;
+import org.jboss.metadata.web.spec.WebResourceCollectionsMetaData;
+
+/**
+ * Utility class that simplifies work with JBossWebMetaData object structure.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ * @author <a href="mailto:tdiesler@redhat.com">Thomas Diesler</a>
+ */
+public final class WebMetaDataHelper
+{
+ /** Star utility string. */
+ private static final String STAR_STRING = "*";
+
+ /** GET http method utility string. */
+ private static final String GET_STRING = "GET";
+
+ /** POST http method utility string. */
+ private static final String POST_STRING = "POST";
+
+ /** GET and POST methods utility list. */
+ private static List<String> getAndPostMethods;
+
+ /** POST method utility list. */
+ private static List<String> onlyPostMethod;
+
+ /** All roles utility list. */
+ private static List<String> allRoles;
+
+ static
+ {
+ final List<String> getAndPostList = new LinkedList<String>();
+ getAndPostList.add(WebMetaDataHelper.GET_STRING);
+ getAndPostList.add(WebMetaDataHelper.POST_STRING);
+ WebMetaDataHelper.getAndPostMethods = Collections.unmodifiableList(getAndPostList);
+
+ final List<String> onlyPostList = new LinkedList<String>();
+ onlyPostList.add(WebMetaDataHelper.POST_STRING);
+ WebMetaDataHelper.onlyPostMethod = Collections.unmodifiableList(onlyPostList);
+
+ final List<String> roleNamesList = new LinkedList<String>();
+ roleNamesList.add(WebMetaDataHelper.STAR_STRING);
+ WebMetaDataHelper.allRoles = Collections.unmodifiableList(roleNamesList);
+ }
+
+ /**
+ * Constructor.
+ */
+ private WebMetaDataHelper()
+ {
+ super();
+ }
+
+ /**
+ * Creates URL pattern list from passed string.
+ *
+ * @param urlPattern URL pattern
+ * @return list wrapping passed parameter
+ */
+ public static List<String> getUrlPatterns(final String urlPattern)
+ {
+ final List<String> linkedList = new LinkedList<String>();
+
+ linkedList.add(urlPattern);
+
+ return linkedList;
+ }
+
+ /**
+ * If WSDL access is secured, it returns both POST and GET methods, otherwise only POST method.
+ *
+ * @param secureWsdlAccess whether WSDL is secured
+ * @return web access methods
+ */
+ public static List<String> getHttpMethods(final boolean secureWsdlAccess)
+ {
+ return secureWsdlAccess ? WebMetaDataHelper.getAndPostMethods : WebMetaDataHelper.onlyPostMethod;
+ }
+
+ /**
+ * Returns all role list.
+ *
+ * @return all role list
+ */
+ public static List<String> getAllRoles()
+ {
+ return WebMetaDataHelper.allRoles;
+ }
+
+ /**
+ * Gests servlets meta data from jboss web meta data.
+ * If not found it creates new servlets meta data
+ * and associates them with jboss web meta data.
+ *
+ * @param jbossWebMD jboss web meta data
+ * @return servlets meta data
+ */
+ public static JBossServletsMetaData getServlets(final JBossWebMetaData jbossWebMD)
+ {
+ JBossServletsMetaData servletsMD = jbossWebMD.getServlets();
+
+ if (servletsMD == null)
+ {
+ servletsMD = new JBossServletsMetaData();
+ jbossWebMD.setServlets(servletsMD);
+ }
+
+ return servletsMD;
+ }
+
+ /**
+ * Gests servlet mappings meta data from jboss web meta data.
+ * If not found it creates new servlet mappings meta data
+ * and associates them with jboss web meta data.
+ *
+ * @param jbossWebMD jboss web meta data
+ * @return servlet mappings meta data
+ */
+ public static List<ServletMappingMetaData> getServletMappings(final JBossWebMetaData jbossWebMD)
+ {
+ List<ServletMappingMetaData> servletMappingsMD = jbossWebMD.getServletMappings();
+
+ if (servletMappingsMD == null)
+ {
+ servletMappingsMD = new LinkedList<ServletMappingMetaData>();
+ jbossWebMD.setServletMappings(servletMappingsMD);
+ }
+
+ return servletMappingsMD;
+ }
+
+ /**
+ * Gests security constraints meta data from jboss web meta data.
+ * If not found it creates new security constraints meta data
+ * and associates them with jboss web meta data.
+ *
+ * @param jbossWebMD jboss web meta data
+ * @return security constraints meta data
+ */
+ public static List<SecurityConstraintMetaData> getSecurityConstraints(final JBossWebMetaData jbossWebMD)
+ {
+ List<SecurityConstraintMetaData> securityConstraintsMD = jbossWebMD.getSecurityConstraints();
+
+ if (securityConstraintsMD == null)
+ {
+ securityConstraintsMD = new LinkedList<SecurityConstraintMetaData>();
+ jbossWebMD.setSecurityConstraints(securityConstraintsMD);
+ }
+
+ return securityConstraintsMD;
+ }
+
+ /**
+ * Gests login config meta data from jboss web meta data.
+ * If not found it creates new login config meta data
+ * and associates them with jboss web meta data.
+ *
+ * @param jbossWebMD jboss web meta data
+ * @return login config meta data
+ */
+ public static LoginConfigMetaData getLoginConfig(final JBossWebMetaData jbossWebMD)
+ {
+ LoginConfigMetaData loginConfigMD = jbossWebMD.getLoginConfig();
+
+ if (loginConfigMD == null)
+ {
+ loginConfigMD = new LoginConfigMetaData();
+ jbossWebMD.setLoginConfig(loginConfigMD);
+ }
+
+ return loginConfigMD;
+ }
+
+ /**
+ * Gests context parameters meta data from jboss web meta data.
+ * If not found it creates new context parameters meta data
+ * and associates them with jboss web meta data.
+ *
+ * @param jbossWebMD jboss web meta data
+ * @return context parameters meta data
+ */
+ public static List<ParamValueMetaData> getContextParams(final JBossWebMetaData jbossWebMD)
+ {
+ List<ParamValueMetaData> contextParamsMD = jbossWebMD.getContextParams();
+
+ if (contextParamsMD == null)
+ {
+ contextParamsMD = new LinkedList<ParamValueMetaData>();
+ jbossWebMD.setContextParams(contextParamsMD);
+ }
+
+ return contextParamsMD;
+ }
+
+ /**
+ * Gests web resource collections meta data from security constraint meta data.
+ * If not found it creates new web resource collections meta data
+ * and associates them with security constraint meta data.
+ *
+ * @param securityConstraintMD security constraint meta data
+ * @return web resource collections meta data
+ */
+ public static WebResourceCollectionsMetaData getWebResourceCollections(final SecurityConstraintMetaData securityConstraintMD)
+ {
+ WebResourceCollectionsMetaData webResourceCollectionsMD = securityConstraintMD.getResourceCollections();
+
+ if (webResourceCollectionsMD == null)
+ {
+ webResourceCollectionsMD = new WebResourceCollectionsMetaData();
+ securityConstraintMD.setResourceCollections(webResourceCollectionsMD);
+ }
+
+ return webResourceCollectionsMD;
+ }
+
+ /**
+ * Gests init parameters meta data from servlet meta data.
+ * If not found it creates new init parameters meta data
+ * and associates them with servlet meta data.
+ *
+ * @param servletMD servlet meta data
+ * @return init parameters meta data
+ */
+ public static List<ParamValueMetaData> getServletInitParams(final ServletMetaData servletMD)
+ {
+ List<ParamValueMetaData> initParamsMD = servletMD.getInitParam();
+
+ if (initParamsMD == null)
+ {
+ initParamsMD = new LinkedList<ParamValueMetaData>();
+ servletMD.setInitParam(initParamsMD);
+ }
+
+ return initParamsMD;
+ }
+
+ /**
+ * Creates new security constraint meta data and associates them with security constraints meta data.
+ *
+ * @param securityConstraintsMD security constraints meta data
+ * @return new security constraing meta data
+ */
+ public static SecurityConstraintMetaData newSecurityConstraint(final List<SecurityConstraintMetaData> securityConstraintsMD)
+ {
+ final SecurityConstraintMetaData securityConstraintMD = new SecurityConstraintMetaData();
+
+ securityConstraintsMD.add(securityConstraintMD);
+
+ return securityConstraintMD;
+ }
+
+ /**
+ * Creates new web resource collection meta data and associates them with web resource collections meta data.
+ *
+ * @param servletName servlet name
+ * @param urlPattern URL pattern
+ * @param securedWsdl whether WSDL access is secured
+ * @param webResourceCollectionsMD web resource collections meta data
+ * @return new web resource collection meta data
+ */
+ public static WebResourceCollectionMetaData newWebResourceCollection(final String servletName, final String urlPattern,
+ final boolean securedWsdl, final WebResourceCollectionsMetaData webResourceCollectionsMD)
+ {
+ final WebResourceCollectionMetaData webResourceCollectionMD = new WebResourceCollectionMetaData();
+
+ webResourceCollectionMD.setWebResourceName(servletName);
+ webResourceCollectionMD.setUrlPatterns(WebMetaDataHelper.getUrlPatterns(urlPattern));
+ webResourceCollectionMD.setHttpMethods(WebMetaDataHelper.getHttpMethods(securedWsdl));
+ webResourceCollectionsMD.add(webResourceCollectionMD);
+
+ return webResourceCollectionMD;
+ }
+
+ /**
+ * Creates new servlet meta data and associates them with servlets meta data.
+ *
+ * @param servletName servlet name
+ * @param servletClass servlet class name
+ * @param servletsMD servlets meta data
+ * @return new servlet meta data
+ */
+ public static JBossServletMetaData newServlet(final String servletName, final String servletClass,
+ final JBossServletsMetaData servletsMD)
+ {
+ final JBossServletMetaData servletMD = new JBossServletMetaData();
+
+ servletMD.setServletName(servletName);
+ servletMD.setServletClass(servletClass);
+ servletsMD.add(servletMD);
+
+ return servletMD;
+ }
+
+ /**
+ * Creates new servlet mapping meta data and associates them with servlet mappings meta data.
+ *
+ * @param servletName servlet name
+ * @param urlPatterns URL patterns
+ * @param servletMappingsMD servlet mapping meta data
+ * @return new servlet mapping meta data
+ */
+ public static ServletMappingMetaData newServletMapping(final String servletName, final List<String> urlPatterns,
+ final List<ServletMappingMetaData> servletMappingsMD)
+ {
+ final ServletMappingMetaData servletMappingMD = new ServletMappingMetaData();
+
+ servletMappingMD.setServletName(servletName);
+ servletMappingMD.setUrlPatterns(urlPatterns);
+ servletMappingsMD.add(servletMappingMD);
+
+ return servletMappingMD;
+ }
+
+ /**
+ * Creates new authentication constraint and associates it with security constraint meta data.
+ *
+ * @param roleNames roles
+ * @param securityConstraintMD security constraint meta data
+ * @return new authentication constraint meta data
+ */
+ public static AuthConstraintMetaData newAuthConstraint(final List<String> roleNames,
+ final SecurityConstraintMetaData securityConstraintMD)
+ {
+ final AuthConstraintMetaData authConstraintMD = new AuthConstraintMetaData();
+
+ authConstraintMD.setRoleNames(roleNames);
+ securityConstraintMD.setAuthConstraint(authConstraintMD);
+
+ return authConstraintMD;
+ }
+
+ /**
+ * Creates new user constraint meta data and associates it with security constraint meta data.
+ *
+ * @param transportGuarantee transport guarantee value
+ * @param securityConstraintMD security constraint meta data
+ * @return new user data constraint meta data
+ */
+ public static UserDataConstraintMetaData newUserDataConstraint(final String transportGuarantee,
+ final SecurityConstraintMetaData securityConstraintMD)
+ {
+ final UserDataConstraintMetaData userDataConstraintMD = new UserDataConstraintMetaData();
+ final TransportGuaranteeType transportGuaranteeValue = TransportGuaranteeType.valueOf(transportGuarantee);
+
+ userDataConstraintMD.setTransportGuarantee(transportGuaranteeValue);
+ securityConstraintMD.setUserDataConstraint(userDataConstraintMD);
+
+ return userDataConstraintMD;
+ }
+
+ /**
+ * Creates new parameter meta data and associates it with parameters meta data.
+ *
+ * @param key parameter key
+ * @param value parameter value
+ * @param paramsMD parameters meta data
+ * @return new parameter meta data
+ */
+ public static ParamValueMetaData newParamValue(final String key, final String value, final List<ParamValueMetaData> paramsMD)
+ {
+ final ParamValueMetaData paramValueMD = WebMetaDataHelper.newParamValue(key, value);
+
+ paramsMD.add(paramValueMD);
+
+ return paramValueMD;
+ }
+
+ /**
+ * Creates new parameter with specified key and value.
+ *
+ * @param key the key
+ * @param value the value
+ * @return new parameter
+ */
+ private static ParamValueMetaData newParamValue(final String key, final String value)
+ {
+ final ParamValueMetaData paramMD = new ParamValueMetaData();
+
+ paramMD.setParamName(key);
+ paramMD.setParamValue(value);
+
+ return paramMD;
+ }
+}
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/weld/WeldDeploymentAspect.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/weld/WeldDeploymentAspect.java (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/weld/WeldDeploymentAspect.java 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1,69 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, 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.webservices.integration.weld;
+
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.weld.integration.deployer.DeployersUtils;
+import org.jboss.wsf.common.integration.AbstractDeploymentAspect;
+import org.jboss.wsf.common.integration.WSHelper;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.Endpoint;
+
+/**
+ * Weld deployment aspect that associates Weld Invocation handler
+ * if WS CDI integration is detected.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+public final class WeldDeploymentAspect extends AbstractDeploymentAspect
+{
+
+ public WeldDeploymentAspect()
+ {
+ // does nothing
+ }
+
+ @Override
+ public void start(final Deployment dep)
+ {
+ if (!WSHelper.isJaxwsJseDeployment(dep))
+ {
+ // we support weld integration for JAXWS JSE endpoints only
+ return;
+ }
+
+ final DeploymentUnit deploymentUnit = WSHelper.getRequiredAttachment(dep, DeploymentUnit.class);
+ if (this.isWeldDeployment(deploymentUnit))
+ {
+ for (final Endpoint endpoint : dep.getService().getEndpoints())
+ {
+ endpoint.setInvocationHandler(new WeldInvocationHandler(endpoint.getInvocationHandler()));
+ }
+ }
+ }
+
+ private boolean isWeldDeployment(final DeploymentUnit unit)
+ {
+ return unit.getAttachment(DeployersUtils.WELD_FILES) != null;
+ }
+
+}
Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/weld/WeldInvocationHandler.java
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/weld/WeldInvocationHandler.java (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/weld/WeldInvocationHandler.java 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1,88 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, 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.webservices.integration.weld;
+
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+import org.jboss.weld.integration.injection.NonContextualObjectInjectionHelper;
+import org.jboss.weld.manager.api.WeldManager;
+import org.jboss.wsf.common.invocation.AbstractInvocationHandlerJSE;
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.invocation.Invocation;
+import org.jboss.wsf.spi.invocation.InvocationHandler;
+
+/**
+ * Weld invocation handler.
+ *
+ * @author <a href="maito:ropalka@redhat.com">Richard Opalka</a>
+ * @author <a href="mailto:mariusb@redhat.com">Marius Bogoevici</a>
+ */
+public final class WeldInvocationHandler extends AbstractInvocationHandlerJSE
+{
+
+ private static final String BEAN_MANAGER_JNDI_NAME = "java:comp/BeanManager";
+
+ private final InvocationHandler delegate;
+
+ public WeldInvocationHandler(final InvocationHandler delegate)
+ {
+ this.delegate = delegate;
+ }
+
+ @Override
+ public void onEndpointInstantiated(final Endpoint endpoint, final Invocation invocation) throws Exception
+ {
+ // handle Weld injections first
+ this.handleWeldInjection(invocation.getInvocationContext().getTargetBean());
+ // handle JBossWS injections last and call @PostConstruct annotated methods
+ this.delegate.onEndpointInstantiated(endpoint, invocation);
+ }
+
+ @Override
+ public void onBeforeInvocation(final Invocation invocation) throws Exception
+ {
+ this.delegate.onBeforeInvocation(invocation);
+ }
+
+ @Override
+ public void onAfterInvocation(final Invocation invocation) throws Exception
+ {
+ this.delegate.onAfterInvocation(invocation);
+ }
+
+ /**
+ * Handles weld injection.
+ *
+ * @param instance to operate upon
+ */
+ private void handleWeldInjection(final Object instance)
+ {
+ try {
+ WeldManager beanManager = (WeldManager) new InitialContext().lookup(BEAN_MANAGER_JNDI_NAME);
+ NonContextualObjectInjectionHelper.injectNonContextualInstance(instance, beanManager);
+ } catch (NamingException e) {
+ throw new IllegalStateException("Unable to locate BeanManager");
+ }
+ }
+
+}
Added: container/jboss60/branches/jbossws-jboss610/src/main/resources/jbossws-jaxrpc-jboss.deployer/META-INF/jboss-classloading.xml
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/resources/jbossws-jaxrpc-jboss.deployer/META-INF/jboss-classloading.xml (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/resources/jbossws-jaxrpc-jboss.deployer/META-INF/jboss-classloading.xml 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<classloading xmlns="urn:jboss:classloading:1.0"
+ domain="JAXRPCDeployerDomain"
+ parent-domain="DefaultDomain"
+ export-all="NON_EMPTY"
+ import-all="true">
+</classloading>
Added: container/jboss60/branches/jbossws-jboss610/src/main/resources/jbossws-jaxrpc-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/resources/jbossws-jaxrpc-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/resources/jbossws-jaxrpc-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="JAXRPCAppClientClassPathDeployer" class="org.jboss.webservices.integration.deployers.JAXRPCAppClientClassPathDeployer">
+ <property name="wsServerConfig"><inject bean="WSServerConfig"/></property>
+ <property name="libs">
+ <set class="java.util.HashSet" elementClass="java.lang.String">
+ <value>deployers/jbossws-jaxrpc.deployer/jbossws-native-factories.jar</value>
+ <value>deployers/jbossws-jaxrpc.deployer/jbossws-native-services.jar</value>
+ </set>
+ </property>
+ </bean>
+
+ <bean name="JAXRPCEjbClientClassPathDeployer" class="org.jboss.webservices.integration.deployers.JAXRPCEjbClientClassPathDeployer">
+ <property name="wsServerConfig"><inject bean="WSServerConfig"/></property>
+ <property name="libs">
+ <set class="java.util.HashSet" elementClass="java.lang.String">
+ <value>deployers/jbossws-jaxrpc.deployer/jbossws-native-factories.jar</value>
+ <value>deployers/jbossws-jaxrpc.deployer/jbossws-native-services.jar</value>
+ </set>
+ </property>
+ </bean>
+
+ <bean name="JAXRPCServletClientClassPathDeployer" class="org.jboss.webservices.integration.deployers.JAXRPCServletClientClassPathDeployer">
+ <property name="wsServerConfig"><inject bean="WSServerConfig"/></property>
+ <property name="libs">
+ <set class="java.util.HashSet" elementClass="java.lang.String">
+ <value>deployers/jbossws-jaxrpc.deployer/jbossws-native-factories.jar</value>
+ <value>deployers/jbossws-jaxrpc.deployer/jbossws-native-services.jar</value>
+ </set>
+ </property>
+ </bean>
+
+ <bean name="JAXRPCServerClassPathDeployer" class="org.jboss.webservices.integration.deployers.JAXRPCServerClassPathDeployer">
+ <property name="wsServerConfig"><inject bean="WSServerConfig"/></property>
+ <property name="libs">
+ <set class="java.util.HashSet" elementClass="java.lang.String">
+ <value>deployers/jbossws-jaxrpc.deployer/jbossws-native-factories.jar</value>
+ <value>deployers/jbossws-jaxrpc.deployer/jbossws-native-services.jar</value>
+ </set>
+ </property>
+ </bean>
+
+</deployment>
Added: container/jboss60/branches/jbossws-jboss610/src/main/resources/jbossws-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/resources/jbossws-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/resources/jbossws-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <!-- processes @WebServiceRef resources and their DD equivalents (EE.5.6 of Java EE6 spec) -->
+ <bean
+ name="org.jboss.switchboard.WebServiceRefResourceProvider"
+ class="org.jboss.webservices.integration.injection.ServiceRefResourceProvider"
+ />
+
+ <!-- processes @Resource annotated WebServiceContext beans (EE.5.6 of Java EE6 spec) -->
+ <bean
+ name="org.jboss.switchboard.WebServiceContextResourceProvider"
+ class="org.jboss.webservices.integration.injection.WebServiceContextResourceProvider"
+ />
+
+ <!-- Wraps single instance of the kernel -->
+ <bean name="WSIoCContainerProxy" class="org.jboss.webservices.integration.ioc.IoCContainerProxyImpl">
+ <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
+ </bean>
+
+ <!-- Locate the single instance of the MBeanServer -->
+ <bean name="WSMBeanServerLocator" class="org.jboss.ws.common.management.MBeanServerLocator">
+ <constructor>
+ <parameter>
+ <inject bean="JMXKernel" property="mbeanServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- An abstraction of server configuration aspects. -->
+ <bean name="WSServerConfig" class="org.jboss.webservices.integration.config.ServerConfigImpl">
+ <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
+
+ <!--
+ The WSDL, that is a required deployment artifact for an endpoint, has a <soap:address>
+ element which points to the location of the endpoint. JBoss supports rewriting of that SOAP address.
+
+ If the content of <soap:address> is a valid URL, JBossWS will not rewrite it unless 'modifySOAPAddress' is true.
+ If the content of <soap:address> is not a valid URL, JBossWS will rewrite it using the attribute values given below.
+
+ If 'webServiceHost' is set to 'jbossws.undefined.host', JBossWS uses requesters host when rewriting the <soap:address>
+ -->
+ <property name="webServiceHost">${jboss.bind.address}</property>
+ <property name="modifySOAPAddress">true</property>
+
+ <!--
+ Set these properties to explicitly define the ports that will be used for rewriting the SOAP address.
+ Otherwise the ports will be identified by querying the list of installed connectors.
+ If multiple connectors are found the port of the first connector is used.
+ <property name="webServiceSecurePort">8443</property>
+ <property name="webServicePort">8080</property>
+ -->
+ </bean>
+
+ <!-- deployers -->
+ <bean name="WSDescriptorDeployer" class="org.jboss.webservices.integration.deployers.WSDescriptorDeployer">
+ <incallback method="setParser"/>
+ </bean>
+
+ <bean name="WSEJBAdapterDeployer" class="org.jboss.webservices.integration.deployers.WSEJBAdapterDeployer"/>
+
+ <bean name="WSTypeDeployer" class="org.jboss.webservices.integration.deployers.WSTypeDeployer"/>
+
+ <bean name="WSDeploymentDeployer" class="org.jboss.webservices.integration.deployers.WSDeploymentDeployer"/>
+
+ <!-- WSDeploymentAspectDeployers factory -->
+ <bean name="WSAspectizedDeployersFactory" class="org.jboss.webservices.integration.deployers.WSAspectizedDeployersFactory">
+ <constructor>
+ <parameter>
+ <inject bean="Deployers"/>
+ </parameter>
+ </constructor>
+ <incallback method="addDeployer"/>
+ <uncallback method="removeDeployer"/>
+ </bean>
+
+ <!-- The AS specific deployment aspects -->
+ <bean name="WSContainerMetaDataDeploymentAspect" class="org.jboss.webservices.integration.metadata.ContainerMetaDataDeploymentAspect">
+ <property name="provides">ContainerMetaData, VFSRoot</property>
+ </bean>
+
+ <bean name="WSInjectionMetaDataDeploymentAspect" class="org.jboss.webservices.integration.injection.InjectionMetaDataDeploymentAspect">
+ <property name="requires">WebMetaData</property>
+ <property name="provides">InjectionMetaData</property>
+ <property name="ejbReferenceResolver"><inject bean="org.jboss.ejb3.ejbref.resolver.EjbReferenceResolver"/></property>
+ </bean>
+
+ <!-- TODO: remove this hacky aspect -->
+ <bean name="WSJACCPermissionsDeploymentAspect" class="org.jboss.webservices.integration.security.JACCPermissionsDeploymentAspect">
+ <property name="requires">WebMetaData</property>
+ <property name="provides">JACCPermisions</property>
+ </bean>
+
+ <bean name="WSContextRootDeploymentAspect" class="org.jboss.ws.common.deployment.BackwardCompatibleContextRootDeploymentAspect">
+ <property name="requires">ContainerMetaData</property>
+ <property name="provides">ContextRoot</property>
+ </bean>
+
+ <bean name="WSVirtualHostDeploymentAspect" class="org.jboss.ws.common.deployment.VirtualHostDeploymentAspect">
+ <property name="requires">ContainerMetaData</property>
+ <property name="provides">VirtualHosts</property>
+ </bean>
+
+ <bean name="WSEndpointAddressDeploymentAspect" class="org.jboss.ws.common.deployment.EndpointAddressDeploymentAspect">
+ <property name="requires">URLPattern</property>
+ <property name="provides">EndpointAddress</property>
+ </bean>
+
+ <bean name="WSEndpointLifecycleDeploymentAspect" class="org.jboss.webservices.integration.security.SecurityDomainContextDeploymentAspect">
+ <property name="provides">LifecycleHandler</property>
+ <property name="last">true</property>
+ </bean>
+
+ <bean name="WSEndpointMetricsDeploymentAspect" class="org.jboss.ws.common.deployment.EndpointMetricsDeploymentAspect">
+ <property name="provides">EndpointMetrics</property>
+ </bean>
+
+ <bean name="WSEndpointNameDeploymentAspect" class="org.jboss.ws.common.deployment.EndpointNameDeploymentAspect">
+ <property name="requires">URLPattern</property>
+ <property name="provides">EndpointName</property>
+ </bean>
+
+ <bean name="WSEndpointRegistryDeploymentAspect" class="org.jboss.ws.common.deployment.EndpointRegistryDeploymentAspect">
+ <property name="requires">EndpointName, EndpointAddress</property>
+ <property name="provides">RegisteredEndpoint</property>
+ </bean>
+
+ <bean name="WSURLPatternDeploymentAspect" class="org.jboss.ws.common.deployment.URLPatternDeploymentAspect">
+ <property name="requires">ContextRoot, ContainerMetaData</property>
+ <property name="provides">URLPattern</property>
+ </bean>
+
+ <bean name="WSWebMetaDataModifyingDeploymentAspect" class="org.jboss.webservices.integration.tomcat.WebMetaDataModifyingDeploymentAspect">
+ <property name="requires">WebMetaData, ContextProperties, StackDescriptor</property>
+ <property name="provides">WebMetaData</property>
+ </bean>
+
+ <bean name="WSWebMetaDataCreatingDeploymentAspect" class="org.jboss.webservices.integration.tomcat.WebMetaDataCreatingDeploymentAspect">
+ <property name="requires">VirtualHosts,URLPattern,EndpointAddress</property>
+ <property name="provides">WebMetaData</property>
+ </bean>
+
+ <bean name="WSWeldDeploymentAspect" class="org.jboss.webservices.integration.weld.WeldDeploymentAspect">
+ <property name="requires">StackEndpointHandler</property>
+ <property name="provides">CDIInjection</property>
+ </bean>
+
+</deployment>
Added: container/jboss60/branches/jbossws-jboss610/src/main/resources/jbossws-jboss.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentModelFactory
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/resources/jbossws-jboss.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentModelFactory (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/resources/jbossws-jboss.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentModelFactory 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1 @@
+org.jboss.ws.common.deployment.ArchiveDeploymentModelFactory
\ No newline at end of file
Added: container/jboss60/branches/jbossws-jboss610/src/main/resources/jbossws-jboss.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/resources/jbossws-jboss.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/resources/jbossws-jboss.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1 @@
+org.jboss.webservices.integration.invocation.InvocationHandlerFactoryImpl
\ No newline at end of file
Added: container/jboss60/branches/jbossws-jboss610/src/main/resources/jbossws-jboss.jar/META-INF/services/org.jboss.wsf.spi.invocation.SecurityAdaptorFactory
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/resources/jbossws-jboss.jar/META-INF/services/org.jboss.wsf.spi.invocation.SecurityAdaptorFactory (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/resources/jbossws-jboss.jar/META-INF/services/org.jboss.wsf.spi.invocation.SecurityAdaptorFactory 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1 @@
+org.jboss.webservices.integration.security.SecurityAdapterFactoryImpl
\ No newline at end of file
Added: container/jboss60/branches/jbossws-jboss610/src/main/resources/jbossws-jboss.jar/META-INF/services/org.jboss.wsf.spi.ioc.IoCContainerProxyFactory
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/resources/jbossws-jboss.jar/META-INF/services/org.jboss.wsf.spi.ioc.IoCContainerProxyFactory (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/resources/jbossws-jboss.jar/META-INF/services/org.jboss.wsf.spi.ioc.IoCContainerProxyFactory 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1 @@
+org.jboss.webservices.integration.ioc.IoCContainerProxyFactoryImpl
\ No newline at end of file
Added: container/jboss60/branches/jbossws-jboss610/src/main/resources/jbossws-jboss.jar/META-INF/services/org.jboss.wsf.spi.management.JMSEndpointResolver
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/resources/jbossws-jboss.jar/META-INF/services/org.jboss.wsf.spi.management.JMSEndpointResolver (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/resources/jbossws-jboss.jar/META-INF/services/org.jboss.wsf.spi.management.JMSEndpointResolver 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1 @@
+org.jboss.webservices.integration.endpoint.HornetQJMSResolver
\ No newline at end of file
Added: container/jboss60/branches/jbossws-jboss610/src/main/resources/jbossws-jboss.jar/META-INF/services/org.jboss.wsf.spi.management.ServerConfigFactory
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/resources/jbossws-jboss.jar/META-INF/services/org.jboss.wsf.spi.management.ServerConfigFactory (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/resources/jbossws-jboss.jar/META-INF/services/org.jboss.wsf.spi.management.ServerConfigFactory 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1 @@
+org.jboss.webservices.integration.config.ServerConfigFactoryImpl
\ No newline at end of file
Added: container/jboss60/branches/jbossws-jboss610/src/main/resources/jbossws-jboss.jar/META-INF/services/org.jboss.wsf.spi.security.JAASSecurityDomainAdaptorResolver
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/resources/jbossws-jboss.jar/META-INF/services/org.jboss.wsf.spi.security.JAASSecurityDomainAdaptorResolver (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/resources/jbossws-jboss.jar/META-INF/services/org.jboss.wsf.spi.security.JAASSecurityDomainAdaptorResolver 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1 @@
+org.jboss.webservices.integration.security.JaasSecurityDomainAdaptorResolverImpl
\ No newline at end of file
Added: container/jboss60/branches/jbossws-jboss610/src/main/scripts/assembly-resources.xml
===================================================================
--- container/jboss60/branches/jbossws-jboss610/src/main/scripts/assembly-resources.xml (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/scripts/assembly-resources.xml 2011-08-17 08:18:10 UTC (rev 14886)
@@ -0,0 +1,19 @@
+<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd">
+ <id>resources</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>src/main/resources</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>jbossws-jboss.deployer/**</include>
+ <include>jbossws-jaxrpc-jboss.deployer/**</include>
+ <include>jbossws-jboss.jar/**</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
13 years, 4 months
- 1
- 0
JBossWS SVN: r14885 - stack/cxf/branches/jbossws-cxf-3.1.2.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2011-08-17 00:03:42 -0400 (Wed, 17 Aug 2011)
New Revision: 14885
Modified:
stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml
Log:
Move to the next dev cycle
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml 2011-08-17 04:03:42 UTC (rev 14885)
@@ -53,7 +53,7 @@
<jbossws.jboss510.version>3.1.0-SNAPSHOT</jbossws.jboss510.version>
-->
<!-- END -->
- <cxf.version>2.2.12-patch-02-SNAPSHOT</cxf.version>
+ <cxf.version>2.2.12-patch-03-SNAPSHOT</cxf.version>
<cxf.spring.version>2.5.6.SEC02</cxf.spring.version>
<cxf.stax.version>1.0.1</cxf.stax.version>
<cxf.asm.version>3.1</cxf.asm.version>
13 years, 4 months
- 1
- 0
JBossWS SVN: r14884 - in thirdparty/cxf/branches/cxf-2.2.12: api and 87 other directories.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2011-08-16 23:26:16 -0400 (Tue, 16 Aug 2011)
New Revision: 14884
Modified:
thirdparty/cxf/branches/cxf-2.2.12/api/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/buildtools/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/common/common/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/common/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/common/schemas/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/common/wstx-msv-validation/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/common/xerces-xsd-validation/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/common/xjc/boolean-test/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/common/xjc/boolean/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/common/xjc/bug671/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/common/xjc/dv-test/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/common/xjc/dv/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/common/xjc/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/common/xjc/ts-test/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/common/xjc/ts/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/common/xsd/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/distribution/bundle/all/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/distribution/bundle/jaxrs/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/distribution/bundle/minimal/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/distribution/bundle/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/distribution/manifest/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/distribution/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/integration/jbi/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/integration/jca/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/integration/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/archetypes/cxf-jaxws-javafirst/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/archetypes/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/codegen-plugin/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/corba/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/java2ws-plugin/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/wsdl-validator-plugin/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/xml2fastinfoset-plugin/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/parent/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/coloc/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/corba/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/http/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/jbi/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/object/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/soap/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/xml/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/rt/core/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/rt/databinding/aegis/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/rt/databinding/jaxb/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/rt/databinding/xmlbeans/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/rt/frontend/jaxrs/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/rt/frontend/jaxws/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/rt/frontend/js/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/rt/frontend/simple/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/rt/javascript/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/rt/management/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/rt/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/rt/testsupport/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/rt/transports/http-jetty/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/rt/transports/http-osgi/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/rt/transports/http/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/rt/transports/jbi/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/rt/transports/jms/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/rt/transports/local/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/rt/ws/addr/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/rt/ws/policy/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/rt/ws/rm/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/rt/ws/security/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/systests/databinding/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/systests/jaxrs/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/systests/jaxws/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/systests/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/systests/transports/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/systests/uncategorized/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/systests/ws-specs/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/systests/wsdl_maven/codegen/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/systests/wsdl_maven/java2ws/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/systests/wsdl_maven/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/testutils/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/tools/common/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/tools/corba/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/tools/javato/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/tools/javato/ws/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/tools/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/tools/validator/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/core/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/databinding/jaxb/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/frontend/javascript/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/frontend/jaxws/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/misc/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/test/pom.xml
Log:
Move to the next dev cycle
Modified: thirdparty/cxf/branches/cxf-2.2.12/api/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/api/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/api/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -22,13 +22,13 @@
<artifactId>cxf-api</artifactId>
<packaging>jar</packaging>
<name>Apache CXF API</name>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/buildtools/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/buildtools/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/buildtools/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -20,13 +20,13 @@
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-buildtools</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<name>Apache CXF Buildtools</name>
<url>http://cxf.apache.org</url>
<packaging>jar</packaging>
Modified: thirdparty/cxf/branches/cxf-2.2.12/common/common/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/common/common/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/common/common/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-common-utilities</artifactId>
<packaging>jar</packaging>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<name>Apache CXF Common Utilities</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/common/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/common/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/common/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-common</artifactId>
<packaging>pom</packaging>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<name>Apache CXF Common</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
</parent>
<modules>
Modified: thirdparty/cxf/branches/cxf-2.2.12/common/schemas/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/common/schemas/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/common/schemas/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -22,13 +22,13 @@
<artifactId>cxf-common-schemas</artifactId>
<packaging>jar</packaging>
<name>Apache CXF Common Schemas</name>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<url>http://cxf.apache.org/</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/common/wstx-msv-validation/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/common/wstx-msv-validation/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/common/wstx-msv-validation/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.1-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
<dependencies>
Modified: thirdparty/cxf/branches/cxf-2.2.12/common/xerces-xsd-validation/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/common/xerces-xsd-validation/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/common/xerces-xsd-validation/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -22,13 +22,13 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-xerces-xsd-validation</artifactId>
<packaging>jar</packaging>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<name>Apache CXF XML Schema Validation with Xerces</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
<dependencies>
Modified: thirdparty/cxf/branches/cxf-2.2.12/common/xjc/boolean/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/common/xjc/boolean/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/common/xjc/boolean/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf.xjcplugins</groupId>
<artifactId>cxf-xjc-boolean</artifactId>
<packaging>jar</packaging>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<name>Apache CXF XJC Boolean Getter Plugin</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/common/xjc/boolean-test/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/common/xjc/boolean-test/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/common/xjc/boolean-test/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf.xjcplugins</groupId>
<artifactId>cxf-xjc-boolean-test</artifactId>
<packaging>jar</packaging>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<name>Apache CXF XJC Boolean Getter Plugin Tests</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/common/xjc/bug671/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/common/xjc/bug671/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/common/xjc/bug671/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf.xjcplugins</groupId>
<artifactId>cxf-xjc-bug671</artifactId>
<packaging>jar</packaging>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<name>Apache CXF XJC Plugin To Workaround JAXB Bug 671</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/common/xjc/dv/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/common/xjc/dv/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/common/xjc/dv/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-xjc-dv</artifactId>
<packaging>jar</packaging>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<name>Apache CXF XJC Default Value Plugin</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/common/xjc/dv-test/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/common/xjc/dv-test/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/common/xjc/dv-test/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-xjc-dv-test</artifactId>
<packaging>jar</packaging>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<name>Apache CXF XJC Default Value Plugin Tests</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/common/xjc/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/common/xjc/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/common/xjc/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-xjc</artifactId>
<packaging>pom</packaging>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<name>Apache CXF XJC Plugins</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/common/xjc/ts/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/common/xjc/ts/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/common/xjc/ts/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-xjc-ts</artifactId>
<packaging>jar</packaging>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<name>Apache CXF XJC toString Plugin</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/common/xjc/ts-test/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/common/xjc/ts-test/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/common/xjc/ts-test/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-xjc-ts-test</artifactId>
<packaging>jar</packaging>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<name>Apache CXF XJC toString Plugin Tests</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/common/xsd/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/common/xsd/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/common/xsd/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -21,7 +21,7 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-common-xsd</artifactId>
<packaging>maven-plugin</packaging>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<name>Apache CXF Common XSD2Java Plugins</name>
<url>http://cxf.apache.org</url>
@@ -29,7 +29,7 @@
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/distribution/bundle/all/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/distribution/bundle/all/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/distribution/bundle/all/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -23,13 +23,13 @@
<artifactId>cxf-bundle</artifactId>
<packaging>bundle</packaging>
<name>Apache CXF Bundle Jar</name>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-bundle-parent</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
</parent>
<properties>
<bundle.symbolic.name>${project.groupId}.bundle</bundle.symbolic.name>
Modified: thirdparty/cxf/branches/cxf-2.2.12/distribution/bundle/jaxrs/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/distribution/bundle/jaxrs/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/distribution/bundle/jaxrs/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -23,13 +23,13 @@
<artifactId>cxf-bundle-jaxrs</artifactId>
<packaging>bundle</packaging>
<name>Apache CXF JAX-RS Bundle Jar</name>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-bundle-parent</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
</parent>
<properties>
<bundle.symbolic.name>${project.groupId}.bundle-jaxrs</bundle.symbolic.name>
Modified: thirdparty/cxf/branches/cxf-2.2.12/distribution/bundle/minimal/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/distribution/bundle/minimal/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/distribution/bundle/minimal/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -23,13 +23,13 @@
<artifactId>cxf-bundle-minimal</artifactId>
<packaging>bundle</packaging>
<name>Apache CXF Minimal Bundle Jar</name>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-bundle-parent</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
</parent>
<properties>
<bundle.symbolic.name>${project.groupId}.bundle-minimal</bundle.symbolic.name>
Modified: thirdparty/cxf/branches/cxf-2.2.12/distribution/bundle/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/distribution/bundle/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/distribution/bundle/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -23,13 +23,13 @@
<artifactId>cxf-bundle-parent</artifactId>
<packaging>pom</packaging>
<name>Apache CXF Bundle Parent</name>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/distribution/manifest/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/distribution/manifest/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/distribution/manifest/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -23,13 +23,13 @@
<artifactId>cxf-distribution-manifest</artifactId>
<packaging>jar</packaging>
<name>Apache CXF Manifest Jar</name>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/distribution/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/distribution/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/distribution/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -22,13 +22,13 @@
<artifactId>apache-cxf</artifactId>
<packaging>pom</packaging>
<name>Apache CXF Distribution</name>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/integration/jbi/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/integration/jbi/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/integration/jbi/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-integration-jbi</artifactId>
<packaging>jar</packaging>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<name>Apache CXF JBI Integration</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/integration/jca/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/integration/jca/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/integration/jca/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -22,14 +22,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-integration-jca</artifactId>
<packaging>jar</packaging>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<name>Apache CXF JCA Connection</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/integration/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/integration/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/integration/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-integration</artifactId>
<packaging>pom</packaging>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<name>Apache CXF Integration</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/archetypes/cxf-jaxws-javafirst/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/archetypes/cxf-jaxws-javafirst/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/archetypes/cxf-jaxws-javafirst/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -21,14 +21,14 @@
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cxf.archetype</groupId>
<artifactId>cxf-jaxws-javafirst</artifactId>
<name>Apache CXF Archetype - Simple JAX-WS Java First</name>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<url>http://cxf.apache.org</url>
<properties>
<maven.test.skip>true</maven.test.skip>
Modified: thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/archetypes/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/archetypes/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/archetypes/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -22,14 +22,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-archetypes</artifactId>
<packaging>pom</packaging>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<name>Apache CXF Maven Archetypes</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/codegen-plugin/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/codegen-plugin/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/codegen-plugin/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -22,7 +22,7 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-codegen-plugin</artifactId>
<packaging>maven-plugin</packaging>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<name>Apache CXF Code Generation Maven2 Plugins</name>
<url>http://cxf.apache.org</url>
@@ -30,7 +30,7 @@
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/corba/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/corba/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/corba/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -22,14 +22,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-corbatools-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<name>Apache CXF CORBA Tools Maven2 Plugins</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/java2ws-plugin/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/java2ws-plugin/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/java2ws-plugin/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -22,7 +22,7 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-java2ws-plugin</artifactId>
<packaging>maven-plugin</packaging>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<name>Apache CXF Java2WS Maven2 Plugin</name>
<url>http://cxf.apache.org</url>
@@ -30,7 +30,7 @@
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-maven-plugins</artifactId>
<packaging>pom</packaging>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<name>Apache CXF Maven Plugins</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
</parent>
<modules>
Modified: thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/wsdl-validator-plugin/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/wsdl-validator-plugin/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/wsdl-validator-plugin/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -3,7 +3,7 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-wsdl-validator-plugin</artifactId>
<packaging>maven-plugin</packaging>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<name>Apache CXF WSDL Validator Maven2 Plugin</name>
<url>http://cxf.apache.org</url>
@@ -11,7 +11,7 @@
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/xml2fastinfoset-plugin/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/xml2fastinfoset-plugin/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/xml2fastinfoset-plugin/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -22,7 +22,7 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-xml2fastinfoset-plugin</artifactId>
<packaging>maven-plugin</packaging>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<name>Apache CXF XML to FastInfoset Maven2 Plugin</name>
<url>http://cxf.apache.org</url>
<prerequisites>
@@ -32,7 +32,7 @@
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/parent/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/parent/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/parent/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -20,13 +20,13 @@
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<name>Apache CXF Parent</name>
<url>http://cxf.apache.org</url>
Modified: thirdparty/cxf/branches/cxf-2.2.12/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<name>Apache CXF</name>
<url>http://cxf.apache.org</url>
Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/coloc/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/coloc/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/coloc/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/corba/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/corba/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/corba/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/http/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/http/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/http/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/jbi/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/jbi/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/jbi/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/object/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/object/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/object/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/soap/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/soap/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/soap/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/xml/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/xml/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/xml/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/core/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/rt/core/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/rt/core/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-core</artifactId>
<packaging>jar</packaging>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<name>Apache CXF Runtime Core</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/databinding/aegis/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/rt/databinding/aegis/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/rt/databinding/aegis/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/databinding/jaxb/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/rt/databinding/jaxb/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/rt/databinding/jaxb/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/databinding/xmlbeans/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/rt/databinding/xmlbeans/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/rt/databinding/xmlbeans/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/frontend/jaxrs/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/rt/frontend/jaxrs/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/rt/frontend/jaxrs/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
<packaging>jar</packaging>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<name>Apache CXF Runtime JAX-RS Frontend</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/frontend/jaxws/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/rt/frontend/jaxws/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/rt/frontend/jaxws/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
<packaging>jar</packaging>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<name>Apache CXF Runtime JAX-WS Frontend</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/frontend/js/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/rt/frontend/js/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/rt/frontend/js/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-js</artifactId>
<packaging>jar</packaging>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<name>Apache CXF Runtime JavaScript Frontend</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/frontend/simple/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/rt/frontend/simple/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/rt/frontend/simple/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-simple</artifactId>
<packaging>jar</packaging>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<name>Apache CXF Runtime Simple Frontend</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/javascript/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/rt/javascript/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/rt/javascript/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/management/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/rt/management/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/rt/management/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-management</artifactId>
<packaging>jar</packaging>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<name>Apache CXF Runtime Management</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/rt/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/rt/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt</artifactId>
<packaging>pom</packaging>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<name>Apache CXF Runtime</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
</parent>
<modules>
Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/testsupport/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/rt/testsupport/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/rt/testsupport/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -3,14 +3,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-testsupport</artifactId>
<packaging>jar</packaging>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<name>Apache CXF Test Case Support</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/transports/http/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/rt/transports/http/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/rt/transports/http/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
<packaging>jar</packaging>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<name>Apache CXF Runtime HTTP Transport</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/transports/http-jetty/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/rt/transports/http-jetty/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/rt/transports/http-jetty/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http-jetty</artifactId>
<packaging>jar</packaging>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<name>Apache CXF Runtime HTTP Jetty Transport</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/transports/http-osgi/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/rt/transports/http-osgi/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/rt/transports/http-osgi/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http-osgi</artifactId>
<packaging>bundle</packaging>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<name>Apache CXF HTTP Transport for OSGi</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/transports/jbi/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/rt/transports/jbi/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/rt/transports/jbi/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-jbi</artifactId>
<packaging>jar</packaging>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<name>Apache CXF Runtime JBI Transport</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/transports/jms/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/rt/transports/jms/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/rt/transports/jms/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-jms</artifactId>
<packaging>jar</packaging>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<name>Apache CXF Runtime JMS Transport</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/transports/local/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/rt/transports/local/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/rt/transports/local/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-local</artifactId>
<packaging>jar</packaging>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<name>Apache CXF Runtime Local Transport</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/ws/addr/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/rt/ws/addr/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/rt/ws/addr/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/ws/policy/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/rt/ws/policy/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/rt/ws/policy/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/ws/rm/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/rt/ws/rm/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/rt/ws/rm/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/ws/security/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/rt/ws/security/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/rt/ws/security/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/systests/databinding/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/systests/databinding/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/systests/databinding/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -21,14 +21,14 @@
<parent>
<artifactId>cxf-parent</artifactId>
<groupId>org.apache.cxf</groupId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cxf.systests</groupId>
<artifactId>cxf-systests-databinding</artifactId>
<name>Apache CXF Databinding System Tests</name>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<url>http://cxf.apache.org</url>
<build>
<plugins>
Modified: thirdparty/cxf/branches/cxf-2.2.12/systests/jaxrs/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/systests/jaxrs/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/systests/jaxrs/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -21,14 +21,14 @@
<parent>
<artifactId>cxf-parent</artifactId>
<groupId>org.apache.cxf</groupId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cxf.systests</groupId>
<artifactId>cxf-systests-jaxrs</artifactId>
<name>Apache CXF JAX-RS System Tests</name>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<url>http://cxf.apache.org</url>
<build>
<plugins>
Modified: thirdparty/cxf/branches/cxf-2.2.12/systests/jaxws/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/systests/jaxws/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/systests/jaxws/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -21,14 +21,14 @@
<parent>
<artifactId>cxf-parent</artifactId>
<groupId>org.apache.cxf</groupId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cxf.systests</groupId>
<artifactId>cxf-systests-jaxws</artifactId>
<name>Apache CXF JAX-WS System Tests</name>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<url>http://cxf.apache.org</url>
<build>
Modified: thirdparty/cxf/branches/cxf-2.2.12/systests/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/systests/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/systests/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf.systests</groupId>
<artifactId>cxf-systests</artifactId>
<packaging>pom</packaging>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<name>Apache CXF System Tests</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
</parent>
<modules>
Modified: thirdparty/cxf/branches/cxf-2.2.12/systests/transports/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/systests/transports/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/systests/transports/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -21,14 +21,14 @@
<parent>
<artifactId>cxf-parent</artifactId>
<groupId>org.apache.cxf</groupId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cxf.systests</groupId>
<artifactId>cxf-systests-transports</artifactId>
<name>Apache CXF Transport System Tests</name>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<url>http://cxf.apache.org</url>
<build>
<plugins>
Modified: thirdparty/cxf/branches/cxf-2.2.12/systests/uncategorized/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/systests/uncategorized/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/systests/uncategorized/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -21,14 +21,14 @@
<parent>
<artifactId>cxf-parent</artifactId>
<groupId>org.apache.cxf</groupId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cxf.systests</groupId>
<artifactId>cxf-systests-uncategorized</artifactId>
<name>Apache CXF Uncategorized System Tests</name>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<url>http://cxf.apache.org</url>
<build>
<plugins>
Modified: thirdparty/cxf/branches/cxf-2.2.12/systests/ws-specs/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/systests/ws-specs/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/systests/ws-specs/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -21,14 +21,14 @@
<parent>
<artifactId>cxf-parent</artifactId>
<groupId>org.apache.cxf</groupId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cxf.systests</groupId>
<artifactId>cxf-systests-ws-specs</artifactId>
<name>Apache CXF WS-* Specifications System Tests</name>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<url>http://cxf.apache.org</url>
<build>
<plugins>
Modified: thirdparty/cxf/branches/cxf-2.2.12/systests/wsdl_maven/codegen/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/systests/wsdl_maven/codegen/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/systests/wsdl_maven/codegen/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -20,12 +20,12 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cxf.systests.wsdl_maven</groupId>
<artifactId>cxf-systests-codegen</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<name>Test for reading wsdl from repo and generating code from it</name>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
<build>
Modified: thirdparty/cxf/branches/cxf-2.2.12/systests/wsdl_maven/java2ws/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/systests/wsdl_maven/java2ws/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/systests/wsdl_maven/java2ws/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -20,12 +20,12 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cxf.systests.wsdl_maven</groupId>
<artifactId>cxf-systests-java2ws</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<name>Test for writing wsdl to repo</name>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
<build>
Modified: thirdparty/cxf/branches/cxf-2.2.12/systests/wsdl_maven/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/systests/wsdl_maven/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/systests/wsdl_maven/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf.systests</groupId>
<artifactId>cxf-wsdl-maven</artifactId>
<packaging>pom</packaging>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<name>Apache CXF System Tests for WSDL generation and retrieval</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf.systests</groupId>
<artifactId>cxf-systests</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
</parent>
<modules>
Modified: thirdparty/cxf/branches/cxf-2.2.12/testutils/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/testutils/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/testutils/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-testutils</artifactId>
<packaging>jar</packaging>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<name>Apache CXF Test Utilities</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/tools/common/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/tools/common/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/tools/common/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-tools-common</artifactId>
<packaging>jar</packaging>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<name>Apache CXF Command Line Tools Common</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/tools/corba/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/tools/corba/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/tools/corba/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -22,14 +22,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-tools-corba</artifactId>
<packaging>jar</packaging>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<name>Apache CXF Command Line Tools CORBA</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/tools/javato/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/tools/javato/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/tools/javato/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-tools-javato</artifactId>
<packaging>pom</packaging>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<name>Apache CXF Command Line Tools JavaTo</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-tools</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
</parent>
<modules>
Modified: thirdparty/cxf/branches/cxf-2.2.12/tools/javato/ws/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/tools/javato/ws/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/tools/javato/ws/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-tools-java2ws</artifactId>
<packaging>jar</packaging>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<name>Apache CXF Command Line Tools JavaTo WS</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/tools/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/tools/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/tools/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-tools</artifactId>
<packaging>pom</packaging>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<name>Apache CXF Command Line Tools</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
</parent>
<modules>
Modified: thirdparty/cxf/branches/cxf-2.2.12/tools/validator/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/tools/validator/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/tools/validator/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-tools-validator</artifactId>
<packaging>jar</packaging>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<name>Apache CXF Command Line Tools Validator</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/core/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/core/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/core/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-tools-wsdlto-core</artifactId>
<packaging>jar</packaging>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<name>Apache CXF Command Line Tools WSDLTo Core</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/databinding/jaxb/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/databinding/jaxb/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/databinding/jaxb/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-tools-wsdlto-databinding-jaxb</artifactId>
<packaging>jar</packaging>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<name>Apache CXF Command Line Tools WSDLTo JAXB Databinding</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<relativePath>../../../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/frontend/javascript/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/frontend/javascript/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/frontend/javascript/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-tools-wsdlto-frontend-javascript</artifactId>
<packaging>jar</packaging>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<name>Apache CXF Command Line Tools WSDL to JavaScript Front End</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<relativePath>../../../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/frontend/jaxws/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/frontend/jaxws/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/frontend/jaxws/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-tools-wsdlto-frontend-jaxws</artifactId>
<packaging>jar</packaging>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<name>Apache CXF Command Line Tools WSDLTo JAXWS Frontend</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<relativePath>../../../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/misc/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/misc/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/misc/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-tools-misctools</artifactId>
<packaging>jar</packaging>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<name>Apache CXF Command Line Tools WSDLTo Misctools</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-tools-wsdlto</artifactId>
<packaging>pom</packaging>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<name>Apache CXF Command Line Tools WSDLTo</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-tools</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
</parent>
<modules>
Modified: thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/test/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/test/pom.xml 2011-08-16 13:33:48 UTC (rev 14883)
+++ thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/test/pom.xml 2011-08-17 03:26:16 UTC (rev 14884)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-tools-wsdlto-test</artifactId>
<packaging>jar</packaging>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<name>Apache CXF Command Line Tools WSDLTo Test</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-02-SNAPSHOT</version>
+ <version>2.2.12-patch-03-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
13 years, 4 months
- 1
- 0