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/09/25 02:38:32 UTC
svn commit: r818678 - in /webservices/juddi/trunk: docs/
juddi-core/src/main/java/org/apache/juddi/
uddi-client/src/main/java/org/apache/juddi/v3/annotations/
uddi-client/src/main/java/org/apache/juddi/v3/client/
uddi-client/src/main/java/org/apache/ju...
Author: kstam
Date: Fri Sep 25 00:38:30 2009
New Revision: 818678
URL: http://svn.apache.org/viewvc?rev=818678&view=rev
Log:
JUDDI-204, switching to uddi.xml client config file.
Added:
webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/annotations/
webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/annotations/AnnotationProcessor.java
webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/annotations/UDDIOverviewDoc.java
webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/annotations/UDDIService.java
webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/annotations/UDDIServiceBinding.java
webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/annotations/UDDITModelInstance.java
webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/UDDIClient.java
webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/UDDIClientServlet.java
webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerk.java
webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDINode.java
webservices/juddi/trunk/uddi-client/src/main/resources/
webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDIClientTest.java
webservices/juddi/trunk/uddi-client/src/test/resources/META-INF/
webservices/juddi/trunk/uddi-client/src/test/resources/META-INF/uddi.xml
Removed:
webservices/juddi/trunk/uddi-client/src/test/resources/uddi.properties
webservices/juddi/trunk/uddi-tck/src/main/java/org/uddi/api_v3/
Modified:
webservices/juddi/trunk/docs/jUDDI-UserGuide.odt
webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/Registry.java
webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/config/ClientConfig.java
webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/config/Constants.java
webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/config/Property.java
webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/transport/InVMTransport.java
webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/transport/JAXWSTransport.java
webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/transport/RMITransport.java
webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/UDDIInquiryService.java
webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/UDDIPublicationService.java
webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/UDDISecurityService.java
webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/JUDDI_010_PublisherIntegrationTest.java
webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_010_PublisherIntegrationTest.java
webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_020_TmodelIntegrationTest.java
webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_030_BusinessEntityIntegrationTest.java
webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_040_BusinessServiceIntegrationTest.java
webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_050_BindingTemplateIntegrationTest.java
webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_060_PublisherAssertionIntegrationTest.java
webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_070_FindEntityIntegrationTest.java
webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_080_SubscriptionIntegrationTest.java
webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_090_SubscriptionListenerIntegrationTest.java
webservices/juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/jaxb/JAXBMarshaller.java
Modified: webservices/juddi/trunk/docs/jUDDI-UserGuide.odt
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/docs/jUDDI-UserGuide.odt?rev=818678&r1=818677&r2=818678&view=diff
==============================================================================
Binary files - no diff available.
Modified: webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/Registry.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/Registry.java?rev=818678&r1=818677&r2=818678&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/Registry.java (original)
+++ webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/Registry.java Fri Sep 25 00:38:30 2009
@@ -24,7 +24,7 @@
* Stops the registry.
* @throws ConfigurationException
*/
- public static void stop() throws ConfigurationException {
+ public synchronized static void stop() throws ConfigurationException {
if (registry!=null) {
log.info("Stopping jUDDI registry...");
if (subscriptionNotifier!=null) {
@@ -49,7 +49,7 @@
* @throws ConfigurationException
* @throws
*/
- public static Registry start() throws ConfigurationException {
+ public synchronized static Registry start() throws ConfigurationException {
if (registry==null) {
log.info("Starting jUDDI registry...");
registry = new Registry();
Added: webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/annotations/AnnotationProcessor.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/annotations/AnnotationProcessor.java?rev=818678&view=auto
==============================================================================
--- webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/annotations/AnnotationProcessor.java (added)
+++ webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/annotations/AnnotationProcessor.java Fri Sep 25 00:38:30 2009
@@ -0,0 +1,50 @@
+package org.apache.juddi.v3.annotations;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import javax.jws.WebService;
+
+//import org.apache.log4j.Logger;
+import org.uddi.api_v3.BusinessService;
+import org.uddi.api_v3.Name;
+
+public class AnnotationProcessor {
+
+ //private Logger log = Logger.getLogger(AnnotationProcessor.class);
+
+ public Collection<BusinessService> readServiceAnnotations(String[] classesWithAnnotations) {
+ Collection<BusinessService> services = new ArrayList<BusinessService>();
+ try {
+ for (String className : classesWithAnnotations) {
+ Class<?> clazz = Thread.currentThread().getContextClassLoader().loadClass(className);
+ UDDIService uddiService= (UDDIService) clazz.getAnnotation(UDDIService.class);
+ if (uddiService!=null) {
+ BusinessService service = new BusinessService();
+ WebService webServiceAnnotation = (WebService) clazz.getAnnotation(WebService.class);
+ if (webServiceAnnotation!=null) {
+ Name name = new Name();
+ name.setLang("en"); //default to english
+ name.setValue(webServiceAnnotation.name());
+ service.getName().add(name);
+
+
+ String kurt1= webServiceAnnotation.wsdlLocation();
+ System.out.println(kurt1);
+ String kurt2=webServiceAnnotation.endpointInterface();
+ System.out.println(kurt2);
+ String kurt3=webServiceAnnotation.portName();
+ System.out.println(kurt3);
+ System.out.println(webServiceAnnotation.serviceName());
+ String description = uddiService.description();
+ System.out.println(description);
+ }
+ services.add(service);
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return services;
+ }
+}
Added: webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/annotations/UDDIOverviewDoc.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/annotations/UDDIOverviewDoc.java?rev=818678&view=auto
==============================================================================
--- webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/annotations/UDDIOverviewDoc.java (added)
+++ webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/annotations/UDDIOverviewDoc.java Fri Sep 25 00:38:30 2009
@@ -0,0 +1,26 @@
+package org.apache.juddi.v3.annotations;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+/**
+ * The overviewDoc is a mandatory repeating element, used to house references to remote
+ * descriptive information or instructions related to the use of a particular tModel and its
+ * instanceParms. Multiple overviewDoc elements are useful, for example, to handle alternative
+ * representations of the documentation.
+ */
+@Retention(RetentionPolicy.RUNTIME)
+public @interface UDDIOverviewDoc {
+
+ /** The tModelInstance Key */
+ public String tModelInstanceKey();
+ /** The description is a mandatory repeating element. Each description, optionally qualified by
+ * an lang attribute, holds a short descriptive overview of how a particular tModel is to be used. */
+ public String description();
+ /** Language code i.e.: en, fr, nl. */
+ public String lang() default "en";
+ /** The optional overviewURL is to be used to hold a URL that refers to a long form of an
+ * overview document that covers the way a particular tModel is used as a component of an
+ * overall Web service description. */
+ public String overviewURL();
+
+}
Added: webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/annotations/UDDIService.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/annotations/UDDIService.java?rev=818678&view=auto
==============================================================================
--- webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/annotations/UDDIService.java (added)
+++ webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/annotations/UDDIService.java Fri Sep 25 00:38:30 2009
@@ -0,0 +1,19 @@
+package org.apache.juddi.v3.annotations;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+@Retention(RetentionPolicy.RUNTIME)
+public @interface UDDIService {
+
+ /** Name of the Service, this can be omitted if one is specified in a WebService annotation */
+ public String serviceName() default "";
+ /** Description of the Service */
+ public String description();
+ /** Unique key of this service */
+ public String serviceKey();
+ /** Unique key of the business to which this Service belongs. */
+ public String businessKey() default "";
+ /** Language code i.e.: en, fr, nl. */
+ public String lang() default "en";
+}
Added: webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/annotations/UDDIServiceBinding.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/annotations/UDDIServiceBinding.java?rev=818678&view=auto
==============================================================================
--- webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/annotations/UDDIServiceBinding.java (added)
+++ webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/annotations/UDDIServiceBinding.java Fri Sep 25 00:38:30 2009
@@ -0,0 +1,20 @@
+package org.apache.juddi.v3.annotations;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+@Retention(RetentionPolicy.RUNTIME)
+public @interface UDDIServiceBinding {
+
+ /** name which can be referenced by TModelInstanceRegistration, this key is not send
+ * down to the UDDI Registry. */
+ public String serviceBindingKey() default "";
+ /** Description of the ServiceBinding. */
+ public String description();
+ /** AccessPoint Type, which could be one of endPoint, wsdlDeployment, bindingTemplate, hostingDirector */
+ public String accessPointType() default "wsdlDeployment";
+ /** The URL of the accessPoint. */
+ public String accessPoint();
+ /** Language code i.e.: en, fr, nl. */
+ public String lang() default "en";
+}
Added: webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/annotations/UDDITModelInstance.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/annotations/UDDITModelInstance.java?rev=818678&view=auto
==============================================================================
--- webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/annotations/UDDITModelInstance.java (added)
+++ webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/annotations/UDDITModelInstance.java Fri Sep 25 00:38:30 2009
@@ -0,0 +1,24 @@
+package org.apache.juddi.v3.annotations;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+@Retention(RetentionPolicy.RUNTIME)
+public @interface UDDITModelInstance {
+
+ /** The tModelInstance Key */
+ public String tModelInstanceKey();
+ /** Reference to ServiceBinding Key to which this tModelInstance belongs. */
+ public String serviceBindingKey();
+ /** Description of the tModelInstanceInfo */
+ public String description() default "";
+ /** tModelKey reference to a specification with which the Service represented by the containing bindingTemplate complies */
+ public String tModelKey();
+ /** Language code i.e.: en, fr, nl. */
+ public String lang() default "en";
+ /** The instanceParms is an optional element of type string, used to locally contain settings or
+ parameters related to the proper use of a tModelInstanceInfo. The suggested format is a
+ namespace-qualified XML document so that the settings or parameters can be found in the
+ XML documents elements and attributes. */
+ public String instanceParams() default "";
+}
Added: webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/UDDIClient.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/UDDIClient.java?rev=818678&view=auto
==============================================================================
--- webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/UDDIClient.java (added)
+++ webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/UDDIClient.java Fri Sep 25 00:38:30 2009
@@ -0,0 +1,66 @@
+package org.apache.juddi.v3.client;
+
+import java.util.Collection;
+import java.util.Set;
+
+import org.apache.commons.configuration.ConfigurationException;
+import org.apache.juddi.v3.annotations.AnnotationProcessor;
+import org.apache.juddi.v3.client.config.ClientConfig;
+import org.apache.juddi.v3.client.config.UDDIClerk;
+import org.apache.log4j.Logger;
+import org.uddi.api_v3.BusinessService;
+
+public class UDDIClient {
+
+ private static UDDIClient client = null;
+ private static Logger log = Logger.getLogger(UDDIClient.class);
+ private static ClientConfig clientConfig = null;
+
+ /**
+ * Singleton.
+ * @throws ConfigurationException
+ */
+ private UDDIClient() throws ConfigurationException {
+ super();
+ clientConfig = ClientConfig.getInstance();
+ }
+ /**
+ * Stops the client.
+ * @throws ConfigurationException
+ */
+ public synchronized static void stop() throws ConfigurationException {
+ if (client!=null) {
+ log.info("Stopping UDDI-client...");
+ //new AnnotationProcessor(clientConfig.getClerks()).unRegister();
+ client=null;
+ log.info("UDDI-client shutdown completed.");
+ }
+ }
+ /**
+ * Initializes the UDDI client.
+ * @return
+ * @throws ConfigurationException
+ * @throws
+ */
+ public synchronized static UDDIClient start() throws ConfigurationException {
+ if (client==null) {
+ log.info("Starting UDDI-client...");
+ client = new UDDIClient();
+ Set<UDDIClerk> clerks = clientConfig.getClerks();
+ AnnotationProcessor ap = new AnnotationProcessor();
+ for (UDDIClerk clerk : clerks) {
+ Collection<BusinessService> services = ap.readServiceAnnotations(clerk.getClassWithAnnotations());
+ clerk.register(services);
+ }
+
+ log.info("UDDI client started succesfully.");
+ }
+ return client;
+ }
+
+ public ClientConfig getClientConfig() {
+ return clientConfig;
+ }
+
+}
+
Added: webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/UDDIClientServlet.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/UDDIClientServlet.java?rev=818678&view=auto
==============================================================================
--- webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/UDDIClientServlet.java (added)
+++ webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/UDDIClientServlet.java Fri Sep 25 00:38:30 2009
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.juddi.v3.client;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+
+import org.apache.commons.configuration.ConfigurationException;
+import org.apache.log4j.Logger;
+
+/**
+ * This servlet is to initialize the UDDIclient on deployment and
+ * cleanup on shutdown.
+ *
+ * @author Kurt Stam (kstam@apache.org)
+ */
+public class UDDIClientServlet extends HttpServlet {
+ private static final long serialVersionUID = 1L;
+ private static Logger logger = Logger.getLogger(UDDIClientServlet.class);
+
+ /**
+ * Create the shared instance of jUDDI's Registry class and call it's
+ * "init()" method to initialize all core components.
+ */
+ @Override
+ public void init(ServletConfig config) throws ServletException {
+ super.init(config);
+ try {
+ UDDIClient.start();
+ } catch (ConfigurationException e) {
+ logger.error("UDDI-client could not be started."
+ + e.getMessage(), e);
+ }
+ }
+
+ @Override
+ public void destroy() {
+ try {
+ UDDIClient.stop();
+ } catch (ConfigurationException e) {
+ logger.error("UDDI client could not be stopped."
+ + e.getMessage(), e);
+ }
+ super.destroy();
+ }
+
+}
\ No newline at end of file
Modified: webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/config/ClientConfig.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/config/ClientConfig.java?rev=818678&r1=818677&r2=818678&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/config/ClientConfig.java (original)
+++ webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/config/ClientConfig.java Fri Sep 25 00:38:30 2009
@@ -16,11 +16,16 @@
*/
package org.apache.juddi.v3.client.config;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
import org.apache.commons.configuration.CompositeConfiguration;
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationException;
-import org.apache.commons.configuration.PropertiesConfiguration;
import org.apache.commons.configuration.SystemConfiguration;
+import org.apache.commons.configuration.XMLConfiguration;
import org.apache.commons.configuration.reloading.FileChangedReloadingStrategy;
import org.apache.log4j.Logger;
@@ -32,10 +37,12 @@
*/
public class ClientConfig
{
- private final static String UDDI_PROPERTIES = "uddi.properties";
- private Logger log = Logger.getLogger(ClientConfig.class);
+ private final static String UDDI_CONFIG = "META-INF/uddi.xml";
+ private static Logger log = Logger.getLogger(ClientConfig.class);
private Configuration config;
private static ClientConfig instance=null;
+ private Map<String,UDDINode> nodes = null;
+ private Set<UDDIClerk> clerks = null;
/**
* Constructor (note Singleton pattern).
@@ -51,41 +58,42 @@
* file is updated the file will be reloaded. By default the reloadDelay is
* set to 1 second to prevent excessive date stamp checking.
*/
- private void loadConfiguration() throws ConfigurationException
- {
+ private synchronized void loadConfiguration() throws ConfigurationException {
//Properties from system properties
CompositeConfiguration compositeConfig = new CompositeConfiguration();
compositeConfig.addConfiguration(new SystemConfiguration());
- //Properties from file
- PropertiesConfiguration propConfig = new PropertiesConfiguration(UDDI_PROPERTIES);
-
- long refreshDelay = propConfig.getLong(Property.UDDI_CONFIGURATION_RELOAD_DELAY, 1000l);
+ //Properties from XML file
+ XMLConfiguration xmlConfig = new XMLConfiguration(UDDI_CONFIG);
+ long refreshDelay = xmlConfig.getLong(Property.UDDI_RELOAD_DELAY, 1000l);
log.debug("Setting refreshDelay to " + refreshDelay);
FileChangedReloadingStrategy fileChangedReloadingStrategy = new FileChangedReloadingStrategy();
fileChangedReloadingStrategy.setRefreshDelay(refreshDelay);
- propConfig.setReloadingStrategy(fileChangedReloadingStrategy);
- compositeConfig.addConfiguration(propConfig);
-
+ xmlConfig.setReloadingStrategy(fileChangedReloadingStrategy);
+ compositeConfig.addConfiguration(xmlConfig);
//Making the new configuration globally accessible.
config = compositeConfig;
+ nodes = readNodeConfig(config);
+ clerks = readClerkConfig(config, nodes);
}
-
-
-
/**
* Obtains the reference to the Singleton instance.
*
* @return the APplicationConfuration Singleton Instance.
* @throws ConfigurationException
*/
- private static ClientConfig getInstance() throws ConfigurationException
+ public static ClientConfig getInstance() throws ConfigurationException
{
if (instance==null) {
instance = new ClientConfig();
}
return instance;
}
+
+ public static void init() throws ConfigurationException
+ {
+ getInstance();
+ }
/**
* Hook to receive configuration reload events from an external application.
*
@@ -104,4 +112,58 @@
{
return getInstance().config;
}
+
+ private static Set<UDDIClerk> readClerkConfig(Configuration config, Map<String,UDDINode> nodes)
+ throws ConfigurationException {
+ String[] names = config.getStringArray("clerks.clerk[@name]");
+ Set<UDDIClerk> clerks = new HashSet<UDDIClerk>();
+ log.debug("clerk names=" + names);
+ for (int i=0; i<names.length; i++) {
+ UDDIClerk uddiClerk = new UDDIClerk();
+ uddiClerk.setName( config.getString("clerks.clerk(" + i + ")[@name]"));
+ String nodeRef = config.getString("clerks.clerk(" + i + ")[@node]");
+ if (!nodes.containsKey(nodeRef)) throw new ConfigurationException("Could not find Node with name=" + nodeRef);
+ UDDINode node = nodes.get(nodeRef);
+ uddiClerk.setNode(node);
+ uddiClerk.setPublisher(config.getString("clerks.clerk(" + i + ")[@publisher]"));
+ uddiClerk.setPassword( config.getString("clerks.clerk(" + i + ")[@password]"));
+ String[] classes = config.getStringArray("clerks.clerk(" + i + ").class");
+ uddiClerk.setClassWithAnnotations(classes);
+ clerks.add(uddiClerk);
+ }
+ return clerks;
+ }
+
+ private static Map<String,UDDINode> readNodeConfig(Configuration config)
+ throws ConfigurationException {
+ String[] names = config.getStringArray("nodes.node.name");
+ Map<String,UDDINode> nodes = new HashMap<String,UDDINode>();
+ log.debug("node names=" + names);
+ for (int i=0; i<names.length; i++) {
+ UDDINode uddiNode = new UDDINode();
+ String name = config.getString("nodes.node(" + i +").name");
+ uddiNode.setName( config.getString("nodes.node(" + i +").name"));
+ uddiNode.setDescription( config.getString("nodes.node(" + i +").description"));
+ uddiNode.setInquiryUrl( config.getString("nodes.node(" + i +").inquiryUrl"));
+ uddiNode.setPublishUrl( config.getString("nodes.node(" + i +").publishUrl"));
+ uddiNode.setCustodyTransferUrl( config.getString("nodes.node(" + i +").custodyTransferUrl"));
+ uddiNode.setSecurityUrl( config.getString("nodes.node(" + i +").securityUrl"));
+ uddiNode.setSubscriptionUrl( config.getString("nodes.node(" + i +").subscriptionUrl"));
+ uddiNode.setSubscriptionListenerUrl(config.getString("nodes.node(" + i +").subscriptionListenerUrl"));
+ uddiNode.setJuddiApiUrl( config.getString("nodes.node(" + i +").juddiApiUrl"));
+ uddiNode.setProxyTransport( config.getString("nodes.node(" + i +").proxyTransport"));
+ nodes.put(name,uddiNode);
+ }
+ if (!nodes.containsKey("default")) {
+ throw new ConfigurationException("Required node named 'default' is not found.");
+ }
+ return nodes;
+ }
+
+ public Map<String, UDDINode> getNodes() {
+ return nodes;
+ }
+ public Set<UDDIClerk> getClerks() {
+ return clerks;
+ }
}
Modified: webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/config/Constants.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/config/Constants.java?rev=818678&r1=818677&r2=818678&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/config/Constants.java (original)
+++ webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/config/Constants.java Fri Sep 25 00:38:30 2009
@@ -25,6 +25,4 @@
public class Constants {
public static final String API_V3_NAMESPACE = "urn:uddi-org:api_v3_portType";
- public static final String INQUERY_SERVICE = "InquiryService";
- public static final String PUBLISH_SERVICE = "PublishService";
}
Modified: webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/config/Property.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/config/Property.java?rev=818678&r1=818677&r2=818678&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/config/Property.java (original)
+++ webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/config/Property.java Fri Sep 25 00:38:30 2009
@@ -18,15 +18,8 @@
public interface Property
{
- public final static String UDDI_CONFIGURATION_RELOAD_DELAY ="uddi.configuration.reload.delay";
- public final static String UDDI_INQUIRY_URL ="uddi.inquiry.url";
- public final static String UDDI_SECURITY_URL ="uddi.security.url";
- public final static String UDDI_PUBLISH_URL ="uddi.publish.url";
- public final static String UDDI_SUBSCRIPTION_URL ="uddi.subscription.url";
- public final static String UDDI_SUBSCRIPTION_LISTENER_URL ="uddi.subscription.listener.url";
- public final static String UDDI_PROXY_TRANSPORT ="uddi.proxy.transport";
- public final static String UDDI_CUSTODY_TRANSFER_URL ="uddi.custodytransfer.url";
- public final static String UDDI_JUDDI_API_URL ="uddi.juddi.api.url";
+ public final static String UDDI_RELOAD_DELAY ="reloadDelay";
+
public final static String UDDI_PROXY_FACTORY_INITIAL ="java.naming.factory.initial";
public final static String UDDI_PROXY_PROVIDER_URL ="java.naming.provider.url";
Added: webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerk.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerk.java?rev=818678&view=auto
==============================================================================
--- webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerk.java (added)
+++ webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerk.java Fri Sep 25 00:38:30 2009
@@ -0,0 +1,95 @@
+package org.apache.juddi.v3.client.config;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+import org.apache.commons.configuration.ConfigurationException;
+import org.apache.log4j.Logger;
+import org.uddi.api_v3.BusinessService;
+
+public class UDDIClerk {
+
+ private Logger logger = Logger.getLogger(this.getClass());
+ private String name;
+ private UDDINode node;
+ private String publisher;
+ private String password;
+ private String[] classWithAnnotations;
+ private Map<String,Properties> services = new HashMap<String,Properties>();
+
+ public UDDIClerk() {
+ super();
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+
+ /**
+ * Register all services.
+ * @throws ConfigurationException
+ */
+ public void register(Collection<BusinessService> services) throws ConfigurationException {
+ if (services.size()>0) {
+ for (BusinessService service : services) {
+ logger.info("Registering service " + service);
+ }
+ }
+ }
+
+ public void unRegister(Collection<BusinessService> services) throws ConfigurationException {
+ if (services.size()>0) {
+ for (BusinessService service : services) {
+ logger.info("UnRegistering service/binding " + service);
+ }
+ }
+ }
+
+ public String[] getClassWithAnnotations() {
+ return classWithAnnotations;
+ }
+
+ public void setClassWithAnnotations(String[] classWithAnnotations) {
+ this.classWithAnnotations = classWithAnnotations;
+ }
+
+ public UDDINode getNode() {
+ return node;
+ }
+
+ public void setNode(UDDINode node) {
+ this.node = node;
+ }
+
+ public String getPublisher() {
+ return publisher;
+ }
+
+ public void setPublisher(String publisher) {
+ this.publisher = publisher;
+ }
+
+ public String getPassword() {
+ return password;
+ }
+
+ public void setPassword(String password) {
+ this.password = password;
+ }
+
+ public Map<String, Properties> getServices() {
+ return services;
+ }
+
+ public void setServices(Map<String, Properties> services) {
+ this.services = services;
+ }
+
+}
Added: webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDINode.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDINode.java?rev=818678&view=auto
==============================================================================
--- webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDINode.java (added)
+++ webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDINode.java Fri Sep 25 00:38:30 2009
@@ -0,0 +1,79 @@
+package org.apache.juddi.v3.client.config;
+
+
+public class UDDINode {
+
+ private String name;
+ private String description;
+ private String custodyTransferUrl;
+ private String inquiryUrl;
+ private String publishUrl;
+ private String securityUrl;
+ private String subscriptionUrl;
+ private String subscriptionListenerUrl;
+ private String juddiApiUrl;
+ private String proxyTransport;
+
+ public String getName() {
+ return name;
+ }
+ public void setName(String name) {
+ this.name = name;
+ }
+ public String getDescription() {
+ return description;
+ }
+ public void setDescription(String description) {
+ this.description = description;
+ }
+ public String getCustodyTransferUrl() {
+ return custodyTransferUrl;
+ }
+ public void setCustodyTransferUrl(String custodyTransferUrl) {
+ this.custodyTransferUrl = custodyTransferUrl;
+ }
+ public String getInquiryUrl() {
+ return inquiryUrl;
+ }
+ public void setInquiryUrl(String inquiryUrl) {
+ this.inquiryUrl = inquiryUrl;
+ }
+ public String getPublishUrl() {
+ return publishUrl;
+ }
+ public void setPublishUrl(String publishUrl) {
+ this.publishUrl = publishUrl;
+ }
+ public String getSecurityUrl() {
+ return securityUrl;
+ }
+ public void setSecurityUrl(String securityUrl) {
+ this.securityUrl = securityUrl;
+ }
+ public String getSubscriptionUrl() {
+ return subscriptionUrl;
+ }
+ public void setSubscriptionUrl(String subscriptionUrl) {
+ this.subscriptionUrl = subscriptionUrl;
+ }
+ public String getProxyTransport() {
+ return proxyTransport;
+ }
+ public void setProxyTransport(String proxyTransport) {
+ this.proxyTransport = proxyTransport;
+ }
+ public String getJuddiApiUrl() {
+ return juddiApiUrl;
+ }
+ public void setJuddiApiUrl(String juddiApiUrl) {
+ this.juddiApiUrl = juddiApiUrl;
+ }
+ public String getSubscriptionListenerUrl() {
+ return subscriptionListenerUrl;
+ }
+ public void setSubscriptionListenerUrl(String subscriptionListenerUrl) {
+ this.subscriptionListenerUrl = subscriptionListenerUrl;
+ }
+
+
+}
Modified: webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/transport/InVMTransport.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/transport/InVMTransport.java?rev=818678&r1=818677&r2=818678&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/transport/InVMTransport.java (original)
+++ webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/transport/InVMTransport.java Fri Sep 25 00:38:30 2009
@@ -17,7 +17,6 @@
package org.apache.juddi.v3.client.transport;
import org.apache.juddi.v3.client.config.ClientConfig;
-import org.apache.juddi.v3.client.config.Property;
import org.apache.juddi.v3_service.JUDDIApiPortType;
import org.uddi.v3_service.UDDICustodyTransferPortType;
import org.uddi.v3_service.UDDIInquiryPortType;
@@ -40,7 +39,7 @@
public UDDIInquiryPortType getUDDIInquiryService() throws TransportException {
if (inquiryService==null) {
try {
- String endpointURL = ClientConfig.getConfiguration().getString(Property.UDDI_INQUIRY_URL);
+ String endpointURL = ClientConfig.getInstance().getNodes().get("default").getInquiryUrl();
Class<?> c = Class.forName(endpointURL);
inquiryService = (UDDIInquiryPortType) c.newInstance();
} catch (Exception e) {
@@ -53,7 +52,7 @@
public UDDISecurityPortType getUDDISecurityService() throws TransportException {
if (securityService==null) {
try {
- String endpointURL = ClientConfig.getConfiguration().getString(Property.UDDI_SECURITY_URL);
+ String endpointURL = ClientConfig.getInstance().getNodes().get("default").getSecurityUrl();
Class<?> c = Class.forName(endpointURL);
securityService = (UDDISecurityPortType) c.newInstance();
} catch (Exception e) {
@@ -66,7 +65,7 @@
public UDDIPublicationPortType getUDDIPublishService() throws TransportException {
if (publishService==null) {
try {
- String endpointURL = ClientConfig.getConfiguration().getString(Property.UDDI_PUBLISH_URL);
+ String endpointURL = ClientConfig.getInstance().getNodes().get("default").getPublishUrl();
Class<?> c = Class.forName(endpointURL);
publishService = (UDDIPublicationPortType) c.newInstance();
} catch (Exception e) {
@@ -79,7 +78,7 @@
public UDDISubscriptionPortType getUDDISubscriptionService() throws TransportException {
if (subscriptionService==null) {
try {
- String endpointURL = ClientConfig.getConfiguration().getString(Property.UDDI_SUBSCRIPTION_URL);
+ String endpointURL = ClientConfig.getInstance().getNodes().get("default").getSubscriptionUrl();
Class<?> c = Class.forName(endpointURL);
subscriptionService = (UDDISubscriptionPortType) c.newInstance();
} catch (Exception e) {
@@ -92,7 +91,7 @@
public UDDISubscriptionListenerPortType getUDDISubscriptionListenerService() throws TransportException {
if (subscriptionListenerService==null) {
try {
- String endpointURL = ClientConfig.getConfiguration().getString(Property.UDDI_SUBSCRIPTION_LISTENER_URL);
+ String endpointURL = ClientConfig.getInstance().getNodes().get("default").getSubscriptionListenerUrl();
Class<?> c = Class.forName(endpointURL);
subscriptionListenerService = (UDDISubscriptionListenerPortType) c.newInstance();
} catch (Exception e) {
@@ -105,7 +104,7 @@
public UDDICustodyTransferPortType getUDDICustodyTransferService() throws TransportException {
if (custodyTransferService==null) {
try {
- String endpointURL = ClientConfig.getConfiguration().getString(Property.UDDI_CUSTODY_TRANSFER_URL);
+ String endpointURL = ClientConfig.getInstance().getNodes().get("default").getCustodyTransferUrl();
Class<?> c = Class.forName(endpointURL);
custodyTransferService = (UDDICustodyTransferPortType) c.newInstance();
} catch (Exception e) {
@@ -118,7 +117,7 @@
public JUDDIApiPortType getJUDDIApiService() throws TransportException {
if (publisherService==null) {
try {
- String endpointURL = ClientConfig.getConfiguration().getString(Property.UDDI_JUDDI_API_URL);
+ String endpointURL = ClientConfig.getInstance().getNodes().get("default").getJuddiApiUrl();
Class<?> c = Class.forName(endpointURL);
publisherService = (JUDDIApiPortType) c.newInstance();
} catch (Exception e) {
Modified: webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/transport/JAXWSTransport.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/transport/JAXWSTransport.java?rev=818678&r1=818677&r2=818678&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/transport/JAXWSTransport.java (original)
+++ webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/transport/JAXWSTransport.java Fri Sep 25 00:38:30 2009
@@ -22,7 +22,6 @@
import javax.xml.ws.Service;
import org.apache.juddi.v3.client.config.ClientConfig;
-import org.apache.juddi.v3.client.config.Property;
import org.apache.juddi.v3_service.JUDDIApiPortType;
import org.uddi.v3_service.UDDICustodyTransferPortType;
import org.uddi.v3_service.UDDIInquiryPortType;
@@ -46,7 +45,7 @@
if (inquiryService==null) {
try {
- String endpointURL = ClientConfig.getConfiguration().getString(Property.UDDI_INQUIRY_URL);
+ String endpointURL = ClientConfig.getInstance().getNodes().get("default").getInquiryUrl();
QName qName = new QName(Transport.API_V3_NAMESPACE, Transport.INQUIRY_SERVICE);
Service service = Service.create(new URL(endpointURL), qName);
inquiryService = (UDDIInquiryPortType) service.getPort(UDDIInquiryPortType.class);
@@ -61,7 +60,7 @@
if (securityService==null) {
try {
- String endpointURL = ClientConfig.getConfiguration().getString(Property.UDDI_SECURITY_URL);
+ String endpointURL = ClientConfig.getInstance().getNodes().get("default").getSecurityUrl();
QName qName = new QName(Transport.API_V3_NAMESPACE, Transport.SECURITY_SERVICE);
Service service = Service.create(new URL(endpointURL), qName);
securityService = (UDDISecurityPortType) service.getPort(UDDISecurityPortType.class);
@@ -76,7 +75,7 @@
if (publishService==null) {
try {
- String endpointURL = ClientConfig.getConfiguration().getString(Property.UDDI_PUBLISH_URL);
+ String endpointURL = ClientConfig.getInstance().getNodes().get("default").getPublishUrl();
QName qName = new QName(Transport.API_V3_NAMESPACE, Transport.PUBLISH_SERVICE);
Service service = Service.create(new URL(endpointURL), qName);
publishService = (UDDIPublicationPortType) service.getPort(UDDIPublicationPortType.class);
@@ -91,7 +90,7 @@
if (subscriptionService==null) {
try {
- String endpointURL = ClientConfig.getConfiguration().getString(Property.UDDI_SUBSCRIPTION_URL);
+ String endpointURL = ClientConfig.getInstance().getNodes().get("default").getSubscriptionUrl();
QName qName = new QName(Transport.SUB_V3_NAMESPACE, Transport.SUBSCRIPTION_SERVICE);
Service service = Service.create(new URL(endpointURL), qName);
subscriptionService = (UDDISubscriptionPortType) service.getPort(UDDISubscriptionPortType.class);
@@ -105,7 +104,7 @@
public UDDISubscriptionListenerPortType getUDDISubscriptionListenerService() throws TransportException {
if (subscriptionListenerService == null) {
try {
- String endpointURL = ClientConfig.getConfiguration().getString(Property.UDDI_SUBSCRIPTION_LISTENER_URL);
+ String endpointURL = ClientConfig.getInstance().getNodes().get("default").getSubscriptionListenerUrl();
QName qName = new QName(Transport.SUBR_V3_NAMESPACE, Transport.SUBSCRIPTION_LISTENER_SERVICE);
Service service = Service.create(new URL(endpointURL), qName);
subscriptionListenerService = (UDDISubscriptionListenerPortType) service.getPort(UDDISubscriptionListenerPortType.class);
@@ -119,7 +118,7 @@
public UDDICustodyTransferPortType getUDDICustodyTransferService() throws TransportException {
if (custodyTransferService == null) {
try {
- String endpointURL = ClientConfig.getConfiguration().getString(Property.UDDI_CUSTODY_TRANSFER_URL);
+ String endpointURL = ClientConfig.getInstance().getNodes().get("default").getCustodyTransferUrl();
QName qName = new QName(Transport.CUSTODY_V3_NAMESPACE, Transport.CUSTODY_TRANSFER_SERVICE);
Service service = Service.create(new URL(endpointURL), qName);
custodyTransferService = (UDDICustodyTransferPortType) service.getPort(UDDICustodyTransferPortType.class);
@@ -133,7 +132,7 @@
public JUDDIApiPortType getJUDDIApiService() throws TransportException {
if (publisherService == null) {
try {
- String endpointURL = ClientConfig.getConfiguration().getString(Property.UDDI_JUDDI_API_URL);
+ String endpointURL = ClientConfig.getInstance().getNodes().get("default").getJuddiApiUrl();
QName qName = new QName(Transport.JUDDI_API_V3_NAMESPACE, Transport.PUBLISHER_SERVICE);
Service service = Service.create(new URL(endpointURL), qName);
publisherService = (JUDDIApiPortType) service.getPort(JUDDIApiPortType.class);
Modified: webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/transport/RMITransport.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/transport/RMITransport.java?rev=818678&r1=818677&r2=818678&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/transport/RMITransport.java (original)
+++ webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/transport/RMITransport.java Fri Sep 25 00:38:30 2009
@@ -64,7 +64,7 @@
public UDDIInquiryPortType getUDDIInquiryService() throws TransportException {
if (inquiryService==null) {
try {
- String endpointURL = ClientConfig.getConfiguration().getString(Property.UDDI_INQUIRY_URL);
+ String endpointURL = ClientConfig.getInstance().getNodes().get("default").getInquiryUrl();
URI endpointURI = new URI(endpointURL);
String service = endpointURI.getPath();
logger.debug("Looking up service=" + service);
@@ -80,7 +80,7 @@
public UDDISecurityPortType getUDDISecurityService() throws TransportException {
if (securityService==null) {
try {
- String endpointURL = ClientConfig.getConfiguration().getString(Property.UDDI_SECURITY_URL);
+ String endpointURL = ClientConfig.getInstance().getNodes().get("default").getSecurityUrl();
URI endpointURI = new URI(endpointURL);
String service = endpointURI.getPath();
logger.debug("Looking up service=" + service);
@@ -96,7 +96,7 @@
public UDDIPublicationPortType getUDDIPublishService() throws TransportException {
if (publishService==null) {
try {
- String endpointURL = ClientConfig.getConfiguration().getString(Property.UDDI_PUBLISH_URL);
+ String endpointURL = ClientConfig.getInstance().getNodes().get("default").getPublishUrl();
URI endpointURI = new URI(endpointURL);
String service = endpointURI.getPath();
logger.debug("Looking up service=" + service);
@@ -112,7 +112,7 @@
public UDDISubscriptionPortType getUDDISubscriptionService() throws TransportException {
if (subscriptionService==null) {
try {
- String endpointURL = ClientConfig.getConfiguration().getString(Property.UDDI_SUBSCRIPTION_URL);
+ String endpointURL = ClientConfig.getInstance().getNodes().get("default").getSubscriptionUrl();
URI endpointURI = new URI(endpointURL);
String service = endpointURI.getPath();
logger.debug("Looking up service=" + service);
@@ -128,7 +128,7 @@
public UDDISubscriptionListenerPortType getUDDISubscriptionListenerService() throws TransportException {
if (subscriptionListenerService==null) {
try {
- String endpointURL = ClientConfig.getConfiguration().getString(Property.UDDI_SUBSCRIPTION_LISTENER_URL);
+ String endpointURL = ClientConfig.getInstance().getNodes().get("default").getSubscriptionListenerUrl();
URI endpointURI = new URI(endpointURL);
String service = endpointURI.getPath();
logger.debug("Looking up service=" + service);
@@ -144,7 +144,7 @@
public UDDICustodyTransferPortType getUDDICustodyTransferService() throws TransportException {
if (custodyTransferService==null) {
try {
- String endpointURL = ClientConfig.getConfiguration().getString(Property.UDDI_CUSTODY_TRANSFER_URL);
+ String endpointURL = ClientConfig.getInstance().getNodes().get("default").getCustodyTransferUrl();
URI endpointURI = new URI(endpointURL);
String service = endpointURI.getPath();
logger.debug("Looking up service=" + service);
@@ -160,7 +160,7 @@
public JUDDIApiPortType getJUDDIApiService() throws TransportException {
if (publisherService==null) {
try {
- String endpointURL = ClientConfig.getConfiguration().getString(Property.UDDI_JUDDI_API_URL);
+ String endpointURL = ClientConfig.getInstance().getNodes().get("default").getJuddiApiUrl();
URI endpointURI = new URI(endpointURL);
String service = endpointURI.getPath();
logger.debug("Looking up service=" + service);
Modified: webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/UDDIInquiryService.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/UDDIInquiryService.java?rev=818678&r1=818677&r2=818678&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/UDDIInquiryService.java (original)
+++ webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/UDDIInquiryService.java Fri Sep 25 00:38:30 2009
@@ -65,7 +65,8 @@
requestHandler.setMethodName(opHandler.getMethodName());
requestHandler.setOperationClass(opHandler.getParameter());
- String version = requestHandler.getVersion(uddiReq,operation);
+ @SuppressWarnings("unused")
+ String version = requestHandler.getVersion(uddiReq,operation);
validateRequest(operation);
return requestHandler.invoke(uddiReq);
}
Modified: webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/UDDIPublicationService.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/UDDIPublicationService.java?rev=818678&r1=818677&r2=818678&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/UDDIPublicationService.java (original)
+++ webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/UDDIPublicationService.java Fri Sep 25 00:38:30 2009
@@ -74,6 +74,7 @@
requestHandler.setMethodName(opHandler.getMethodName());
requestHandler.setOperationClass(opHandler.getParameter());
+ @SuppressWarnings("unused")
String version = requestHandler.getVersion(uddiReq, operation);
validateRequest(operation);
Modified: webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/UDDISecurityService.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/UDDISecurityService.java?rev=818678&r1=818677&r2=818678&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/UDDISecurityService.java (original)
+++ webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/UDDISecurityService.java Fri Sep 25 00:38:30 2009
@@ -50,6 +50,7 @@
requestHandler.setMethodName(opHandler.getMethodName());
requestHandler.setOperationClass(opHandler.getParameter());
+ @SuppressWarnings("unused")
String version = requestHandler.getVersion(uddiReq, operation);
validateRequest(operation);
return requestHandler.invoke(uddiReq);
Modified: webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/JUDDI_010_PublisherIntegrationTest.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/JUDDI_010_PublisherIntegrationTest.java?rev=818678&r1=818677&r2=818678&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/JUDDI_010_PublisherIntegrationTest.java (original)
+++ webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/JUDDI_010_PublisherIntegrationTest.java Fri Sep 25 00:38:30 2009
@@ -32,7 +32,6 @@
import org.apache.juddi.config.Constants;
import org.apache.juddi.error.InvalidKeyPassedException;
import org.apache.juddi.v3.client.config.ClientConfig;
-import org.apache.juddi.v3.client.config.Property;
import org.apache.juddi.v3.client.transport.InVMTransport;
import org.apache.juddi.v3.client.transport.Transport;
import org.apache.juddi.v3.tck.EntityCreator;
@@ -55,7 +54,7 @@
*/
public class JUDDI_010_PublisherIntegrationTest {
- private static Logger logger = Logger.getLogger(JUDDI_010_PublisherIntegrationTest.class);
+ private static Logger logger = Logger.getLogger(JUDDI_010_PublisherIntegrationTest.class);
private static UDDISecurityPortType security =null;
private static JUDDIApiPortType publisher = null;
@@ -63,7 +62,7 @@
@BeforeClass
public static void startRegistry() throws ConfigurationException {
- String clazz = ClientConfig.getConfiguration().getString(Property.UDDI_PROXY_TRANSPORT,Property.DEFAULT_UDDI_PROXY_TRANSPORT);
+ String clazz = ClientConfig.getInstance().getNodes().get("default").getProxyTransport();
if (InVMTransport.class.getName().equals(clazz)) {
Registry.start();
}
@@ -90,7 +89,7 @@
@AfterClass
public static void stopRegistry() throws ConfigurationException {
- String clazz = ClientConfig.getConfiguration().getString(Property.UDDI_PROXY_TRANSPORT,Property.DEFAULT_UDDI_PROXY_TRANSPORT);
+ String clazz = ClientConfig.getInstance().getNodes().get("default").getProxyTransport();
if (InVMTransport.class.getName().equals(clazz)) {
Registry.stop();
}
@@ -99,7 +98,7 @@
@Test
public void testAuthToken() {
try {
- String clazz = ClientConfig.getConfiguration().getString(Property.UDDI_PROXY_TRANSPORT,Property.DEFAULT_UDDI_PROXY_TRANSPORT);
+ String clazz = ClientConfig.getInstance().getNodes().get("default").getProxyTransport();
Class<?> transportClass = Loader.loadClass(clazz);
if (transportClass!=null) {
Transport transport = (Transport) transportClass.newInstance();
Added: webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDIClientTest.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDIClientTest.java?rev=818678&view=auto
==============================================================================
--- webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDIClientTest.java (added)
+++ webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDIClientTest.java Fri Sep 25 00:38:30 2009
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2001-2009 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.juddi.v3.client;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * @author <a href="mailto:kstam@apache.org">Kurt T Stam</a>
+ */
+public class UDDIClientTest {
+
+ @Test
+ public void testReadingTheConfig() {
+ try {
+ UDDIClient.start();
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ Assert.fail();
+ }
+ }
+
+
+
+}
Modified: webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_010_PublisherIntegrationTest.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_010_PublisherIntegrationTest.java?rev=818678&r1=818677&r2=818678&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_010_PublisherIntegrationTest.java (original)
+++ webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_010_PublisherIntegrationTest.java Fri Sep 25 00:38:30 2009
@@ -17,7 +17,6 @@
import org.apache.commons.configuration.ConfigurationException;
import org.apache.juddi.Registry;
import org.apache.juddi.v3.client.config.ClientConfig;
-import org.apache.juddi.v3.client.config.Property;
import org.apache.juddi.v3.client.transport.InVMTransport;
import org.apache.juddi.v3.client.transport.Transport;
import org.apache.log4j.helpers.Loader;
@@ -36,7 +35,7 @@
@BeforeClass
public static void startRegistry() throws ConfigurationException {
- String clazz = ClientConfig.getConfiguration().getString(Property.UDDI_PROXY_TRANSPORT,Property.DEFAULT_UDDI_PROXY_TRANSPORT);
+ String clazz = ClientConfig.getInstance().getNodes().get("default").getProxyTransport();
if (InVMTransport.class.getName().equals(clazz)) {
Registry.start();
}
@@ -44,7 +43,7 @@
@AfterClass
public static void stopRegistry() throws ConfigurationException {
- String clazz = ClientConfig.getConfiguration().getString(Property.UDDI_PROXY_TRANSPORT,Property.DEFAULT_UDDI_PROXY_TRANSPORT);
+ String clazz = ClientConfig.getInstance().getNodes().get("default").getProxyTransport();
if (InVMTransport.class.getName().equals(clazz)) {
Registry.stop();
}
@@ -53,7 +52,7 @@
@Test
public void testAuthToken() {
try {
- String clazz = ClientConfig.getConfiguration().getString(Property.UDDI_PROXY_TRANSPORT,Property.DEFAULT_UDDI_PROXY_TRANSPORT);
+ String clazz = ClientConfig.getInstance().getNodes().get("default").getProxyTransport();
Class<?> transportClass = Loader.loadClass(clazz);
if (transportClass!=null) {
Transport transport = (Transport) transportClass.newInstance();
Modified: webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_020_TmodelIntegrationTest.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_020_TmodelIntegrationTest.java?rev=818678&r1=818677&r2=818678&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_020_TmodelIntegrationTest.java (original)
+++ webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_020_TmodelIntegrationTest.java Fri Sep 25 00:38:30 2009
@@ -17,7 +17,6 @@
import org.apache.commons.configuration.ConfigurationException;
import org.apache.juddi.Registry;
import org.apache.juddi.v3.client.config.ClientConfig;
-import org.apache.juddi.v3.client.config.Property;
import org.apache.juddi.v3.client.transport.InVMTransport;
import org.apache.juddi.v3.client.transport.Transport;
import org.apache.juddi.v3.tck.TckPublisher;
@@ -47,7 +46,7 @@
@BeforeClass
public static void setup() throws ConfigurationException {
- String clazz = ClientConfig.getConfiguration().getString(Property.UDDI_PROXY_TRANSPORT,Property.DEFAULT_UDDI_PROXY_TRANSPORT);
+ String clazz = ClientConfig.getInstance().getNodes().get("default").getProxyTransport();
if (InVMTransport.class.getName().equals(clazz)) {
Registry.start();
}
@@ -77,7 +76,7 @@
@AfterClass
public static void stopRegistry() throws ConfigurationException {
- String clazz = ClientConfig.getConfiguration().getString(Property.UDDI_PROXY_TRANSPORT,Property.DEFAULT_UDDI_PROXY_TRANSPORT);
+ String clazz = ClientConfig.getInstance().getNodes().get("default").getProxyTransport();
if (InVMTransport.class.getName().equals(clazz)) {
Registry.stop();
}
Modified: webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_030_BusinessEntityIntegrationTest.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_030_BusinessEntityIntegrationTest.java?rev=818678&r1=818677&r2=818678&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_030_BusinessEntityIntegrationTest.java (original)
+++ webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_030_BusinessEntityIntegrationTest.java Fri Sep 25 00:38:30 2009
@@ -17,7 +17,6 @@
import org.apache.commons.configuration.ConfigurationException;
import org.apache.juddi.Registry;
import org.apache.juddi.v3.client.config.ClientConfig;
-import org.apache.juddi.v3.client.config.Property;
import org.apache.juddi.v3.client.transport.InVMTransport;
import org.apache.juddi.v3.client.transport.Transport;
import org.apache.juddi.v3.tck.TckBusiness;
@@ -49,13 +48,12 @@
@BeforeClass
public static void setup() throws ConfigurationException {
- String clazz = ClientConfig.getConfiguration().getString(Property.UDDI_PROXY_TRANSPORT,Property.DEFAULT_UDDI_PROXY_TRANSPORT);
+ String clazz = ClientConfig.getInstance().getNodes().get("default").getProxyTransport();
if (InVMTransport.class.getName().equals(clazz)) {
Registry.start();
}
logger.debug("Getting auth tokens..");
try {
- clazz = ClientConfig.getConfiguration().getString(Property.UDDI_PROXY_TRANSPORT,Property.DEFAULT_UDDI_PROXY_TRANSPORT);
Class<?> transportClass = Loader.loadClass(clazz);
if (transportClass!=null) {
Transport transport = (Transport) transportClass.newInstance();
@@ -81,7 +79,7 @@
@AfterClass
public static void stopRegistry() throws ConfigurationException {
- String clazz = ClientConfig.getConfiguration().getString(Property.UDDI_PROXY_TRANSPORT,Property.DEFAULT_UDDI_PROXY_TRANSPORT);
+ String clazz = ClientConfig.getInstance().getNodes().get("default").getProxyTransport();
if (InVMTransport.class.getName().equals(clazz)) {
Registry.stop();
}
Modified: webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_040_BusinessServiceIntegrationTest.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_040_BusinessServiceIntegrationTest.java?rev=818678&r1=818677&r2=818678&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_040_BusinessServiceIntegrationTest.java (original)
+++ webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_040_BusinessServiceIntegrationTest.java Fri Sep 25 00:38:30 2009
@@ -17,7 +17,6 @@
import org.apache.commons.configuration.ConfigurationException;
import org.apache.juddi.Registry;
import org.apache.juddi.v3.client.config.ClientConfig;
-import org.apache.juddi.v3.client.config.Property;
import org.apache.juddi.v3.client.transport.InVMTransport;
import org.apache.juddi.v3.client.transport.Transport;
import org.apache.juddi.v3.tck.TckBusiness;
@@ -53,13 +52,12 @@
@BeforeClass
public static void setup() throws ConfigurationException {
- String clazz = ClientConfig.getConfiguration().getString(Property.UDDI_PROXY_TRANSPORT,Property.DEFAULT_UDDI_PROXY_TRANSPORT);
+ String clazz = ClientConfig.getInstance().getNodes().get("default").getProxyTransport();
if (InVMTransport.class.getName().equals(clazz)) {
Registry.start();
}
logger.debug("Getting auth tokens..");
try {
- clazz = ClientConfig.getConfiguration().getString(Property.UDDI_PROXY_TRANSPORT,Property.DEFAULT_UDDI_PROXY_TRANSPORT);
Class<?> transportClass = Loader.loadClass(clazz);
if (transportClass!=null) {
Transport transport = (Transport) transportClass.newInstance();
@@ -87,7 +85,7 @@
@AfterClass
public static void stopRegistry() throws ConfigurationException {
- String clazz = ClientConfig.getConfiguration().getString(Property.UDDI_PROXY_TRANSPORT,Property.DEFAULT_UDDI_PROXY_TRANSPORT);
+ String clazz = ClientConfig.getInstance().getNodes().get("default").getProxyTransport();
if (InVMTransport.class.getName().equals(clazz)) {
Registry.stop();
}
Modified: webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_050_BindingTemplateIntegrationTest.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_050_BindingTemplateIntegrationTest.java?rev=818678&r1=818677&r2=818678&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_050_BindingTemplateIntegrationTest.java (original)
+++ webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_050_BindingTemplateIntegrationTest.java Fri Sep 25 00:38:30 2009
@@ -17,7 +17,6 @@
import org.apache.commons.configuration.ConfigurationException;
import org.apache.juddi.Registry;
import org.apache.juddi.v3.client.config.ClientConfig;
-import org.apache.juddi.v3.client.config.Property;
import org.apache.juddi.v3.client.transport.InVMTransport;
import org.apache.juddi.v3.client.transport.Transport;
import org.apache.juddi.v3.tck.TckBindingTemplate;
@@ -55,13 +54,12 @@
@BeforeClass
public static void setup() throws ConfigurationException {
- String clazz = ClientConfig.getConfiguration().getString(Property.UDDI_PROXY_TRANSPORT,Property.DEFAULT_UDDI_PROXY_TRANSPORT);
+ String clazz = ClientConfig.getInstance().getNodes().get("default").getProxyTransport();
if (InVMTransport.class.getName().equals(clazz)) {
Registry.start();
}
logger.debug("Getting auth tokens..");
try {
- clazz = ClientConfig.getConfiguration().getString(Property.UDDI_PROXY_TRANSPORT,Property.DEFAULT_UDDI_PROXY_TRANSPORT);
Class<?> transportClass = Loader.loadClass(clazz);
if (transportClass!=null) {
Transport transport = (Transport) transportClass.newInstance();
@@ -88,7 +86,7 @@
@AfterClass
public static void stopRegistry() throws ConfigurationException {
- String clazz = ClientConfig.getConfiguration().getString(Property.UDDI_PROXY_TRANSPORT,Property.DEFAULT_UDDI_PROXY_TRANSPORT);
+ String clazz = ClientConfig.getInstance().getNodes().get("default").getProxyTransport();
if (InVMTransport.class.getName().equals(clazz)) {
Registry.stop();
}
Modified: webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_060_PublisherAssertionIntegrationTest.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_060_PublisherAssertionIntegrationTest.java?rev=818678&r1=818677&r2=818678&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_060_PublisherAssertionIntegrationTest.java (original)
+++ webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_060_PublisherAssertionIntegrationTest.java Fri Sep 25 00:38:30 2009
@@ -21,7 +21,6 @@
import org.apache.commons.configuration.ConfigurationException;
import org.apache.juddi.Registry;
import org.apache.juddi.v3.client.config.ClientConfig;
-import org.apache.juddi.v3.client.config.Property;
import org.apache.juddi.v3.client.transport.InVMTransport;
import org.apache.juddi.v3.client.transport.Transport;
import org.apache.juddi.v3.tck.TckBusiness;
@@ -51,13 +50,12 @@
@BeforeClass
public static void setup() throws ConfigurationException {
- String clazz = ClientConfig.getConfiguration().getString(Property.UDDI_PROXY_TRANSPORT,Property.DEFAULT_UDDI_PROXY_TRANSPORT);
+ String clazz = ClientConfig.getInstance().getNodes().get("default").getProxyTransport();
if (InVMTransport.class.getName().equals(clazz)) {
Registry.start();
}
logger.debug("Getting auth tokens..");
try {
- clazz = ClientConfig.getConfiguration().getString(Property.UDDI_PROXY_TRANSPORT,Property.DEFAULT_UDDI_PROXY_TRANSPORT);
Class<?> transportClass = Loader.loadClass(clazz);
if (transportClass!=null) {
Transport transport = (Transport) transportClass.newInstance();
@@ -85,7 +83,7 @@
@AfterClass
public static void stopRegistry() throws ConfigurationException {
- String clazz = ClientConfig.getConfiguration().getString(Property.UDDI_PROXY_TRANSPORT,Property.DEFAULT_UDDI_PROXY_TRANSPORT);
+ String clazz = ClientConfig.getInstance().getNodes().get("default").getProxyTransport();
if (InVMTransport.class.getName().equals(clazz)) {
Registry.stop();
}
Modified: webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_070_FindEntityIntegrationTest.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_070_FindEntityIntegrationTest.java?rev=818678&r1=818677&r2=818678&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_070_FindEntityIntegrationTest.java (original)
+++ webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_070_FindEntityIntegrationTest.java Fri Sep 25 00:38:30 2009
@@ -17,7 +17,6 @@
import org.apache.commons.configuration.ConfigurationException;
import org.apache.juddi.Registry;
import org.apache.juddi.v3.client.config.ClientConfig;
-import org.apache.juddi.v3.client.config.Property;
import org.apache.juddi.v3.client.transport.InVMTransport;
import org.apache.juddi.v3.client.transport.Transport;
import org.apache.juddi.v3.tck.TckBindingTemplate;
@@ -56,13 +55,12 @@
@BeforeClass
public static void setup() throws ConfigurationException {
- String clazz = ClientConfig.getConfiguration().getString(Property.UDDI_PROXY_TRANSPORT,Property.DEFAULT_UDDI_PROXY_TRANSPORT);
+ String clazz = ClientConfig.getInstance().getNodes().get("default").getProxyTransport();
if (InVMTransport.class.getName().equals(clazz)) {
Registry.start();
}
logger.debug("Getting auth tokens..");
try {
- clazz = ClientConfig.getConfiguration().getString(Property.UDDI_PROXY_TRANSPORT,Property.DEFAULT_UDDI_PROXY_TRANSPORT);
Class<?> transportClass = Loader.loadClass(clazz);
if (transportClass!=null) {
Transport transport = (Transport) transportClass.newInstance();
@@ -90,7 +88,7 @@
@AfterClass
public static void stopRegistry() throws ConfigurationException {
- String clazz = ClientConfig.getConfiguration().getString(Property.UDDI_PROXY_TRANSPORT,Property.DEFAULT_UDDI_PROXY_TRANSPORT);
+ String clazz = ClientConfig.getInstance().getNodes().get("default").getProxyTransport();
if (InVMTransport.class.getName().equals(clazz)) {
Registry.stop();
}
Modified: webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_080_SubscriptionIntegrationTest.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_080_SubscriptionIntegrationTest.java?rev=818678&r1=818677&r2=818678&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_080_SubscriptionIntegrationTest.java (original)
+++ webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_080_SubscriptionIntegrationTest.java Fri Sep 25 00:38:30 2009
@@ -17,7 +17,6 @@
import org.apache.commons.configuration.ConfigurationException;
import org.apache.juddi.Registry;
import org.apache.juddi.v3.client.config.ClientConfig;
-import org.apache.juddi.v3.client.config.Property;
import org.apache.juddi.v3.client.transport.InVMTransport;
import org.apache.juddi.v3.client.transport.Transport;
import org.apache.juddi.v3.tck.TckBindingTemplate;
@@ -57,13 +56,12 @@
@BeforeClass
public static void setup() throws ConfigurationException {
- String clazz = ClientConfig.getConfiguration().getString(Property.UDDI_PROXY_TRANSPORT,Property.DEFAULT_UDDI_PROXY_TRANSPORT);
+ String clazz = ClientConfig.getInstance().getNodes().get("default").getProxyTransport();
if (InVMTransport.class.getName().equals(clazz)) {
Registry.start();
}
logger.debug("Getting subscriber proxy..");
try {
- clazz = ClientConfig.getConfiguration().getString(Property.UDDI_PROXY_TRANSPORT, Property.DEFAULT_UDDI_PROXY_TRANSPORT);
Class<?> transportClass = Loader.loadClass(clazz);
if (transportClass!=null) {
Transport transport = (Transport) transportClass.newInstance();
@@ -95,7 +93,7 @@
@AfterClass
public static void stopRegistry() throws ConfigurationException {
- String clazz = ClientConfig.getConfiguration().getString(Property.UDDI_PROXY_TRANSPORT,Property.DEFAULT_UDDI_PROXY_TRANSPORT);
+ String clazz = ClientConfig.getInstance().getNodes().get("default").getProxyTransport();
if (InVMTransport.class.getName().equals(clazz)) {
Registry.stop();
}
Modified: webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_090_SubscriptionListenerIntegrationTest.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_090_SubscriptionListenerIntegrationTest.java?rev=818678&r1=818677&r2=818678&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_090_SubscriptionListenerIntegrationTest.java (original)
+++ webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_090_SubscriptionListenerIntegrationTest.java Fri Sep 25 00:38:30 2009
@@ -60,13 +60,12 @@
@BeforeClass
public static void setup() throws ConfigurationException {
- String clazz = ClientConfig.getConfiguration().getString(org.apache.juddi.v3.client.config.Property.UDDI_PROXY_TRANSPORT,org.apache.juddi.v3.client.config.Property.DEFAULT_UDDI_PROXY_TRANSPORT);
+ String clazz = ClientConfig.getInstance().getNodes().get("default").getProxyTransport();
if (InVMTransport.class.getName().equals(clazz)) {
Registry.start();
}
logger.debug("Getting subscriber proxy..");
try {
- clazz = ClientConfig.getConfiguration().getString(org.apache.juddi.v3.client.config.Property.UDDI_PROXY_TRANSPORT, org.apache.juddi.v3.client.config.Property.DEFAULT_UDDI_PROXY_TRANSPORT);
Class<?> transportClass = Loader.loadClass(clazz);
if (transportClass!=null) {
Transport transport = (Transport) transportClass.newInstance();
@@ -96,7 +95,7 @@
@AfterClass
public static void stopRegistry() throws ConfigurationException {
- String clazz = ClientConfig.getConfiguration().getString(org.apache.juddi.v3.client.config.Property.UDDI_PROXY_TRANSPORT,org.apache.juddi.v3.client.config.Property.DEFAULT_UDDI_PROXY_TRANSPORT);
+ String clazz = ClientConfig.getInstance().getNodes().get("default").getProxyTransport();
if (InVMTransport.class.getName().equals(clazz)) {
Registry.stop();
}
Added: webservices/juddi/trunk/uddi-client/src/test/resources/META-INF/uddi.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-client/src/test/resources/META-INF/uddi.xml?rev=818678&view=auto
==============================================================================
--- webservices/juddi/trunk/uddi-client/src/test/resources/META-INF/uddi.xml (added)
+++ webservices/juddi/trunk/uddi-client/src/test/resources/META-INF/uddi.xml Fri Sep 25 00:38:30 2009
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+
+<uddi>
+ <reloadDelay>5000</reloadDelay>
+ <nodes>
+ <node>
+ <name>default</name>
+ <description>Main jUDDI node</description>
+ <!-- JAX-WS Transport -->
+ <proxyTransport>org.apache.juddi.v3.client.transport.JAXWSTransport</proxyTransport>
+ <custodyTransferUrl>http://localhost:8880/juddiv3/services/custody-transfer?wsdl</custodyTransferUrl>
+ <inquiryUrl>http://localhost:8880/juddiv3/services/inquiry?wsdl</inquiryUrl>
+ <publishUrl>http://localhost:8880/juddiv3/services/publish?wsdl</publishUrl>
+ <securityUrl>http://localhost:8880/juddiv3/services/security?wsdl</securityUrl>
+ <subscriptionUrl>http://localhost:8880/juddiv3/services/subscription?wsdl</subscriptionUrl>
+ <subscriptionListenerUrl>http://localhost:8880/juddiv3/services/subscription-listener?wsdl</subscriptionListenerUrl>
+ <juddiApiUrl>http://localhost:8880/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>
+
+</uddi>
\ No newline at end of file
Modified: webservices/juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/jaxb/JAXBMarshaller.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/jaxb/JAXBMarshaller.java?rev=818678&r1=818677&r2=818678&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/jaxb/JAXBMarshaller.java (original)
+++ webservices/juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/jaxb/JAXBMarshaller.java Fri Sep 25 00:38:30 2009
@@ -113,6 +113,7 @@
return element;
}
+ @SuppressWarnings("unchecked")
public static Object unmarshallFromElement(Element element, String thePackage) throws JAXBException {
JAXBContext jc = JAXBContexts.get(thePackage);
Unmarshaller unmarshaller = jc.createUnmarshaller();
---------------------------------------------------------------------
To unsubscribe, e-mail: juddi-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: juddi-cvs-help@ws.apache.org