[jboss-svn-commits] JBL Code SVN: r29673 - in labs/jbossesb/workspace/tcunning/uddiv3/product: install/jUDDI-registryV3 and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Oct 19 20:18:01 EDT 2009
Author: tcunning
Date: 2009-10-19 20:18:01 -0400 (Mon, 19 Oct 2009)
New Revision: 29673
Added:
labs/jbossesb/workspace/tcunning/uddiv3/product/install/jUDDI-registryV3/uddi.xml
labs/jbossesb/workspace/tcunning/uddiv3/product/lib/ext/juddi-client-3.0.0.SNAPSHOT.jar
labs/jbossesb/workspace/tcunning/uddiv3/product/lib/ext/juddi-core-3.0.0.SNAPSHOT.jar
labs/jbossesb/workspace/tcunning/uddiv3/product/lib/ext/scout-1.2.jar
labs/jbossesb/workspace/tcunning/uddiv3/product/lib/ext/uddi-ws-3.0.0.SNAPSHOT.jar
Removed:
labs/jbossesb/workspace/tcunning/uddiv3/product/install/jUDDI-registryV3/uddi.properties
labs/jbossesb/workspace/tcunning/uddiv3/product/lib/ext/scout-1.2-SNAPSHOT.jar
Modified:
labs/jbossesb/workspace/tcunning/uddiv3/product/build-distr.xml
labs/jbossesb/workspace/tcunning/uddiv3/product/install/jUDDI-registryV3/juddiv3.properties
labs/jbossesb/workspace/tcunning/uddiv3/product/ivy.xml
labs/jbossesb/workspace/tcunning/uddiv3/product/rosetta/build.xml
labs/jbossesb/workspace/tcunning/uddiv3/product/rosetta/src/org/jboss/internal/soa/esb/services/registry/JAXRConnectionFactory.java
labs/jbossesb/workspace/tcunning/uddiv3/product/rosetta/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryImpl.java
Log:
Update with trunk to test out recent juddi trunk changes.
Modified: labs/jbossesb/workspace/tcunning/uddiv3/product/build-distr.xml
===================================================================
--- labs/jbossesb/workspace/tcunning/uddiv3/product/build-distr.xml 2009-10-19 17:32:04 UTC (rev 29672)
+++ labs/jbossesb/workspace/tcunning/uddiv3/product/build-distr.xml 2009-10-20 00:18:01 UTC (rev 29673)
@@ -107,18 +107,18 @@
<copy todir="${build.dir}/jbossesb.sar" overwrite="true">
<fileset dir="${installation.files.dir}/jUDDI-registryV3">
<include name="juddiv3.properties"/>
- <include name="uddi.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}"/>
- <unzip src="${lib.dir}/juddi-core-3.0.0.rc1.jar" dest="${juddi.jar.build.dir}"/>
+ <unzip src="${lib.ext.dir}/juddi-core-3.0.0.SNAPSHOT.jar" dest="${juddi.jar.build.dir}"/>
<copy overwrite="true" todir="${juddi.jar.build.dir}/juddi_install_data">
<fileset dir="${installation.files.dir}/jUDDI-registryV3/juddi_install_data">
<include name="UDDI*"/>
@@ -155,6 +155,10 @@
<mkdir dir="${build.dir}/jbossesb.sar/lib"/>
<copy todir="${build.dir}/jbossesb.sar/lib">
+ <fileset dir="${lib.ext.dir}">
+ <include name="juddi-client-*.jar"/>
+ <include name="uddi-ws-*.jar"/>
+ </fileset>
<fileset dir="${lib.ext.dir}" includes="jbossts-common.jar"/>
<fileset dir="${build.lib.dir}" includes="jbossesb*.jar"/>
<!-- We use AOP on scout to get around an issue, use the modified jar for now
Modified: labs/jbossesb/workspace/tcunning/uddiv3/product/install/jUDDI-registryV3/juddiv3.properties
===================================================================
--- labs/jbossesb/workspace/tcunning/uddiv3/product/install/jUDDI-registryV3/juddiv3.properties 2009-10-19 17:32:04 UTC (rev 29672)
+++ labs/jbossesb/workspace/tcunning/uddiv3/product/install/jUDDI-registryV3/juddiv3.properties 2009-10-20 00:18:01 UTC (rev 29673)
@@ -10,6 +10,8 @@
# System parameters.
juddi.server.name=localhost
juddi.server.port=8080
+
+juddi.root.publisher=root
#
# Name of the persistence unit to use (the default, "juddiDatabase" refers to the unit compiled into the juddi library)
juddi.persistenceunit.name=juddiDatabase
Deleted: labs/jbossesb/workspace/tcunning/uddiv3/product/install/jUDDI-registryV3/uddi.properties
===================================================================
--- labs/jbossesb/workspace/tcunning/uddiv3/product/install/jUDDI-registryV3/uddi.properties 2009-10-19 17:32:04 UTC (rev 29672)
+++ labs/jbossesb/workspace/tcunning/uddiv3/product/install/jUDDI-registryV3/uddi.properties 2009-10-20 00:18:01 UTC (rev 29673)
@@ -1,33 +0,0 @@
-#### JAXWS Transport #############################################################
-#uddi.proxy.transport =org.apache.juddi.v3.client.transport.JAXWSTransport
-#uddi.custody.transfer.url =http://localhost:8880/juddiv3/services/custody-transfer?wsdl
-#uddi.inquiry.url =http://localhost:8880/juddiv3/services/inquiry?wsdl
-#uddi.publish.url =http://localhost:8880/juddiv3/services/publish?wsdl
-#uddi.security.url =http://localhost:8880/juddiv3/services/security?wsdl
-#uddi.subscription.url =http://localhost:8880/juddiv3/services/subscription?wsdl
-#uddi.subscription.listener.url =http://localhost:8880/juddiv3/services/subscription-listener?wsdl
-#uddi.juddi.api.url =http://localhost:8880/juddiv3/services/juddi-api?wsdl
-
-#### InVM Transport ##############################################################
-uddi.proxy.transport =org.apache.juddi.v3.client.transport.InVMTransport
-uddi.custody.transfer.url =org.apache.juddi.api.impl.UDDICustodyTransferImpl
-uddi.inquiry.url =org.apache.juddi.api.impl.UDDIInquiryImpl
-uddi.publish.url =org.apache.juddi.api.impl.UDDIPublicationImpl
-uddi.security.url =org.apache.juddi.api.impl.UDDISecurityImpl
-uddi.subscription.url =org.apache.juddi.api.impl.UDDISubscriptionImpl
-uddi.subscription.listener.url =org.apache.juddi.api.impl.UDDISubscriptionListenerImpl
-uddi.juddi.api.url =org.apache.juddi.api.impl.JUDDIApiImpl
-
-#### RMI Transport ###############################################################
-#uddi.proxy.transport =org.apache.juddi.v3.client.transport.RMITransport
-#java.naming.factory.initial =org.jnp.interfaces.NamingContextFactory
-#java.naming.factory.url.pkgs =org.jboss.naming
-#java.naming.provider.url =jnp://localhost:1099
-#uddi.custody.transfer.url =/juddiv3/UDDICustodyTransferService
-#uddi.inquiry.url =/juddiv3/UDDIInquiryService
-#uddi.publish.url =/juddiv3/UDDIPublicationService
-#uddi.security.url =/juddiv3/UDDISecurityService
-#uddi.subscription.url =/juddiv3/UDDISubscriptionService
-#uddi.subscription.listener.url =/juddiv3/UDDISubscriptionListenerService
-#uddi.juddi.api.url =/juddiv3/JUDDIApiService
-
Added: labs/jbossesb/workspace/tcunning/uddiv3/product/install/jUDDI-registryV3/uddi.xml
===================================================================
--- labs/jbossesb/workspace/tcunning/uddiv3/product/install/jUDDI-registryV3/uddi.xml (rev 0)
+++ labs/jbossesb/workspace/tcunning/uddiv3/product/install/jUDDI-registryV3/uddi.xml 2009-10-20 00:18:01 UTC (rev 29673)
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+
+<uddi>
+ <reloadDelay>5000</reloadDelay>
+ <manager name="test-manager">
+ <nodes>
+ <node>
+ <!-- required 'default' node -->
+ <name>default</name>
+ <description>Main jUDDI node</description>
+ <properties>
+ <property name="serverName" value="localhost" />
+ <property name="serverPort" value="8880" />
+ </properties>
+ <!-- JAX-WS Transport
+ <proxyTransport>org.apache.juddi.v3.client.transport.JAXWSTransport</proxyTransport>
+ <custodyTransferUrl>http://${serverName}:${serverPort}/juddiv3/services/custody-transfer?wsdl</custodyTransferUrl>
+ <inquiryUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiry?wsdl</inquiryUrl>
+ <publishUrl>http://${serverName}:${serverPort}/juddiv3/services/publish?wsdl</publishUrl>
+ <securityUrl>http://${serverName}:${serverPort}/juddiv3/services/security?wsdl</securityUrl>
+ <subscriptionUrl>http://${serverName}:${serverPort}/juddiv3/services/subscription?wsdl</subscriptionUrl>
+ <subscriptionListenerUrl>http://${serverName}:${serverPort}/juddiv3/services/subscription-listener?wsdl</subscriptionListenerUrl>
+ <juddiApiUrl>http://${serverName}:${serverPort}/juddiv3/services/juddi-api?wsdl</juddiApiUrl>
+ -->
+ <!-- In VM Transport Settings -->
+ <proxyTransport>org.apache.juddi.v3.client.transport.InVMTransport</proxyTransport>
+ <custodyTransferUrl>org.apache.juddi.api.impl.UDDICustodyTransferImpl</custodyTransferUrl>
+ <inquiryUrl>org.apache.juddi.api.impl.UDDIInquiryImpl</inquiryUrl>
+ <publishUrl>org.apache.juddi.api.impl.UDDIPublicationImpl</publishUrl>
+ <securityUrl>org.apache.juddi.api.impl.UDDISecurityImpl</securityUrl>
+ <subscriptionUrl>org.apache.juddi.api.impl.UDDISubscriptionImpl</subscriptionUrl>
+ <subscriptionListenerUrl>org.apache.juddi.api.impl.UDDISubscriptionListenerImpl</subscriptionListenerUrl>
+ <juddiApiUrl>org.apache.juddi.api.impl.JUDDIApiImpl</juddiApiUrl>
+ <!-- RMI Transport Settings
+ <proxyTransport>org.apache.juddi.v3.client.transport.RMITransport</proxyTransport>
+ <custodyTransferUrl>/juddiv3/UDDICustodyTransferService</custodyTransferUrl>
+ <inquiryUrl>/juddiv3/UDDIInquiryService</inquiryUrl>
+ <publishUrl>/juddiv3/UDDIPublicationService</publishUrl>
+ <securityUrl>/juddiv3/UDDISecurityService</securityUrl>
+ <subscriptionUrl>/juddiv3/UDDISubscriptionService</subscriptionUrl>
+ <subscriptionListenerUrl>/juddiv3/UDDISubscriptionListenerService</subscriptionListenerUrl>
+ <juddiApiUrl>/juddiv3/JUDDIApiService</juddiApiUrl>
+ <javaNamingFactoryInitial>org.jnp.interfaces.NamingContextFactory</javaNamingFactoryInitial>
+ <javaNamingFactoryUrlPkgs>org.jboss.naming</javaNamingFactoryUrlPkgs>
+ <javaNamingProviderUrl>jnp://localhost:1099</javaNamingProviderUrl>
+ -->
+ </node>
+ </nodes>
+ </manager>
+</uddi>
Modified: labs/jbossesb/workspace/tcunning/uddiv3/product/ivy.xml
===================================================================
--- labs/jbossesb/workspace/tcunning/uddiv3/product/ivy.xml 2009-10-19 17:32:04 UTC (rev 29672)
+++ labs/jbossesb/workspace/tcunning/uddiv3/product/ivy.xml 2009-10-20 00:18:01 UTC (rev 29673)
@@ -14,10 +14,11 @@
<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.rc1"/>
<dependency org="org.apache.juddi" name="uddi-client" rev="3.0.0.rc1"/>
<dependency org="org.apache.juddi" name="juddi-core" rev="3.0.0.rc1"/>
-
+ -->
<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"/>
Added: labs/jbossesb/workspace/tcunning/uddiv3/product/lib/ext/juddi-client-3.0.0.SNAPSHOT.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossesb/workspace/tcunning/uddiv3/product/lib/ext/juddi-client-3.0.0.SNAPSHOT.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossesb/workspace/tcunning/uddiv3/product/lib/ext/juddi-core-3.0.0.SNAPSHOT.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossesb/workspace/tcunning/uddiv3/product/lib/ext/juddi-core-3.0.0.SNAPSHOT.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: labs/jbossesb/workspace/tcunning/uddiv3/product/lib/ext/scout-1.2-SNAPSHOT.jar
===================================================================
(Binary files differ)
Added: labs/jbossesb/workspace/tcunning/uddiv3/product/lib/ext/scout-1.2.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossesb/workspace/tcunning/uddiv3/product/lib/ext/scout-1.2.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossesb/workspace/tcunning/uddiv3/product/lib/ext/uddi-ws-3.0.0.SNAPSHOT.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossesb/workspace/tcunning/uddiv3/product/lib/ext/uddi-ws-3.0.0.SNAPSHOT.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: labs/jbossesb/workspace/tcunning/uddiv3/product/rosetta/build.xml
===================================================================
--- labs/jbossesb/workspace/tcunning/uddiv3/product/rosetta/build.xml 2009-10-19 17:32:04 UTC (rev 29672)
+++ labs/jbossesb/workspace/tcunning/uddiv3/product/rosetta/build.xml 2009-10-20 00:18:01 UTC (rev 29673)
@@ -224,7 +224,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.ext.lib.dir}/scout-1.2-SNAPSHOT.jar" dest="${org.jboss.esb.rosetta.aopc.scout.classes.dir}"/>
+ <unzip src="${org.jboss.esb.ext.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">
Modified: labs/jbossesb/workspace/tcunning/uddiv3/product/rosetta/src/org/jboss/internal/soa/esb/services/registry/JAXRConnectionFactory.java
===================================================================
--- labs/jbossesb/workspace/tcunning/uddiv3/product/rosetta/src/org/jboss/internal/soa/esb/services/registry/JAXRConnectionFactory.java 2009-10-19 17:32:04 UTC (rev 29672)
+++ labs/jbossesb/workspace/tcunning/uddiv3/product/rosetta/src/org/jboss/internal/soa/esb/services/registry/JAXRConnectionFactory.java 2009-10-20 00:18:01 UTC (rev 29673)
@@ -128,6 +128,8 @@
}
} catch (JAXRException je) {
logger.log(Level.ERROR, je.getMessage(), je);
+ } finally {
+ connection = null;
}
}
}
Modified: labs/jbossesb/workspace/tcunning/uddiv3/product/rosetta/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryImpl.java
===================================================================
--- labs/jbossesb/workspace/tcunning/uddiv3/product/rosetta/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryImpl.java 2009-10-19 17:32:04 UTC (rev 29672)
+++ labs/jbossesb/workspace/tcunning/uddiv3/product/rosetta/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryImpl.java 2009-10-20 00:18:01 UTC (rev 29673)
@@ -150,7 +150,7 @@
try {
jbossTModel = getJBossESBTModel(jaxrConnectionFactory);
} catch (JAXRException je) {
- throw new RegistryException();
+ throw new RegistryException();
}
}
More information about the jboss-svn-commits
mailing list