JBossWS SVN: r2355 - in trunk: jbossws-core and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: jason.greene(a)jboss.com
Date: 2007-02-13 18:16:12 -0500 (Tue, 13 Feb 2007)
New Revision: 2355
Modified:
trunk/build/ant-import/build-release.xml
trunk/jbossws-core/build.xml
Log:
Add wsrunclient
Modified: trunk/build/ant-import/build-release.xml
===================================================================
--- trunk/build/ant-import/build-release.xml 2007-02-13 23:13:51 UTC (rev 2354)
+++ trunk/build/ant-import/build-release.xml 2007-02-13 23:16:12 UTC (rev 2355)
@@ -151,6 +151,7 @@
<fileset dir="${etc.dir}">
<include name="wstools.bat"/>
<include name="wstools.sh"/>
+ <include name="wsrunclient"/>
<include name="wsprovide.bat"/>
<include name="wsprovide"/>
<include name="wsconsume.bat"/>
Modified: trunk/jbossws-core/build.xml
===================================================================
--- trunk/jbossws-core/build.xml 2007-02-13 23:13:51 UTC (rev 2354)
+++ trunk/jbossws-core/build.xml 2007-02-13 23:16:12 UTC (rev 2355)
@@ -162,8 +162,9 @@
<include name="wstools-log4j.xml"/>
</fileset>
<zipfileset dir="${etc.dir}" filemode="755">
- <include name="wsprovide.sh"/>
- <include name="wsconsume.sh"/>
+ <include name="wsprovide"/>
+ <include name="wsrunclient"/>
+ <include name="wsconsume"/>
<include name="wstools.sh"/>
</zipfileset>
</jar>
17 years, 4 months
JBossWS SVN: r2354 - trunk/build/etc.
by jbossws-commits＠lists.jboss.org
Author: jason.greene(a)jboss.com
Date: 2007-02-13 18:13:51 -0500 (Tue, 13 Feb 2007)
New Revision: 2354
Added:
trunk/build/etc/wsrunclient
Log:
Add new wsrunclient tool
Added: trunk/build/etc/wsrunclient
===================================================================
--- trunk/build/etc/wsrunclient (rev 0)
+++ trunk/build/etc/wsrunclient 2007-02-13 23:13:51 UTC (rev 2354)
@@ -0,0 +1,97 @@
+#!/bin/sh
+
+# $Id: wsprovide 2325 2007-02-09 22:14:15Z jason.greene(a)jboss.com $
+DIRNAME=`dirname $0`
+PROGNAME=`basename $0`
+
+if [ $# -eq 0 ]; then
+ echo "$PROGNAME is a command line tool that invokes a JBossWS JAX-WS Web Service client."
+ echo "It builds the correct classpath and endorsed libs for you. Feel free to use"
+ echo "the code for this script to make your own shell scripts. It is open source"
+ echo "after all."
+ echo
+ echo "usage: $PROGNAME [-classpath <additional class path>] <java-main-class> [arguments...]"
+ exit 1;
+fi
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false;
+case "`uname`" in
+ CYGWIN*)
+ cygwin=true
+ ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+ [ -n "$JBOSS_HOME" ] &&
+ JBOSS_HOME=`cygpath --unix "$JBOSS_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+# Setup JBOSS_HOME
+if [ "x$JBOSS_HOME" = "x" ]; then
+ # get the full path (without any relative bits)
+ JBOSS_HOME=`cd $DIRNAME/..; pwd`
+fi
+export JBOSS_HOME
+
+# Setup the JVM
+if [ "x$JAVA" = "x" ]; then
+ if [ "x$JAVA_HOME" != "x" ]; then
+ JAVA="$JAVA_HOME/bin/java"
+ else
+ JAVA="java"
+ fi
+fi
+
+#JPDA options. Uncomment and modify as appropriate to enable remote debugging .
+#JAVA_OPTS="-classic -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n $JAVA_OPTS"
+
+# Setup JBoss sepecific properties
+JAVA_OPTS="$JAVA_OPTS"
+
+# Setup the java endorsed dirs
+JBOSS_ENDORSED_DIRS="$JBOSS_HOME/lib/endorsed"
+
+# Setup the wstools classpath
+WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-xml-binding.jar"
+WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/activation.jar"
+WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/getopt.jar"
+WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/javassist.jar"
+WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jaxb-api.jar"
+WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jaxb-impl.jar"
+WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jaxb-xjc.jar"
+WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jbossall-client.jar"
+WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-j2ee.jar"
+WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jbossws-client.jar"
+WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-jaxws.jar"
+WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-jaxrpc.jar"
+WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-saaj.jar"
+WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/log4j.jar"
+WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/mail.jar"
+WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/wstx.jar"
+
+while [ $# -ge 1 ]; do
+ case $1 in
+ "-classpath") WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$2"; shift;;
+ *) args="$args \"$1\"";;
+ esac
+ shift
+done
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+ JBOSS_HOME=`cygpath --path --windows "$JBOSS_HOME"`
+ JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+ WSRUNCLIENT_CLASSPATH=`cygpath --path --windows "$WSRUNCLIENT_CLASSPATH"`
+ JBOSS_ENDORSED_DIRS=`cygpath --path --windows "$JBOSS_ENDORSED_DIRS"`
+fi
+
+# Execute the JVM
+eval "$JAVA" $JAVA_OPTS \
+ -Djava.endorsed.dirs="$JBOSS_ENDORSED_DIRS" \
+ -Dlog4j.configuration=wstools-log4j.xml \
+ -classpath "$WSRUNCLIENT_CLASSPATH" \
+ "$args"
Property changes on: trunk/build/etc/wsrunclient
___________________________________________________________________
Name: svn:executable
+ *
17 years, 4 months
JBossWS SVN: r2353 - trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/command.
by jbossws-commits＠lists.jboss.org
Author: jason.greene(a)jboss.com
Date: 2007-02-13 17:17:00 -0500 (Tue, 13 Feb 2007)
New Revision: 2353
Modified:
trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/command/wsconsume.java
Log:
Correct javadoc
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/command/wsconsume.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/command/wsconsume.java 2007-02-13 17:21:18 UTC (rev 2352)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/command/wsconsume.java 2007-02-13 22:17:00 UTC (rev 2353)
@@ -39,7 +39,7 @@
* from a WSDL file.
*
* <pre>
- * usage: wsimport [options] <wsdl-urlgt;
+ * usage: wsconsume [options] <wsdl-url>
* options:
* -h, --help Show this help message
* -b, --binding=<file> One or more JAX-WS or JAXB binding files
17 years, 4 months
JBossWS SVN: r2352 - branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-02-13 12:21:18 -0500 (Tue, 13 Feb 2007)
New Revision: 2352
Modified:
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/JaxrBaseTest.java
Log:
typo
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/JaxrBaseTest.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/JaxrBaseTest.java 2007-02-13 16:50:42 UTC (rev 2351)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/JaxrBaseTest.java 2007-02-13 17:21:18 UTC (rev 2352)
@@ -106,7 +106,6 @@
Properties props = new Properties();
props.setProperty("javax.xml.registry.queryManagerURL", queryurl);
-
props.setProperty("javax.xml.registry.lifeCycleManagerURL", puburl);
String transportClass = System.getProperty("juddi.proxy.transportClass", "org.jboss.jaxr.juddi.transport.SaajTransport");
@@ -160,9 +159,6 @@
/**
* Locale aware Search a business in the registry
- *
- * @param bizname
- * @throws JAXRException
*/
public void searchBusiness(String bizname) throws JAXRException
{
17 years, 4 months
JBossWS SVN: r2351 - branches/jbossws-1.2.0/jbossws-docs/user-guide/project/en/modules.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-02-13 11:50:42 -0500 (Tue, 13 Feb 2007)
New Revision: 2351
Added:
branches/jbossws-1.2.0/jbossws-docs/user-guide/project/en/modules/wsbpel/
Log:
REsurect wsbpel
Copied: branches/jbossws-1.2.0/jbossws-docs/user-guide/project/en/modules/wsbpel (from rev 2350, tags/jbossws-1.0.4.GA/docs/user-guide/project/en/modules/wsbpel)
17 years, 4 months
JBossWS SVN: r2350 - in branches/jbossws-1.2.0/build: ant-import and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-02-13 11:38:35 -0500 (Tue, 13 Feb 2007)
New Revision: 2350
Modified:
branches/jbossws-1.2.0/build/ant-import/build-thirdparty.xml
branches/jbossws-1.2.0/build/version.properties
Log:
Remove thirdparty scout,juddi
Modified: branches/jbossws-1.2.0/build/ant-import/build-thirdparty.xml
===================================================================
--- branches/jbossws-1.2.0/build/ant-import/build-thirdparty.xml 2007-02-13 16:37:16 UTC (rev 2349)
+++ branches/jbossws-1.2.0/build/ant-import/build-thirdparty.xml 2007-02-13 16:38:35 UTC (rev 2350)
@@ -28,7 +28,6 @@
<get src="${jboss.repository}/apache-collections/${apache-collections}/lib/commons-collections.jar" dest="${thirdparty.dir}/commons-collections.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/apache-log4j/${apache-log4j}/lib/log4j.jar" dest="${thirdparty.dir}/log4j.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/apache-logging/${apache-logging}/lib/commons-logging.jar" dest="${thirdparty.dir}/commons-logging.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/apache-scout/${apache-scout}/lib/scout.jar" dest="${thirdparty.dir}/scout.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/apache-xalan/${apache-xalan}/lib/serializer.jar" dest="${thirdparty.dir}/serializer.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/apache-xalan/${apache-xalan}/lib/xalan.jar" dest="${thirdparty.dir}/xalan.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/apache-xerces/${apache-xerces}/lib/resolver.jar" dest="${thirdparty.dir}/resolver.jar" usetimestamp="true" verbose="true"/>
@@ -61,7 +60,6 @@
<get src="${jboss.repository}/jboss/security/${jboss-security}/lib/jbosssx-src.zip" dest="${thirdparty.dir}/jbosssx-src.zip" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jbossas/core-libs/${jbossas-core-libs}/lib/jboss-j2ee.jar" dest="${thirdparty.dir}/jboss-j2ee.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jbpm/bpel/${jbpm-bpel}/lib/jbpm-bpel.sar" dest="${thirdparty.dir}/jbpm-bpel.sar" usetimestamp="true" verbose="true" />
- <get src="${jboss.repository}/juddi/${juddi}/lib/juddi.jar" dest="${thirdparty.dir}/juddi.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/junit/${junit}/lib/junit.jar" dest="${thirdparty.dir}/junit.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/oswego-concurrent/${oswego-concurrent}/lib/concurrent.jar" dest="${thirdparty.dir}/concurrent.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/qdox/${qdox}/lib/qdox.jar" dest="${thirdparty.dir}/qdox.jar" usetimestamp="true" verbose="true"/>
Modified: branches/jbossws-1.2.0/build/version.properties
===================================================================
--- branches/jbossws-1.2.0/build/version.properties 2007-02-13 16:37:16 UTC (rev 2349)
+++ branches/jbossws-1.2.0/build/version.properties 2007-02-13 16:38:35 UTC (rev 2350)
@@ -27,7 +27,6 @@
apache-collections=3.1
apache-log4j=1.2.8
apache-logging=1.0.5.GA-jboss
-apache-scout=0.7rc2
apache-tomcat=5.5.20
apache-xalan=j_2.7.0
apache-xerces=2.7.1
@@ -45,7 +44,6 @@
jbossas-core-libs=4.0.5.GA
jbossws-wsconsume=2.0.0
jbpm-bpel=1.1.Beta3
-juddi=0.9RC4
junit=3.8.1
oswego-concurrent=1.3.4
qdox=1.4
17 years, 4 months
JBossWS SVN: r2349 - in branches/jbossws-1.2.0: build/ant-import and 11 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-02-13 11:37:16 -0500 (Tue, 13 Feb 2007)
New Revision: 2349
Added:
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/JaxrBaseTest.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/publish/
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/publish/JaxrDeleteOrganizationTestCase.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/publish/JaxrSaveOrganizationTestCase.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/query/
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/query/JaxrBusinessQueryTestCase.java
Modified:
branches/jbossws-1.2.0/build/ant-import/build-thirdparty.xml
branches/jbossws-1.2.0/build/version.properties
branches/jbossws-1.2.0/integration-jboss40/build.xml
branches/jbossws-1.2.0/integration-jboss42/build.xml
branches/jbossws-1.2.0/integration-jboss50/build.xml
branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/build.xml
branches/jbossws-1.2.0/jbossws-tests/build.xml
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt
Log:
Add jaxr tests
Modified: branches/jbossws-1.2.0/build/ant-import/build-thirdparty.xml
===================================================================
--- branches/jbossws-1.2.0/build/ant-import/build-thirdparty.xml 2007-02-13 12:37:40 UTC (rev 2348)
+++ branches/jbossws-1.2.0/build/ant-import/build-thirdparty.xml 2007-02-13 16:37:16 UTC (rev 2349)
@@ -28,6 +28,7 @@
<get src="${jboss.repository}/apache-collections/${apache-collections}/lib/commons-collections.jar" dest="${thirdparty.dir}/commons-collections.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/apache-log4j/${apache-log4j}/lib/log4j.jar" dest="${thirdparty.dir}/log4j.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/apache-logging/${apache-logging}/lib/commons-logging.jar" dest="${thirdparty.dir}/commons-logging.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/apache-scout/${apache-scout}/lib/scout.jar" dest="${thirdparty.dir}/scout.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/apache-xalan/${apache-xalan}/lib/serializer.jar" dest="${thirdparty.dir}/serializer.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/apache-xalan/${apache-xalan}/lib/xalan.jar" dest="${thirdparty.dir}/xalan.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/apache-xerces/${apache-xerces}/lib/resolver.jar" dest="${thirdparty.dir}/resolver.jar" usetimestamp="true" verbose="true"/>
@@ -60,6 +61,7 @@
<get src="${jboss.repository}/jboss/security/${jboss-security}/lib/jbosssx-src.zip" dest="${thirdparty.dir}/jbosssx-src.zip" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jbossas/core-libs/${jbossas-core-libs}/lib/jboss-j2ee.jar" dest="${thirdparty.dir}/jboss-j2ee.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jbpm/bpel/${jbpm-bpel}/lib/jbpm-bpel.sar" dest="${thirdparty.dir}/jbpm-bpel.sar" usetimestamp="true" verbose="true" />
+ <get src="${jboss.repository}/juddi/${juddi}/lib/juddi.jar" dest="${thirdparty.dir}/juddi.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/junit/${junit}/lib/junit.jar" dest="${thirdparty.dir}/junit.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/oswego-concurrent/${oswego-concurrent}/lib/concurrent.jar" dest="${thirdparty.dir}/concurrent.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/qdox/${qdox}/lib/qdox.jar" dest="${thirdparty.dir}/qdox.jar" usetimestamp="true" verbose="true"/>
Modified: branches/jbossws-1.2.0/build/version.properties
===================================================================
--- branches/jbossws-1.2.0/build/version.properties 2007-02-13 12:37:40 UTC (rev 2348)
+++ branches/jbossws-1.2.0/build/version.properties 2007-02-13 16:37:16 UTC (rev 2349)
@@ -27,6 +27,7 @@
apache-collections=3.1
apache-log4j=1.2.8
apache-logging=1.0.5.GA-jboss
+apache-scout=0.7rc2
apache-tomcat=5.5.20
apache-xalan=j_2.7.0
apache-xerces=2.7.1
@@ -44,6 +45,7 @@
jbossas-core-libs=4.0.5.GA
jbossws-wsconsume=2.0.0
jbpm-bpel=1.1.Beta3
+juddi=0.9RC4
junit=3.8.1
oswego-concurrent=1.3.4
qdox=1.4
Modified: branches/jbossws-1.2.0/integration-jboss40/build.xml
===================================================================
--- branches/jbossws-1.2.0/integration-jboss40/build.xml 2007-02-13 12:37:40 UTC (rev 2348)
+++ branches/jbossws-1.2.0/integration-jboss40/build.xml 2007-02-13 16:37:16 UTC (rev 2349)
@@ -338,6 +338,13 @@
<copy todir="${jboss40.home}//../../../thirdparty/jboss/jbossxb/lib" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/>
<copy todir="${jboss40.home}/client" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/>
<copy todir="${jboss40.home}/lib" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/>
+ <!--
+ [JBWS-1517] - Resolve dependency on juddi-service.sar
+ -->
+ <mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ <copy todir="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar">
+ <fileset dir="${jboss40.home}/server/all/deploy/juddi-service.sar"/>
+ </copy>
</target>
<!-- Deploy jbossws to jboss40 jdk1.4 -->
@@ -386,6 +393,13 @@
<copy todir="${jboss40.home}//../../../thirdparty/jboss/jbossxb/lib" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/>
<copy todir="${jboss40.home}/client" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/>
<copy todir="${jboss40.home}/lib" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/>
+ <!--
+ [JBWS-1517] - Resolve dependency on juddi-service.sar
+ -->
+ <mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ <copy todir="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar">
+ <fileset dir="${jboss40.home}/server/all/deploy/juddi-service.sar"/>
+ </copy>
</target>
<!-- ================================================================== -->
Modified: branches/jbossws-1.2.0/integration-jboss42/build.xml
===================================================================
--- branches/jbossws-1.2.0/integration-jboss42/build.xml 2007-02-13 12:37:40 UTC (rev 2348)
+++ branches/jbossws-1.2.0/integration-jboss42/build.xml 2007-02-13 16:37:16 UTC (rev 2349)
@@ -166,6 +166,13 @@
<include name="jbossws-jboss42-integration.jar"/>
</fileset>
</copy>
+ <!--
+ [JBWS-1517] - Resolve dependency on juddi-service.sar
+ -->
+ <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ <copy todir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar">
+ <fileset dir="${jboss42.home}/server/all/deploy/juddi-service.sar"/>
+ </copy>
</target>
<!-- ================================================================== -->
Modified: branches/jbossws-1.2.0/integration-jboss50/build.xml
===================================================================
--- branches/jbossws-1.2.0/integration-jboss50/build.xml 2007-02-13 12:37:40 UTC (rev 2348)
+++ branches/jbossws-1.2.0/integration-jboss50/build.xml 2007-02-13 16:37:16 UTC (rev 2349)
@@ -175,6 +175,13 @@
<include name="jbossws-jboss50-integration.jar"/>
</fileset>
</copy>
+ <!--
+ [JBWS-1517] - Resolve dependency on juddi-service.sar
+ -->
+ <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ <copy todir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar">
+ <fileset dir="${jboss50.home}/server/all/deploy/juddi-service.sar"/>
+ </copy>
</target>
<!-- ================================================================== -->
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/build.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/build.xml 2007-02-13 12:37:40 UTC (rev 2348)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/build.xml 2007-02-13 16:37:16 UTC (rev 2349)
@@ -196,6 +196,9 @@
<pathelement location="${jboss.server.lib}/jboss.jar"/>
<pathelement location="${jboss.server.lib}/jbosssx.jar"/>
<pathelement location="${jboss.server.lib}/jbosssx.jar"/>
+ <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi.jar"/>
+ <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddisaaj.jar"/>
+ <pathelement location="${jboss.server.deploy}/juddi-service.sar/scout.jar"/>
<path refid="javac.classpath"/>
</path>
Modified: branches/jbossws-1.2.0/jbossws-tests/build.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/build.xml 2007-02-13 12:37:40 UTC (rev 2348)
+++ branches/jbossws-1.2.0/jbossws-tests/build.xml 2007-02-13 16:37:16 UTC (rev 2349)
@@ -203,6 +203,9 @@
<pathelement location="${jboss.server.lib}/jboss.jar"/>
<pathelement location="${jboss.server.lib}/jbosssx.jar"/>
<pathelement location="${jboss.server.lib}/jbosssx.jar"/>
+ <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi.jar"/>
+ <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddisaaj.jar"/>
+ <pathelement location="${jboss.server.deploy}/juddi-service.sar/scout.jar"/>
<path refid="javac.classpath"/>
</path>
@@ -227,10 +230,7 @@
</target>
<target name="tomcat-classpath" depends="common-classpath" if="jbossws.integration.target.tomcat">
-
<fail message="jdk-1.5 is required for Tomcat integration" unless="HAVE_JDK_1.5"/>
-
- <!-- The test client classpath -->
<path id="test.client.classpath">
<path refid="jbossws.classpath"/>
<pathelement location="${tomcat.common.lib}/jbossws-thirdparty.jar"/>
Added: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/JaxrBaseTest.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/JaxrBaseTest.java (rev 0)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/JaxrBaseTest.java 2007-02-13 16:37:16 UTC (rev 2349)
@@ -0,0 +1,387 @@
+/*
+ * 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.test.ws.jaxws.samples.jaxr.scout;
+
+import java.net.PasswordAuthentication;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Locale;
+import java.util.Properties;
+import java.util.Set;
+
+import javax.management.MBeanServerConnection;
+import javax.management.ObjectName;
+import javax.xml.registry.BulkResponse;
+import javax.xml.registry.BusinessLifeCycleManager;
+import javax.xml.registry.BusinessQueryManager;
+import javax.xml.registry.Connection;
+import javax.xml.registry.ConnectionFactory;
+import javax.xml.registry.FindQualifier;
+import javax.xml.registry.JAXRException;
+import javax.xml.registry.RegistryService;
+import javax.xml.registry.infomodel.Classification;
+import javax.xml.registry.infomodel.ClassificationScheme;
+import javax.xml.registry.infomodel.EmailAddress;
+import javax.xml.registry.infomodel.ExternalIdentifier;
+import javax.xml.registry.infomodel.InternationalString;
+import javax.xml.registry.infomodel.Key;
+import javax.xml.registry.infomodel.LocalizedString;
+import javax.xml.registry.infomodel.Organization;
+import javax.xml.registry.infomodel.PersonName;
+import javax.xml.registry.infomodel.PostalAddress;
+import javax.xml.registry.infomodel.RegistryObject;
+import javax.xml.registry.infomodel.Service;
+import javax.xml.registry.infomodel.ServiceBinding;
+import javax.xml.registry.infomodel.TelephoneNumber;
+import javax.xml.registry.infomodel.User;
+
+import org.jboss.test.ws.JBossWSTest;
+import org.jboss.ws.core.utils.ObjectNameFactory;
+
+/**
+ * Acts as the base class for Jaxr Test Cases
+ *
+ * @author Anil.Saldhana(a)jboss.org
+ * @author Thomas.Diesler(a)jboss.com
+ * @since 29-Dec-2004
+ */
+public class JaxrBaseTest extends JBossWSTest
+{
+ protected String userid = "jboss";
+ protected String passwd = "jboss";
+ protected BusinessLifeCycleManager blm = null;
+ protected RegistryService rs = null;
+ protected BusinessQueryManager bqm = null;
+ protected Connection connection = null;
+ protected BulkResponse br = null;
+ protected MBeanServerConnection server = null;
+
+ protected ConnectionFactory factory = null;
+
+ protected static final ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss:service=juddi");
+
+ /**
+ * Setup of the JUnit test
+ * We create the juddi tables on startup
+ *
+ * @throws Exception
+ */
+ protected void setUp() throws Exception
+ {
+ //Change the createonstart setting for juddi service and restart it
+ server = getServer();
+ server.invoke(OBJECT_NAME, "setCreateOnStart", new Object[] { Boolean.TRUE }, new String[] { Boolean.TYPE.getName() });
+ server.invoke(OBJECT_NAME, "stop", null, null);
+ server.invoke(OBJECT_NAME, "start", null, null);
+
+ //Ensure that the Jaxr Connection Factory class is setup
+ String factoryString = "javax.xml.registry.ConnectionFactoryClass";
+ String factoryClass = System.getProperty(factoryString);
+ if (factoryClass == null || factoryClass.length() == 0)
+ System.setProperty(factoryString, "org.apache.ws.scout.registry.ConnectionFactoryImpl");
+
+ String queryurl = System.getProperty("jaxr.query.url", "http://localhost:8080/juddi/inquiry");
+ String puburl = System.getProperty("jaxr.publish.url", "http://localhost:8080/juddi/publish");
+
+ Properties props = new Properties();
+ props.setProperty("javax.xml.registry.queryManagerURL", queryurl);
+
+ props.setProperty("javax.xml.registry.lifeCycleManagerURL", puburl);
+
+ String transportClass = System.getProperty("juddi.proxy.transportClass", "org.jboss.jaxr.juddi.transport.SaajTransport");
+ System.setProperty("juddi.proxy.transportClass", transportClass);
+
+ // Create the connection, passing it the configuration properties
+ factory = ConnectionFactory.newInstance();
+ factory.setProperties(props);
+ connection = factory.createConnection();
+ }
+
+ /**
+ * Teardown of the junit test
+ * We discard all the tables created by the juddi service
+ *
+ * @throws Exception
+ */
+ protected void tearDown() throws Exception
+ {
+ if (connection != null)
+ connection.close();
+
+ //stop the juddi service so that all the tables are dropped
+ server.invoke(OBJECT_NAME, "setCreateOnStart", new Object[] { Boolean.FALSE }, new String[] { Boolean.TYPE.getName() });
+ server.invoke(OBJECT_NAME, "stop", null, null);
+ }
+
+ /**
+ * Does authentication with the uddi registry
+ */
+ protected void login() throws JAXRException
+ {
+ PasswordAuthentication passwdAuth = new PasswordAuthentication(userid, passwd.toCharArray());
+ Set creds = new HashSet();
+ creds.add(passwdAuth);
+
+ connection.setCredentials(creds);
+ }
+
+ protected void getJAXREssentials() throws JAXRException
+ {
+ rs = connection.getRegistryService();
+ blm = rs.getBusinessLifeCycleManager();
+ bqm = rs.getBusinessQueryManager();
+ }
+
+ public InternationalString getIString(String str) throws JAXRException
+ {
+ return blm.createInternationalString(str);
+ }
+
+ /**
+ * Locale aware Search a business in the registry
+ *
+ * @param bizname
+ * @throws JAXRException
+ */
+ public void searchBusiness(String bizname) throws JAXRException
+ {
+ try
+ {
+ // Get registry service and business query manager
+ this.getJAXREssentials();
+
+ // Define find qualifiers and name patterns
+ Collection findQualifiers = new ArrayList();
+ findQualifiers.add(FindQualifier.SORT_BY_NAME_ASC);
+ Collection namePatterns = new ArrayList();
+ String pattern = "%" + bizname + "%";
+ LocalizedString ls = blm.createLocalizedString(Locale.getDefault(), pattern);
+ namePatterns.add(ls);
+
+ // Find based upon qualifier type and values
+ BulkResponse response = bqm.findOrganizations(findQualifiers, namePatterns, null, null, null, null);
+
+ // check how many organisation we have matched
+ Collection orgs = response.getCollection();
+ if (orgs == null)
+ {
+ log.debug(" -- Matched 0 orgs");
+
+ }
+ else
+ {
+ log.debug(" -- Matched " + orgs.size() + " organizations -- ");
+
+ // then step through them
+ for (Iterator orgIter = orgs.iterator(); orgIter.hasNext();)
+ {
+ Organization org = (Organization)orgIter.next();
+ log.debug("Org name: " + getName(org));
+ log.debug("Org description: " + getDescription(org));
+ log.debug("Org key id: " + getKey(org));
+ checkUser(org);
+ checkServices(org);
+ }
+ }
+ }
+ finally
+ {
+ connection.close();
+ }
+
+ }
+
+ protected RegistryService getRegistryService() throws JAXRException
+ {
+ assertNotNull(connection);
+ return connection.getRegistryService();
+ }
+
+ protected BusinessQueryManager getBusinessQueryManager() throws JAXRException
+ {
+ assertNotNull(connection);
+ if (rs == null)
+ rs = this.getRegistryService();
+ return rs.getBusinessQueryManager();
+ }
+
+ protected BusinessLifeCycleManager getBusinessLifeCycleManager() throws JAXRException
+ {
+ assertNotNull(connection);
+ if (rs == null)
+ rs = this.getRegistryService();
+ return rs.getBusinessLifeCycleManager();
+ }
+
+ private void checkServices(Organization org) throws JAXRException
+ {
+ // Display service and binding information
+ Collection services = org.getServices();
+ for (Iterator svcIter = services.iterator(); svcIter.hasNext();)
+ {
+ Service svc = (Service)svcIter.next();
+ log.debug(" Service name: " + getName(svc));
+ log.debug(" Service description: " + getDescription(svc));
+
+ assertEquals("JBOSS JAXR Service", getName(svc));
+ assertEquals("Services of XML Registry", getDescription(svc));
+
+ Collection serviceBindings = svc.getServiceBindings();
+ for (Iterator sbIter = serviceBindings.iterator(); sbIter.hasNext();)
+ {
+ ServiceBinding sb = (ServiceBinding)sbIter.next();
+ log.debug(" Binding Description: " + getDescription(sb));
+ log.debug(" Access URI: " + sb.getAccessURI());
+ assertEquals("http://testjboss.org", sb.getAccessURI());
+ assertEquals("Test Service Binding", getDescription(sb));
+ }
+ }
+ }
+
+ private void checkUser(Organization org) throws JAXRException
+ {
+ // Display primary contact information
+ User pc = org.getPrimaryContact();
+ if (pc != null)
+ {
+ PersonName pcName = pc.getPersonName();
+ log.debug(" Contact name: " + pcName.getFullName());
+ assertEquals("Anil S", pcName.getFullName());
+ Collection phNums = pc.getTelephoneNumbers(pc.getType());
+ for (Iterator phIter = phNums.iterator(); phIter.hasNext();)
+ {
+ TelephoneNumber num = (TelephoneNumber)phIter.next();
+ log.debug(" Phone number: " + num.getNumber());
+ }
+ Collection eAddrs = pc.getEmailAddresses();
+ for (Iterator eaIter = eAddrs.iterator(); eaIter.hasNext();)
+ {
+ log.debug(" Email Address: " + (EmailAddress)eaIter.next());
+ }
+ }
+ }
+
+ private static String getName(RegistryObject ro) throws JAXRException
+ {
+ if (ro != null && ro.getName() != null)
+ {
+ return ro.getName().getValue();
+ }
+ return "";
+ }
+
+ private static String getDescription(RegistryObject ro) throws JAXRException
+ {
+ if (ro != null && ro.getDescription() != null)
+ {
+ return ro.getDescription().getValue();
+ }
+ return "";
+ }
+
+ private static String getKey(RegistryObject ro) throws JAXRException
+ {
+ if (ro != null && ro.getKey() != null)
+ {
+ return ro.getKey().getId();
+ }
+ return "";
+ }
+
+ /**
+ * Creates a Jaxr Organization with 1 or more services
+ */
+ protected Organization createOrganization(String orgname) throws JAXRException
+ {
+ Organization org = blm.createOrganization(getIString(orgname));
+ org.setDescription(getIString("JBoss Inc"));
+ Service service = blm.createService(getIString("JBOSS JAXR Service"));
+ service.setDescription(getIString("Services of XML Registry"));
+ //Create serviceBinding
+ ServiceBinding serviceBinding = blm.createServiceBinding();
+ serviceBinding.setDescription(blm.createInternationalString("Test Service Binding"));
+
+ //Turn validation of URI off
+ serviceBinding.setValidateURI(false);
+ serviceBinding.setAccessURI("http://testjboss.org");
+
+ // Add the serviceBinding to the service
+ service.addServiceBinding(serviceBinding);
+
+ User user = blm.createUser();
+ org.setPrimaryContact(user);
+ PersonName personName = blm.createPersonName("Anil S");
+ TelephoneNumber telephoneNumber = blm.createTelephoneNumber();
+ telephoneNumber.setNumber("111-111-7777");
+ telephoneNumber.setType(null);
+ PostalAddress address = blm.createPostalAddress("111", "My Drive", "BuckHead", "GA", "USA", "1111-111", "");
+ Collection postalAddresses = new ArrayList();
+ postalAddresses.add(address);
+ Collection emailAddresses = new ArrayList();
+ EmailAddress emailAddress = blm.createEmailAddress("anil(a)apache.org");
+ emailAddresses.add(emailAddress);
+
+ Collection numbers = new ArrayList();
+ numbers.add(telephoneNumber);
+ user.setPersonName(personName);
+ user.setPostalAddresses(postalAddresses);
+ user.setEmailAddresses(emailAddresses);
+ user.setTelephoneNumbers(numbers);
+
+ ClassificationScheme cScheme = getClassificationScheme("ntis-gov:naics", "");
+ Key cKey = blm.createKey("uuid:C0B9FE13-324F-413D-5A5B-2004DB8E5CC2");
+ cScheme.setKey(cKey);
+ Classification classification = blm.createClassification(cScheme, "Computer Systems Design and Related Services", "5415");
+ org.addClassification(classification);
+ ClassificationScheme cScheme1 = getClassificationScheme("D-U-N-S", "");
+ Key cKey1 = blm.createKey("uuid:3367C81E-FF1F-4D5A-B202-3EB13AD02423");
+ cScheme1.setKey(cKey1);
+ ExternalIdentifier ei = blm.createExternalIdentifier(cScheme1, "D-U-N-S number", "08-146-6849");
+ org.addExternalIdentifier(ei);
+ org.addService(service);
+ return org;
+ }
+
+ /**
+ * Delete an Organization with a given key
+ */
+ protected void deleteOrganization(Key orgkey) throws Exception
+ {
+ assertNotNull("Org Key is null?", orgkey);
+ if (blm == null)
+ blm = this.getBusinessLifeCycleManager();
+ Collection keys = new ArrayList();
+ keys.add(orgkey);
+
+ BulkResponse response = blm.deleteOrganizations(keys);
+ Collection exceptions = response.getExceptions();
+ assertNull("Deleting Org with Key=" + orgkey, exceptions);
+ }
+
+ private ClassificationScheme getClassificationScheme(String str1, String str2) throws JAXRException
+ {
+ ClassificationScheme cs = blm.createClassificationScheme(getIString(str1), getIString(str2));
+ return cs;
+ }
+}
Property changes on: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/JaxrBaseTest.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/publish/JaxrDeleteOrganizationTestCase.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/publish/JaxrDeleteOrganizationTestCase.java (rev 0)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/publish/JaxrDeleteOrganizationTestCase.java 2007-02-13 16:37:16 UTC (rev 2349)
@@ -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.test.ws.jaxws.samples.jaxr.scout.publish;
+
+// $Id$
+
+import org.jboss.test.ws.jaxws.samples.jaxr.scout.JaxrBaseTest;
+
+import javax.xml.registry.BulkResponse;
+import javax.xml.registry.JAXRException;
+import javax.xml.registry.JAXRResponse;
+import javax.xml.registry.infomodel.Key;
+import javax.xml.registry.infomodel.Organization;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+
+/**
+ * Checks Deletion of Organization
+ *
+ * @author <mailto:Anil.Saldhana@jboss.org>Anil Saldhana
+ * @since Jan 3, 2005
+ */
+public class JaxrDeleteOrganizationTestCase extends JaxrBaseTest
+{
+ public String saveOrg(String orgname) throws JAXRException
+ {
+ String keyid = "";
+ login();
+
+ getJAXREssentials();
+ Collection orgs = new ArrayList();
+ Organization org = createOrganization("JBOSS");
+
+ orgs.add(org);
+ BulkResponse br = blm.saveOrganizations(orgs);
+ if (br.getStatus() == JAXRResponse.STATUS_SUCCESS)
+ {
+ log.debug("Organization Saved");
+ Collection coll = br.getCollection();
+ Iterator iter = coll.iterator();
+ while (iter.hasNext())
+ {
+ Key key = (Key)iter.next();
+ keyid = key.getId();
+ log.debug("Saved Key=" + key.getId());
+ assertNotNull(keyid);
+ }//end while
+ }
+ else
+ {
+ log.error("JAXRExceptions " + "occurred during save:");
+ Collection exceptions = br.getExceptions();
+ Iterator iter = exceptions.iterator();
+ while (iter.hasNext())
+ {
+ Exception e = (Exception)iter.next();
+ log.error(e.toString());
+ fail(e.toString());
+ }
+ }
+
+ return keyid;
+ }
+
+ public void testDeleteOrgs() throws Exception
+ {
+ String keyid = this.saveOrg("DELETEORG");
+ assertNotNull(keyid);
+ Key key = blm.createKey(keyid);
+ this.deleteOrganization(key);
+ }
+}
Property changes on: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/publish/JaxrDeleteOrganizationTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/publish/JaxrSaveOrganizationTestCase.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/publish/JaxrSaveOrganizationTestCase.java (rev 0)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/publish/JaxrSaveOrganizationTestCase.java 2007-02-13 16:37:16 UTC (rev 2349)
@@ -0,0 +1,103 @@
+/*
+ * 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.test.ws.jaxws.samples.jaxr.scout.publish;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+
+import javax.xml.registry.BulkResponse;
+import javax.xml.registry.JAXRException;
+import javax.xml.registry.JAXRResponse;
+import javax.xml.registry.infomodel.Key;
+import javax.xml.registry.infomodel.Organization;
+
+import org.jboss.test.ws.jaxws.samples.jaxr.scout.JaxrBaseTest;
+
+/**
+ * Tests Jaxr Save Organization
+ *
+ * @author <mailto:Anil.Saldhana@jboss.org>Anil Saldhana
+ * @since Dec 29, 2004
+ */
+
+public class JaxrSaveOrganizationTestCase extends JaxrBaseTest
+{
+ private Key orgKey = null;
+
+ public void testSaveOrg() throws JAXRException
+ {
+ String keyid = "";
+ login();
+
+ rs = connection.getRegistryService();
+
+ blm = rs.getBusinessLifeCycleManager();
+ Collection orgs = new ArrayList();
+ Organization org = createOrganization("JBOSS");
+
+ orgs.add(org);
+ BulkResponse br = blm.saveOrganizations(orgs);
+ if (br.getStatus() == JAXRResponse.STATUS_SUCCESS)
+ {
+ log.debug("Organization Saved");
+ Collection coll = br.getCollection();
+ Iterator iter = coll.iterator();
+ while (iter.hasNext())
+ {
+ Key key = (Key)iter.next();
+ keyid = key.getId();
+ log.debug("Saved Key=" + key.getId());
+ assertNotNull(keyid);
+ }//end while
+ }
+ else
+ {
+ log.error("JAXRExceptions " + "occurred during save:");
+ Collection exceptions = br.getExceptions();
+ Iterator iter = exceptions.iterator();
+ while (iter.hasNext())
+ {
+ Exception e = (Exception)iter.next();
+ log.error(e.toString());
+ fail(e.toString());
+ }
+ }
+ checkBusinessExists("JBOSS");
+ }
+
+ private void checkBusinessExists(String bizname) throws JAXRException
+ {
+ String request = "<find_business generic='2.0' xmlns='urn:uddi-org:api_v2'>" + "<name xml:lang='en'>" + bizname + "</name></find_business>";
+ String response = rs.makeRegistrySpecificRequest(request);
+ if (response == null || "".equals(response))
+ fail("Find Business failed");
+
+ }
+
+ protected void tearDown() throws Exception
+ {
+ super.tearDown();
+ if (this.orgKey != null)
+ this.deleteOrganization(orgKey);
+ }
+}
Property changes on: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/publish/JaxrSaveOrganizationTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/query/JaxrBusinessQueryTestCase.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/query/JaxrBusinessQueryTestCase.java (rev 0)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/query/JaxrBusinessQueryTestCase.java 2007-02-13 16:37:16 UTC (rev 2349)
@@ -0,0 +1,94 @@
+/*
+ * 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.test.ws.jaxws.samples.jaxr.scout.query;
+
+/** Tests Jaxr capability to do business queries
+ * @author <mailto:Anil.Saldhana@jboss.org>Anil Saldhana
+ * @since Dec 29, 2004
+ */
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+
+import org.jboss.test.ws.jaxws.samples.jaxr.scout.JaxrBaseTest;
+
+import javax.xml.registry.BulkResponse;
+import javax.xml.registry.JAXRException;
+import javax.xml.registry.JAXRResponse;
+import javax.xml.registry.infomodel.Key;
+import javax.xml.registry.infomodel.Organization;
+
+public class JaxrBusinessQueryTestCase extends JaxrBaseTest
+{
+ protected String querystr = "JBOSS";
+
+ private Key orgKey = null;
+
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+ String keyid = "";
+ login();
+
+ getJAXREssentials();
+ Collection orgs = new ArrayList();
+ Organization org = createOrganization("JBOSS");
+
+ orgs.add(org);
+ BulkResponse br = blm.saveOrganizations(orgs);
+ if (br.getStatus() == JAXRResponse.STATUS_SUCCESS)
+ {
+ Collection coll = br.getCollection();
+ Iterator iter = coll.iterator();
+ while (iter.hasNext())
+ {
+ Key key = (Key)iter.next();
+ keyid = key.getId();
+ assertNotNull(keyid);
+ orgKey = key;
+ }//end while
+ }
+ else
+ {
+ Collection exceptions = br.getExceptions();
+ Iterator iter = exceptions.iterator();
+ while (iter.hasNext())
+ {
+ Exception e = (Exception)iter.next();
+ fail(e.toString());
+ }
+ }
+ }
+
+ protected void tearDown() throws Exception
+ {
+ if (orgKey != null)
+ this.deleteOrganization(this.orgKey);
+ super.tearDown();
+ }
+
+ public void testBusinessQuery() throws JAXRException
+ {
+ searchBusiness(querystr);
+ }
+}
Property changes on: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/query/JaxrBusinessQueryTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt 2007-02-13 12:37:40 UTC (rev 2348)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt 2007-02-13 16:37:16 UTC (rev 2349)
@@ -19,6 +19,7 @@
org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.*
org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.*
org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.*
+org/jboss/test/ws/jaxws/samples/jaxr/**
# TODO: Why are these excluded
# [JBWS-1471] - Remove unwanted tomcat excludes
17 years, 4 months
JBossWS SVN: r2348 - branches/jbossws-1.2.0/jbossws-core/src/main/resources/dist.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-02-13 07:37:40 -0500 (Tue, 13 Feb 2007)
New Revision: 2348
Modified:
branches/jbossws-1.2.0/jbossws-core/src/main/resources/dist/ReleaseNotes.txt
Log:
Update release notes
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/resources/dist/ReleaseNotes.txt
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/resources/dist/ReleaseNotes.txt 2007-02-13 11:43:23 UTC (rev 2347)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/resources/dist/ReleaseNotes.txt 2007-02-13 12:37:40 UTC (rev 2348)
@@ -22,7 +22,88 @@
What's new in jbossws-(a)version.id@
----------------------------------
+Feature Request
+ * [JBWS-1156] - Implement injection of WebServiceRef
+ * [JBWS-1021] - Implement javax.xml.ws.Endpoint
+ * [JBWS-1022] - Implement javax.xml.ws.WebServiceContext
+ * [JBWS-1023] - Implement javax.xml.ws.Service
+ * [JBWS-1024] - Implement javax.xml.ws.BindingProvider
+ * [JBWS-1025] - Implement javax.xml.ws.Dispatch
+ * [JBWS-1070] - Add context-root in generated jboss-web.xml for Endpoint API
+ * [JBWS-1207] - Async jaxws dispatch
+ * [JBWS-1208] - Async jaxws proxy
+ * [JBWS-1020] - Implement javax.xml.ws.Provider
+ * [JBWS-1192] - Examples for JSR181 EJB Endpoints: show how to use a JavaBean as an operations's argument or return value
+ * [JBWS-1388] - Notification validation before dispatch
+ * [JBWS-1406] - WS-Eventing: event notification failure
+ * [JBWS-1438] - Implement @WebServiceRef injection for JBossAS-4.2
+ * [JBWS-1443] - getMessageContext Not Implemented
+ * [JBWS-1456] - Allow client configuration on StubExt
+ * [JBWS-1457] - Support soap attachments on StubExt
+
+Task
+
+ * [JBWS-1284] - Gracefully handle invalid ImageIO mime types
+ * [JBWS-1297] - Implement JAXB Fault Marshalling
+ * [JBWS-1404] - Add support for differing namespaces on SEI and implementation bean
+ * [JBWS-644] - JAXWS initial implementation
+ * [JBWS-1031] - Use JAXB-2.0 for JSR-181 endpoints
+ * [JBWS-1099] - Implement JAXWS Handler Framework
+ * [JBWS-1150] - Implement JAXWS Logical Handlers
+ * [JBWS-1315] - Implement WS deployers for jbossas/trunk
+ * [JBWS-1425] - Update to remoting-2.0
+ * [JBWS-723] - Protect access to WSDL
+ * [JBWS-1077] - Improve/Complete security documentation
+ * [JBWS-1098] - Publicly available interop endpoints
+ * [JBWS-1100] - Move WS-Eventing to updated wsa schema
+ * [JBWS-1155] - Document SwA/XOP usage with JSR181 endpoints.
+ * [JBWS-1307] - JAXWS user guide and samples
+ * [JBWS-1418] - Provide JBossWS API docs
+ * [JBWS-1429] - Cleanup PortComponent annotation
+ * [JBWS-1433] - Remerge connector discovery code
+ * [JBWS-1434] - Client programming: Add property API at Service level similiar to StubExt.
+ * [JBWS-1473] - Setup soak and performance tests
+ * [JBWS-1503] - Support XOP samples in tomcat
+ * [JBWS-1504] - Resolve dependency on snapshots
+
+Bug
+
+ * [JBWS-1079] - Incorrect WSDL to Java mapping for anonymous struct.
+ * [JBWS-1336] - JAXWSDeployerJSE throws NPE
+ * [JBWS-1389] - WebServiceProvider should be allowed on EJB3 beans
+ * [JBWS-1409] - WsdlGenerator crashes on void-methods
+ * [JBWS-1168] - JAXWS handler ordering
+ * [JBWS-1357] - JAXWSDeployerJSE is not handling jsp servlet defs correctly
+ * [JBWS-1374] - Package to namespace mapping is wrong
+ * [JBWS-1375] - JSR181MetaDataBuilder inspects java.* classes
+ * [JBWS-800] - ClassCastException when trying to marshal a subclass of Date
+ * [JBWS-810] - Simple type with restriction
+ * [JBWS-1184] - WSDL to Java - maps required xsd:double attribute to java.lang.Double
+ * [JBWS-1231] - wstools/java-wsdl does not handle recursive types
+ * [JBWS-1259] - WSDL To Java - StackOverflowError with self referencing element.
+ * [JBWS-1260] - WSDL To Java - Parameter unwrapping fails for a lot of scenarios.
+ * [JBWS-1285] - NPE when the soap encoded array size is 0 on the return path
+ * [JBWS-1317] - webservices.xml override does not account for namespaces
+ * [JBWS-1328] - Security configuration not correctly loaded when deployed as ear to JBoss 5.0.x
+ * [JBWS-1378] - NPE in replaceAddressLocation with SOAP1.2 WSDL
+ * [JBWS-1384] - Attachment parts with doclit message
+ * [JBWS-1386] - ComplexType with base64Binary property
+ * [JBWS-1393] - Problem interpreting messages with attachment when confronted with no <start> header
+ * [JBWS-1396] - Now jbossws-beans is exploded jbossws.sar must be exploded
+ * [JBWS-1408] - NPE when jbossws.sar is not expanded
+ * [JBWS-1410] - NumberFormatException From StubExt.PROPERTY_CLIENT_TIMEOUT
+ * [JBWS-1427] - Handling of invalid binding port type ref and doc/lit message parts
+ * [JBWS-1428] - Java to WSDL - Arrays defined with indexed properties within value type are skipped when generating the WSDL
+ * [JBWS-1441] - WSDL to Java - Complex type defined with complexContent only last element is in the generated java class if base type is empty
+ * [JBWS-1450] - WSDL To Java - Parameter unwrapping not handling nillable types correctly.
+ * [JBWS-1451] - comparison of the mime type should not be case sensitive
+ * [JBWS-1455] - WSDL To Java - Generated jaxrpc mapping contains same exception mapped multiple times if there are multiple operations.
+ * [JBWS-1468] - @Resource WebServiceContext for jbossas-4.x
+ * [JBWS-1497] - Fix failed resource lookup when offline
+ * [JBWS-1501] - wsimport RI fails when processing parameterOrder on one-way operations
+
+
Errata
------
17 years, 4 months
JBossWS SVN: r2347 - branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/jbossxb.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-02-13 06:43:23 -0500 (Tue, 13 Feb 2007)
New Revision: 2347
Modified:
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/jbossxb/SchemaBindingBuilder.java
Log:
schemaBinding.setReplacePropertyRefs(false);
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/jbossxb/SchemaBindingBuilder.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/jbossxb/SchemaBindingBuilder.java 2007-02-13 11:04:06 UTC (rev 2346)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/jbossxb/SchemaBindingBuilder.java 2007-02-13 11:43:23 UTC (rev 2347)
@@ -93,6 +93,7 @@
schemaBinding.setUnmarshalListsToArrays(true); // note: default jaxb2.0 is false!
schemaBinding.setSimpleContentProperty("_value");
schemaBinding.setUseNoArgCtorIfFound(true);
+ schemaBinding.setReplacePropertyRefs(false);
if (wsdlMapping != null)
{
bindSchemaToJava(schemaBinding, wsdlMapping);
17 years, 4 months
JBossWS SVN: r2346 - branches/jbossws-1.2.0/build/ant-import.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-02-13 06:04:06 -0500 (Tue, 13 Feb 2007)
New Revision: 2346
Modified:
branches/jbossws-1.2.0/build/ant-import/build-release.xml
Log:
[JBWS-1418] Provide JBossWS API docs
Modified: branches/jbossws-1.2.0/build/ant-import/build-release.xml
===================================================================
--- branches/jbossws-1.2.0/build/ant-import/build-release.xml 2007-02-13 10:06:14 UTC (rev 2345)
+++ branches/jbossws-1.2.0/build/ant-import/build-release.xml 2007-02-13 11:04:06 UTC (rev 2346)
@@ -128,8 +128,8 @@
<!-- ================================================================== -->
<!-- Build the bin dist -->
- <target name="build-bin-dist" description="Build the binary distribution"
- depends="core-jars,jboss50-jars,jboss42-jars,jboss40-jars,jboss40-jars14,tomcat-jars,build-samples,build-docs">
+ <target name="build-bin-dist" depends="core-jars,jboss50-jars,jboss42-jars,jboss40-jars,jboss40-jars14,tomcat-jars,build-samples,build-javadoc,build-docs"
+ description="Build the binary distribution">
<mkdir dir="${build.bin.dist}"/>
<mkdir dir="${build.bin.dist}/bin"/>
@@ -152,15 +152,18 @@
<include name="wstools.bat"/>
<include name="wstools.sh"/>
<include name="wsprovide.bat"/>
- <include name="wsprovide"/>
+ <include name="wsprovide.sh"/>
<include name="wsconsume.bat"/>
- <include name="wsconsume"/>
+ <include name="wsconsume.sh"/>
</fileset>
</copy>
<!-- samples -->
<copy todir="${build.bin.dist}" file="${build.output.dir}/${samples.target}.zip" overwrite="true"/>
+ <!-- javadoc -->
+ <copy todir="${build.bin.dist}" file="${build.output.dir}/jbossws-${version.id}-api.zip" overwrite="true"/>
+
<!-- documentation -->
<copy todir="${build.bin.dist}/docs/html" overwrite="true">
<fileset dir="${docs.userguide.dir}/build/en/html"/>
@@ -261,4 +264,22 @@
includes="jbossws-src-${version.id}/**"/>
</target>
+ <!-- ================================================================== -->
+ <!-- Documentation -->
+ <!-- ================================================================== -->
+
+ <!-- Generate the JavaDoc -->
+ <target name="build-javadoc" depends="init" description="Generate the Javadoc">
+ <mkdir dir="${build.output.dir}/docs/api"/>
+ <javadoc destdir="${build.output.dir}/docs/api" author="true" version="true" use="true" windowtitle="JBossWS API">
+ <packageset dir="${core.java.dir}" defaultexcludes="yes"/>
+ <packageset dir="${jboss42.java.dir}" defaultexcludes="yes"/>
+ <packageset dir="${jboss50.java.dir}" defaultexcludes="yes"/>
+ <packageset dir="${tomcat.java.dir}" defaultexcludes="yes"/>
+ <classpath refid="core.classpath"/>
+ </javadoc>
+ <zip destfile="${build.output.dir}/jbossws-${version.id}-api.zip" basedir="${build.output.dir}/docs"
+ includes="api/**"/>
+ </target>
+
</project>
17 years, 4 months