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 2009/10/18 04:55:06 UTC

svn commit: r826352 - in /webservices/juddi/trunk: docs/ juddi-client/src/main/java/org/apache/juddi/v3/client/config/ juddiv3-samples/src/main/resources/META-INF/ juddiv3-samples/src/main/webapp/META-INF/ juddiv3-samples/src/main/webapp/WEB-INF/

Author: kstam
Date: Sun Oct 18 02:55:06 2009
New Revision: 826352

URL: http://svn.apache.org/viewvc?rev=826352&view=rev
Log:
JUDDI-240 working on the subscription example

Added:
    webservices/juddi/trunk/juddiv3-samples/src/main/webapp/META-INF/
    webservices/juddi/trunk/juddiv3-samples/src/main/webapp/META-INF/context.xml
Modified:
    webservices/juddi/trunk/docs/jUDDI-UserGuide.odt
    webservices/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/ClientConfig.java
    webservices/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerk.java
    webservices/juddi/trunk/juddiv3-samples/src/main/resources/META-INF/uddi.xml
    webservices/juddi/trunk/juddiv3-samples/src/main/webapp/WEB-INF/web.xml

Modified: webservices/juddi/trunk/docs/jUDDI-UserGuide.odt
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/docs/jUDDI-UserGuide.odt?rev=826352&r1=826351&r2=826352&view=diff
==============================================================================
Binary files - no diff available.

Modified: webservices/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/ClientConfig.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/ClientConfig.java?rev=826352&r1=826351&r2=826352&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/ClientConfig.java (original)
+++ webservices/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/ClientConfig.java Sun Oct 18 02:55:06 2009
@@ -151,9 +151,6 @@
 			uddiNode.setFactoryNamingProvider(  TokenResolver.replaceTokens(config.getString("manager.nodes.node(" + i +").javaNamingProviderUrl"),properties));
 			nodes.put(nodeName,uddiNode);
 		}
-		if (!nodes.containsKey("default")) {
-			throw new ConfigurationException("Required node named 'default' is not found.");
-		}
 		return nodes;
 	}
 	/*

Modified: webservices/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerk.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerk.java?rev=826352&r1=826351&r2=826352&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerk.java (original)
+++ webservices/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerk.java Sun Oct 18 02:55:06 2009
@@ -73,7 +73,8 @@
 	public BusinessService register(BusinessService service) {
 		
 		BusinessService businessService=null;
-		log.info("Registering service " + service);
+		log.info("Registering service " + service.getName().get(0).getValue()
+				+ " with key " + service.getServiceKey());
 		try {
 			String authToken = getAuthToken();
 			SaveService saveService = new SaveService();
@@ -88,7 +89,7 @@
 			log.error("Unable to register service " + service.getName().get(0).getValue()
 					+ " ." + t.getMessage(),t);
 		}
-		log.info("Registering service " + service + " completed.");
+		log.info("Registering service " + service.getName().get(0).getValue() + " completed.");
 		return businessService;
 	}
 	/**

Modified: webservices/juddi/trunk/juddiv3-samples/src/main/resources/META-INF/uddi.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddiv3-samples/src/main/resources/META-INF/uddi.xml?rev=826352&r1=826351&r2=826352&view=diff
==============================================================================
--- webservices/juddi/trunk/juddiv3-samples/src/main/resources/META-INF/uddi.xml (original)
+++ webservices/juddi/trunk/juddiv3-samples/src/main/resources/META-INF/uddi.xml Sun Oct 18 02:55:06 2009
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
-
 <uddi>
     <reloadDelay>5000</reloadDelay>
     <manager name="example-manager">
 		<nodes>
 			<node>
 				<name>default</name>
-				<description>Main jUDDI node</description>  
+				<description>Sales jUDDI node</description>  
 				<properties>
-					<property name="serverName"  value="localhost"/>
+					<property name="serverName"  value="sales"/>
 					<property name="serverPort"  value="8080"/>
-					<property name="keyDomain"   value="juddi.apache.org"/>
-					<property name="department"  value="businesses" />
+					<property name="keyDomain"   value="sales.apache.org"/>
+					<property name="department"  value="sales" />
 				</properties>
                 <proxyTransport>org.apache.juddi.v3.client.transport.InVMTransport</proxyTransport>
                 <custodyTransferUrl>org.apache.juddi.api.impl.UDDICustodyTransferImpl</custodyTransferUrl>
@@ -24,16 +23,10 @@
 			</node>
 		</nodes>
 		<clerks registerOnStartup="true">
-		   <clerk name="default" node="default" publisher="root" password="root">
-		       <class>org.apache.juddi.samples.HelloWorldImpl</class>
-		   </clerk>
-		   <!--  
-	       <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>
+           <clerk name="BobCratchit" node="default" publisher="sales" password="sales">
+                <class>org.apache.juddi.samples.HelloWorldImpl</class>
+           </clerk>
+        </clerks>
 	</manager>
-   
+	
 </uddi>
\ No newline at end of file

Added: webservices/juddi/trunk/juddiv3-samples/src/main/webapp/META-INF/context.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddiv3-samples/src/main/webapp/META-INF/context.xml?rev=826352&view=auto
==============================================================================
--- webservices/juddi/trunk/juddiv3-samples/src/main/webapp/META-INF/context.xml (added)
+++ webservices/juddi/trunk/juddiv3-samples/src/main/webapp/META-INF/context.xml Sun Oct 18 02:55:06 2009
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<Context>
+    <WatchedResource>WEB-INF/web.xml</WatchedResource>
+    <!--  -->
+    <Resource name="jdbc/JuddiDS" auth="Container"
+            type="javax.sql.DataSource" username="" password=""
+            driverClassName="org.apache.derby.jdbc.EmbeddedDriver" 
+            url="jdbc:derby:target/juddi-derby-test-db;create=true"
+            maxActive="8" 
+            />
+    
+    <!-- mysql 
+    <Resource name="jdbc/JuddiDS" auth="Container"
+            type="javax.sql.DataSource" username="root" password=""
+            driverClassName="com.mysql.jdbc.Driver" 
+            url="jdbc:mysql://localhost:3306/juddiv3"
+            maxActive="8" 
+            />
+        -->    
+</Context>
+

Modified: webservices/juddi/trunk/juddiv3-samples/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddiv3-samples/src/main/webapp/WEB-INF/web.xml?rev=826352&r1=826351&r2=826352&view=diff
==============================================================================
--- webservices/juddi/trunk/juddiv3-samples/src/main/webapp/WEB-INF/web.xml (original)
+++ webservices/juddi/trunk/juddiv3-samples/src/main/webapp/WEB-INF/web.xml Sun Oct 18 02:55:06 2009
@@ -61,6 +61,14 @@
     </servlet-class>
     <load-on-startup>1</load-on-startup>
    
+    <resource-ref>
+	  <description>jUDDI DataSource</description>
+	  <res-ref-name>jdbc/juddiDB</res-ref-name>
+	  <res-type>javax.sql.DataSource</res-type>
+      <res-auth>Container</res-auth>
+	  u<res-sharing-scope>Shareable</res-sharing-scope>
+	</resource-ref>
+  
   </servlet>
    
 </web-app>



---------------------------------------------------------------------
To unsubscribe, e-mail: juddi-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: juddi-cvs-help@ws.apache.org