You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by al...@apache.org on 2013/05/12 18:46:36 UTC
svn commit: r1481602 - in /juddi/trunk/juddi-client: ./
src/main/java/org/apache/juddi/v3/client/
src/main/java/org/apache/juddi/v3/client/mapping/
src/test/java/org/apache/juddi/v3/client/mapping/
Author: alexoree
Date: Sun May 12 16:46:35 2013
New Revision: 1481602
URL: http://svn.apache.org/r1481602
Log:
synching changes from the brand for wsdl2uddi
Added:
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/MockSSLSocketFactory.java
- copied unchanged from r1481580, juddi/branches/juddi-3.2.x/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/MockSSLSocketFactory.java
Modified:
juddi/trunk/juddi-client/ (props changed)
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/JUDDIApiService.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/UDDIConstants.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/ServiceLocator.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/UDDIServiceCache.java
juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/BPEL2UDDITest.java
Propchange: juddi/trunk/juddi-client/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun May 12 16:46:35 2013
@@ -0,0 +1,2 @@
+/juddi/branches/juddi-3.2.x/juddi-client:1460934-1481580
+/webservices/juddi/branches/v3_trunk/juddi-client:797614-802957
Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/JUDDIApiService.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/JUDDIApiService.java?rev=1481602&r1=1481601&r2=1481602&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/JUDDIApiService.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/JUDDIApiService.java Sun May 12 16:46:35 2013
@@ -9,7 +9,12 @@ import javax.xml.ws.WebServiceFeature;
import org.apache.juddi.v3_service.JUDDIApiPortType;
-
+/**
+ * This call is for client side access to the JUDDI API, a web service meant for administrative functions above and beyond the
+ * UDDI v3 specification.
+ *
+ * @author jUDDI Team
+ */
@WebServiceClient(name = "JUDDIApiService", targetNamespace = "urn:juddi-apache-org:v3_service", wsdlLocation = "classpath:/juddi_api_v1.wsdl")
public class JUDDIApiService
extends Service
Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/UDDIConstants.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/UDDIConstants.java?rev=1481602&r1=1481601&r2=1481602&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/UDDIConstants.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/UDDIConstants.java Sun May 12 16:46:35 2013
@@ -1,5 +1,12 @@
package org.apache.juddi.v3.client;
+import org.uddi.api_v3.CategoryBag;
+import org.uddi.api_v3.KeyedReference;
+import org.uddi.api_v3.Name;
+import org.uddi.api_v3.OverviewDoc;
+import org.uddi.api_v3.OverviewURL;
+import org.uddi.api_v3.TModel;
+
/**
* This file was borrowed from juddi-core's constants file with modifications
*
@@ -467,32 +474,46 @@ public interface UDDIConstants {
*/
public static String WILDCARD = "%";
/**
- * Presents any SINGLE character<br>
- * Wildcards, when they are allowed, may occur at any position in the string
- * of characters that constitutes the argument value and may occur more than
- * once. Wildcards are denoted with a percent sign (%) to indicate any value
- * for any number of characters and an underscore (_) to indicate any value
- * for a single character. The backslash character (\) is used as an escape
- * character for the percent sign, underscore and backslash characters. Use
- * of the "exactMatch" findQualifier will cause wildcard characters to be
- * interpreted literally, and as such should not also be combined with the
- * escape character.
+ * Presents any SINGLE character<br> Wildcards, when they are allowed, may
+ * occur at any position in the string of characters that constitutes the
+ * argument value and may occur more than once. Wildcards are denoted with a
+ * percent sign (%) to indicate any value for any number of characters and
+ * an underscore (_) to indicate any value for a single character. The
+ * backslash character (\) is used as an escape character for the percent
+ * sign, underscore and backslash characters. Use of the "exactMatch"
+ * findQualifier will cause wildcard characters to be interpreted literally,
+ * and as such should not also be combined with the escape character.
*/
public static String WILDCARD_CHAR = "_";
/**
- * unchecked: Marking a tModel with this categorization asserts that it represents a value set or category group system whose use, through keyedReferences, is not checked.
+ * unchecked: Marking a tModel with this categorization asserts that it
+ * represents a value set or category group system whose use, through
+ * keyedReferences, is not checked.
*/
public static String TMODEL_GENERAL_KEYWORDS = "uddi:uddi.org:categorization:general_keywords";
/**
- * An unchecked value set is one that allows unrestricted references to its values. A UDDI registry is REQUIRED to have a policy to differentiate between unchecked value sets and checked value sets. UDDI registries MUST allow unchecked value sets to be referred to in keyedReferences. tModels that represent unchecked value sets SHOULD be categorized with the unchecked value from the uddi-org:types category system.
+ * An unchecked value set is one that allows unrestricted references to its
+ * values. A UDDI registry is REQUIRED to have a policy to differentiate
+ * between unchecked value sets and checked value sets. UDDI registries MUST
+ * allow unchecked value sets to be referred to in keyedReferences. tModels
+ * that represent unchecked value sets SHOULD be categorized with the
+ * unchecked value from the uddi-org:types category system.
*/
public static String UNCHECKED = "uddi-org:types:unchecked";
/**
- * checked: Marking a tModel with this categorization asserts that it represents a value set or category group system whose use, through keyedReferences, may be checked. Registry, and possibly node policy determines when and how a checked value set is supported.
+ * checked: Marking a tModel with this categorization asserts that it
+ * represents a value set or category group system whose use, through
+ * keyedReferences, may be checked. Registry, and possibly node policy
+ * determines when and how a checked value set is supported.
*/
public static String CHECKED = "uddi-org:types:checked";
/**
- * uncacheable: Marking a tModel with this categorization asserts that it represents a checked value set or category group system whose values must not be cached for validation. The validation algorithm for a supported uncacheable checked value set must be specified and associated with the tModel marked with this categorization and may consider contextual criteria involving the entity associated with the reference.
+ * uncacheable: Marking a tModel with this categorization asserts that it
+ * represents a checked value set or category group system whose values must
+ * not be cached for validation. The validation algorithm for a supported
+ * uncacheable checked value set must be specified and associated with the
+ * tModel marked with this categorization and may consider contextual
+ * criteria involving the entity associated with the reference.
*/
public static String UNCACHEABLE = "uddi-org:types:uncacheable";
/**
@@ -500,9 +521,32 @@ public interface UDDIConstants {
*/
public static String RELATIONSHIPS = "uddi:uddi.org:relationships";
/**
- * keyGenerator: Marking a tModel with this categorization designates it as one whose tModelKey identifies a key generator partition that can be used by its owner to derive and assign other entity keys. This categorization is reserved for key generator tModels. Any attempt to use this categorization for something other than a key generator tModel will fail with E_valueNotAllowed returned.
+ * "uddi:uddi.org:keygenerator" keyGenerator: Marking a tModel with this
+ * categorization designates it as one whose tModelKey identifies a key
+ * generator partition that can be used by its owner to derive and assign
+ * other entity keys. This categorization is reserved for key generator
+ * tModels. Any attempt to use this categorization for something other than
+ * a key generator tModel will fail with E_valueNotAllowed returned.
+ */
+ public static String KEY_GENERATOR_TMODEL = "uddi:uddi.org:keygenerator";
+ /**
+ * "uddi.org:keygenerator" keyGenerator: Marking a tModel with this
+ * categorization designates it as one whose tModelKey identifies a key
+ * generator partition that can be used by its owner to derive and assign
+ * other entity keys. This categorization is reserved for key generator
+ * tModels. Any attempt to use this categorization for something other than
+ * a key generator tModel will fail with E_valueNotAllowed returned.
+ */
+ public static String KEY_GENERATOR = "uddi.org:keygenerator";
+ /**
+ * "keyGenerator" keyGenerator: Marking a tModel with this categorization
+ * designates it as one whose tModelKey identifies a key generator partition
+ * that can be used by its owner to derive and assign other entity keys.
+ * This categorization is reserved for key generator tModels. Any attempt to
+ * use this categorization for something other than a key generator tModel
+ * will fail with E_valueNotAllowed returned.
*/
- public static String KEY_GENERATOR = "uddi:uddi.org:keygenerator";
+ public static String KEY_GENERATOR_VALUE = "keyGenerator";
/**
* Identifier system used to point to the UDDI entity, using UDDI keys, that
* is the logical replacement for the one in which isReplacedBy is used.
@@ -593,4 +637,6 @@ public interface UDDIConstants {
* A tModel that represents the SOAP 1.2 protocol
*/
public static String PROTOCOL_SOAP12 = "uddi:uddi.org:protocol:soap12";
+
+
}
Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/ServiceLocator.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/ServiceLocator.java?rev=1481602&r1=1481601&r2=1481602&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/ServiceLocator.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/ServiceLocator.java Sun May 12 16:46:35 2013
@@ -50,7 +50,7 @@ public class ServiceLocator {
private UDDIServiceCache serviceCache = null;
private SelectionPolicy selectionPolicy = null;
- public ServiceLocator(UDDIClerk clerk, URLLocalizer urlLocalizer, Properties properties) throws ClassNotFoundException, IllegalArgumentException, SecurityException, InstantiationException, IllegalAccessException, InvocationTargetException, NoSuchMethodException, DatatypeConfigurationException, MalformedURLException, RemoteException, ConfigurationException, WSDLException, TransportException {
+ public ServiceLocator(UDDIClerk clerk, URLLocalizer urlLocalizer, Properties properties) throws ClassNotFoundException, IllegalArgumentException, SecurityException, InstantiationException, IllegalAccessException, InvocationTargetException, NoSuchMethodException, DatatypeConfigurationException, MalformedURLException, RemoteException, ConfigurationException, WSDLException, TransportException, Exception {
super();
this.clerk = clerk;
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=1481602&r1=1481601&r2=1481602&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 May 12 16:46:35 2013
@@ -67,7 +67,7 @@ public class UDDIServiceCache {
this.clerk = clerk;
}
- public UDDIServiceCache(UDDIClerk clerk, URLLocalizer urlLocalizer, Properties properties) throws DatatypeConfigurationException, MalformedURLException, RemoteException, ConfigurationException, WSDLException, TransportException {
+ public UDDIServiceCache(UDDIClerk clerk, URLLocalizer urlLocalizer, Properties properties) throws DatatypeConfigurationException, MalformedURLException, RemoteException, ConfigurationException, WSDLException, TransportException, Exception {
super();
this.clerk = clerk;
this.urlLocalizer = urlLocalizer;
@@ -77,7 +77,7 @@ public class UDDIServiceCache {
init();
}
- private void init() throws DatatypeConfigurationException, MalformedURLException, WSDLException, RemoteException, ConfigurationException, TransportException {
+ private void init() throws DatatypeConfigurationException, MalformedURLException, WSDLException, RemoteException, ConfigurationException, TransportException, Exception {
QName serviceQName = new QName("urn:uddi-org:v3_service", "UDDIClientSubscriptionListenerService");
String portName = "UDDIClientSubscriptionListenerImplPort";
Modified: 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/BPEL2UDDITest.java?rev=1481602&r1=1481601&r2=1481602&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/BPEL2UDDITest.java Sun May 12 16:46:35 2013
@@ -59,7 +59,7 @@ public class BPEL2UDDITest {
}
@Test
- public void testTN_WSDLPortTypeModels() throws WSDLException, JAXBException {
+ public void testTN_WSDLPortTypeModels() throws WSDLException, JAXBException, Exception {
// Reading the WSDL
Definition wsdlDefinition = rw.readWSDL("bpel/bpel-technote.wsdl");
@@ -74,7 +74,7 @@ public class BPEL2UDDITest {
}
@Test
- public void testTN_BPEL4WSProcessTModel() throws WSDLException, JAXBException {
+ public void testTN_BPEL4WSProcessTModel() throws WSDLException, JAXBException, Exception {
// Obtained from the .bpel file:
String targetNamespace = "http://example.com/travelagent";
@@ -108,7 +108,7 @@ public class BPEL2UDDITest {
}
@Test
- public void testHelloWorld_WSDLPortTypeModels() throws WSDLException, JAXBException {
+ public void testHelloWorld_WSDLPortTypeModels() throws WSDLException, JAXBException , Exception{
// Reading the WSDL
Definition wsdlDefinition = rw.readWSDL("bpel/HelloWorld.wsdl");
@@ -124,7 +124,7 @@ public class BPEL2UDDITest {
}
@Test
- public void testHelloWorld_UDDIBindingModel() throws WSDLException, JAXBException {
+ public void testHelloWorld_UDDIBindingModel() throws WSDLException, JAXBException, Exception {
// Reading the WSDL
Definition wsdlDefinition = rw.readWSDL("bpel/HelloWorld.wsdl");
@@ -140,7 +140,7 @@ public class BPEL2UDDITest {
}
@Test
- public void testHelloWorld_BPEL4WSProcessTModel() throws WSDLException, JAXBException {
+ public void testHelloWorld_BPEL4WSProcessTModel() throws WSDLException, JAXBException , Exception{
//Obtained from the .bpel file:
String targetNamespace = "http://www.jboss.org/bpel/examples";
@@ -161,7 +161,7 @@ public class BPEL2UDDITest {
}
@Test
- public void testHelloWorld_BPELBinding() throws WSDLException, JAXBException, MalformedURLException {
+ public void testHelloWorld_BPELBinding() throws WSDLException, JAXBException, MalformedURLException, Exception {
//Obtained from the .bpel file:
String portName = "HelloPort";
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org