[jboss-svn-commits] JBL Code SVN: r29874 - in labs/jbossesb/workspace/tcunning/juddiintegration: product/install and 11 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Oct 30 02:11:14 EDT 2009
Author: tcunning
Date: 2009-10-30 02:11:13 -0400 (Fri, 30 Oct 2009)
New Revision: 29874
Modified:
labs/jbossesb/workspace/tcunning/juddiintegration/product/.classpath
labs/jbossesb/workspace/tcunning/juddiintegration/product/build-distr.xml
labs/jbossesb/workspace/tcunning/juddiintegration/product/build.xml
labs/jbossesb/workspace/tcunning/juddiintegration/product/install/build.xml
labs/jbossesb/workspace/tcunning/juddiintegration/product/ivy.xml
labs/jbossesb/workspace/tcunning/juddiintegration/product/ivysettings.xml
labs/jbossesb/workspace/tcunning/juddiintegration/product/rosetta/build.xml
labs/jbossesb/workspace/tcunning/juddiintegration/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/JuddiRMIService.java
labs/jbossesb/workspace/tcunning/juddiintegration/product/rosetta/src/org/jboss/internal/soa/esb/services/registry/JAXRConnectionFactory.java
labs/jbossesb/workspace/tcunning/juddiintegration/product/rosetta/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryImpl.java
labs/jbossesb/workspace/tcunning/juddiintegration/product/rosetta/src/org/jboss/soa/esb/common/Configuration.java
labs/jbossesb/workspace/tcunning/juddiintegration/product/rosetta/src/org/jboss/soa/esb/common/Environment.java
labs/jbossesb/workspace/tcunning/juddiintegration/product/rosetta/tests/src/org/jboss/soa/esb/testutils/jbossesb-properties.xml
labs/jbossesb/workspace/tcunning/juddiintegration/product/services/base-project-build.xml
labs/jbossesb/workspace/tcunning/juddiintegration/product/services/build.xml
labs/jbossesb/workspace/tcunning/juddiintegration/qa/jbossesb-unittest-properties.xml
labs/jbossesb/workspace/tcunning/juddiintegration/qa/junit/build.xml
labs/jbossesb/workspace/tcunning/juddiintegration/qa/junit/resources/server/jbossesb-properties.xml
labs/jbossesb/workspace/tcunning/juddiintegration/qa/junit/src/org/jboss/soa/esb/server/aop/AOPServer.java
labs/jbossesb/workspace/tcunning/juddiintegration/qa/quickstarts/build.xml
Log:
Commit juddi integration changes.
Modified: labs/jbossesb/workspace/tcunning/juddiintegration/product/.classpath
===================================================================
--- labs/jbossesb/workspace/tcunning/juddiintegration/product/.classpath 2009-10-29 19:51:24 UTC (rev 29873)
+++ labs/jbossesb/workspace/tcunning/juddiintegration/product/.classpath 2009-10-30 06:11:13 UTC (rev 29874)
@@ -171,5 +171,6 @@
<classpathentry kind="lib" path="services/jbrules/lib/ext/jsr94-1.1.jar"/>
<classpathentry kind="lib" path="services/jbrules/lib/ext/jxl-2.4.2.jar"/>
<classpathentry kind="lib" path="services/jbrules/lib/ext/xpp3_min-1.1.3.4.O.jar"/>
+ <classpathentry kind="lib" path="build/lib/junit-3.8.2.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: labs/jbossesb/workspace/tcunning/juddiintegration/product/build-distr.xml
===================================================================
--- labs/jbossesb/workspace/tcunning/juddiintegration/product/build-distr.xml 2009-10-29 19:51:24 UTC (rev 29873)
+++ labs/jbossesb/workspace/tcunning/juddiintegration/product/build-distr.xml 2009-10-30 06:11:13 UTC (rev 29874)
@@ -1,96 +1,140 @@
-<project name="JBESB Distribution Build" default="dist" basedir=".">
- <!-- Set default properties filename -->
- <property name="org.jboss.esb.properties" location="product.properties"/>
-
- <property file="skip.properties"/>
-
-
- <property name="build.dir" value="build"/>
- <property name="lib.dir" value="build/lib"/>
- <property name="aoplib.dir" value="build/aoplib"/>
- <property name="lib.ext.dir" value="lib/ext"/>
- <property name="services.dir" value="services"/>
- <property name="build.lib.dir" value="${build.dir}/jbossesb/lib"/>
- <property name="version" value="4.2.MR1"/>
- <property name="installation.files.dir" value="install"/>
-
- <!-- Load Build Properties File -->
- <property file="${org.jboss.esb.properties}"/>
-
- <echo message="org.jboss.esb.server.home=${org.jboss.esb.server.home}"/>
- <echo message="esbserver.dist.dir=${esbserver.dist.dir}"/>
-
- <target name="dist" depends="server.dist, copy.esbserver.files" />
-
- <target name="copy.esbserver.files" unless="skip.server.esb">
- <copy todir="${esbserver.dist.dir}/docs" failonerror="false">
- <fileset dir="${build.dir}/jbossesb/docs">
- <include name="**/*"/>
- </fileset>
- </copy>
- <copy todir="${esbserver.dist.dir}" failonerror="false">
- <fileset dir="${build.dir}/jbossesb">
- <include name="javadocs/**/*"/>
- </fileset>
- </copy>
- <copy todir="${esbserver.dist.dir}" failonerror="false">
- <fileset dir="${build.dir}/jbossesb">
- <include name="samples/**/*"/>
- </fileset>
- </copy>
- <copy todir="${esbserver.dist.dir}/docs/schema">
- <fileset dir="${build.dir}/jbossesb/xml/"
- includes="jbossesb-1.0.1.xsd jbossesb-1.1.0.xsd jbossesb-1.2.0.xsd"/>
- </copy>
- <copy todir="${esbserver.dist.dir}">
- <fileset dir="${build.dir}/jbossesb">
- <include name="*.txt"/>
- </fileset>
- </copy>
- </target>
-
- <target name="ftp-server" unless="skip.ftp.server">
- <ant antfile="build.xml" dir="ftp"/>
- </target>
-
- <target name="server.dist" depends="build.sar, unpack.server.zip, ftp-server" unless="skip.server.esb">
- <ant antfile="build.xml" dir="${esb.install.location}" target="deploy"
- inheritall="false">
- <property name="org.jboss.esb.server.home" value="${esbserver.dist.dir}"/>
- <property name="org.jboss.esb.server.config" value="default"/>
- </ant>
- </target>
-
- <target name="unpack.server.zip" unless="skip.server.unzip">
- <delete dir="${esbserver.dist.dir}"/>
- <unzip src="${installation.files.dir}/standalone/jbossesb-server-base.zip" dest="${build.dir}"/>
- <chmod dir="${build.dir}/jbossesb-server/bin" perm="ugo+rx" includes="*.sh"/>
- <move file="${build.dir}/jbossesb-server" tofile="${esbserver.dist.dir}"/>
- </target>
-
- <target name="build.sar">
- <echo message="Building JBoss ESB sar files"/>
- <delete dir="${build.dir}/jbossesb.sar"/>
- <mkdir dir="${build.dir}/jbossesb.sar"/>
- <mkdir dir="${build.dir}/jbossesb.sar/META-INF"/>
- <copy file="${installation.files.dir}/jboss-service.xml"
- todir="${build.dir}/jbossesb.sar/META-INF"/>
- <copy todir="${build.dir}/jbossesb.sar">
- <fileset dir="${installation.files.dir}/conf">
- <include name="jbossesb-properties.xml"/>
- <include name="esb.juddi.xml"/>
- <include name="actionArtifactMap.properties"/>
- <include name="privateKeyStore"/>
- <include name="publicKeyStore"/>
- </fileset>
- <fileset dir="${installation.files.dir}/jUDDI-registry">
- <include name="juddi-ds.xml"/>
- </fileset>
- <!-- We use AOP on scout to get around an issue -->
- <fileset dir="${build.dir}" includes="rosetta.aop"/>
- </copy>
-
- <mkdir dir="${build.dir}/jbossesb.sar/juddi-sql"/>
+<project name="JBESB Distribution Build" default="dist" basedir=".">
+ <!-- Set default properties filename -->
+ <property name="org.jboss.esb.properties" location="product.properties"/>
+
+ <property file="skip.properties"/>
+
+
+ <property name="build.dir" value="build"/>
+ <property name="lib.dir" value="build/lib"/>
+ <property name="aoplib.dir" value="build/aoplib"/>
+ <property name="lib.ext.dir" value="lib/ext"/>
+ <property name="services.dir" value="services"/>
+ <property name="build.lib.dir" value="${build.dir}/jbossesb/lib"/>
+ <property name="version" value="4.2.MR1"/>
+ <property name="installation.files.dir" value="install"/>
+
+ <!-- Load Build Properties File -->
+ <property file="${org.jboss.esb.properties}"/>
+
+ <echo message="org.jboss.esb.server.home=${org.jboss.esb.server.home}"/>
+ <echo message="esbserver.dist.dir=${esbserver.dist.dir}"/>
+
+ <target name="dist" depends="server.dist, copy.esbserver.files" />
+
+ <target name="copy.esbserver.files" unless="skip.server.esb">
+ <copy todir="${esbserver.dist.dir}/docs" failonerror="false">
+ <fileset dir="${build.dir}/jbossesb/docs">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+ <copy todir="${esbserver.dist.dir}" failonerror="false">
+ <fileset dir="${build.dir}/jbossesb">
+ <include name="javadocs/**/*"/>
+ </fileset>
+ </copy>
+ <copy todir="${esbserver.dist.dir}" failonerror="false">
+ <fileset dir="${build.dir}/jbossesb">
+ <include name="samples/**/*"/>
+ </fileset>
+ </copy>
+ <copy todir="${esbserver.dist.dir}/docs/schema">
+ <fileset dir="${build.dir}/jbossesb/xml/"
+ includes="jbossesb-1.0.1.xsd jbossesb-1.1.0.xsd jbossesb-1.2.0.xsd"/>
+ </copy>
+ <copy todir="${esbserver.dist.dir}">
+ <fileset dir="${build.dir}/jbossesb">
+ <include name="*.txt"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="ftp-server" unless="skip.ftp.server">
+ <ant antfile="build.xml" dir="ftp"/>
+ </target>
+
+ <target name="server.dist" depends="build.sar, unpack.server.zip, ftp-server" unless="skip.server.esb">
+ <ant antfile="build.xml" dir="${esb.install.location}" target="deploy"
+ inheritall="false">
+ <property name="org.jboss.esb.server.home" value="${esbserver.dist.dir}"/>
+ <property name="org.jboss.esb.server.config" value="default"/>
+ </ant>
+ </target>
+
+ <target name="unpack.server.zip" unless="skip.server.unzip">
+ <delete dir="${esbserver.dist.dir}"/>
+ <unzip src="${installation.files.dir}/standalone/jbossesb-server-base.zip" dest="${build.dir}"/>
+ <chmod dir="${build.dir}/jbossesb-server/bin" perm="ugo+rx" includes="*.sh"/>
+ <move file="${build.dir}/jbossesb-server" tofile="${esbserver.dist.dir}"/>
+ </target>
+
+ <target name="build.sar">
+ <echo message="Building JBoss ESB sar files"/>
+ <delete dir="${build.dir}/jbossesb.sar"/>
+ <mkdir dir="${build.dir}/jbossesb.sar"/>
+ <mkdir dir="${build.dir}/jbossesb.sar/META-INF"/>
+ <copy file="${installation.files.dir}/jboss-service.xml"
+ todir="${build.dir}/jbossesb.sar/META-INF"/>
+ <copy todir="${build.dir}/jbossesb.sar">
+ <fileset dir="${installation.files.dir}/conf">
+ <include name="jbossesb-properties.xml"/>
+ <include name="esb.juddi.xml"/>
+ <include name="actionArtifactMap.properties"/>
+ <include name="privateKeyStore"/>
+ <include name="publicKeyStore"/>
+ </fileset>
+ <fileset dir="${installation.files.dir}/jUDDI-registry">
+ <include name="juddi-ds.xml"/>
+ </fileset>
+ <!-- We use AOP on scout to get around an issue -->
+ <fileset dir="${build.dir}" includes="rosetta.aop"/>
+ </copy>
+
+ <!-- jUDDI V3 deploys -->
+ <copy todir="${build.dir}/jbossesb.sar" overwrite="true">
+ <fileset dir="${installation.files.dir}/jUDDI-registryV3">
+ <include name="juddiv3.properties"/>
+ <include name="jbossesb-properties.xml"/>
+ </fileset>
+ </copy>
+ <copy todir="${build.dir}/jbossesb.sar/META-INF">
+ <fileset dir="${installation.files.dir}/jUDDI-registryV3">
+ <include name="persistence.xml"/>
+ <include name="uddi.xml"/>
+ </fileset>
+ </copy>
+ <property name="juddi.jar.build.dir" value="${build.dir}/juddi.jar.build"/>
+
+ <mkdir dir="${juddi.jar.build.dir}"/>
+ <mkdir dir="${build.dir}/jbossesb.sar/juddi_custom_install_data"/>
+ <copy overwrite="true" todir="${build.dir}/jbossesb.sar/juddi_custom_install_data">
+ <fileset dir="${installation.files.dir}/jUDDI-registryV3/juddi_custom_install_data">
+ <include name="UDDI*"/>
+ <include name="jbossesb*"/>
+ <include name="root*"/>
+ </fileset>
+ </copy>
+ <copy todir="${build.dir}/jbossesb.sar/lib">
+ <fileset dir="${lib.dir}">
+ <include name="juddi-core*"/>
+ <include name="uddi-ws*"/>
+ <include name="commons-configuration*"/>
+ </fileset>
+ </copy>
+ <copy todir="${build.dir}/jbossesb.sar/lib">
+ <fileset dir="${lib.ext.dir}">
+ <include name="juddi-client-*"/>
+ </fileset>
+ </copy>
+ <copy todir="${lib.dir}">
+ <fileset dir="${lib.ext.dir}">
+ <include name="juddi-client-*"/>
+ </fileset>
+ </copy>
+
+ <delete dir="${juddi.jar.build.dir}"/>
+
+ <mkdir dir="${build.dir}/jbossesb.sar/juddi-sql"/>
<copy todir="${build.dir}/jbossesb.sar/juddi-sql">
<fileset dir="${installation.files.dir}/jUDDI-registry/sql">
<include name="**/import.sql"/>
Modified: labs/jbossesb/workspace/tcunning/juddiintegration/product/build.xml
===================================================================
--- labs/jbossesb/workspace/tcunning/juddiintegration/product/build.xml 2009-10-29 19:51:24 UTC (rev 29873)
+++ labs/jbossesb/workspace/tcunning/juddiintegration/product/build.xml 2009-10-30 06:11:13 UTC (rev 29874)
@@ -146,11 +146,24 @@
<target name="org.jboss.soa.esb.plugin.build" depends="org.jboss.esb.rosetta.compile">
<echo message="Build ESB JON plugin"/>
- <ant dir="tools/jonplugin"/>
+ <!--
+ <ant dir="tools/jonplugin" target="jar-as4-plugin"/>
+ <ant dir="tools/jonplugin" target="jar-as5-plugin"/>
+ -->
</target>
<target name="dependencies.get">
<ant antfile="ivy-build.xml" />
+ <mkdir dir="build/unzip"/>
+ <unzip dest="build/lib" src="install/standalone/jbossesb-server-base.zip">
+ <patternset>
+ <include name="**/hibernate-annotations.jar"/>
+ <include name="**/hibernate-entitymanager.jar"/>
+ <include name="**/hibernate3.jar"/>
+ <include name="**/ejb3-persistence.jar"/>
+ </patternset>
+ <mapper type="flatten"/>
+ </unzip>
</target>
<target name="dependencies.report">
@@ -425,7 +438,6 @@
<ant dir="rosetta" target="clean"/>
<ant dir="contract-web" target="clean"/>
<ant dir="services" target="clean"/>
- <ant dir="tools/jonplugin" target="clean"/>
<delete dir="${org.jboss.esb.internal.dest}"/>
<delete dir="${org.jboss.esb.internal.dest.root}"/>
Modified: labs/jbossesb/workspace/tcunning/juddiintegration/product/install/build.xml
===================================================================
--- labs/jbossesb/workspace/tcunning/juddiintegration/product/install/build.xml 2009-10-29 19:51:24 UTC (rev 29873)
+++ labs/jbossesb/workspace/tcunning/juddiintegration/product/install/build.xml 2009-10-30 06:11:13 UTC (rev 29874)
@@ -109,7 +109,7 @@
<copy todir="${plugin.dir}" file="${jopr.plugin.jar}"/>
</target>
- <target name="deploy" depends="undeploy, internal.deploy, internal.deploy.jbossas5, deploy.console, deploy.bindings" description="Wrapper for internal.deploy"/>
+ <target name="deploy" depends="undeploy, internal.deploy, internal.deploy.jbossas5, deploy.bindings" description="Wrapper for internal.deploy"/>
<target name="check.tomcat.props">
<fail unless="org.jboss.esb.tomcat.home" message="Cannot determine target deployment, please check deployment.properties"/>
@@ -265,6 +265,13 @@
<include name="wstx-asl-*.jar"/>
<include name="xbean-*.jar"/>
<include name="xstream-*.jar"/>
+
+ <!-- JUDDI V3 dependencies -->
+ <include name="commons-configuration-*.jar"/>
+ <include name="juddi-core-*.jar"/>
+ <include name="uddi-ws-*.jar"/>
+ <include name="juddi-client-*.jar"/>
+
</fileset>
<fileset dir="${org.jboss.esb.dist.lib}">
<include name="commons-codec-*.jar"/>
Modified: labs/jbossesb/workspace/tcunning/juddiintegration/product/ivy.xml
===================================================================
--- labs/jbossesb/workspace/tcunning/juddiintegration/product/ivy.xml 2009-10-29 19:51:24 UTC (rev 29873)
+++ labs/jbossesb/workspace/tcunning/juddiintegration/product/ivy.xml 2009-10-30 06:11:13 UTC (rev 29874)
@@ -6,13 +6,27 @@
<dependency org="asm" name="asm" rev="1.5.3"/>
<dependency org="commons-codec" name="commons-codec" rev="1.3"/>
<dependency org="commons-collections" name="commons-collections" rev="3.2"/>
-
+ <dependency org="commons-configuration" name="commons-configuration" rev="1.5"/>
<!-- Mina dependencies -->
<dependency org="org.apache.mina" name="mina-core" rev="1.1.7"/>
<dependency org="org.apache.mina" name="mina-filter-ssl" rev="1.1.7"/>
<dependency org="org.slf4j" name="slf4j-api" rev="1.4.3"/>
<dependency org="org.slf4j" name="slf4j-log4j12" rev="1.4.3"/>
+ <dependency org="commons-configuration" name="commons-configuration" rev="1.5"/>
+
+ <dependency org="org.apache.juddi" name="uddi-ws" rev="3.0.0">
+ <exclude org="junit" module="junit"/>
+ </dependency>
+ <!--
+ <dependency org="org.apache.juddi" name="juddi-client" rev="3.0.0">
+ <exclude org="junit" module="junit"/>
+ </dependency>
+ -->
+ <dependency org="org.apache.juddi" name="juddi-core" rev="3.0.0">
+ <exclude org="junit" module="junit"/>
+ </dependency>
+
<dependency org="commons-httpclient" name="commons-httpclient" rev="3.0.1"/>
<dependency org="commons-io" name="commons-io" rev="1.3"/>
<dependency org="commons-lang" name="commons-lang" rev="2.1"/>
@@ -21,7 +35,6 @@
<dependency org="org.codehaus.groovy" name="groovy-all" rev="1.5.4"/>
<dependency org="com.h2database" name="h2" rev="1.0.68"/>
<dependency org="hibernate" name="hibernate3" rev="3.2.4.SP1"/>
- <dependency org="org.hibernate" name="ejb3-persistence" rev="1.0.2.GA"/>
<dependency org="jboss" name="jboss-cache" rev="1.2.4.SP2"/>
<dependency org="jgroups" name="jgroups" rev="2.4.1"/>
@@ -34,8 +47,9 @@
<exclude org="axis" module="axis"/>
<exclude org="geronimo-spec" module="geronimo-spec-activation"/>
</dependency>
- <dependency org="org.apache.ws.scout" name="scout" rev="1.0">
- <exclude org="axis" module="axis"/>
+ <dependency org="org.apache.ws.scout" name="scout" rev="1.2">
+ <exclude org="junit" module="junit"/>
+ <exclude org="axis" module="axis"/>
<exclude org="geronimo-spec" module="geronimo-spec-activation"/>
</dependency>
@@ -173,12 +187,28 @@
<dependency org="org.jboss.ws.native" name="jbossws-native-core" rev="3.0.5.GA"/>
<dependency org="org.jboss.ws" name="jbossws-common" rev="1.0.8.GA"/>
- <!-- JOPR dependencies -->
- <dependency org="org.jboss.jopr" name="jopr-embedded-jbas4" rev="1.2.0.GA">
- <artifact name="jopr-embedded-jbas4" type="war"/>
- </dependency>
- <dependency org="org.jboss.jopr" name="jopr-embedded-jbas5" rev="1.3.2.GA">
- <artifact name="jopr-embedded-jbas5" type="war"/>
- </dependency>
+ <!-- persistence and hibernate needed for juddi
+ <dependency org="org.hibernate" name="hibernate-annotations" rev="3.4.0.GA">
+ <exclude org="commons-collection"/>
+ <exclude org="javax.security"/>
+ <exclude org="commons-logging"/>
+ <exclude org="javax.transaction"/>
+ <exclude org="net.sf.ehcache"/>
+ <exclude org="swarmcache"/>
+ <exclude org="jboss"/>
+ <exclude org="jgroups"/>
+ <exclude org="c3p0"/>
+ <exclude org="dom4j"/>
+ <exclude org="commons-collections"/>
+ <exclude org="opensymphony"/>
+ <exclude org="cglib"/>
+ <exclude org="antlr"/>
+ <exclude org="proxool"/>
+ </dependency>
+ <dependency org="org.hibernate" name="hibernate-entitymanager" rev="3.3.1.ga">
+ <exclude org="javax.transaction"/>
+ <exclude org="jboss"/>
+ </dependency>
+ -->
</dependencies>
</ivy-module>
Modified: labs/jbossesb/workspace/tcunning/juddiintegration/product/ivysettings.xml
===================================================================
--- labs/jbossesb/workspace/tcunning/juddiintegration/product/ivysettings.xml 2009-10-29 19:51:24 UTC (rev 29873)
+++ labs/jbossesb/workspace/tcunning/juddiintegration/product/ivysettings.xml 2009-10-30 06:11:13 UTC (rev 29874)
@@ -13,15 +13,25 @@
<artifact pattern="http://dist.codehaus.org/[organisation]/[artifact]/[revision]/[artifact]-[revision].[ext]"/>
</url>
</chain>
+ <url name="mvel" m2compatible="true">
+ <artifact pattern="http://repo1.maven.org/maven2/org/mvel/[artifact]/[revision]/[artifact]-[revision].[ext]"/>
+ </url>
<url name="smooks" m2compatible="true">
<artifact pattern="http://repo1.maven.org/maven2/[organisation]/[artifact]/[revision]/[artifact]-[revision].[ext]"/>
</url>
- <url name="ejb3" m2compatible="true">
- <artifact pattern="http://repository.jboss.org/maven2/[organisation]/[artifact]/[revision]/[artifact]-[revision].jar"/>
+ <url name="juddi" m2compatible="true">
+ <artifact pattern="http://people.apache.org/repo/m2-ibiblio-rsync-repository/[organisation]/[artifact]/[revision]/[artifact]-[revision].[ext]"/>
</url>
+ <url name="scout" m2compatible="true">
+ <artifact pattern="https://repository.apache.org/content/repositories/releases/[organisation]/[artifact]/[revision]/[artifact]-[revision].[ext]"/>
+ </url>
</resolvers>
<modules>
+ <module organisation="org.codehaus.mvel" name="mvel" resolver="mvel"/>
<module organisation="org.milyn" name="*" resolver="smooks"/>
- <module organisation="org.hibernate" name="ejb3-persistence" resolver="ejb3"/>
+ <module organisation="org.apache.juddi" name="juddi-core" resolver="juddi"/>
+ <module organisation="org.apache.juddi" name="uddi-ws" resolver="juddi"/>
+ <module organisation="org.apache.juddi" name="uddi-client" resolver="juddi"/>
+ <module organisation="org.apache.ws.scout" name="scout" resolver="scout"/>
</modules>
</ivysettings>
Modified: labs/jbossesb/workspace/tcunning/juddiintegration/product/rosetta/build.xml
===================================================================
--- labs/jbossesb/workspace/tcunning/juddiintegration/product/rosetta/build.xml 2009-10-29 19:51:24 UTC (rev 29873)
+++ labs/jbossesb/workspace/tcunning/juddiintegration/product/rosetta/build.xml 2009-10-30 06:11:13 UTC (rev 29874)
@@ -225,7 +225,7 @@
<mkdir dir="${org.jboss.esb.rosetta.aopc.scout.classes.dir}"/>
<mkdir dir="${org.jboss.esb.rosetta.aopc.juddi.classes.dir}"/>
- <unzip src="${org.jboss.esb.lib.dir}/scout-1.0.jar" dest="${org.jboss.esb.rosetta.aopc.scout.classes.dir}"/>
+ <unzip src="${org.jboss.esb.lib.dir}/scout-1.2.jar" dest="${org.jboss.esb.rosetta.aopc.scout.classes.dir}"/>
<unzip src="${org.jboss.esb.lib.dir}/juddi-2.0rc5.jar" dest="${org.jboss.esb.rosetta.aopc.juddi.classes.dir}"/>
<aopc compilerclasspathref="aop-classpath">
@@ -242,7 +242,7 @@
<aoppath path="aop/resources/META-INF/jboss-aop.xml"/>
<aopclasspath path="${org.jboss.esb.rosetta.aop.classes.dir}"/>
</aopc>
- <zip destfile="${org.jboss.esb.aoplib.dir}/scout-1.0.aop.jar" basedir="${org.jboss.esb.rosetta.aopc.scout.classes.dir}"/>
+ <zip destfile="${org.jboss.esb.aoplib.dir}/scout-1.2.aop.jar" basedir="${org.jboss.esb.rosetta.aopc.scout.classes.dir}"/>
<zip destfile="${org.jboss.esb.aoplib.dir}/juddi-2.0rc5.aop.jar" basedir="${org.jboss.esb.rosetta.aopc.juddi.classes.dir}"/>
</target>
Modified: labs/jbossesb/workspace/tcunning/juddiintegration/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/JuddiRMIService.java
===================================================================
--- labs/jbossesb/workspace/tcunning/juddiintegration/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/JuddiRMIService.java 2009-10-29 19:51:24 UTC (rev 29873)
+++ labs/jbossesb/workspace/tcunning/juddiintegration/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/JuddiRMIService.java 2009-10-30 06:11:13 UTC (rev 29874)
@@ -42,10 +42,14 @@
import org.jboss.system.ServiceMBeanSupport;
import org.jboss.system.server.ServerConfig;
import org.jboss.system.server.ServerConfigImplMBean;
+import org.apache.juddi.Registry;
public class JuddiRMIService extends ServiceMBeanSupport implements JuddiRMIServiceMBean
{
private Logger logger = Logger.getLogger(this.getClass());
+ public static final String PROPNAME_JAVA_NAMING_FACTORY_INITIAL = "java.naming.factory.initial";
+ public static final String PROPNAME_JAVA_NAMING_PROVIDER_URL = "java.naming.provider.url";
+ public static final String PROPNAME_JAVA_NAMING_FACTORY_URL_PKGS = "java.naming.factory.url.pkgs";
private static final String DEFAULT_PROPERTIES_RESOURCE_FILE = "esb.juddi.xml";
private static final String JUDDI_PROPERTIES_RESOURCE_FILE = "esb.juddi.properties";
@@ -122,6 +126,22 @@
}
System.setProperty("juddi.propertiesFile", juddiPropertyFile.getAbsolutePath());
System.setProperty("javax.xml.registry.ConnectionFactoryClass","org.apache.ws.scout.registry.ConnectionFactoryImpl");
+
+ // Read properties from file and if they exist - pass them on to juddi as system properties
+ String factoryInitial = xmlProperties.getProperty(PROPNAME_JAVA_NAMING_FACTORY_INITIAL, null);
+ String providerURL = xmlProperties.getProperty(PROPNAME_JAVA_NAMING_PROVIDER_URL, null);
+ String factoryURLPkgs = xmlProperties.getProperty(PROPNAME_JAVA_NAMING_FACTORY_URL_PKGS, null);
+ if (factoryInitial != null) {
+ System.setProperty(PROPNAME_JAVA_NAMING_FACTORY_INITIAL, factoryInitial);
+ }
+ if (providerURL != null) {
+ System.setProperty(PROPNAME_JAVA_NAMING_PROVIDER_URL, providerURL);
+ }
+ if (factoryURLPkgs != null) {
+ System.setProperty(PROPNAME_JAVA_NAMING_FACTORY_URL_PKGS, factoryURLPkgs);
+ }
+
+ Registry.start();
JNDIRegistration.register();
}
@@ -130,6 +150,7 @@
{
logger.info("Unbinding juddi services");
final InitialContext ic = new InitialContext() ;
+ Registry.stop();
ic.unbind(JNDIRegistration.INQUIRY_SERVICE) ;
ic.unbind(JNDIRegistration.PUBLISH_SERVICE) ;
}
Modified: labs/jbossesb/workspace/tcunning/juddiintegration/product/rosetta/src/org/jboss/internal/soa/esb/services/registry/JAXRConnectionFactory.java
===================================================================
--- labs/jbossesb/workspace/tcunning/juddiintegration/product/rosetta/src/org/jboss/internal/soa/esb/services/registry/JAXRConnectionFactory.java 2009-10-29 19:51:24 UTC (rev 29873)
+++ labs/jbossesb/workspace/tcunning/juddiintegration/product/rosetta/src/org/jboss/internal/soa/esb/services/registry/JAXRConnectionFactory.java 2009-10-30 06:11:13 UTC (rev 29874)
@@ -25,7 +25,9 @@
import org.jboss.soa.esb.common.Environment;
import org.jboss.soa.esb.services.security.PasswordUtil;
import org.jboss.soa.esb.ConfigurationException;
+import org.apache.juddi.Registry;
+
import javax.xml.registry.Connection;
import javax.xml.registry.ConnectionFactory;
import javax.xml.registry.JAXRException;
@@ -80,6 +82,14 @@
if (Configuration.getRegistryScoutTransportClass()!=null) {
props.setProperty("scout.proxy.transportClass", Configuration.getRegistryScoutTransportClass());
}
+ if (Configuration.getRegistryUDDIVersion() != null) {
+ props.setProperty("scout.proxy.uddiVersion", Configuration.getRegistryUDDIVersion());
+ props.setProperty("javax.xml.registry.securityManagerURL", Configuration.getRegistrySecurityManagerURI());
+ }
+ if (Configuration.getRegistryUDDINameSpace() != null) {
+ props.setProperty("scout.proxy.uddiNamespace", Configuration.getRegistryUDDINameSpace());
+ }
+
String user = Configuration.getRegistryUser();
String password = Configuration.getRegistryPassword();
if (PasswordUtil.isPasswordFile(password))
@@ -134,6 +144,8 @@
}
} catch (JAXRException je) {
logger.log(Level.ERROR, je.getMessage(), je);
+ } finally {
+ connection = null;
}
- }
+ }
}
Modified: labs/jbossesb/workspace/tcunning/juddiintegration/product/rosetta/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryImpl.java
===================================================================
--- labs/jbossesb/workspace/tcunning/juddiintegration/product/rosetta/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryImpl.java 2009-10-29 19:51:24 UTC (rev 29873)
+++ labs/jbossesb/workspace/tcunning/juddiintegration/product/rosetta/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryImpl.java 2009-10-30 06:11:13 UTC (rev 29874)
@@ -27,6 +27,7 @@
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
+import java.util.Properties;
import javax.xml.registry.BulkResponse;
import javax.xml.registry.BusinessLifeCycleManager;
@@ -58,6 +59,7 @@
import org.jboss.soa.esb.ConfigurationException;
import org.jboss.soa.esb.MarshalException;
import org.jboss.soa.esb.UnmarshalException;
+import org.jboss.soa.esb.common.Configuration;
import org.jboss.soa.esb.common.ModulePropertyManager;
import org.jboss.soa.esb.common.Environment;
import org.jboss.soa.esb.addressing.EPR;
@@ -148,7 +150,7 @@
try {
jbossTModel = getJBossESBTModel(jaxrConnectionFactory);
} catch (JAXRException je) {
- throw new RegistryException();
+ throw new RegistryException();
}
}
@@ -413,7 +415,12 @@
Collection<String> findQualifiers = new ArrayList<String>();
findQualifiers.add(FindQualifier.SORT_BY_NAME_ASC);
Collection<String> namePatterns = new ArrayList<String>();
- namePatterns.add("%" + organizationName + "%");
+
+ if ("3.0".equals(Configuration.getRegistryUDDIVersion())) {
+ namePatterns.add(organizationName);
+ } else {
+ namePatterns.add("%" + organizationName + "%");
+ }
//Find based upon qualifier type and values
logger.log(Level.DEBUG,"Going to query the registry for name pattern " + namePatterns);
BulkResponse response = bqm.findOrganizations(findQualifiers,
@@ -639,8 +646,12 @@
Collection<String> findQualifiers = new ArrayList<String>();
findQualifiers.add(FindQualifier.SORT_BY_NAME_ASC);
Collection<String> namePatterns = new ArrayList<String>();
- namePatterns.add("%" + orgCategory + "%");
-
+ if ("3.0".equals(Configuration.getRegistryUDDIVersion())) {
+ namePatterns.add(orgCategory);
+ } else {
+ namePatterns.add("%" + orgCategory + "%");
+ }
+
BulkResponse response = bqm.findConcepts(findQualifiers, namePatterns, null, null, null);
if (response.getStatus()==JAXRResponse.STATUS_SUCCESS) {
Collection<RegistryObject> regs = (Collection<RegistryObject>) response.getCollection();
@@ -756,6 +767,14 @@
@SuppressWarnings("unchecked")
private Collection<ServiceBinding> findServiceBindings(Service service) throws RegistryException
{
+ if (jbossTModel == null) {
+ try {
+ jbossTModel = getJBossESBTModel(jaxrConnectionFactory);
+ } catch (JAXRException je) {
+ throw new RegistryException();
+ }
+ }
+
Collection<ServiceBinding> serviceBindings = new ArrayList<ServiceBinding>();
Connection connection = jaxrConnectionFactory.getConnection();
try {
@@ -791,6 +810,7 @@
jaxrConnectionFactory.closeConnection(connection);
}
}
+
}
Modified: labs/jbossesb/workspace/tcunning/juddiintegration/product/rosetta/src/org/jboss/soa/esb/common/Configuration.java
===================================================================
--- labs/jbossesb/workspace/tcunning/juddiintegration/product/rosetta/src/org/jboss/soa/esb/common/Configuration.java 2009-10-29 19:51:24 UTC (rev 29873)
+++ labs/jbossesb/workspace/tcunning/juddiintegration/product/rosetta/src/org/jboss/soa/esb/common/Configuration.java 2009-10-30 06:11:13 UTC (rev 29874)
@@ -57,11 +57,14 @@
new KeyValuePair(Environment.JNDI_SERVER_PKG_PREFIX, getJndiServerPkgPrefix()),
new KeyValuePair(Environment.REGISTRY_QUERY_MANAGER_URI, getRegistryQueryManageURI()),
new KeyValuePair(Environment.REGISTRY_LIFECYCLE_MANAGER_URI,getRegistryLifecycleManagerURI()),
+ new KeyValuePair(Environment.REGISTRY_SECURITY_MANAGER_URI, getRegistrySecurityManagerURI()),
new KeyValuePair(Environment.REGISTRY_IMPEMENTATION_CLASS, getRegistryImplementationClass()),
new KeyValuePair(Environment.REGISTRY_FACTORY_CLASS, getRegistryFactoryClass()),
new KeyValuePair(Environment.REGISTRY_USER, getRegistryUser()),
new KeyValuePair(Environment.REGISTRY_PASSWORD, getRegistryPassword()),
new KeyValuePair(Environment.REGISTRY_SCOUT_TRANSPORT_CLASS,getRegistryScoutTransportClass()),
+ new KeyValuePair(Environment.REGISTRY_SCOUT_UDDI_VERSION, getRegistryUDDIVersion()),
+ new KeyValuePair(Environment.REGISTRY_SCOUT_UDDI_NAMESPACE, getRegistryUDDINameSpace()),
new KeyValuePair(Environment.PARAMS_REPOS_IMPL_CLASS, getParamRepositoryImplClass()),
new KeyValuePair(Environment.OBJECT_STORE_CONFIG_FILE, getObjStoreConfigFile()),
new KeyValuePair(Environment.ENCRYPT_FACTORY_CLASS, getEncryptionFactoryClass()),
@@ -199,6 +202,14 @@
return ModulePropertyManager.getPropertyManager(ModulePropertyManager.REGISTRY_MODULE).getProperty(Environment.REGISTRY_LIFECYCLE_MANAGER_URI);
}
/**
+ * The Registry Security Manager URI can be use to publish services.
+ * @return Registry Lifecycle Manager URI String
+ */
+ public static String getRegistrySecurityManagerURI()
+ {
+ return ModulePropertyManager.getPropertyManager(ModulePropertyManager.REGISTRY_MODULE).getProperty(Environment.REGISTRY_SECURITY_MANAGER_URI);
+ }
+ /**
* The Registry Factory Class setting specifies which JAXR implementation should be used.
* @return Registry Factory Class String
*/
@@ -224,6 +235,24 @@
return ModulePropertyManager.getPropertyManager(ModulePropertyManager.REGISTRY_MODULE).getProperty(Environment.REGISTRY_SCOUT_TRANSPORT_CLASS);
}
/**
+ * The Registry Scout Transport Class defines which communication protocol Scout should use to communicate
+ * with the UDDI registry. Note that this parameter is Scout specific.
+ * @return Registry Scout Transport Class String
+ */
+ public static String getRegistryUDDIVersion()
+ {
+ return ModulePropertyManager.getPropertyManager(ModulePropertyManager.REGISTRY_MODULE).getProperty(Environment.REGISTRY_SCOUT_UDDI_VERSION);
+ }
+ /**
+ * The Registry Scout Transport Class defines which communication protocol Scout should use to communicate
+ * with the UDDI registry. Note that this parameter is Scout specific.
+ * @return Registry Scout Transport Class String
+ */
+ public static String getRegistryUDDINameSpace()
+ {
+ return ModulePropertyManager.getPropertyManager(ModulePropertyManager.REGISTRY_MODULE).getProperty(Environment.REGISTRY_SCOUT_UDDI_NAMESPACE);
+ }
+ /**
* The Registry User is used to inquire and publish to the Registry.
* @return Registry User String
*/
Modified: labs/jbossesb/workspace/tcunning/juddiintegration/product/rosetta/src/org/jboss/soa/esb/common/Environment.java
===================================================================
--- labs/jbossesb/workspace/tcunning/juddiintegration/product/rosetta/src/org/jboss/soa/esb/common/Environment.java 2009-10-29 19:51:24 UTC (rev 29873)
+++ labs/jbossesb/workspace/tcunning/juddiintegration/product/rosetta/src/org/jboss/soa/esb/common/Environment.java 2009-10-30 06:11:13 UTC (rev 29874)
@@ -90,6 +90,7 @@
* The Registry Lifecycle Manager URI defines the endPoint where service information can be published to.
*/
public static final String REGISTRY_LIFECYCLE_MANAGER_URI = "org.jboss.soa.esb.registry.lifeCycleManagerURI";
+ public static final String REGISTRY_SECURITY_MANAGER_URI = "org.jboss.soa.esb.registry.securityManagerURI";
/**
* The Registry Implementation class, a light wrapper class.
*/
@@ -112,6 +113,12 @@
*/
public static final String REGISTRY_SCOUT_TRANSPORT_CLASS = "org.jboss.soa.esb.scout.proxy.transportClass";
/**
+ * The Registry Scout UDDI Version property defines which UDDI Version Scout should use to communicate
+ * with the UDDI registry. Note that this parameter is Scout specific.
+ */
+ public static final String REGISTRY_SCOUT_UDDI_VERSION = "org.jboss.soa.esb.scout.proxy.uddiVersion";
+ public static final String REGISTRY_SCOUT_UDDI_NAMESPACE = "org.jboss.soa.esb.scout.proxy.uddiNameSpace";
+ /**
* Property that holds directory to use with the helper EPRManager class.
*/
public static final String REGISTRY_FILE_HELPER_DIR = "org.jboss.soa.esb.registry.file.directory";
Modified: labs/jbossesb/workspace/tcunning/juddiintegration/product/rosetta/tests/src/org/jboss/soa/esb/testutils/jbossesb-properties.xml
===================================================================
--- labs/jbossesb/workspace/tcunning/juddiintegration/product/rosetta/tests/src/org/jboss/soa/esb/testutils/jbossesb-properties.xml 2009-10-29 19:51:24 UTC (rev 29873)
+++ labs/jbossesb/workspace/tcunning/juddiintegration/product/rosetta/tests/src/org/jboss/soa/esb/testutils/jbossesb-properties.xml 2009-10-30 06:11:13 UTC (rev 29874)
@@ -38,17 +38,20 @@
<property name="jboss.esb.invm.scope.default" value="NONE"/>
</properties>
<properties name="registry">
- <property name="org.jboss.soa.esb.registry.queryManagerURI" value="org.apache.juddi.registry.local.InquiryService#inquire"/>
- <property name="org.jboss.soa.esb.registry.lifeCycleManagerURI" value="org.apache.juddi.registry.local.PublishService#publish"/>
+ <property name="org.jboss.soa.esb.registry.queryManagerURI" value="org.apache.juddi.v3.client.transport.wrapper.UDDIInquiryService#inquire"/>
+ <property name="org.jboss.soa.esb.registry.lifeCycleManagerURI" value="org.apache.juddi.v3.client.transport.wrapper.UDDIPublicationService#publish"/>
+ <property name="org.jboss.soa.esb.registry.securityManagerURI" value="org.apache.juddi.v3.client.transport.wrapper.UDDISecurityService#secure"/>
<property name="org.jboss.soa.esb.registry.implementationClass" value="org.jboss.internal.soa.esb.services.registry.JAXRRegistryImpl"/>
<property name="org.jboss.soa.esb.registry.factoryClass" value="org.apache.ws.scout.registry.ConnectionFactoryImpl"/>
- <property name="org.jboss.soa.esb.registry.user" value="jbossesb"/>
- <property name="org.jboss.soa.esb.registry.password" value="password"/>
+ <property name="org.jboss.soa.esb.registry.user" value="root"/>
+ <property name="org.jboss.soa.esb.registry.password" value="root"/>
<!-- the following parameter is scout specific to set the type of communication between scout and the UDDI (embedded, rmi, soap) -->
<property name="org.jboss.soa.esb.scout.proxy.transportClass" value="org.apache.ws.scout.transport.LocalTransport"/>
+ <property name="org.jboss.soa.esb.scout.proxy.uddiVersion" value="3.0"/>
+ <property name="org.jboss.soa.esb.scout.proxy.uddiNameSpace" value="urn:uddi-org:api_v3"/>
<!-- specify the interceptors, in order -->
- <property name="org.jboss.soa.esb.registry.interceptors"
- value="org.jboss.internal.soa.esb.services.registry.InVMRegistryInterceptor, org.jboss.internal.soa.esb.services.registry.CachingRegistryInterceptor"/>
+ <!-- <property name="org.jboss.soa.esb.registry.interceptors"
+ value="org.jboss.internal.soa.esb.services.registry.InVMRegistryInterceptor, org.jboss.internal.soa.esb.services.registry.CachingRegistryInterceptor"/> -->
<!-- The following properties modify the cache interceptor behaviour -->
<property name="org.jboss.soa.esb.registry.cache.maxSize" value="100"/>
<property name="org.jboss.soa.esb.registry.cache.validityPeriod" value="600000"/>
Modified: labs/jbossesb/workspace/tcunning/juddiintegration/product/services/base-project-build.xml
===================================================================
--- labs/jbossesb/workspace/tcunning/juddiintegration/product/services/base-project-build.xml 2009-10-29 19:51:24 UTC (rev 29873)
+++ labs/jbossesb/workspace/tcunning/juddiintegration/product/services/base-project-build.xml 2009-10-30 06:11:13 UTC (rev 29874)
@@ -37,13 +37,14 @@
<pathelement location="build/${ant.project.name}.esb" />
<pathelement location="build/classes" />
<pathelement location="build/test/classes" />
- <fileset dir="${esb.main.lib}" includes="jboss-system-4.2.2.GA.jar" />
+ <fileset dir="${esb.main.lib}" includes="jboss-system-4.2.2.GA.jar" />
<fileset dir="lib/ext" includes="*.jar" />
<fileset dir="lib/ext/build-time" includes="*.jar" />
- <fileset dir="${esb.product.lib.ext}/endorsed" includes="jboss-saaj.jar" />
+
+ <fileset dir="${esb.product.lib.ext}/endorsed" includes="jboss-saaj.jar" />
<fileset dir="${esb.product.lib.dir}" includes="*.jar" /> <!-- Product Jars. -->
- <fileset dir="${esb.product.lib.ext}" includes="*.jar" />
- <fileset dir="${esb.main.lib}" includes="*.jar" />
+ <fileset dir="${esb.product.lib.ext}" includes="*.jar" />
+ <fileset dir="${esb.main.lib}" includes="*.jar" />
</path>
<path id="classpath">
@@ -144,6 +145,12 @@
<pathelement location="${esb.root.dir}/ftp/lib/slf4j-log4j12-1.3.0.jar"/>
<pathelement location="${esb.root.dir}/ftp/lib/slf4j-api-1.3.0.jar"/>
<pathelement location="${esb.root.dir}/build/jbossesb/lib/test-util.jar"/>
+ <fileset dir="${esb.root.dir}/build/lib">
+ <include name="hibernate*.jar"/>
+ <include name="ejb3-persistence.jar"/>
+ <include name="juddi-client-*.jar"/>
+ <include name="juddi-core-*.jar"/>
+ </fileset>
<!-- log4j location -->
<pathelement location="test/resources"/>
<!-- using instrumented code for code coverage -->
@@ -152,11 +159,11 @@
<path refid="classpath" />
<path refid="test.classpath" />
</classpath>
- <!-- emma jvm args -->
- <jvmarg value="-Demma.coverage.out.file=${coverage.dir}/coverage.emma" />
- <sysproperty key="log4j.configuration" value="log4j.xml"/>
+ <!-- emma jvm args -->
+ <jvmarg value="-Demma.coverage.out.file=${coverage.dir}/coverage.emma" />
+ <sysproperty key="log4j.configuration" value="log4j.xml"/>
<sysproperty key="jboss.esb.invm.scope.default" value="NONE"/>
- <jvmarg line="-Djava.endorsed.dirs=${endorsed.dir}"/>
+ <jvmarg line="-Djava.endorsed.dirs=${endorsed.dir}"/>
</junit>
<junitreport>
<fileset dir="build/tests/report">
Modified: labs/jbossesb/workspace/tcunning/juddiintegration/product/services/build.xml
===================================================================
--- labs/jbossesb/workspace/tcunning/juddiintegration/product/services/build.xml 2009-10-29 19:51:24 UTC (rev 29873)
+++ labs/jbossesb/workspace/tcunning/juddiintegration/product/services/build.xml 2009-10-30 06:11:13 UTC (rev 29874)
@@ -29,7 +29,7 @@
<ant dir="jbpm" target="test"/>
<ant dir="jbrules" target="test"/>
<ant dir="smooks" target="test"/>
- <ant dir="soapui-client" target="test"/>
+ <ant dir="soapui-client" target="test"/>
<ant dir="soap" target="test"/>
<ant dir="spring" target="test"/>
<ant dir="slsb" target="test"/>
Modified: labs/jbossesb/workspace/tcunning/juddiintegration/qa/jbossesb-unittest-properties.xml
===================================================================
--- labs/jbossesb/workspace/tcunning/juddiintegration/qa/jbossesb-unittest-properties.xml 2009-10-29 19:51:24 UTC (rev 29873)
+++ labs/jbossesb/workspace/tcunning/juddiintegration/qa/jbossesb-unittest-properties.xml 2009-10-30 06:11:13 UTC (rev 29874)
@@ -35,13 +35,18 @@
<property name="org.jboss.soa.esb.jndi.server.url" value="localhost"/>
</properties>
<properties name="registry">
- <property name="org.jboss.soa.esb.registry.queryManagerURI" value="org.apache.juddi.registry.local.InquiryService#inquire"/>
- <property name="org.jboss.soa.esb.registry.lifeCycleManagerURI" value="org.apache.juddi.registry.local.PublishService#publish"/>
+ <property name="org.jboss.soa.esb.registry.queryManagerURI" value="org.apache.juddi.v3.client.transport.wrapper.UDDIInquiryService#inquire"/>
+ <property name="org.jboss.soa.esb.registry.lifeCycleManagerURI" value="org.apache.juddi.v3.client.transport.wrapper.UDDIPublicationService#publish"/>
+ <property name="org.jboss.soa.esb.registry.securityManagerURI" value="org.apache.juddi.v3.client.transport.wrapper.UDDISecurityService#secure"/>
+ <property name="org.jboss.soa.esb.registry.implementationClass" value="org.jboss.internal.soa.esb.services.registry.JAXRRegistryImpl"/>
+
<property name="org.jboss.soa.esb.registry.factoryClass" value="org.apache.ws.scout.registry.ConnectionFactoryImpl"/>
- <property name="org.jboss.soa.esb.registry.user" value="jbossesb"/>
- <property name="org.jboss.soa.esb.registry.password" value="password"/>
+ <property name="org.jboss.soa.esb.registry.user" value="root"/>
+ <property name="org.jboss.soa.esb.registry.password" value="root"/>
<!-- the following parameter is scout specific to set the type of communication between scout and the UDDI (embedded, rmi, soap) -->
<property name="org.jboss.soa.esb.scout.proxy.transportClass" value="org.apache.ws.scout.transport.LocalTransport"/>
+ <property name="org.jboss.soa.esb.scout.proxy.uddiVersion" value="3.0"/>
+ <property name="org.jboss.soa.esb.scout.proxy.uddiNameSpace" value="urn:uddi-org:api_v3"/>
</properties>
<properties name="transports" depends="core">
<property name="org.jboss.soa.esb.mail.smtp.host" value="@org.jboss.soa.esb.mail.smtp.host@"/>
Modified: labs/jbossesb/workspace/tcunning/juddiintegration/qa/junit/build.xml
===================================================================
--- labs/jbossesb/workspace/tcunning/juddiintegration/qa/junit/build.xml 2009-10-29 19:51:24 UTC (rev 29873)
+++ labs/jbossesb/workspace/tcunning/juddiintegration/qa/junit/build.xml 2009-10-30 06:11:13 UTC (rev 29874)
@@ -265,10 +265,14 @@
<fileset dir="${qa.junit.src}">
<include name="**/${tests.filter}Test.java"/>
<exclude name="${tests.exclude}"/>
+ <exclude name="**/JbpmAsyncUnitTest.java"/>
+ <exclude name="**/JbpmLocalUnitTest.java"/>
+ <exclude name="**/JbpmReplyUnitTest.java"/>
</fileset>
</batchtest>
<classpath>
+ <fileset dir="${product.build}/lib/" includes="hibernate*.jar, ejb3-persistence.jar, juddi-client*.jar"/>
<pathelement location="${qa.junit.classes}"/>
<path refid="base.cp"/>
<pathelement location="${qa.junit.src}"/>
@@ -281,7 +285,7 @@
<sysproperty key="jbosstest.threadcount" value="${jbosstest.threadcount}"/>
<sysproperty key="jbosstest.iterationcount" value="${jbosstest.iterationcount}"/>
<sysproperty key="jbosstest.beancount" value="${jbosstest.beancount}"/>
- <sysproperty key="javax.xml.registry.ConnectionFactoryClass" value="org.apache.ws.scout.registry.ConnectionFactoryImpl"/>
+ <sysproperty key="javax.xml.registry.ConnectionFactoryClass" value="org.apache.ws.scout.registry.ConnectionFactoryImpl"/>
<!-- Listener Sys Props... -->
<sysproperty key="org.jboss.soa.esb.paramsRepository.file.root"
@@ -339,11 +343,15 @@
<batchtest todir="${qa.junit.report}">
<fileset dir="${qa.junit.src}">
<include name="**/${tests.filter}Test.java"/>
- </fileset>
+ </fileset>
</batchtest>
<classpath>
<pathelement location="${qa.junit.classes}"/>
<path refid="qa.junit.emma.cp"/>
+ <fileset dir="${product.build}/lib">
+ <include name="hibernate*.jar"/>
+ <include name="ejb3-persistence.jar"/>
+ </fileset>
<pathelement location="${qa.junit.src}"/>
</classpath>
Modified: labs/jbossesb/workspace/tcunning/juddiintegration/qa/junit/resources/server/jbossesb-properties.xml
===================================================================
--- labs/jbossesb/workspace/tcunning/juddiintegration/qa/junit/resources/server/jbossesb-properties.xml 2009-10-29 19:51:24 UTC (rev 29873)
+++ labs/jbossesb/workspace/tcunning/juddiintegration/qa/junit/resources/server/jbossesb-properties.xml 2009-10-30 06:11:13 UTC (rev 29874)
@@ -35,22 +35,23 @@
<property name="org.jboss.soa.esb.jndi.server.url" value="localhost"/>
<property name="org.jboss.soa.esb.persistence.connection.factory" value="org.jboss.internal.soa.esb.persistence.format.MessageStoreFactoryImpl"/>
</properties>
- <properties name="registry">
- <property name="org.jboss.soa.esb.registry.queryManagerURI"
- value="jnp://localhost:1099/InquiryService?org.apache.juddi.registry.rmi.Inquiry#inquire"/>
- <property name="org.jboss.soa.esb.registry.lifeCycleManagerURI"
- value="jnp://localhost:1099/PublishService?org.apache.juddi.registry.rmi.Publish#publish" />
+ <properties name="registry">
+ <property name="org.jboss.soa.esb.registry.queryManagerURI" value="org.apache.juddi.v3.client.transport.wrapper.UDDIInquiryService#inquire"/>
+ <property name="org.jboss.soa.esb.registry.lifeCycleManagerURI" value="org.apache.juddi.v3.client.transport.wrapper.UDDIPublicationService#publish"/>
+ <property name="org.jboss.soa.esb.registry.securityManagerURI" value="org.apache.juddi.v3.client.transport.wrapper.UDDISecurityService#secure"/>
<property name="org.jboss.soa.esb.registry.implementationClass"
value="org.jboss.internal.soa.esb.services.registry.JAXRRegistryImpl"/>
<property name="org.jboss.soa.esb.registry.factoryClass"
value="org.apache.ws.scout.registry.ConnectionFactoryImpl"/>
<property name="org.jboss.soa.esb.registry.user"
- value="jbossesb"/>
+ value="root"/>
<property name="org.jboss.soa.esb.registry.password"
- value="password"/>
+ value="root"/>
+ <property name="org.jboss.soa.esb.scout.proxy.uddiVersion" value="3.0"/>
+ <property name="org.jboss.soa.esb.scout.proxy.uddiNameSpace" value="urn:uddi-org:api_v3"/>
<!-- the following parameter is scout specific to set the type of communication between scout and the UDDI (embedded, rmi, soap) -->
<property name="org.jboss.soa.esb.scout.proxy.transportClass"
- value="org.apache.ws.scout.transport.RMITransport"/>
+ value="org.apache.ws.scout.transport.LocalTransport"/>
<!-- specify the interceptors, in order -->
<property name="org.jboss.soa.esb.registry.interceptors"
value="org.jboss.internal.soa.esb.services.registry.InVMRegistryInterceptor, org.jboss.internal.soa.esb.services.registry.CachingRegistryInterceptor"/>
Modified: labs/jbossesb/workspace/tcunning/juddiintegration/qa/junit/src/org/jboss/soa/esb/server/aop/AOPServer.java
===================================================================
--- labs/jbossesb/workspace/tcunning/juddiintegration/qa/junit/src/org/jboss/soa/esb/server/aop/AOPServer.java 2009-10-29 19:51:24 UTC (rev 29873)
+++ labs/jbossesb/workspace/tcunning/juddiintegration/qa/junit/src/org/jboss/soa/esb/server/aop/AOPServer.java 2009-10-30 06:11:13 UTC (rev 29874)
@@ -147,7 +147,12 @@
final Connection connection = scoutConnectionFactory.getConnection();
final RegistryService rs = connection.getRegistryService();
final BusinessQueryManager bqm = rs.getBusinessQueryManager();
- final BulkResponse bulkResponse = bqm.findServiceBindings(service.getKey(),null,null,null);
+ /*
+ jUDDI v3 requires a find_tmodel, categorybag, or tmodel
+ The query below is needs arguments - null null null not valid for
+ v3
+
+ final BulkResponse bulkResponse = bqm.findServiceBindings(service.getKey(),null,null,null);
if (bulkResponse.getStatus()!=JAXRResponse.STATUS_SUCCESS)
{
return "findServiceBindings failed" ;
@@ -177,7 +182,7 @@
// is null - in this case, just move on
}
}
-
+ */
return null ;
}
}
Modified: labs/jbossesb/workspace/tcunning/juddiintegration/qa/quickstarts/build.xml
===================================================================
--- labs/jbossesb/workspace/tcunning/juddiintegration/qa/quickstarts/build.xml 2009-10-29 19:51:24 UTC (rev 29873)
+++ labs/jbossesb/workspace/tcunning/juddiintegration/qa/quickstarts/build.xml 2009-10-30 06:11:13 UTC (rev 29874)
@@ -352,6 +352,12 @@
<fileset dir="${qa.quickstarts.src}">
<include name="**/${tests.filter}Test.java"/>
<exclude name="${tests.exclude}"/>
+
+ <!-- TOM C add 10/29/09 -->
+ <exclude name="**/BPMOrchestration2Test.java"/>
+
+
+
<!-- Aggregator QS only runs standalone -->
<exclude name="**/AggregatorTest.java"/>
<!-- GroovyGateway QS requires UI interaction -->
More information about the jboss-svn-commits
mailing list