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 2014/01/05 20:04:15 UTC
svn commit: r1555613 - in /juddi/trunk:
juddi-client/src/main/java/org/apache/juddi/v3/client/compare/
juddi-client/src/main/java/org/apache/juddi/v3/client/config/
juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/
juddi-client/src/main/ja...
Author: kstam
Date: Sun Jan 5 19:04:14 2014
New Revision: 1555613
URL: http://svn.apache.org/r1555613
Log:
JUDDI-765 refactoring the packages
Added:
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/compare/
- copied from r1555600, juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/util/
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/compare/TModelInstanceDetailsComparator.java
- copied, changed from r1555612, juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/util/TModelInstanceDetailsComparator.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/
- copied from r1555600, juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mappings/wadl/
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/WADL2UDDI.java
- copied, changed from r1555600, juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/WADL2UDDI.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wsdl/
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wsdl/BPEL2UDDI.java
- copied, changed from r1555612, juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/BPEL2UDDI.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wsdl/ReadWSDL.java
- copied, changed from r1555600, juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/ReadWSDL.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wsdl/WSDL2UDDI.java
- copied, changed from r1555600, juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/WSDL2UDDI.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wsdl/WSDLLocatorImpl.java
- copied, changed from r1555600, juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/WSDLLocatorImpl.java
juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/compare/
- copied from r1555600, juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/util/
juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/wsdl/
juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/wsdl/BPEL2UDDITest.java
- copied, changed from r1555600, juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/BPEL2UDDITest.java
juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/wsdl/ReadWSDLTest.java
- copied, changed from r1555600, juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/ReadWSDLTest.java
juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/wsdl/WADL2UDDITest.java
- copied, changed from r1555600, juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/WADL2UDDITest.java
juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/wsdl/WSDL2UDDITest.java
- copied, changed from r1555600, juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/WSDL2UDDITest.java
juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/wsdl/WSDLLocatorTest.java
- copied, changed from r1555600, juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/WSDLLocatorTest.java
juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/wsdl/WSDLinaUDDIRegistryTest.java
- copied, changed from r1555600, juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/WSDLinaUDDIRegistryTest.java
Removed:
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/BPEL2UDDI.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/ReadWSDL.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/WADL2UDDI.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/WSDL2UDDI.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/WSDLLocatorImpl.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mappings/
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/util/
juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/BPEL2UDDITest.java
juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/ReadWSDLTest.java
juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/WADL2UDDITest.java
juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/WSDL2UDDITest.java
juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/WSDLLocatorTest.java
juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/WSDLinaUDDIRegistryTest.java
juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/util/
Modified:
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerk.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/AsyncRegistration.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/UDDIClientSubscriptionListenerImpl.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/UDDIServiceCache.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/Application.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/Doc.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/Grammars.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/HTTPMethods.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/Include.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/Link.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/Method.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/ObjectFactory.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/Option.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/Param.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/ParamStyle.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/Representation.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/Request.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/Resource.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/ResourceType.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/Resources.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/Response.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/package-info.java
juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/compare/TModelInstanceDetailsComparatorTest.java
juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/ServiceLocatorTest.java
juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/UDDIServiceCacheTest.java
juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_051_BindingTemplateWSDLTest.java
juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiFindEndpoints.java
juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/WadlImport.java
juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/WsdlImport.java
juddi/trunk/juddi-gui/src/main/webapp/ajax/importFromWadl.jsp
juddi/trunk/juddi-rest-cxf/src/main/java/org/apache/juddi/api/impl/rest/UDDIInquiryJAXRS.java
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/bpel/BPEL_020_IntegrationTest.java
Copied: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/compare/TModelInstanceDetailsComparator.java (from r1555612, juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/util/TModelInstanceDetailsComparator.java)
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/compare/TModelInstanceDetailsComparator.java?p2=juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/compare/TModelInstanceDetailsComparator.java&p1=juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/util/TModelInstanceDetailsComparator.java&r1=1555612&r2=1555613&rev=1555613&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/util/TModelInstanceDetailsComparator.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/compare/TModelInstanceDetailsComparator.java Sun Jan 5 19:04:14 2014
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juddi.v3.client.util;
+package org.apache.juddi.v3.client.compare;
import javax.xml.datatype.DatatypeConfigurationException;
import javax.xml.datatype.DatatypeConstants;
Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerk.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerk.java?rev=1555613&r1=1555612&r2=1555613&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerk.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerk.java Sun Jan 5 19:04:14 2014
@@ -45,9 +45,9 @@ import org.apache.juddi.api_v3.SaveClerk
import org.apache.juddi.api_v3.SaveNode;
import org.apache.juddi.v3.client.UDDIConstants;
import org.apache.juddi.v3.client.cryptor.CryptorFactory;
-import org.apache.juddi.v3.client.mapping.ReadWSDL;
import org.apache.juddi.v3.client.mapping.URLLocalizerDefaultImpl;
-import org.apache.juddi.v3.client.mapping.WSDL2UDDI;
+import org.apache.juddi.v3.client.mapping.wsdl.ReadWSDL;
+import org.apache.juddi.v3.client.mapping.wsdl.WSDL2UDDI;
import org.apache.juddi.v3.client.transport.TransportException;
import org.uddi.api_v3.BindingDetail;
import org.uddi.api_v3.BindingTemplate;
@@ -1187,7 +1187,7 @@ public class UDDIClerk implements Serial
if (value.startsWith("http://") || value.startsWith("https://")) {
//here, we need an HTTP Get for WSDLs
- org.apache.juddi.v3.client.mapping.ReadWSDL r = new ReadWSDL();
+ org.apache.juddi.v3.client.mapping.wsdl.ReadWSDL r = new ReadWSDL();
r.setIgnoreSSLErrors(true);
try {
Definition wsdlDefinition = r.readWSDL(new URL(value));
Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/AsyncRegistration.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/AsyncRegistration.java?rev=1555613&r1=1555612&r2=1555613&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/AsyncRegistration.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/AsyncRegistration.java Sun Jan 5 19:04:14 2014
@@ -23,6 +23,8 @@ import java.util.Properties;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.juddi.v3.client.config.UDDIClerk;
+import org.apache.juddi.v3.client.mapping.wsdl.BPEL2UDDI;
+import org.apache.juddi.v3.client.mapping.wsdl.WSDL2UDDI;
public class AsyncRegistration implements Runnable {
Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/UDDIClientSubscriptionListenerImpl.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/UDDIClientSubscriptionListenerImpl.java?rev=1555613&r1=1555612&r2=1555613&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/UDDIClientSubscriptionListenerImpl.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/UDDIClientSubscriptionListenerImpl.java Sun Jan 5 19:04:14 2014
@@ -36,7 +36,6 @@ import org.uddi.v3_service.UDDISubscript
* the UDDI registry when any change to a Service or BindingTemplate
* call in to it.
*
- * @deprecated Use SubscriptionCallbackListener instead
* @author kstam
* @see SubscriptionCallbackListener
*
Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/UDDIServiceCache.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/UDDIServiceCache.java?rev=1555613&r1=1555612&r2=1555613&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/UDDIServiceCache.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/UDDIServiceCache.java Sun Jan 5 19:04:14 2014
@@ -41,6 +41,8 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.juddi.v3.client.config.UDDIClerk;
import org.apache.juddi.v3.client.config.UDDIKeyConvention;
+import org.apache.juddi.v3.client.mapping.wsdl.ReadWSDL;
+import org.apache.juddi.v3.client.mapping.wsdl.WSDL2UDDI;
import org.apache.juddi.v3.client.transport.TransportException;
import org.uddi.api_v3.FindQualifiers;
import org.uddi.api_v3.FindService;
Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/Application.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/Application.java?rev=1555613&r1=1555600&r2=1555613&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/Application.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/Application.java Sun Jan 5 19:04:14 2014
@@ -6,7 +6,7 @@
//
-package org.apache.juddi.v3.client.mappings.wadl;
+package org.apache.juddi.v3.client.mapping.wadl;
import java.util.ArrayList;
import java.util.List;
Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/Doc.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/Doc.java?rev=1555613&r1=1555600&r2=1555613&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/Doc.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/Doc.java Sun Jan 5 19:04:14 2014
@@ -6,7 +6,7 @@
//
-package org.apache.juddi.v3.client.mappings.wadl;
+package org.apache.juddi.v3.client.mapping.wadl;
import java.util.ArrayList;
import java.util.HashMap;
Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/Grammars.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/Grammars.java?rev=1555613&r1=1555600&r2=1555613&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/Grammars.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/Grammars.java Sun Jan 5 19:04:14 2014
@@ -6,7 +6,7 @@
//
-package org.apache.juddi.v3.client.mappings.wadl;
+package org.apache.juddi.v3.client.mapping.wadl;
import java.util.ArrayList;
import java.util.List;
Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/HTTPMethods.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/HTTPMethods.java?rev=1555613&r1=1555600&r2=1555613&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/HTTPMethods.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/HTTPMethods.java Sun Jan 5 19:04:14 2014
@@ -6,7 +6,7 @@
//
-package org.apache.juddi.v3.client.mappings.wadl;
+package org.apache.juddi.v3.client.mapping.wadl;
import javax.xml.bind.annotation.XmlEnum;
import javax.xml.bind.annotation.XmlType;
Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/Include.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/Include.java?rev=1555613&r1=1555600&r2=1555613&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/Include.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/Include.java Sun Jan 5 19:04:14 2014
@@ -6,7 +6,7 @@
//
-package org.apache.juddi.v3.client.mappings.wadl;
+package org.apache.juddi.v3.client.mapping.wadl;
import java.util.ArrayList;
import java.util.HashMap;
Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/Link.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/Link.java?rev=1555613&r1=1555600&r2=1555613&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/Link.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/Link.java Sun Jan 5 19:04:14 2014
@@ -6,7 +6,7 @@
//
-package org.apache.juddi.v3.client.mappings.wadl;
+package org.apache.juddi.v3.client.mapping.wadl;
import java.util.ArrayList;
import java.util.HashMap;
Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/Method.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/Method.java?rev=1555613&r1=1555600&r2=1555613&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/Method.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/Method.java Sun Jan 5 19:04:14 2014
@@ -6,7 +6,7 @@
//
-package org.apache.juddi.v3.client.mappings.wadl;
+package org.apache.juddi.v3.client.mapping.wadl;
import java.util.ArrayList;
import java.util.HashMap;
Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/ObjectFactory.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/ObjectFactory.java?rev=1555613&r1=1555600&r2=1555613&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/ObjectFactory.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/ObjectFactory.java Sun Jan 5 19:04:14 2014
@@ -6,7 +6,7 @@
//
-package org.apache.juddi.v3.client.mappings.wadl;
+package org.apache.juddi.v3.client.mapping.wadl;
import javax.xml.bind.annotation.XmlRegistry;
@@ -14,7 +14,7 @@ import javax.xml.bind.annotation.XmlRegi
/**
* This object contains factory methods for each
* Java content interface and Java element interface
- * generated in the org.apache.juddi.v3.client.mappings.wadl package.
+ * generated in the org.apache.juddi.v3.client.mapping.wadl package.
* <p>An ObjectFactory allows you to programatically
* construct new instances of the Java representation
* for XML content. The Java representation of XML
@@ -30,7 +30,7 @@ public class ObjectFactory {
/**
- * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.apache.juddi.v3.client.mappings.wadl
+ * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.apache.juddi.v3.client.mapping.wadl
*
*/
public ObjectFactory() {
Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/Option.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/Option.java?rev=1555613&r1=1555600&r2=1555613&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/Option.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/Option.java Sun Jan 5 19:04:14 2014
@@ -6,7 +6,7 @@
//
-package org.apache.juddi.v3.client.mappings.wadl;
+package org.apache.juddi.v3.client.mapping.wadl;
import java.util.ArrayList;
import java.util.HashMap;
Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/Param.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/Param.java?rev=1555613&r1=1555600&r2=1555613&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/Param.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/Param.java Sun Jan 5 19:04:14 2014
@@ -6,7 +6,7 @@
//
-package org.apache.juddi.v3.client.mappings.wadl;
+package org.apache.juddi.v3.client.mapping.wadl;
import java.util.ArrayList;
import java.util.HashMap;
Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/ParamStyle.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/ParamStyle.java?rev=1555613&r1=1555600&r2=1555613&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/ParamStyle.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/ParamStyle.java Sun Jan 5 19:04:14 2014
@@ -6,7 +6,7 @@
//
-package org.apache.juddi.v3.client.mappings.wadl;
+package org.apache.juddi.v3.client.mapping.wadl;
import javax.xml.bind.annotation.XmlEnum;
import javax.xml.bind.annotation.XmlEnumValue;
Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/Representation.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/Representation.java?rev=1555613&r1=1555600&r2=1555613&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/Representation.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/Representation.java Sun Jan 5 19:04:14 2014
@@ -6,7 +6,7 @@
//
-package org.apache.juddi.v3.client.mappings.wadl;
+package org.apache.juddi.v3.client.mapping.wadl;
import java.util.ArrayList;
import java.util.HashMap;
Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/Request.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/Request.java?rev=1555613&r1=1555600&r2=1555613&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/Request.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/Request.java Sun Jan 5 19:04:14 2014
@@ -6,7 +6,7 @@
//
-package org.apache.juddi.v3.client.mappings.wadl;
+package org.apache.juddi.v3.client.mapping.wadl;
import java.util.ArrayList;
import java.util.HashMap;
Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/Resource.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/Resource.java?rev=1555613&r1=1555600&r2=1555613&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/Resource.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/Resource.java Sun Jan 5 19:04:14 2014
@@ -6,7 +6,7 @@
//
-package org.apache.juddi.v3.client.mappings.wadl;
+package org.apache.juddi.v3.client.mapping.wadl;
import java.util.ArrayList;
import java.util.HashMap;
Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/ResourceType.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/ResourceType.java?rev=1555613&r1=1555600&r2=1555613&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/ResourceType.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/ResourceType.java Sun Jan 5 19:04:14 2014
@@ -6,7 +6,7 @@
//
-package org.apache.juddi.v3.client.mappings.wadl;
+package org.apache.juddi.v3.client.mapping.wadl;
import java.util.ArrayList;
import java.util.HashMap;
Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/Resources.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/Resources.java?rev=1555613&r1=1555600&r2=1555613&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/Resources.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/Resources.java Sun Jan 5 19:04:14 2014
@@ -6,7 +6,7 @@
//
-package org.apache.juddi.v3.client.mappings.wadl;
+package org.apache.juddi.v3.client.mapping.wadl;
import java.util.ArrayList;
import java.util.HashMap;
Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/Response.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/Response.java?rev=1555613&r1=1555600&r2=1555613&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/Response.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/Response.java Sun Jan 5 19:04:14 2014
@@ -6,7 +6,7 @@
//
-package org.apache.juddi.v3.client.mappings.wadl;
+package org.apache.juddi.v3.client.mapping.wadl;
import java.util.ArrayList;
import java.util.HashMap;
Copied: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/WADL2UDDI.java (from r1555600, 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/wadl/WADL2UDDI.java?p2=juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/WADL2UDDI.java&p1=juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/WADL2UDDI.java&r1=1555600&r2=1555613&rev=1555613&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/wadl/WADL2UDDI.java Sun Jan 5 19:04:14 2014
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juddi.v3.client.mapping;
+package org.apache.juddi.v3.client.mapping.wadl;
import java.io.File;
import java.io.FileNotFoundException;
@@ -27,8 +27,10 @@ import java.util.HashSet;
import java.util.List;
import java.util.Properties;
import java.util.Set;
+
import javax.xml.bind.JAXB;
import javax.xml.namespace.QName;
+
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -48,9 +50,8 @@ import org.apache.juddi.v3.client.UDDICo
import org.apache.juddi.v3.client.config.Property;
import org.apache.juddi.v3.client.config.UDDIClerk;
import org.apache.juddi.v3.client.config.UDDIKeyConvention;
-import org.apache.juddi.v3.client.mappings.wadl.Application;
-import org.apache.juddi.v3.client.mappings.wadl.Doc;
-import org.apache.juddi.v3.client.mappings.wadl.Resources;
+import org.apache.juddi.v3.client.mapping.MockSSLSocketFactory;
+import org.apache.juddi.v3.client.mapping.URLLocalizer;
import org.uddi.api_v3.AccessPoint;
import org.uddi.api_v3.BindingTemplate;
import org.uddi.api_v3.BindingTemplates;
@@ -430,7 +431,7 @@ public class WADL2UDDI {
Application unmarshal = JAXB.unmarshal(stream, Application.class);
return unmarshal;
}
- public static final String PACKAGE = "org.apache.juddi.v3.client.mappings.wadl";
+ public static final String PACKAGE = "org.apache.juddi.v3.client.mapping.wadl";
/**
* parses a wadl from a URL or file
Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/package-info.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/package-info.java?rev=1555613&r1=1555600&r2=1555613&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/package-info.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/package-info.java Sun Jan 5 19:04:14 2014
@@ -6,4 +6,4 @@
//
@javax.xml.bind.annotation.XmlSchema(namespace = "http://wadl.dev.java.net/2009/02", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package org.apache.juddi.v3.client.mappings.wadl;
+package org.apache.juddi.v3.client.mapping.wadl;
Copied: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wsdl/BPEL2UDDI.java (from r1555612, juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/BPEL2UDDI.java)
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wsdl/BPEL2UDDI.java?p2=juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wsdl/BPEL2UDDI.java&p1=juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/BPEL2UDDI.java&r1=1555612&r2=1555613&rev=1555613&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/BPEL2UDDI.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wsdl/BPEL2UDDI.java Sun Jan 5 19:04:14 2014
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.juddi.v3.client.mapping;
+package org.apache.juddi.v3.client.mapping.wsdl;
import java.net.MalformedURLException;
import java.net.URL;
@@ -42,6 +42,7 @@ import org.apache.juddi.v3.annotations.A
import org.apache.juddi.v3.client.config.Property;
import org.apache.juddi.v3.client.config.UDDIClerk;
import org.apache.juddi.v3.client.config.UDDIKeyConvention;
+import org.apache.juddi.v3.client.mapping.URLLocalizer;
import org.apache.juddi.v3.client.transport.TransportException;
import org.uddi.api_v3.AccessPoint;
import org.uddi.api_v3.BindingTemplate;
Copied: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wsdl/ReadWSDL.java (from r1555600, juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/ReadWSDL.java)
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wsdl/ReadWSDL.java?p2=juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wsdl/ReadWSDL.java&p1=juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/ReadWSDL.java&r1=1555600&r2=1555613&rev=1555613&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/ReadWSDL.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wsdl/ReadWSDL.java Sun Jan 5 19:04:14 2014
@@ -12,7 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juddi.v3.client.mapping;
+package org.apache.juddi.v3.client.mapping.wsdl;
import java.net.URI;
import java.net.URISyntaxException;
Copied: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wsdl/WSDL2UDDI.java (from r1555600, 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/wsdl/WSDL2UDDI.java?p2=juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wsdl/WSDL2UDDI.java&p1=juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/WSDL2UDDI.java&r1=1555600&r2=1555613&rev=1555613&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/wsdl/WSDL2UDDI.java Sun Jan 5 19:04:14 2014
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.juddi.v3.client.mapping;
+package org.apache.juddi.v3.client.mapping.wsdl;
import java.net.MalformedURLException;
import java.net.URL;
@@ -49,6 +49,8 @@ import org.apache.juddi.v3.client.config
import org.apache.juddi.v3.client.config.UDDIClerk;
import org.apache.juddi.v3.client.config.UDDIClient;
import org.apache.juddi.v3.client.config.UDDIKeyConvention;
+import org.apache.juddi.v3.client.mapping.ServiceRegistrationResponse;
+import org.apache.juddi.v3.client.mapping.URLLocalizer;
import org.apache.juddi.v3.client.transport.TransportException;
import org.uddi.api_v3.AccessPoint;
import org.uddi.api_v3.BindingTemplate;
Copied: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wsdl/WSDLLocatorImpl.java (from r1555600, 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/wsdl/WSDLLocatorImpl.java?p2=juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wsdl/WSDLLocatorImpl.java&p1=juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/WSDLLocatorImpl.java&r1=1555600&r2=1555613&rev=1555613&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/wsdl/WSDLLocatorImpl.java Sun Jan 5 19:04:14 2014
@@ -15,14 +15,16 @@
*
*
*/
-package org.apache.juddi.v3.client.mapping;
+package org.apache.juddi.v3.client.mapping.wsdl;
import java.io.IOException;
import java.io.InputStream;
import java.io.StringReader;
import java.net.URI;
import java.net.URL;
+
import javax.wsdl.xml.WSDLLocator;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.http.HttpResponse;
@@ -36,6 +38,7 @@ import org.apache.http.conn.scheme.Schem
import org.apache.http.impl.client.BasicResponseHandler;
import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.impl.conn.BasicClientConnectionManager;
+import org.apache.juddi.v3.client.mapping.MockSSLSocketFactory;
import org.xml.sax.InputSource;
/**
Modified: juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/compare/TModelInstanceDetailsComparatorTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/compare/TModelInstanceDetailsComparatorTest.java?rev=1555613&r1=1555600&r2=1555613&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/compare/TModelInstanceDetailsComparatorTest.java (original)
+++ juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/compare/TModelInstanceDetailsComparatorTest.java Sun Jan 5 19:04:14 2014
@@ -13,16 +13,20 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juddi.v3.client.util;
+package org.apache.juddi.v3.client.compare;
import javax.xml.datatype.DatatypeConfigurationException;
+
+import org.apache.juddi.v3.client.compare.TModelInstanceDetailsComparator;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
+
import static org.junit.Assert.*;
+
import org.uddi.api_v3.InstanceDetails;
import org.uddi.api_v3.TModelInstanceDetails;
import org.uddi.api_v3.TModelInstanceInfo;
Modified: juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/ServiceLocatorTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/ServiceLocatorTest.java?rev=1555613&r1=1555612&r2=1555613&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/ServiceLocatorTest.java (original)
+++ juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/ServiceLocatorTest.java Sun Jan 5 19:04:14 2014
@@ -18,7 +18,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
-import org.apache.juddi.v3.client.config.UDDIClerk;
import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
Modified: juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/UDDIServiceCacheTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/UDDIServiceCacheTest.java?rev=1555613&r1=1555612&r2=1555613&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/UDDIServiceCacheTest.java (original)
+++ juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/UDDIServiceCacheTest.java Sun Jan 5 19:04:14 2014
@@ -16,19 +16,9 @@ package org.apache.juddi.v3.client.mappi
import java.net.BindException;
import java.net.URL;
-import java.util.Map;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Port;
-import javax.wsdl.extensions.http.HTTPAddress;
-import javax.wsdl.extensions.soap.SOAPAddress;
-import javax.wsdl.extensions.soap12.SOAP12Address;
-import javax.xml.namespace.QName;
-import javax.xml.ws.Endpoint;
import org.junit.Ignore;
import org.junit.Test;
-import org.uddi.v3_service.UDDISubscriptionListenerPortType;
/**
* @author <a href="mailto:kstam@apache.org">Kurt T Stam</a>
Copied: juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/wsdl/BPEL2UDDITest.java (from r1555600, juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/BPEL2UDDITest.java)
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/wsdl/BPEL2UDDITest.java?p2=juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/wsdl/BPEL2UDDITest.java&p1=juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/BPEL2UDDITest.java&r1=1555600&r2=1555613&rev=1555613&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/BPEL2UDDITest.java (original)
+++ juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/wsdl/BPEL2UDDITest.java Sun Jan 5 19:04:14 2014
@@ -12,7 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juddi.v3.client.mapping;
+package org.apache.juddi.v3.client.mapping.wsdl;
import java.net.MalformedURLException;
import java.net.URL;
@@ -29,6 +29,10 @@ import javax.xml.namespace.QName;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.juddi.jaxb.PrintUDDI;
+import org.apache.juddi.v3.client.mapping.URLLocalizer;
+import org.apache.juddi.v3.client.mapping.URLLocalizerDefaultImpl;
+import org.apache.juddi.v3.client.mapping.wsdl.BPEL2UDDI;
+import org.apache.juddi.v3.client.mapping.wsdl.ReadWSDL;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
Copied: juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/wsdl/ReadWSDLTest.java (from r1555600, juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/ReadWSDLTest.java)
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/wsdl/ReadWSDLTest.java?p2=juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/wsdl/ReadWSDLTest.java&p1=juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/ReadWSDLTest.java&r1=1555600&r2=1555613&rev=1555613&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/ReadWSDLTest.java (original)
+++ juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/wsdl/ReadWSDLTest.java Sun Jan 5 19:04:14 2014
@@ -12,7 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juddi.v3.client.mapping;
+package org.apache.juddi.v3.client.mapping.wsdl;
import java.net.HttpURLConnection;
import java.net.MalformedURLException;
@@ -23,6 +23,7 @@ import java.net.UnknownHostException;
import javax.wsdl.Definition;
import javax.wsdl.WSDLException;
+import org.apache.juddi.v3.client.mapping.wsdl.ReadWSDL;
import org.junit.Assert;
import org.junit.Test;
Copied: juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/wsdl/WADL2UDDITest.java (from r1555600, 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/wsdl/WADL2UDDITest.java?p2=juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/wsdl/WADL2UDDITest.java&p1=juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/WADL2UDDITest.java&r1=1555600&r2=1555613&rev=1555613&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/wsdl/WADL2UDDITest.java Sun Jan 5 19:04:14 2014
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juddi.v3.client.mapping;
+package org.apache.juddi.v3.client.mapping.wsdl;
import java.io.File;
import java.net.HttpURLConnection;
@@ -22,10 +22,14 @@ import java.net.URL;
import java.util.List;
import java.util.Properties;
import java.util.logging.Logger;
+
import javax.xml.namespace.QName;
+
import org.apache.juddi.jaxb.PrintUDDI;
import org.apache.juddi.v3.client.config.UDDIClerk;
-import org.apache.juddi.v3.client.mappings.wadl.Application;
+import org.apache.juddi.v3.client.mapping.URLLocalizerDefaultImpl;
+import org.apache.juddi.v3.client.mapping.wadl.Application;
+import org.apache.juddi.v3.client.mapping.wadl.WADL2UDDI;
import org.junit.Assert;
import org.junit.Test;
import org.uddi.api_v3.BusinessService;
Copied: juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/wsdl/WSDL2UDDITest.java (from r1555600, 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/wsdl/WSDL2UDDITest.java?p2=juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/wsdl/WSDL2UDDITest.java&p1=juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/WSDL2UDDITest.java&r1=1555600&r2=1555613&rev=1555613&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/wsdl/WSDL2UDDITest.java Sun Jan 5 19:04:14 2014
@@ -12,7 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juddi.v3.client.mapping;
+package org.apache.juddi.v3.client.mapping.wsdl;
import java.util.HashSet;
import java.util.Map;
@@ -30,6 +30,9 @@ import javax.xml.namespace.QName;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.juddi.jaxb.PrintUDDI;
+import org.apache.juddi.v3.client.mapping.URLLocalizerDefaultImpl;
+import org.apache.juddi.v3.client.mapping.wsdl.ReadWSDL;
+import org.apache.juddi.v3.client.mapping.wsdl.WSDL2UDDI;
import org.junit.Assert;
import org.junit.Test;
import org.uddi.api_v3.TModel;
Copied: juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/wsdl/WSDLLocatorTest.java (from r1555600, juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/WSDLLocatorTest.java)
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/wsdl/WSDLLocatorTest.java?p2=juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/wsdl/WSDLLocatorTest.java&p1=juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/WSDLLocatorTest.java&r1=1555600&r2=1555613&rev=1555613&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/WSDLLocatorTest.java (original)
+++ juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/wsdl/WSDLLocatorTest.java Sun Jan 5 19:04:14 2014
@@ -12,12 +12,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juddi.v3.client.mapping;
+package org.apache.juddi.v3.client.mapping.wsdl;
import java.net.URISyntaxException;
import java.net.URL;
import org.apache.juddi.v3.client.ClassUtil;
+import org.apache.juddi.v3.client.mapping.wsdl.WSDLLocatorImpl;
import org.junit.Assert;
import org.junit.Test;
Copied: juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/wsdl/WSDLinaUDDIRegistryTest.java (from r1555600, juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/WSDLinaUDDIRegistryTest.java)
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/wsdl/WSDLinaUDDIRegistryTest.java?p2=juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/wsdl/WSDLinaUDDIRegistryTest.java&p1=juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/WSDLinaUDDIRegistryTest.java&r1=1555600&r2=1555613&rev=1555613&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/WSDLinaUDDIRegistryTest.java (original)
+++ juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/wsdl/WSDLinaUDDIRegistryTest.java Sun Jan 5 19:04:14 2014
@@ -12,7 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juddi.v3.client.mapping;
+package org.apache.juddi.v3.client.mapping.wsdl;
import java.io.IOException;
import java.util.HashSet;
@@ -31,6 +31,9 @@ import javax.xml.namespace.QName;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.juddi.jaxb.EntityCreator;
import org.apache.juddi.jaxb.PrintUDDI;
+import org.apache.juddi.v3.client.mapping.URLLocalizerDefaultImpl;
+import org.apache.juddi.v3.client.mapping.wsdl.ReadWSDL;
+import org.apache.juddi.v3.client.mapping.wsdl.WSDL2UDDI;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
Modified: juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_051_BindingTemplateWSDLTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_051_BindingTemplateWSDLTest.java?rev=1555613&r1=1555612&r2=1555613&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_051_BindingTemplateWSDLTest.java (original)
+++ juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_051_BindingTemplateWSDLTest.java Sun Jan 5 19:04:14 2014
@@ -28,10 +28,10 @@ import org.apache.juddi.Registry;
import org.apache.juddi.jaxb.PrintUDDI;
import org.apache.juddi.v3.client.config.UDDIClerk;
import org.apache.juddi.v3.client.config.UDDIClient;
-import org.apache.juddi.v3.client.mapping.ReadWSDL;
import org.apache.juddi.v3.client.mapping.URLLocalizer;
import org.apache.juddi.v3.client.mapping.URLLocalizerDefaultImpl;
-import org.apache.juddi.v3.client.mapping.WSDL2UDDI;
+import org.apache.juddi.v3.client.mapping.wsdl.ReadWSDL;
+import org.apache.juddi.v3.client.mapping.wsdl.WSDL2UDDI;
import org.apache.juddi.v3.client.transport.TransportException;
import org.apache.juddi.v3.tck.TckBusiness;
import org.apache.juddi.v3.tck.TckPublisher;
Modified: juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiFindEndpoints.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiFindEndpoints.java?rev=1555613&r1=1555612&r2=1555613&view=diff
==============================================================================
--- juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiFindEndpoints.java (original)
+++ juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiFindEndpoints.java Sun Jan 5 19:04:14 2014
@@ -22,14 +22,16 @@ import java.util.List;
import java.util.Properties;
import java.util.logging.Level;
import java.util.logging.Logger;
+
import javax.wsdl.Definition;
+
import org.apache.juddi.api_v3.AccessPointType;
import org.apache.juddi.v3.client.config.UDDIClerk;
import org.apache.juddi.v3.client.config.UDDIClient;
import org.apache.juddi.v3.client.config.UDDIClientContainer;
-import org.apache.juddi.v3.client.mapping.ReadWSDL;
import org.apache.juddi.v3.client.mapping.URLLocalizerDefaultImpl;
-import org.apache.juddi.v3.client.mapping.WSDL2UDDI;
+import org.apache.juddi.v3.client.mapping.wsdl.ReadWSDL;
+import org.apache.juddi.v3.client.mapping.wsdl.WSDL2UDDI;
import org.apache.juddi.v3.client.transport.Transport;
import org.uddi.api_v3.*;
import org.uddi.v3_service.UDDIInquiryPortType;
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=1555613&r1=1555612&r2=1555613&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 Sun Jan 5 19:04:14 2014
@@ -21,14 +21,16 @@ import java.net.URL;
import java.util.List;
import java.util.Properties;
import java.util.Set;
+
import javax.xml.namespace.QName;
+
import org.apache.juddi.jaxb.PrintUDDI;
import org.apache.juddi.v3.client.config.UDDIClerk;
import org.apache.juddi.v3.client.config.UDDIClient;
import org.apache.juddi.v3.client.config.UDDIClientContainer;
import org.apache.juddi.v3.client.mapping.URLLocalizerDefaultImpl;
-import org.apache.juddi.v3.client.mapping.WADL2UDDI;
-import org.apache.juddi.v3.client.mappings.wadl.Application;
+import org.apache.juddi.v3.client.mapping.wadl.Application;
+import org.apache.juddi.v3.client.mapping.wadl.WADL2UDDI;
import org.apache.juddi.v3.client.transport.Transport;
import org.apache.juddi.v3_service.JUDDIApiPortType;
import org.uddi.api_v3.AuthToken;
Modified: juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/WsdlImport.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/WsdlImport.java?rev=1555613&r1=1555612&r2=1555613&view=diff
==============================================================================
--- juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/WsdlImport.java (original)
+++ juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/WsdlImport.java Sun Jan 5 19:04:14 2014
@@ -20,16 +20,18 @@ import java.net.URL;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
+
import javax.wsdl.Definition;
import javax.wsdl.PortType;
import javax.xml.namespace.QName;
+
import org.apache.juddi.jaxb.PrintUDDI;
import org.apache.juddi.v3.client.config.UDDIClerk;
import org.apache.juddi.v3.client.config.UDDIClient;
import org.apache.juddi.v3.client.config.UDDIClientContainer;
-import org.apache.juddi.v3.client.mapping.ReadWSDL;
import org.apache.juddi.v3.client.mapping.URLLocalizerDefaultImpl;
-import org.apache.juddi.v3.client.mapping.WSDL2UDDI;
+import org.apache.juddi.v3.client.mapping.wsdl.ReadWSDL;
+import org.apache.juddi.v3.client.mapping.wsdl.WSDL2UDDI;
import org.apache.juddi.v3.client.transport.Transport;
import org.apache.juddi.v3_service.JUDDIApiPortType;
import org.uddi.api_v3.AuthToken;
Modified: juddi/trunk/juddi-gui/src/main/webapp/ajax/importFromWadl.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/ajax/importFromWadl.jsp?rev=1555613&r1=1555612&r2=1555613&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/importFromWadl.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/importFromWadl.jsp Sun Jan 5 19:04:14 2014
@@ -5,8 +5,8 @@
--%>
<%@page import="org.apache.juddi.jaxb.PrintUDDI"%>
<%@page import="org.uddi.api_v3.BusinessService"%>
-<%@page import="org.apache.juddi.v3.client.mappings.wadl.Application"%>
-<%@page import="org.apache.juddi.v3.client.mapping.WADL2UDDI"%>
+<%@page import="org.apache.juddi.v3.client.mapping.wadl.Application"%>
+<%@page import="org.apache.juddi.v3.client.mapping.wadl.WADL2UDDI"%>
<%@page import="java.io.File"%>
<%@page import="org.apache.juddi.v3.client.config.TokenResolver"%>
<%@page import="org.uddi.api_v3.Name"%>
@@ -20,11 +20,11 @@
<%@page import="javax.wsdl.PortType"%>
<%@page import="java.util.Map"%>
<%@page import="org.uddi.api_v3.BusinessServices"%>
-<%@page import="org.apache.juddi.v3.client.mapping.WSDL2UDDI"%>
+<%@page import="org.apache.juddi.v3.client.mapping.wsdl.WSDL2UDDI"%>
<%@page import="org.apache.juddi.v3.client.mapping.URLLocalizerDefaultImpl"%>
<%@page import="java.util.Properties"%>
<%@page import="javax.wsdl.Definition"%>
-<%@page import="org.apache.juddi.v3.client.mapping.ReadWSDL"%>
+<%@page import="org.apache.juddi.v3.client.mapping.wsdl.ReadWSDL"%>
<%@page import="org.apache.juddi.v3.client.config.UDDIClerk"%>
<%@page import="org.uddi.api_v3.TModel"%>
<%@page import="java.net.URL"%>
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=1555613&r1=1555612&r2=1555613&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 Sun Jan 5 19:04:14 2014
@@ -19,17 +19,19 @@ import java.net.URL;
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
+
import javax.ws.rs.*;
import javax.wsdl.Definition;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.juddi.api.impl.UDDIInquiryImpl;
import org.apache.juddi.api_v3.AccessPointType;
import org.apache.juddi.api_v3.rest.UriContainer;
import org.apache.juddi.v3.client.UDDIConstants;
-import org.apache.juddi.v3.client.mapping.ReadWSDL;
import org.apache.juddi.v3.client.mapping.URLLocalizerDefaultImpl;
-import org.apache.juddi.v3.client.mapping.WSDL2UDDI;
+import org.apache.juddi.v3.client.mapping.wsdl.ReadWSDL;
+import org.apache.juddi.v3.client.mapping.wsdl.WSDL2UDDI;
import org.apache.juddi.v3.error.UDDIErrorHelper;
import org.uddi.api_v3.*;
import org.uddi.sub_v3.KeyBag;
@@ -477,7 +479,7 @@ public class UDDIInquiryJAXRS {
if (value.startsWith("http://") || value.startsWith("https://")) {
//here, we need an HTTP Get for WSDLs
- org.apache.juddi.v3.client.mapping.ReadWSDL r = new ReadWSDL();
+ org.apache.juddi.v3.client.mapping.wsdl.ReadWSDL r = new ReadWSDL();
r.setIgnoreSSLErrors(true);
try {
Definition wsdlDefinition = r.readWSDL(new URL(value));
Modified: juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/bpel/BPEL_020_IntegrationTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/bpel/BPEL_020_IntegrationTest.java?rev=1555613&r1=1555612&r2=1555613&view=diff
==============================================================================
--- juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/bpel/BPEL_020_IntegrationTest.java (original)
+++ juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/bpel/BPEL_020_IntegrationTest.java Sun Jan 5 19:04:14 2014
@@ -32,9 +32,9 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.juddi.v3.client.config.UDDIClerk;
import org.apache.juddi.v3.client.config.UDDIClient;
-import org.apache.juddi.v3.client.mapping.BPEL2UDDI;
-import org.apache.juddi.v3.client.mapping.ReadWSDL;
import org.apache.juddi.v3.client.mapping.URLLocalizerDefaultImpl;
+import org.apache.juddi.v3.client.mapping.wsdl.BPEL2UDDI;
+import org.apache.juddi.v3.client.mapping.wsdl.ReadWSDL;
import org.apache.juddi.v3.client.transport.Transport;
import org.apache.juddi.v3.client.transport.TransportException;
import org.apache.juddi.v3.tck.TckBusiness;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org