[jboss-svn-commits] JBL Code SVN: r31240 - in labs/jbossesb/branches/JBESB_4_7_CP/product: install and 10 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Jan 27 03:18:21 EST 2010
Author: kevin.conner at jboss.com
Date: 2010-01-27 03:18:19 -0500 (Wed, 27 Jan 2010)
New Revision: 31240
Added:
labs/jbossesb/branches/JBESB_4_7_CP/product/lib/ext/juddi-client-3.0.1.jar
labs/jbossesb/branches/JBESB_4_7_CP/product/lib/ext/juddi-core-3.0.1.jar
labs/jbossesb/branches/JBESB_4_7_CP/product/lib/ext/scout-1.2.1.jar
labs/jbossesb/branches/JBESB_4_7_CP/product/lib/ext/uddi-ws-3.0.1.jar
Removed:
labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/aop/
labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/gateway/juddi-unittest.properties
labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/juddi-unittest.properties
labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/services/registry/juddi-unittest.properties
labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/testutils/juddi-unittest.properties
Modified:
labs/jbossesb/branches/JBESB_4_7_CP/product/build-distr.xml
labs/jbossesb/branches/JBESB_4_7_CP/product/install/build.xml
labs/jbossesb/branches/JBESB_4_7_CP/product/install/jboss-structure.xml
labs/jbossesb/branches/JBESB_4_7_CP/product/ivy.xml
labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/build.xml
labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/src/org/jboss/internal/soa/esb/registry/client/JuddiRMITransport.java
labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/src/org/jboss/internal/soa/esb/registry/server/JuddiInVMServerTransport.java
labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryUnitTest.java
labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/ListenerManagerBaseTest.java
labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/gateway/GatewayListenerControllerBaseTest.java
labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/services/registry/RegistryUnitTest.java
labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/testutils/TestEnvironmentUtil.java
labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/conf/base-build.xml
Log:
Upgrade to juddi 3.0.1 and scout 1.2.1: JBESB-3141
Modified: labs/jbossesb/branches/JBESB_4_7_CP/product/build-distr.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/build-distr.xml 2010-01-26 23:07:09 UTC (rev 31239)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/build-distr.xml 2010-01-27 08:18:19 UTC (rev 31240)
@@ -7,7 +7,6 @@
<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"/>
@@ -85,8 +84,6 @@
<fileset dir="${installation.files.dir}/jUDDI-registryV3">
<include name="esb.juddi.client.xml"/>
</fileset>
- <!-- We use AOP on juddi to get around an issue -->
- <fileset dir="${build.dir}" includes="rosetta.aop"/>
</copy>
<mkdir dir="${build.dir}/jbossesb.sar/lib"/>
@@ -97,8 +94,9 @@
<fileset dir="${lib.dir}" includes="xbean*.jar"/>
<fileset dir="${lib.dir}" includes="stax-api-*.jar"/>
<!-- jUDDI Registry, we're one -->
- <fileset dir="${aoplib.dir}" includes="juddi-client-*.jar, scout-*.jar"/>
- <fileset dir="${lib.dir}" includes="uddi-ws-*.jar,commons-configuration-*.jar,commons-codec-*.jar"/>
+ <!-- temporary until juddi 3.0.1 and scout 1.2.1 releases pushed out through maven -->
+ <fileset dir="${lib.ext.dir}" includes="juddi-client-*.jar, uddi-ws-*.jar scout-*.jar"/>
+ <fileset dir="${lib.dir}" includes="commons-configuration-*.jar,commons-codec-*.jar"/>
<!-- ftp -->
<fileset dir="${lib.ext.dir}" includes="commons-net-*.jar"/>
<fileset dir="${lib.dir}" includes="commons-io-*.jar,jsch-*.jar"/>
@@ -131,7 +129,8 @@
<include name="juddi-ds.xml"/>
<include name="esb.juddi.xml"/>
</fileset>
- <fileset dir="${aoplib.dir}" includes="juddi-core-*.jar"/>
+ <!-- temporary until 3.0.1 release pushed out through maven -->
+ <fileset dir="${lib.ext.dir}" includes="juddi-core-*.jar"/>
<fileset dir="${build.lib.dir}" includes="jbossesb-registry.jar"/>
</copy>
Modified: labs/jbossesb/branches/JBESB_4_7_CP/product/install/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/install/build.xml 2010-01-26 23:07:09 UTC (rev 31239)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/install/build.xml 2010-01-27 08:18:19 UTC (rev 31240)
@@ -269,14 +269,14 @@
<include name="ognl*.jar"/>
<include name="opencsv*.jar"/>
<include name="stringtemplate*.jar"/>
- <include name="scout-*.aop.jar"/>
+ <include name="scout-*.jar"/>
<include name="stax-api-*.jar"/>
<include name="wstx-asl-*.jar"/>
<include name="xbean-*.jar"/>
<include name="xstream-*.jar"/>
<!-- JUDDI V3 dependencies -->
- <include name="juddi-*.aop.jar"/>
+ <include name="juddi-core-*.jar"/>
<include name="juddi-client-*.jar"/>
<include name="commons-configuration-*.jar"/>
<include name="uddi-ws-*.jar"/>
@@ -300,7 +300,6 @@
<include name="jbossesb-properties.xml"/>
<include name="privateKeyStore"/>
<include name="publicKeyStore"/>
- <include name="rosetta.aop"/>
</fileset>
</copy>
@@ -345,11 +344,10 @@
<exclude name="jbossesb-properties.xml"/>
<exclude name="privateKeyStore"/>
<exclude name="publicKeyStore"/>
- <exclude name="rosetta.aop"/>
<!-- JUDDI V3 dependencies -->
- <exclude name="lib/juddi-*.aop.jar"/>
- <exclude name="lib/juddi-client-*.aop.jar"/>
- <exclude name="lib/scout-*.aop.jar"/>
+ <exclude name="lib/juddi-core-*.jar"/>
+ <exclude name="lib/juddi-client-*.jar"/>
+ <exclude name="lib/scout-*.jar"/>
<exclude name="lib/commons-configuration-*.jar"/>
<exclude name="lib/uddi-ws-*.jar"/>
</fileset>
Modified: labs/jbossesb/branches/JBESB_4_7_CP/product/install/jboss-structure.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/install/jboss-structure.xml 2010-01-26 23:07:09 UTC (rev 31239)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/install/jboss-structure.xml 2010-01-27 08:18:19 UTC (rev 31240)
@@ -8,13 +8,6 @@
<classpath>
<path name=""/>
<path name="lib" suffixes=".jar"/>
- <path name="rosetta.aop"/>
</classpath>
</context>
- <context>
- <path name="rosetta.aop"/>
- <metaDataPath>
- <path name="META-INF"/>
- </metaDataPath>
- </context>
</structure>
Modified: labs/jbossesb/branches/JBESB_4_7_CP/product/ivy.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/ivy.xml 2010-01-26 23:07:09 UTC (rev 31239)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/ivy.xml 2010-01-27 08:18:19 UTC (rev 31240)
@@ -31,7 +31,9 @@
<dependency org="javassist" name="javassist" rev="3.6.0.GA"/>
<dependency org="org.apache.ws.scout" name="jaxr-api" rev="1.0"/>
- <dependency org="org.apache.ws.scout" name="scout" rev="1.2"/>
+ <!-- temporary until 1.2.1 is pushed into maven
+ <dependency org="org.apache.ws.scout" name="scout" rev="1.2.1"/>
+ -->
<dependency org="jboss.aop" name="jboss-aop-jdk50" rev="1.5.6.GA"/>
<!-- dependency org="jboss.messaging" name="jboss-messaging-client" rev="1.4.1.CR1"/ -->
@@ -40,9 +42,11 @@
<dependency org="jboss" name="jbossall-client" rev="4.2.2.GA"/>
<!-- dependency org="jboss" name="jbossts.jbossts-common" rev="4.2.2.GA"/ -->
<dependency org="com.jcraft" name="jsch" rev="0.1.38"/>
- <dependency org="org.apache.juddi" name="uddi-ws" rev="3.0.0"/>
- <dependency org="org.apache.juddi" name="juddi-client" rev="3.0.0"/>
- <dependency org="org.apache.juddi" name="juddi-core" rev="3.0.0"/>
+ <!-- temporary until 3.0.1 is pushed into maven. Also need to add juddiv3.war
+ <dependency org="org.apache.juddi" name="uddi-ws" rev="3.0.1"/>
+ <dependency org="org.apache.juddi" name="juddi-client" rev="3.0.1"/>
+ <dependency org="org.apache.juddi" name="juddi-core" rev="3.0.1"/>
+ -->
<dependency org="xerces" name="xercesImpl" rev="2.8.0"/>
<dependency org="log4j" name="log4j" rev="1.2.14"/>
Added: labs/jbossesb/branches/JBESB_4_7_CP/product/lib/ext/juddi-client-3.0.1.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossesb/branches/JBESB_4_7_CP/product/lib/ext/juddi-client-3.0.1.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossesb/branches/JBESB_4_7_CP/product/lib/ext/juddi-core-3.0.1.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossesb/branches/JBESB_4_7_CP/product/lib/ext/juddi-core-3.0.1.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossesb/branches/JBESB_4_7_CP/product/lib/ext/scout-1.2.1.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossesb/branches/JBESB_4_7_CP/product/lib/ext/scout-1.2.1.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossesb/branches/JBESB_4_7_CP/product/lib/ext/uddi-ws-3.0.1.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossesb/branches/JBESB_4_7_CP/product/lib/ext/uddi-ws-3.0.1.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/build.xml 2010-01-26 23:07:09 UTC (rev 31239)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/build.xml 2010-01-27 08:18:19 UTC (rev 31240)
@@ -6,18 +6,8 @@
<property name="org.jboss.esb.registry.war.name" value="juddiv3.war"/>
<property name="org.jboss.esb.rosetta.distrib.dir" location="${org.jboss.esb.internal.dest}/jbossesb"/>
<property name="org.jboss.esb.rosetta.classes.dir" location="${org.jboss.esb.internal.dest}/classes/rosetta"/>
- <property name="org.jboss.esb.rosetta.aop.classes.dir" location="${org.jboss.esb.rosetta.classes.dir}-aop"/>
- <property name="org.jboss.esb.rosetta.aopc.juddi.client.classes.dir" location="${org.jboss.esb.rosetta.classes.dir}-juddi-client-aopc"/>
- <property name="org.jboss.esb.rosetta.aopc.scout.classes.dir" location="${org.jboss.esb.rosetta.classes.dir}-scout-aopc"/>
- <property name="juddi.client.jar" value="juddi-client-3.0.0.jar"/>
- <property name="juddi.client.aop.jar" value="juddi-client-3.0.0.aop.jar"/>
- <property name="org.jboss.esb.rosetta.aopc.juddi.core.classes.dir" location="${org.jboss.esb.rosetta.classes.dir}-juddi-core-aopc"/>
- <property name="juddi.core.jar" value="juddi-core-3.0.0.jar"/>
- <property name="juddi.core.aop.jar" value="juddi-core-3.0.0.aop.jar"/>
- <property name="scout.jar" value="scout-1.2.jar"/>
- <property name="scout.aop.jar" value="scout-1.2.aop.jar"/>
- <property name="uddi.webservices.jar" value="uddi-ws-3.0.0.jar"/>
+ <property name="uddi.webservices.jar" value="uddi-ws-3.0.1.jar"/>
<property name="org.jboss.esb.registry.war.dir" location="war"/>
<property name="org.jboss.esb.registry.war.src.dir" location="${org.jboss.esb.registry.war.dir}/java"/>
@@ -36,7 +26,6 @@
<property environment="env"/>
<property name="org.jboss.esb.lib.dir" location="${org.jboss.esb.internal.dest}/lib"/>
- <property name="org.jboss.esb.aoplib.dir" location="${org.jboss.esb.internal.dest}/aoplib"/>
<property name="org.jboss.esb.ext.lib.dir" location="${org.jboss.esb.root.dir}/lib/ext"/>
<path id="org.jboss.esb.rosetta.base.classpath">
@@ -60,9 +49,6 @@
<mkdir dir="${org.jboss.esb.rosetta.classes.dir}"/>
<mkdir dir="${org.jboss.esb.rosetta.distrib.dir}"/>
<mkdir dir="${org.jboss.esb.rosetta.distrib.dir}/lib"/>
- <!-- aop dirs -->
- <mkdir dir="${org.jboss.esb.rosetta.aop.classes.dir}"/>
- <mkdir dir="${org.jboss.esb.aoplib.dir}"/>
<!-- webservice dirs -->
<mkdir dir="${org.jboss.esb.registry.war.classes.dir}"/>
</target>
@@ -72,7 +58,7 @@
<delete dir="${org.jboss.esb.rosetta.classes.dir}"/>
</target>
- <target name="org.jboss.esb.rosetta.compile" depends="generate-config-model, org.jboss.esb.rosetta.internal.compile, aop, war">
+ <target name="org.jboss.esb.rosetta.compile" depends="generate-config-model, org.jboss.esb.rosetta.internal.compile, war">
<ant inheritAll="true" dir="tests" target="org.jboss.esb.rosetta.tests.compile"/>
</target>
@@ -240,75 +226,6 @@
<property name="coverage.dir" location="${org.jboss.esb.internal.dest}/tests/coverage"/>
- <path id="aop-classpath">
- <fileset dir="${org.jboss.esb.lib.dir}" includes="jboss-aop-*.jar, javassist-*.jar, jbossall-client-*.jar, xbean-*.jar, uddi-ws-*.jar, commons-configuration-*.jar, commons-lang-*.jar, log4j-*.jar"/>
- <fileset dir="${org.jboss.esb.ext.lib.dir}" includes="trove.jar"/>
- </path>
-
- <target name="aop" depends="aop-jar">
- <taskdef name="aopc" classname="org.jboss.aop.ant.AopC" classpathref="aop-classpath"/>
-
- <delete dir="${org.jboss.esb.rosetta.aopc.juddi.client.classes.dir}" quiet="true"/>
- <delete dir="${org.jboss.esb.rosetta.aopc.juddi.core.classes.dir}" quiet="true"/>
- <delete dir="${org.jboss.esb.rosetta.aopc.scout.classes.dir}" quiet="true"/>
- <mkdir dir="${org.jboss.esb.rosetta.aopc.juddi.client.classes.dir}"/>
- <mkdir dir="${org.jboss.esb.rosetta.aopc.juddi.core.classes.dir}"/>
- <mkdir dir="${org.jboss.esb.rosetta.aopc.scout.classes.dir}"/>
-
- <unzip src="${org.jboss.esb.lib.dir}/${juddi.client.jar}" dest="${org.jboss.esb.rosetta.aopc.juddi.client.classes.dir}"/>
- <unzip src="${org.jboss.esb.lib.dir}/${juddi.core.jar}" dest="${org.jboss.esb.rosetta.aopc.juddi.core.classes.dir}"/>
- <unzip src="${org.jboss.esb.lib.dir}/${scout.jar}" dest="${org.jboss.esb.rosetta.aopc.scout.classes.dir}"/>
-
- <aopc compilerclasspathref="aop-classpath">
- <classpath path="${org.jboss.esb.rosetta.aopc.juddi.client.classes.dir}"/>
- <src path="${org.jboss.esb.rosetta.aopc.juddi.client.classes.dir}"/>
- <include name="org/apache/juddi/v3/client/transport/wrapper/UDDIInquiryService.class"/>
- <include name="org/apache/juddi/v3/client/transport/wrapper/UDDISecurityService.class"/>
- <include name="org/apache/juddi/v3/client/transport/wrapper/UDDIPublicationService.class"/>
- <include name="org/apache/juddi/v3/client/config/ClientConfig.class"/>
- <aoppath path="aop/resources/META-INF/jboss-aop.xml"/>
- <aopclasspath path="${org.jboss.esb.rosetta.aop.classes.dir}"/>
- </aopc>
- <aopc compilerclasspathref="aop-classpath">
- <classpath path="${org.jboss.esb.rosetta.aopc.juddi.core.classes.dir}"/>
- <src path="${org.jboss.esb.rosetta.aopc.juddi.core.classes.dir}"/>
- <include name="org/apache/juddi/config/AppConfig.class"/>
- <include name="org/apache/juddi/subscription/NotificationList.class"/>
- <include name="org/apache/juddi/v3/auth/AuthenticatorFactory.class"/>
- <include name="org/apache/juddi/config/Install.class"/>
- <aoppath path="aop/resources/META-INF/jboss-aop.xml"/>
- <aopclasspath path="${org.jboss.esb.rosetta.aop.classes.dir}"/>
- </aopc>
- <aopc compilerclasspathref="aop-classpath">
- <classpath path="${org.jboss.esb.rosetta.aopc.scout.classes.dir}"/>
- <src path="${org.jboss.esb.rosetta.aopc.scout.classes.dir}"/>
- <include name="org/apache/ws/scout/util/ScoutJaxrUddiV3Helper.class"/>
- <include name="org/apache/ws/scout/util/ScoutUddiJaxrHelper.class"/>
- <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}/${juddi.client.aop.jar}" basedir="${org.jboss.esb.rosetta.aopc.juddi.client.classes.dir}"/>
- <zip destfile="${org.jboss.esb.aoplib.dir}/${juddi.core.aop.jar}" basedir="${org.jboss.esb.rosetta.aopc.juddi.core.classes.dir}"/>
- <zip destfile="${org.jboss.esb.aoplib.dir}/${scout.aop.jar}" basedir="${org.jboss.esb.rosetta.aopc.scout.classes.dir}"/>
- </target>
-
- <target name="aop-jar" depends="aop-compile">
- <jar destfile="${org.jboss.esb.internal.dest}/rosetta.aop">
- <fileset dir="${org.jboss.esb.rosetta.aop.classes.dir}"/>
- <fileset dir="aop/resources"/>
- </jar>
- </target>
-
- <target name="aop-compile">
- <javac srcdir="aop/java" destdir="${org.jboss.esb.rosetta.aop.classes.dir}"
- debug="${org.jboss.esb.debug}" optimize="${org.jboss.esb.optimize}">
- <classpath>
- <path refid="org.jboss.esb.rosetta.base.classpath"/>
- <pathelement location="${org.jboss.esb.rosetta.classes.dir}"/>
- </classpath>
- </javac>
- </target>
-
<target name="war">
<javac
destdir="${org.jboss.esb.registry.war.classes.dir}"
@@ -325,7 +242,7 @@
<zip destfile="${juddiv3.war.file}">
<zipfileset dir="${org.jboss.esb.registry.war.resources.dir}"/>
<zipfileset dir="${org.jboss.esb.registry.war.classes.dir}" prefix="WEB-INF/classes"/>
- <zipfileset src="${org.jboss.esb.lib.dir}/${uddi.webservices.jar}" includes="uddi*"
+ <zipfileset src="${org.jboss.esb.ext.lib.dir}/${uddi.webservices.jar}" includes="uddi*"
prefix="WEB-INF/wsdl"/>
</zip>
</target>
Modified: labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/src/org/jboss/internal/soa/esb/registry/client/JuddiRMITransport.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/src/org/jboss/internal/soa/esb/registry/client/JuddiRMITransport.java 2010-01-26 23:07:09 UTC (rev 31239)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/src/org/jboss/internal/soa/esb/registry/client/JuddiRMITransport.java 2010-01-27 08:18:19 UTC (rev 31240)
@@ -32,6 +32,7 @@
import org.apache.commons.configuration.ConfigurationException;
import org.apache.juddi.v3.client.config.UDDIClerkManager;
+import org.apache.juddi.v3.client.config.UDDIClientContainer;
import org.apache.juddi.v3.client.config.UDDINode;
import org.apache.juddi.v3.client.transport.Transport;
import org.apache.juddi.v3.client.transport.TransportException;
@@ -259,7 +260,8 @@
throws ConfigurationException
{
final Properties jndiEnv = new Properties() ;
- final UDDINode uddiNode = UDDIClerkManager.getClientConfig().getUDDINode(nodeName) ;
+ final UDDIClerkManager manager = UDDIClientContainer.getUDDIClerkManager(null) ;
+ final UDDINode uddiNode = manager.getClientConfig().getUDDINode(nodeName) ;
final String initialContextFactory = uddiNode.getFactoryInitial() ;
final String providerURL = uddiNode.getFactoryNamingProvider() ;
final String urlPkgPrefixes = uddiNode.getFactoryURLPkgs() ;
@@ -315,7 +317,8 @@
{
try
{
- return UDDIClerkManager.getClientConfig().getUDDINode(nodeName) ;
+ final UDDIClerkManager manager = UDDIClientContainer.getUDDIClerkManager(null) ;
+ return manager.getClientConfig().getUDDINode(nodeName) ;
}
catch (final ConfigurationException ce)
{
Modified: labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/src/org/jboss/internal/soa/esb/registry/server/JuddiInVMServerTransport.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/src/org/jboss/internal/soa/esb/registry/server/JuddiInVMServerTransport.java 2010-01-26 23:07:09 UTC (rev 31239)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/src/org/jboss/internal/soa/esb/registry/server/JuddiInVMServerTransport.java 2010-01-27 08:18:19 UTC (rev 31240)
@@ -31,6 +31,7 @@
import org.apache.commons.configuration.ConfigurationException;
import org.apache.juddi.v3.client.config.UDDIClerkManager;
+import org.apache.juddi.v3.client.config.UDDIClientContainer;
import org.apache.juddi.v3.client.transport.Transport;
import org.apache.juddi.v3.client.transport.TransportException;
import org.apache.juddi.v3_service.JUDDIApiPortType;
@@ -118,7 +119,8 @@
{
try
{
- juddiApiUrl = UDDIClerkManager.getClientConfig().getUDDINode(nodeName).getJuddiApiUrl() ;
+ final UDDIClerkManager manager = UDDIClientContainer.getUDDIClerkManager(null) ;
+ juddiApiUrl = manager.getClientConfig().getUDDINode(nodeName).getJuddiApiUrl() ;
}
catch (final ConfigurationException ce)
{
@@ -158,7 +160,8 @@
{
try
{
- custodyTransferUrl = UDDIClerkManager.getClientConfig().getUDDINode(nodeName).getCustodyTransferUrl() ;
+ final UDDIClerkManager manager = UDDIClientContainer.getUDDIClerkManager(null) ;
+ custodyTransferUrl = manager.getClientConfig().getUDDINode(nodeName).getCustodyTransferUrl() ;
}
catch (final ConfigurationException ce)
{
@@ -197,7 +200,8 @@
{
try
{
- inquiryUrl = UDDIClerkManager.getClientConfig().getUDDINode(nodeName).getInquiryUrl() ;
+ final UDDIClerkManager manager = UDDIClientContainer.getUDDIClerkManager(null) ;
+ inquiryUrl = manager.getClientConfig().getUDDINode(nodeName).getInquiryUrl() ;
}
catch (final ConfigurationException ce)
{
@@ -236,7 +240,8 @@
{
try
{
- publishUrl = UDDIClerkManager.getClientConfig().getUDDINode(nodeName).getPublishUrl() ;
+ final UDDIClerkManager manager = UDDIClientContainer.getUDDIClerkManager(null) ;
+ publishUrl = manager.getClientConfig().getUDDINode(nodeName).getPublishUrl() ;
}
catch (final ConfigurationException ce)
{
@@ -275,7 +280,8 @@
{
try
{
- securityUrl = UDDIClerkManager.getClientConfig().getUDDINode(nodeName).getSecurityUrl() ;
+ final UDDIClerkManager manager = UDDIClientContainer.getUDDIClerkManager(null) ;
+ securityUrl = manager.getClientConfig().getUDDINode(nodeName).getSecurityUrl() ;
}
catch (final ConfigurationException ce)
{
@@ -314,7 +320,8 @@
{
try
{
- subscriptionListenerUrl = UDDIClerkManager.getClientConfig().getUDDINode(nodeName).getSubscriptionListenerUrl() ;
+ final UDDIClerkManager manager = UDDIClientContainer.getUDDIClerkManager(null) ;
+ subscriptionListenerUrl = manager.getClientConfig().getUDDINode(nodeName).getSubscriptionListenerUrl() ;
}
catch (final ConfigurationException ce)
{
@@ -353,7 +360,8 @@
{
try
{
- subscriptionUrl = UDDIClerkManager.getClientConfig().getUDDINode(nodeName).getSubscriptionUrl() ;
+ final UDDIClerkManager manager = UDDIClientContainer.getUDDIClerkManager(null) ;
+ subscriptionUrl = manager.getClientConfig().getUDDINode(nodeName).getSubscriptionUrl() ;
}
catch (final ConfigurationException ce)
{
Modified: labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryUnitTest.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryUnitTest.java 2010-01-26 23:07:09 UTC (rev 31239)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryUnitTest.java 2010-01-27 08:18:19 UTC (rev 31240)
@@ -23,12 +23,9 @@
import static org.junit.Assert.assertEquals;
-import java.io.InputStream;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
-import java.util.Properties;
import javax.xml.registry.BulkResponse;
import javax.xml.registry.BusinessLifeCycleManager;
@@ -50,7 +47,6 @@
import org.jboss.soa.esb.addressing.EPR;
import org.jboss.soa.esb.services.registry.RegistryException;
import org.jboss.soa.esb.services.registry.ServiceNotFoundException;
-import org.jboss.soa.esb.testutils.HsqldbUtil;
import org.jboss.soa.esb.testutils.TestEnvironmentUtil;
import org.jboss.soa.esb.ConfigurationException;
@@ -67,7 +63,6 @@
public class JAXRRegistryUnitTest
{
private static Logger logger = Logger.getLogger(JAXRRegistryUnitTest.class);
- private static Object server;
/**
* Tests the successful creation of the RED HAT/JBossESB Organization.
*/
@@ -183,14 +178,8 @@
@BeforeClass
public static void runBeforeAllTests() throws Exception {
TestEnvironmentUtil.setESBPropertiesFileToUse();
- Properties props = getJuddiProperties();
- Class.forName(props.getProperty("juddi.jdbcDriver"));
-
- //Bring up hsql on default port 9001
- final String databaseFile = TestEnvironmentUtil.getUserDir() + "build/hsqltestdb";
- HsqldbUtil.dropHsqldb(databaseFile);
- server = HsqldbUtil.startHsqldb(databaseFile, "juddi");
+ TestEnvironmentUtil.startJAXRDatabase();
}
/**
@@ -199,22 +188,10 @@
*/
@AfterClass
public static void runAfterAllTests() throws Exception {
- HsqldbUtil.stopHsqldb(server);
+ TestEnvironmentUtil.startJAXRDatabase();
}
public static junit.framework.Test suite() {
return new JUnit4TestAdapter(JAXRRegistryUnitTest.class);
}
-
- private static Properties getJuddiProperties() throws IOException {
- //Set the juddi properties file in System so juddi will pick it up later and use the test values.
- String juddiPropertiesFile = "/org/jboss/soa/esb/services/registry/juddi-unittest.properties";
- System.setProperty("juddi.propertiesFile", juddiPropertiesFile);
- //Read this properties file to get the db connection string
- Properties props = new Properties();
- InputStream inStream = Class.class.getResourceAsStream(juddiPropertiesFile);
- props.load(inStream);
- return props;
- }
-
}
Modified: labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/ListenerManagerBaseTest.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/ListenerManagerBaseTest.java 2010-01-26 23:07:09 UTC (rev 31239)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/ListenerManagerBaseTest.java 2010-01-27 08:18:19 UTC (rev 31240)
@@ -22,10 +22,7 @@
package org.jboss.soa.esb.listeners;
-import java.io.InputStream;
-import java.io.IOException;
import java.util.LinkedList;
-import java.util.Properties;
import java.util.Queue;
import java.util.Random;
import java.util.concurrent.TimeUnit;
@@ -37,7 +34,6 @@
import org.jboss.soa.esb.common.tests.BaseTest;
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.testutils.HsqldbUtil;
import org.jboss.soa.esb.testutils.TestEnvironmentUtil;
public class ListenerManagerBaseTest extends BaseTest
@@ -132,19 +128,12 @@
protected void runBeforeAllTests() throws Exception {
TestEnvironmentUtil.setESBPropertiesFileToUse("product", "../product");
- Properties props = getJuddiProperties();
-
- Class.forName(props.getProperty("juddi.jdbcDriver"));
-
- //Bring up hsql on default port 9001
- final String databaseFile = TestEnvironmentUtil.getUserDir() + "build/hsqltestdb";
- HsqldbUtil.dropHsqldb(databaseFile);
- server = HsqldbUtil.startHsqldb(databaseFile, "juddi");
+ TestEnvironmentUtil.startJAXRDatabase();
}
protected final void runAfterAllTests() throws Exception
{
- HsqldbUtil.stopHsqldb(server);
+ TestEnvironmentUtil.stopJAXRDatabase();
}
protected static final String TMP_DIR = System
@@ -153,8 +142,6 @@
protected static Logger _logger = Logger
.getLogger(ListenerManagerBaseTest.class);
- private static Object server;
-
public static class MockMessageAwareAction
{
Random _rand = new Random(System.currentTimeMillis());
@@ -173,16 +160,4 @@
return message;
}
}
-
- private static Properties getJuddiProperties() throws IOException {
- // Set the juddi properties file in System so juddi will pick it up
- // later and use the test values.
- String juddiPropertiesFile = "/org/jboss/soa/esb/listeners/juddi-unittest.properties";
- System.setProperty("juddi.propertiesFile", juddiPropertiesFile);
- //Read this properties file to get the db connection string
- Properties props = new Properties();
- InputStream inStream = Class.class.getResourceAsStream(juddiPropertiesFile);
- props.load(inStream);
- return props;
- }
}
Modified: labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/gateway/GatewayListenerControllerBaseTest.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/gateway/GatewayListenerControllerBaseTest.java 2010-01-26 23:07:09 UTC (rev 31239)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/gateway/GatewayListenerControllerBaseTest.java 2010-01-27 08:18:19 UTC (rev 31240)
@@ -22,19 +22,12 @@
package org.jboss.soa.esb.listeners.gateway;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Properties;
-
import org.apache.log4j.Logger;
import org.jboss.soa.esb.common.tests.BaseTest;
-import org.jboss.soa.esb.testutils.HsqldbUtil;
import org.jboss.soa.esb.testutils.TestEnvironmentUtil;
public class GatewayListenerControllerBaseTest extends BaseTest
{
- private static Object server;
-
protected static final String TMP_DIR = System.getProperty("java.io.tmpdir");
protected static Logger _logger = Logger.getLogger(GatewayListenerControllerBaseTest.class);
@@ -43,31 +36,11 @@
{
TestEnvironmentUtil.setESBPropertiesFileToUse("product",
"../product");
- Properties props = getJuddiProperties();
-
- Class.forName(props.getProperty("juddi.jdbcDriver"));
-
- //Bring up hsql on default port 9001
- final String databaseFile = TestEnvironmentUtil.getUserDir() + "build/hsqltestdb";
- HsqldbUtil.dropHsqldb(databaseFile);
- server = HsqldbUtil.startHsqldb(databaseFile, "juddi");
+ TestEnvironmentUtil.startJAXRDatabase();
}
protected final void runAfterAllTests() throws Exception
{
- HsqldbUtil.stopHsqldb(server);
+ TestEnvironmentUtil.stopJAXRDatabase();
}
-
-
- private static Properties getJuddiProperties() throws IOException {
- // Set the juddi properties file in System so juddi will pick it up
- // later and use the test values.
- String juddiPropertiesFile = "/org/jboss/soa/esb/listeners/gateway/juddi-unittest.properties";
- System.setProperty("juddi.propertiesFile", juddiPropertiesFile);
- //Read this properties file to get the db connection string
- Properties props = new Properties();
- InputStream inStream = Class.class.getResourceAsStream(juddiPropertiesFile);
- props.load(inStream);
- return props;
- }
}
Deleted: labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/gateway/juddi-unittest.properties
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/gateway/juddi-unittest.properties 2010-01-26 23:07:09 UTC (rev 31239)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/gateway/juddi-unittest.properties 2010-01-27 08:18:19 UTC (rev 31240)
@@ -1,69 +0,0 @@
-# jUDDI Registry Properties (used by RegistryServer)
-# see http://www.juddi.org for more information
-
-# The UDDI Operator Name
-juddi.operatorName = jUDDI.org
-
-# The i18n locale default codes
-juddi.i18n.languageCode = en
-juddi.i18n.countryCode = US
-
-# The UDDI DiscoveryURL Prefix
-juddi.discoveryURL = http://localhost:8080/juddi/uddiget.jsp?
-
-# The UDDI Operator Contact Email Address
-juddi.operatorEmailAddress = admin at juddi.org
-
-# The maximum name size and maximum number
-# of name elements allows in several of the
-# FindXxxx and SaveXxxx UDDI functions.
-juddi.maxNameLength=255
-juddi.maxNameElementsAllowed=5
-
-# The maximum number of UDDI artifacts allowed
-# per publisher. A value of '-1' indicates any
-# number of artifacts is valid (These values can be
-# overridden at the individual publisher level).
-juddi.maxBusinessesPerPublisher=25
-juddi.maxServicesPerBusiness=20
-juddi.maxBindingsPerService=10
-juddi.maxTModelsPerPublisher=100
-
-# jUDDI Authentication module to use
-juddi.auth = org.apache.juddi.auth.DefaultAuthenticator
-
-# jUDDI DataStore module currently to use
-juddi.dataStore = org.apache.juddi.datastore.jdbc.JDBCDataStore
-
-# use a dataSource (if set to false a direct
-# jdbc connection will be used.
-juddi.isUseDataSource=false
-juddi.jdbcDriver=org.hsqldb.jdbcDriver
-juddi.jdbcUrl=jdbc:hsqldb:hsql://localhost/juddi
-juddi.jdbcUsername=sa
-juddi.jdbcPassword=
-# jUDDI DataSource to use
-juddi.dataSource=java:comp/env/jdbc/juddiDB
-
-# jUDDI UUIDGen implementation to use
-juddi.uuidgen = org.apache.juddi.uuidgen.DefaultUUIDGen
-
-# jUDDI Cryptor implementation to use
-juddi.cryptor = org.apache.juddi.cryptor.DefaultCryptor
-
-# jUDDI Validator to use
-juddi.validator=org.apache.juddi.validator.DefaultValidator
-
-# jUDDI Proxy Properties (used by RegistryProxy)
-juddi.proxy.adminURL = http://localhost:8080/juddi/admin
-juddi.proxy.inquiryURL = http://localhost:8080/juddi/inquiry
-juddi.proxy.publishURL = http://localhost:8080/juddi/publish
-juddi.proxy.transportClass = org.apache.juddi.proxy.AxisTransport
-juddi.proxy.securityProvider = com.sun.net.ssl.internal.ssl.Provider
-juddi.proxy.protocolHandler = com.sun.net.ssl.internal.www.protocol
-
-# JNDI settings (used by RMITransport)
-java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-java.naming.provider.url=jnp://localhost:1099
-java.naming.factory.url.pkgs=org.jboss.naming
-
Deleted: labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/juddi-unittest.properties
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/juddi-unittest.properties 2010-01-26 23:07:09 UTC (rev 31239)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/juddi-unittest.properties 2010-01-27 08:18:19 UTC (rev 31240)
@@ -1,69 +0,0 @@
-# jUDDI Registry Properties (used by RegistryServer)
-# see http://www.juddi.org for more information
-
-# The UDDI Operator Name
-juddi.operatorName = jUDDI.org
-
-# The i18n locale default codes
-juddi.i18n.languageCode = en
-juddi.i18n.countryCode = US
-
-# The UDDI DiscoveryURL Prefix
-juddi.discoveryURL = http://localhost:8080/juddi/uddiget.jsp?
-
-# The UDDI Operator Contact Email Address
-juddi.operatorEmailAddress = admin at juddi.org
-
-# The maximum name size and maximum number
-# of name elements allows in several of the
-# FindXxxx and SaveXxxx UDDI functions.
-juddi.maxNameLength=255
-juddi.maxNameElementsAllowed=5
-
-# The maximum number of UDDI artifacts allowed
-# per publisher. A value of '-1' indicates any
-# number of artifacts is valid (These values can be
-# overridden at the individual publisher level).
-juddi.maxBusinessesPerPublisher=25
-juddi.maxServicesPerBusiness=20
-juddi.maxBindingsPerService=10
-juddi.maxTModelsPerPublisher=100
-
-# jUDDI Authentication module to use
-juddi.auth = org.apache.juddi.auth.DefaultAuthenticator
-
-# jUDDI DataStore module currently to use
-juddi.dataStore = org.apache.juddi.datastore.jdbc.JDBCDataStore
-
-# use a dataSource (if set to false a direct
-# jdbc connection will be used.
-juddi.isUseDataSource=false
-juddi.jdbcDriver=org.hsqldb.jdbcDriver
-juddi.jdbcUrl=jdbc:hsqldb:hsql://localhost/juddi
-juddi.jdbcUsername=sa
-juddi.jdbcPassword=
-# jUDDI DataSource to use
-juddi.dataSource=java:comp/env/jdbc/juddiDB
-
-# jUDDI UUIDGen implementation to use
-juddi.uuidgen = org.apache.juddi.uuidgen.DefaultUUIDGen
-
-# jUDDI Cryptor implementation to use
-juddi.cryptor = org.apache.juddi.cryptor.DefaultCryptor
-
-# jUDDI Validator to use
-juddi.validator=org.apache.juddi.validator.DefaultValidator
-
-# jUDDI Proxy Properties (used by RegistryProxy)
-juddi.proxy.adminURL = http://localhost:8080/juddi/admin
-juddi.proxy.inquiryURL = http://localhost:8080/juddi/inquiry
-juddi.proxy.publishURL = http://localhost:8080/juddi/publish
-juddi.proxy.transportClass = org.apache.juddi.proxy.AxisTransport
-juddi.proxy.securityProvider = com.sun.net.ssl.internal.ssl.Provider
-juddi.proxy.protocolHandler = com.sun.net.ssl.internal.www.protocol
-
-# JNDI settings (used by RMITransport)
-java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-java.naming.provider.url=jnp://localhost:1099
-java.naming.factory.url.pkgs=org.jboss.naming
-
Modified: labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/services/registry/RegistryUnitTest.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/services/registry/RegistryUnitTest.java 2010-01-26 23:07:09 UTC (rev 31239)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/services/registry/RegistryUnitTest.java 2010-01-27 08:18:19 UTC (rev 31240)
@@ -24,18 +24,14 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
-import java.io.IOException;
-import java.io.InputStream;
import java.util.Collection;
import java.util.Iterator;
-import java.util.Properties;
import junit.framework.JUnit4TestAdapter;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.jboss.soa.esb.addressing.EPR;
-import org.jboss.soa.esb.testutils.HsqldbUtil;
import org.jboss.soa.esb.testutils.TestEnvironmentUtil;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -53,8 +49,6 @@
private static Logger logger = Logger.getLogger(RegistryUnitTest.class);
- private static Object server;
-
/**
* Testing the registering of an EPR.
*/
@@ -141,14 +135,7 @@
@BeforeClass
public static void runBeforeAllTests() throws Exception {
TestEnvironmentUtil.setESBPropertiesFileToUse();
- Properties props = getJuddiProperties();
-
- Class.forName(props.getProperty("juddi.jdbcDriver"));
-
- //Bring up hsql on default port 9001
- final String databaseFile = TestEnvironmentUtil.getUserDir() + "build/hsqltestdb";
- HsqldbUtil.dropHsqldb(databaseFile);
- server = HsqldbUtil.startHsqldb(databaseFile, "juddi");
+ TestEnvironmentUtil.startJAXRDatabase();
}
/**
* Shutdown the database
@@ -156,21 +143,10 @@
*/
@AfterClass
public static void runAfterAllTests() throws Exception {
- HsqldbUtil.stopHsqldb(server);
+ TestEnvironmentUtil.stopJAXRDatabase();
}
public static junit.framework.Test suite() {
return new JUnit4TestAdapter(RegistryUnitTest.class);
}
-
- private static Properties getJuddiProperties() throws IOException {
- //Set the juddi properties file in System so juddi will pick it up later and use the test values.
- String juddiPropertiesFile = "/org/jboss/soa/esb/services/registry/juddi-unittest.properties";
- System.setProperty("juddi.propertiesFile", juddiPropertiesFile);
- //Read this properties file to get the db connection string
- Properties props = new Properties();
- InputStream inStream = Class.class.getResourceAsStream(juddiPropertiesFile);
- props.load(inStream);
- return props;
- }
}
Deleted: labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/services/registry/juddi-unittest.properties
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/services/registry/juddi-unittest.properties 2010-01-26 23:07:09 UTC (rev 31239)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/services/registry/juddi-unittest.properties 2010-01-27 08:18:19 UTC (rev 31240)
@@ -1,75 +0,0 @@
-# jUDDI Registry Properties (used by RegistryServer)
-# see http://www.juddi.org for more information
-
-# The UDDI Operator Name
-juddi.operatorName = jUDDI.org
-
-# The i18n locale default codes
-juddi.i18n.languageCode = en
-juddi.i18n.countryCode = US
-
-# The UDDI DiscoveryURL Prefix
-juddi.discoveryURL = http://localhost:8080/juddi/uddiget.jsp?
-
-# The UDDI Operator Contact Email Address
-juddi.operatorEmailAddress = admin at juddi.org
-
-# The maximum name size and maximum number
-# of name elements allows in several of the
-# FindXxxx and SaveXxxx UDDI functions.
-juddi.maxNameLength=255
-juddi.maxNameElementsAllowed=5
-
-# The maximum number of UDDI artifacts allowed
-# per publisher. A value of '-1' indicates any
-# number of artifacts is valid (These values can be
-# overridden at the individual publisher level).
-juddi.maxBusinessesPerPublisher=25
-juddi.maxServicesPerBusiness=20
-juddi.maxBindingsPerService=10
-juddi.maxTModelsPerPublisher=100
-
-# jUDDI Authentication module to use
-juddi.auth = org.apache.juddi.auth.DefaultAuthenticator
-
-# jUDDI DataStore module currently to use
-juddi.dataStore = org.apache.juddi.datastore.jdbc.JDBCDataStore
-
-# use a dataSource (if set to false a direct
-# jdbc connection will be used.
-juddi.isUseDataSource=false
-juddi.jdbcDriver=org.hsqldb.jdbcDriver
-juddi.jdbcUrl=jdbc:hsqldb:hsql://localhost/juddi
-juddi.jdbcUsername=sa
-juddi.jdbcPassword=
-#For Mysql use:
-#juddi.jdbcDriver=com.mysql.jdbc.Driver
-#juddi.jdbcUrl=jdbc:mysql://localhost/juddi?allowMultiQueries=true
-#juddi.jdbcUsername=root
-#juddi.jdbcPassword=
-
-# jUDDI DataSource to use
-juddi.dataSource=java:comp/env/jdbc/juddiDB
-
-# jUDDI UUIDGen implementation to use
-juddi.uuidgen = org.apache.juddi.uuidgen.DefaultUUIDGen
-
-# jUDDI Cryptor implementation to use
-juddi.cryptor = org.apache.juddi.cryptor.DefaultCryptor
-
-# jUDDI Validator to use
-juddi.validator=org.apache.juddi.validator.DefaultValidator
-
-# jUDDI Proxy Properties (used by RegistryProxy)
-juddi.proxy.adminURL = http://localhost:8080/juddi/admin
-juddi.proxy.inquiryURL = http://localhost:8080/juddi/inquiry
-juddi.proxy.publishURL = http://localhost:8080/juddi/publish
-juddi.proxy.transportClass = org.apache.juddi.proxy.AxisTransport
-juddi.proxy.securityProvider = com.sun.net.ssl.internal.ssl.Provider
-juddi.proxy.protocolHandler = com.sun.net.ssl.internal.www.protocol
-
-# JNDI settings (used by RMITransport)
-java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-java.naming.provider.url=jnp://localhost:1099
-java.naming.factory.url.pkgs=org.jboss.naming
-
Modified: labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/testutils/TestEnvironmentUtil.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/testutils/TestEnvironmentUtil.java 2010-01-26 23:07:09 UTC (rev 31239)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/testutils/TestEnvironmentUtil.java 2010-01-27 08:18:19 UTC (rev 31240)
@@ -1,12 +1,10 @@
package org.jboss.soa.esb.testutils;
-import junit.framework.TestCase;
import org.apache.log4j.Logger;
import java.io.*;
import java.sql.SQLException;
-import java.util.Properties;
public class TestEnvironmentUtil
{
@@ -117,13 +115,7 @@
}
public static void startJAXRDatabase() throws SQLException {
- Properties props = getJuddiProperties();
-
- String mDbDriver = props.getProperty("juddi.jdbcDriver");
-
try {
- Class.forName(mDbDriver);
-
final String databaseFile = TestEnvironmentUtil.getProductDir() + "build/hsqltestdb";
HsqldbUtil.dropHsqldb(databaseFile);
server = HsqldbUtil.startHsqldb(databaseFile, "juddi");
@@ -165,19 +157,4 @@
public static void stopJAXRDatabase() throws Exception {
HsqldbUtil.stopHsqldb(server);
}
-
- private static Properties getJuddiProperties() {
- //Set the juddi properties file in System so juddi will pick it up later and use the test values.
- String juddiPropertiesFile = "/org/jboss/soa/esb/testutils/juddi-unittest.properties";
- System.setProperty("juddi.propertiesFile", juddiPropertiesFile);
- //Read this properties file to get the db connection string
- Properties props = new Properties();
- InputStream inStream = Class.class.getResourceAsStream(juddiPropertiesFile);
- try {
- props.load(inStream);
- } catch (IOException e) {
- TestCase.fail("Failed to load juddi properties.");
- }
- return props;
- }
}
Deleted: labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/testutils/juddi-unittest.properties
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/testutils/juddi-unittest.properties 2010-01-26 23:07:09 UTC (rev 31239)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/testutils/juddi-unittest.properties 2010-01-27 08:18:19 UTC (rev 31240)
@@ -1,75 +0,0 @@
-# jUDDI Registry Properties (used by RegistryServer)
-# see http://www.juddi.org for more information
-
-# The UDDI Operator Name
-juddi.operatorName = jUDDI.org
-
-# The i18n locale default codes
-juddi.i18n.languageCode = en
-juddi.i18n.countryCode = US
-
-# The UDDI DiscoveryURL Prefix
-juddi.discoveryURL = http://localhost:8080/juddi/uddiget.jsp?
-
-# The UDDI Operator Contact Email Address
-juddi.operatorEmailAddress = admin at juddi.org
-
-# The maximum name size and maximum number
-# of name elements allows in several of the
-# FindXxxx and SaveXxxx UDDI functions.
-juddi.maxNameLength=255
-juddi.maxNameElementsAllowed=5
-
-# The maximum number of UDDI artifacts allowed
-# per publisher. A value of '-1' indicates any
-# number of artifacts is valid (These values can be
-# overridden at the individual publisher level).
-juddi.maxBusinessesPerPublisher=25
-juddi.maxServicesPerBusiness=20
-juddi.maxBindingsPerService=10
-juddi.maxTModelsPerPublisher=100
-
-# jUDDI Authentication module to use
-juddi.auth = org.apache.juddi.auth.DefaultAuthenticator
-
-# jUDDI DataStore module currently to use
-juddi.dataStore = org.apache.juddi.datastore.jdbc.JDBCDataStore
-
-# use a dataSource (if set to false a direct
-# jdbc connection will be used.
-juddi.isUseDataSource=false
-juddi.jdbcDriver=org.hsqldb.jdbcDriver
-juddi.jdbcUrl=jdbc:hsqldb:hsql://localhost/juddi
-juddi.jdbcUsername=sa
-juddi.jdbcPassword=
-#For Mysql use:
-#juddi.jdbcDriver=com.mysql.jdbc.Driver
-#juddi.jdbcUrl=jdbc:mysql://localhost/juddi?allowMultiQueries=true
-#juddi.jdbcUsername=root
-#juddi.jdbcPassword=
-
-# jUDDI DataSource to use
-juddi.dataSource=java:comp/env/jdbc/juddiDB
-
-# jUDDI UUIDGen implementation to use
-juddi.uuidgen = org.apache.juddi.uuidgen.DefaultUUIDGen
-
-# jUDDI Cryptor implementation to use
-juddi.cryptor = org.apache.juddi.cryptor.DefaultCryptor
-
-# jUDDI Validator to use
-juddi.validator=org.apache.juddi.validator.DefaultValidator
-
-# jUDDI Proxy Properties (used by RegistryProxy)
-juddi.proxy.adminURL = http://localhost:8080/juddi/admin
-juddi.proxy.inquiryURL = http://localhost:8080/juddi/inquiry
-juddi.proxy.publishURL = http://localhost:8080/juddi/publish
-juddi.proxy.transportClass = org.apache.juddi.proxy.AxisTransport
-juddi.proxy.securityProvider = com.sun.net.ssl.internal.ssl.Provider
-juddi.proxy.protocolHandler = com.sun.net.ssl.internal.www.protocol
-
-# JNDI settings (used by RMITransport)
-java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-java.naming.provider.url=jnp://localhost:1099
-java.naming.factory.url.pkgs=org.jboss.naming
-
Modified: labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/conf/base-build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/conf/base-build.xml 2010-01-26 23:07:09 UTC (rev 31239)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/conf/base-build.xml 2010-01-27 08:18:19 UTC (rev 31240)
@@ -354,7 +354,6 @@
<pathelement location="${classes}" />
<pathelement location="${basedir}/src"/>
<pathelement location="${registry.dir}"/>
- <fileset dir="${org.jboss.esb.server.server}/deploy/jbossesb.sar" includes="rosetta.aop"/>
<fileset dir="${org.jboss.esb.server.server}/lib" includes="jboss-remoting.jar jboss-j2ee.jar jboss-messaging-client.jar" /> <!-- Required for JMS Client Code. -->
<fileset dir="${org.jboss.esb.server.server}/lib" includes="hibernate3.jar commons-collections.jar hsqldb.jar" /> <!-- Required for jbpm Client Code. -->
<fileset dir="${org.jboss.esb.server.server}/lib" includes="bsh.jar" /> <!-- Required for scripting Client Code. -->
@@ -384,7 +383,6 @@
<pathelement location="${classes}" />
<pathelement location="${basedir}/src" />
<pathelement location="${registry.dir}"/>
- <fileset dir="${org.jboss.esb.server.server}/deployers/esb.deployer" includes="rosetta.aop"/>
<fileset dir="${org.jboss.esb.server.home}/common/lib" includes="jboss-remoting.jar jboss-javaee.jar jboss-messaging-client.jar" /> <!-- Required for JMS Client Code. -->
<fileset dir="${org.jboss.esb.server.home}/client" includes="jboss-messaging-client.jar" /> <!-- Required for JMS Client Code. -->
<fileset dir="${org.jboss.esb.server.home}/common/lib" includes="hibernate-*.jar commons-collections.jar hsqldb.jar" /> <!-- Required for jbpm Client Code. -->
More information about the jboss-svn-commits
mailing list