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 23:54:54 UTC
svn commit: r1481655 [3/3] - in /juddi/branches/juddi-3.2.x: ./
juddi-client/ juddi-client/src/main/java/org/apache/juddi/v3/client/config/
juddi-client/src/main/java/org/apache/juddi/v3/client/transport/
juddi-client/src/main/java/org/apache/juddi/v3/...
Modified: juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_120_CombineCategoryBagsFindServiceIntegrationTest.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_120_CombineCategoryBagsFindServiceIntegrationTest.java?rev=1481655&r1=1481654&r2=1481655&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_120_CombineCategoryBagsFindServiceIntegrationTest.java (original)
+++ juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_120_CombineCategoryBagsFindServiceIntegrationTest.java Sun May 12 21:54:52 2013
@@ -21,7 +21,7 @@ import org.apache.commons.configuration.
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.juddi.v3.client.UDDIConstants;
-import org.apache.juddi.v3.client.config.UDDIClerkManager;
+import org.apache.juddi.v3.client.config.UDDIClient;
import org.apache.juddi.v3.client.transport.Transport;
import org.junit.AfterClass;
import org.junit.Assert;
@@ -76,7 +76,7 @@ public class UDDI_120_CombineCategoryBag
protected static String authInfoJoe = null;
private static UDDIInquiryPortType inquiry = null;
- private static UDDIClerkManager manager;
+ private static UDDIClient manager;
@AfterClass
public static void stopManager() throws ConfigurationException {
@@ -85,7 +85,7 @@ public class UDDI_120_CombineCategoryBag
@BeforeClass
public static void startManager() throws ConfigurationException {
- manager = new UDDIClerkManager();
+ manager = new UDDIClient();
manager.start();
logger.debug("Getting auth tokens..");
Modified: juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_130_CombineCategoryBagsFindBusinessIntegrationTest.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_130_CombineCategoryBagsFindBusinessIntegrationTest.java?rev=1481655&r1=1481654&r2=1481655&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_130_CombineCategoryBagsFindBusinessIntegrationTest.java (original)
+++ juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_130_CombineCategoryBagsFindBusinessIntegrationTest.java Sun May 12 21:54:52 2013
@@ -20,7 +20,7 @@ import java.util.List;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.juddi.v3.client.config.UDDIClerkManager;
+import org.apache.juddi.v3.client.config.UDDIClient;
import org.apache.juddi.v3.client.transport.Transport;
import org.junit.AfterClass;
import org.junit.Assert;
@@ -73,7 +73,7 @@ public class UDDI_130_CombineCategoryBag
protected static String authInfoJoe = null;
private static UDDIInquiryPortType inquiry = null;
- private static UDDIClerkManager manager;
+ private static UDDIClient manager;
@AfterClass
public static void stopManager() throws ConfigurationException {
@@ -82,7 +82,7 @@ public class UDDI_130_CombineCategoryBag
@BeforeClass
public static void startManager() throws ConfigurationException {
- manager = new UDDIClerkManager();
+ manager = new UDDIClient();
manager.start();
logger.debug("Getting auth tokens..");
Modified: juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_140_NegativePublicationIntegrationTest.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_140_NegativePublicationIntegrationTest.java?rev=1481655&r1=1481654&r2=1481655&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_140_NegativePublicationIntegrationTest.java (original)
+++ juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_140_NegativePublicationIntegrationTest.java Sun May 12 21:54:52 2013
@@ -24,7 +24,7 @@ import org.apache.commons.configuration.
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.juddi.api_v3.AccessPointType;
-import org.apache.juddi.v3.client.config.UDDIClerkManager;
+import org.apache.juddi.v3.client.config.UDDIClient;
import org.apache.juddi.v3.client.transport.Transport;
import org.junit.AfterClass;
import org.junit.Assert;
@@ -86,7 +86,7 @@ public class UDDI_140_NegativePublicatio
protected static String authInfoJoe = null;
protected static String authInfoSam = null;
- private static UDDIClerkManager manager;
+ private static UDDIClient manager;
static final String str256 = "1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111";
static final String str255 = "uddi:tmodelkey:categories:1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111";
static final String strkey256 = "uddi:tmodelkey:categories:11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111";
@@ -111,7 +111,7 @@ public class UDDI_140_NegativePublicatio
@BeforeClass
public static void startManager() throws ConfigurationException {
- manager = new UDDIClerkManager();
+ manager = new UDDIClient();
manager.start();
logger.debug("Getting auth tokens..");
Modified: juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_141_JIRAIntegrationTest.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_141_JIRAIntegrationTest.java?rev=1481655&r1=1481654&r2=1481655&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_141_JIRAIntegrationTest.java (original)
+++ juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_141_JIRAIntegrationTest.java Sun May 12 21:54:52 2013
@@ -30,7 +30,7 @@ import org.apache.commons.configuration.
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.juddi.v3.client.UDDIConstants;
-import org.apache.juddi.v3.client.config.UDDIClerkManager;
+import org.apache.juddi.v3.client.config.UDDIClient;
import org.apache.juddi.v3.client.transport.Transport;
import org.junit.AfterClass;
import org.junit.Assert;
@@ -61,7 +61,7 @@ public class UDDI_141_JIRAIntegrationTes
static UDDIPublicationPortType publication = null;
protected static String authInfoJoe = null;
protected static String authInfoSam = null;
- private static UDDIClerkManager manager;
+ private static UDDIClient manager;
static final String str256 = "1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111";
static final String str255 = "111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111";
static final String strkey256 = "uddi:11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111";
@@ -86,7 +86,7 @@ public class UDDI_141_JIRAIntegrationTes
@BeforeClass
public static void startManager() throws ConfigurationException {
- manager = new UDDIClerkManager();
+ manager = new UDDIClient();
manager.start();
logger.debug("Getting auth tokens..");
@@ -770,9 +770,13 @@ public class UDDI_141_JIRAIntegrationTes
}
- //testing upper case subscription callbacks
+ /**
+ * //testing upper case subscription callbacks
+ *
+ * @throws Exception
+ */
@Test
- public void JIRA_597() throws Exception {
+ public void JIRA_597() throws Exception {
System.out.println("JIRA_597");
int port = 4444;
String localhostname = java.net.InetAddress.getLocalHost().getHostName();
@@ -840,7 +844,7 @@ public class UDDI_141_JIRAIntegrationTes
gcal.setTimeInMillis(System.currentTimeMillis());
gcal.add(Calendar.HOUR, 1);
s.setExpiresAfter(df.newXMLGregorianCalendar(gcal));
-
+
s.setNotificationInterval(df.newDuration(5000));
list.value.add(s);
subscription.saveSubscription(authInfoJoe, list);
@@ -854,13 +858,114 @@ public class UDDI_141_JIRAIntegrationTes
publication.saveBusiness(sb);
int maxwait = 30000;
while (maxwait > 0) {
- if (UDDISubscriptionListenerImpl.notifcationMap.size() > 0)
+ if (UDDISubscriptionListenerImpl.notifcationMap.size() > 0) {
break;
+ }
+ Thread.sleep(1000);
+ maxwait = maxwait - 1000;
+ }
+ if (UDDISubscriptionListenerImpl.notifcationMap.isEmpty()) {
+ Assert.fail("no callbacks were recieved.");
+ }
+
+
+ }
+
+ /**
+ * testing callbacks with underfined transport type
+ *
+ * @throws Exception
+ */
+ @Test
+ public void JIRA_596() throws Exception {
+ System.out.println("JIRA_596");
+ int port = 4444;
+ String localhostname = java.net.InetAddress.getLocalHost().getHostName();
+ UDDISubscriptionListenerImpl impl = new UDDISubscriptionListenerImpl();
+ UDDISubscriptionListenerImpl.notifcationMap.clear();
+ UDDISubscriptionListenerImpl.notificationCount = 0;
+ Endpoint ep = null;
+ boolean ok = false;
+ do {
+ try {
+ ep = Endpoint.publish("http://" + localhostname + ":" + port + "/UDDI_CALLBACK", impl);
+ ok = true;
+ } catch (Exception ex) {
+ port++;
+ }
+ } while (!ok);
+ SaveBusiness sb = new SaveBusiness();
+ sb.setAuthInfo(authInfoJoe);
+ BusinessEntity be = new BusinessEntity();
+ be.getName().add(new Name());
+ be.getName().get(0).setValue("Joe's callback business");
+ be.setBusinessServices(new BusinessServices());
+ BusinessService bs = new BusinessService();
+ bs.getName().add(new Name());
+ bs.getName().get(0).setValue("Joe's callback service");
+ bs.setBindingTemplates(new BindingTemplates());
+ BindingTemplate bt = new BindingTemplate();
+ bt.setAccessPoint(new AccessPoint());
+ bt.getAccessPoint().setValue("http://" + localhostname + ":" + port + "/UDDI_CALLBACK");
+ bt.getAccessPoint().setUseType("endPoint");
+ //Added per Kurt
+ /*TModelInstanceInfo instanceInfo = new TModelInstanceInfo();
+ instanceInfo.setTModelKey("uddi:uddi.org:transport:http");
+ bt.setTModelInstanceDetails(new TModelInstanceDetails());
+ bt.getTModelInstanceDetails().getTModelInstanceInfo().add(instanceInfo);
+ */
+ bs.getBindingTemplates().getBindingTemplate().add(bt);
+
+ bs.getBindingTemplates().getBindingTemplate().add(bt);
+ be.getBusinessServices().getBusinessService().add(bs);
+ sb.getBusinessEntity().add(be);
+ BusinessDetail saveBusiness = publication.saveBusiness(sb);
+
+ //ok Joe's callback is setup
+
+ //Setup a business to subscribe to
+ sb = new SaveBusiness();
+ sb.setAuthInfo(authInfoSam);
+ be = new BusinessEntity();
+ be.getName().add(new Name());
+ be.getName().get(0).setValue("Sam's business");
+ sb.getBusinessEntity().add(be);
+ BusinessDetail saveBusiness1 = publication.saveBusiness(sb);
+
+ //ok Joe now needs to subscribe for Sam's business
+ Holder<List<Subscription>> list = new Holder<List<Subscription>>();
+ list.value = new ArrayList<Subscription>();
+ Subscription s = new Subscription();
+ s.setBindingKey(saveBusiness.getBusinessEntity().get(0).getBusinessServices().getBusinessService().get(0).getBindingTemplates().getBindingTemplate().get(0).getBindingKey());
+ s.setSubscriptionFilter(new SubscriptionFilter());
+ s.getSubscriptionFilter().setGetBusinessDetail(new GetBusinessDetail());
+ s.getSubscriptionFilter().getGetBusinessDetail().getBusinessKey().add(saveBusiness1.getBusinessEntity().get(0).getBusinessKey());
+ DatatypeFactory df = DatatypeFactory.newInstance();
+ GregorianCalendar gcal = new GregorianCalendar();
+ gcal.setTimeInMillis(System.currentTimeMillis());
+ gcal.add(Calendar.HOUR, 1);
+ s.setExpiresAfter(df.newXMLGregorianCalendar(gcal));
+
+ s.setNotificationInterval(df.newDuration(5000));
+ list.value.add(s);
+ subscription.saveSubscription(authInfoJoe, list);
+
+ //ok have sam change his business around.
+ sb = new SaveBusiness();
+ sb.setAuthInfo(authInfoSam);
+ be = saveBusiness1.getBusinessEntity().get(0);
+ be.getName().get(0).setLang("en");
+ sb.getBusinessEntity().add(be);
+ publication.saveBusiness(sb);
+ int maxwait = 30000;
+ while (maxwait > 0) {
+ if (UDDISubscriptionListenerImpl.notifcationMap.size() > 0) {
+ break;
+ }
Thread.sleep(1000);
maxwait = maxwait - 1000;
}
- if (UDDISubscriptionListenerImpl.notifcationMap.isEmpty())
- {
+ if (UDDISubscriptionListenerImpl.notifcationMap.isEmpty()) {
Assert.fail("no callbacks were recieved.");
}
Modified: juddi/branches/juddi-3.2.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/Node.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/Node.java?rev=1481655&r1=1481654&r2=1481655&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/Node.java (original)
+++ juddi/branches/juddi-3.2.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/Node.java Sun May 12 21:54:52 2013
@@ -32,7 +32,7 @@ import javax.xml.bind.annotation.XmlType
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "node", propOrder = {
"name",
- "managerName",
+ "clientName",
"description",
"custodyTransferUrl",
"inquiryUrl",
@@ -51,7 +51,7 @@ public class Node implements Serializabl
@XmlTransient
private static final long serialVersionUID = -4601378453000384721L;
private String name;
- private String managerName;
+ private String clientName;
private String description;
private String custodyTransferUrl;
private String inquiryUrl;
@@ -74,11 +74,11 @@ public class Node implements Serializabl
this.name = name;
}
- public String getManagerName() {
- return managerName;
+ public String getClientName() {
+ return clientName;
}
- public void setManagerName(String managerName) {
- this.managerName = managerName;
+ public void setClientName(String clientName) {
+ this.clientName = clientName;
}
public String getDescription() {
return description;
Propchange: juddi/branches/juddi-3.2.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/Node.java
------------------------------------------------------------------------------
Merged /juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/Node.java:r1460934-1481602
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org