Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/WADL2UDDI.java URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/WADL2UDDI.java?rev=1540346&r1=1540345&r2=1540346&view=diff ============================================================================== --- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/WADL2UDDI.java (original) +++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/WADL2UDDI.java Sat Nov 9 17:34:10 2013 @@ -69,8 +69,8 @@ import org.uddi.api_v3.TModelInstanceInf * structure that more or less works within the UDDI data structures.<br><br> * <h1>Example Usage Scenario</h1> * <pre> - Application app = WADL2UDDI.ParseWadl(new File("A path to your file.wadl")); - List<URL> urls = WADL2UDDI.GetBaseAddresses(app); + Application app = WADL2UDDI.parseWadl(new File("A path to your file.wadl")); + List<URL> urls = WADL2UDDI.getBaseAddresses(app); URL url = urls.get(0); String domain = url.getHost(); TModel keygen = UDDIClerk.createKeyGenator("uddi:" + domain + ":keygenerator", domain, "en"); @@ -287,7 +287,7 @@ public class WADL2UDDI { CategoryBag categoryBag = new CategoryBag(); String namespace = serviceQName.getNamespaceURI(); - if (namespace != null && namespace != "") { + if (namespace != null && namespace.length()!=0) { KeyedReference namespaceReference = newKeyedReference( "uddi:uddi.org:xml:namespace", "uddi-org:xml:namespace", namespace); categoryBag.getKeyedReference().add(namespaceReference); @@ -316,7 +316,7 @@ public class WADL2UDDI { return service; } - public static List<URL> GetBaseAddresses(Application app) + public static List<URL> getBaseAddresses(Application app) { List<URL> urls = new ArrayList<URL>(); if (app==null) return urls; @@ -391,13 +391,23 @@ public class WADL2UDDI { return bindingTemplate; } - public static Application ParseWadl(InputStream stream) { + /** + * parses a wadl from stream + * @param stream + * @return + */ + public static Application parseWadl(InputStream stream) { Application unmarshal = JAXB.unmarshal(stream, Application.class); return unmarshal; } public static final String PACKAGE = "org.apache.juddi.v3.client.mappings.wadl"; - public static Application ParseWadl(URL file) { + /** + * parses a wadl from a URL or file + * @param file + * @return + */ + public static Application parseWadl(URL file) { Application unmarshal = JAXB.unmarshal(file, Application.class); return unmarshal; } @@ -411,7 +421,7 @@ public class WADL2UDDI { * @return a non-null "Application" object, represeting a WADL's application root XML * Sample code:<br> * <pre> - * Application app = WADL2UDDI.ParseWadl(new URL("http://server/wsdl.wsdl";), "username", "password", + * Application app = WADL2UDDI.parseWadl(new URL("http://server/wsdl.wsdl";), "username", "password", * clerkManager.getClientConfig().isX_To_Wsdl_Ignore_SSL_Errors() ); * </pre> */ @@ -421,7 +431,7 @@ public class WADL2UDDI { try { String url = weburl.toString(); if (!url.toLowerCase().startsWith("http")) { - return ParseWadl(weburl); + return parseWadl(weburl); } boolean usessl = false;
Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/WSDL2UDDI.java URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/WSDL2UDDI.java?rev=1540346&r1=1540345&r2=1540346&view=diff ============================================================================== --- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/WSDL2UDDI.java (original) +++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/WSDL2UDDI.java Sat Nov 9 17:34:10 2013 @@ -102,12 +102,13 @@ public class WSDL2UDDI { * * @param clerk - can be null if register/unregister methods are not used. * @param urlLocalizer - A reference to an custom - * @param properties + * @param properties - required values keyDomain, businessKey, nodeName * @throws ConfigurationException */ public WSDL2UDDI(UDDIClerk clerk, URLLocalizer urlLocalizer, Properties properties) throws ConfigurationException { super(); - + if (properties==null) + throw new IllegalArgumentException("properties"); this.clerk = clerk; this.urlLocalizer = urlLocalizer; this.properties = properties; @@ -765,7 +766,7 @@ public class WSDL2UDDI { CategoryBag categoryBag = new CategoryBag(); String namespace = serviceQName.getNamespaceURI(); - if (namespace != null && namespace != "") { + if (namespace != null && namespace.length() != 0) { KeyedReference namespaceReference = newKeyedReference( "uddi:uddi.org:xml:namespace", "uddi-org:xml:namespace", namespace); categoryBag.getKeyedReference().add(namespaceReference); Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/WSDLLocatorImpl.java URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/WSDLLocatorImpl.java?rev=1540346&r1=1540345&r2=1540346&view=diff ============================================================================== --- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/WSDLLocatorImpl.java (original) +++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/WSDLLocatorImpl.java Sat Nov 9 17:34:10 2013 @@ -61,7 +61,7 @@ public class WSDLLocatorImpl implements */ public WSDLLocatorImpl(URI baseURI) { this.baseURI = baseURI; - this.ignoreSSLErrors = ignoreSSLErrors; + this.ignoreSSLErrors = false; } /** Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/subscription/SubscriptionCallbackListener.java URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/subscription/SubscriptionCallbackListener.java?rev=1540346&r1=1540345&r2=1540346&view=diff ============================================================================== --- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/subscription/SubscriptionCallbackListener.java (original) +++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/subscription/SubscriptionCallbackListener.java Sat Nov 9 17:34:10 2013 @@ -144,7 +144,7 @@ public class SubscriptionCallbackListene instance = new SubscriptionCallbackListener(); } - if (ep !=null && ep.isPublished()) { + if (ep != null && ep.isPublished()) { throw new ServiceAlreadyStartedException(); } @@ -379,7 +379,7 @@ public class SubscriptionCallbackListene } @Override - public void finalize() throws Throwable { + protected void finalize() throws Throwable { run(); super.finalize(); @@ -390,6 +390,10 @@ public class SubscriptionCallbackListene */ @Override public void run() { + shutdown(); + } + + private synchronized void shutdown() { if (ep != null && !ep.isPublished()) { log.fatal("Hey, someone should tell the developer to call SubscriptionCallbackListern.stop(...) before ending the program. Stopping endpoint at " + callback); unregisterAllCallbacks(); Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/RMITransport.java URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/RMITransport.java?rev=1540346&r1=1540345&r2=1540346&view=diff ============================================================================== --- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/RMITransport.java (original) +++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/RMITransport.java Sat Nov 9 17:34:10 2013 @@ -68,9 +68,9 @@ public class RMITransport extends Transp String factoryInitial = client.getClientConfig().getHomeNode().getFactoryInitial(); String factoryURLPkgs = client.getClientConfig().getHomeNode().getFactoryURLPkgs(); String factoryNamingProvider = client.getClientConfig().getHomeNode().getFactoryNamingProvider(); - if (factoryInitial!=null && factoryInitial!="") env.setProperty(Property.UDDI_PROXY_FACTORY_INITIAL, factoryInitial); - if (factoryURLPkgs!=null && factoryURLPkgs!="") env.setProperty(Property.UDDI_PROXY_FACTORY_URL_PKS, factoryURLPkgs); - if (factoryNamingProvider!=null && factoryNamingProvider!="") env.setProperty(Property.UDDI_PROXY_PROVIDER_URL, factoryNamingProvider); + if (factoryInitial!=null && !"".equals(factoryInitial)) env.setProperty(Property.UDDI_PROXY_FACTORY_INITIAL, factoryInitial); + if (factoryURLPkgs!=null && !"".equals(factoryURLPkgs)) env.setProperty(Property.UDDI_PROXY_FACTORY_URL_PKS, factoryURLPkgs); + if (factoryNamingProvider!=null && !"".equals(factoryNamingProvider)) env.setProperty(Property.UDDI_PROXY_PROVIDER_URL, factoryNamingProvider); logger.debug("Initial Context using env=" + env.toString()); context = new InitialContext(env); } Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/RequestHandler.java URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/RequestHandler.java?rev=1540346&r1=1540345&r2=1540346&view=diff ============================================================================== --- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/RequestHandler.java (original) +++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/RequestHandler.java Sat Nov 9 17:34:10 2013 @@ -30,8 +30,6 @@ import javax.xml.transform.dom.DOMSource import javax.xml.transform.stream.StreamResult; import javax.xml.ws.Holder; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.juddi.jaxb.JAXBMarshaller; import org.uddi.api_v3.AssertionStatusItem; import org.uddi.api_v3.AssertionStatusReport; @@ -115,7 +113,7 @@ public class RequestHandler return version; } - public static String getText(Element element) throws TransformerException + public static synchronized String getText(Element element) throws TransformerException { if (transFactory == null) { transFactory = TransformerFactory.newInstance(); Modified: juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/WADL2UDDITest.java URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/WADL2UDDITest.java?rev=1540346&r1=1540345&r2=1540346&view=diff ============================================================================== --- juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/WADL2UDDITest.java (original) +++ juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/WADL2UDDITest.java Sat Nov 9 17:34:10 2013 @@ -54,7 +54,7 @@ public class WADL2UDDITest { Application app = WADL2UDDI.ParseWadl(new File("src/test/resources/wadl/cxf.wadl")); Assert.assertNotNull(app); Assert.assertNotNull(app); - List<URL> urls = WADL2UDDI.GetBaseAddresses(app); + List<URL> urls = WADL2UDDI.getBaseAddresses(app); URL url = urls.get(0); String domain = url.getHost(); PrintUDDI<TModel> tmodelPrinter = new PrintUDDI<TModel>(); @@ -133,10 +133,10 @@ public class WADL2UDDITest { org.junit.Assume.assumeTrue(b); - Application app = WADL2UDDI.ParseWadl(new URL("http://svn.apache.org/repos/asf/cxf/trunk/systests/jaxrs/src/test/resources/wadl/bookstoreImportResource.wadl";)); + Application app = WADL2UDDI.parseWadl(new URL("http://svn.apache.org/repos/asf/cxf/trunk/systests/jaxrs/src/test/resources/wadl/bookstoreImportResource.wadl";)); Assert.assertNotNull(app); Assert.assertNotNull(app); - List<URL> urls = WADL2UDDI.GetBaseAddresses(app); + List<URL> urls = WADL2UDDI.getBaseAddresses(app); URL url = urls.get(0); String domain = url.getHost(); PrintUDDI<TModel> tmodelPrinter = new PrintUDDI<TModel>(); Modified: juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/WSDL2UDDITest.java URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/WSDL2UDDITest.java?rev=1540346&r1=1540345&r2=1540346&view=diff ============================================================================== --- juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/WSDL2UDDITest.java (original) +++ juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/WSDL2UDDITest.java Sat Nov 9 17:34:10 2013 @@ -18,6 +18,8 @@ import java.util.HashSet; import java.util.Map; import java.util.Properties; import java.util.Set; +import java.util.logging.Level; +import java.util.logging.Logger; import javax.wsdl.Binding; import javax.wsdl.Definition; @@ -40,6 +42,25 @@ public class WSDL2UDDITest { PrintUDDI<TModel> pTModel = new PrintUDDI<TModel>(); ReadWSDL rw = new ReadWSDL(); + @Test + public void Nulltest1() + { + try { + WSDL2UDDI wsdl2UDDI = new WSDL2UDDI(null, null, new Properties()); + } catch (ConfigurationException ex) { + Logger.getLogger(WSDL2UDDITest.class.getName()).log(Level.SEVERE, null, ex); + } + } + @Test(expected = IllegalArgumentException.class) + public void Nulltest2() + { + try { + WSDL2UDDI wsdl2UDDI = new WSDL2UDDI(null, new URLLocalizerDefaultImpl(), null); + } catch (ConfigurationException ex) { + + } + + } @Test public void testUDDIBindingModel() throws WSDLException, JAXBException, ConfigurationException , Exception{ Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/InquiryHelper.java URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/InquiryHelper.java?rev=1540346&r1=1540345&r2=1540346&view=diff ============================================================================== --- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/InquiryHelper.java (original) +++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/InquiryHelper.java Sat Nov 9 17:34:10 2013 @@ -233,7 +233,7 @@ public class InquiryHelper { int returnedRowCount = 0; - while (currentIndex < queryResults.size()) { + while (queryResults!=null && currentIndex < queryResults.size()) { Object item = queryResults.get(currentIndex); org.apache.juddi.model.BusinessEntity modelBusinessEntity = (org.apache.juddi.model.BusinessEntity)item; @@ -265,7 +265,7 @@ public class InquiryHelper { // If the loop was broken prematurely (max row count hit) we set the subscriptionStartIndex to the next index to start with. // Otherwise, set it to null so the subscription call won't trigger chunk token generation. - if (currentIndex < (queryResults.size() - 1)) { + if (queryResults!=null && currentIndex < (queryResults.size() - 1)) { if (subscriptionStartIndex != null) subscriptionStartIndex.value = currentIndex + 1; } @@ -322,7 +322,7 @@ public class InquiryHelper { int returnedRowCount = 0; if (logger.isDebugEnabled()) logger.debug("Period = " + modifiedAfter + " ---- " + modifiedBefore); - while (currentIndex < queryResults.size()) { + while (queryResults!=null && currentIndex < queryResults.size()) { Object item = queryResults.get(currentIndex); org.apache.juddi.model.BusinessService modelBusinessService = (org.apache.juddi.model.BusinessService)item; @@ -354,7 +354,7 @@ public class InquiryHelper { // If the loop was broken prematurely (max row count hit) we set the subscriptionStartIndex to the next index to start with. // Otherwise, set it to null so the subscription call won't trigger chunk token generation. - if (currentIndex < (queryResults.size() - 1)) { + if (queryResults!=null && currentIndex < (queryResults.size() - 1)) { if (subscriptionStartIndex != null) subscriptionStartIndex.value = currentIndex + 1; } @@ -400,7 +400,7 @@ public class InquiryHelper { int returnedRowCount = 0; - while (currentIndex < queryResults.size()) { + while (queryResults!=null && currentIndex < queryResults.size()) { Object item = queryResults.get(currentIndex); org.apache.juddi.model.Tmodel modelTModel = (org.apache.juddi.model.Tmodel)item; @@ -432,7 +432,7 @@ public class InquiryHelper { // If the loop was broken prematurely (max row count hit) we set the subscriptionStartIndex to the next index to start with. // Otherwise, set it to null so the subscription call won't trigger chunk token generation. - if (currentIndex < (queryResults.size() - 1)) { + if (queryResults!=null && currentIndex < (queryResults.size() - 1)) { if (subscriptionStartIndex != null) subscriptionStartIndex.value = currentIndex + 1; } Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/Install.java URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/Install.java?rev=1540346&r1=1540345&r2=1540346&view=diff ============================================================================== --- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/Install.java (original) +++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/Install.java Sat Nov 9 17:34:10 2013 @@ -74,7 +74,7 @@ public class Install { public static final String FILE_PERSISTENCE = "persistence.xml"; public static final String JUDDI_INSTALL_DATA_DIR = "juddi_install_data/"; public static final String JUDDI_CUSTOM_INSTALL_DATA_DIR = "juddi_custom_install_data/"; - public static Log log = LogFactory.getLog(Install.class); + public static final Log log = LogFactory.getLog(Install.class); protected static void install(Configuration config) throws JAXBException, DispositionReportFaultMessage, IOException, ConfigurationException { @@ -88,7 +88,7 @@ public class Install { boolean seedAlways = config.getBoolean("juddi.seed.always", false); boolean alreadyInstalled = alreadyInstalled(config); if (!seedAlways && alreadyInstalled) - new FatalErrorException(new ErrorMessage("errors.install.AlreadyInstalled")); + throw new FatalErrorException(new ErrorMessage("errors.install.AlreadyInstalled")); String rootPublisherStr = config.getString(Property.JUDDI_ROOT_PUBLISHER); @@ -541,22 +541,25 @@ public class Install { } else { String[] paths = {}; Enumeration<JarEntry> en = null; + JarFile jf = null; try { if (path.indexOf("!") > 0) { paths = path.split("!"); - en = new JarFile(new File(new URI(paths[0]))).entries(); + jf=new JarFile(new File(new URI(paths[0]))); + en = jf.entries(); } else { // Handle Windows / jboss-5.1.0 case if (path.indexOf(".jar") > 0) { paths = path.split(".jar"); paths[0] = paths[0] + ".jar"; - en = new JarFile(new File(paths[0])).entries(); + jf= new JarFile(new File(paths[0])); + en = jf.entries(); } } if (paths.length > 0) { log.debug("Discovering the Publisher XML data files in jar: " + paths[0]); - while (en.hasMoreElements()) { + while (en!=null && en.hasMoreElements()) { String name = en.nextElement().getName(); if (name.endsWith(FILE_PUBLISHER)) { log.debug("Found publisher file=" + name); @@ -569,6 +572,9 @@ public class Install { } else { log.info("No custom configuration files where found in " + path); } + if (jf!=null) + jf.close(); + } catch (IOException e) { throw new ConfigurationException(e); } catch (URISyntaxException e) { Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/cryptor/CryptorFactory.java URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/cryptor/CryptorFactory.java?rev=1540346&r1=1540345&r2=1540346&view=diff ============================================================================== --- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/cryptor/CryptorFactory.java (original) +++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/cryptor/CryptorFactory.java Sat Nov 9 17:34:10 2013 @@ -14,7 +14,6 @@ * limitations under the License. * */ - package org.apache.juddi.cryptor; import org.apache.commons.configuration.ConfigurationException; @@ -26,98 +25,99 @@ import org.apache.juddi.config.Property; import org.apache.juddi.v3.client.cryptor.Cryptor; /** - * Used to create the org.apache.juddi.cryptor.Cryptor implementation - * as specified by the 'juddi.cryptor' property. Defaults to + * Used to create the org.apache.juddi.cryptor.Cryptor implementation as + * specified by the 'juddi.cryptor' property. Defaults to * org.apache.juddi.cryptor.DefaultCryptor if an implementation is not - * specified. + * specified.<Br> + * <br> * + * @deprecated Use org.apache.juddi.v3.client.cryptor.CryptorFactor * @author Steve Viens ([email protected]) * @author <a href="mailto:[email protected]";>Jeff Faath</a> */ +@Deprecated public abstract class CryptorFactory { - private static Log log = LogFactory.getLog(CryptorFactory.class); - // the shared Cryptor instance - private static Cryptor cryptor = null; + private static Log log = LogFactory.getLog(CryptorFactory.class); + // the shared Cryptor instance + private static Cryptor cryptor = null; + + /* + * Returns a new instance of a CryptorFactory. + * + * @return Cryptor + */ + public static synchronized Cryptor getCryptor() { + if (cryptor == null) { + cryptor = createCryptor(); + } + return cryptor; + } + + public static synchronized Cryptor getCryptor(String className) throws Exception { + Class<?> cryptorClass = null; + try { + // Use Loader to locate & load the Cryptor implementation + cryptorClass = ClassUtil.forName(className, CryptorFactory.class); + } catch (ClassNotFoundException e) { + log.error("The specified Cryptor class '" + className + "' was not found in classpath."); + log.error(e); + throw e; + } + + try { + // try to instantiate the Cryptor implementation + cryptor = (Cryptor) cryptorClass.newInstance(); + } catch (Exception e) { + log.error("Exception while attempting to instantiate the implementation of Cryptor: " + cryptorClass.getName() + "\n" + e.getMessage()); + log.error(e); + throw e; + } + + return cryptor; + } + + /* + * Returns a new instance of a Cryptor. + * + * @return Cryptor + */ + private static synchronized Cryptor createCryptor() { + if (cryptor != null) { + return cryptor; + } + + // grab class name of the Cryptor implementation to create + String className = Property.DEFAULT_CRYPTOR; + try { + // grab class name of the Authenticator implementation to create + className = AppConfig.getConfiguration().getString(Property.JUDDI_CRYPTOR, Property.DEFAULT_CRYPTOR); + } catch (ConfigurationException ce) { + log.error("Configuration exception occurred retrieving: " + Property.JUDDI_CRYPTOR, ce); + } + + // write the Cryptor implementation name to the log + log.debug("Cryptor Implementation = " + className); + + Class<?> cryptorClass = null; + try { + // Use Loader to locate & load the Cryptor implementation + cryptorClass = ClassUtil.forName(className, CryptorFactory.class); + } catch (ClassNotFoundException e) { + log.error("The specified Cryptor class '" + className + "' was not found in classpath."); + log.error(e); + } + + if (cryptorClass != null) { + try { + // try to instantiate the Cryptor implementation + cryptor = (Cryptor) cryptorClass.newInstance(); + } catch (Exception e) { + log.error("Exception while attempting to instantiate the implementation of Cryptor: " + cryptorClass.getName() + "\n" + e.getMessage()); + log.error(e); + } + } - /* - * Returns a new instance of a CryptorFactory. - * - * @return Cryptor - */ - public static Cryptor getCryptor() { - if (cryptor == null) - cryptor = createCryptor(); - return cryptor; - } - - - public static Cryptor getCryptor(String className) throws Exception { - Class<?> cryptorClass = null; - try { - // Use Loader to locate & load the Cryptor implementation - cryptorClass = ClassUtil.forName(className, CryptorFactory.class); - } - catch(ClassNotFoundException e) { - log.error("The specified Cryptor class '" + className + "' was not found in classpath."); - log.error(e); - throw e; - } - - try { - // try to instantiate the Cryptor implementation - cryptor = (Cryptor)cryptorClass.newInstance(); - } - catch(Exception e) { - log.error("Exception while attempting to instantiate the implementation of Cryptor: " + cryptorClass.getName() + "\n" + e.getMessage()); - log.error(e); - throw e; - } - - return cryptor; - } - - /* - * Returns a new instance of a Cryptor. - * - * @return Cryptor - */ - private static synchronized Cryptor createCryptor() { - if (cryptor != null) - return cryptor; - - // grab class name of the Cryptor implementation to create - String className = Property.DEFAULT_CRYPTOR; - try { - // grab class name of the Authenticator implementation to create - className = AppConfig.getConfiguration().getString(Property.JUDDI_CRYPTOR, Property.DEFAULT_CRYPTOR); - } - catch(ConfigurationException ce) { - log.error("Configuration exception occurred retrieving: " + Property.JUDDI_CRYPTOR, ce); - } - - // write the Cryptor implementation name to the log - log.debug("Cryptor Implementation = " + className); - - Class<?> cryptorClass = null; - try { - // Use Loader to locate & load the Cryptor implementation - cryptorClass = ClassUtil.forName(className, CryptorFactory.class); - } - catch(ClassNotFoundException e) { - log.error("The specified Cryptor class '" + className + "' was not found in classpath."); - log.error(e); - } - - try { - // try to instantiate the Cryptor implementation - cryptor = (Cryptor)cryptorClass.newInstance(); - } - catch(Exception e) { - log.error("Exception while attempting to instantiate the implementation of Cryptor: " + cryptorClass.getName() + "\n" + e.getMessage()); - log.error(e); - } - - return cryptor; - } + return cryptor; + } } \ No newline at end of file Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/keygen/KeyGeneratorFactory.java URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/keygen/KeyGeneratorFactory.java?rev=1540346&r1=1540345&r2=1540346&view=diff ============================================================================== --- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/keygen/KeyGeneratorFactory.java (original) +++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/keygen/KeyGeneratorFactory.java Sat Nov 9 17:34:10 2013 @@ -17,8 +17,6 @@ package org.apache.juddi.keygen; -import java.util.logging.Level; -import java.util.logging.Logger; import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -48,13 +46,13 @@ public abstract class KeyGeneratorFactor * * @return KeyGenerator */ - public static KeyGenerator getKeyGenerator() { + public static synchronized KeyGenerator getKeyGenerator() { if (keyGenerator == null) keyGenerator = createKeyGenerator(); return keyGenerator; } - public static KeyGenerator forceNewKeyGenerator() { + public static synchronized KeyGenerator forceNewKeyGenerator() { keyGenerator = null; keyGenerator = createKeyGenerator(); return keyGenerator; @@ -101,7 +99,7 @@ public abstract class KeyGeneratorFactor } catch(IllegalAccessException iae) { throw new RuntimeException("The specified Key Generator class '" + className + "' cannot be instantiated due to illegal access.",iae); } catch(Exception e) { - throw new RuntimeException("Exception while attempting to instantiate the implementation of Key Generator: " + keygenClass.getName() + "\n" + e.getMessage()); + throw new RuntimeException("Exception while attempting to instantiate the implementation of Key Generator: " + className + "\n" + e.getMessage()); } return keyGenerator; Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java?rev=1540346&r1=1540345&r2=1540346&view=diff ============================================================================== --- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java (original) +++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java Sat Nov 9 17:34:10 2013 @@ -648,7 +648,7 @@ public class MappingApiToModel { org.uddi.api_v3.OverviewURL elem = apiOverviewDoc.getOverviewURL(); if (elem instanceof org.uddi.api_v3.OverviewURL) { - org.uddi.api_v3.OverviewURL overviewURL = (org.uddi.api_v3.OverviewURL) elem; + org.uddi.api_v3.OverviewURL overviewURL = elem; modelOverviewDoc.setOverviewUrl(overviewURL.getValue()); modelOverviewDoc.setOverviewUrlUseType(overviewURL.getUseType()); } Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/PublisherAssertionId.java URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/PublisherAssertionId.java?rev=1540346&r1=1540345&r2=1540346&view=diff ============================================================================== --- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/PublisherAssertionId.java (original) +++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/PublisherAssertionId.java Sat Nov 9 17:34:10 2013 @@ -63,11 +63,11 @@ public class PublisherAssertionId implem return false; PublisherAssertionId castOther = (PublisherAssertionId) other; - return ((this.getFromKey() == castOther.getFromKey()) || (this + return ((this.getFromKey() == null ? castOther.getFromKey() == null : this.getFromKey().equals(castOther.getFromKey())) || (this .getFromKey() != null && castOther.getFromKey() != null && this.getFromKey().equals( castOther.getFromKey()))) - && ((this.getToKey() == castOther.getToKey()) || (this + && ((this.getToKey() == null ? castOther.getToKey() == null : this.getToKey().equals(castOther.getToKey())) || (this .getToKey() != null && castOther.getToKey() != null && this.getToKey() .equals(castOther.getToKey()))); Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/util/KeyedRefGroupTModelComparator.java URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/util/KeyedRefGroupTModelComparator.java?rev=1540346&r1=1540345&r2=1540346&view=diff ============================================================================== --- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/util/KeyedRefGroupTModelComparator.java (original) +++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/util/KeyedRefGroupTModelComparator.java Sat Nov 9 17:34:10 2013 @@ -17,13 +17,15 @@ package org.apache.juddi.query.util; +import java.io.Serializable; import java.util.Comparator; import org.uddi.api_v3.KeyedReferenceGroup; /** * @author <a href="mailto:[email protected]";>Jeff Faath</a> */ -public class KeyedRefGroupTModelComparator implements Comparator<KeyedReferenceGroup> { +public class KeyedRefGroupTModelComparator implements Comparator<KeyedReferenceGroup>, Serializable { + private static final long serialVersionUID = 1L; public int compare(KeyedReferenceGroup krg1, KeyedReferenceGroup krg2) { if (krg1 == null && krg2 == null) Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/util/KeyedRefTModelComparator.java URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/util/KeyedRefTModelComparator.java?rev=1540346&r1=1540345&r2=1540346&view=diff ============================================================================== --- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/util/KeyedRefTModelComparator.java (original) +++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/util/KeyedRefTModelComparator.java Sat Nov 9 17:34:10 2013 @@ -17,13 +17,15 @@ package org.apache.juddi.query.util; +import java.io.Serializable; import java.util.Comparator; import org.uddi.api_v3.KeyedReference; /** * @author <a href="mailto:[email protected]";>Jeff Faath</a> */ -public class KeyedRefTModelComparator implements Comparator<KeyedReference> { +public class KeyedRefTModelComparator implements Comparator<KeyedReference>, Serializable { + private static final long serialVersionUID = 1L; public int compare(KeyedReference kr1, KeyedReference kr2) { if (kr1 == null && kr2 == null) Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/rmi/JNDIRegistration.java URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/rmi/JNDIRegistration.java?rev=1540346&r1=1540345&r2=1540346&view=diff ============================================================================== --- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/rmi/JNDIRegistration.java (original) +++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/rmi/JNDIRegistration.java Sat Nov 9 17:34:10 2013 @@ -27,14 +27,14 @@ import org.apache.commons.logging.LogFac */ public class JNDIRegistration { - public static String JUDDI = "/juddiv3"; - public static String UDDI_SECURITY_SERVICE = JUDDI + "/UDDISecurityService"; - public static String UDDI_PUBLICATION_SERVICE = JUDDI + "/UDDIPublicationService"; - public static String UDDI_INQUIRY_SERVICE = JUDDI + "/UDDIInquiryService"; - public static String UDDI_SUBSCRIPTION_SERVICE = JUDDI + "/UDDISubscriptionService"; - public static String UDDI_SUBSCRIPTION_LISTENER_SERVICE = JUDDI + "/UDDISubscriptionListenerService"; - public static String UDDI_CUSTODY_TRANSFER_SERVICE = JUDDI + "/UDDICustodyTransferService"; - public static String JUDDI_PUBLISHER_SERVICE = JUDDI + "/JUDDIApiService"; + public static final String JUDDI = "/juddiv3"; + public static final String UDDI_SECURITY_SERVICE = JUDDI + "/UDDISecurityService"; + public static final String UDDI_PUBLICATION_SERVICE = JUDDI + "/UDDIPublicationService"; + public static final String UDDI_INQUIRY_SERVICE = JUDDI + "/UDDIInquiryService"; + public static final String UDDI_SUBSCRIPTION_SERVICE = JUDDI + "/UDDISubscriptionService"; + public static final String UDDI_SUBSCRIPTION_LISTENER_SERVICE = JUDDI + "/UDDISubscriptionListenerService"; + public static final String UDDI_CUSTODY_TRANSFER_SERVICE = JUDDI + "/UDDICustodyTransferService"; + public static final String JUDDI_PUBLISHER_SERVICE = JUDDI + "/JUDDIApiService"; private UDDISecurityService securityService = null; private UDDIPublicationService publicationService = null; Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/rmi/RMIRegistration.java URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/rmi/RMIRegistration.java?rev=1540346&r1=1540345&r2=1540346&view=diff ============================================================================== --- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/rmi/RMIRegistration.java (original) +++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/rmi/RMIRegistration.java Sat Nov 9 17:34:10 2013 @@ -29,14 +29,14 @@ import org.apache.commons.logging.LogFac */ public class RMIRegistration { - public static String JUDDI = "/juddiv3"; - public static String UDDI_SECURITY_SERVICE = JUDDI + "/UDDISecurityService"; - public static String UDDI_PUBLICATION_SERVICE = JUDDI + "/UDDIPublicationService"; - public static String UDDI_INQUIRY_SERVICE = JUDDI + "/UDDIInquiryService"; - public static String UDDI_SUBSCRIPTION_SERVICE = JUDDI + "/UDDISubscriptionService"; - public static String UDDI_SUBSCRIPTION_LISTENER_SERVICE = JUDDI + "/UDDISubscriptionListenerService"; - public static String UDDI_CUSTODY_TRANSFER_SERVICE = JUDDI + "/UDDICustodyTransferService"; - public static String JUDDI_PUBLISHER_SERVICE = JUDDI + "/JUDDIApiService"; + public static final String JUDDI = "/juddiv3"; + public static final String UDDI_SECURITY_SERVICE = JUDDI + "/UDDISecurityService"; + public static final String UDDI_PUBLICATION_SERVICE = JUDDI + "/UDDIPublicationService"; + public static final String UDDI_INQUIRY_SERVICE = JUDDI + "/UDDIInquiryService"; + public static final String UDDI_SUBSCRIPTION_SERVICE = JUDDI + "/UDDISubscriptionService"; + public static final String UDDI_SUBSCRIPTION_LISTENER_SERVICE = JUDDI + "/UDDISubscriptionListenerService"; + public static final String UDDI_CUSTODY_TRANSFER_SERVICE = JUDDI + "/UDDICustodyTransferService"; + public static final String JUDDI_PUBLISHER_SERVICE = JUDDI + "/JUDDIApiService"; private UDDISecurityService securityService = null; private UDDIPublicationService publicationService = null; Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/subscription/notify/JNDI_RMINotifier.java URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/subscription/notify/JNDI_RMINotifier.java?rev=1540346&r1=1540345&r2=1540346&view=diff ============================================================================== --- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/subscription/notify/JNDI_RMINotifier.java (original) +++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/subscription/notify/JNDI_RMINotifier.java Sat Nov 9 17:34:10 2013 @@ -28,7 +28,7 @@ public class JNDI_RMINotifier implements Log log = LogFactory.getLog(this.getClass()); UDDISubscriptionListenerPortType subscriptionListenerPort = null; - public static String JNDI_RMI_TRANSPORT_KEY = "uddi:uddi.org:transport:jndi-rmi"; + public static final String JNDI_RMI_TRANSPORT_KEY = "uddi:uddi.org:transport:jndi-rmi"; public JNDI_RMINotifier(BindingTemplate bindingTemplate) throws IOException, URISyntaxException, NotBoundException, NamingException, JAXBException { Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/subscription/notify/NotifierFactory.java URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/subscription/notify/NotifierFactory.java?rev=1540346&r1=1540345&r2=1540346&view=diff ============================================================================== --- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/subscription/notify/NotifierFactory.java (original) +++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/subscription/notify/NotifierFactory.java Sat Nov 9 17:34:10 2013 @@ -17,7 +17,7 @@ import org.apache.juddi.model.TmodelInst public class NotifierFactory { Log log = LogFactory.getLog(this.getClass()); - public static String UDDI_TRANSPORT_KEY = "uddi:uddi.org:transport:"; + public static final String UDDI_TRANSPORT_KEY = "uddi:uddi.org:transport:"; public Notifier getNotifier(BindingTemplate bindingTemplate) throws URISyntaxException, IllegalArgumentException, SecurityException, @@ -36,7 +36,7 @@ public class NotifierFactory { } if (notifierClassName == null) { //JUDDI-496 TODO make sure the tModel is loaded - log.error("The bindingTemplate " + bindingTemplate.getEntityKey() + " does not contain a tModel to define its type of transport. Defaulting " + log.warn("The bindingTemplate " + bindingTemplate.getEntityKey() + " does not contain a tModel to define its type of transport. Defaulting " + "to http."); //JUDDI-596, attempt http transport, even if a transport isn't specified notifierClassName = "org.apache.juddi.subscription.notify.HTTPNotifier"; Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/subscription/notify/SMTPNotifier.java URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/subscription/notify/SMTPNotifier.java?rev=1540346&r1=1540345&r2=1540346&view=diff ============================================================================== --- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/subscription/notify/SMTPNotifier.java (original) +++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/subscription/notify/SMTPNotifier.java Sat Nov 9 17:34:10 2013 @@ -41,7 +41,7 @@ public class SMTPNotifier implements Not Log log = LogFactory.getLog(this.getClass()); String notificationEmailAddress = null; - String from = null; + //String from = null; Session session = null; Properties properties = null; @@ -70,9 +70,11 @@ public class SMTPNotifier implements Not log.info("Path="+ path); File tmpFile = new File(path + "/juddi-mail.properties"); if (tmpFile.exists()) { + FileInputStream fis = null; try { Properties fileProperties = new Properties(); - fileProperties.load(new FileInputStream(tmpFile)); + fis = new FileInputStream(tmpFile); + fileProperties.load(fis); for (String key: mailProps) { if (fileProperties.containsKey(mailPrefix + key)) { properties.put(key, fileProperties.get(mailPrefix + key)); @@ -80,8 +82,15 @@ public class SMTPNotifier implements Not } } catch (Exception e) { // TODO Auto-generated catch block - e.printStackTrace(); + log.warn("Unable to load mail properties",e); } + finally{ + if (fis!=null) + try { + fis.close(); + } catch (Exception ex) { + } + } log.info("TEST only: Reading properties from " + tmpFile.getAbsolutePath() + ":" + properties); } } Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/v3/auth/AuthenticatorFactory.java URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/v3/auth/AuthenticatorFactory.java?rev=1540346&r1=1540345&r2=1540346&view=diff ============================================================================== --- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/v3/auth/AuthenticatorFactory.java (original) +++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/v3/auth/AuthenticatorFactory.java Sat Nov 9 17:34:10 2013 @@ -44,7 +44,7 @@ public class AuthenticatorFactory { * * @return Authenticator */ - public static Authenticator getAuthenticator() { + public static synchronized Authenticator getAuthenticator() { if (auth == null) auth = createAuthenticator(); return auth; @@ -90,7 +90,7 @@ public class AuthenticatorFactory { } } catch(Exception e) { - log.error("Exception while attempting to instantiate the implementation of Authenticator: " + authClass.getName() + "\n" + e.getMessage()); + log.error("Exception while attempting to instantiate the implementation of Authenticator: " + className + "\n" + e.getMessage()); log.error(e); } Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateInquiry.java URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateInquiry.java?rev=1540346&r1=1540345&r2=1540346&view=diff ============================================================================== --- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateInquiry.java (original) +++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateInquiry.java Sat Nov 9 17:34:10 2013 @@ -408,7 +408,6 @@ public class ValidateInquiry extends Val throw new ValueNotAllowedException(new ErrorMessage("errors.keyedreference.NullInput")); // Keyed references must contain a tModelKey and keyValue - if (kr instanceof org.uddi.api_v3.KeyedReference) { if (kr.getTModelKey() == null || kr.getTModelKey().length() == 0) throw new ValueNotAllowedException(new ErrorMessage("errors.keyedreference.NoTModelKey")); @@ -417,7 +416,6 @@ public class ValidateInquiry extends Val if (kr.getKeyValue() == null || kr.getKeyValue().length() == 0) throw new ValueNotAllowedException(new ErrorMessage("errors.keyedreference.NoKeyValue")); - } } private void validateFindQualifiers(org.uddi.api_v3.FindQualifiers findQualifiers) throws DispositionReportFaultMessage { Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java?rev=1540346&r1=1540345&r2=1540346&view=diff ============================================================================== --- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java (original) +++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java Sat Nov 9 17:34:10 2013 @@ -20,7 +20,6 @@ import java.net.MalformedURLException; import java.net.URL; import java.util.HashSet; import java.util.List; -import java.util.Set; import javax.persistence.EntityManager; import javax.persistence.EntityTransaction; @@ -98,7 +97,6 @@ public class ValidatePublish extends Val * set this to true if */ private Log log = LogFactory.getLog(this.getClass()); - Set<String> buildInTmodels = null; public ValidatePublish(UddiEntityPublisher publisher) { super(publisher); @@ -993,7 +991,8 @@ public class ValidatePublish extends Val // TODO: validate "checked" categories or category groups (see section 5.2.3 of spec)? optional to support - if (tModel.getName() == null || tModel.getName().equals("")) { + if (tModel.getName() == null || tModel.getName().getValue()==null || + tModel.getName().getValue().equals("")) { throw new ValueNotAllowedException(new ErrorMessage("errors.tmodel.NoName")); } @@ -1536,7 +1535,7 @@ public class ValidatePublish extends Val } else if (value.getUseType().equalsIgnoreCase(AccessPointType.HOSTING_REDIRECTOR.toString())) { try { //no validation necessary other than confirm that it's a URL - URL url = new URL(value.getValue()); + new URL(value.getValue()); } catch (MalformedURLException ex) { throw new ValueNotAllowedException(new ErrorMessage("errors.accessPoint.hostingRedirector.notaurl")); } Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateUDDIKey.java URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateUDDIKey.java?rev=1540346&r1=1540345&r2=1540346&view=diff ============================================================================== --- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateUDDIKey.java (original) +++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateUDDIKey.java Sat Nov 9 17:34:10 2013 @@ -85,8 +85,8 @@ public class ValidateUDDIKey { if (elems != null && elems.size() == 1) { org.uddi.api_v3.KeyedReference elem = elems.get(0); if (elem != null) { - if (elem != null && elem instanceof org.uddi.api_v3.KeyedReference) { - String keyedValue = ((org.uddi.api_v3.KeyedReference)elem).getKeyValue(); + if (elem instanceof org.uddi.api_v3.KeyedReference) { + String keyedValue = elem.getKeyValue(); if (keyedValue != null) { if (keyedValue.equalsIgnoreCase(KeyGenerator.KEYGENERATOR_SUFFIX)) return; Modified: juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/WadlImport.java URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/WadlImport.java?rev=1540346&r1=1540345&r2=1540346&view=diff ============================================================================== --- juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/WadlImport.java (original) +++ juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/WadlImport.java Sat Nov 9 17:34:10 2013 @@ -100,10 +100,10 @@ public class WadlImport { //in either case, we're going to have to parse the WSDL - //Application app = WADL2UDDI.ParseWadl(new URL("http://server/wsdl.wsdl";), "username", "password", clerkManager.getClientConfig().isX_To_Wsdl_Ignore_SSL_Errors() ); + //Application app = WADL2UDDI.parseWadl(new URL("http://server/wsdl.wsdl";), "username", "password", clerkManager.getClientConfig().isX_To_Wsdl_Ignore_SSL_Errors() ); Application app = WADL2UDDI.ParseWadl(new File("diggo.wadl")); - List<URL> urls = WADL2UDDI.GetBaseAddresses(app); + List<URL> urls = WADL2UDDI.getBaseAddresses(app); URL url = urls.get(0); String domain = url.getHost(); PrintUDDI<TModel> tmodelPrinter = new PrintUDDI<TModel>(); Modified: juddi/trunk/juddi-rest-cxf/src/main/java/org/apache/juddi/api/impl/rest/UDDIInquiryJAXRS.java URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-rest-cxf/src/main/java/org/apache/juddi/api/impl/rest/UDDIInquiryJAXRS.java?rev=1540346&r1=1540345&r2=1540346&view=diff ============================================================================== --- juddi/trunk/juddi-rest-cxf/src/main/java/org/apache/juddi/api/impl/rest/UDDIInquiryJAXRS.java (original) +++ juddi/trunk/juddi-rest-cxf/src/main/java/org/apache/juddi/api/impl/rest/UDDIInquiryJAXRS.java Sat Nov 9 17:34:10 2013 @@ -21,8 +21,6 @@ import java.net.URL; import java.util.ArrayList; import java.util.List; import java.util.Properties; -import java.util.logging.Level; -import java.util.logging.Logger; import javax.ws.rs.*; import javax.wsdl.Definition; import org.apache.commons.logging.Log; @@ -255,7 +253,7 @@ public class UDDIInquiryJAXRS { GetBindingDetail req = new GetBindingDetail(); req.getBindingKey().add(id); try { - BindingDetail bindingDetail = inquiry.getBindingDetail(null); + BindingDetail bindingDetail = inquiry.getBindingDetail(req); return bindingDetail.getBindingTemplate().get(0); } catch (DispositionReportFaultMessage ex) { HandleException(ex); @@ -305,7 +303,7 @@ public class UDDIInquiryJAXRS { throw new WebApplicationException(400); } else { List<URI> endpoints = GetEndpoints(serviceDetail, null); - + ret.addAll(endpoints); } } catch (DispositionReportFaultMessage ex) { HandleException(ex); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
