wise SVN: r410 - in hudson/trunk: hudson-home and 6 other directories.
by wise-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-12-22 10:09:22 -0500 (Wed, 22 Dec 2010)
New Revision: 410
Added:
hudson/trunk/hudson-home/jobs/AS-5.1.0/
hudson/trunk/hudson-home/jobs/AS-5.1.0/config.xml
hudson/trunk/hudson-home/jobs/AS-6.0.0/
hudson/trunk/hudson-home/jobs/AS-6.0.0/config.xml
hudson/trunk/hudson-home/jobs/Wise-Core-AS-5.1.0-JDK6/
hudson/trunk/hudson-home/jobs/Wise-Core-AS-5.1.0-JDK6/config.xml
hudson/trunk/hudson-home/jobs/Wise-Core-AS-6.0.0-JDK6/
hudson/trunk/hudson-home/jobs/Wise-Core-AS-6.0.0-JDK6/config.xml
Modified:
hudson/trunk/ant.properties.example
hudson/trunk/build.xml
hudson/trunk/hudson-home/config.xml
hudson/trunk/hudson-home/jobs/Wise-Core-AS-4.2.3-JDK6/config.xml
Log:
A bunch of changes/fixes/updates on hudson configuration:
- upgraded to Hudson 1.226 / Tomcat 5.5.31
- added jobs for building and testing with AS 5.1.0
- added jobs for building and testing with AS 6.0.0.CR1
Modified: hudson/trunk/ant.properties.example
===================================================================
--- hudson/trunk/ant.properties.example 2010-12-22 12:37:18 UTC (rev 409)
+++ hudson/trunk/ant.properties.example 2010-12-22 15:09:22 UTC (rev 410)
@@ -29,9 +29,17 @@
hudson.jboss423.build=jboss-4.2.3.GA
hudson.jboss423.rev=HEAD
+hudson.jboss510.url=http://anonsvn.jboss.org/repos/jbossas/tags/JBoss_5_1_0_GA
+hudson.jboss510.build=jboss-5.1.0.GA
+hudson.jboss510.rev=HEAD
+
+hudson.jboss600.url=http://anonsvn.jboss.org/repos/jbossas/tags/6.0.0.20101110-CR1
+hudson.jboss600.build=jboss-6.0.0.20101110-CR1
+hudson.jboss600.rev=HEAD
+
hudson.mail.recipients=
hudson.smtp.host=localhost
# Hudson setup
-apache-tomcat=5.5.20
-sun-hudson=1.160
+apache-tomcat=5.5.31
+sun-hudson=1.226
Modified: hudson/trunk/build.xml
===================================================================
--- hudson/trunk/build.xml 2010-12-22 12:37:18 UTC (rev 409)
+++ hudson/trunk/build.xml 2010-12-22 15:09:22 UTC (rev 410)
@@ -62,7 +62,8 @@
-->
<target name="hudson-tomcat-setup" depends="init-hudson" unless="hudson.tomcat.available">
- <get src="${jboss.repository}/apache-tomcat/${apache-tomcat}/lib/apache-tomcat.zip" dest="${thirdparty.dir}/apache-tomcat.zip" usetimestamp="true" verbose="true"/>
+ <!-- <get src="${jboss.repository}/apache-tomcat/${apache-tomcat}/lib/apache-tomcat.zip" dest="${thirdparty.dir}/apache-tomcat.zip" usetimestamp="true" verbose="true"/> -->
+ <get src="http://mirror.nohup.it/apache/tomcat/tomcat-5/v${apache-tomcat}/bin/apach..." dest="${thirdparty.dir}/apache-tomcat.zip" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-hudson/${sun-hudson}/lib/hudson.war" dest="${thirdparty.dir}/hudson.war" usetimestamp="true" verbose="true"/>
<mkdir dir="${hudson.root}"/>
@@ -158,6 +159,7 @@
<exec executable="${hudson.tomcat}/bin/catalina.sh" failonerror="true" output="${hudson.target.dir}/hudson.log">
<env key="CATALINA_OPTS" value="-Xmx512m -Djava.awt.headless=true"/>
+ <env key="HUDSON_HOME" value="${hudson.home}"/>
<arg line="start"/>
</exec>
Modified: hudson/trunk/hudson-home/config.xml
===================================================================
--- hudson/trunk/hudson-home/config.xml 2010-12-22 12:37:18 UTC (rev 409)
+++ hudson/trunk/hudson-home/config.xml 2010-12-22 15:09:22 UTC (rev 410)
@@ -12,6 +12,8 @@
<tr><th align=left>Wise-core:</th><td>@hudson.wise.core.url@</td></tr>
<tr><td colspan=2></td></tr>
<tr><th align=left>@hudson.jboss423.build@</th><td>-r(a)hudson.jboss423.rev@ @hudson.jboss423.url@</td></tr>
+ <tr><th align=left>@hudson.jboss510.build@</th><td>-r(a)hudson.jboss510.rev@ @hudson.jboss510.url@</td></tr>
+ <tr><th align=left>@hudson.jboss600.build@</th><td>-r(a)hudson.jboss600.rev@ @hudson.jboss600.url@</td></tr>
<tr><td colspan=2></td></tr>
</table>
]]>
@@ -28,6 +30,8 @@
<no-comparator/>
<string>Wise-Core-AS-4.2.3-JDK5</string>
<string>Wise-Core-AS-4.2.3-JDK6</string>
+ <string>Wise-Core-AS-5.1.0-JDK6</string>
+ <string>Wise-Core-AS-6.0.0-JDK6</string>
</jobNames>
<name>Core Tests</name>
<description>
@@ -49,6 +53,8 @@
<jobNames class="tree-set">
<no-comparator/>
<string>AS-4.2.3</string>
+ <string>AS-5.1.0</string>
+ <string>AS-6.0.0</string>
</jobNames>
<name>Target Container</name>
<description> <![CDATA[
Added: hudson/trunk/hudson-home/jobs/AS-5.1.0/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/AS-5.1.0/config.xml (rev 0)
+++ hudson/trunk/hudson-home/jobs/AS-5.1.0/config.xml 2010-12-22 15:09:22 UTC (rev 410)
@@ -0,0 +1,70 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+SVNBASE=JBossAS-5.1.0
+
+#
+# checkout with an explicit version
+#
+#if [ -d "$SVNBASE" ]; then
+# svn up -r(a)hudson.jboss510.rev@ $SVNBASE
+#else
+# svn co -r(a)hudson.jboss510.rev@ @hudson.jboss510.url@
+#fi
+
+#
+# build jboss
+#
+cd $SVNBASE
+#rm -rf thirdparty/*
+./build/build.sh clean main
+
+#
+# Verify build
+#
+if [ ! -d ./build/output/(a)hudson.jboss510.build@ ]; then
+ echo "Cannot find expected build: @hudson.jboss510.build@"
+ exit 1
+fi
+ </command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.jboss510.url@</remote>
+ <local>JBossAS-5.1.0</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossAS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>7</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build AS-5.1.0</description>
+ <actions class="vector"/>
+</project>
Added: hudson/trunk/hudson-home/jobs/AS-6.0.0/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/AS-6.0.0/config.xml (rev 0)
+++ hudson/trunk/hudson-home/jobs/AS-6.0.0/config.xml 2010-12-22 15:09:22 UTC (rev 410)
@@ -0,0 +1,70 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+SVNBASE=JBossAS-6.0.0
+
+#
+# checkout with an explicit version
+#
+#if [ -d "$SVNBASE" ]; then
+# svn up -r(a)hudson.jboss600.rev@ $SVNBASE
+#else
+# svn co -r(a)hudson.jboss600.rev@ @hudson.jboss600.url@
+#fi
+
+#
+# build jboss
+#
+cd $SVNBASE
+./build.sh clean
+./build.sh -Dskip-download-sources
+
+#
+# Verify build
+#
+if [ ! -d ./build/target/(a)hudson.jboss600.build@ ]; then
+ echo "Cannot find expected build: @hudson.jboss600.build@"
+ exit 1
+fi
+ </command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.jboss600.url@</remote>
+ <local>JBossAS-6.0.0</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossAS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>7</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build AS-6.0.0</description>
+ <actions class="vector"/>
+</project>
Modified: hudson/trunk/hudson-home/jobs/Wise-Core-AS-4.2.3-JDK6/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/Wise-Core-AS-4.2.3-JDK6/config.xml 2010-12-22 12:37:18 UTC (rev 409)
+++ hudson/trunk/hudson-home/jobs/Wise-Core-AS-4.2.3-JDK6/config.xml 2010-12-22 15:09:22 UTC (rev 410)
@@ -15,7 +15,7 @@
JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
JBOSS_CONFIG=(a)jboss.server.instance@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.3/workspace/JBossAS-4.2.3/build/output/(a)hudson.jboss423.build@
-TEST_OPTS="-Dendorsed.dir=$JBOSS_INSTANCE/lib/endorsed"
+#TEST_OPTS="-Dendorsed.dir=$JBOSS_INSTANCE/lib/endorsed"
#
# load test functions
Added: hudson/trunk/hudson-home/jobs/Wise-Core-AS-5.1.0-JDK6/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/Wise-Core-AS-5.1.0-JDK6/config.xml (rev 0)
+++ hudson/trunk/hudson-home/jobs/Wise-Core-AS-5.1.0-JDK6/config.xml 2010-12-22 15:09:22 UTC (rev 410)
@@ -0,0 +1,92 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=Wise-Core-AS-5.1.0-JDK6
+
+WORKSPACE=`pwd`
+JAVA_HOME=(a)java.home.jdk16@
+HUDSON_DIR=$WORKSPACE/hudson
+CORE_DIR=$WORKSPACE/core
+JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
+JBOSS_CONFIG=(a)jboss.server.instance@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.1.0/workspace/JBossAS-5.1.0/build/output/(a)hudson.jboss510.build@
+#TEST_OPTS="-Dendorsed.dir=$JBOSS_INSTANCE/lib/endorsed"
+
+#
+# load test functions
+#
+. $HUDSON_DIR/jboss/bin/wisecore-qa.sh
+
+#
+# Copy endorsed libs
+#
+cp $JBOSS_INSTANCE/client/jaxb-api.jar $JBOSS_INSTANCE/lib/endorsed
+cp $JBOSS_INSTANCE/client/jbossws-native-jaxrpc.jar $JBOSS_INSTANCE/lib/endorsed
+cp $JBOSS_INSTANCE/client/jbossws-native-jaxws.jar $JBOSS_INSTANCE/lib/endorsed
+cp $JBOSS_INSTANCE/client/jbossws-native-jaxws-ext.jar $JBOSS_INSTANCE/lib/endorsed
+cp $JBOSS_INSTANCE/client/jbossws-native-saaj.jar $JBOSS_INSTANCE/lib/endorsed
+
+#
+# execute core tests
+#
+coreTest
+
+#
+# Remove endorsed libs
+#
+rm -f $JBOSS_INSTANCE/lib/endorsed/jaxb-api.jar
+rm -f $JBOSS_INSTANCE/lib/endorsed/jbossws-native-jaxrpc.jar
+rm -f $JBOSS_INSTANCE/lib/endorsed/jbossws-native-jaxws.jar
+rm -f $JBOSS_INSTANCE/lib/endorsed/jbossws-native-jaxws-ext.jar
+rm -f $JBOSS_INSTANCE/lib/endorsed/jbossws-native-saaj.jar
+
+
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>core/**/target/surefire-reports/*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.hudson.url@</remote>
+ <local>hudson</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.wise.core.url@</remote>
+ <local>core</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/Wise/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>14</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test wise-core-(a)version.id@ against AS-5.1.0 with JDK6</description>
+ <actions class="vector"/>
+</project>
Added: hudson/trunk/hudson-home/jobs/Wise-Core-AS-6.0.0-JDK6/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/Wise-Core-AS-6.0.0-JDK6/config.xml (rev 0)
+++ hudson/trunk/hudson-home/jobs/Wise-Core-AS-6.0.0-JDK6/config.xml 2010-12-22 15:09:22 UTC (rev 410)
@@ -0,0 +1,74 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=Wise-Core-AS-6.0.0-JDK6
+
+WORKSPACE=`pwd`
+JAVA_HOME=(a)java.home.jdk16@
+HUDSON_DIR=$WORKSPACE/hudson
+CORE_DIR=$WORKSPACE/core
+JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
+JBOSS_CONFIG=(a)jboss.server.instance@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.0.0/workspace/JBossAS-6.0.0/build/target/(a)hudson.jboss600.build@
+#TEST_OPTS="-Dendorsed.dir=$JBOSS_INSTANCE/lib/endorsed -Dcxf.stack=true -Djboss6=true"
+TEST_OPTS="-Dcxf.stack=true -Djboss6=true"
+
+#
+# load test functions
+#
+. $HUDSON_DIR/jboss/bin/wisecore-qa.sh
+
+#
+# execute core tests
+#
+coreTest
+
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>core/**/target/surefire-reports/*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.hudson.url@</remote>
+ <local>hudson</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.wise.core.url@</remote>
+ <local>core</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/Wise/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>14</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test wise-core-(a)version.id@ against AS-6.0.0 with JDK6</description>
+ <actions class="vector"/>
+</project>
13 years, 11 months
- 1
- 0
wise SVN: r409 - core/trunk/integration-testsuite.
by wise-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-12-22 07:37:18 -0500 (Wed, 22 Dec 2010)
New Revision: 409
Modified:
core/trunk/integration-testsuite/pom.xml
Log:
[WISE-172] Added 'jboss6' profile for running the integration tests against AS 6
Modified: core/trunk/integration-testsuite/pom.xml
===================================================================
--- core/trunk/integration-testsuite/pom.xml 2010-12-21 14:35:29 UTC (rev 408)
+++ core/trunk/integration-testsuite/pom.xml 2010-12-22 12:37:18 UTC (rev 409)
@@ -21,10 +21,6 @@
<artifactId>wise-integration-testsuite</artifactId>
<packaging>pom</packaging>
- <properties>
- <jboss-as-server.version>5.1.0.GA</jboss-as-server.version>
- </properties>
-
<parent>
<groupId>org.jboss.wise</groupId>
<artifactId>wise</artifactId>
@@ -32,9 +28,9 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <modules>
+ <modules>
<module>common</module>
- </modules>
+ </modules>
<dependencies>
<dependency>
@@ -58,39 +54,8 @@
<version>${version}</version>
<scope>test</scope>
</dependency>
+
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-server</artifactId>
- <version>${jboss-as-server.version}</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>sun-jaxb</groupId>
- <artifactId>jaxb-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.jpa</groupId>
- <artifactId>jboss-jpa-deployers</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.metadata</groupId>
- <artifactId>jboss-metadata</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-ejb-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-saaj</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-jaxws</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
<scope>test</scope>
@@ -194,6 +159,90 @@
</dependencies>
</profile>
<profile>
+ <id>jboss5</id>
+ <activation>
+ <property>
+ <name>!jboss6</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-server</artifactId>
+ <version>5.1.0.GA</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>sun-jaxb</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.jpa</groupId>
+ <artifactId>jboss-jpa-deployers</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.ws.native</groupId>
+ <artifactId>jbossws-native-saaj</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.ws.native</groupId>
+ <artifactId>jbossws-native-jaxws</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>jboss6</id>
+ <activation>
+ <property>
+ <name>jboss6</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-server</artifactId>
+ <version>6.0.0.20101110-CR1</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>sun-jaxb</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.jpa</groupId>
+ <artifactId>jboss-jpa-deployers</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.ws.native</groupId>
+ <artifactId>jbossws-native-saaj</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.ws.native</groupId>
+ <artifactId>jbossws-native-jaxws</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
<id>use.endorsed.dir</id>
<activation>
<property>
13 years, 11 months
- 1
- 0
wise SVN: r408 - hudson/tags.
by wise-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-12-21 09:35:29 -0500 (Tue, 21 Dec 2010)
New Revision: 408
Added:
hudson/tags/wise-hudson-1.1/
Log:
Taggin hudson configuration for already released Wise 1.1
Copied: hudson/tags/wise-hudson-1.1 (from rev 407, hudson/trunk)
13 years, 11 months
- 1
- 0
wise SVN: r407 - core/trunk/integration-testsuite/cxf.
by wise-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-12-20 09:08:55 -0500 (Mon, 20 Dec 2010)
New Revision: 407
Modified:
core/trunk/integration-testsuite/cxf/
Log:
Fixing svn:ignore
Property changes on: core/trunk/integration-testsuite/cxf
___________________________________________________________________
Name: svn:ignore
+ target
.settings
.project
.classpath
13 years, 11 months
- 1
- 0
wise SVN: r406 - in core/trunk: core-cxf/src/main/java/org/jboss/wise/core/wsextensions and 18 other directories.
by wise-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-12-20 09:07:41 -0500 (Mon, 20 Dec 2010)
New Revision: 406
Added:
core/trunk/core-cxf/src/main/java/org/jboss/wise/core/wsextensions/
core/trunk/core-cxf/src/main/java/org/jboss/wise/core/wsextensions/impl/
core/trunk/core-cxf/src/main/java/org/jboss/wise/core/wsextensions/impl/jbosswscxf/
core/trunk/core-cxf/src/main/java/org/jboss/wise/core/wsextensions/impl/jbosswscxf/CXFEnablerDelegate.java
core/trunk/core-cxf/src/main/resources/META-INF/services/org.jboss.wise.core.wsextensions.EnablerDelegate
core/trunk/integration-testsuite/cxf/
core/trunk/integration-testsuite/cxf/pom.xml
core/trunk/integration-testsuite/cxf/src/
core/trunk/integration-testsuite/cxf/src/main/
core/trunk/integration-testsuite/cxf/src/main/java/
core/trunk/integration-testsuite/cxf/src/main/resources/
core/trunk/integration-testsuite/cxf/src/test/
core/trunk/integration-testsuite/cxf/src/test/java/
core/trunk/integration-testsuite/cxf/src/test/java/org/
core/trunk/integration-testsuite/cxf/src/test/java/org/jboss/
core/trunk/integration-testsuite/cxf/src/test/java/org/jboss/wise/
core/trunk/integration-testsuite/cxf/src/test/java/org/jboss/wise/test/
core/trunk/integration-testsuite/cxf/src/test/java/org/jboss/wise/test/integration/
core/trunk/integration-testsuite/cxf/src/test/java/org/jboss/wise/test/integration/wsaddressing/
core/trunk/integration-testsuite/cxf/src/test/java/org/jboss/wise/test/integration/wsaddressing/Hello.java
core/trunk/integration-testsuite/cxf/src/test/java/org/jboss/wise/test/integration/wsaddressing/HelloImpl.java
core/trunk/integration-testsuite/cxf/src/test/java/org/jboss/wise/test/integration/wsaddressing/WSAddressingIntegrationTest.java
core/trunk/integration-testsuite/cxf/src/test/resources/
core/trunk/integration-testsuite/cxf/src/test/resources/WEB-INF/
core/trunk/integration-testsuite/cxf/src/test/resources/WEB-INF/wsa/
core/trunk/integration-testsuite/cxf/src/test/resources/WEB-INF/wsa/Hello.wsdl
core/trunk/integration-testsuite/cxf/src/test/resources/WEB-INF/wsa/test.wsdl
core/trunk/integration-testsuite/cxf/src/test/resources/WEB-INF/wsa/web.xml
core/trunk/integration-testsuite/cxf/src/test/resources/integration-test-log4j.xml
core/trunk/integration-testsuite/cxf/src/test/resources/jndi.properties
Modified:
core/trunk/integration-testsuite/pom.xml
Log:
[WISE-169] Adding WS-Addressing support with CXF stack; adding new integration testsuite module for integration tests with cxf stack
Added: core/trunk/core-cxf/src/main/java/org/jboss/wise/core/wsextensions/impl/jbosswscxf/CXFEnablerDelegate.java
===================================================================
--- core/trunk/core-cxf/src/main/java/org/jboss/wise/core/wsextensions/impl/jbosswscxf/CXFEnablerDelegate.java (rev 0)
+++ core/trunk/core-cxf/src/main/java/org/jboss/wise/core/wsextensions/impl/jbosswscxf/CXFEnablerDelegate.java 2010-12-20 14:07:41 UTC (rev 406)
@@ -0,0 +1,70 @@
+/*
+ * JBoss, Home of Professional Open Source Copyright 2006, 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.wise.core.wsextensions.impl.jbosswscxf;
+
+import net.jcip.annotations.Immutable;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
+import org.apache.cxf.endpoint.Client;
+import org.apache.cxf.frontend.ClientProxy;
+import org.apache.cxf.ws.addressing.WSAddressingFeature;
+import org.jboss.wise.core.wsextensions.DefaultEnablerDelegate;
+
+/**
+ * CXF version of EnablerDelegate
+ *
+ * @author alessio.soldano(a)jboss.com
+ */
+@Immutable
+public class CXFEnablerDelegate extends DefaultEnablerDelegate {
+
+ public CXFEnablerDelegate() {
+ super();
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.jboss.wise.core.wsextensions.EnablerDelegate#visitWSAddressing(Object)
+ */
+ public void visitWSAddressing(Object endpointInstance) throws UnsupportedOperationException {
+ Bus bus = BusFactory.getThreadDefaultBus();
+ Client client = ClientProxy.getClient(endpointInstance);
+ WSAddressingFeature feature = new WSAddressingFeature();
+ feature.initialize(client, bus);
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.jboss.wise.core.wsextensions.EnablerDelegate#visitWSRM(Object)
+ */
+ public void visitWSRM(Object endpointInstance) throws UnsupportedOperationException {
+ throw new UnsupportedOperationException("Not yet implemented");
+ }
+
+ public void visitWSSecurity(Object endpointInstance) throws UnsupportedOperationException, IllegalStateException {
+ throw new UnsupportedOperationException("Not yet implemented");
+ }
+
+}
Added: core/trunk/core-cxf/src/main/resources/META-INF/services/org.jboss.wise.core.wsextensions.EnablerDelegate
===================================================================
--- core/trunk/core-cxf/src/main/resources/META-INF/services/org.jboss.wise.core.wsextensions.EnablerDelegate (rev 0)
+++ core/trunk/core-cxf/src/main/resources/META-INF/services/org.jboss.wise.core.wsextensions.EnablerDelegate 2010-12-20 14:07:41 UTC (rev 406)
@@ -0,0 +1 @@
+org.jboss.wise.core.wsextensions.impl.jbosswscxf.CXFEnablerDelegate
\ No newline at end of file
Added: core/trunk/integration-testsuite/cxf/pom.xml
===================================================================
--- core/trunk/integration-testsuite/cxf/pom.xml (rev 0)
+++ core/trunk/integration-testsuite/cxf/pom.xml 2010-12-20 14:07:41 UTC (rev 406)
@@ -0,0 +1,92 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to you under the Apache License, Version
+ 2.0 (the "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+ applicable law or agreed to in writing, software distributed under the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ CONDITIONS OF ANY KIND, either express or implied. See the License for
+ the specific language governing permissions and limitations under the
+ License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <name>Wise Integration CXF test</name>
+ <artifactId>wise-integration-cxf</artifactId>
+
+ <packaging>jar</packaging>
+
+ <parent>
+ <groupId>org.jboss.wise</groupId>
+ <artifactId>wise-integration-testsuite</artifactId>
+ <version>1.2.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.wise</groupId>
+ <artifactId>wise-core-cxf</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws.cxf</groupId>
+ <artifactId>jbossws-cxf-client</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>war-wsaddress</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>war</goal>
+ </goals>
+ <configuration>
+ <webXml>${basedir}/src/test/resources/WEB-INF/wsa/web.xml</webXml>
+ <warName>wsa</warName>
+ <outputDirectory>${project.build.testOutputDirectory}</outputDirectory>
+ <webappDirectory>${project.build.directory}/wsa</webappDirectory>
+ <warSourceExcludes>**/lib/**</warSourceExcludes>
+ <webResources>
+ <webResource>
+ <targetPath>WEB-INF/classes</targetPath>
+ <directory>${basedir}/target/test-classes/</directory>
+ <includes>
+ <include>**/wsaddressing/*.class</include>
+ <include>**/test.wsdl</include>
+ </includes>
+ <excludes>
+ <exclude>**/*Test.class</exclude>
+ </excludes>
+ </webResource>
+ <webResource>
+ <targetPath>WEB-INF</targetPath>
+ <directory>${basedir}/src/test/resources/WEB-INF/wsa/</directory>
+ <includes>
+ <include>**/*.wsdl</include>
+ </includes>
+ </webResource>
+ </webResources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles/>
+
+</project>
Added: core/trunk/integration-testsuite/cxf/src/test/java/org/jboss/wise/test/integration/wsaddressing/Hello.java
===================================================================
--- core/trunk/integration-testsuite/cxf/src/test/java/org/jboss/wise/test/integration/wsaddressing/Hello.java (rev 0)
+++ core/trunk/integration-testsuite/cxf/src/test/java/org/jboss/wise/test/integration/wsaddressing/Hello.java 2010-12-20 14:07:41 UTC (rev 406)
@@ -0,0 +1,46 @@
+/*
+ * JBoss, Home of Professional Open Source Copyright 2006, 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.wise.test.integration.wsaddressing;
+
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+
+/**
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 23-Dic-2008
+ *
+ */
+@WebService( name = "Hello", targetNamespace = "http://org.jboss/wise/wsaddressing" )
+@SOAPBinding( style = SOAPBinding.Style.RPC )
+public interface Hello {
+
+ @WebMethod
+ @WebResult( partName = "return" )
+ public String echoUserType( @WebParam( name = "user", partName = "user" )
+ String user );
+
+}
Added: core/trunk/integration-testsuite/cxf/src/test/java/org/jboss/wise/test/integration/wsaddressing/HelloImpl.java
===================================================================
--- core/trunk/integration-testsuite/cxf/src/test/java/org/jboss/wise/test/integration/wsaddressing/HelloImpl.java (rev 0)
+++ core/trunk/integration-testsuite/cxf/src/test/java/org/jboss/wise/test/integration/wsaddressing/HelloImpl.java 2010-12-20 14:07:41 UTC (rev 406)
@@ -0,0 +1,47 @@
+/*
+ * JBoss, Home of Professional Open Source Copyright 2006, 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.wise.test.integration.wsaddressing;
+
+import javax.ejb.Stateless;
+import javax.jws.WebService;
+import javax.xml.ws.soap.Addressing;
+
+/**
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 20-Dic-2010
+ *
+ */
+
+@WebService( endpointInterface = "org.jboss.wise.test.integration.wsaddressing.Hello",
+ targetNamespace = "http://org.jboss/wise/wsa",
+ serviceName = "HelloService",
+ wsdlLocation = "WEB-INF/test.wsdl" ) //this is added to force the server on publishing a WSDL without policies; this way we're sure WS-Addressing
+ //on client side is controlled by features only, not by WS-Policy engine.
+@Stateless
+@Addressing(enabled = true, required = false)
+public class HelloImpl implements Hello {
+
+ public String echoUserType( String user ) {
+ return "Hello WSAddressing";
+ }
+}
Added: core/trunk/integration-testsuite/cxf/src/test/java/org/jboss/wise/test/integration/wsaddressing/WSAddressingIntegrationTest.java
===================================================================
--- core/trunk/integration-testsuite/cxf/src/test/java/org/jboss/wise/test/integration/wsaddressing/WSAddressingIntegrationTest.java (rev 0)
+++ core/trunk/integration-testsuite/cxf/src/test/java/org/jboss/wise/test/integration/wsaddressing/WSAddressingIntegrationTest.java 2010-12-20 14:07:41 UTC (rev 406)
@@ -0,0 +1,87 @@
+/*
+ * JBoss, Home of Professional Open Source Copyright 2006, 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.wise.test.integration.wsaddressing;
+
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+import java.net.URL;
+import java.util.Map;
+
+import junit.framework.Assert;
+
+import org.jboss.wise.core.client.InvocationResult;
+import org.jboss.wise.core.client.WSDynamicClient;
+import org.jboss.wise.core.client.WSEndpoint;
+import org.jboss.wise.core.client.WSMethod;
+import org.jboss.wise.core.client.builder.WSDynamicClientBuilder;
+import org.jboss.wise.core.client.factories.WSDynamicClientFactory;
+import org.jboss.wise.core.handlers.LoggingHandler;
+import org.jboss.wise.core.test.WiseTest;
+import org.jboss.wise.core.wsextensions.impl.WSAddressingEnabler;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Tests WS-Addressing extension in Wise
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 23-Dic-2008
+ */
+public class WSAddressingIntegrationTest extends WiseTest {
+ private URL warUrl = null;
+
+ @Before
+ public void setUp() throws Exception {
+ warUrl = this.getClass().getClassLoader().getResource("wsa.war");
+ deployWS(warUrl);
+ }
+
+ @Test
+ @SuppressWarnings("unchecked")
+ public void shouldRunWithoutMK() throws Exception {
+ URL wsdlURL = new URL(getServerHostAndPort() + "/wsa/Hello?wsdl");
+
+ WSDynamicClientBuilder clientBuilder = WSDynamicClientFactory.getJAXWSClientBuilder();
+ WSDynamicClient client = clientBuilder.tmpDir("target/temp/wise").verbose(true).keepSource(true).wsdlURL(wsdlURL
+ .toString()).build();
+ WSMethod method = client.getWSMethod("HelloService", "HelloImplPort", "echoUserType");
+ WSEndpoint wsEndpoint = method.getEndpoint();
+
+ wsEndpoint.addWSExtension(new WSAddressingEnabler(client));
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ wsEndpoint.addHandler(new LoggingHandler(new PrintStream(baos)));
+
+ Map<String, Object> args = new java.util.HashMap<String, Object>();
+ args.put("user", "test");
+ InvocationResult result = method.invoke(args, null);
+ Map<String, Object> results = (Map<String, Object>) result.getMapRequestAndResult(null, null).get("results");
+ client.close();
+ Assert.assertEquals("Hello WSAddressing", results.get("result"));
+ Assert.assertTrue("Could not find WS-A headers in exchanged messages!", baos.toString().contains("http://www.w3.org/2005/08/addressing"));
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ undeployWS(warUrl);
+ }
+}
Added: core/trunk/integration-testsuite/cxf/src/test/resources/WEB-INF/wsa/Hello.wsdl
===================================================================
--- core/trunk/integration-testsuite/cxf/src/test/resources/WEB-INF/wsa/Hello.wsdl (rev 0)
+++ core/trunk/integration-testsuite/cxf/src/test/resources/WEB-INF/wsa/Hello.wsdl 2010-12-20 14:07:41 UTC (rev 406)
@@ -0,0 +1,30 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<definitions name='HelloService' targetNamespace='http://org.jboss/wise/wsaddressing' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://org.jboss/wise/wsaddressing' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss/wise/wsa' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types></types>
+ <message name='Hello_echoUserType'>
+ <part name='user' type='xsd:string'></part>
+ </message>
+ <message name='Hello_echoUserTypeResponse'>
+ <part name='return' type='xsd:string'></part>
+ </message>
+ <portType name='Hello'>
+
+ <operation name='echoUserType' parameterOrder='user'>
+ <input message='ns1:Hello_echoUserType'></input>
+ <output message='ns1:Hello_echoUserTypeResponse'></output>
+ </operation>
+ </portType>
+ <binding name='HelloBinding' type='ns1:Hello'>
+ <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='echoUserType'>
+ <soap:operation soapAction=''/>
+
+ <input>
+ <soap:body namespace='http://org.jboss/wise/wsa' use='literal'/>
+ </input>
+ <output>
+ <soap:body namespace='http://org.jboss/wise/wsa' use='literal'/>
+ </output>
+ </operation>
+ </binding>
+</definitions>
\ No newline at end of file
Added: core/trunk/integration-testsuite/cxf/src/test/resources/WEB-INF/wsa/test.wsdl
===================================================================
--- core/trunk/integration-testsuite/cxf/src/test/resources/WEB-INF/wsa/test.wsdl (rev 0)
+++ core/trunk/integration-testsuite/cxf/src/test/resources/WEB-INF/wsa/test.wsdl 2010-12-20 14:07:41 UTC (rev 406)
@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='UTF-8'?><wsdl:definitions name="HelloService" targetNamespace="http://org.jboss/wise/wsa" xmlns:ns1="http://org.jboss/wise/wsaddressing" xmlns:ns2="http://schemas.xmlsoap.org/soap/http" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://org.jboss/wise/wsa" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+ <wsdl:import location="Hello.wsdl" namespace="http://org.jboss/wise/wsaddressing"/>
+ <wsdl:service name="HelloService">
+
+ <wsdl:port binding="ns1:HelloBinding" name="HelloImplPort">
+ <soap:address location="http://localhost:8080/wsa/Hello" />
+ </wsdl:port>
+ </wsdl:service>
+</wsdl:definitions>
Added: core/trunk/integration-testsuite/cxf/src/test/resources/WEB-INF/wsa/web.xml
===================================================================
--- core/trunk/integration-testsuite/cxf/src/test/resources/WEB-INF/wsa/web.xml (rev 0)
+++ core/trunk/integration-testsuite/cxf/src/test/resources/WEB-INF/wsa/web.xml 2010-12-20 14:07:41 UTC (rev 406)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+ version="2.4">
+
+ <servlet>
+ <servlet-name>Hello</servlet-name>
+ <servlet-class>org.jboss.wise.test.integration.wsaddressing.HelloImpl</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>Hello</servlet-name>
+ <url-pattern>/Hello</url-pattern>
+ </servlet-mapping>
+
+</web-app>
+
Added: core/trunk/integration-testsuite/cxf/src/test/resources/integration-test-log4j.xml
===================================================================
--- core/trunk/integration-testsuite/cxf/src/test/resources/integration-test-log4j.xml (rev 0)
+++ core/trunk/integration-testsuite/cxf/src/test/resources/integration-test-log4j.xml 2010-12-20 14:07:41 UTC (rev 406)
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"
+debug="false">
+
+ <appender name="FILE" class="org.apache.log4j.FileAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <param name="File" value="target/integration-test.log"/>
+ <param name="Append" value="false"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <!-- The default pattern: Date Priority [Category] Message\n -->
+ <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
+
+ <!-- The full pattern: Date MS Priority [Category] (Thread:NDC) Message\n
+ <param name="ConversionPattern" value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
+ -->
+ </layout>
+ </appender>
+ <category name="org.jboss.wise">
+ <priority value="DEBUG"/>
+ </category>
+ <root>
+ <priority value="INFO"/>
+ <appender-ref ref="FILE"/>
+ </root>
+
+</log4j:configuration>
Added: core/trunk/integration-testsuite/cxf/src/test/resources/jndi.properties
===================================================================
--- core/trunk/integration-testsuite/cxf/src/test/resources/jndi.properties (rev 0)
+++ core/trunk/integration-testsuite/cxf/src/test/resources/jndi.properties 2010-12-20 14:07:41 UTC (rev 406)
@@ -0,0 +1,5 @@
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.provider.url=jnp://localhost:1099
+java.naming.factory.url.pkgs=org.jboss.naming
+java.naming.factory.url.pkgs=org.jnp.interfaces
+
Modified: core/trunk/integration-testsuite/pom.xml
===================================================================
--- core/trunk/integration-testsuite/pom.xml 2010-12-20 10:09:10 UTC (rev 405)
+++ core/trunk/integration-testsuite/pom.xml 2010-12-20 14:07:41 UTC (rev 406)
@@ -182,6 +182,9 @@
<name>cxf.stack</name>
</property>
</activation>
+ <modules>
+ <module>cxf</module>
+ </modules>
<dependencies>
<dependency>
<groupId>org.jboss.ws.cxf</groupId>
13 years, 11 months
- 1
- 0
wise SVN: r405 - in core/trunk: core and 3 other directories.
by wise-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-12-20 05:09:10 -0500 (Mon, 20 Dec 2010)
New Revision: 405
Modified:
core/trunk/core-cxf/pom.xml
core/trunk/core-native/pom.xml
core/trunk/core/pom.xml
core/trunk/integration-testsuite/pom.xml
core/trunk/pom.xml
Log:
[WISE-169] Fixing dependencies
Modified: core/trunk/core/pom.xml
===================================================================
--- core/trunk/core/pom.xml 2010-12-18 18:17:59 UTC (rev 404)
+++ core/trunk/core/pom.xml 2010-12-20 10:09:10 UTC (rev 405)
@@ -31,8 +31,7 @@
<version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
-
-
+
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -49,50 +48,13 @@
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
-
+
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
</dependency>
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-container</artifactId>
- <exclusions>
- <exclusion>
- <groupId>apache-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jboss</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
-
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-kernel</artifactId>
- <exclusions>
- <exclusion>
- <groupId>wutka-dtdparser</groupId>
- <artifactId>dtdparser121</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jboss</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>2.2</version>
- </dependency>
-
- <dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-common</artifactId>
</dependency>
@@ -140,6 +102,7 @@
<dependency>
<groupId>net.jcip</groupId>
<artifactId>jcip-annotations</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
Modified: core/trunk/core-cxf/pom.xml
===================================================================
--- core/trunk/core-cxf/pom.xml 2010-12-18 18:17:59 UTC (rev 404)
+++ core/trunk/core-cxf/pom.xml 2010-12-20 10:09:10 UTC (rev 405)
@@ -99,6 +99,12 @@
</dependency>
<dependency>
+ <groupId>net.jcip</groupId>
+ <artifactId>jcip-annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
<groupId>sun.jdk</groupId>
<artifactId>tools</artifactId>
<version>1.5.0</version>
Modified: core/trunk/core-native/pom.xml
===================================================================
--- core/trunk/core-native/pom.xml 2010-12-18 18:17:59 UTC (rev 404)
+++ core/trunk/core-native/pom.xml 2010-12-20 10:09:10 UTC (rev 405)
@@ -47,6 +47,13 @@
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-client</artifactId>
</dependency>
+
+ <!-- workaround for http://java.net/jira/browse/JAX_WS-836 -->
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>policy</artifactId>
+ <version>2.2.1</version>
+ </dependency>
<dependency>
<groupId>xalan</groupId>
@@ -67,6 +74,12 @@
</dependency>
<dependency>
+ <groupId>net.jcip</groupId>
+ <artifactId>jcip-annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
<groupId>sun.jdk</groupId>
<artifactId>tools</artifactId>
<version>1.5.0</version>
Modified: core/trunk/integration-testsuite/pom.xml
===================================================================
--- core/trunk/integration-testsuite/pom.xml 2010-12-18 18:17:59 UTC (rev 404)
+++ core/trunk/integration-testsuite/pom.xml 2010-12-20 10:09:10 UTC (rev 405)
@@ -19,7 +19,11 @@
<name>Wise Integration Test</name>
<artifactId>wise-integration-testsuite</artifactId>
- <packaging>pom</packaging>
+ <packaging>pom</packaging>
+
+ <properties>
+ <jboss-as-server.version>5.1.0.GA</jboss-as-server.version>
+ </properties>
<parent>
<groupId>org.jboss.wise</groupId>
@@ -55,15 +59,47 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jbossall-client</artifactId>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-server</artifactId>
+ <version>${jboss-as-server.version}</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>sun-jaxb</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.jpa</groupId>
+ <artifactId>jboss-jpa-deployers</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.ws.native</groupId>
+ <artifactId>jbossws-native-saaj</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.ws.native</groupId>
+ <artifactId>jbossws-native-jaxws</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>net.jcip</groupId>
+ <artifactId>jcip-annotations</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
Modified: core/trunk/pom.xml
===================================================================
--- core/trunk/pom.xml 2010-12-18 18:17:59 UTC (rev 404)
+++ core/trunk/pom.xml 2010-12-20 10:09:10 UTC (rev 405)
@@ -120,12 +120,14 @@
</exclusion>
</exclusions>
</dependency>
+
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
<scope>provided</scope>
<version>2.0.4</version>
</dependency>
+
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
@@ -133,12 +135,12 @@
<version>2.0.4</version>
</dependency>
-
<dependency>
<groupId>ant</groupId>
<artifactId>ant</artifactId>
<version>1.6.5</version>
</dependency>
+
<dependency>
<groupId>ant</groupId>
<artifactId>ant-nodeps</artifactId>
@@ -157,19 +159,13 @@
<version>1.4</version>
</dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.4</version>
- </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ <version>2.2.17.GA</version>
+ </dependency>
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-container</artifactId>
- <version>2.0.0.Beta</version>
- </dependency>
-
- <dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-log4j</artifactId>
<version>2.2.0.CR1</version>
@@ -182,12 +178,6 @@
</dependency>
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-kernel</artifactId>
- <version>2.0.0.Beta</version>
- </dependency>
-
- <dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-common</artifactId>
<version>1.3.0.GA</version>
@@ -272,13 +262,7 @@
<version>3.0</version>
</dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jbossall-client</artifactId>
- <version>4.2.2.GA</version>
- </dependency>
-
- <dependency>
+ <dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
<version>${cxf.version}</version>
@@ -288,14 +272,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
<version>${cxf.version}</version>
- <scope>test</scope>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http-jetty</artifactId>
<version>${cxf.version}</version>
- <scope>test</scope>
+ <scope>test</scope>
</dependency>
<dependency>
13 years, 11 months
- 1
- 0
wise SVN: r404 - in core/trunk: core and 17 other directories.
by wise-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-12-18 13:17:59 -0500 (Sat, 18 Dec 2010)
New Revision: 404
Added:
core/trunk/core-cxf/src/test/java/org/jboss/wise/core/consumer/
core/trunk/core-cxf/src/test/java/org/jboss/wise/core/consumer/impl/
core/trunk/core-cxf/src/test/java/org/jboss/wise/core/consumer/impl/WSConsumerTest.java
core/trunk/core-cxf/src/test/resources/hello_world.wsdl
core/trunk/core-cxf/src/test/resources/jaxws-binding.xml
core/trunk/core-cxf/src/test/resources/placeHolderClasses/
core/trunk/core-cxf/src/test/resources/placeHolderClasses/org/
core/trunk/core-cxf/src/test/resources/placeHolderClasses/org/jboss/
core/trunk/core-cxf/src/test/resources/placeHolderClasses/org/jboss/foo/
core/trunk/core-cxf/src/test/resources/placeHolderClasses/org/jboss/foo/Foo.class
core/trunk/core-native/src/test/java/org/jboss/wise/core/consumer/impl/WSConsumerTest.java
core/trunk/core-native/src/test/resources/jaxws-binding.xml
core/trunk/core-native/src/test/resources/placeHolderClasses/
core/trunk/core-native/src/test/resources/placeHolderClasses/org/
core/trunk/core-native/src/test/resources/placeHolderClasses/org/jboss/
core/trunk/core-native/src/test/resources/placeHolderClasses/org/jboss/foo/
core/trunk/core-native/src/test/resources/placeHolderClasses/org/jboss/foo/Foo.class
Removed:
core/trunk/core/src/test/java/org/jboss/wise/core/consumer/impl/WSConsumerTest.java
core/trunk/core/src/test/resources/hello_world.wsdl
core/trunk/core/src/test/resources/jaxws-binding.xml
core/trunk/core/src/test/resources/placeHolderClasses/
Modified:
core/trunk/core/pom.xml
core/trunk/integration-testsuite/pom.xml
core/trunk/pom.xml
Log:
[WISE-169] Slimming down core modules dependencies by removing the stack ones
Modified: core/trunk/core/pom.xml
===================================================================
--- core/trunk/core/pom.xml 2010-09-10 11:01:29 UTC (rev 403)
+++ core/trunk/core/pom.xml 2010-12-18 18:17:59 UTC (rev 404)
@@ -216,40 +216,4 @@
</build>
- <profiles>
- <!--
- Depending on the enabled profile, provide additional runtime client dependencies
- -->
- <profile>
- <id>native</id>
- <activation>
- <property>
- <name>!cxf.stack</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-client</artifactId>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>cxf</id>
- <activation>
- <property>
- <name>cxf.stack</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.jboss.ws.cxf</groupId>
- <artifactId>jbossws-cxf-client</artifactId>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
</project>
Deleted: core/trunk/core/src/test/java/org/jboss/wise/core/consumer/impl/WSConsumerTest.java
===================================================================
--- core/trunk/core/src/test/java/org/jboss/wise/core/consumer/impl/WSConsumerTest.java 2010-09-10 11:01:29 UTC (rev 403)
+++ core/trunk/core/src/test/java/org/jboss/wise/core/consumer/impl/WSConsumerTest.java 2010-12-18 18:17:59 UTC (rev 404)
@@ -1,91 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2010, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.wise.core.consumer.impl;
-
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-import static org.junit.matchers.JUnitMatchers.hasItem;
-
-import java.io.File;
-import java.net.URL;
-import java.util.List;
-
-import org.jboss.wise.core.client.SpiLoader;
-import org.jboss.wise.core.consumer.WSConsumer;
-import org.jboss.wise.core.exception.WiseRuntimeException;
-import org.junit.Test;
-
-/**
- * @author stefano.maestri(a)javalinux.it
- * @author alessio.soldano(a)jboss.com
- */
-public class WSConsumerTest {
-
- @Test
- public void parseHelloGreetingWSDLShouldWorkWithoutPackage() throws Exception {
- URL url = Thread.currentThread().getContextClassLoader().getResource(".");
- File outputDir = new File(url.getFile());
- URL wsdURL = Thread.currentThread().getContextClassLoader().getResource("./hello_world.wsdl");
- WSConsumer importer = newConsumer();
- importer.importObjectFromWsdl(wsdURL.toExternalForm(), outputDir, outputDir, null, null, System.out, null);
- }
-
- @Test()
- public void parseHelloWSDLWithBindingFile() throws Exception {
- URL url = Thread.currentThread().getContextClassLoader().getResource(".");
- File outputDir = new File(url.getFile());
- URL bindingURL = Thread.currentThread().getContextClassLoader().getResource("./jaxws-binding.xml");
- URL wsdURL = Thread.currentThread().getContextClassLoader().getResource("./hello_world.wsdl");
- File bindFile = new File(bindingURL.getFile());
- List<File> bindings = new java.util.ArrayList<File>();
- bindings.add(bindFile);
- WSConsumer importer = newConsumer();
- importer.importObjectFromWsdl(wsdURL.toExternalForm(), outputDir, outputDir, null, bindings, System.out, null);
- File generatedClass = new File(url.getFile(), "org/mytest");
- assertTrue(generatedClass.exists());
- }
-
- @Test(expected = WiseRuntimeException.class)
- public void parseHelloGreetingWSDLShouldFailWithPackageAndNoBindingsForNameDuplication() throws Exception {
- URL url = Thread.currentThread().getContextClassLoader().getResource(".");
- File outputDir = new File(url.getFile());
- URL wsdURL = Thread.currentThread().getContextClassLoader().getResource("./hello_world.wsdl");
- WSConsumer importer = newConsumer();
- importer.importObjectFromWsdl(wsdURL.toExternalForm(), outputDir, outputDir, "org.jboss.wise", null, System.out, null);
- }
-
- @Test()
- public void getClassNamesShouldFindFooClassPlaceHolder() throws Exception {
- WSConsumer importer = newConsumer();
- URL url = Thread.currentThread().getContextClassLoader().getResource("./placeHolderClasses/");
- File file = new File(url.getFile());
- List<String> list = importer.getClassNames(file);
- assertThat(list.size(), is(1));
- assertThat(list, hasItem("org.jboss.foo.Foo"));
-
- }
-
- private WSConsumer newConsumer() {
- return (WSConsumer) SpiLoader.loadService("org.jboss.wise.consumer.WSConsumer", "org.jboss.wise.core.consumer.impl.jbossws.DefaultWSImportImpl");
- }
-}
Deleted: core/trunk/core/src/test/resources/hello_world.wsdl
===================================================================
--- core/trunk/core/src/test/resources/hello_world.wsdl 2010-09-10 11:01:29 UTC (rev 403)
+++ core/trunk/core/src/test/resources/hello_world.wsdl 2010-12-18 18:17:59 UTC (rev 404)
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions name="HelloWorld" targetNamespace="http://www.jboss.org/hello_world_soap_http"
- xmlns="http://schemas.xmlsoap.org/wsdl/"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:tns="http://www.jboss.org/hello_world_soap_http"
- xmlns:x1="http://www.jboss.org/hello_world_soap_http/types"
- xmlns:x2="http://www.jboss.org/mytypes"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema">
- <wsdl:types>
- <schema targetNamespace="http://www.jboss.org/hello_world_soap_http/types"
- xmlns="http://www.w3.org/2001/XMLSchema"
- xmlns:tns="http://www.jboss.org/hello_world_soap_http/types"
- elementFormDefault="qualified">
- <simpleType name="MyStringType">
- <restriction base="string">
- <maxLength value="30" />
- </restriction>
- </simpleType>
-
- <element name="greetMe">
- <complexType>
- <sequence>
- <element name="myStringType" type="tns:MyStringType"/>
- <element name="requestType" type="string"/>
- </sequence>
- </complexType>
- </element>
- <element name="greetMeResponse">
- <complexType>
- <sequence>
- <element name="requestType" type="string"/>
- </sequence>
- </complexType>
- </element>
- </schema>
- <schema targetNamespace="http://www.jboss.org/mytypes"
- xmlns="http://www.w3.org/2001/XMLSchema"
- xmlns:tns="http://www.jboss.org/mytypes"
- elementFormDefault="qualified">
- <element name="greetMeResponse">
- <complexType>
- <sequence>
- <element name="requestType" type="string"/>
- </sequence>
- </complexType>
- </element>
- </schema>
-
-
- </wsdl:types>
- <wsdl:message name="greetMeRequest">
- <wsdl:part element="x1:greetMe" name="in"/>
- </wsdl:message>
- <wsdl:message name="greetMeResponse">
- <wsdl:part element="x2:greetMeResponse" name="out"/>
- </wsdl:message>
-
- <wsdl:portType name="Greeter">
-
- <wsdl:operation name="greetMe">
- <wsdl:input message="tns:greetMeRequest" name="greetMeRequest"/>
- <wsdl:output message="tns:greetMeResponse" name="greetMeResponse"/>
- </wsdl:operation>
- </wsdl:portType>
- <wsdl:binding name="Greeter_SOAPBinding" type="tns:Greeter">
- <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-
- <wsdl:operation name="greetMe">
- <soap:operation soapAction="" style="document"/>
- <wsdl:input name="greetMeRequest">
- <soap:body use="literal"/>
- </wsdl:input>
- <wsdl:output name="greetMeResponse">
- <soap:body use="literal"/>
- </wsdl:output>
- </wsdl:operation>
-
- </wsdl:binding>
- <wsdl:service name="SOAPService">
- <wsdl:port binding="tns:Greeter_SOAPBinding" name="SoapPort">
- <soap:address location="http://localhost:9000/SoapContext/SoapPort"/>
- </wsdl:port>
- </wsdl:service>
-</wsdl:definitions>
Deleted: core/trunk/core/src/test/resources/jaxws-binding.xml
===================================================================
--- core/trunk/core/src/test/resources/jaxws-binding.xml 2010-09-10 11:01:29 UTC (rev 403)
+++ core/trunk/core/src/test/resources/jaxws-binding.xml 2010-12-18 18:17:59 UTC (rev 404)
@@ -1,9 +0,0 @@
-<jaxws:bindings xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
- wsdlLocation="hello_world.wsdl"
- xmlns="http://java.sun.com/xml/ns/jaxws"
- xmlns:jaxws="http://java.sun.com/xml/ns/jaxws">
-
- <jaxws:package name="org.mytest"/>
-
-</jaxws:bindings>
Added: core/trunk/core-cxf/src/test/java/org/jboss/wise/core/consumer/impl/WSConsumerTest.java
===================================================================
--- core/trunk/core-cxf/src/test/java/org/jboss/wise/core/consumer/impl/WSConsumerTest.java (rev 0)
+++ core/trunk/core-cxf/src/test/java/org/jboss/wise/core/consumer/impl/WSConsumerTest.java 2010-12-18 18:17:59 UTC (rev 404)
@@ -0,0 +1,91 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wise.core.consumer.impl;
+
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+import static org.junit.matchers.JUnitMatchers.hasItem;
+
+import java.io.File;
+import java.net.URL;
+import java.util.List;
+
+import org.jboss.wise.core.client.SpiLoader;
+import org.jboss.wise.core.consumer.WSConsumer;
+import org.jboss.wise.core.exception.WiseRuntimeException;
+import org.junit.Test;
+
+/**
+ * @author stefano.maestri(a)javalinux.it
+ * @author alessio.soldano(a)jboss.com
+ */
+public class WSConsumerTest {
+
+ @Test
+ public void parseHelloGreetingWSDLShouldWorkWithoutPackage() throws Exception {
+ URL url = Thread.currentThread().getContextClassLoader().getResource(".");
+ File outputDir = new File(url.getFile());
+ URL wsdURL = Thread.currentThread().getContextClassLoader().getResource("./hello_world.wsdl");
+ WSConsumer importer = newConsumer();
+ importer.importObjectFromWsdl(wsdURL.toExternalForm(), outputDir, outputDir, null, null, System.out, null);
+ }
+
+ @Test()
+ public void parseHelloWSDLWithBindingFile() throws Exception {
+ URL url = Thread.currentThread().getContextClassLoader().getResource(".");
+ File outputDir = new File(url.getFile());
+ URL bindingURL = Thread.currentThread().getContextClassLoader().getResource("./jaxws-binding.xml");
+ URL wsdURL = Thread.currentThread().getContextClassLoader().getResource("./hello_world.wsdl");
+ File bindFile = new File(bindingURL.getFile());
+ List<File> bindings = new java.util.ArrayList<File>();
+ bindings.add(bindFile);
+ WSConsumer importer = newConsumer();
+ importer.importObjectFromWsdl(wsdURL.toExternalForm(), outputDir, outputDir, null, bindings, System.out, null);
+ File generatedClass = new File(url.getFile(), "org/mytest");
+ assertTrue(generatedClass.exists());
+ }
+
+ @Test(expected = WiseRuntimeException.class)
+ public void parseHelloGreetingWSDLShouldFailWithPackageAndNoBindingsForNameDuplication() throws Exception {
+ URL url = Thread.currentThread().getContextClassLoader().getResource(".");
+ File outputDir = new File(url.getFile());
+ URL wsdURL = Thread.currentThread().getContextClassLoader().getResource("./hello_world.wsdl");
+ WSConsumer importer = newConsumer();
+ importer.importObjectFromWsdl(wsdURL.toExternalForm(), outputDir, outputDir, "org.jboss.wise", null, System.out, null);
+ }
+
+ @Test()
+ public void getClassNamesShouldFindFooClassPlaceHolder() throws Exception {
+ WSConsumer importer = newConsumer();
+ URL url = Thread.currentThread().getContextClassLoader().getResource("./placeHolderClasses/");
+ File file = new File(url.getFile());
+ List<String> list = importer.getClassNames(file);
+ assertThat(list.size(), is(1));
+ assertThat(list, hasItem("org.jboss.foo.Foo"));
+
+ }
+
+ private WSConsumer newConsumer() {
+ return (WSConsumer) SpiLoader.loadService("org.jboss.wise.consumer.WSConsumer", "org.jboss.wise.core.consumer.impl.jbossws.DefaultWSImportImpl");
+ }
+}
Added: core/trunk/core-cxf/src/test/resources/hello_world.wsdl
===================================================================
--- core/trunk/core-cxf/src/test/resources/hello_world.wsdl (rev 0)
+++ core/trunk/core-cxf/src/test/resources/hello_world.wsdl 2010-12-18 18:17:59 UTC (rev 404)
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions name="HelloWorld" targetNamespace="http://www.jboss.org/hello_world_soap_http"
+ xmlns="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:tns="http://www.jboss.org/hello_world_soap_http"
+ xmlns:x1="http://www.jboss.org/hello_world_soap_http/types"
+ xmlns:x2="http://www.jboss.org/mytypes"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+ <wsdl:types>
+ <schema targetNamespace="http://www.jboss.org/hello_world_soap_http/types"
+ xmlns="http://www.w3.org/2001/XMLSchema"
+ xmlns:tns="http://www.jboss.org/hello_world_soap_http/types"
+ elementFormDefault="qualified">
+ <simpleType name="MyStringType">
+ <restriction base="string">
+ <maxLength value="30" />
+ </restriction>
+ </simpleType>
+
+ <element name="greetMe">
+ <complexType>
+ <sequence>
+ <element name="myStringType" type="tns:MyStringType"/>
+ <element name="requestType" type="string"/>
+ </sequence>
+ </complexType>
+ </element>
+ <element name="greetMeResponse">
+ <complexType>
+ <sequence>
+ <element name="requestType" type="string"/>
+ </sequence>
+ </complexType>
+ </element>
+ </schema>
+ <schema targetNamespace="http://www.jboss.org/mytypes"
+ xmlns="http://www.w3.org/2001/XMLSchema"
+ xmlns:tns="http://www.jboss.org/mytypes"
+ elementFormDefault="qualified">
+ <element name="greetMeResponse">
+ <complexType>
+ <sequence>
+ <element name="requestType" type="string"/>
+ </sequence>
+ </complexType>
+ </element>
+ </schema>
+
+
+ </wsdl:types>
+ <wsdl:message name="greetMeRequest">
+ <wsdl:part element="x1:greetMe" name="in"/>
+ </wsdl:message>
+ <wsdl:message name="greetMeResponse">
+ <wsdl:part element="x2:greetMeResponse" name="out"/>
+ </wsdl:message>
+
+ <wsdl:portType name="Greeter">
+
+ <wsdl:operation name="greetMe">
+ <wsdl:input message="tns:greetMeRequest" name="greetMeRequest"/>
+ <wsdl:output message="tns:greetMeResponse" name="greetMeResponse"/>
+ </wsdl:operation>
+ </wsdl:portType>
+ <wsdl:binding name="Greeter_SOAPBinding" type="tns:Greeter">
+ <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+
+ <wsdl:operation name="greetMe">
+ <soap:operation soapAction="" style="document"/>
+ <wsdl:input name="greetMeRequest">
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output name="greetMeResponse">
+ <soap:body use="literal"/>
+ </wsdl:output>
+ </wsdl:operation>
+
+ </wsdl:binding>
+ <wsdl:service name="SOAPService">
+ <wsdl:port binding="tns:Greeter_SOAPBinding" name="SoapPort">
+ <soap:address location="http://localhost:9000/SoapContext/SoapPort"/>
+ </wsdl:port>
+ </wsdl:service>
+</wsdl:definitions>
Added: core/trunk/core-cxf/src/test/resources/jaxws-binding.xml
===================================================================
--- core/trunk/core-cxf/src/test/resources/jaxws-binding.xml (rev 0)
+++ core/trunk/core-cxf/src/test/resources/jaxws-binding.xml 2010-12-18 18:17:59 UTC (rev 404)
@@ -0,0 +1,9 @@
+<jaxws:bindings xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ wsdlLocation="hello_world.wsdl"
+ xmlns="http://java.sun.com/xml/ns/jaxws"
+ xmlns:jaxws="http://java.sun.com/xml/ns/jaxws">
+
+ <jaxws:package name="org.mytest"/>
+
+</jaxws:bindings>
Added: core/trunk/core-cxf/src/test/resources/placeHolderClasses/org/jboss/foo/Foo.class
===================================================================
Added: core/trunk/core-native/src/test/java/org/jboss/wise/core/consumer/impl/WSConsumerTest.java
===================================================================
--- core/trunk/core-native/src/test/java/org/jboss/wise/core/consumer/impl/WSConsumerTest.java (rev 0)
+++ core/trunk/core-native/src/test/java/org/jboss/wise/core/consumer/impl/WSConsumerTest.java 2010-12-18 18:17:59 UTC (rev 404)
@@ -0,0 +1,91 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wise.core.consumer.impl;
+
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+import static org.junit.matchers.JUnitMatchers.hasItem;
+
+import java.io.File;
+import java.net.URL;
+import java.util.List;
+
+import org.jboss.wise.core.client.SpiLoader;
+import org.jboss.wise.core.consumer.WSConsumer;
+import org.jboss.wise.core.exception.WiseRuntimeException;
+import org.junit.Test;
+
+/**
+ * @author stefano.maestri(a)javalinux.it
+ * @author alessio.soldano(a)jboss.com
+ */
+public class WSConsumerTest {
+
+ @Test
+ public void parseHelloGreetingWSDLShouldWorkWithoutPackage() throws Exception {
+ URL url = Thread.currentThread().getContextClassLoader().getResource(".");
+ File outputDir = new File(url.getFile());
+ URL wsdURL = Thread.currentThread().getContextClassLoader().getResource("./hello_world.wsdl");
+ WSConsumer importer = newConsumer();
+ importer.importObjectFromWsdl(wsdURL.toExternalForm(), outputDir, outputDir, null, null, System.out, null);
+ }
+
+ @Test()
+ public void parseHelloWSDLWithBindingFile() throws Exception {
+ URL url = Thread.currentThread().getContextClassLoader().getResource(".");
+ File outputDir = new File(url.getFile());
+ URL bindingURL = Thread.currentThread().getContextClassLoader().getResource("./jaxws-binding.xml");
+ URL wsdURL = Thread.currentThread().getContextClassLoader().getResource("./hello_world.wsdl");
+ File bindFile = new File(bindingURL.getFile());
+ List<File> bindings = new java.util.ArrayList<File>();
+ bindings.add(bindFile);
+ WSConsumer importer = newConsumer();
+ importer.importObjectFromWsdl(wsdURL.toExternalForm(), outputDir, outputDir, null, bindings, System.out, null);
+ File generatedClass = new File(url.getFile(), "org/mytest");
+ assertTrue(generatedClass.exists());
+ }
+
+ @Test(expected = WiseRuntimeException.class)
+ public void parseHelloGreetingWSDLShouldFailWithPackageAndNoBindingsForNameDuplication() throws Exception {
+ URL url = Thread.currentThread().getContextClassLoader().getResource(".");
+ File outputDir = new File(url.getFile());
+ URL wsdURL = Thread.currentThread().getContextClassLoader().getResource("./hello_world.wsdl");
+ WSConsumer importer = newConsumer();
+ importer.importObjectFromWsdl(wsdURL.toExternalForm(), outputDir, outputDir, "org.jboss.wise", null, System.out, null);
+ }
+
+ @Test()
+ public void getClassNamesShouldFindFooClassPlaceHolder() throws Exception {
+ WSConsumer importer = newConsumer();
+ URL url = Thread.currentThread().getContextClassLoader().getResource("./placeHolderClasses/");
+ File file = new File(url.getFile());
+ List<String> list = importer.getClassNames(file);
+ assertThat(list.size(), is(1));
+ assertThat(list, hasItem("org.jboss.foo.Foo"));
+
+ }
+
+ private WSConsumer newConsumer() {
+ return (WSConsumer) SpiLoader.loadService("org.jboss.wise.consumer.WSConsumer", "org.jboss.wise.core.consumer.impl.jbossws.DefaultWSImportImpl");
+ }
+}
Added: core/trunk/core-native/src/test/resources/jaxws-binding.xml
===================================================================
--- core/trunk/core-native/src/test/resources/jaxws-binding.xml (rev 0)
+++ core/trunk/core-native/src/test/resources/jaxws-binding.xml 2010-12-18 18:17:59 UTC (rev 404)
@@ -0,0 +1,9 @@
+<jaxws:bindings xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ wsdlLocation="hello_world.wsdl"
+ xmlns="http://java.sun.com/xml/ns/jaxws"
+ xmlns:jaxws="http://java.sun.com/xml/ns/jaxws">
+
+ <jaxws:package name="org.mytest"/>
+
+</jaxws:bindings>
Added: core/trunk/core-native/src/test/resources/placeHolderClasses/org/jboss/foo/Foo.class
===================================================================
Modified: core/trunk/integration-testsuite/pom.xml
===================================================================
--- core/trunk/integration-testsuite/pom.xml 2010-09-10 11:01:29 UTC (rev 403)
+++ core/trunk/integration-testsuite/pom.xml 2010-12-18 18:17:59 UTC (rev 404)
@@ -131,8 +131,30 @@
<modules>
<module>native</module>
</modules>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.ws.native</groupId>
+ <artifactId>jbossws-native-client</artifactId>
+ <scope>runtime</scope> <!-- runtime scope to avoid having the dependency while compiling -->
+ </dependency>
+ </dependencies>
</profile>
<profile>
+ <id>cxf</id>
+ <activation>
+ <property>
+ <name>cxf.stack</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.ws.cxf</groupId>
+ <artifactId>jbossws-cxf-client</artifactId>
+ <scope>runtime</scope> <!-- runtime scope to avoid having the dependency while compiling -->
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
<id>use.endorsed.dir</id>
<activation>
<property>
Modified: core/trunk/pom.xml
===================================================================
--- core/trunk/pom.xml 2010-09-10 11:01:29 UTC (rev 403)
+++ core/trunk/pom.xml 2010-12-18 18:17:59 UTC (rev 404)
@@ -47,7 +47,7 @@
<surefire.usefile>false</surefire.usefile>
<compile.flags>-Xlint:unchecked,deprecation,fallthrough,finally</compile.flags>
<checkstyle.extension />
- <cxf.version>2.2</cxf.version>
+ <cxf.version>2.2.9</cxf.version> <!-- This should stay in synch with the one used within the jbossws-cxf being pulled in wise-core-cxf -->
<compiler.fork>false</compiler.fork>
</properties>
13 years, 11 months
- 1
- 0
- ← Newer
- 1
- Older →