JBossWS SVN: r3024 - in trunk/build/hudson/hudson-home/jobs: JBWS-Integration-AS-5.0 and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-05-09 15:30:33 -0400 (Wed, 09 May 2007)
New Revision: 3024
Modified:
trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-5.0/config.xml
Log:
Fix hudson integration builds
Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-4.2/config.xml 2007-05-09 19:09:37 UTC (rev 3023)
+++ trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-4.2/config.xml 2007-05-09 19:30:33 UTC (rev 3024)
@@ -35,11 +35,11 @@
#
# Build jbws-jboss42
#
-cd $INTDIR/build
+cd $INTDIR
cp ant.properties.example ant.properties
ant $ENVIRONMENT thirdparty
-cp $SPIDIR/output/lib/jbossws-spi.jar $INTDIR/build/thirdparty/jbossws-spi
-cp $JBWSDIR/output/lib/*.jar $INTDIR/build/thirdparty/jbossws-core
+cp $SPIDIR/output/lib/jbossws-spi.jar $INTDIR/thirdparty/jbossws-spi
+cp $JBWSDIR/jbossws-core/output/lib/*.jar $INTDIR/thirdparty/jbossws-core
ant $ENVIRONMENT clean main
#
@@ -50,7 +50,7 @@
#
# deploy to jboss
#
-cd $INTDIR/build
+cd $INTDIR
ant $ENVIRONMENT deploy-jboss42
#
Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-5.0/config.xml 2007-05-09 19:09:37 UTC (rev 3023)
+++ trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-5.0/config.xml 2007-05-09 19:30:33 UTC (rev 3024)
@@ -35,11 +35,11 @@
#
# Build jbws-jboss50
#
-cd $INTDIR/build
+cd $INTDIR
cp ant.properties.example ant.properties
ant $ENVIRONMENT thirdparty
-cp $SPIDIR/output/lib/jbossws-spi.jar $INTDIR/build/thirdparty/jbossws-spi
-cp $JBWSDIR/output/lib/*.jar $INTDIR/build/thirdparty/jbossws-core
+cp $SPIDIR/output/lib/jbossws-spi.jar $INTDIR/thirdparty/jbossws-spi
+cp $JBWSDIR/jbossws-core/output/lib/*.jar $INTDIR/thirdparty/jbossws-core
ant $ENVIRONMENT clean main
#
@@ -50,7 +50,7 @@
#
# deploy to jboss
#
-cd $INTDIR/build
+cd $INTDIR
ant $ENVIRONMENT deploy-jboss50
#
17 years, 8 months
- 1
- 0
JBossWS SVN: r3023 - in trunk/build: ant-import and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-05-09 15:09:37 -0400 (Wed, 09 May 2007)
New Revision: 3023
Added:
trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-4.2/
trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-5.0/
trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-5.0/config.xml
Modified:
trunk/build/ant-import/build-thirdparty.xml
trunk/build/ant.properties.example
trunk/build/build.xml
trunk/build/version.properties
Log:
Fix path to jbossws-spi
Modified: trunk/build/ant-import/build-thirdparty.xml
===================================================================
--- trunk/build/ant-import/build-thirdparty.xml 2007-05-09 19:05:56 UTC (rev 3022)
+++ trunk/build/ant-import/build-thirdparty.xml 2007-05-09 19:09:37 UTC (rev 3023)
@@ -17,7 +17,7 @@
<!-- Libraries -->
<!-- ========= -->
- <target name="thirdparty" depends="jbossws-spi-get,thirdparty-get,thirdparty-classpath">
+ <target name="thirdparty" depends="prepare,jbossws-spi-get,thirdparty-get,thirdparty-classpath">
</target>
<!--
@@ -66,8 +66,6 @@
<get src="${jboss.repository}/jboss/jboss-vfs/${jboss-vfs}/lib/jboss-vfs-sources.jar" dest="${thirdparty.dir}/jboss-vfs-sources.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossretro/${jboss-jbossretro}/lib/jbossretro.jar" dest="${thirdparty.dir}/jbossretro.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossretro/${jboss-jbossretro}/lib/jbossretro-rt.jar" dest="${thirdparty.dir}/jbossretro-rt.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi-src.zip" dest="${thirdparty.dir}/jbossws-spi-src.zip" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42.jar" dest="${thirdparty.dir}/jbossws-jboss42.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss50}/lib/jbossws-jboss50.jar" dest="${thirdparty.dir}/jbossws-jboss50.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossws-wsconsume-impl/${jbossws-wsconsume-impl}/lib/jbossws-wsconsume-impl.jar" dest="${thirdparty.dir}/jbossws-wsconsume-impl.jar" usetimestamp="true" verbose="true"/>
Modified: trunk/build/ant.properties.example
===================================================================
--- trunk/build/ant.properties.example 2007-05-09 19:05:56 UTC (rev 3022)
+++ trunk/build/ant.properties.example 2007-05-09 19:09:37 UTC (rev 3023)
@@ -37,7 +37,7 @@
hudson.jbws-tc55.url=https://svn.jboss.org/repos/jbossws/projects/jbws-tc...
hudson.jboss50.url=https://svn.jboss.org/repos/jbossas/trunk
-hudson.jboss50.build=jboss-5.0.0.Beta2
+hudson.jboss50.build=jboss-5.0.0.Beta3
hudson.jboss50.rev=HEAD
hudson.jboss42.url=https://svn.jboss.org/repos/jbossas/branches/Branch_4_2
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2007-05-09 19:05:56 UTC (rev 3022)
+++ trunk/build/build.xml 2007-05-09 19:09:37 UTC (rev 3023)
@@ -13,8 +13,8 @@
<project default="main" basedir="../build" name="JBossWS-Build">
+ <import file="${basedir}/ant-import/build-setup.xml"/>
<import file="${basedir}/ant-import/build-thirdparty.xml"/>
- <import file="${basedir}/ant-import/build-setup.xml"/>
<import file="${basedir}/ant-import/build-release.xml"/>
<import file="${basedir}/ant-import/build-samples.xml"/>
<import file="${basedir}/ant-import/build-hudson.xml"/>
Added: trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-4.2/config.xml (rev 0)
+++ trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-4.2/config.xml 2007-05-09 19:09:37 UTC (rev 3023)
@@ -0,0 +1,115 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=JBWS-Integration-AS-4.2
+
+WORKSPACE=`pwd`
+JBWSDIR=$WORKSPACE/jbossws
+SPIDIR=$WORKSPACE/jbossws-spi
+INTDIR=$WORKSPACE/jbws-jboss42
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/trunk/build/output/(a)hudson.jboss42.build@
+ENVIRONMENT="-Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE"
+
+#
+# Build jbossws-spi
+#
+cd $SPIDIR
+cp ant.properties.example ant.properties
+ant $ENVIRONMENT thirdparty
+ant $ENVIRONMENT clean main
+
+#
+# Build jbossws
+#
+cd $JBWSDIR/build
+cp ant.properties.example ant.properties
+ant $ENVIRONMENT thirdparty
+cp $SPIDIR/output/lib/jbossws-spi.jar $JBWSDIR/build/thirdparty/jbossws-spi
+ant $ENVIRONMENT clean main
+
+#
+# Build jbws-jboss42
+#
+cd $INTDIR/build
+cp ant.properties.example ant.properties
+ant $ENVIRONMENT thirdparty
+cp $SPIDIR/output/lib/jbossws-spi.jar $INTDIR/build/thirdparty/jbossws-spi
+cp $JBWSDIR/output/lib/*.jar $INTDIR/build/thirdparty/jbossws-core
+ant $ENVIRONMENT clean main
+
+#
+# stop jbossas
+#
+$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+
+#
+# deploy to jboss
+#
+cd $INTDIR/build
+ant $ENVIRONMENT deploy-jboss42
+
+#
+# start jbossas
+#
+$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start
+
+#
+# execute tests
+#
+cd $JBWSDIR/jbossws-tests
+ant $ENVIRONMENT clean tests 2>&1 | tee $WORKSPACE/tests.out
+cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
+
+#
+# stop jbossas
+#
+$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>jbossws/jbossws-tests/output/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>@svn.url@</remote>
+ <local>jbossws</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.jbossws-spi.url@</remote>
+ <local>jbossws-spi</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.jbws-jboss42.url@</remote>
+ <local>jbws-jboss42</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"/>
+ <description>Build and test jbossws-(a)version.id@ against AS-4.2</description>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <actions class="vector"/>
+</project>
\ No newline at end of file
Property changes on: trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-4.2/config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-5.0/config.xml (rev 0)
+++ trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-5.0/config.xml 2007-05-09 19:09:37 UTC (rev 3023)
@@ -0,0 +1,115 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=JBWS-Integration-AS-5.0
+
+WORKSPACE=`pwd`
+JBWSDIR=$WORKSPACE/jbossws
+SPIDIR=$WORKSPACE/jbossws-spi
+INTDIR=$WORKSPACE/jbws-jboss50
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@
+ENVIRONMENT="-Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE"
+
+#
+# Build jbossws-spi
+#
+cd $SPIDIR
+cp ant.properties.example ant.properties
+ant $ENVIRONMENT thirdparty
+ant $ENVIRONMENT clean main
+
+#
+# Build jbossws
+#
+cd $JBWSDIR/build
+cp ant.properties.example ant.properties
+ant $ENVIRONMENT thirdparty
+cp $SPIDIR/output/lib/jbossws-spi.jar $JBWSDIR/build/thirdparty/jbossws-spi
+ant $ENVIRONMENT clean main
+
+#
+# Build jbws-jboss50
+#
+cd $INTDIR/build
+cp ant.properties.example ant.properties
+ant $ENVIRONMENT thirdparty
+cp $SPIDIR/output/lib/jbossws-spi.jar $INTDIR/build/thirdparty/jbossws-spi
+cp $JBWSDIR/output/lib/*.jar $INTDIR/build/thirdparty/jbossws-core
+ant $ENVIRONMENT clean main
+
+#
+# stop jbossas
+#
+$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+
+#
+# deploy to jboss
+#
+cd $INTDIR/build
+ant $ENVIRONMENT deploy-jboss50
+
+#
+# start jbossas
+#
+$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start
+
+#
+# execute tests
+#
+cd $JBWSDIR/jbossws-tests
+ant $ENVIRONMENT clean tests 2>&1 | tee $WORKSPACE/tests.out
+cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
+
+#
+# stop jbossas
+#
+$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>jbossws/jbossws-tests/output/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>@svn.url@</remote>
+ <local>jbossws</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.jbossws-spi.url@</remote>
+ <local>jbossws-spi</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.jbws-jboss50.url@</remote>
+ <local>jbws-jboss50</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"/>
+ <description>Build and test jbossws-(a)version.id@ against AS-5.0</description>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <actions class="vector"/>
+</project>
\ No newline at end of file
Property changes on: trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-5.0/config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/build/version.properties
===================================================================
--- trunk/build/version.properties 2007-05-09 19:05:56 UTC (rev 3022)
+++ trunk/build/version.properties 2007-05-09 19:09:37 UTC (rev 3023)
@@ -17,7 +17,7 @@
apache-xmlsec=1.3.0
ibm-wsdl4j=1.6.2
javassist=3.5.0.CR1
-jbossws-spi=SNAPSHOT
+jboss-jbossws-spi=SNAPSHOT
jbossws-wsconsume-impl=2.0.0
jbpm-bpel=1.1.0.Beta5
sun-jaxb=2.0.3jboss
17 years, 8 months
- 1
- 0
JBossWS SVN: r3022 - in projects/wsintegration: jbws-jboss50/trunk/src/main/etc/ant-import and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-05-09 15:05:56 -0400 (Wed, 09 May 2007)
New Revision: 3022
Modified:
projects/wsintegration/jbws-jboss42/trunk/src/main/etc/ant-import/build-thirdparty.xml
projects/wsintegration/jbws-jboss50/trunk/src/main/etc/ant-import/build-thirdparty.xml
Log:
Fix path to jbossws-spi
Modified: projects/wsintegration/jbws-jboss42/trunk/src/main/etc/ant-import/build-thirdparty.xml
===================================================================
--- projects/wsintegration/jbws-jboss42/trunk/src/main/etc/ant-import/build-thirdparty.xml 2007-05-09 18:16:36 UTC (rev 3021)
+++ projects/wsintegration/jbws-jboss42/trunk/src/main/etc/ant-import/build-thirdparty.xml 2007-05-09 19:05:56 UTC (rev 3022)
@@ -17,9 +17,42 @@
<!-- Libraries -->
<!-- ========= -->
- <target name="thirdparty" depends="thirdparty-get,thirdparty-classpath">
+ <target name="thirdparty" depends="prepare,jbossws-spi-get,jbossws-core-get,thirdparty-get,thirdparty-classpath">
</target>
+ <!--
+ jbossws-spi-get
+ -->
+ <target name="jbossws-spi-get" if="force.thirdparty.get"
+ description="Gets the jbossws-core libraries">
+
+ <mkdir dir="${thirdparty.dir}/jbossws-spi"/>
+ <get src="${jboss.repository}/jboss/jbossws-spi/${jboss-jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi/jbossws-spi.jar" usetimestamp="true" verbose="true"/>
+
+ </target>
+
+ <!--
+ jbossws-core-get
+ -->
+ <target name="jbossws-core-get" if="force.thirdparty.get"
+ description="Gets the jbossws-core libraries">
+
+ <mkdir dir="${thirdparty.dir}/jbossws-core"/>
+ <get src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jbossws-client.jar" dest="${thirdparty.dir}/jbossws-core/jbossws-client.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jbossws-core.jar" dest="${thirdparty.dir}/jbossws-core/jbossws-core.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jbossws-resources.zip" dest="${thirdparty.dir}/jbossws-core/jbossws-resources.zip" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jboss-saaj.jar" dest="${thirdparty.dir}/jbossws-core/jboss-saaj.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jboss-jaxrpc.jar" dest="${thirdparty.dir}/jbossws-core/jboss-jaxrpc.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jboss-jaxws.jar" dest="${thirdparty.dir}/jbossws-core/jboss-jaxws.jar" usetimestamp="true" verbose="true"/>
+
+ <mkdir dir="${thirdparty.dir}/jbossws-resources"/>
+ <unzip dest="${thirdparty.dir}/jbossws-resources" src="${thirdparty.dir}/jbossws-core/jbossws-resources.zip"/>
+
+ </target>
+
+ <!--
+ thirdpartry-get
+ -->
<target name="thirdparty-get" if="force.thirdparty.get"
description="Gets the thirdparty libraries">
@@ -32,13 +65,6 @@
<get src="${jboss.repository}/jboss/common-logging-log4j/${jboss-common-logging-log4j}/lib/jboss-logging-log4j.jar" dest="${thirdparty.dir}/jboss-logging-log4j.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/common-logging-spi/${jboss-common-logging-spi}/lib/jboss-logging-spi.jar" dest="${thirdparty.dir}/jboss-logging-spi.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jaxr/${jboss-jaxr}/lib/juddi-service.sar" dest="${thirdparty.dir}/juddi-service.sar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jbossws-client.jar" dest="${thirdparty.dir}/jbossws-client.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jbossws-core.jar" dest="${thirdparty.dir}/jbossws-core.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jbossws-resources.zip" dest="${thirdparty.dir}/jbossws-resources.zip" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jboss-saaj.jar" dest="${thirdparty.dir}/jboss-saaj.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jboss-jaxrpc.jar" dest="${thirdparty.dir}/jboss-jaxrpc.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jboss-jaxws.jar" dest="${thirdparty.dir}/jboss-jaxws.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/jbossws-spi/${jboss-jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossws-wsconsume-impl/${jbossws-wsconsume-impl}/lib/jbossws-wsconsume-impl.jar" dest="${thirdparty.dir}/jbossws-wsconsume-impl.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding.jar" dest="${thirdparty.dir}/jboss-xml-binding.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding-sources.jar" dest="${thirdparty.dir}/jboss-xml-binding-sources.jar" usetimestamp="true" verbose="true"/>
@@ -51,15 +77,17 @@
<get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-xjc.jar" dest="${thirdparty.dir}/jaxb-xjc.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-servlet/${sun-servlet}/lib/servlet-api.jar" dest="${thirdparty.dir}/servlet-api.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/wscommons-policy/${wscommons-policy}/lib/policy.jar" dest="${thirdparty.dir}/policy.jar" usetimestamp="true" verbose="true"/>
-
- <mkdir dir="${thirdparty.dir}/jbossws-resources"/>
- <unzip dest="${thirdparty.dir}/jbossws-resources" src="${thirdparty.dir}/jbossws-resources.zip"/>
</target>
<target name="thirdparty-classpath" >
<!-- The compile classpath for jboss42 integration -->
<path id="jboss42.integration.classpath">
+ <pathelement location="${thirdparty.dir}/jbossws-spi/jbossws-spi.jar"/>
+ <pathelement location="${thirdparty.dir}/jbossws-core/jbossws-core.jar"/>
+ <pathelement location="${thirdparty.dir}/jbossws-core/jboss-jaxrpc.jar"/>
+ <pathelement location="${thirdparty.dir}/jbossws-core/jboss-jaxws.jar"/>
+ <pathelement location="${thirdparty.dir}/jbossws-core/jboss-saaj.jar"/>
<pathelement location="${jboss42.lib}/jboss-jmx.jar"/>
<pathelement location="${jboss42.lib}/jboss-system.jar"/>
<pathelement location="${jboss42.server.lib}/jboss.jar"/>
@@ -74,32 +102,12 @@
<pathelement location="${thirdparty.dir}/jaxb-xjc.jar"/>
<pathelement location="${thirdparty.dir}/jboss-common-core.jar"/>
<pathelement location="${thirdparty.dir}/jboss-dependency.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-jaxrpc.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-jaxws.jar"/>
<pathelement location="${thirdparty.dir}/jboss-logging-spi.jar"/>
<pathelement location="${thirdparty.dir}/jboss-microcontainer.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-saaj.jar"/>
<pathelement location="${thirdparty.dir}/jboss-xml-binding.jar"/>
- <pathelement location="${thirdparty.dir}/jbossws-core.jar"/>
- <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/>
<pathelement location="${thirdparty.dir}/servlet-api.jar"/>
</path>
- <!-- The compile classpath for jboss40 integration -->
- <path id="jboss40.integration.classpath">
- <pathelement location="${jboss40.lib}/jboss-jmx.jar"/>
- <pathelement location="${jboss40.lib}/jboss-system.jar"/>
- <pathelement location="${jboss40.server.lib}/jboss.jar"/>
- <pathelement location="${jboss40.server.deploy}/jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar"/>
- <pathelement location="${jboss40.server.deploy}/ejb3.deployer/jboss-annotations-ejb3.jar"/>
- <pathelement location="${jboss40.server.deploy}/ejb3.deployer/jboss-ejb3.jar"/>
- <pathelement location="${jboss40.server.deploy}/ejb3.deployer/jboss-ejb3x.jar"/>
- </path>
-
- <!-- The compile classpath for tomcat integration -->
- <path id="tomcat.integration.classpath">
- </path>
-
</target>
</project>
Modified: projects/wsintegration/jbws-jboss50/trunk/src/main/etc/ant-import/build-thirdparty.xml
===================================================================
--- projects/wsintegration/jbws-jboss50/trunk/src/main/etc/ant-import/build-thirdparty.xml 2007-05-09 18:16:36 UTC (rev 3021)
+++ projects/wsintegration/jbws-jboss50/trunk/src/main/etc/ant-import/build-thirdparty.xml 2007-05-09 19:05:56 UTC (rev 3022)
@@ -17,10 +17,21 @@
<!-- Libraries -->
<!-- ========= -->
- <target name="thirdparty" depends="jbossws-core-get,jbossws-spi-get,thirdparty-get,thirdparty-classpath">
+ <target name="thirdparty" depends="prepare,jbossws-spi-get,jbossws-core-get,thirdparty-get,thirdparty-classpath">
</target>
<!--
+ jbossws-spi-get
+ -->
+ <target name="jbossws-spi-get" if="force.thirdparty.get"
+ description="Gets the jbossws-core libraries">
+
+ <mkdir dir="${thirdparty.dir}/jbossws-spi"/>
+ <get src="${jboss.repository}/jboss/jbossws-spi/${jboss-jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi/jbossws-spi.jar" usetimestamp="true" verbose="true"/>
+
+ </target>
+
+ <!--
jbossws-core-get
-->
<target name="jbossws-core-get" if="force.thirdparty.get"
@@ -40,17 +51,6 @@
</target>
<!--
- jbossws-spi-get
- -->
- <target name="jbossws-spi-get" if="force.thirdparty.get"
- description="Gets the jbossws-core libraries">
-
- <mkdir dir="${thirdparty.dir}/jbossws-spi"/>
- <get src="${jboss.repository}/jboss/jbossws-spi/${jboss-jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi/jbossws-spi.jar" usetimestamp="true" verbose="true"/>
-
- </target>
-
- <!--
thirdpartry-get
-->
<target name="thirdparty-get" if="force.thirdparty.get"
@@ -87,12 +87,10 @@
<!-- The compile classpath for jboss50 integration -->
<path id="jboss50.integration.classpath">
<pathelement location="${thirdparty.dir}/jbossws-spi/jbossws-spi.jar"/>
-
<pathelement location="${thirdparty.dir}/jbossws-core/jbossws-core.jar"/>
<pathelement location="${thirdparty.dir}/jbossws-core/jboss-jaxrpc.jar"/>
<pathelement location="${thirdparty.dir}/jbossws-core/jboss-jaxws.jar"/>
<pathelement location="${thirdparty.dir}/jbossws-core/jboss-saaj.jar"/>
-
<pathelement location="${jboss50.lib}/jboss-aop-jdk50.jar"/>
<pathelement location="${jboss50.lib}/jboss-deployers.jar"/>
<pathelement location="${jboss50.lib}/jboss-j2se.jar"/>
17 years, 8 months
- 1
- 0
JBossWS SVN: r3021 - in trunk/build: ant-import and 16 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-05-09 14:16:36 -0400 (Wed, 09 May 2007)
New Revision: 3021
Added:
trunk/build/hudson/hudson-home/jobs/AS-4.0.5/
trunk/build/hudson/hudson-home/jobs/AS-4.0/
trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0/
trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0.5/
trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0/
trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0.5/
trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0/
Modified:
trunk/build/ant-import/build-thirdparty.xml
trunk/build/ant.properties.example
trunk/build/hudson/hudson-home/config.xml
trunk/build/hudson/hudson-home/jobs/AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0/config.xml
trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0.5/config.xml
trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0/config.xml
trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/JBWS-Samples-TC-5.5/config.xml
trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0.5/config.xml
trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0/config.xml
trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/JBWS-Tests-TC-5.5/config.xml
Log:
Update hudson
Modified: trunk/build/ant-import/build-thirdparty.xml
===================================================================
--- trunk/build/ant-import/build-thirdparty.xml 2007-05-09 17:10:57 UTC (rev 3020)
+++ trunk/build/ant-import/build-thirdparty.xml 2007-05-09 18:16:36 UTC (rev 3021)
@@ -17,9 +17,23 @@
<!-- Libraries -->
<!-- ========= -->
- <target name="thirdparty" depends="thirdparty-get,thirdparty-classpath">
+ <target name="thirdparty" depends="jbossws-spi-get,thirdparty-get,thirdparty-classpath">
</target>
+ <!--
+ jbossws-spi-get
+ -->
+ <target name="jbossws-spi-get" if="force.thirdparty.get"
+ description="Gets the jbossws-core libraries">
+
+ <mkdir dir="${thirdparty.dir}/jbossws-spi"/>
+ <get src="${jboss.repository}/jboss/jbossws-spi/${jboss-jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi/jbossws-spi.jar" usetimestamp="true" verbose="true"/>
+
+ </target>
+
+ <!--
+ thirdpartry-get
+ -->
<target name="thirdparty-get" if="force.thirdparty.get"
description="Gets the thirdparty libraries">
@@ -94,6 +108,8 @@
<!-- The compile classpath for jbossws core -->
<path id="core.classpath">
+ <pathelement location="${thirdparty.dir}/jbossws-spi/jbossws-spi.jar"/>
+
<pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-annotations-ejb3.jar"/>
<pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-ejb3x.jar"/>
<pathelement location="${thirdparty.dir}/activation.jar"/>
@@ -109,7 +125,6 @@
<pathelement location="${thirdparty.dir}/jboss-remoting.jar"/>
<pathelement location="${thirdparty.dir}/jboss-xml-binding.jar"/>
<pathelement location="${thirdparty.dir}/jbosssx-client.jar"/>
- <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/>
<pathelement location="${thirdparty.dir}/mail.jar"/>
<pathelement location="${thirdparty.dir}/servlet-api.jar"/>
<pathelement location="${thirdparty.dir}/stax-api.jar"/>
Modified: trunk/build/ant.properties.example
===================================================================
--- trunk/build/ant.properties.example 2007-05-09 17:10:57 UTC (rev 3020)
+++ trunk/build/ant.properties.example 2007-05-09 18:16:36 UTC (rev 3021)
@@ -6,8 +6,9 @@
# Optional JBoss Home
#jboss50.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3
#jboss42.home=/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.GA
+#jboss40.home=/home/tdiesler/svn/jbossas/branches/Branch_4_0/build/output/jboss-4.0.5.SP1-ejb3
-# The JBoss server under test. This can be [jboss50|jboss42|tomcat]
+# The JBoss server under test. This can be [jboss50|jboss42|jboss40|tomcat]
jbossws.integration.target=jboss50
# The JBoss server instance
@@ -29,6 +30,12 @@
hudson.jdk15=/usr/java/jdk1.5
hudson.jdk14=/usr/java/jdk1.4
+hudson.jbossws-spi.url=https://svn.jboss.org/repos/jbossws/projects/jbossws-spi/trunk
+hudson.jbws-jboss50.url=https://svn.jboss.org/repos/jbossws/projects/jbws-jboss50/trunk
+hudson.jbws-jboss42.url=https://svn.jboss.org/repos/jbossws/projects/jbws-jboss42/trunk
+hudson.jbws-jboss40.url=https://svn.jboss.org/repos/jbossws/projects/jbws-jboss40/trunk
+hudson.jbws-tc55.url=https://svn.jboss.org/repos/jbossws/projects/jbws-tc55/trunk
+
hudson.jboss50.url=https://svn.jboss.org/repos/jbossas/trunk
hudson.jboss50.build=jboss-5.0.0.Beta2
hudson.jboss50.rev=HEAD
@@ -37,6 +44,10 @@
hudson.jboss42.build=jboss-4.2.0.GA
hudson.jboss42.rev=HEAD
+hudson.jboss40.url=https://svn.jboss.org/repos/jbossas/branches/Branch_4_0
+hudson.jboss40.build=jboss-4.0.5.SP1
+hudson.jboss40.rev=HEAD
+
hudson.mail.recipients=thomas.diesler(a)jboss.com, heiko.braun(a)jboss.com, alejandro.guizar(a)jboss.com
hudson.smtp.host=mail.navisite.com
Modified: trunk/build/hudson/hudson-home/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/config.xml 2007-05-09 17:10:57 UTC (rev 3020)
+++ trunk/build/hudson/hudson-home/config.xml 2007-05-09 18:16:36 UTC (rev 3021)
@@ -34,7 +34,6 @@
<jobNames class="tree-set">
<no-comparator/>
<string>JBAS-Tests-AS-4.0</string>
- <string>JBAS-Tests-AS-4.0-jdk14</string>
<string>JBAS-Tests-AS-4.2</string>
<string>JBAS-Tests-AS-5.0</string>
</jobNames>
@@ -75,9 +74,7 @@
<jobNames class="tree-set">
<no-comparator/>
<string>JBWS-Tests-AS-4.0.5</string>
- <string>JBWS-Tests-AS-4.0.5-jdk14</string>
<string>JBWS-Tests-AS-4.0</string>
- <string>JBWS-Tests-AS-4.0-jdk14</string>
<string>JBWS-Tests-AS-4.2</string>
<string>JBWS-Tests-AS-5.0</string>
<string>JBWS-Tests-TC-5.5</string>
@@ -131,9 +128,7 @@
<tr align=center><th align=left>AS-5.0</th><td>ok</td><td>ok</td><td>ok</td></tr>
<tr align=center><th align=left>AS-4.2</th><td>ok</td><td>ok</td><td>ok</td></tr>
<tr align=center><th align=left>AS-4.0</th><td>ok</td><td>ok</td><td>ok</td></tr>
-<tr align=center><th align=left>AS-4.0-jdk14</th><td>ok</td><td>ok</td><td>N/A</td></tr>
<tr align=center><th align=left>AS-4.0.5</th><td>ok</td><td>ok</td><td>ok</td></tr>
-<tr align=center><th align=left>AS-4.0.5-jdk14</th><td>ok</td><td>ok</td><td>N/A</td></tr>
<tr align=center><th align=left>TC-5.5</th><td>ok</td><td>N/A</td><td>ok</td></tr>
</table>
]]>
@@ -148,9 +143,7 @@
<string>AS-5.0</string>
<string>AS-4.2</string>
<string>AS-4.0</string>
- <string>AS-4.0-jdk14</string>
<string>AS-4.0.5</string>
- <string>AS-4.0.5-jdk14</string>
<string>TC-5.5</string>
</jobNames>
<name>Target Container</name>
Copied: trunk/build/hudson/hudson-home/jobs/AS-4.0 (from rev 3017, branches/jbossws-2.0/build/hudson/hudson-home/jobs/AS-4.0)
Copied: trunk/build/hudson/hudson-home/jobs/AS-4.0.5 (from rev 3017, branches/jbossws-2.0/build/hudson/hudson-home/jobs/AS-4.0.5)
Modified: trunk/build/hudson/hudson-home/jobs/AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/AS-5.0/config.xml 2007-05-09 17:10:57 UTC (rev 3020)
+++ trunk/build/hudson/hudson-home/jobs/AS-5.0/config.xml 2007-05-09 18:16:36 UTC (rev 3021)
@@ -22,7 +22,6 @@
# build jboss
#
cd $SVNBASE
-rm -f thirdparty/libraries.ent
./build/build.sh clean main
#
Copied: trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0 (from rev 3017, branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0)
Modified: trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0/config.xml
===================================================================
--- branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0/config.xml 2007-05-09 12:50:02 UTC (rev 3017)
+++ trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0/config.xml 2007-05-09 18:16:36 UTC (rev 3021)
@@ -7,33 +7,33 @@
# Module settings
#
MODULE=JBAS-Tests-AS-4.0
-SVNBASENAME=(a)svn.basename@
+
WORKSPACE=`pwd`
-SVNBASEDIR=$WORKSPACE/(a)svn.basename@
+JBWSDIR=$WORKSPACE/jbossws
JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build(a)-ejb3
ENVIRONMENT="-Djbossws.integration.target=jboss40 -Djboss40.home=$JBOSS_INSTANCE"
#
# copy ant.properties
#
-cd $SVNBASEDIR/build
+cd $JBWSDIR/build
cp ant.properties.example ant.properties
#
# stop jbossas
#
-$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
# deploy to jboss
#
-cd $SVNBASEDIR/build
+cd $JBWSDIR/build
ant $ENVIRONMENT clean deploy-jboss40
#
# start jbossas
#
-$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start
+$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start
#
# build the testsuite
@@ -57,7 +57,7 @@
#
# stop jbossas
#
-$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
</command>
</hudson.tasks.Shell>
</builders>
@@ -73,7 +73,7 @@
<locations>
<hudson.scm.SubversionSCM-ModuleLocation>
<remote>@svn.url@</remote>
- <local>@svn.basename@</local>
+ <local>jbossws</local>
</hudson.scm.SubversionSCM-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
Modified: trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.2/config.xml 2007-05-09 17:10:57 UTC (rev 3020)
+++ trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.2/config.xml 2007-05-09 18:16:36 UTC (rev 3021)
@@ -7,33 +7,33 @@
# Module settings
#
MODULE=JBAS-Tests-AS-4.2
-SVNBASENAME=(a)svn.basename@
+
WORKSPACE=`pwd`
-SVNBASEDIR=$WORKSPACE/(a)svn.basename@
+JBWSDIR=$WORKSPACE/jbossws
JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/(a)hudson.jboss42.build@
ENVIRONMENT="-Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE"
#
# copy ant.properties
#
-cd $SVNBASEDIR/build
+cd $JBWSDIR/build
cp ant.properties.example ant.properties
#
# stop jbossas
#
-$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
# deploy to jboss
#
-cd $SVNBASEDIR/build
+cd $JBWSDIR/build
ant $ENVIRONMENT clean deploy-jboss42
#
# start jbossas
#
-$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start
+$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start
#
# build the testsuite
@@ -57,7 +57,7 @@
#
# stop jbossas
#
-$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
</command>
</hudson.tasks.Shell>
</builders>
@@ -73,7 +73,7 @@
<locations>
<hudson.scm.SubversionSCM-ModuleLocation>
<remote>@svn.url@</remote>
- <local>@svn.basename@</local>
+ <local>jbossws</local>
</hudson.scm.SubversionSCM-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
Modified: trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-5.0/config.xml 2007-05-09 17:10:57 UTC (rev 3020)
+++ trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-5.0/config.xml 2007-05-09 18:16:36 UTC (rev 3021)
@@ -7,33 +7,33 @@
# Module settings
#
MODULE=JBAS-Tests-AS-5.0
-SVNBASENAME=(a)svn.basename@
+
WORKSPACE=`pwd`
-SVNBASEDIR=$WORKSPACE/(a)svn.basename@
+JBWSDIR=$WORKSPACE/jbossws
JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@
ENVIRONMENT="-Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE"
#
# copy ant.properties
#
-cd $SVNBASEDIR/build
+cd $JBWSDIR/build
cp ant.properties.example ant.properties
#
# stop jbossas
#
-$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
# deploy to jboss
#
-cd $SVNBASEDIR/build
+cd $JBWSDIR/build
ant $ENVIRONMENT clean deploy-jboss50
#
# start jbossas
#
-$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start
+$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start
#
# build the testsuite
@@ -57,7 +57,7 @@
#
# stop jbossas
#
-$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
</command>
</hudson.tasks.Shell>
</builders>
@@ -73,7 +73,7 @@
<locations>
<hudson.scm.SubversionSCM-ModuleLocation>
<remote>@svn.url@</remote>
- <local>@svn.basename@</local>
+ <local>jbossws</local>
</hudson.scm.SubversionSCM-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
Copied: trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0 (from rev 3017, branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0)
Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0/config.xml
===================================================================
--- branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0/config.xml 2007-05-09 12:50:02 UTC (rev 3017)
+++ trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0/config.xml 2007-05-09 18:16:36 UTC (rev 3021)
@@ -8,7 +8,7 @@
#
MODULE=JBWS-Samples-AS-4.0
WORKSPACE=`pwd`
-SVNBASEDIR=$WORKSPACE/(a)svn.basename@
+JBWSDIR=$WORKSPACE/jbossws
JBOSS40_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build(a)-ejb3
JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/(a)hudson.jboss42.build@
JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@
@@ -20,30 +20,30 @@
#
# copy ant.properties
#
-cd $SVNBASEDIR/build
+cd $JBWSDIR/build
cp ant.properties.example ant.properties
#
# stop jbossas
#
-$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
# build/deploy binary distribution
#
ant $ENVIRONMENT clean build-bin-dist
-cd $SVNBASEDIR/build/output/bin-dist
+cd $JBWSDIR/build/output/bin-dist
ant $ENVIRONMENT deploy-jboss40
#
# start jbossas
#
-$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start
+$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start
#
# execute samples
#
-cd $SVNBASEDIR/build/output/jbossws-samples-(a)version.id@
+cd $JBWSDIR/build/output/jbossws-samples-(a)version.id@
cp ant.properties.example ant.properties
ant $ENVIRONMENT clean tests 2>&1 | tee $WORKSPACE/tests.out
cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
@@ -51,7 +51,7 @@
#
# stop jbossas
#
-$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
</command>
</hudson.tasks.Shell>
</builders>
@@ -70,7 +70,7 @@
<locations>
<hudson.scm.SubversionSCM-ModuleLocation>
<remote>@svn.url@</remote>
- <local>@svn.basename@</local>
+ <local>jbossws</local>
</hudson.scm.SubversionSCM-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
Copied: trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0.5 (from rev 3017, branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0.5)
Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0.5/config.xml
===================================================================
--- branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0.5/config.xml 2007-05-09 12:50:02 UTC (rev 3017)
+++ trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0.5/config.xml 2007-05-09 18:16:36 UTC (rev 3021)
@@ -8,7 +8,7 @@
#
MODULE=JBWS-Samples-AS-4.0.5
WORKSPACE=`pwd`
-SVNBASEDIR=$WORKSPACE/(a)svn.basename@
+JBWSDIR=$WORKSPACE/jbossws
JBOSS40_INSTANCE=@hudson.home(a)/jobs/AS-4.0.5/workspace/JBoss_4_0_5_GA/build/output/jboss-4.0.5.GA-ejb3
JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/(a)hudson.jboss42.build@
JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@
@@ -20,30 +20,30 @@
#
# copy ant.properties
#
-cd $SVNBASEDIR/build
+cd $JBWSDIR/build
cp ant.properties.example ant.properties
#
# stop jbossas
#
-$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
# build/deploy binary distribution
#
ant $ENVIRONMENT clean build-bin-dist
-cd $SVNBASEDIR/build/output/bin-dist
+cd $JBWSDIR/build/output/bin-dist
ant $ENVIRONMENT deploy-jboss40
#
# start jbossas
#
-$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start
+$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start
#
# execute samples
#
-cd $SVNBASEDIR/build/output/jbossws-samples-(a)version.id@
+cd $JBWSDIR/build/output/jbossws-samples-(a)version.id@
cp ant.properties.example ant.properties
ant $ENVIRONMENT clean tests 2>&1 | tee $WORKSPACE/tests.out
cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
@@ -51,7 +51,7 @@
#
# stop jbossas
#
-$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
</command>
</hudson.tasks.Shell>
</builders>
@@ -70,7 +70,7 @@
<locations>
<hudson.scm.SubversionSCM-ModuleLocation>
<remote>@svn.url@</remote>
- <local>@svn.basename@</local>
+ <local>jbossws</local>
</hudson.scm.SubversionSCM-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.2/config.xml 2007-05-09 17:10:57 UTC (rev 3020)
+++ trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.2/config.xml 2007-05-09 18:16:36 UTC (rev 3021)
@@ -8,7 +8,7 @@
#
MODULE=JBWS-Samples-AS-4.2
WORKSPACE=`pwd`
-SVNBASEDIR=$WORKSPACE/(a)svn.basename@
+JBWSDIR=$WORKSPACE/jbossws
JBOSS40_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build(a)-ejb3
JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/(a)hudson.jboss42.build@
JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@
@@ -20,30 +20,30 @@
#
# copy ant.properties
#
-cd $SVNBASEDIR/build
+cd $JBWSDIR/build
cp ant.properties.example ant.properties
#
# stop jbossas
#
-$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
# build/deploy binary distribution
#
ant $ENVIRONMENT clean build-bin-dist
-cd $SVNBASEDIR/build/output/bin-dist
+cd $JBWSDIR/build/output/bin-dist
ant $ENVIRONMENT deploy-jboss42
#
# start jbossas
#
-$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start
+$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start
#
# execute samples
#
-cd $SVNBASEDIR/build/output/jbossws-samples-(a)version.id@
+cd $JBWSDIR/build/output/jbossws-samples-(a)version.id@
cp ant.properties.example ant.properties
ant $ENVIRONMENT clean tests 2>&1 | tee $WORKSPACE/tests.out
cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
@@ -51,7 +51,7 @@
#
# stop jbossas
#
-$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
</command>
</hudson.tasks.Shell>
</builders>
@@ -70,7 +70,7 @@
<locations>
<hudson.scm.SubversionSCM-ModuleLocation>
<remote>@svn.url@</remote>
- <local>@svn.basename@</local>
+ <local>jbossws</local>
</hudson.scm.SubversionSCM-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-5.0/config.xml 2007-05-09 17:10:57 UTC (rev 3020)
+++ trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-5.0/config.xml 2007-05-09 18:16:36 UTC (rev 3021)
@@ -8,7 +8,7 @@
#
MODULE=JBWS-Samples-AS-5.0
WORKSPACE=`pwd`
-SVNBASEDIR=$WORKSPACE/(a)svn.basename@
+JBWSDIR=$WORKSPACE/jbossws
JBOSS40_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build(a)-ejb3
JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/(a)hudson.jboss42.build@
JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@
@@ -20,30 +20,30 @@
#
# copy ant.properties
#
-cd $SVNBASEDIR/build
+cd $JBWSDIR/build
cp ant.properties.example ant.properties
#
# stop jbossas
#
-$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
# build/deploy binary distribution
#
ant $ENVIRONMENT clean build-bin-dist
-cd $SVNBASEDIR/build/output/bin-dist
+cd $JBWSDIR/build/output/bin-dist
ant $ENVIRONMENT deploy-jboss50
#
# start jbossas
#
-$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start
+$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start
#
# execute samples
#
-cd $SVNBASEDIR/build/output/jbossws-samples-(a)version.id@
+cd $JBWSDIR/build/output/jbossws-samples-(a)version.id@
cp ant.properties.example ant.properties
ant $ENVIRONMENT clean tests 2>&1 | tee $WORKSPACE/tests.out
cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
@@ -51,7 +51,7 @@
#
# stop jbossas
#
-$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
</command>
</hudson.tasks.Shell>
</builders>
@@ -70,7 +70,7 @@
<locations>
<hudson.scm.SubversionSCM-ModuleLocation>
<remote>@svn.url@</remote>
- <local>@svn.basename@</local>
+ <local>jbossws</local>
</hudson.scm.SubversionSCM-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Samples-TC-5.5/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/JBWS-Samples-TC-5.5/config.xml 2007-05-09 17:10:57 UTC (rev 3020)
+++ trunk/build/hudson/hudson-home/jobs/JBWS-Samples-TC-5.5/config.xml 2007-05-09 18:16:36 UTC (rev 3021)
@@ -8,7 +8,7 @@
#
MODULE=JBWS-Samples-TC-5.5
WORKSPACE=`pwd`
-SVNBASEDIR=$WORKSPACE/(a)svn.basename@
+JBWSDIR=$WORKSPACE/jbossws
JBOSS40_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build(a)-ejb3
JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/(a)hudson.jboss42.build@
JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@
@@ -18,7 +18,7 @@
#
# copy ant.properties
#
-cd $SVNBASEDIR/build
+cd $JBWSDIR/build
cp ant.properties.example ant.properties
#
@@ -30,7 +30,7 @@
# build/deploy binary distribution
#
ant $ENVIRONMENT clean build-bin-dist
-cd $SVNBASEDIR/build/output/bin-dist
+cd $JBWSDIR/build/output/bin-dist
ant $ENVIRONMENT deploy-tomcat
#
@@ -41,7 +41,7 @@
#
# execute samples
#
-cd $SVNBASEDIR/build/output/jbossws-samples-(a)version.id@
+cd $JBWSDIR/build/output/jbossws-samples-(a)version.id@
cp ant.properties.example ant.properties
ant $ENVIRONMENT clean tests 2>&1 | tee $WORKSPACE/tests.out
cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
@@ -68,7 +68,7 @@
<locations>
<hudson.scm.SubversionSCM-ModuleLocation>
<remote>@svn.url@</remote>
- <local>@svn.basename@</local>
+ <local>jbossws</local>
</hudson.scm.SubversionSCM-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
Copied: trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0 (from rev 3017, branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0)
Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0/config.xml
===================================================================
--- branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0/config.xml 2007-05-09 12:50:02 UTC (rev 3017)
+++ trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0/config.xml 2007-05-09 18:16:36 UTC (rev 3021)
@@ -7,22 +7,22 @@
# Module settings
#
MODULE=JBWS-Tests-AS-4.0
-SVNBASENAME=(a)svn.basename@
+
WORKSPACE=`pwd`
-SVNBASEDIR=$WORKSPACE/(a)svn.basename@
+JBWSDIR=$WORKSPACE/jbossws
JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build(a)-ejb3
ENVIRONMENT="-Djbossws.integration.target=jboss40 -Djboss40.home=$JBOSS_INSTANCE"
#
# copy ant.properties
#
-cd $SVNBASEDIR/build
+cd $JBWSDIR/build
cp ant.properties.example ant.properties
#
# stop jbossas
#
-$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
# deploy to jboss
@@ -32,19 +32,19 @@
#
# start jbossas
#
-$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start
+$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start
#
# execute tests
#
-cd $SVNBASEDIR/jbossws-tests
+cd $JBWSDIR/jbossws-tests
ant $ENVIRONMENT clean tests 2>&1 | tee $WORKSPACE/tests.out
cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
#
# stop jbossas
#
-$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
</command>
</hudson.tasks.Shell>
</builders>
@@ -63,7 +63,7 @@
<locations>
<hudson.scm.SubversionSCM-ModuleLocation>
<remote>@svn.url@</remote>
- <local>@svn.basename@</local>
+ <local>jbossws</local>
</hudson.scm.SubversionSCM-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
Copied: trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0.5 (from rev 3017, branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0.5)
Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0.5/config.xml
===================================================================
--- branches/jbossws-2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0.5/config.xml 2007-05-09 12:50:02 UTC (rev 3017)
+++ trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0.5/config.xml 2007-05-09 18:16:36 UTC (rev 3021)
@@ -7,22 +7,22 @@
# Module settings
#
MODULE=JBWS-Tests-AS-4.0.5
-SVNBASENAME=(a)svn.basename@
+
WORKSPACE=`pwd`
-SVNBASEDIR=$WORKSPACE/(a)svn.basename@
+JBWSDIR=$WORKSPACE/jbossws
JBOSS_INSTANCE=@hudson.home(a)/jobs/AS-4.0.5/workspace/JBoss_4_0_5_GA/build/output/jboss-4.0.5.GA-ejb3
ENVIRONMENT="-Djbossws.integration.target=jboss40 -Djboss40.home=$JBOSS_INSTANCE"
#
# copy ant.properties
#
-cd $SVNBASEDIR/build
+cd $JBWSDIR/build
cp ant.properties.example ant.properties
#
# stop jbossas
#
-$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
# deploy to jboss
@@ -32,19 +32,19 @@
#
# start jbossas
#
-$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start
+$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start
#
# execute tests
#
-cd $SVNBASEDIR/jbossws-tests
+cd $JBWSDIR/jbossws-tests
ant $ENVIRONMENT clean tests 2>&1 | tee $WORKSPACE/tests.out
cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
#
# stop jbossas
#
-$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
</command>
</hudson.tasks.Shell>
</builders>
@@ -63,7 +63,7 @@
<locations>
<hudson.scm.SubversionSCM-ModuleLocation>
<remote>@svn.url@</remote>
- <local>@svn.basename@</local>
+ <local>jbossws</local>
</hudson.scm.SubversionSCM-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2/config.xml 2007-05-09 17:10:57 UTC (rev 3020)
+++ trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2/config.xml 2007-05-09 18:16:36 UTC (rev 3021)
@@ -7,22 +7,22 @@
# Module settings
#
MODULE=JBWS-Tests-AS-4.2
-SVNBASENAME=(a)svn.basename@
+
WORKSPACE=`pwd`
-SVNBASEDIR=$WORKSPACE/(a)svn.basename@
+JBWSDIR=$WORKSPACE/jbossws
JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/(a)hudson.jboss42.build@
ENVIRONMENT="-Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE"
#
# copy ant.properties
#
-cd $SVNBASEDIR/build
+cd $JBWSDIR/build
cp ant.properties.example ant.properties
#
# stop jbossas
#
-$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
# deploy to jboss
@@ -32,19 +32,19 @@
#
# start jbossas
#
-$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start
+$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start
#
# execute tests
#
-cd $SVNBASEDIR/jbossws-tests
+cd $JBWSDIR/jbossws-tests
ant $ENVIRONMENT clean tests 2>&1 | tee $WORKSPACE/tests.out
cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
#
# stop jbossas
#
-$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
</command>
</hudson.tasks.Shell>
</builders>
@@ -63,7 +63,7 @@
<locations>
<hudson.scm.SubversionSCM-ModuleLocation>
<remote>@svn.url@</remote>
- <local>@svn.basename@</local>
+ <local>jbossws</local>
</hudson.scm.SubversionSCM-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-5.0/config.xml 2007-05-09 17:10:57 UTC (rev 3020)
+++ trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-5.0/config.xml 2007-05-09 18:16:36 UTC (rev 3021)
@@ -7,50 +7,50 @@
# Module settings
#
MODULE=JBWS-Tests-AS-5.0
-SVNBASENAME=(a)svn.basename@
+
WORKSPACE=`pwd`
-SVNBASEDIR=$WORKSPACE/(a)svn.basename@
+JBWSDIR=$WORKSPACE/jbossws
JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@
ENVIRONMENT="-Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE"
#
# copy ant.properties
#
-cd $SVNBASEDIR/build
+cd $JBWSDIR/build
cp ant.properties.example ant.properties
#
# stop jbossas
#
-$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
# deploy to jboss
#
-ant $ENVIRONMENT clean deploy-jboss50
+ant $ENVIRONMENT clean deploy-jboss42
#
# start jbossas
#
-$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start
+$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start
#
# execute tests
#
-cd $SVNBASEDIR/jbossws-tests
+cd $JBWSDIR/jbossws-tests
ant $ENVIRONMENT clean tests 2>&1 | tee $WORKSPACE/tests.out
cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
#
# stop jbossas
#
-$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
</command>
</hudson.tasks.Shell>
</builders>
<publishers class="vector">
<hudson.tasks.junit.JUnitResultArchiver>
- <testResults>@svn.basename(a)/jbossws-tests/output/reports/*.xml</testResults>
+ <testResults>jbossws/jbossws-tests/output/reports/*.xml</testResults>
</hudson.tasks.junit.JUnitResultArchiver>
<hudson.tasks.Mailer>
<recipients>@hudson.mail.recipients@</recipients>
@@ -63,7 +63,7 @@
<locations>
<hudson.scm.SubversionSCM-ModuleLocation>
<remote>@svn.url@</remote>
- <local>@svn.basename@</local>
+ <local>jbossws</local>
</hudson.scm.SubversionSCM-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Tests-TC-5.5/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/JBWS-Tests-TC-5.5/config.xml 2007-05-09 17:10:57 UTC (rev 3020)
+++ trunk/build/hudson/hudson-home/jobs/JBWS-Tests-TC-5.5/config.xml 2007-05-09 18:16:36 UTC (rev 3021)
@@ -7,16 +7,16 @@
# Module settings
#
MODULE=JBWS-Tests-TC-5.5
-SVNBASENAME=(a)svn.basename@
+
WORKSPACE=`pwd`
-SVNBASEDIR=$WORKSPACE/(a)svn.basename@
+JBWSDIR=$WORKSPACE/jbossws
TOMCAT_INSTANCE=@hudson.home(a)/jobs/TC-5.5/workspace/apache-tomcat
ENVIRONMENT="-Djbossws.integration.target=tomcat -Dtomcat.home=$TOMCAT_INSTANCE"
#
# copy ant.properties
#
-cd $SVNBASEDIR/build
+cd $JBWSDIR/build
cp ant.properties.example ant.properties
#
@@ -37,7 +37,7 @@
#
# execute tests
#
-cd $SVNBASEDIR/jbossws-tests
+cd $JBWSDIR/jbossws-tests
ant $ENVIRONMENT clean main tests-samples 2>&1 | tee $WORKSPACE/tests.out
cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
@@ -63,7 +63,7 @@
<locations>
<hudson.scm.SubversionSCM-ModuleLocation>
<remote>@svn.url@</remote>
- <local>@svn.basename@</local>
+ <local>jbossws</local>
</hudson.scm.SubversionSCM-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
17 years, 8 months
- 1
- 0
JBossWS SVN: r3020 - in trunk: jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client and 11 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-05-09 13:10:57 -0400 (Wed, 09 May 2007)
New Revision: 3020
Added:
trunk/jbossws-core/src/java/org/jboss/ws/core/deployment/EventingDeployer.java
trunk/jbossws-core/src/java/org/jboss/ws/core/server/ContextServlet.java
trunk/jbossws-core/src/java/org/jboss/ws/core/server/PortComponentLinkServlet.java
trunk/jbossws-core/src/java/org/jboss/ws/extensions/eventing/deployment/EventingEndpointDeployment.java
Removed:
trunk/jbossws-core/src/java/org/jboss/ws/core/server/legacy/
trunk/jbossws-core/src/java/org/jboss/ws/extensions/eventing/deployment/EventingEndpoint.java
trunk/jbossws-core/src/java/org/jboss/ws/extensions/eventing/deployment/EventingEndpointDI.java
Modified:
trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactoryJAXRPC.java
trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceReferenceable.java
trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/spi/EndpointImpl.java
trunk/jbossws-core/src/java/org/jboss/ws/core/server/ManagedEndpointRegistry.java
trunk/jbossws-core/src/java/org/jboss/ws/core/soap/MessageFactoryImpl.java
trunk/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPMessageUnMarshaller.java
trunk/jbossws-core/src/java/org/jboss/ws/extensions/eventing/mgmt/EventingBuilder.java
trunk/jbossws-core/src/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java
trunk/jbossws-core/src/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManagerMBean.java
trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java
trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java
trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java
trunk/jbossws-tests/.classpath
trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1121/JBWS1121TestCase.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1178/JBWS1178TestCase.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/wseventing/SubscriptionManagerTestCase.java
Log:
Fix test regression
Added: trunk/jbossws-core/src/java/org/jboss/ws/core/deployment/EventingDeployer.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/deployment/EventingDeployer.java (rev 0)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/deployment/EventingDeployer.java 2007-05-09 17:10:57 UTC (rev 3020)
@@ -0,0 +1,92 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, 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.ws.core.deployment;
+
+//$Id$
+
+import org.jboss.ws.extensions.eventing.EventingConstants;
+import org.jboss.ws.extensions.eventing.deployment.EventingEndpointDeployment;
+import org.jboss.ws.extensions.eventing.metadata.EventingEpMetaExt;
+import org.jboss.ws.extensions.eventing.mgmt.SubscriptionManagerFactory;
+import org.jboss.ws.extensions.eventing.mgmt.SubscriptionManagerMBean;
+import org.jboss.ws.integration.Endpoint;
+import org.jboss.ws.integration.deployment.AbstractDeployer;
+import org.jboss.ws.integration.deployment.Deployment;
+import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
+
+/**
+ * A deployer that creates event sources and register them with the
+ * subscripion manager when a service endpoint is created.
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 25-Apr-2007
+ */
+public class EventingDeployer extends AbstractDeployer
+{
+ @Override
+ public void create(Deployment dep)
+ {
+ for (Endpoint ep : dep.getService().getEndpoints())
+ {
+ ServerEndpointMetaData sepMetaData = ep.getMetaData(ServerEndpointMetaData.class);
+ if (sepMetaData == null)
+ throw new IllegalStateException("Cannot obtain endpoint meta data");
+
+ EventingEpMetaExt ext = (EventingEpMetaExt)sepMetaData.getExtension(EventingConstants.NS_EVENTING);
+ if (ext != null)
+ {
+ // Currently several endpoints may belong to an event source deployment.
+ // Therefore we have to avoid duplicate registrations
+ // Actually there should be a 1:n mapping of event source NS to endpoints.
+ // See also http://jira.jboss.org/jira/browse/JBWS-770
+
+ // create pending incomplete event source
+ EventingEndpointDeployment desc = new EventingEndpointDeployment(ext.getEventSourceNS(), ext.getNotificationSchema(), ext.getNotificationRootElementNS());
+ desc.setEndpointAddress(sepMetaData.getEndpointAddress());
+ desc.setPortName(sepMetaData.getPortName());
+
+ SubscriptionManagerFactory factory = SubscriptionManagerFactory.getInstance();
+ SubscriptionManagerMBean manager = factory.getSubscriptionManager();
+ manager.registerEventSource(desc);
+ }
+ }
+ }
+
+ @Override
+ public void destroy(Deployment dep)
+ {
+ for (Endpoint ep : dep.getService().getEndpoints())
+ {
+ ServerEndpointMetaData sepMetaData = ep.getMetaData(ServerEndpointMetaData.class);
+ if (sepMetaData == null)
+ throw new IllegalStateException("Cannot obtain endpoint meta data");
+
+ EventingEpMetaExt ext = (EventingEpMetaExt)sepMetaData.getExtension(EventingConstants.NS_EVENTING);
+ if (ext != null)
+ {
+ SubscriptionManagerFactory factory = SubscriptionManagerFactory.getInstance();
+ SubscriptionManagerMBean manager = factory.getSubscriptionManager();
+ manager.removeEventSource(ext.getEventSourceURI());
+ }
+ }
+ }
+}
\ No newline at end of file
Property changes on: trunk/jbossws-core/src/java/org/jboss/ws/core/deployment/EventingDeployer.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactoryJAXRPC.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactoryJAXRPC.java 2007-05-09 17:09:16 UTC (rev 3019)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactoryJAXRPC.java 2007-05-09 17:10:57 UTC (rev 3020)
@@ -52,15 +52,16 @@
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
import org.jboss.ws.core.client.ServiceObjectFactory;
-import org.jboss.ws.core.server.legacy.ServiceEndpoint;
-import org.jboss.ws.core.server.legacy.ServiceEndpointManager;
-import org.jboss.ws.core.server.legacy.ServiceEndpointManagerFactory;
+import org.jboss.ws.integration.Endpoint;
+import org.jboss.ws.integration.management.EndpointRegistry;
+import org.jboss.ws.integration.management.EndpointRegistryFactory;
import org.jboss.ws.metadata.j2ee.serviceref.UnifiedCallPropertyMetaData;
import org.jboss.ws.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData;
import org.jboss.ws.metadata.j2ee.serviceref.UnifiedServiceRefMetaData;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMappingFactory;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
+import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
import org.jboss.ws.metadata.umdm.ServiceMetaData;
import org.jboss.ws.metadata.wsse.WSSecurityConfiguration;
@@ -181,13 +182,13 @@
String endpointAddress = null;
try
{
- ServiceEndpointManagerFactory factory = ServiceEndpointManagerFactory.getInstance();
- ServiceEndpointManager epManager = factory.getServiceEndpointManager();
- ServiceEndpoint serviceEndpoint = epManager.resolvePortComponentLink(pcLink);
- if (serviceEndpoint == null)
+ EndpointRegistry epRegistry = EndpointRegistryFactory.getEndpointRegistry();
+ Endpoint endpoint = epRegistry.resolvePortComponentLink(pcLink);
+ if (endpoint == null)
throw new WSException("Cannot resolve port-component-link: " + pcLink);
- endpointAddress = serviceEndpoint.getServiceEndpointInfo().getServerEndpointMetaData().getEndpointAddress();
+ ServerEndpointMetaData sepMetaData = endpoint.getMetaData(ServerEndpointMetaData.class);
+ endpointAddress = sepMetaData.getEndpointAddress();
}
catch (Throwable ex)
{
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceReferenceable.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceReferenceable.java 2007-05-09 17:09:16 UTC (rev 3019)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceReferenceable.java 2007-05-09 17:10:57 UTC (rev 3020)
@@ -36,8 +36,6 @@
import javax.naming.StringRefAddr;
import org.jboss.logging.Logger;
-import org.jboss.ws.core.server.legacy.ServiceEndpointManager;
-import org.jboss.ws.core.server.legacy.ServiceEndpointManagerFactory;
import org.jboss.ws.integration.UnifiedVirtualFile;
import org.jboss.ws.integration.management.ServerConfig;
import org.jboss.ws.integration.management.ServerConfigFactory;
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/spi/EndpointImpl.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/spi/EndpointImpl.java 2007-05-09 17:09:16 UTC (rev 3019)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/spi/EndpointImpl.java 2007-05-09 17:10:57 UTC (rev 3020)
@@ -43,8 +43,6 @@
import org.jboss.ws.core.jaxws.binding.BindingProviderImpl;
import org.jboss.ws.core.server.HttpContext;
import org.jboss.ws.core.server.HttpServer;
-import org.jboss.ws.core.server.legacy.ServiceEndpointManagerFactory;
-import org.jboss.ws.integration.management.ServerConfig;
import org.jboss.ws.integration.management.ServerConfigFactory;
import org.w3c.dom.Element;
Added: trunk/jbossws-core/src/java/org/jboss/ws/core/server/ContextServlet.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/server/ContextServlet.java (rev 0)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/server/ContextServlet.java 2007-05-09 17:10:57 UTC (rev 3020)
@@ -0,0 +1,175 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, 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.ws.core.server;
+
+// $Id$
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.net.URL;
+import java.util.Set;
+
+import javax.management.ObjectName;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.jboss.logging.Logger;
+import org.jboss.ws.integration.Endpoint;
+import org.jboss.ws.integration.management.EndpointRegistry;
+import org.jboss.ws.integration.management.EndpointRegistryFactory;
+import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
+
+/**
+ * The servlet that that is associated with context /jbossws
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 21-Mar-2005
+ */
+public class ContextServlet extends HttpServlet
+{
+ // provide logging
+ protected final Logger log = Logger.getLogger(ContextServlet.class);
+
+ protected EndpointRegistry epRegistry;
+
+ public void init(ServletConfig config) throws ServletException
+ {
+ super.init(config);
+ epRegistry = EndpointRegistryFactory.getEndpointRegistry();
+ }
+
+ /** Process GET requests.
+ */
+ public void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException
+ {
+ PrintWriter writer = res.getWriter();
+ res.setContentType("text/html");
+
+ writer.print("<html>");
+ setupHTMLResponseHeader(writer);
+
+ URL requestURL = new URL(req.getRequestURL().toString());
+
+ writer.print("<body>");
+
+ writer.print("<div class='pageHeader'>JBossWS/Services</div>");
+ writer.print("<div class='pageSection'>");
+ writer.print("<fieldset>");
+ writer.print("<legend><b>Registered Service Endpoints</b></legend>");
+ writer.print("<table>");
+
+ // begin iteration
+ Set<ObjectName> endpoints = epRegistry.getEndpoints();
+
+ if (endpoints.isEmpty())
+ {
+ writer.print("<tr>");
+ writer.print(" <td><h3>There are currently no endpoints deployed</h3></td>");
+ writer.print("</tr>");
+ }
+
+ for (ObjectName oname : endpoints)
+ {
+ Endpoint ep = epRegistry.getEndpoint(oname);
+ ServerEndpointMetaData sepMetaData = ep.getMetaData(ServerEndpointMetaData.class);
+
+ writer.print("<tr>");
+ writer.print(" <td>ServiceEndpointID</td>");
+ writer.print(" <td>" + ep.getName() + "</td>");
+ writer.print("</tr>");
+ writer.print("<tr>");
+ writer.print(" <td>ServiceEndpointAddress</td>");
+ writer.print(" <td><a href='" + sepMetaData.getEndpointAddress() + "?wsdl'>" + sepMetaData.getEndpointAddress() + "?wsdl</a></td>");
+ writer.print("</tr>");
+ writer.print("<tr>");
+ writer.print(" <td colspan=2>");
+ writer.print(" ");
+ writer.print("");
+ /*
+ writer.print("<table class='metrics'>");
+ writer.print("<tr>");
+ writer.print(" <td>StartTime</td>");
+ writer.print(" <td>StopTime</td>");
+ writer.print(" <td></td>");
+ writer.print("</tr>");
+ writer.print("<tr>");
+ writer.print(" <td>" + ep.getSeMetrics().getStartTime() + "</td>");
+
+ String stopTime = ep.getSeMetrics().getStopTime() != null ? ep.getSeMetrics().getStopTime().toString() : "";
+ writer.print(" <td>" + stopTime + "</td>");
+ writer.print(" <td></td>");
+ writer.print("</tr>");
+ writer.print("<tr>");
+
+ writer.print(" <td>RequestCount</td>");
+ writer.print(" <td>ResponseCount</td>");
+ writer.print(" <td>FaultCount</td>");
+ writer.print("</tr>");
+ writer.print("<tr>");
+ writer.print(" <td>" + ep.getSeMetrics().getRequestCount() + "</td>");
+ writer.print(" <td>" + ep.getSeMetrics().getResponseCount() + "</td>");
+ writer.print(" <td>" + ep.getSeMetrics().getFaultCount() + "</td>");
+ writer.print("</tr>");
+ writer.print("<tr>");
+ writer.print(" <td>MinProcessingTime</td>");
+ writer.print(" <td>MaxProcessingTime</td>");
+ writer.print(" <td>AvgProcessingTime</td>");
+ writer.print("</tr>");
+ writer.print("<tr>");
+ writer.print(" <td>" + ep.getSeMetrics().getMinProcessingTime() + "</td>");
+ writer.print(" <td>" + ep.getSeMetrics().getMaxProcessingTime() + "</td>");
+ writer.print(" <td>" + ep.getSeMetrics().getAverageProcessingTime() + "</td>");
+ writer.print("</tr>");
+ writer.print("");
+ writer.print("");
+ writer.print("</table>");
+ */
+ writer.print("");
+ writer.print(" </td>");
+ writer.print("</tr>");
+
+ writer.print("<tr><td colspan='3'> </td></tr>");
+ }
+ // end iteration
+ writer.print("</table>");
+ writer.print("");
+ writer.print("</fieldset>");
+ writer.print("</div>");
+
+ writer.print("</body>");
+ writer.print("</html>");
+ writer.close();
+ }
+
+ private void setupHTMLResponseHeader(PrintWriter writer)
+ {
+ Package wsPackage = Package.getPackage("org.jboss.ws");
+ writer.println("<head>");
+ writer.println("<meta http-equiv='Content-Type content='text/html; charset=iso-8859-1'>");
+ writer.println("<title>JBossWS / " + wsPackage.getImplementationVersion() + "</title>");
+ writer.println("<link rel='stylesheet' href='./styles.css'>");
+ writer.println("</head>");
+ }
+}
Property changes on: trunk/jbossws-core/src/java/org/jboss/ws/core/server/ContextServlet.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/server/ManagedEndpointRegistry.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/server/ManagedEndpointRegistry.java 2007-05-09 17:09:16 UTC (rev 3019)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/server/ManagedEndpointRegistry.java 2007-05-09 17:10:57 UTC (rev 3020)
@@ -27,9 +27,12 @@
import javax.management.MBeanServer;
import javax.management.MBeanServerFactory;
+import javax.management.ObjectName;
import org.jboss.logging.Logger;
+import org.jboss.ws.integration.Endpoint;
import org.jboss.ws.integration.management.BasicEndpointRegistry;
+import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
import org.jboss.ws.metadata.umdm.UnifiedMetaData;
/**
@@ -48,6 +51,44 @@
return UnifiedMetaData.getImplementationVersion();
}
+ /** Resolve a port-component-link, like:
+ *
+ * [deployment.war]#PortComponentName
+ * [deployment.jar]#PortComponentName
+ *
+ */
+ public Endpoint resolvePortComponentLink(String pcLink)
+ {
+ String pcName = pcLink;
+ int hashIndex = pcLink.indexOf("#");
+ if (hashIndex > 0)
+ {
+ pcName = pcLink.substring(hashIndex + 1);
+ }
+
+ Endpoint endpoint = null;
+ for (ObjectName sepID : getEndpoints())
+ {
+ Endpoint auxEndpoint = getEndpoint(sepID);
+ ServerEndpointMetaData sepMetaData = auxEndpoint.getMetaData(ServerEndpointMetaData.class);
+ if (pcName.equals(sepMetaData.getPortComponentName()))
+ {
+ if (endpoint != null)
+ {
+ log.warn("Multiple service endoints found for: " + pcLink);
+ endpoint = null;
+ break;
+ }
+ endpoint = auxEndpoint;
+ }
+ }
+
+ if (endpoint == null)
+ log.warn("No ServiceEndpoint found for pcLink: " + pcLink);
+
+ return endpoint;
+ }
+
public void create() throws Exception
{
log.info(UnifiedMetaData.getImplementationVersion());
Copied: trunk/jbossws-core/src/java/org/jboss/ws/core/server/PortComponentLinkServlet.java (from rev 3007, trunk/jbossws-core/src/java/org/jboss/ws/core/server/legacy/PortComponentLinkServlet.java)
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/server/PortComponentLinkServlet.java (rev 0)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/server/PortComponentLinkServlet.java 2007-05-09 17:10:57 UTC (rev 3020)
@@ -0,0 +1,93 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, 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.ws.core.server;
+
+// $Id$
+
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.jboss.logging.Logger;
+import org.jboss.ws.WSException;
+import org.jboss.ws.integration.Endpoint;
+import org.jboss.ws.integration.management.EndpointRegistry;
+import org.jboss.ws.integration.management.EndpointRegistryFactory;
+import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
+
+/**
+ * A servlet that reports the serviceURL for a given service ID.
+ * <p/>
+ * When the web service client ENC is setup, it may contain port-component-link
+ * entries that point to service endpoints in the same top level deployment.
+ * The final serviceURL of those endpoints will become available after the
+ * reference to the javax.xml.rpc.Service is bound to JNDI.
+ * <p/>
+ * When the client does a lookup of the javax.xml.rpc.Service from JNDI the ObjectFactory
+ * will contact this servlet for the final serviceURL. It is acceptable that the client
+ * wsdl does not contain the correct serviceURL if the client is using the port-component-link element.
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 29-May-2004
+ */
+public class PortComponentLinkServlet extends HttpServlet
+{
+ // provide logging
+ private static final Logger log = Logger.getLogger(PortComponentLinkServlet.class);
+
+ protected EndpointRegistry epRegistry;
+
+ public void init(ServletConfig config) throws ServletException
+ {
+ super.init(config);
+ epRegistry = EndpointRegistryFactory.getEndpointRegistry();
+ }
+
+ /**
+ * Get the serviceURL as string for a given serviceID.
+ */
+ public void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException
+ {
+ String pcLink = req.getParameter("pcLink");
+ if (pcLink == null)
+ throw new IllegalArgumentException("Cannot obtain request parameter 'pcLink'");
+
+ Endpoint endpoint = epRegistry.resolvePortComponentLink(pcLink);
+ if (endpoint == null)
+ throw new WSException("Cannot resolve port-component-link: " + pcLink);
+
+ res.setContentType("text/plain");
+ PrintWriter out = res.getWriter();
+
+ ServerEndpointMetaData sepMetaData = endpoint.getMetaData(ServerEndpointMetaData.class);
+ String endpointAddress = sepMetaData.getEndpointAddress();
+ out.println(endpointAddress);
+
+ log.debug("Resolved " + pcLink + " to: " + endpointAddress);
+ out.close();
+ }
+}
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/soap/MessageFactoryImpl.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/soap/MessageFactoryImpl.java 2007-05-09 17:09:16 UTC (rev 3019)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/soap/MessageFactoryImpl.java 2007-05-09 17:10:57 UTC (rev 3020)
@@ -179,7 +179,7 @@
return createMessage(mimeHeaders, ins, false);
}
- public SOAPMessage createMessage(MimeHeaders mimeHeaders, InputStream ins, boolean ignoreParseError) throws IOException, SOAPException
+ public SOAPMessage createMessage(MimeHeaders mimeHeaders, InputStream inputStream, boolean ignoreParseError) throws IOException, SOAPException
{
if (mimeHeaders == null)
{
@@ -196,63 +196,65 @@
}
ContentType contentType = getContentType(mimeHeaders);
- if (log.isDebugEnabled())
- log.debug("createMessage: [contentType=" + contentType + "]");
+ log.debug("createMessage: [contentType=" + contentType + "]");
- // Debug the incoming message
- if (log.isTraceEnabled())
+ SOAPMessageImpl soapMessage = new SOAPMessageImpl();
+ if (inputStream != null)
{
- ByteArrayOutputStream baos = new ByteArrayOutputStream(1024);
- IOUtils.copyStream(baos, ins);
- byte[] bytes = baos.toByteArray();
+ // Debug the incoming message
+ if (log.isTraceEnabled())
+ {
+ ByteArrayOutputStream baos = new ByteArrayOutputStream(1024);
+ IOUtils.copyStream(baos, inputStream);
+ byte[] bytes = baos.toByteArray();
- log.trace("createMessage\n" + new String(bytes));
- ins = new ByteArrayInputStream(bytes);
- }
+ log.trace("createMessage\n" + new String(bytes));
+ inputStream = new ByteArrayInputStream(bytes);
+ }
- Collection<AttachmentPart> attachments = null;
- if (isMultipartRelatedContent(contentType))
- {
- MultipartRelatedDecoder decoder;
- try
+ Collection<AttachmentPart> attachments = null;
+ if (isMultipartRelatedContent(contentType))
{
- decoder = new MultipartRelatedDecoder(contentType);
- decoder.decodeMultipartRelatedMessage(ins);
+ MultipartRelatedDecoder decoder;
+ try
+ {
+ decoder = new MultipartRelatedDecoder(contentType);
+ decoder.decodeMultipartRelatedMessage(inputStream);
+ }
+ catch (RuntimeException rte)
+ {
+ throw rte;
+ }
+ catch (IOException ex)
+ {
+ throw ex;
+ }
+ catch (Exception ex)
+ {
+ throw new SOAPException("Cannot decode multipart related message", ex);
+ }
+
+ inputStream = decoder.getRootPart().getDataHandler().getInputStream();
+ attachments = decoder.getRelatedParts();
}
- catch (RuntimeException rte)
+ else if (isSoapContent(contentType) == false)
{
- throw rte;
+ throw new SOAPException("Unsupported content type: " + contentType);
}
- catch (IOException ex)
- {
- throw ex;
- }
- catch (Exception ex)
- {
- throw new SOAPException("Cannot decode multipart related message", ex);
- }
- ins = decoder.getRootPart().getDataHandler().getInputStream();
- attachments = decoder.getRelatedParts();
- }
- else if (isSoapContent(contentType) == false)
- {
- throw new SOAPException("Unsupported content type: " + contentType);
- }
+ if (mimeHeaders != null)
+ soapMessage.setMimeHeaders(mimeHeaders);
- SOAPMessageImpl soapMessage = new SOAPMessageImpl();
- if (mimeHeaders != null)
- soapMessage.setMimeHeaders(mimeHeaders);
+ if (attachments != null)
+ soapMessage.setAttachments(attachments);
- if (attachments != null)
- soapMessage.setAttachments(attachments);
+ // Get the SOAPEnvelope builder
+ EnvelopeBuilder envBuilder = new EnvelopeBuilderDOM(getStyle());
- // Get the SOAPEnvelope builder
- EnvelopeBuilder envBuilder = new EnvelopeBuilderDOM(getStyle());
+ // Build the payload
+ envBuilder.build(soapMessage, inputStream, ignoreParseError);
+ }
- // Build the payload
- envBuilder.build(soapMessage, ins, ignoreParseError);
-
return soapMessage;
}
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPMessageUnMarshaller.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPMessageUnMarshaller.java 2007-05-09 17:09:16 UTC (rev 3019)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPMessageUnMarshaller.java 2007-05-09 17:10:57 UTC (rev 3020)
@@ -60,9 +60,7 @@
public Object read(InputStream inputStream, Map metadata) throws IOException, ClassNotFoundException
{
if (log.isTraceEnabled())
- {
log.trace("Read input stream with metadata=" + metadata);
- }
try
{
@@ -73,6 +71,7 @@
MimeHeaders mimeHeaders = getMimeHeaders(metadata);
SOAPMessage soapMsg = new MessageFactoryImpl().createMessage(mimeHeaders, inputStream, true);
+
return soapMsg;
}
catch (SOAPException e)
Deleted: trunk/jbossws-core/src/java/org/jboss/ws/extensions/eventing/deployment/EventingEndpoint.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/extensions/eventing/deployment/EventingEndpoint.java 2007-05-09 17:09:16 UTC (rev 3019)
+++ trunk/jbossws-core/src/java/org/jboss/ws/extensions/eventing/deployment/EventingEndpoint.java 2007-05-09 17:10:57 UTC (rev 3020)
@@ -1,70 +0,0 @@
-package org.jboss.ws.extensions.eventing.deployment;
-
-import org.jboss.ws.WSException;
-import org.jboss.ws.core.server.legacy.ServiceEndpoint;
-import org.jboss.ws.core.server.legacy.ServiceEndpointInfo;
-import org.jboss.ws.extensions.eventing.EventingConstants;
-import org.jboss.ws.extensions.eventing.metadata.EventingEpMetaExt;
-import org.jboss.ws.extensions.eventing.mgmt.SubscriptionManagerFactory;
-import org.jboss.ws.extensions.eventing.mgmt.SubscriptionManagerMBean;
-import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
-
-/**
- * EventingEndpointLifecycle is responsible to create event sources
- * and register them with the subscripion manager when a service endpoint is created.
- *
- * @author Heiko Braun, <heiko(a)openj.net>
- * @since 22-Mar-2006
- */
-public class EventingEndpoint extends ServiceEndpoint
-{
- // encupsulates access to subscription manager
- private SubscriptionManagerFactory factory = SubscriptionManagerFactory.getInstance();
-
- public EventingEndpoint(ServiceEndpointInfo seInfo)
- {
- super(seInfo);
- }
-
- /**
- * Register event source with subscription manager.
- */
- public void create() throws Exception
- {
- super.create();
-
- ServerEndpointMetaData epMetaData = seInfo.getServerEndpointMetaData();
- EventingEpMetaExt ext = (EventingEpMetaExt)epMetaData.getExtension(EventingConstants.NS_EVENTING);
- if (null == ext)
- throw new WSException("Cannot obtain eventing meta data");
-
- // Currently several endpoints may belong to an event source deployment.
- // Therefore we have to avoid duplicate registrations
- // Actually there should be a 1:n mapping of event source NS to endpoints.
- // See also http://jira.jboss.org/jira/browse/JBWS-770
-
- // create pending incomplete event source
- EventingEndpointDI desc = new EventingEndpointDI(ext.getEventSourceNS(), ext.getNotificationSchema(), ext.getNotificationRootElementNS());
- desc.setEndpointAddress(epMetaData.getEndpointAddress());
- desc.setPortName(epMetaData.getPortName());
-
- SubscriptionManagerMBean manager = factory.getSubscriptionManager();
- manager.registerEventSource(desc);
- }
-
- /**
- * Unregister event source with subscription manager.
- */
- public void destroy()
- {
- ServerEndpointMetaData epMetaData = seInfo.getServerEndpointMetaData();
- EventingEpMetaExt ext = (EventingEpMetaExt)epMetaData.getExtension(EventingConstants.NS_EVENTING);
- if (null == ext)
- throw new WSException("Cannot obtain eventing meta data");
-
- SubscriptionManagerMBean manager = factory.getSubscriptionManager();
- manager.removeEventSource(ext.getEventSourceURI());
-
- super.destroy();
- }
-}
Deleted: trunk/jbossws-core/src/java/org/jboss/ws/extensions/eventing/deployment/EventingEndpointDI.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/extensions/eventing/deployment/EventingEndpointDI.java 2007-05-09 17:09:16 UTC (rev 3019)
+++ trunk/jbossws-core/src/java/org/jboss/ws/extensions/eventing/deployment/EventingEndpointDI.java 2007-05-09 17:10:57 UTC (rev 3020)
@@ -1,64 +0,0 @@
-package org.jboss.ws.extensions.eventing.deployment;
-
-import javax.xml.namespace.QName;
-
-/**
- * Eventsource endpoint deployment info.
- *
- * @author Heiko Braun, <heiko(a)openj.net>
- * @since 18-Jan-2006
- */
-public class EventingEndpointDI {
-
- /* event source URI */
- private String name;
-
- private QName portName;
-
- // event source endpoint address
- private String endpointAddress;
-
- /* notification schema */
- private String[] schema;
-
- private String notificationRootElementNS;
-
- public EventingEndpointDI(String name, String[] schema, String notificationRootElementNS) {
- this.name = name;
- this.schema = schema;
- this.notificationRootElementNS = notificationRootElementNS;
- }
-
- public QName getPortName() {
- return portName;
- }
-
- public void setPortName(QName portName) {
- this.portName = portName;
- }
-
- public String getName() {
- return name;
- }
-
- public String[] getSchema() {
- return schema;
- }
-
- public String getEndpointAddress() {
- return endpointAddress;
- }
-
- public void setEndpointAddress(String endpointAddress) {
- this.endpointAddress = endpointAddress;
- }
-
- public String getNotificationRootElementNS() {
- return notificationRootElementNS;
- }
-
- public void setNotificationRootElementNS(String notificationRootElementNS) {
- this.notificationRootElementNS = notificationRootElementNS;
- }
-
-}
Copied: trunk/jbossws-core/src/java/org/jboss/ws/extensions/eventing/deployment/EventingEndpointDeployment.java (from rev 3007, trunk/jbossws-core/src/java/org/jboss/ws/extensions/eventing/deployment/EventingEndpointDI.java)
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/extensions/eventing/deployment/EventingEndpointDeployment.java (rev 0)
+++ trunk/jbossws-core/src/java/org/jboss/ws/extensions/eventing/deployment/EventingEndpointDeployment.java 2007-05-09 17:10:57 UTC (rev 3020)
@@ -0,0 +1,73 @@
+package org.jboss.ws.extensions.eventing.deployment;
+
+import javax.xml.namespace.QName;
+
+/**
+ * Eventsource endpoint deployment info.
+ *
+ * @author Heiko Braun, <heiko(a)openj.net>
+ * @since 18-Jan-2006
+ */
+public class EventingEndpointDeployment
+{
+ /* event source URI */
+ private String name;
+
+ private QName portName;
+
+ // event source endpoint address
+ private String endpointAddress;
+
+ /* notification schema */
+ private String[] schema;
+
+ private String notificationRootElementNS;
+
+ public EventingEndpointDeployment(String name, String[] schema, String notificationRootElementNS)
+ {
+ this.name = name;
+ this.schema = schema;
+ this.notificationRootElementNS = notificationRootElementNS;
+ }
+
+ public QName getPortName()
+ {
+ return portName;
+ }
+
+ public void setPortName(QName portName)
+ {
+ this.portName = portName;
+ }
+
+ public String getName()
+ {
+ return name;
+ }
+
+ public String[] getSchema()
+ {
+ return schema;
+ }
+
+ public String getEndpointAddress()
+ {
+ return endpointAddress;
+ }
+
+ public void setEndpointAddress(String endpointAddress)
+ {
+ this.endpointAddress = endpointAddress;
+ }
+
+ public String getNotificationRootElementNS()
+ {
+ return notificationRootElementNS;
+ }
+
+ public void setNotificationRootElementNS(String notificationRootElementNS)
+ {
+ this.notificationRootElementNS = notificationRootElementNS;
+ }
+
+}
Modified: trunk/jbossws-core/src/java/org/jboss/ws/extensions/eventing/mgmt/EventingBuilder.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/extensions/eventing/mgmt/EventingBuilder.java 2007-05-09 17:09:16 UTC (rev 3019)
+++ trunk/jbossws-core/src/java/org/jboss/ws/extensions/eventing/mgmt/EventingBuilder.java 2007-05-09 17:10:57 UTC (rev 3020)
@@ -5,7 +5,7 @@
import org.jboss.ws.WSException;
import org.jboss.ws.extensions.eventing.EventingConstants;
-import org.jboss.ws.extensions.eventing.deployment.EventingEndpointDI;
+import org.jboss.ws.extensions.eventing.deployment.EventingEndpointDeployment;
/**
* @author Heiko Braun, <heiko(a)openj.net>
@@ -20,7 +20,7 @@
return new EventingBuilder();
}
- public EventSource newEventSource(EventingEndpointDI desc) {
+ public EventSource newEventSource(EventingEndpointDeployment desc) {
URI eventSourceNS = newEventSourceURI(desc.getName());
EventSource eventSource = new EventSource(desc.getName(), eventSourceNS, desc.getSchema(), desc.getNotificationRootElementNS());
eventSource.getSupportedFilterDialects().add(EventingConstants.getDefaultFilterDialect());
Modified: trunk/jbossws-core/src/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java 2007-05-09 17:09:16 UTC (rev 3019)
+++ trunk/jbossws-core/src/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java 2007-05-09 17:10:57 UTC (rev 3020)
@@ -57,7 +57,7 @@
import org.jboss.ws.core.utils.DOMWriter;
import org.jboss.ws.core.utils.UUIDGenerator;
import org.jboss.ws.extensions.eventing.EventingConstants;
-import org.jboss.ws.extensions.eventing.deployment.EventingEndpointDI;
+import org.jboss.ws.extensions.eventing.deployment.EventingEndpointDeployment;
import org.jboss.ws.extensions.eventing.jaxws.AttributedURIType;
import org.jboss.ws.extensions.eventing.jaxws.EndpointReferenceType;
import org.jboss.ws.extensions.eventing.jaxws.ReferenceParametersType;
@@ -97,8 +97,6 @@
private static final Logger log = Logger.getLogger(SubscriptionManager.class);
- public static final ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.ws:service=SubscriptionManager,module=eventing");
-
/**
* Maps event source namespaces to event source instances.
*/
@@ -214,7 +212,7 @@
/**
* A two phase deployment process.
*/
- public void registerEventSource(EventingEndpointDI deploymentInfo)
+ public void registerEventSource(EventingEndpointDeployment deploymentInfo)
{
// workaround for JBWS-1006
lazyBindEventDispatcher();
@@ -263,7 +261,7 @@
* @param deploymentInfo
* @param eventSource
*/
- private static void updateManagerAddress(EventingEndpointDI deploymentInfo, EventSource eventSource)
+ private static void updateManagerAddress(EventingEndpointDeployment deploymentInfo, EventSource eventSource)
{
String addr = null;
if(deploymentInfo.getPortName().getLocalPart().equals("SubscriptionManagerPort"))
Modified: trunk/jbossws-core/src/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManagerMBean.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManagerMBean.java 2007-05-09 17:09:16 UTC (rev 3019)
+++ trunk/jbossws-core/src/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManagerMBean.java 2007-05-09 17:10:57 UTC (rev 3020)
@@ -27,8 +27,11 @@
import java.util.Date;
import java.util.List;
-import org.jboss.ws.extensions.eventing.deployment.EventingEndpointDI;
+import javax.management.ObjectName;
+
+import org.jboss.ws.extensions.eventing.deployment.EventingEndpointDeployment;
import org.jboss.ws.extensions.eventing.jaxws.EndpointReferenceType;
+import org.jboss.ws.integration.ObjectNameFactory;
import org.w3c.dom.Element;
/**
@@ -37,8 +40,10 @@
*/
public interface SubscriptionManagerMBean
{
- public static final String BEAN_NAME = "SubscriptionManager";
+ static final ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.ws:service=SubscriptionManager,module=eventing");
+ static final String BEAN_NAME = "WSSubscriptionManager";
+
/**
* Returns the core number of threads.
*
@@ -92,7 +97,7 @@
// notification API
void dispatch(URI eventSourceNS, Element payload);
- void registerEventSource(EventingEndpointDI deploymentInfo);
+ void registerEventSource(EventingEndpointDeployment deploymentInfo);
void removeEventSource(URI eventSourceNS);
Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2007-05-09 17:09:16 UTC (rev 3019)
+++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2007-05-09 17:10:57 UTC (rev 3020)
@@ -48,17 +48,14 @@
import org.jboss.ws.WSException;
import org.jboss.ws.core.deployment.UnifiedDeploymentInfo;
import org.jboss.ws.core.jaxrpc.Use;
-import org.jboss.ws.core.server.legacy.ServiceEndpointManager;
-import org.jboss.ws.core.server.legacy.ServiceEndpointManagerFactory;
-import org.jboss.ws.integration.ObjectNameFactory;
-import org.jboss.ws.integration.management.ServerConfig;
-import org.jboss.ws.integration.management.ServerConfigFactory;
import org.jboss.ws.extensions.addressing.AddressingPropertiesImpl;
import org.jboss.ws.extensions.addressing.metadata.AddressingOpMetaExt;
import org.jboss.ws.extensions.eventing.EventingConstants;
import org.jboss.ws.extensions.eventing.EventingUtils;
-import org.jboss.ws.extensions.eventing.deployment.EventingEndpoint;
import org.jboss.ws.extensions.eventing.metadata.EventingEpMetaExt;
+import org.jboss.ws.integration.ObjectNameFactory;
+import org.jboss.ws.integration.management.ServerConfig;
+import org.jboss.ws.integration.management.ServerConfigFactory;
import org.jboss.ws.metadata.j2ee.UnifiedApplicationMetaData;
import org.jboss.ws.metadata.j2ee.UnifiedBeanMetaData;
import org.jboss.ws.metadata.j2ee.UnifiedEjbPortComponentMetaData;
@@ -161,10 +158,10 @@
String wsContextRoot = applMetaData.getWebServiceContextRoot();
if (wsContextRoot != null)
contextRoot = wsContextRoot;
-
+
String ejbClass = beanMetaData.getEjbClass();
String ejbClassName = WSDLUtils.getJustClassName(ejbClass);
-
+
UnifiedEjbPortComponentMetaData ejbpcMetaData = beanMetaData.getPortComponent();
if (ejbpcMetaData != null && ejbpcMetaData.getPortComponentURI() != null)
{
@@ -182,7 +179,7 @@
}
}
}
-
+
if (contextRoot == null)
contextRoot = ejbClassName + "Service";
if (urlPattern == null)
@@ -493,9 +490,7 @@
ext.setEventSourceNS(eventSourceNS);
ext.setNotificationSchema(notificationSchema);
ext.setNotificationRootElementNS(notificationRootElementNS);
-
sepMetaData.addExtension(ext);
- sepMetaData.setManagedEndpointBean(EventingEndpoint.class.getName());
}
}
}
Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java 2007-05-09 17:09:16 UTC (rev 3019)
+++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java 2007-05-09 17:10:57 UTC (rev 3020)
@@ -63,8 +63,6 @@
private String transportGuarantee;
// The optional secure wsdl access
private boolean secureWSDLAccess;
- // The bean that registers with the ServiceEndpointManager
- private String managedEndpointBean = "org.jboss.ws.core.server.ServiceEndpoint";
public ServerEndpointMetaData(ServiceMetaData service, QName portName, QName portTypeName, Type type)
{
@@ -173,16 +171,6 @@
this.secureWSDLAccess = secureWSDLAccess;
}
- public String getManagedEndpointBean()
- {
- return managedEndpointBean;
- }
-
- public void setManagedEndpointBean(String managedEndpointBean)
- {
- this.managedEndpointBean = managedEndpointBean;
- }
-
public String toString()
{
StringBuilder buffer = new StringBuilder("\nServerEndpointMetaData:");
Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java 2007-05-09 17:09:16 UTC (rev 3019)
+++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java 2007-05-09 17:10:57 UTC (rev 3020)
@@ -30,7 +30,7 @@
import java.util.StringTokenizer;
import org.jboss.logging.Logger;
-import org.jboss.ws.core.server.legacy.ServiceEndpointManager;
+import org.jboss.ws.core.server.ManagedEndpointRegistry;
import org.jboss.ws.integration.UnifiedVirtualFile;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
@@ -186,7 +186,8 @@
{
if (eagerInitialized == false)
{
- if(log.isDebugEnabled()) log.debug("Eagerly initialize the meta data model");
+ if (log.isDebugEnabled())
+ log.debug("Eagerly initialize the meta data model");
for (ServiceMetaData service : services)
{
service.eagerInitialize();
@@ -199,7 +200,7 @@
{
if (implementationVersion == null)
{
- implementationVersion = ServiceEndpointManager.class.getPackage().getImplementationVersion();
+ implementationVersion = ManagedEndpointRegistry.class.getPackage().getImplementationVersion();
if (implementationVersion != null)
isFinalRelease = new StringTokenizer(implementationVersion).nextToken().endsWith(".GA");
}
Modified: trunk/jbossws-tests/.classpath
===================================================================
--- trunk/jbossws-tests/.classpath 2007-05-09 17:09:16 UTC (rev 3019)
+++ trunk/jbossws-tests/.classpath 2007-05-09 17:10:57 UTC (rev 3020)
@@ -38,5 +38,7 @@
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-common-core.jar" sourcepath="/build/thirdparty/jboss-common-core-sources.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/jbossws-spi"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/jbws-jboss42"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/jbws-jboss50"/>
<classpathentry kind="output" path="output-eclipse"/>
</classpath>
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1121/JBWS1121TestCase.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1121/JBWS1121TestCase.java 2007-05-09 17:09:16 UTC (rev 3019)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1121/JBWS1121TestCase.java 2007-05-09 17:10:57 UTC (rev 3020)
@@ -30,13 +30,14 @@
import org.jboss.test.ws.JBossWSTestSetup;
/**
- * Test case to test that the call can be made when the client
- * was deployed with an issolated classloader.
+ * Client security configuration not loaded when client deployed with issolated classloader
*
* If the client has not picked up the config it will send the
* message without security headers which will cause the call
* to fail.
*
+ * http://jira.jboss.org/jira/browse/JBWS-1121
+ *
* @author darran.lofthouse(a)jboss.com
* @since 03-August-2006
*/
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1178/JBWS1178TestCase.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1178/JBWS1178TestCase.java 2007-05-09 17:09:16 UTC (rev 3019)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1178/JBWS1178TestCase.java 2007-05-09 17:10:57 UTC (rev 3020)
@@ -35,6 +35,7 @@
import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.ws.core.jaxrpc.client.CallImpl;
+import org.jboss.ws.core.server.ManagedServerConfigMBean;
/**
* [JBWS-1178] Multiple virtual host and soap:address problem
@@ -54,7 +55,7 @@
public void setUp() throws Exception
{
- ObjectName objectName = new ObjectName("jboss.ws:service=ServiceEndpointManager");
+ ObjectName objectName = ManagedServerConfigMBean.OBJECT_NAME;
webServiceHost = (String)getServer().getAttribute(objectName, "WebServiceHost");
// Setting the WebServiceHost to an empty string, causes the request host to be used
getServer().setAttribute(objectName, new Attribute("WebServiceHost", ""));
@@ -62,7 +63,7 @@
public void tearDown() throws Exception
{
- ObjectName objectName = new ObjectName("jboss.ws:service=ServiceEndpointManager");
+ ObjectName objectName = ManagedServerConfigMBean.OBJECT_NAME;
getServer().setAttribute(objectName, new Attribute("WebServiceHost", webServiceHost));
}
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/wseventing/SubscriptionManagerTestCase.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/wseventing/SubscriptionManagerTestCase.java 2007-05-09 17:09:16 UTC (rev 3019)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/wseventing/SubscriptionManagerTestCase.java 2007-05-09 17:10:57 UTC (rev 3020)
@@ -31,7 +31,7 @@
import org.jboss.test.ws.JBossWSTest;
import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.extensions.eventing.EventingConstants;
-import org.jboss.ws.extensions.eventing.deployment.EventingEndpointDI;
+import org.jboss.ws.extensions.eventing.deployment.EventingEndpointDeployment;
import org.jboss.ws.extensions.eventing.jaxws.AttributedURIType;
import org.jboss.ws.extensions.eventing.jaxws.EndpointReferenceType;
import org.jboss.ws.extensions.eventing.mgmt.Filter;
@@ -82,7 +82,7 @@
{
try
{
- EventingEndpointDI deploymentInfo = new EventingEndpointDI("http://schemas.xmlsoap.org/ws/2004/08/eventing/Warnings", null, null);
+ EventingEndpointDeployment deploymentInfo = new EventingEndpointDeployment("http://schemas.xmlsoap.org/ws/2004/08/eventing/Warnings", null, null);
deploymentInfo.setEndpointAddress("http://localhost:8080/jaxws-wseventing/manage");
deploymentInfo.setPortName(new QName("http://schemas.xmlsoap.org/ws/2004/08/eventing","SubscriptionManagerPort"));
17 years, 8 months
- 1
- 0
JBossWS SVN: r3019 - in projects/wsintegration: jbws-jboss42/trunk and 8 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-05-09 13:09:16 -0400 (Wed, 09 May 2007)
New Revision: 3019
Removed:
projects/wsintegration/jbws-jboss42/trunk/src/main/java/org/jboss/ws/integration/jboss42/jbossws/PortComponentLinkServlet.java
Modified:
projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/management/BasicEndpointRegistry.java
projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/management/EndpointRegistry.java
projects/wsintegration/jbws-jboss42/trunk/.classpath
projects/wsintegration/jbws-jboss42/trunk/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.ws.extensions.security.SecurityAssociationAdaptorFactory
projects/wsintegration/jbws-jboss50/trunk/build.xml
projects/wsintegration/jbws-jboss50/trunk/src/main/etc/ant-import/build-deploy.xml
projects/wsintegration/jbws-jboss50/trunk/src/main/etc/ant-import/build-thirdparty.xml
projects/wsintegration/jbws-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/jbossws/DeploymentInfoAdapter.java
projects/wsintegration/jbws-jboss50/trunk/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.ws.extensions.security.SecurityAssociationAdaptorFactory
projects/wsintegration/jbws-jboss50/trunk/src/main/resources/jbossws.sar/META-INF/jbossws-beans.xml
projects/wsintegration/jbws-jboss50/trunk/src/main/resources/jbossws.war/WEB-INF/web.xml
Log:
Fix test regression
Modified: projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/management/BasicEndpointRegistry.java
===================================================================
--- projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/management/BasicEndpointRegistry.java 2007-05-09 16:02:45 UTC (rev 3018)
+++ projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/management/BasicEndpointRegistry.java 2007-05-09 17:09:16 UTC (rev 3019)
@@ -64,6 +64,7 @@
import javax.management.ObjectName;
import org.jboss.logging.Logger;
+import org.jboss.util.NotImplementedException;
import org.jboss.ws.integration.Endpoint;
/**
@@ -91,6 +92,11 @@
return endpoint;
}
+ public Endpoint resolvePortComponentLink(String pcLink)
+ {
+ throw new NotImplementedException();
+ }
+
public boolean isRegistered(ObjectName epName)
{
if (epName == null)
Modified: projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/management/EndpointRegistry.java
===================================================================
--- projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/management/EndpointRegistry.java 2007-05-09 16:02:45 UTC (rev 3018)
+++ projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/management/EndpointRegistry.java 2007-05-09 17:09:16 UTC (rev 3019)
@@ -80,6 +80,9 @@
/** Get the registered endpoint */
Endpoint getEndpoint(ObjectName epName);
+ /** Resolve a port component link */
+ Endpoint resolvePortComponentLink(String pcLink);
+
/** True is an endpoint for that name is registered */
boolean isRegistered(ObjectName epName);
Modified: projects/wsintegration/jbws-jboss42/trunk/.classpath
===================================================================
--- projects/wsintegration/jbws-jboss42/trunk/.classpath 2007-05-09 16:02:45 UTC (rev 3018)
+++ projects/wsintegration/jbws-jboss42/trunk/.classpath 2007-05-09 17:09:16 UTC (rev 3019)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry excluding="org/jboss/ws/integration/jboss42/jms/" kind="src" path="src/main/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry combineaccessrules="false" kind="src" path="/jbossws-core"/>
<classpathentry kind="lib" path="thirdparty/jaxb-api.jar"/>
Deleted: projects/wsintegration/jbws-jboss42/trunk/src/main/java/org/jboss/ws/integration/jboss42/jbossws/PortComponentLinkServlet.java
===================================================================
--- projects/wsintegration/jbws-jboss42/trunk/src/main/java/org/jboss/ws/integration/jboss42/jbossws/PortComponentLinkServlet.java 2007-05-09 16:02:45 UTC (rev 3018)
+++ projects/wsintegration/jbws-jboss42/trunk/src/main/java/org/jboss/ws/integration/jboss42/jbossws/PortComponentLinkServlet.java 2007-05-09 17:09:16 UTC (rev 3019)
@@ -1,93 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, 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.ws.integration.jboss42.jbossws;
-
-// $Id$
-
-import java.io.IOException;
-import java.io.PrintWriter;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.jboss.logging.Logger;
-import org.jboss.ws.WSException;
-import org.jboss.ws.core.server.legacy.ServiceEndpoint;
-import org.jboss.ws.core.server.legacy.ServiceEndpointManager;
-import org.jboss.ws.core.server.legacy.ServiceEndpointManagerFactory;
-
-/**
- * A servlet that reports the serviceURL for a given service ID.
- * <p/>
- * When the web service client ENC is setup, it may contain port-component-link
- * entries that point to service endpoints in the same top level deployment.
- * The final serviceURL of those endpoints will become available after the
- * reference to the javax.xml.rpc.Service is bound to JNDI.
- * <p/>
- * When the client does a lookup of the javax.xml.rpc.Service from JNDI the ObjectFactory
- * will contact this servlet for the final serviceURL. It is acceptable that the client
- * wsdl does not contain the correct serviceURL if the client is using the port-component-link element.
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 29-May-2004
- */
-public class PortComponentLinkServlet extends HttpServlet
-{
- // provide logging
- private static final Logger log = Logger.getLogger(PortComponentLinkServlet.class);
-
- protected ServiceEndpointManager epManager;
-
- public void init(ServletConfig config) throws ServletException
- {
- super.init(config);
- ServiceEndpointManagerFactory factory = ServiceEndpointManagerFactory.getInstance();
- epManager = factory.getServiceEndpointManager();
- }
-
- /**
- * Get the serviceURL as string for a given serviceID.
- */
- public void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException
- {
- String pcLink = req.getParameter("pcLink");
- if (pcLink == null)
- throw new IllegalArgumentException("Cannot obtain request parameter 'pcLink'");
-
- ServiceEndpoint serviceEndpoint = epManager.resolvePortComponentLink(pcLink);
- ;
- if (serviceEndpoint == null)
- throw new WSException("Cannot resolve port-component-link: " + pcLink);
-
- res.setContentType("text/plain");
- PrintWriter out = res.getWriter();
-
- String endpointAddress = serviceEndpoint.getServiceEndpointInfo().getServerEndpointMetaData().getEndpointAddress();
- out.println(endpointAddress);
-
- log.debug("Resolved " + pcLink + " to: " + endpointAddress);
- out.close();
- }
-}
Modified: projects/wsintegration/jbws-jboss42/trunk/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.ws.extensions.security.SecurityAssociationAdaptorFactory
===================================================================
--- projects/wsintegration/jbws-jboss42/trunk/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.ws.extensions.security.SecurityAssociationAdaptorFactory 2007-05-09 16:02:45 UTC (rev 3018)
+++ projects/wsintegration/jbws-jboss42/trunk/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.ws.extensions.security.SecurityAssociationAdaptorFactory 2007-05-09 17:09:16 UTC (rev 3019)
@@ -1 +1 @@
-org.jboss.ws.integration.jboss42.SecurityAssociationAdaptorFactoryImpl
\ No newline at end of file
+org.jboss.ws.integration.jboss42.jbossws.SecurityAssociationAdaptorFactoryImpl
\ No newline at end of file
Modified: projects/wsintegration/jbws-jboss50/trunk/build.xml
===================================================================
--- projects/wsintegration/jbws-jboss50/trunk/build.xml 2007-05-09 16:02:45 UTC (rev 3018)
+++ projects/wsintegration/jbws-jboss50/trunk/build.xml 2007-05-09 17:09:16 UTC (rev 3019)
@@ -162,9 +162,11 @@
<include name="jbossws-context.war"/>
</fileset>
-->
+ <fileset dir="${thirdparty.dir}/jbossws-core">
+ <include name="jbossws-core.jar"/>
+ </fileset>
<fileset dir="${thirdparty.dir}">
<include name="policy.jar"/>
- <include name="jbossws-core.jar"/>
<include name="wsdl4j.jar"/>
<include name="xmlsec.jar"/>
</fileset>
@@ -178,7 +180,7 @@
<!-- Build jbossws50.deployer -->
<zip zipfile="${jboss50.output.lib.dir}/jbossws50-deployer.zip">
- <fileset dir="${thirdparty.dir}">
+ <fileset dir="${thirdparty.dir}/jbossws-spi">
<include name="jbossws-spi.jar"/>
</fileset>
<fileset dir="${jboss50.output.lib.dir}">
Modified: projects/wsintegration/jbws-jboss50/trunk/src/main/etc/ant-import/build-deploy.xml
===================================================================
--- projects/wsintegration/jbws-jboss50/trunk/src/main/etc/ant-import/build-deploy.xml 2007-05-09 16:02:45 UTC (rev 3018)
+++ projects/wsintegration/jbws-jboss50/trunk/src/main/etc/ant-import/build-deploy.xml 2007-05-09 17:09:16 UTC (rev 3019)
@@ -54,6 +54,8 @@
<delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
<mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
<unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="${jboss50.output.lib.dir}/jbossws50.sar"/>
+
+ <copy todir="${jboss50.home}/server/${jboss.server.instance}/deploy" file="${jboss50.output.lib.dir}/jbossws-context.war" overwrite="true"/>
</target>
</project>
Modified: projects/wsintegration/jbws-jboss50/trunk/src/main/etc/ant-import/build-thirdparty.xml
===================================================================
--- projects/wsintegration/jbws-jboss50/trunk/src/main/etc/ant-import/build-thirdparty.xml 2007-05-09 16:02:45 UTC (rev 3018)
+++ projects/wsintegration/jbws-jboss50/trunk/src/main/etc/ant-import/build-thirdparty.xml 2007-05-09 17:09:16 UTC (rev 3019)
@@ -17,13 +17,45 @@
<!-- Libraries -->
<!-- ========= -->
- <target name="thirdparty" depends="thirdparty-get,thirdparty-classpath">
+ <target name="thirdparty" depends="jbossws-core-get,jbossws-spi-get,thirdparty-get,thirdparty-classpath">
</target>
+ <!--
+ jbossws-core-get
+ -->
+ <target name="jbossws-core-get" if="force.thirdparty.get"
+ description="Gets the jbossws-core libraries">
+
+ <mkdir dir="${thirdparty.dir}/jbossws-core"/>
+ <get src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jbossws-client.jar" dest="${thirdparty.dir}/jbossws-core/jbossws-client.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jbossws-core.jar" dest="${thirdparty.dir}/jbossws-core/jbossws-core.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jbossws-resources.zip" dest="${thirdparty.dir}/jbossws-core/jbossws-resources.zip" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jboss-saaj.jar" dest="${thirdparty.dir}/jbossws-core/jboss-saaj.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jboss-jaxrpc.jar" dest="${thirdparty.dir}/jbossws-core/jboss-jaxrpc.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jboss-jaxws.jar" dest="${thirdparty.dir}/jbossws-core/jboss-jaxws.jar" usetimestamp="true" verbose="true"/>
+
+ <mkdir dir="${thirdparty.dir}/jbossws-resources"/>
+ <unzip dest="${thirdparty.dir}/jbossws-resources" src="${thirdparty.dir}/jbossws-core/jbossws-resources.zip"/>
+
+ </target>
+
+ <!--
+ jbossws-spi-get
+ -->
+ <target name="jbossws-spi-get" if="force.thirdparty.get"
+ description="Gets the jbossws-core libraries">
+
+ <mkdir dir="${thirdparty.dir}/jbossws-spi"/>
+ <get src="${jboss.repository}/jboss/jbossws-spi/${jboss-jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi/jbossws-spi.jar" usetimestamp="true" verbose="true"/>
+
+ </target>
+
+ <!--
+ thirdpartry-get
+ -->
<target name="thirdparty-get" if="force.thirdparty.get"
description="Gets the thirdparty libraries">
- <mkdir dir="${thirdparty.dir}"/>
<get src="${jboss.repository}/apache-xmlsec/${apache-xmlsec}/lib/xmlsec.jar" dest="${thirdparty.dir}/xmlsec.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar" dest="${thirdparty.dir}/wsdl4j.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j-src.jar" dest="${thirdparty.dir}/wsdl4j-src.jar" usetimestamp="true" verbose="true"/>
@@ -32,13 +64,6 @@
<get src="${jboss.repository}/jboss/common-logging-log4j/${jboss-common-logging-log4j}/lib/jboss-logging-log4j.jar" dest="${thirdparty.dir}/jboss-logging-log4j.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/common-logging-spi/${jboss-common-logging-spi}/lib/jboss-logging-spi.jar" dest="${thirdparty.dir}/jboss-logging-spi.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jaxr/${jboss-jaxr}/lib/juddi-service.sar" dest="${thirdparty.dir}/juddi-service.sar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jbossws-client.jar" dest="${thirdparty.dir}/jbossws-client.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jbossws-core.jar" dest="${thirdparty.dir}/jbossws-core.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jbossws-resources.zip" dest="${thirdparty.dir}/jbossws-resources.zip" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jboss-saaj.jar" dest="${thirdparty.dir}/jboss-saaj.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jboss-jaxrpc.jar" dest="${thirdparty.dir}/jboss-jaxrpc.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jboss-jaxws.jar" dest="${thirdparty.dir}/jboss-jaxws.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/jbossws-spi/${jboss-jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossws-wsconsume-impl/${jbossws-wsconsume-impl}/lib/jbossws-wsconsume-impl.jar" dest="${thirdparty.dir}/jbossws-wsconsume-impl.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding.jar" dest="${thirdparty.dir}/jboss-xml-binding.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding-sources.jar" dest="${thirdparty.dir}/jboss-xml-binding-sources.jar" usetimestamp="true" verbose="true"/>
@@ -55,15 +80,19 @@
<get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-xjc.jar" dest="${thirdparty.dir}/jaxb-xjc.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-servlet/${sun-servlet}/lib/servlet-api.jar" dest="${thirdparty.dir}/servlet-api.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/wscommons-policy/${wscommons-policy}/lib/policy.jar" dest="${thirdparty.dir}/policy.jar" usetimestamp="true" verbose="true"/>
-
- <mkdir dir="${thirdparty.dir}/jbossws-resources"/>
- <unzip dest="${thirdparty.dir}/jbossws-resources" src="${thirdparty.dir}/jbossws-resources.zip"/>
</target>
<target name="thirdparty-classpath" >
<!-- The compile classpath for jboss50 integration -->
<path id="jboss50.integration.classpath">
+ <pathelement location="${thirdparty.dir}/jbossws-spi/jbossws-spi.jar"/>
+
+ <pathelement location="${thirdparty.dir}/jbossws-core/jbossws-core.jar"/>
+ <pathelement location="${thirdparty.dir}/jbossws-core/jboss-jaxrpc.jar"/>
+ <pathelement location="${thirdparty.dir}/jbossws-core/jboss-jaxws.jar"/>
+ <pathelement location="${thirdparty.dir}/jbossws-core/jboss-saaj.jar"/>
+
<pathelement location="${jboss50.lib}/jboss-aop-jdk50.jar"/>
<pathelement location="${jboss50.lib}/jboss-deployers.jar"/>
<pathelement location="${jboss50.lib}/jboss-j2se.jar"/>
@@ -82,15 +111,10 @@
<pathelement location="${thirdparty.dir}/jaxb-xjc.jar"/>
<pathelement location="${thirdparty.dir}/jboss-common-core.jar"/>
<pathelement location="${thirdparty.dir}/jboss-dependency.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-jaxrpc.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-jaxws.jar"/>
<pathelement location="${thirdparty.dir}/jboss-logging-spi.jar"/>
<pathelement location="${thirdparty.dir}/jboss-microcontainer.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-saaj.jar"/>
<pathelement location="${thirdparty.dir}/jboss-security-spi.jar"/>
<pathelement location="${thirdparty.dir}/jboss-xml-binding.jar"/>
- <pathelement location="${thirdparty.dir}/jbossws-core.jar"/>
- <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/>
<pathelement location="${thirdparty.dir}/servlet-api.jar"/>
</path>
Modified: projects/wsintegration/jbws-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/jbossws/DeploymentInfoAdapter.java
===================================================================
--- projects/wsintegration/jbws-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/jbossws/DeploymentInfoAdapter.java 2007-05-09 16:02:45 UTC (rev 3018)
+++ projects/wsintegration/jbws-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/jbossws/DeploymentInfoAdapter.java 2007-05-09 17:09:16 UTC (rev 3019)
@@ -93,9 +93,5 @@
udi.metaData = WebMetaDataAdaptor.buildUnifiedWebMetaData(udi, unit);
udi.webappURL = udi.vfRoot.toURL();
}
- else
- {
- throw new IllegalStateException("Cannot build meta data");
- }
}
}
Modified: projects/wsintegration/jbws-jboss50/trunk/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.ws.extensions.security.SecurityAssociationAdaptorFactory
===================================================================
--- projects/wsintegration/jbws-jboss50/trunk/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.ws.extensions.security.SecurityAssociationAdaptorFactory 2007-05-09 16:02:45 UTC (rev 3018)
+++ projects/wsintegration/jbws-jboss50/trunk/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.ws.extensions.security.SecurityAssociationAdaptorFactory 2007-05-09 17:09:16 UTC (rev 3019)
@@ -1 +1 @@
-org.jboss.ws.integration.jboss50.SecurityAssociationAdaptorFactoryImpl
\ No newline at end of file
+org.jboss.ws.integration.jboss50.jbossws.SecurityAssociationAdaptorFactoryImpl
\ No newline at end of file
Modified: projects/wsintegration/jbws-jboss50/trunk/src/main/resources/jbossws.sar/META-INF/jbossws-beans.xml
===================================================================
--- projects/wsintegration/jbws-jboss50/trunk/src/main/resources/jbossws.sar/META-INF/jbossws-beans.xml 2007-05-09 16:02:45 UTC (rev 3018)
+++ projects/wsintegration/jbws-jboss50/trunk/src/main/resources/jbossws.sar/META-INF/jbossws-beans.xml 2007-05-09 17:09:16 UTC (rev 3019)
@@ -117,6 +117,7 @@
<inject bean="WSPublishContractDeployer"/>
<inject bean="WSClassLoaderInjectionDeployer"/>
<inject bean="WSEagerInitializeDeployer"/>
+ <inject bean="WSEventingDeployer"/>
<inject bean="WSEndpointRegistryDeployer"/>
<inject bean="WSEndpointLifecycleDeployer"/>
</list>
@@ -144,6 +145,7 @@
<bean name="WSEndpointLifecycleDeployer" class="org.jboss.ws.core.deployment.EndpointLifecycleDeployer"/>
<bean name="WSEndpointNameDeployer" class="org.jboss.ws.core.deployment.EndpointNameDeployer"/>
<bean name="WSEndpointRegistryDeployer" class="org.jboss.ws.integration.deployment.EndpointRegistryDeployer"/>
+ <bean name="WSEventingDeployer" class="org.jboss.ws.core.deployment.EventingDeployer"/>
<bean name="WSModifyWebMetaDataDeployer" class="org.jboss.ws.integration.jboss50.jbossws.ModifyWebMetaDataDeployer">
<property name="serviceEndpointPublisher"><inject bean="WSServiceEndpointPublisher"/></property>
</bean>
Modified: projects/wsintegration/jbws-jboss50/trunk/src/main/resources/jbossws.war/WEB-INF/web.xml
===================================================================
--- projects/wsintegration/jbws-jboss50/trunk/src/main/resources/jbossws.war/WEB-INF/web.xml 2007-05-09 16:02:45 UTC (rev 3018)
+++ projects/wsintegration/jbws-jboss50/trunk/src/main/resources/jbossws.war/WEB-INF/web.xml 2007-05-09 17:09:16 UTC (rev 3019)
@@ -14,12 +14,12 @@
<servlet>
<servlet-name>ContextServlet</servlet-name>
- <servlet-class>org.jboss.ws.integration.jboss50.JBossContextServlet</servlet-class>
+ <servlet-class>org.jboss.ws.core.server.ContextServlet</servlet-class>
</servlet>
<servlet>
<servlet-name>PortComponentLinkServlet</servlet-name>
- <servlet-class>org.jboss.ws.integration.jboss50.PortComponentLinkServlet</servlet-class>
+ <servlet-class>org.jboss.ws.core.server.PortComponentLinkServlet</servlet-class>
</servlet>
<!-- now the mappings -->
17 years, 8 months
- 1
- 0
JBossWS SVN: r3018 - in branches/JBWS-856: jbossws-core/src/java/org/jboss/ws/extensions/policy/deployer/util and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: maeste
Date: 2007-05-09 12:02:45 -0400 (Wed, 09 May 2007)
New Revision: 3018
Modified:
branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/extensions/policy/deployer/WSSecurityAssertionDeployer.java
branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/extensions/policy/deployer/util/PrimitiveAssertionWriter.java
branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/extensions/security/SecurityStore.java
branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/META-INF/wsdl/HelloService.wsdl
branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/PolicyAttachmentFragment.wsdl
Log:
Sample works!
Modified: branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/extensions/policy/deployer/WSSecurityAssertionDeployer.java
===================================================================
--- branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/extensions/policy/deployer/WSSecurityAssertionDeployer.java 2007-05-09 12:50:02 UTC (rev 3017)
+++ branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/extensions/policy/deployer/WSSecurityAssertionDeployer.java 2007-05-09 16:02:45 UTC (rev 3018)
@@ -22,7 +22,6 @@
public void deploy(PrimitiveAssertion assertion, ExtensibleMetaData extMetaData) throws UnsupportedAssertion
{
- System.out.print("#########################");
StringWriter writer = new StringWriter();
if (extMetaData instanceof EndpointMetaData)
{
@@ -40,11 +39,11 @@
securityConfiguration = WSSecurityOMFactory.newInstance().parse(reader);
WSSecurityConfigFactory.newInstance().initKeystorePath(ep.getRootFile(), securityConfiguration);
ep.getServiceMetaData().setSecurityConfiguration(securityConfiguration);
+
//set up handler chain as defined in standard file
ep.setConfigName("Standard WSSecurity Endpoint");
ep.initEndpointConfig();
-
- System.out.print("-----------#########################-------------");
+
}
catch (Exception e)
{
Modified: branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/extensions/policy/deployer/util/PrimitiveAssertionWriter.java
===================================================================
--- branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/extensions/policy/deployer/util/PrimitiveAssertionWriter.java 2007-05-09 12:50:02 UTC (rev 3017)
+++ branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/extensions/policy/deployer/util/PrimitiveAssertionWriter.java 2007-05-09 16:02:45 UTC (rev 3018)
@@ -1,88 +1,109 @@
-
package org.jboss.ws.extensions.policy.deployer.util;
import java.io.StringWriter;
import java.util.Hashtable;
import java.util.Iterator;
+import java.util.List;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLOutputFactory;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamWriter;
+import org.apache.ws.policy.Assertion;
import org.apache.ws.policy.PrimitiveAssertion;
+public class PrimitiveAssertionWriter
+{
-public class PrimitiveAssertionWriter {
+ private int num = 1;
- private int num = 1;
+ PrimitiveAssertionWriter()
+ {
+ }
- PrimitiveAssertionWriter() {
- }
-
- public static PrimitiveAssertionWriter newInstance()
+ public static PrimitiveAssertionWriter newInstance()
{
- return new PrimitiveAssertionWriter();
+ return new PrimitiveAssertionWriter();
}
- public void writePrimitiveAssertion(PrimitiveAssertion assertion,
- StringWriter stringWriter) throws XMLStreamException {
-
+ public void writePrimitiveAssertion(PrimitiveAssertion assertion, StringWriter stringWriter) throws XMLStreamException
+ {
XMLStreamWriter writer = XMLOutputFactory.newInstance().createXMLStreamWriter(stringWriter);
+ writePrimitiveAssertion(assertion, writer);
- QName qname = assertion.getName();
+ }
+ public void writePrimitiveAssertion(PrimitiveAssertion assertion, XMLStreamWriter writer) throws XMLStreamException
+ {
- String writerPrefix = writer.getPrefix(qname.getNamespaceURI());
- if (writerPrefix != null) {
- writer.writeStartElement(qname.getNamespaceURI(), qname
- .getLocalPart());
- } else {
- String prefix = (qname.getPrefix() != null) ? qname.getPrefix()
- : generateNamespace();
- writer.writeStartElement(prefix, qname.getLocalPart(), qname
- .getNamespaceURI());
- writer.writeNamespace(prefix, qname.getNamespaceURI());
- writer.setPrefix(prefix, qname.getNamespaceURI());
+
- }
+ QName qname = assertion.getName();
- Hashtable attributes = assertion.getAttributes();
- writeAttributes(attributes, writer);
+ String writerPrefix = writer.getPrefix(qname.getNamespaceURI());
+ if (writerPrefix != null)
+ {
+ writer.writeStartElement(qname.getNamespaceURI(), qname.getLocalPart());
+ }
+ else
+ {
+ String prefix = (qname.getPrefix() != null) ? qname.getPrefix() : generateNamespace();
+ writer.writeStartElement(prefix, qname.getLocalPart(), qname.getNamespaceURI());
+ writer.writeNamespace(prefix, qname.getNamespaceURI());
+ writer.setPrefix(prefix, qname.getNamespaceURI());
- String text = (String) assertion.getStrValue();
- if (text != null) {
- writer.writeCharacters(text);
- }
+ }
+ Hashtable attributes = assertion.getAttributes();
+ writeAttributes(attributes, writer);
+
+ String text = (String)assertion.getStrValue();
+ if (text != null)
+ {
+ writer.writeCharacters(text);
+ }
+
//A Primitive assertion can't have terms----to be verified
-// List terms = assertion.getTerms();
-// writeTerms(terms, writer);
+ List terms = assertion.getTerms();
+ writeTerms(terms, writer);
- writer.writeEndElement();
- }
+ writer.writeEndElement();
+ }
-
+ private void writeTerms(List terms, XMLStreamWriter writer) throws XMLStreamException
+ {
- private void writeAttributes(Hashtable attributes, XMLStreamWriter writer)
- throws XMLStreamException {
+ Iterator iterator = terms.iterator();
+ while (iterator.hasNext())
+ {
+ Assertion assertion = (Assertion)iterator.next();
+ writePrimitiveAssertion((PrimitiveAssertion) assertion, writer);
+ }
+ }
- Iterator iterator = attributes.keySet().iterator();
- while (iterator.hasNext()) {
- QName qname = (QName) iterator.next();
- String value = (String) attributes.get(qname);
+ private void writeAttributes(Hashtable attributes, XMLStreamWriter writer) throws XMLStreamException
+ {
- String prefix = qname.getPrefix();
- if (prefix != null) {
- writer.writeAttribute(prefix, qname.getNamespaceURI(), qname
- .getLocalPart(), value);
- } else {
- writer.writeAttribute(qname.getNamespaceURI(), qname
- .getLocalPart(), value);
- }
- }
- }
+ Iterator iterator = attributes.keySet().iterator();
+ while (iterator.hasNext())
+ {
+ QName qname = (QName)iterator.next();
+ String value = (String)attributes.get(qname);
- private String generateNamespace() {
- return "ns" + num++;
- }
+ String prefix = qname.getPrefix();
+ if (prefix != null)
+ {
+ writer.writeAttribute(prefix, qname.getNamespaceURI(), qname.getLocalPart(), value);
+ }
+ else
+ {
+ writer.writeAttribute(qname.getNamespaceURI(), qname.getLocalPart(), value);
+ }
+ }
+ }
+
+ private String generateNamespace()
+ {
+ return "ns" + num++;
+ }
}
\ No newline at end of file
Modified: branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/extensions/security/SecurityStore.java
===================================================================
--- branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/extensions/security/SecurityStore.java 2007-05-09 12:50:02 UTC (rev 3017)
+++ branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/extensions/security/SecurityStore.java 2007-05-09 16:02:45 UTC (rev 3018)
@@ -298,6 +298,7 @@
X509Certificate cert;
try
{
+ log.info("ALIAS:" + alias);
cert = (X509Certificate)keyStore.getCertificate(alias);
}
catch (Exception e)
Modified: branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/META-INF/wsdl/HelloService.wsdl
===================================================================
--- branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/META-INF/wsdl/HelloService.wsdl 2007-05-09 12:50:02 UTC (rev 3017)
+++ branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/META-INF/wsdl/HelloService.wsdl 2007-05-09 16:02:45 UTC (rev 3018)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='HelloService' targetNamespace='http://org.jboss.ws/samples/wssecuritypolicy' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.ws/samples/wssecuritypolicy' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+<definitions name='HelloService' targetNamespace='http://org.jboss.ws/samples/wssecurity' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.ws/samples/wssecurity' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
<types>
- <xs:schema targetNamespace='http://org.jboss.ws/samples/wssecuritypolicy' version='1.0' xmlns:xs='http://www.w3.org/2001/XMLSchema'>
+ <xs:schema targetNamespace='http://org.jboss.ws/samples/wssecurity' version='1.0' xmlns:xs='http://www.w3.org/2001/XMLSchema'>
<xs:complexType name='UserType'>
<xs:sequence>
<xs:element minOccurs='0' name='msg' type='xs:string'/>
@@ -38,4 +38,4 @@
<soap:address location='REPLACE_WITH_ACTUAL_URL'/>
</port>
</service>
-</definitions>
+</definitions>
\ No newline at end of file
Modified: branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/PolicyAttachmentFragment.wsdl
===================================================================
--- branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/PolicyAttachmentFragment.wsdl 2007-05-09 12:50:02 UTC (rev 3017)
+++ branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/PolicyAttachmentFragment.wsdl 2007-05-09 16:02:45 UTC (rev 3018)
@@ -18,7 +18,7 @@
<sp:trust-store-file>WEB-INF/wsse.truststore</sp:trust-store-file>
<sp:trust-store-password>jbossws</sp:trust-store-password>
<sp:config>
- <sp:encrypt sp:type="x509v3" sp:alias="wsse"/>
+ <sp:encrypt type="x509v3" alias="wsse"/>
<sp:requires>
<sp:encryption/>
</sp:requires>
17 years, 8 months
- 1
- 0
JBossWS SVN: r3017 - trunk/jbossws-core/src/java/org/jboss/ws/core/server.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-05-09 08:50:02 -0400 (Wed, 09 May 2007)
New Revision: 3017
Added:
trunk/jbossws-core/src/java/org/jboss/ws/core/server/ManagedServerConfig.java
trunk/jbossws-core/src/java/org/jboss/ws/core/server/ManagedServerConfigMBean.java
Log:
Add ManagedServerConfig
Added: trunk/jbossws-core/src/java/org/jboss/ws/core/server/ManagedServerConfig.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/server/ManagedServerConfig.java (rev 0)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/server/ManagedServerConfig.java 2007-05-09 12:50:02 UTC (rev 3017)
@@ -0,0 +1,76 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, 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.ws.core.server;
+
+// $Id$
+
+import java.util.ArrayList;
+
+import javax.management.MBeanServer;
+import javax.management.MBeanServerFactory;
+
+import org.jboss.logging.Logger;
+import org.jboss.ws.integration.management.BasicServerConfig;
+
+/**
+ * A Service Endpoint Registry
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 04-May-2007
+ */
+public class ManagedServerConfig extends BasicServerConfig implements ManagedServerConfigMBean
+{
+ // provide logging
+ private static final Logger log = Logger.getLogger(ManagedServerConfig.class);
+
+ public void create() throws Exception
+ {
+ log.debug("WebServiceHost: " + getWebServiceHost());
+ log.debug("WebServicePort: " + getWebServicePort());
+ log.debug("WebServiceSecurePort: " + getWebServiceSecurePort());
+ MBeanServer server = getMBeanServer();
+ if (server != null)
+ {
+ server.registerMBean(this, OBJECT_NAME);
+ }
+ }
+
+ public void destroy() throws Exception
+ {
+ MBeanServer server = getMBeanServer();
+ if (server != null)
+ {
+ server.unregisterMBean(OBJECT_NAME);
+ }
+ }
+
+ private MBeanServer getMBeanServer()
+ {
+ MBeanServer server = null;
+ ArrayList servers = MBeanServerFactory.findMBeanServer(null);
+ if (servers.size() > 0)
+ {
+ server = (MBeanServer)servers.get(0);
+ }
+ return server;
+ }
+}
Property changes on: trunk/jbossws-core/src/java/org/jboss/ws/core/server/ManagedServerConfig.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-core/src/java/org/jboss/ws/core/server/ManagedServerConfigMBean.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/server/ManagedServerConfigMBean.java (rev 0)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/server/ManagedServerConfigMBean.java 2007-05-09 12:50:02 UTC (rev 3017)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, 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.ws.core.server;
+
+import javax.management.ObjectName;
+
+import org.jboss.ws.integration.ObjectNameFactory;
+import org.jboss.ws.integration.management.ServerConfig;
+
+/**
+ * MBean interface.
+ * @since 15-April-2004
+ */
+public interface ManagedServerConfigMBean extends ServerConfig
+{
+ // default object name
+ static final ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.ws:service=ServerConfig");
+}
Property changes on: trunk/jbossws-core/src/java/org/jboss/ws/core/server/ManagedServerConfigMBean.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
17 years, 8 months
- 1
- 0
JBossWS SVN: r3016 - in projects/wsintegration: jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/deployment and 5 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-05-09 08:40:45 -0400 (Wed, 09 May 2007)
New Revision: 3016
Added:
projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/BasicEndpoint.java
projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/BasicLifecycleHandler.java
projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/BasicService.java
projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/deployment/BasicDeployerManager.java
projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/deployment/BasicDeploymentContext.java
projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/deployment/BasicDeploymentImpl.java
projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/management/BasicEndpointRegistry.java
projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/management/BasicServerConfig.java
Removed:
projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/EndpointImpl.java
projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/LifecycleHandlerImpl.java
projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/ServiceImpl.java
projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/deployment/DeployerManagerImpl.java
projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/deployment/DeploymentContextImpl.java
projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/deployment/DeploymentImpl.java
projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/management/EndpointRegistryImpl.java
projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/management/ServerConfigImpl.java
Modified:
projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/management/ServerConfig.java
projects/wsintegration/jbws-jboss42/trunk/src/main/java/org/jboss/ws/integration/jboss42/jbossws/JAXRPCDeployerHookEJB21.java
projects/wsintegration/jbws-jboss42/trunk/src/main/java/org/jboss/ws/integration/jboss42/jbossws/JAXRPCDeployerHookJSE.java
projects/wsintegration/jbws-jboss42/trunk/src/main/java/org/jboss/ws/integration/jboss42/jbossws/JAXWSDeployerHookEJB3.java
projects/wsintegration/jbws-jboss42/trunk/src/main/java/org/jboss/ws/integration/jboss42/jbossws/JAXWSDeployerHookJSE.java
projects/wsintegration/jbws-jboss42/trunk/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml
projects/wsintegration/jbws-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/jbossws/JAXRPCDeployerHookEJB21.java
projects/wsintegration/jbws-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/jbossws/JAXRPCDeployerHookJSE.java
projects/wsintegration/jbws-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/jbossws/JAXWSDeployerHookEJB3.java
projects/wsintegration/jbws-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/jbossws/JAXWSDeployerHookJSE.java
projects/wsintegration/jbws-jboss50/trunk/src/main/resources/jbossws.sar/META-INF/jbossws-beans.xml
Log:
Fix [JBWS-1115]
Copied: projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/BasicEndpoint.java (from rev 3013, projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/EndpointImpl.java)
===================================================================
--- projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/BasicEndpoint.java (rev 0)
+++ projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/BasicEndpoint.java 2007-05-09 12:40:45 UTC (rev 3016)
@@ -0,0 +1,173 @@
+/*
+ * ====================================================================
+ *
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ * any, must include the following acknowlegement:
+ * "This product includes software developed by the
+ * Apache Software Foundation (http://www.apache.org/)."
+ * Alternately, this acknowlegement may appear in the software itself,
+ * if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
+ * Foundation" must not be used to endorse or promote products derived
+ * from this software without prior written permission. For written
+ * permission, please contact apache(a)apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ * nor may "Apache" appear in their names without prior written
+ * permission of the Apache Group.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ */
+package org.jboss.ws.integration;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.management.ObjectName;
+
+import org.jboss.ws.integration.invocation.InvocationHandler;
+
+/**
+ * A general JAXWS endpoint.
+ *
+ * @author Thomas.Diesler(a)jboss.com
+ * @since 20-Apr-2007
+ */
+public class BasicEndpoint implements Endpoint
+{
+ private Service service;
+ private ObjectName name;
+ private Class endpointImpl;
+ private EndpointState state;
+ private RequestHandler requestHandler;
+ private InvocationHandler invocationHandler;
+ private LifecycleHandler lifecycleHandler;
+ private Map<Class, Object> metaData = new HashMap<Class, Object>();
+
+ public BasicEndpoint(Service service, Class impl)
+ {
+ this.service = service;
+ this.endpointImpl = impl;
+ this.state = EndpointState.UNDEFINED;
+ }
+
+ public Service getService()
+ {
+ return service;
+ }
+
+ public void setService(Service service)
+ {
+ this.service = service;
+ }
+
+ public Class getEndpointImpl()
+ {
+ return endpointImpl;
+ }
+
+ public void setEndpointImpl(Class endpointImpl)
+ {
+ this.endpointImpl = endpointImpl;
+ }
+
+ public EndpointState getState()
+ {
+ return state;
+ }
+
+ public void setState(EndpointState state)
+ {
+ this.state = state;
+ }
+
+ public ObjectName getName()
+ {
+ return name;
+ }
+
+ public void setName(ObjectName name)
+ {
+ this.name = name;
+ }
+
+ public RequestHandler getRequestHandler()
+ {
+ return requestHandler;
+ }
+
+ public void setRequestHandler(RequestHandler handler)
+ {
+ this.requestHandler = handler;
+ }
+
+ public LifecycleHandler getLifecycleHandler()
+ {
+ return lifecycleHandler;
+ }
+
+ public void setLifecycleHandler(LifecycleHandler handler)
+ {
+ this.lifecycleHandler = handler;
+ }
+
+ public InvocationHandler getInvocationHandler()
+ {
+ return invocationHandler;
+ }
+
+ public void setInvocationHandler(InvocationHandler handler)
+ {
+ this.invocationHandler = handler;
+ }
+
+ public <T> T addMetaData(Class<T> key, Object value)
+ {
+ return (T)metaData.put(key, value);
+ }
+
+ public <T> T getMetaData(Class<T> key)
+ {
+ return (T)metaData.get(key);
+ }
+
+ public <T> T removeMetaData(Class<T> key)
+ {
+ return (T)metaData.get(key);
+ }
+}
Copied: projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/BasicLifecycleHandler.java (from rev 3013, projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/LifecycleHandlerImpl.java)
===================================================================
--- projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/BasicLifecycleHandler.java (rev 0)
+++ projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/BasicLifecycleHandler.java 2007-05-09 12:40:45 UTC (rev 3016)
@@ -0,0 +1,79 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, 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.ws.integration;
+
+//$Id$
+
+import org.jboss.logging.Logger;
+import org.jboss.ws.integration.Endpoint.EndpointState;
+import org.jboss.ws.integration.invocation.InvocationHandler;
+
+/**
+ * A basic lifecycle handler
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 31-Oct-2006
+ */
+public class BasicLifecycleHandler implements LifecycleHandler
+{
+ // provide logging
+ protected final Logger log = Logger.getLogger(getClass());
+
+ public void create(Endpoint endpoint)
+ {
+ log.debug("Create: " + endpoint.getName());
+
+ // Initialize the invoker
+ InvocationHandler invoker = endpoint.getInvocationHandler();
+ invoker.init(endpoint);
+
+ endpoint.setState(EndpointState.CREATED);
+ }
+
+ public void start(Endpoint endpoint)
+ {
+ log.debug("Start: " + endpoint.getName());
+
+ EndpointState state = endpoint.getState();
+ if (state == EndpointState.UNDEFINED || state == EndpointState.DESTROYED)
+ throw new IllegalStateException("Cannot start endpoint in state: " + state);
+
+ endpoint.setState(EndpointState.STARTED);
+ }
+
+ public void stop(Endpoint endpoint)
+ {
+ log.debug("Stop: " + endpoint.getName());
+
+ EndpointState state = endpoint.getState();
+ if (state != EndpointState.STARTED)
+ throw new IllegalStateException("Cannot stop endpoint in state: " + state);
+
+ endpoint.setState(EndpointState.STOPED);
+ }
+
+ public void destroy(Endpoint endpoint)
+ {
+ log.debug("Destroy: " + endpoint.getName());
+ endpoint.setState(EndpointState.DESTROYED);
+ }
+}
Copied: projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/BasicService.java (from rev 3013, projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/ServiceImpl.java)
===================================================================
--- projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/BasicService.java (rev 0)
+++ projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/BasicService.java 2007-05-09 12:40:45 UTC (rev 3016)
@@ -0,0 +1,103 @@
+/*
+ * ====================================================================
+ *
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ * any, must include the following acknowlegement:
+ * "This product includes software developed by the
+ * Apache Software Foundation (http://www.apache.org/)."
+ * Alternately, this acknowlegement may appear in the software itself,
+ * if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
+ * Foundation" must not be used to endorse or promote products derived
+ * from this software without prior written permission. For written
+ * permission, please contact apache(a)apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ * nor may "Apache" appear in their names without prior written
+ * permission of the Apache Group.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ */
+package org.jboss.ws.integration;
+
+// $Id$
+
+import java.util.LinkedList;
+import java.util.List;
+
+import org.jboss.ws.integration.deployment.Deployment;
+
+/**
+ * A general service.
+ *
+ * Maintains a named set of Endpoints
+ *
+ * @author Thomas.Diesler(a)jboss.com
+ * @since 20-Apr-2007
+ */
+public class BasicService implements Service
+{
+ private Deployment unit;
+ private List<Endpoint> endpoints = new LinkedList<Endpoint>();
+
+ public BasicService(Deployment unit)
+ {
+ this.unit = unit;
+ this.unit.setService(this);
+ }
+
+ public Deployment getDeployment()
+ {
+ return unit;
+ }
+
+ public void setDeployment(Deployment unit)
+ {
+ this.unit = unit;
+ }
+
+ public void addEndpoint(Endpoint endpoint)
+ {
+ endpoints.add(endpoint);
+ }
+
+ public List<Endpoint> getEndpoints()
+ {
+ return endpoints;
+ }
+}
Deleted: projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/EndpointImpl.java
===================================================================
--- projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/EndpointImpl.java 2007-05-09 12:40:01 UTC (rev 3015)
+++ projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/EndpointImpl.java 2007-05-09 12:40:45 UTC (rev 3016)
@@ -1,173 +0,0 @@
-/*
- * ====================================================================
- *
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999 The Apache Software Foundation. All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The end-user documentation included with the redistribution, if
- * any, must include the following acknowlegement:
- * "This product includes software developed by the
- * Apache Software Foundation (http://www.apache.org/)."
- * Alternately, this acknowlegement may appear in the software itself,
- * if and wherever such third-party acknowlegements normally appear.
- *
- * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
- * Foundation" must not be used to endorse or promote products derived
- * from this software without prior written permission. For written
- * permission, please contact apache(a)apache.org.
- *
- * 5. Products derived from this software may not be called "Apache"
- * nor may "Apache" appear in their names without prior written
- * permission of the Apache Group.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation. For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- */
-package org.jboss.ws.integration;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.management.ObjectName;
-
-import org.jboss.ws.integration.invocation.InvocationHandler;
-
-/**
- * A general JAXWS endpoint.
- *
- * @author Thomas.Diesler(a)jboss.com
- * @since 20-Apr-2007
- */
-public class EndpointImpl implements Endpoint
-{
- private Service service;
- private ObjectName name;
- private Class endpointImpl;
- private EndpointState state;
- private RequestHandler requestHandler;
- private InvocationHandler invocationHandler;
- private LifecycleHandler lifecycleHandler;
- private Map<Class, Object> metaData = new HashMap<Class, Object>();
-
- public EndpointImpl(Service service, Class impl)
- {
- this.service = service;
- this.endpointImpl = impl;
- this.state = EndpointState.UNDEFINED;
- }
-
- public Service getService()
- {
- return service;
- }
-
- public void setService(Service service)
- {
- this.service = service;
- }
-
- public Class getEndpointImpl()
- {
- return endpointImpl;
- }
-
- public void setEndpointImpl(Class endpointImpl)
- {
- this.endpointImpl = endpointImpl;
- }
-
- public EndpointState getState()
- {
- return state;
- }
-
- public void setState(EndpointState state)
- {
- this.state = state;
- }
-
- public ObjectName getName()
- {
- return name;
- }
-
- public void setName(ObjectName name)
- {
- this.name = name;
- }
-
- public RequestHandler getRequestHandler()
- {
- return requestHandler;
- }
-
- public void setRequestHandler(RequestHandler handler)
- {
- this.requestHandler = handler;
- }
-
- public LifecycleHandler getLifecycleHandler()
- {
- return lifecycleHandler;
- }
-
- public void setLifecycleHandler(LifecycleHandler handler)
- {
- this.lifecycleHandler = handler;
- }
-
- public InvocationHandler getInvocationHandler()
- {
- return invocationHandler;
- }
-
- public void setInvocationHandler(InvocationHandler handler)
- {
- this.invocationHandler = handler;
- }
-
- public <T> T addMetaData(Class<T> key, Object value)
- {
- return (T)metaData.put(key, value);
- }
-
- public <T> T getMetaData(Class<T> key)
- {
- return (T)metaData.get(key);
- }
-
- public <T> T removeMetaData(Class<T> key)
- {
- return (T)metaData.get(key);
- }
-}
Deleted: projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/LifecycleHandlerImpl.java
===================================================================
--- projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/LifecycleHandlerImpl.java 2007-05-09 12:40:01 UTC (rev 3015)
+++ projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/LifecycleHandlerImpl.java 2007-05-09 12:40:45 UTC (rev 3016)
@@ -1,79 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, 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.ws.integration;
-
-//$Id$
-
-import org.jboss.logging.Logger;
-import org.jboss.ws.integration.Endpoint.EndpointState;
-import org.jboss.ws.integration.invocation.InvocationHandler;
-
-/**
- * A basic lifecycle handler
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 31-Oct-2006
- */
-public class LifecycleHandlerImpl implements LifecycleHandler
-{
- // provide logging
- protected final Logger log = Logger.getLogger(getClass());
-
- public void create(Endpoint endpoint)
- {
- log.debug("Create: " + endpoint.getName());
-
- // Initialize the invoker
- InvocationHandler invoker = endpoint.getInvocationHandler();
- invoker.init(endpoint);
-
- endpoint.setState(EndpointState.CREATED);
- }
-
- public void start(Endpoint endpoint)
- {
- log.debug("Start: " + endpoint.getName());
-
- EndpointState state = endpoint.getState();
- if (state == EndpointState.UNDEFINED || state == EndpointState.DESTROYED)
- throw new IllegalStateException("Cannot start endpoint in state: " + state);
-
- endpoint.setState(EndpointState.STARTED);
- }
-
- public void stop(Endpoint endpoint)
- {
- log.debug("Stop: " + endpoint.getName());
-
- EndpointState state = endpoint.getState();
- if (state != EndpointState.STARTED)
- throw new IllegalStateException("Cannot stop endpoint in state: " + state);
-
- endpoint.setState(EndpointState.STOPED);
- }
-
- public void destroy(Endpoint endpoint)
- {
- log.debug("Destroy: " + endpoint.getName());
- endpoint.setState(EndpointState.DESTROYED);
- }
-}
Deleted: projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/ServiceImpl.java
===================================================================
--- projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/ServiceImpl.java 2007-05-09 12:40:01 UTC (rev 3015)
+++ projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/ServiceImpl.java 2007-05-09 12:40:45 UTC (rev 3016)
@@ -1,103 +0,0 @@
-/*
- * ====================================================================
- *
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999 The Apache Software Foundation. All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The end-user documentation included with the redistribution, if
- * any, must include the following acknowlegement:
- * "This product includes software developed by the
- * Apache Software Foundation (http://www.apache.org/)."
- * Alternately, this acknowlegement may appear in the software itself,
- * if and wherever such third-party acknowlegements normally appear.
- *
- * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
- * Foundation" must not be used to endorse or promote products derived
- * from this software without prior written permission. For written
- * permission, please contact apache(a)apache.org.
- *
- * 5. Products derived from this software may not be called "Apache"
- * nor may "Apache" appear in their names without prior written
- * permission of the Apache Group.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation. For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- */
-package org.jboss.ws.integration;
-
-// $Id$
-
-import java.util.LinkedList;
-import java.util.List;
-
-import org.jboss.ws.integration.deployment.Deployment;
-
-/**
- * A general service.
- *
- * Maintains a named set of Endpoints
- *
- * @author Thomas.Diesler(a)jboss.com
- * @since 20-Apr-2007
- */
-public class ServiceImpl implements Service
-{
- private Deployment unit;
- private List<Endpoint> endpoints = new LinkedList<Endpoint>();
-
- public ServiceImpl(Deployment unit)
- {
- this.unit = unit;
- this.unit.setService(this);
- }
-
- public Deployment getDeployment()
- {
- return unit;
- }
-
- public void setDeployment(Deployment unit)
- {
- this.unit = unit;
- }
-
- public void addEndpoint(Endpoint endpoint)
- {
- endpoints.add(endpoint);
- }
-
- public List<Endpoint> getEndpoints()
- {
- return endpoints;
- }
-}
Copied: projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/deployment/BasicDeployerManager.java (from rev 3013, projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/deployment/DeployerManagerImpl.java)
===================================================================
--- projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/deployment/BasicDeployerManager.java (rev 0)
+++ projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/deployment/BasicDeployerManager.java 2007-05-09 12:40:45 UTC (rev 3016)
@@ -0,0 +1,184 @@
+/*
+ * ====================================================================
+ *
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ * any, must include the following acknowlegement:
+ * "This product includes software developed by the
+ * Apache Software Foundation (http://www.apache.org/)."
+ * Alternately, this acknowlegement may appear in the software itself,
+ * if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
+ * Foundation" must not be used to endorse or promote products derived
+ * from this software without prior written permission. For written
+ * permission, please contact apache(a)apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ * nor may "Apache" appear in their names without prior written
+ * permission of the Apache Group.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ */
+package org.jboss.ws.integration.deployment;
+
+// $Id$
+
+import java.util.LinkedList;
+import java.util.List;
+
+import org.jboss.logging.Logger;
+import org.jboss.ws.integration.deployment.Deployment.DeploymentState;
+
+/**
+ * A general service deployment manger.
+ *
+ * @author Thomas.Diesler(a)jboss.com
+ * @since 20-Apr-2007
+ */
+public class BasicDeployerManager implements DeployerManager
+{
+ // provide logging
+ private static final Logger log = Logger.getLogger(BasicDeployerManager.class);
+
+
+ private List<Deployer> deployers = new LinkedList<Deployer>();
+
+ public List<Deployer> getDeployers()
+ {
+ return deployers;
+ }
+
+ public void setDeployers(List<Deployer> deployers)
+ {
+ this.deployers = deployers;
+ }
+
+ /**
+ * Iterate over the registered deployers calls create on each.
+ * Iterate over the registered deployers again and calls start on each.
+ * If start fails it automaticall calls destroy in the reverse order
+ * starting with the deployer that failed
+ */
+ public void deploy(Deployment dep)
+ {
+ // create the deployment
+ for (int i = 0; i < deployers.size(); i++)
+ {
+ Deployer deployer = deployers.get(i);
+ logInvocation(deployer, "Create");
+ deployer.create(dep);
+ }
+
+ dep.setState(DeploymentState.CREATED);
+
+ // start the deployment
+ for (int i = 0; i < deployers.size(); i++)
+ {
+ Deployer deployer = deployers.get(i);
+ try
+ {
+ logInvocation(deployer, "Start");
+ deployer.start(dep);
+ }
+ catch (RuntimeException rte)
+ {
+ while (i-- >= 0)
+ {
+ // destroy the deployment
+ failsafeDestroy(deployer, dep);
+ }
+ throw rte;
+ }
+ }
+
+ dep.setState(DeploymentState.STARTED);
+ }
+
+ public void undeploy(Deployment dep)
+ {
+ // stop the deployment
+ for (int i = deployers.size(); 0 < i; i--)
+ {
+ Deployer deployer = deployers.get(i - 1);
+ failsafeStop(deployer, dep);
+ }
+
+ dep.setState(DeploymentState.STOPED);
+
+ // destroy the deployment
+ for (int i = deployers.size(); 0 < i; i--)
+ {
+ Deployer deployer = deployers.get(i - 1);
+ failsafeDestroy(deployer, dep);
+ }
+
+ dep.setState(DeploymentState.DESTROYED);
+ }
+
+ private void failsafeStop(Deployer deployer, Deployment dep)
+ {
+ try
+ {
+ logInvocation(deployer, "Stop");
+ deployer.stop(dep);
+ }
+ catch (RuntimeException rte)
+ {
+ WSDeploymentException.rethrow(rte);
+ }
+ }
+
+ private void failsafeDestroy(Deployer deployer, Deployment dep)
+ {
+ try
+ {
+ logInvocation(deployer, "Destroy");
+ deployer.destroy(dep);
+ }
+ catch (RuntimeException rte)
+ {
+ WSDeploymentException.rethrow(rte);
+ }
+ }
+
+ private void logInvocation(Deployer deployer, String method)
+ {
+ String name = deployer.getClass().getName();
+ name = name.substring(name.lastIndexOf(".") + 1);
+ log.debug(name + ":" + method);
+ }
+}
Copied: projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/deployment/BasicDeploymentContext.java (from rev 3013, projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/deployment/DeploymentContextImpl.java)
===================================================================
--- projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/deployment/BasicDeploymentContext.java (rev 0)
+++ projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/deployment/BasicDeploymentContext.java 2007-05-09 12:40:45 UTC (rev 3016)
@@ -0,0 +1,82 @@
+/*
+ * ====================================================================
+ *
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ * any, must include the following acknowlegement:
+ * "This product includes software developed by the
+ * Apache Software Foundation (http://www.apache.org/)."
+ * Alternately, this acknowlegement may appear in the software itself,
+ * if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
+ * Foundation" must not be used to endorse or promote products derived
+ * from this software without prior written permission. For written
+ * permission, please contact apache(a)apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ * nor may "Apache" appear in their names without prior written
+ * permission of the Apache Group.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ */
+package org.jboss.ws.integration.deployment;
+
+//$Id$
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * A general web service deployment context.
+ *
+ * @author Thomas.Diesler(a)jboss.com
+ * @since 20-Apr-2007
+ */
+public class BasicDeploymentContext implements DeploymentContext
+{
+ private Map<Class, Object> attachments = new HashMap<Class, Object>();
+
+ public <T> T getAttachment(Class<T> clazz)
+ {
+ return (T)attachments.get(clazz);
+ }
+
+ public <T> T addAttachment(Class<T> clazz, Object obj)
+ {
+ return (T)attachments.put(clazz, obj);
+ }
+}
Copied: projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/deployment/BasicDeploymentImpl.java (from rev 3013, projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/deployment/DeploymentImpl.java)
===================================================================
--- projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/deployment/BasicDeploymentImpl.java (rev 0)
+++ projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/deployment/BasicDeploymentImpl.java 2007-05-09 12:40:45 UTC (rev 3016)
@@ -0,0 +1,140 @@
+/*
+ * ====================================================================
+ *
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ * any, must include the following acknowlegement:
+ * "This product includes software developed by the
+ * Apache Software Foundation (http://www.apache.org/)."
+ * Alternately, this acknowlegement may appear in the software itself,
+ * if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
+ * Foundation" must not be used to endorse or promote products derived
+ * from this software without prior written permission. For written
+ * permission, please contact apache(a)apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ * nor may "Apache" appear in their names without prior written
+ * permission of the Apache Group.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ */
+package org.jboss.ws.integration.deployment;
+
+//$Id$
+
+import org.jboss.ws.integration.BasicService;
+import org.jboss.ws.integration.Service;
+
+/**
+ * A general web service deployment dep.
+ *
+ * It has no notion of J2EE deployment packages.
+ *
+ * @author Thomas.Diesler(a)jboss.com
+ * @since 20-Apr-2007
+ */
+public class BasicDeploymentImpl implements Deployment
+{
+ // The context for this deployment dep
+ private DeploymentContext context;
+ // A deployment has one service
+ private Service service;
+ // The type of this deployment
+ private DeploymentType type;
+ // The state for this deployment
+ private DeploymentState state;
+ // The deployment class loader
+ private ClassLoader classLoader;
+
+ public BasicDeploymentImpl()
+ {
+ context = new BasicDeploymentContext();
+ service = new BasicService(this);
+ state = DeploymentState.UNDEFINED;
+ }
+
+ public DeploymentContext getContext()
+ {
+ return context;
+ }
+
+ public void setContext(DeploymentContext context)
+ {
+ this.context = context;
+ }
+
+ public void setClassLoader(ClassLoader loader)
+ {
+ this.classLoader = loader;
+ }
+
+ public ClassLoader getClassLoader()
+ {
+ return classLoader;
+ }
+
+ public Service getService()
+ {
+ return service;
+ }
+
+ public void setService(Service service)
+ {
+ this.service = service;
+ }
+
+ public DeploymentState getState()
+ {
+ return state;
+ }
+
+ public void setState(DeploymentState deploymentState)
+ {
+ this.state = deploymentState;
+ }
+
+ public DeploymentType getType()
+ {
+ return type;
+ }
+
+ public void setType(DeploymentType deploymentType)
+ {
+ this.type = deploymentType;
+ }
+}
Deleted: projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/deployment/DeployerManagerImpl.java
===================================================================
--- projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/deployment/DeployerManagerImpl.java 2007-05-09 12:40:01 UTC (rev 3015)
+++ projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/deployment/DeployerManagerImpl.java 2007-05-09 12:40:45 UTC (rev 3016)
@@ -1,184 +0,0 @@
-/*
- * ====================================================================
- *
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999 The Apache Software Foundation. All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The end-user documentation included with the redistribution, if
- * any, must include the following acknowlegement:
- * "This product includes software developed by the
- * Apache Software Foundation (http://www.apache.org/)."
- * Alternately, this acknowlegement may appear in the software itself,
- * if and wherever such third-party acknowlegements normally appear.
- *
- * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
- * Foundation" must not be used to endorse or promote products derived
- * from this software without prior written permission. For written
- * permission, please contact apache(a)apache.org.
- *
- * 5. Products derived from this software may not be called "Apache"
- * nor may "Apache" appear in their names without prior written
- * permission of the Apache Group.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation. For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- */
-package org.jboss.ws.integration.deployment;
-
-// $Id$
-
-import java.util.LinkedList;
-import java.util.List;
-
-import org.jboss.logging.Logger;
-import org.jboss.ws.integration.deployment.Deployment.DeploymentState;
-
-/**
- * A general service deployment manger.
- *
- * @author Thomas.Diesler(a)jboss.com
- * @since 20-Apr-2007
- */
-public class DeployerManagerImpl implements DeployerManager
-{
- // provide logging
- private static final Logger log = Logger.getLogger(DeployerManagerImpl.class);
-
-
- private List<Deployer> deployers = new LinkedList<Deployer>();
-
- public List<Deployer> getDeployers()
- {
- return deployers;
- }
-
- public void setDeployers(List<Deployer> deployers)
- {
- this.deployers = deployers;
- }
-
- /**
- * Iterate over the registered deployers calls create on each.
- * Iterate over the registered deployers again and calls start on each.
- * If start fails it automaticall calls destroy in the reverse order
- * starting with the deployer that failed
- */
- public void deploy(Deployment dep)
- {
- // create the deployment
- for (int i = 0; i < deployers.size(); i++)
- {
- Deployer deployer = deployers.get(i);
- logInvocation(deployer, "Create");
- deployer.create(dep);
- }
-
- dep.setState(DeploymentState.CREATED);
-
- // start the deployment
- for (int i = 0; i < deployers.size(); i++)
- {
- Deployer deployer = deployers.get(i);
- try
- {
- logInvocation(deployer, "Start");
- deployer.start(dep);
- }
- catch (RuntimeException rte)
- {
- while (i-- >= 0)
- {
- // destroy the deployment
- failsafeDestroy(deployer, dep);
- }
- throw rte;
- }
- }
-
- dep.setState(DeploymentState.STARTED);
- }
-
- public void undeploy(Deployment dep)
- {
- // stop the deployment
- for (int i = deployers.size(); 0 < i; i--)
- {
- Deployer deployer = deployers.get(i - 1);
- failsafeStop(deployer, dep);
- }
-
- dep.setState(DeploymentState.STOPED);
-
- // destroy the deployment
- for (int i = deployers.size(); 0 < i; i--)
- {
- Deployer deployer = deployers.get(i - 1);
- failsafeDestroy(deployer, dep);
- }
-
- dep.setState(DeploymentState.DESTROYED);
- }
-
- private void failsafeStop(Deployer deployer, Deployment dep)
- {
- try
- {
- logInvocation(deployer, "Stop");
- deployer.stop(dep);
- }
- catch (RuntimeException rte)
- {
- WSDeploymentException.rethrow(rte);
- }
- }
-
- private void failsafeDestroy(Deployer deployer, Deployment dep)
- {
- try
- {
- logInvocation(deployer, "Destroy");
- deployer.destroy(dep);
- }
- catch (RuntimeException rte)
- {
- WSDeploymentException.rethrow(rte);
- }
- }
-
- private void logInvocation(Deployer deployer, String method)
- {
- String name = deployer.getClass().getName();
- name = name.substring(name.lastIndexOf(".") + 1);
- log.debug(name + ":" + method);
- }
-}
Deleted: projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/deployment/DeploymentContextImpl.java
===================================================================
--- projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/deployment/DeploymentContextImpl.java 2007-05-09 12:40:01 UTC (rev 3015)
+++ projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/deployment/DeploymentContextImpl.java 2007-05-09 12:40:45 UTC (rev 3016)
@@ -1,82 +0,0 @@
-/*
- * ====================================================================
- *
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999 The Apache Software Foundation. All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The end-user documentation included with the redistribution, if
- * any, must include the following acknowlegement:
- * "This product includes software developed by the
- * Apache Software Foundation (http://www.apache.org/)."
- * Alternately, this acknowlegement may appear in the software itself,
- * if and wherever such third-party acknowlegements normally appear.
- *
- * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
- * Foundation" must not be used to endorse or promote products derived
- * from this software without prior written permission. For written
- * permission, please contact apache(a)apache.org.
- *
- * 5. Products derived from this software may not be called "Apache"
- * nor may "Apache" appear in their names without prior written
- * permission of the Apache Group.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation. For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- */
-package org.jboss.ws.integration.deployment;
-
-//$Id$
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * A general web service deployment context.
- *
- * @author Thomas.Diesler(a)jboss.com
- * @since 20-Apr-2007
- */
-public class DeploymentContextImpl implements DeploymentContext
-{
- private Map<Class, Object> attachments = new HashMap<Class, Object>();
-
- public <T> T getAttachment(Class<T> clazz)
- {
- return (T)attachments.get(clazz);
- }
-
- public <T> T addAttachment(Class<T> clazz, Object obj)
- {
- return (T)attachments.put(clazz, obj);
- }
-}
Deleted: projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/deployment/DeploymentImpl.java
===================================================================
--- projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/deployment/DeploymentImpl.java 2007-05-09 12:40:01 UTC (rev 3015)
+++ projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/deployment/DeploymentImpl.java 2007-05-09 12:40:45 UTC (rev 3016)
@@ -1,140 +0,0 @@
-/*
- * ====================================================================
- *
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999 The Apache Software Foundation. All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The end-user documentation included with the redistribution, if
- * any, must include the following acknowlegement:
- * "This product includes software developed by the
- * Apache Software Foundation (http://www.apache.org/)."
- * Alternately, this acknowlegement may appear in the software itself,
- * if and wherever such third-party acknowlegements normally appear.
- *
- * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
- * Foundation" must not be used to endorse or promote products derived
- * from this software without prior written permission. For written
- * permission, please contact apache(a)apache.org.
- *
- * 5. Products derived from this software may not be called "Apache"
- * nor may "Apache" appear in their names without prior written
- * permission of the Apache Group.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation. For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- */
-package org.jboss.ws.integration.deployment;
-
-//$Id$
-
-import org.jboss.ws.integration.ServiceImpl;
-import org.jboss.ws.integration.Service;
-
-/**
- * A general web service deployment dep.
- *
- * It has no notion of J2EE deployment packages.
- *
- * @author Thomas.Diesler(a)jboss.com
- * @since 20-Apr-2007
- */
-public class DeploymentImpl implements Deployment
-{
- // The context for this deployment dep
- private DeploymentContext context;
- // A deployment has one service
- private Service service;
- // The type of this deployment
- private DeploymentType type;
- // The state for this deployment
- private DeploymentState state;
- // The deployment class loader
- private ClassLoader classLoader;
-
- public DeploymentImpl()
- {
- context = new DeploymentContextImpl();
- service = new ServiceImpl(this);
- state = DeploymentState.UNDEFINED;
- }
-
- public DeploymentContext getContext()
- {
- return context;
- }
-
- public void setContext(DeploymentContext context)
- {
- this.context = context;
- }
-
- public void setClassLoader(ClassLoader loader)
- {
- this.classLoader = loader;
- }
-
- public ClassLoader getClassLoader()
- {
- return classLoader;
- }
-
- public Service getService()
- {
- return service;
- }
-
- public void setService(Service service)
- {
- this.service = service;
- }
-
- public DeploymentState getState()
- {
- return state;
- }
-
- public void setState(DeploymentState deploymentState)
- {
- this.state = deploymentState;
- }
-
- public DeploymentType getType()
- {
- return type;
- }
-
- public void setType(DeploymentType deploymentType)
- {
- this.type = deploymentType;
- }
-}
Added: projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/management/BasicEndpointRegistry.java
===================================================================
--- projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/management/BasicEndpointRegistry.java (rev 0)
+++ projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/management/BasicEndpointRegistry.java 2007-05-09 12:40:45 UTC (rev 3016)
@@ -0,0 +1,135 @@
+/*
+ * ====================================================================
+ *
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ * any, must include the following acknowlegement:
+ * "This product includes software developed by the
+ * Apache Software Foundation (http://www.apache.org/)."
+ * Alternately, this acknowlegement may appear in the software itself,
+ * if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
+ * Foundation" must not be used to endorse or promote products derived
+ * from this software without prior written permission. For written
+ * permission, please contact apache(a)apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ * nor may "Apache" appear in their names without prior written
+ * permission of the Apache Group.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ */
+package org.jboss.ws.integration.management;
+
+// $Id$
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+import javax.management.ObjectName;
+
+import org.jboss.logging.Logger;
+import org.jboss.ws.integration.Endpoint;
+
+/**
+ * A general endpoint registry.
+ *
+ * @author Thomas.Diesler(a)jboss.com
+ * @since 20-Apr-2007
+ */
+public class BasicEndpointRegistry implements EndpointRegistry
+{
+ // provide logging
+ private static final Logger log = Logger.getLogger(BasicEndpointRegistry.class);
+
+ private Map<ObjectName, Endpoint> endpoints = new HashMap<ObjectName, Endpoint>();
+
+ public Endpoint getEndpoint(ObjectName epName)
+ {
+ if (epName == null)
+ throw new IllegalArgumentException("Endpoint name cannot be null");
+
+ if (isRegistered(epName) == false)
+ throw new IllegalStateException("Endpoint not registered: " + epName);
+
+ Endpoint endpoint = endpoints.get(epName);
+ return endpoint;
+ }
+
+ public boolean isRegistered(ObjectName epName)
+ {
+ if (epName == null)
+ throw new IllegalArgumentException("Endpoint name cannot be null");
+
+ return endpoints.get(epName) != null;
+ }
+
+ public Set<ObjectName> getEndpoints()
+ {
+ return endpoints.keySet();
+ }
+
+ public void register(Endpoint endpoint)
+ {
+ if (endpoint == null)
+ throw new IllegalArgumentException("Endpoint cannot be null");
+
+ ObjectName epName = endpoint.getName();
+ if (epName == null)
+ throw new IllegalStateException("Endpoint name cannot be null for: " + endpoint);
+
+ if (isRegistered(epName))
+ throw new IllegalStateException("Endpoint already registered: " + epName);
+
+ log.info("register: " + epName);
+ endpoints.put(epName, endpoint);
+ }
+
+ public void unregister(Endpoint endpoint)
+ {
+ if (endpoint == null)
+ throw new IllegalArgumentException("Endpoint cannot be null");
+
+ ObjectName epName = endpoint.getName();
+ if (isRegistered(epName) == false)
+ throw new IllegalStateException("Endpoint not registered: " + epName);
+
+ log.info("remove: " + epName);
+ endpoints.remove(epName);
+ }
+}
Property changes on: projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/management/BasicEndpointRegistry.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Copied: projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/management/BasicServerConfig.java (from rev 3013, projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/management/ServerConfigImpl.java)
===================================================================
--- projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/management/BasicServerConfig.java (rev 0)
+++ projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/management/BasicServerConfig.java 2007-05-09 12:40:45 UTC (rev 3016)
@@ -0,0 +1,218 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, 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.ws.integration.management;
+
+//$Id$
+
+import java.io.File;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.Iterator;
+import java.util.Set;
+
+import javax.management.AttributeNotFoundException;
+import javax.management.JMException;
+import javax.management.MBeanServer;
+import javax.management.MBeanServerFactory;
+import javax.management.ObjectName;
+
+import org.jboss.logging.Logger;
+import org.jboss.ws.integration.ObjectNameFactory;
+
+/**
+ * JBoss specific implementation of a ServerConfig
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @author darran.lofthouse(a)jboss.com
+ * @since 08-May-2006
+ */
+public class BasicServerConfig implements ServerConfig
+{
+ private static final Logger log = Logger.getLogger(BasicServerConfig.class);
+
+ // The webservice host name that will be used when updating the wsdl
+ private String webServiceHost = UNDEFINED_HOSTNAME;
+ // The webservice port that will be used when updating the wsdl
+ private int webServicePort;
+ // The webservice port that will be used when updating the wsdl
+ private int webServiceSecurePort;
+ // Whether we should always modify the soap address to the deployed endpoing location
+ private boolean modifySOAPAddress;
+ // The MBeanServer
+ private MBeanServer server;
+
+ public String getWebServiceHost()
+ {
+ return webServiceHost;
+ }
+
+ public void setWebServiceHost(String host) throws UnknownHostException
+ {
+ if (host == null || host.trim().length() == 0)
+ {
+ log.debug("Using undefined host: " + UNDEFINED_HOSTNAME);
+ host = UNDEFINED_HOSTNAME;
+ }
+ if ("0.0.0.0".equals(host))
+ {
+ InetAddress localHost = InetAddress.getLocalHost();
+ log.debug("Using local host: " + localHost.getHostName());
+ host = localHost.getHostName();
+ }
+ this.webServiceHost = host;
+ }
+
+ public void setWebServicePort(int port)
+ {
+ this.webServicePort = port;
+ }
+
+ public void setWebServiceSecurePort(int port)
+ {
+ this.webServiceSecurePort = port;
+ }
+
+ public boolean isModifySOAPAddress()
+ {
+ return modifySOAPAddress;
+ }
+
+ public void setModifySOAPAddress(boolean modify)
+ {
+ this.modifySOAPAddress = modify;
+ }
+
+ public File getServerTempDir()
+ {
+ try
+ {
+ MBeanServer server = getMBeanServer();
+ ObjectName oname = ObjectNameFactory.create("jboss.system:type=ServerConfig");
+ File tmpdir = (File)server.getAttribute(oname, "ServerTempDir");
+ return tmpdir;
+ }
+ catch (JMException e)
+ {
+ return null;
+ }
+ }
+
+ public File getServerDataDir()
+ {
+ try
+ {
+ MBeanServer server = getMBeanServer();
+ ObjectName oname = ObjectNameFactory.create("jboss.system:type=ServerConfig");
+ File tmpdir = (File)server.getAttribute(oname, "ServerDataDir");
+ return tmpdir;
+ }
+ catch (JMException e)
+ {
+ return null;
+ }
+ }
+
+ public int getWebServicePort()
+ {
+ if (webServicePort <= 0)
+ webServicePort = getConnectorPort("HTTP/1.1", false);
+
+ if (webServicePort <= 0)
+ {
+ log.warn("Unable to calculate 'WebServicePort', using default '8080'");
+ webServicePort = 8080;
+ }
+
+ return webServicePort;
+ }
+
+ public int getWebServiceSecurePort()
+ {
+ if (webServiceSecurePort <= 0)
+ webServiceSecurePort = getConnectorPort("HTTP/1.1", true);
+
+ if (webServiceSecurePort <= 0)
+ {
+ log.warn("Unable to calculate 'WebServiceSecurePort', using default '8443'");
+ webServiceSecurePort = 8443;
+ }
+
+ return webServiceSecurePort;
+ }
+
+ private int getConnectorPort(final String protocol, final boolean secure)
+ {
+ int port = -1;
+
+ try
+ {
+ MBeanServer server = getMBeanServer();
+ ObjectName connectors = new ObjectName("jboss.web:type=Connector,*");
+
+ Set connectorNames = server.queryNames(connectors, null);
+ for (Object current : connectorNames)
+ {
+ ObjectName currentName = (ObjectName)current;
+
+ try
+ {
+ int connectorPort = (Integer)server.getAttribute(currentName, "port");
+ boolean connectorSecure = (Boolean)server.getAttribute(currentName, "secure");
+ String connectorProtocol = (String)server.getAttribute(currentName, "protocol");
+
+ if (protocol.equals(connectorProtocol) && secure == connectorSecure)
+ {
+ if (port > -1)
+ {
+ log.warn("Found multiple connectors for protocol='" + protocol + "' and secure='" + secure + "', using first port found '" + port + "'");
+ }
+ else
+ {
+ port = connectorPort;
+ }
+ }
+ }
+ catch (AttributeNotFoundException ignored)
+ {
+ }
+ }
+
+ return port;
+ }
+ catch (JMException e)
+ {
+ return -1;
+ }
+ }
+
+ private MBeanServer getMBeanServer()
+ {
+ if (server == null)
+ {
+ for (Iterator i = MBeanServerFactory.findMBeanServer(null).iterator(); i.hasNext();)
+ {
+ server = (MBeanServer)i.next();
+ }
+ }
+ return server;
+ }
+}
Deleted: projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/management/EndpointRegistryImpl.java
===================================================================
--- projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/management/EndpointRegistryImpl.java 2007-05-09 12:40:01 UTC (rev 3015)
+++ projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/management/EndpointRegistryImpl.java 2007-05-09 12:40:45 UTC (rev 3016)
@@ -1,135 +0,0 @@
-/*
- * ====================================================================
- *
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999 The Apache Software Foundation. All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The end-user documentation included with the redistribution, if
- * any, must include the following acknowlegement:
- * "This product includes software developed by the
- * Apache Software Foundation (http://www.apache.org/)."
- * Alternately, this acknowlegement may appear in the software itself,
- * if and wherever such third-party acknowlegements normally appear.
- *
- * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
- * Foundation" must not be used to endorse or promote products derived
- * from this software without prior written permission. For written
- * permission, please contact apache(a)apache.org.
- *
- * 5. Products derived from this software may not be called "Apache"
- * nor may "Apache" appear in their names without prior written
- * permission of the Apache Group.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation. For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- */
-package org.jboss.ws.integration.management;
-
-// $Id$
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
-import javax.management.ObjectName;
-
-import org.jboss.logging.Logger;
-import org.jboss.ws.integration.Endpoint;
-
-/**
- * A general endpoint registry.
- *
- * @author Thomas.Diesler(a)jboss.com
- * @since 20-Apr-2007
- */
-public class EndpointRegistryImpl implements EndpointRegistry
-{
- // provide logging
- private static final Logger log = Logger.getLogger(EndpointRegistryImpl.class);
-
- private Map<ObjectName, Endpoint> endpoints = new HashMap<ObjectName, Endpoint>();
-
- public Endpoint getEndpoint(ObjectName epName)
- {
- if (epName == null)
- throw new IllegalArgumentException("Endpoint name cannot be null");
-
- if (isRegistered(epName) == false)
- throw new IllegalStateException("Endpoint not registered: " + epName);
-
- Endpoint endpoint = endpoints.get(epName);
- return endpoint;
- }
-
- public boolean isRegistered(ObjectName epName)
- {
- if (epName == null)
- throw new IllegalArgumentException("Endpoint name cannot be null");
-
- return endpoints.get(epName) != null;
- }
-
- public Set<ObjectName> getEndpoints()
- {
- return endpoints.keySet();
- }
-
- public void register(Endpoint endpoint)
- {
- if (endpoint == null)
- throw new IllegalArgumentException("Endpoint cannot be null");
-
- ObjectName epName = endpoint.getName();
- if (epName == null)
- throw new IllegalStateException("Endpoint name cannot be null for: " + endpoint);
-
- if (isRegistered(epName))
- throw new IllegalStateException("Endpoint already registered: " + epName);
-
- log.info("register: " + epName);
- endpoints.put(epName, endpoint);
- }
-
- public void unregister(Endpoint endpoint)
- {
- if (endpoint == null)
- throw new IllegalArgumentException("Endpoint cannot be null");
-
- ObjectName epName = endpoint.getName();
- if (isRegistered(epName) == false)
- throw new IllegalStateException("Endpoint not registered: " + epName);
-
- log.info("remove: " + epName);
- endpoints.remove(epName);
- }
-}
Modified: projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/management/ServerConfig.java
===================================================================
--- projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/management/ServerConfig.java 2007-05-09 12:40:01 UTC (rev 3015)
+++ projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/management/ServerConfig.java 2007-05-09 12:40:45 UTC (rev 3016)
@@ -24,6 +24,7 @@
// $Id$
import java.io.File;
+import java.net.UnknownHostException;
/**
* Interface to container independent config
@@ -45,9 +46,17 @@
String getWebServiceHost();
+ void setWebServiceHost(String host) throws UnknownHostException;
+
int getWebServicePort();
+ void setWebServicePort(int port);
+
int getWebServiceSecurePort();
+ void setWebServiceSecurePort(int port);
+
boolean isModifySOAPAddress();
+
+ void setModifySOAPAddress(boolean flag);
}
Deleted: projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/management/ServerConfigImpl.java
===================================================================
--- projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/management/ServerConfigImpl.java 2007-05-09 12:40:01 UTC (rev 3015)
+++ projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/management/ServerConfigImpl.java 2007-05-09 12:40:45 UTC (rev 3016)
@@ -1,218 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, 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.ws.integration.management;
-
-//$Id$
-
-import java.io.File;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.Iterator;
-import java.util.Set;
-
-import javax.management.AttributeNotFoundException;
-import javax.management.JMException;
-import javax.management.MBeanServer;
-import javax.management.MBeanServerFactory;
-import javax.management.ObjectName;
-
-import org.jboss.logging.Logger;
-import org.jboss.ws.integration.ObjectNameFactory;
-
-/**
- * JBoss specific implementation of a ServerConfig
- *
- * @author Thomas.Diesler(a)jboss.org
- * @author darran.lofthouse(a)jboss.com
- * @since 08-May-2006
- */
-public class ServerConfigImpl implements ServerConfig
-{
- private static final Logger log = Logger.getLogger(ServerConfigImpl.class);
-
- // The webservice host name that will be used when updating the wsdl
- private String webServiceHost = UNDEFINED_HOSTNAME;
- // The webservice port that will be used when updating the wsdl
- private int webServicePort;
- // The webservice port that will be used when updating the wsdl
- private int webServiceSecurePort;
- // Whether we should always modify the soap address to the deployed endpoing location
- private boolean modifySOAPAddress;
- // The MBeanServer
- private MBeanServer server;
-
- public String getWebServiceHost()
- {
- return webServiceHost;
- }
-
- public void setWebServiceHost(String host) throws UnknownHostException
- {
- if (host == null || host.trim().length() == 0)
- {
- log.debug("Using undefined host: " + UNDEFINED_HOSTNAME);
- host = UNDEFINED_HOSTNAME;
- }
- if ("0.0.0.0".equals(host))
- {
- InetAddress localHost = InetAddress.getLocalHost();
- log.debug("Using local host: " + localHost.getHostName());
- host = localHost.getHostName();
- }
- this.webServiceHost = host;
- }
-
- public void setWebServicePort(int port)
- {
- this.webServicePort = port;
- }
-
- public void setWebServiceSecurePort(int port)
- {
- this.webServiceSecurePort = port;
- }
-
- public boolean isModifySOAPAddress()
- {
- return modifySOAPAddress;
- }
-
- public void setModifySOAPAddress(boolean modify)
- {
- this.modifySOAPAddress = modify;
- }
-
- public File getServerTempDir()
- {
- try
- {
- MBeanServer server = getMBeanServer();
- ObjectName oname = ObjectNameFactory.create("jboss.system:type=ServerConfig");
- File tmpdir = (File)server.getAttribute(oname, "ServerTempDir");
- return tmpdir;
- }
- catch (JMException e)
- {
- return null;
- }
- }
-
- public File getServerDataDir()
- {
- try
- {
- MBeanServer server = getMBeanServer();
- ObjectName oname = ObjectNameFactory.create("jboss.system:type=ServerConfig");
- File tmpdir = (File)server.getAttribute(oname, "ServerDataDir");
- return tmpdir;
- }
- catch (JMException e)
- {
- return null;
- }
- }
-
- public int getWebServicePort()
- {
- if (webServicePort <= 0)
- webServicePort = getConnectorPort("HTTP/1.1", false);
-
- if (webServicePort <= 0)
- {
- log.warn("Unable to calculate 'WebServicePort', using default '8080'");
- webServicePort = 8080;
- }
-
- return webServicePort;
- }
-
- public int getWebServiceSecurePort()
- {
- if (webServiceSecurePort <= 0)
- webServiceSecurePort = getConnectorPort("HTTP/1.1", true);
-
- if (webServiceSecurePort <= 0)
- {
- log.warn("Unable to calculate 'WebServiceSecurePort', using default '8443'");
- webServiceSecurePort = 8443;
- }
-
- return webServiceSecurePort;
- }
-
- private int getConnectorPort(final String protocol, final boolean secure)
- {
- int port = -1;
-
- try
- {
- MBeanServer server = getMBeanServer();
- ObjectName connectors = new ObjectName("jboss.web:type=Connector,*");
-
- Set connectorNames = server.queryNames(connectors, null);
- for (Object current : connectorNames)
- {
- ObjectName currentName = (ObjectName)current;
-
- try
- {
- int connectorPort = (Integer)server.getAttribute(currentName, "port");
- boolean connectorSecure = (Boolean)server.getAttribute(currentName, "secure");
- String connectorProtocol = (String)server.getAttribute(currentName, "protocol");
-
- if (protocol.equals(connectorProtocol) && secure == connectorSecure)
- {
- if (port > -1)
- {
- log.warn("Found multiple connectors for protocol='" + protocol + "' and secure='" + secure + "', using first port found '" + port + "'");
- }
- else
- {
- port = connectorPort;
- }
- }
- }
- catch (AttributeNotFoundException ignored)
- {
- }
- }
-
- return port;
- }
- catch (JMException e)
- {
- return -1;
- }
- }
-
- private MBeanServer getMBeanServer()
- {
- if (server == null)
- {
- for (Iterator i = MBeanServerFactory.findMBeanServer(null).iterator(); i.hasNext();)
- {
- server = (MBeanServer)i.next();
- }
- }
- return server;
- }
-}
Modified: projects/wsintegration/jbws-jboss42/trunk/src/main/java/org/jboss/ws/integration/jboss42/jbossws/JAXRPCDeployerHookEJB21.java
===================================================================
--- projects/wsintegration/jbws-jboss42/trunk/src/main/java/org/jboss/ws/integration/jboss42/jbossws/JAXRPCDeployerHookEJB21.java 2007-05-09 12:40:01 UTC (rev 3015)
+++ projects/wsintegration/jbws-jboss42/trunk/src/main/java/org/jboss/ws/integration/jboss42/jbossws/JAXRPCDeployerHookEJB21.java 2007-05-09 12:40:45 UTC (rev 3016)
@@ -27,11 +27,11 @@
import org.jboss.metadata.ApplicationMetaData;
import org.jboss.metadata.BeanMetaData;
import org.jboss.ws.integration.Endpoint;
-import org.jboss.ws.integration.EndpointImpl;
+import org.jboss.ws.integration.BasicEndpoint;
import org.jboss.ws.integration.ObjectNameFactory;
import org.jboss.ws.integration.Service;
import org.jboss.ws.integration.deployment.Deployment;
-import org.jboss.ws.integration.deployment.DeploymentImpl;
+import org.jboss.ws.integration.deployment.BasicDeploymentImpl;
import org.jboss.ws.integration.deployment.Deployment.DeploymentType;
import org.jboss.ws.metadata.webservices.PortComponentMetaData;
import org.jboss.ws.metadata.webservices.WebserviceDescriptionMetaData;
@@ -55,7 +55,7 @@
@Override
public Deployment createDeployment(DeploymentInfo unit)
{
- Deployment dep = new DeploymentImpl();
+ Deployment dep = new BasicDeploymentImpl();
dep.setType(getDeploymentType());
dep.setClassLoader(unit.ucl);
@@ -92,7 +92,7 @@
Class<?> epBean = loader.loadClass(ejbClass.trim());
// Create the endpoint
- Endpoint endpoint = new EndpointImpl(service, epBean);
+ Endpoint endpoint = new BasicEndpoint(service, epBean);
String nameStr = Endpoint.SEPID_DOMAIN + ":" + Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + ejbLink;
endpoint.setName(ObjectNameFactory.create(nameStr));
Modified: projects/wsintegration/jbws-jboss42/trunk/src/main/java/org/jboss/ws/integration/jboss42/jbossws/JAXRPCDeployerHookJSE.java
===================================================================
--- projects/wsintegration/jbws-jboss42/trunk/src/main/java/org/jboss/ws/integration/jboss42/jbossws/JAXRPCDeployerHookJSE.java 2007-05-09 12:40:01 UTC (rev 3015)
+++ projects/wsintegration/jbws-jboss42/trunk/src/main/java/org/jboss/ws/integration/jboss42/jbossws/JAXRPCDeployerHookJSE.java 2007-05-09 12:40:45 UTC (rev 3016)
@@ -30,11 +30,11 @@
import org.jboss.deployment.DeploymentInfo;
import org.jboss.metadata.WebMetaData;
import org.jboss.ws.integration.Endpoint;
-import org.jboss.ws.integration.EndpointImpl;
+import org.jboss.ws.integration.BasicEndpoint;
import org.jboss.ws.integration.ObjectNameFactory;
import org.jboss.ws.integration.Service;
import org.jboss.ws.integration.deployment.Deployment;
-import org.jboss.ws.integration.deployment.DeploymentImpl;
+import org.jboss.ws.integration.deployment.BasicDeploymentImpl;
import org.jboss.ws.integration.deployment.Deployment.DeploymentType;
import org.jboss.ws.metadata.webservices.PortComponentMetaData;
import org.jboss.ws.metadata.webservices.WebserviceDescriptionMetaData;
@@ -61,7 +61,7 @@
@Override
public Deployment createDeployment(DeploymentInfo unit)
{
- Deployment dep = new DeploymentImpl();
+ Deployment dep = new BasicDeploymentImpl();
dep.setType(getDeploymentType());
dep.setClassLoader(unit.annotationsCl);
@@ -96,7 +96,7 @@
Class<?> epBean = loader.loadClass(servletClass.trim());
// Create the endpoint
- Endpoint endpoint = new EndpointImpl(service, epBean);
+ Endpoint endpoint = new BasicEndpoint(service, epBean);
String nameStr = Endpoint.SEPID_DOMAIN + ":" + Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + servletLink;
endpoint.setName(ObjectNameFactory.create(nameStr));
Modified: projects/wsintegration/jbws-jboss42/trunk/src/main/java/org/jboss/ws/integration/jboss42/jbossws/JAXWSDeployerHookEJB3.java
===================================================================
--- projects/wsintegration/jbws-jboss42/trunk/src/main/java/org/jboss/ws/integration/jboss42/jbossws/JAXWSDeployerHookEJB3.java 2007-05-09 12:40:01 UTC (rev 3015)
+++ projects/wsintegration/jbws-jboss42/trunk/src/main/java/org/jboss/ws/integration/jboss42/jbossws/JAXWSDeployerHookEJB3.java 2007-05-09 12:40:45 UTC (rev 3016)
@@ -31,11 +31,11 @@
import org.jboss.ejb3.Ejb3ModuleMBean;
import org.jboss.ejb3.stateless.StatelessContainer;
import org.jboss.ws.integration.Endpoint;
-import org.jboss.ws.integration.EndpointImpl;
+import org.jboss.ws.integration.BasicEndpoint;
import org.jboss.ws.integration.ObjectNameFactory;
import org.jboss.ws.integration.Service;
import org.jboss.ws.integration.deployment.Deployment;
-import org.jboss.ws.integration.deployment.DeploymentImpl;
+import org.jboss.ws.integration.deployment.BasicDeploymentImpl;
import org.jboss.ws.integration.deployment.Deployment.DeploymentType;
/**
@@ -56,7 +56,7 @@
@Override
public Deployment createDeployment(DeploymentInfo unit)
{
- Deployment dep = new DeploymentImpl();
+ Deployment dep = new BasicDeploymentImpl();
dep.setType(getDeploymentType());
dep.setClassLoader(unit.ucl);
@@ -74,7 +74,7 @@
Class epBean = container.getBeanClass();
// Create the endpoint
- Endpoint endpoint = new EndpointImpl(service, epBean);
+ Endpoint endpoint = new BasicEndpoint(service, epBean);
String nameStr = Endpoint.SEPID_DOMAIN + ":" + Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + ejbName;
endpoint.setName(ObjectNameFactory.create(nameStr));
Modified: projects/wsintegration/jbws-jboss42/trunk/src/main/java/org/jboss/ws/integration/jboss42/jbossws/JAXWSDeployerHookJSE.java
===================================================================
--- projects/wsintegration/jbws-jboss42/trunk/src/main/java/org/jboss/ws/integration/jboss42/jbossws/JAXWSDeployerHookJSE.java 2007-05-09 12:40:01 UTC (rev 3015)
+++ projects/wsintegration/jbws-jboss42/trunk/src/main/java/org/jboss/ws/integration/jboss42/jbossws/JAXWSDeployerHookJSE.java 2007-05-09 12:40:45 UTC (rev 3016)
@@ -36,13 +36,13 @@
import org.jboss.deployment.DeploymentInfo;
import org.jboss.metadata.WebMetaData;
import org.jboss.ws.integration.Endpoint;
-import org.jboss.ws.integration.EndpointImpl;
+import org.jboss.ws.integration.BasicEndpoint;
import org.jboss.ws.integration.ObjectNameFactory;
import org.jboss.ws.integration.ResourceLoaderAdapter;
import org.jboss.ws.integration.Service;
import org.jboss.ws.integration.UnifiedVirtualFile;
import org.jboss.ws.integration.deployment.Deployment;
-import org.jboss.ws.integration.deployment.DeploymentImpl;
+import org.jboss.ws.integration.deployment.BasicDeploymentImpl;
import org.jboss.ws.integration.deployment.Deployment.DeploymentType;
/**
@@ -63,7 +63,7 @@
@Override
public Deployment createDeployment(DeploymentInfo unit)
{
- Deployment dep = new DeploymentImpl();
+ Deployment dep = new BasicDeploymentImpl();
dep.setType(getDeploymentType());
dep.setClassLoader(unit.annotationsCl);
@@ -88,7 +88,7 @@
Class<?> epBean = loader.loadClass(servletClass.trim());
// Create the endpoint
- Endpoint endpoint = new EndpointImpl(service, epBean);
+ Endpoint endpoint = new BasicEndpoint(service, epBean);
String nameStr = Endpoint.SEPID_DOMAIN + ":" + Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + servletName;
endpoint.setName(ObjectNameFactory.create(nameStr));
Modified: projects/wsintegration/jbws-jboss42/trunk/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml
===================================================================
--- projects/wsintegration/jbws-jboss42/trunk/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml 2007-05-09 12:40:01 UTC (rev 3015)
+++ projects/wsintegration/jbws-jboss42/trunk/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml 2007-05-09 12:40:45 UTC (rev 3016)
@@ -3,7 +3,7 @@
<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" xmlns="urn:jboss:bean-deployer">
<!-- An abstraction of server configuration aspects. -->
- <bean name="WSServerConfig" class="org.jboss.ws.integration.management.ServerConfigImpl">
+ <bean name="WSServerConfig" class="org.jboss.ws.core.server.ManagedServerConfig">
<!--
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.
@@ -26,7 +26,7 @@
</bean>
<!-- The registry for web service endpoints -->
- <bean name="WSEndpointRegistry" class="org.jboss.ws.core.server.ServiceEndpointRegistry"/>
+ <bean name="WSEndpointRegistry" class="org.jboss.ws.core.server.ManagedEndpointRegistry"/>
<!-- A subscription manager for WS-Eventing -->
<bean name="WSSubscriptionManager" class="org.jboss.ws.extensions.eventing.mgmt.SubscriptionManager"/>
@@ -76,7 +76,7 @@
Each DeploymentManger maintains a list of Deployers
Each Deployer handles a single aspect of web service deployment.
-->
- <bean name="WSDeployerManagerJSE" class="org.jboss.ws.integration.deployment.DeployerManagerImpl">
+ <bean name="WSDeployerManagerJSE" class="org.jboss.ws.integration.deployment.BasicDeployerManager">
<property name="deployers">
<list class="java.util.LinkedList" elementClass="org.jboss.ws.integration.deployment.Deployer">
<inject bean="WSUnifiedDeploymentInfoDeployer"/>
@@ -86,7 +86,7 @@
</list>
</property>
</bean>
- <bean name="WSDeployerManagerEJB" class="org.jboss.ws.integration.deployment.DeployerManagerImpl">
+ <bean name="WSDeployerManagerEJB" class="org.jboss.ws.integration.deployment.BasicDeployerManager">
<property name="deployers">
<list class="java.util.LinkedList" elementClass="org.jboss.ws.integration.deployment.Deployer">
<inject bean="WSUnifiedDeploymentInfoDeployer"/>
@@ -97,7 +97,7 @@
</list>
</property>
</bean>
- <bean name="WSMainDeployerManager" class="org.jboss.ws.integration.deployment.DeployerManagerImpl">
+ <bean name="WSMainDeployerManager" class="org.jboss.ws.integration.deployment.BasicDeployerManager">
<property name="deployers">
<list class="java.util.LinkedList" elementClass="org.jboss.ws.integration.deployment.Deployer">
<inject bean="WSEndpointNameDeployer"/>
Modified: projects/wsintegration/jbws-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/jbossws/JAXRPCDeployerHookEJB21.java
===================================================================
--- projects/wsintegration/jbws-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/jbossws/JAXRPCDeployerHookEJB21.java 2007-05-09 12:40:01 UTC (rev 3015)
+++ projects/wsintegration/jbws-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/jbossws/JAXRPCDeployerHookEJB21.java 2007-05-09 12:40:45 UTC (rev 3016)
@@ -27,11 +27,11 @@
import org.jboss.metadata.ApplicationMetaData;
import org.jboss.metadata.BeanMetaData;
import org.jboss.ws.integration.Endpoint;
-import org.jboss.ws.integration.EndpointImpl;
+import org.jboss.ws.integration.BasicEndpoint;
import org.jboss.ws.integration.ObjectNameFactory;
import org.jboss.ws.integration.Service;
import org.jboss.ws.integration.deployment.Deployment;
-import org.jboss.ws.integration.deployment.DeploymentImpl;
+import org.jboss.ws.integration.deployment.BasicDeploymentImpl;
import org.jboss.ws.integration.deployment.Deployment.DeploymentType;
import org.jboss.ws.metadata.webservices.PortComponentMetaData;
import org.jboss.ws.metadata.webservices.WebserviceDescriptionMetaData;
@@ -55,7 +55,7 @@
@Override
public Deployment createDeployment(DeploymentUnit unit)
{
- Deployment dep = new DeploymentImpl();
+ Deployment dep = new BasicDeploymentImpl();
dep.setType(getDeploymentType());
dep.setClassLoader(unit.getClassLoader());
@@ -92,7 +92,7 @@
Class<?> epBean = loader.loadClass(ejbClass.trim());
// Create the endpoint
- Endpoint endpoint = new EndpointImpl(service, epBean);
+ Endpoint endpoint = new BasicEndpoint(service, epBean);
String nameStr = Endpoint.SEPID_DOMAIN + ":" + Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + ejbLink;
endpoint.setName(ObjectNameFactory.create(nameStr));
Modified: projects/wsintegration/jbws-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/jbossws/JAXRPCDeployerHookJSE.java
===================================================================
--- projects/wsintegration/jbws-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/jbossws/JAXRPCDeployerHookJSE.java 2007-05-09 12:40:01 UTC (rev 3015)
+++ projects/wsintegration/jbws-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/jbossws/JAXRPCDeployerHookJSE.java 2007-05-09 12:40:45 UTC (rev 3016)
@@ -26,11 +26,11 @@
import org.jboss.deployers.spi.deployer.DeploymentUnit;
import org.jboss.metadata.WebMetaData;
import org.jboss.metadata.web.Servlet;
-import org.jboss.ws.integration.EndpointImpl;
+import org.jboss.ws.integration.BasicEndpoint;
import org.jboss.ws.integration.Endpoint;
import org.jboss.ws.integration.ObjectNameFactory;
import org.jboss.ws.integration.Service;
-import org.jboss.ws.integration.deployment.DeploymentImpl;
+import org.jboss.ws.integration.deployment.BasicDeploymentImpl;
import org.jboss.ws.integration.deployment.Deployment;
import org.jboss.ws.integration.deployment.Deployment.DeploymentType;
import org.jboss.ws.metadata.webservices.PortComponentMetaData;
@@ -58,7 +58,7 @@
@Override
public Deployment createDeployment(DeploymentUnit unit)
{
- Deployment dep = new DeploymentImpl();
+ Deployment dep = new BasicDeploymentImpl();
dep.setType(getDeploymentType());
dep.setClassLoader(unit.getClassLoader());
@@ -93,7 +93,7 @@
Class<?> epBean = loader.loadClass(servletClass.trim());
// Create the endpoint
- Endpoint endpoint = new EndpointImpl(service, epBean);
+ Endpoint endpoint = new BasicEndpoint(service, epBean);
String nameStr = Endpoint.SEPID_DOMAIN + ":" + Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + servletLink;
endpoint.setName(ObjectNameFactory.create(nameStr));
Modified: projects/wsintegration/jbws-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/jbossws/JAXWSDeployerHookEJB3.java
===================================================================
--- projects/wsintegration/jbws-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/jbossws/JAXWSDeployerHookEJB3.java 2007-05-09 12:40:01 UTC (rev 3015)
+++ projects/wsintegration/jbws-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/jbossws/JAXWSDeployerHookEJB3.java 2007-05-09 12:40:45 UTC (rev 3016)
@@ -32,11 +32,11 @@
import org.jboss.ejb3.EJBContainer;
import org.jboss.ejb3.Ejb3Deployment;
import org.jboss.ejb3.stateless.StatelessContainer;
-import org.jboss.ws.integration.EndpointImpl;
+import org.jboss.ws.integration.BasicEndpoint;
import org.jboss.ws.integration.Endpoint;
import org.jboss.ws.integration.ObjectNameFactory;
import org.jboss.ws.integration.Service;
-import org.jboss.ws.integration.deployment.DeploymentImpl;
+import org.jboss.ws.integration.deployment.BasicDeploymentImpl;
import org.jboss.ws.integration.deployment.Deployment;
import org.jboss.ws.integration.deployment.Deployment.DeploymentType;
@@ -58,7 +58,7 @@
@Override
public Deployment createDeployment(DeploymentUnit unit)
{
- Deployment dep = new DeploymentImpl();
+ Deployment dep = new BasicDeploymentImpl();
dep.setType(getDeploymentType());
dep.setClassLoader(unit.getClassLoader());
@@ -81,7 +81,7 @@
Class epBean = container.getBeanClass();
// Create the endpoint
- Endpoint endpoint = new EndpointImpl(service, epBean);
+ Endpoint endpoint = new BasicEndpoint(service, epBean);
String nameStr = Endpoint.SEPID_DOMAIN + ":" + Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + ejbName;
endpoint.setName(ObjectNameFactory.create(nameStr));
Modified: projects/wsintegration/jbws-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/jbossws/JAXWSDeployerHookJSE.java
===================================================================
--- projects/wsintegration/jbws-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/jbossws/JAXWSDeployerHookJSE.java 2007-05-09 12:40:01 UTC (rev 3015)
+++ projects/wsintegration/jbws-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/jbossws/JAXWSDeployerHookJSE.java 2007-05-09 12:40:45 UTC (rev 3016)
@@ -32,11 +32,11 @@
import org.jboss.deployers.spi.deployer.DeploymentUnit;
import org.jboss.metadata.WebMetaData;
import org.jboss.metadata.web.Servlet;
-import org.jboss.ws.integration.EndpointImpl;
+import org.jboss.ws.integration.BasicEndpoint;
import org.jboss.ws.integration.Endpoint;
import org.jboss.ws.integration.ObjectNameFactory;
import org.jboss.ws.integration.Service;
-import org.jboss.ws.integration.deployment.DeploymentImpl;
+import org.jboss.ws.integration.deployment.BasicDeploymentImpl;
import org.jboss.ws.integration.deployment.Deployment;
import org.jboss.ws.integration.deployment.Deployment.DeploymentType;
@@ -58,7 +58,7 @@
@Override
public Deployment createDeployment(DeploymentUnit unit)
{
- Deployment dep = new DeploymentImpl();
+ Deployment dep = new BasicDeploymentImpl();
dep.setType(getDeploymentType());
dep.setClassLoader(unit.getClassLoader());
@@ -83,7 +83,7 @@
Class<?> epBean = loader.loadClass(servletClass.trim());
// Create the endpoint
- Endpoint endpoint = new EndpointImpl(service, epBean);
+ Endpoint endpoint = new BasicEndpoint(service, epBean);
String nameStr = Endpoint.SEPID_DOMAIN + ":" + Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + servletName;
endpoint.setName(ObjectNameFactory.create(nameStr));
Modified: projects/wsintegration/jbws-jboss50/trunk/src/main/resources/jbossws.sar/META-INF/jbossws-beans.xml
===================================================================
--- projects/wsintegration/jbws-jboss50/trunk/src/main/resources/jbossws.sar/META-INF/jbossws-beans.xml 2007-05-09 12:40:01 UTC (rev 3015)
+++ projects/wsintegration/jbws-jboss50/trunk/src/main/resources/jbossws.sar/META-INF/jbossws-beans.xml 2007-05-09 12:40:45 UTC (rev 3016)
@@ -3,7 +3,7 @@
<deployment xmlns="urn:jboss:bean-deployer:2.0">
<!-- An abstraction of server configuration aspects. -->
- <bean name="WSServerConfig" class="org.jboss.ws.integration.management.ServerConfigImpl">
+ <bean name="WSServerConfig" class="org.jboss.ws.core.server.ManagedServerConfig">
<!--
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.
@@ -26,7 +26,7 @@
</bean>
<!-- The registry for web service endpoints -->
- <bean name="WSEndpointRegistry" class="org.jboss.ws.core.server.ServiceEndpointRegistry"/>
+ <bean name="WSEndpointRegistry" class="org.jboss.ws.core.server.ManagedEndpointRegistry"/>
<!-- A subscription manager for WS-Eventing -->
<bean name="WSSubscriptionManager" class="org.jboss.ws.extensions.eventing.mgmt.SubscriptionManager"/>
@@ -88,7 +88,7 @@
Each DeploymentManger maintains a list of Deployers
Each Deployer handles a single aspect of web service deployment.
-->
- <bean name="WSDeployerManagerJSE" class="org.jboss.ws.integration.deployment.DeployerManagerImpl">
+ <bean name="WSDeployerManagerJSE" class="org.jboss.ws.integration.deployment.BasicDeployerManager">
<property name="deployers">
<list class="java.util.LinkedList" elementClass="org.jboss.ws.integration.deployment.Deployer">
<inject bean="WSUnifiedDeploymentInfoDeployer"/>
@@ -98,7 +98,7 @@
</list>
</property>
</bean>
- <bean name="WSDeployerManagerEJB" class="org.jboss.ws.integration.deployment.DeployerManagerImpl">
+ <bean name="WSDeployerManagerEJB" class="org.jboss.ws.integration.deployment.BasicDeployerManager">
<property name="deployers">
<list class="java.util.LinkedList" elementClass="org.jboss.ws.integration.deployment.Deployer">
<inject bean="WSUnifiedDeploymentInfoDeployer"/>
@@ -109,7 +109,7 @@
</list>
</property>
</bean>
- <bean name="WSMainDeployerManager" class="org.jboss.ws.integration.deployment.DeployerManagerImpl">
+ <bean name="WSMainDeployerManager" class="org.jboss.ws.integration.deployment.BasicDeployerManager">
<property name="deployers">
<list class="java.util.LinkedList" elementClass="org.jboss.ws.integration.deployment.Deployer">
<inject bean="WSEndpointNameDeployer"/>
17 years, 8 months
- 1
- 0
JBossWS SVN: r3015 - in trunk: jbossws-tests and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-05-09 08:40:01 -0400 (Wed, 09 May 2007)
New Revision: 3015
Added:
trunk/jbossws-core/src/java/org/jboss/ws/core/server/ManagedEndpointRegistry.java
trunk/jbossws-core/src/java/org/jboss/ws/core/server/ManagedEndpointRegistryMBean.java
Removed:
trunk/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointRegistry.java
trunk/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointRegistryMBean.java
Modified:
trunk/jbossws-core/src/java/org/jboss/ws/core/server/LifecycleHandlerImpl.java
trunk/jbossws-tests/.classpath
trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1115/JBWS1115TestCase.java
Log:
Fix JBWS-1115
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/server/LifecycleHandlerImpl.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/server/LifecycleHandlerImpl.java 2007-05-09 11:47:50 UTC (rev 3014)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/server/LifecycleHandlerImpl.java 2007-05-09 12:40:01 UTC (rev 3015)
@@ -32,7 +32,7 @@
* @author Thomas.Diesler(a)jboss.org
* @since 25-Apr-2007
*/
-public class LifecycleHandlerImpl extends org.jboss.ws.integration.LifecycleHandlerImpl
+public class LifecycleHandlerImpl extends org.jboss.ws.integration.BasicLifecycleHandler
{
public void start(Endpoint endpoint)
{
Copied: trunk/jbossws-core/src/java/org/jboss/ws/core/server/ManagedEndpointRegistry.java (from rev 3007, trunk/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointRegistry.java)
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/server/ManagedEndpointRegistry.java (rev 0)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/server/ManagedEndpointRegistry.java 2007-05-09 12:40:01 UTC (rev 3015)
@@ -0,0 +1,81 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, 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.ws.core.server;
+
+// $Id$
+
+import java.util.ArrayList;
+
+import javax.management.MBeanServer;
+import javax.management.MBeanServerFactory;
+
+import org.jboss.logging.Logger;
+import org.jboss.ws.integration.management.BasicEndpointRegistry;
+import org.jboss.ws.metadata.umdm.UnifiedMetaData;
+
+/**
+ * A Service Endpoint Registry
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 04-May-2007
+ */
+public class ManagedEndpointRegistry extends BasicEndpointRegistry implements ManagedEndpointRegistryMBean
+{
+ // provide logging
+ private static final Logger log = Logger.getLogger(ManagedEndpointRegistry.class);
+
+ public String getImplementationVersion()
+ {
+ return UnifiedMetaData.getImplementationVersion();
+ }
+
+ public void create() throws Exception
+ {
+ log.info(UnifiedMetaData.getImplementationVersion());
+ MBeanServer server = getMBeanServer();
+ if (server != null)
+ {
+ server.registerMBean(this, OBJECT_NAME);
+ }
+ }
+
+ public void destroy() throws Exception
+ {
+ log.debug("Destroy service endpoint manager");
+ MBeanServer server = getMBeanServer();
+ if (server != null)
+ {
+ server.unregisterMBean(OBJECT_NAME);
+ }
+ }
+
+ private MBeanServer getMBeanServer()
+ {
+ MBeanServer server = null;
+ ArrayList servers = MBeanServerFactory.findMBeanServer(null);
+ if (servers.size() > 0)
+ {
+ server = (MBeanServer)servers.get(0);
+ }
+ return server;
+ }
+}
Copied: trunk/jbossws-core/src/java/org/jboss/ws/core/server/ManagedEndpointRegistryMBean.java (from rev 3007, trunk/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointRegistryMBean.java)
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/server/ManagedEndpointRegistryMBean.java (rev 0)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/server/ManagedEndpointRegistryMBean.java 2007-05-09 12:40:01 UTC (rev 3015)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, 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.ws.core.server;
+
+import javax.management.ObjectName;
+
+import org.jboss.ws.integration.ObjectNameFactory;
+import org.jboss.ws.integration.management.EndpointRegistry;
+
+/**
+ * MBean interface.
+ * @since 15-April-2004
+ */
+public interface ManagedEndpointRegistryMBean extends EndpointRegistry
+{
+ // default object name
+ static final ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.ws:service=EndpointRegistry");
+
+ String getImplementationVersion();
+}
Deleted: trunk/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointRegistry.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointRegistry.java 2007-05-09 11:47:50 UTC (rev 3014)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointRegistry.java 2007-05-09 12:40:01 UTC (rev 3015)
@@ -1,81 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, 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.ws.core.server;
-
-// $Id$
-
-import java.util.ArrayList;
-
-import javax.management.MBeanServer;
-import javax.management.MBeanServerFactory;
-
-import org.jboss.logging.Logger;
-import org.jboss.ws.integration.management.EndpointRegistryImpl;
-import org.jboss.ws.metadata.umdm.UnifiedMetaData;
-
-/**
- * A Service Endpoint Registry
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 04-May-2007
- */
-public class ServiceEndpointRegistry extends EndpointRegistryImpl implements ServiceEndpointRegistryMBean
-{
- // provide logging
- private static final Logger log = Logger.getLogger(ServiceEndpointRegistry.class);
-
- public String getImplementationVersion()
- {
- return UnifiedMetaData.getImplementationVersion();
- }
-
- public void create() throws Exception
- {
- log.info(UnifiedMetaData.getImplementationVersion());
- MBeanServer server = getMBeanServer();
- if (server != null)
- {
- server.registerMBean(this, OBJECT_NAME);
- }
- }
-
- public void destroy() throws Exception
- {
- log.debug("Destroy service endpoint manager");
- MBeanServer server = getMBeanServer();
- if (server != null)
- {
- server.unregisterMBean(OBJECT_NAME);
- }
- }
-
- private MBeanServer getMBeanServer()
- {
- MBeanServer server = null;
- ArrayList servers = MBeanServerFactory.findMBeanServer(null);
- if (servers.size() > 0)
- {
- server = (MBeanServer)servers.get(0);
- }
- return server;
- }
-}
Deleted: trunk/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointRegistryMBean.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointRegistryMBean.java 2007-05-09 11:47:50 UTC (rev 3014)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointRegistryMBean.java 2007-05-09 12:40:01 UTC (rev 3015)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, 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.ws.core.server;
-
-import javax.management.ObjectName;
-
-import org.jboss.ws.integration.ObjectNameFactory;
-
-/**
- * MBean interface.
- * @since 15-April-2004
- */
-public interface ServiceEndpointRegistryMBean
-{
- // default object name
- static final ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.ws:service=ServiceEndpointRegistry");
-
- String getImplementationVersion();
-}
Modified: trunk/jbossws-tests/.classpath
===================================================================
--- trunk/jbossws-tests/.classpath 2007-05-09 11:47:50 UTC (rev 3014)
+++ trunk/jbossws-tests/.classpath 2007-05-09 12:40:01 UTC (rev 3015)
@@ -37,6 +37,6 @@
<classpathentry kind="lib" path="/build/thirdparty/jbosssx-client.jar" sourcepath="/build/thirdparty/jbosssx-src.zip"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-common-core.jar" sourcepath="/build/thirdparty/jboss-common-core-sources.jar"/>
- <classpathentry kind="lib" path="/build/thirdparty/jbossws-spi.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/jbossws-spi"/>
<classpathentry kind="output" path="output-eclipse"/>
</classpath>
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1115/JBWS1115TestCase.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1115/JBWS1115TestCase.java 2007-05-09 11:47:50 UTC (rev 3014)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1115/JBWS1115TestCase.java 2007-05-09 12:40:01 UTC (rev 3015)
@@ -26,7 +26,7 @@
import javax.management.ObjectName;
import org.jboss.test.ws.JBossWSTest;
-import org.jboss.ws.integration.ObjectNameFactory;
+import org.jboss.ws.core.server.ManagedServerConfigMBean;
/**
* Auto discover HTTP(S) port configuration from Tomcat
@@ -39,12 +39,12 @@
*/
public class JBWS1115TestCase extends JBossWSTest
{
- private final ObjectName manager = ObjectNameFactory.create("jboss.ws:service=ServiceEndpointManager");
+ private final ObjectName manager = ManagedServerConfigMBean.OBJECT_NAME;
public void testDiscoverWebServicePort() throws Exception
{
MBeanServerConnection server = getServer();
-
+
String attrName = "WebServicePort";
Integer orgPort = (Integer)server.getAttribute(manager, attrName);
server.setAttribute(manager, new Attribute(attrName, new Integer(0)));
@@ -56,7 +56,7 @@
public void testDiscoverWebServiceSecurePort() throws Exception
{
MBeanServerConnection server = getServer();
-
+
String attrName = "WebServiceSecurePort";
Integer orgPort = (Integer)server.getAttribute(manager, attrName);
server.setAttribute(manager, new Attribute(attrName, new Integer(0)));
17 years, 8 months
- 1
- 0