You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by ks...@apache.org on 2010/01/24 23:58:28 UTC
svn commit: r902671 - in /webservices/juddi/trunk: juddi-tomcat/
qa/juddi-xlt/lib/ qa/juddi-xlt/src/ qa/juddi-xlt/src/META-INF/
qa/juddi-xlt/src/org/apache/juddi/xlt/util/
Author: kstam
Date: Sun Jan 24 22:58:28 2010
New Revision: 902671
URL: http://svn.apache.org/viewvc?rev=902671&view=rev
Log:
JUDDI-340 upgrading to 3.0.1 libs
Added:
webservices/juddi/trunk/qa/juddi-xlt/lib/juddi-client-3.0.1.SNAPSHOT.jar (with props)
webservices/juddi/trunk/qa/juddi-xlt/lib/uddi-tck-3.0.1.SNAPSHOT.jar (with props)
webservices/juddi/trunk/qa/juddi-xlt/lib/uddi-ws-3.0.1.SNAPSHOT.jar (with props)
webservices/juddi/trunk/qa/juddi-xlt/src/META-INF/
webservices/juddi/trunk/qa/juddi-xlt/src/META-INF/uddi.xml
Removed:
webservices/juddi/trunk/qa/juddi-xlt/lib/uddi-client-3.0.0.20090723.201033-6.jar
webservices/juddi/trunk/qa/juddi-xlt/lib/uddi-tck-3.0.0.beta.jar
webservices/juddi/trunk/qa/juddi-xlt/lib/uddi-ws-3.0.0.20090723.192310-12.jar
webservices/juddi/trunk/qa/juddi-xlt/src/uddi.properties
Modified:
webservices/juddi/trunk/juddi-tomcat/build.xml
webservices/juddi/trunk/qa/juddi-xlt/src/org/apache/juddi/xlt/util/JUDDIServiceProvider.java
Modified: webservices/juddi/trunk/juddi-tomcat/build.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-tomcat/build.xml?rev=902671&r1=902670&r2=902671&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-tomcat/build.xml (original)
+++ webservices/juddi/trunk/juddi-tomcat/build.xml Sun Jan 24 22:58:28 2010
@@ -12,11 +12,7 @@
<unzip dest="${webapps.dir}/juddiv3-samples" src="${dependency.juddiv3-samples.war}"/>
-->
- <chmod perm="ugo+x">
- <fileset dir="${basedir}/target/tomcat/apache-tomcat-${apache.tomcat.version}/bin">
- <include name="*.sh"/>
- </fileset>
- </chmod>
+
</target>
<target name="copy-resources" depends="unzip-tomcat">
@@ -46,6 +42,12 @@
-->
</target>
- <target name="package-tomcat" depends="copy-resources"/>
+ <target name="package-tomcat" depends="copy-resources">
+ <chmod perm="ugo+x">
+ <fileset dir="${basedir}/target/tomcat/apache-tomcat-${apache.tomcat.version}/bin">
+ <include name="*.sh"/>
+ </fileset>
+ </chmod>
+ </target>
</project>
Added: webservices/juddi/trunk/qa/juddi-xlt/lib/juddi-client-3.0.1.SNAPSHOT.jar
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/qa/juddi-xlt/lib/juddi-client-3.0.1.SNAPSHOT.jar?rev=902671&view=auto
==============================================================================
Binary file - no diff available.
Propchange: webservices/juddi/trunk/qa/juddi-xlt/lib/juddi-client-3.0.1.SNAPSHOT.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: webservices/juddi/trunk/qa/juddi-xlt/lib/uddi-tck-3.0.1.SNAPSHOT.jar
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/qa/juddi-xlt/lib/uddi-tck-3.0.1.SNAPSHOT.jar?rev=902671&view=auto
==============================================================================
Binary file - no diff available.
Propchange: webservices/juddi/trunk/qa/juddi-xlt/lib/uddi-tck-3.0.1.SNAPSHOT.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: webservices/juddi/trunk/qa/juddi-xlt/lib/uddi-ws-3.0.1.SNAPSHOT.jar
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/qa/juddi-xlt/lib/uddi-ws-3.0.1.SNAPSHOT.jar?rev=902671&view=auto
==============================================================================
Binary file - no diff available.
Propchange: webservices/juddi/trunk/qa/juddi-xlt/lib/uddi-ws-3.0.1.SNAPSHOT.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: webservices/juddi/trunk/qa/juddi-xlt/src/META-INF/uddi.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/qa/juddi-xlt/src/META-INF/uddi.xml?rev=902671&view=auto
==============================================================================
--- webservices/juddi/trunk/qa/juddi-xlt/src/META-INF/uddi.xml (added)
+++ webservices/juddi/trunk/qa/juddi-xlt/src/META-INF/uddi.xml Sun Jan 24 22:58:28 2010
@@ -0,0 +1,71 @@
+<?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="8080" />
+ </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>
+ <node>
+ <name>med</name>
+ <description>jUDDI node in other Department</description>
+ <proxyTransport>org.apache.juddi.v3.client.transport.JAXWSTransport</proxyTransport>
+ <custodyTransferUrl>http://med:8080/juddiv3/services/custody-transfer?wsdl</custodyTransferUrl>
+ <inquiryUrl>http://med:8080/juddiv3/services/inquiry?wsdl</inquiryUrl>
+ <publishUrl>http://med:8080/juddiv3/services/publish?wsdl</publishUrl>
+ <securityUrl>http://med:8080/juddiv3/services/security?wsdl</securityUrl>
+ <subscriptionUrl>http://med:8080/juddiv3/services/subscription?wsdl</subscriptionUrl>
+ <subscriptionListenerUrl>http://med:8080/juddiv3/services/subscription-listener?wsdl</subscriptionListenerUrl>
+ <juddiApiUrl>http://med:8080/juddiv3/services/juddi-api?wsdl</juddiApiUrl>
+ </node>
+ </nodes>
+
+ <clerks registerOnStartup="false">
+ <clerk name="default" node="default" publisher="root" password="root"/>
+ <clerk name="medroot" node="med" publisher="root" password="root"/>
+ <xregister>
+ <service bindingKey="uddi:juddi.apache.org:servicebindings-subscriptionlistener-ws" fromClerk="default" toClerk="medroot"/>
+ </xregister>
+ </clerks>
+
+ </manager>
+</uddi>
\ No newline at end of file
Modified: webservices/juddi/trunk/qa/juddi-xlt/src/org/apache/juddi/xlt/util/JUDDIServiceProvider.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/qa/juddi-xlt/src/org/apache/juddi/xlt/util/JUDDIServiceProvider.java?rev=902671&r1=902670&r2=902671&view=diff
==============================================================================
--- webservices/juddi/trunk/qa/juddi-xlt/src/org/apache/juddi/xlt/util/JUDDIServiceProvider.java (original)
+++ webservices/juddi/trunk/qa/juddi-xlt/src/org/apache/juddi/xlt/util/JUDDIServiceProvider.java Sun Jan 24 22:58:28 2010
@@ -23,11 +23,10 @@
import javax.xml.ws.handler.Handler;
import org.apache.commons.configuration.ConfigurationException;
+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.log4j.helpers.Loader;
-import org.uddi.api_v3.client.config.ClientConfig;
-import org.uddi.api_v3.client.config.Property;
-import org.uddi.api_v3.client.transport.Transport;
-import org.uddi.api_v3.client.transport.TransportException;
import org.uddi.v3_service.UDDIInquiryPortType;
import org.uddi.v3_service.UDDIPublicationPortType;
import org.uddi.v3_service.UDDISecurityPortType;
@@ -49,9 +48,8 @@
private JUDDIServiceProvider() {
try {
- String clazz = ClientConfig.getConfiguration().getString(
- Property.UDDI_PROXY_TRANSPORT,
- Property.DEFAULT_UDDI_PROXY_TRANSPORT);
+
+ String clazz = UDDIClientContainer.getDefaultTransportClass();
Class<?> transportClass = Loader.loadClass(clazz);
if (transportClass != null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: juddi-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: juddi-cvs-help@ws.apache.org