You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by tc...@apache.org on 2009/05/28 19:45:28 UTC
svn commit: r779694 - in
/webservices/juddi/branches/v3_trunk/uddi-tck/src/main:
java/org/uddi/api_v3/tck/ resources/uddi_data/subscriptionnotifier/
Author: tcunning
Date: Thu May 28 17:45:28 2009
New Revision: 779694
URL: http://svn.apache.org/viewvc?rev=779694&view=rev
Log:
Check in SubscriptionListenerNotification TCK files and changes.
Added:
webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckSubscriptionListener.java
webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/subscriptionnotifier/
webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/subscriptionnotifier/bindingTemplate.xml
webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/subscriptionnotifier/businessService.xml
webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/subscriptionnotifier/subscription1.xml
Modified:
webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckBusinessService.java
webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckSubscription.java
Modified: webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckBusinessService.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckBusinessService.java?rev=779694&r1=779693&r2=779694&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckBusinessService.java (original)
+++ webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckBusinessService.java Thu May 28 17:45:28 2009
@@ -33,6 +33,10 @@
*/
public class TckBusinessService
{
+
+ public final static String NOTIFIER_SERVICE_XML = "uddi_data/subscriptionnotifier/businessService.xml";
+ public final static String NOTIFIER_SERVICE_KEY = "uddi:uddi.joepublisher.com:notifierone";
+
final static String JOE_SERVICE_XML = "uddi_data/joepublisher/businessService.xml";
final static String JOE_SERVICE_KEY = "uddi:uddi.joepublisher.com:serviceone";
final static String SAM_SERVICE_XML = "uddi_data/samsyndicator/businessService.xml";
@@ -52,7 +56,7 @@
public void saveJoePublisherService(String authInfoJoe) {
saveService(authInfoJoe, JOE_SERVICE_XML, JOE_SERVICE_KEY);
}
-
+
public void saveJoePublisherServices(String authInfoJoe, int numberOfCopies) {
saveServices(authInfoJoe, JOE_SERVICE_XML, JOE_SERVICE_KEY, numberOfCopies);
}
@@ -60,6 +64,15 @@
public void deleteJoePublisherService(String authInfoJoe) {
deleteService(authInfoJoe, JOE_SERVICE_KEY);
}
+
+ public void saveNotifierService(String authInfoJoe) {
+ saveService(authInfoJoe, NOTIFIER_SERVICE_XML, NOTIFIER_SERVICE_KEY);
+ }
+
+ public void deleteNotifierService(String authInfoJoe) {
+ deleteService(authInfoJoe, NOTIFIER_SERVICE_KEY);
+ }
+
public void deleteJoePublisherServices(String authInfoJoe, int numberOfCopies) {
deleteServices(authInfoJoe, JOE_SERVICE_KEY, numberOfCopies);
Modified: webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckSubscription.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckSubscription.java?rev=779694&r1=779693&r2=779694&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckSubscription.java (original)
+++ webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckSubscription.java Thu May 28 17:45:28 2009
@@ -40,6 +40,7 @@
/**
* @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
* @author <a href="mailto:kstam@apache.org">Kurt T Stam</a>
+ * @author <a href="mailto:tcunning@apache.org">Tom Cunningham</a>
*/
public class TckSubscription
{
@@ -72,6 +73,11 @@
this.security = security;
}
+ public void saveJoePublisherSubscription(String authInfoJoe, String subscriptionXML,
+ String subscriptionKey) {
+ saveSubscription(authInfoJoe, subscriptionXML, subscriptionKey);
+ }
+
public void saveJoePublisherSubscription(String authInfoJoe) {
saveSubscription(authInfoJoe, JOE_SUBSCRIPTION_XML, JOE_SUBSCRIPTION_KEY);
}
Added: webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckSubscriptionListener.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckSubscriptionListener.java?rev=779694&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckSubscriptionListener.java (added)
+++ webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckSubscriptionListener.java Thu May 28 17:45:28 2009
@@ -0,0 +1,174 @@
+package org.uddi.api_v3.tck;
+
+/*
+ * Copyright 2001-2009 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import static junit.framework.Assert.assertEquals;
+
+import java.util.List;
+import java.util.ArrayList;
+
+import org.apache.log4j.Logger;
+import org.junit.Assert;
+
+import org.uddi.api_v3.BindingDetail;
+import org.uddi.api_v3.BindingTemplate;
+import org.uddi.api_v3.DeleteBinding;
+import org.uddi.api_v3.GetBindingDetail;
+import org.uddi.api_v3.SaveBinding;
+
+
+import org.uddi.api_v3.BusinessService;
+import org.uddi.api_v3.DeleteService;
+import org.uddi.api_v3.GetServiceDetail;
+import org.uddi.api_v3.SaveService;
+import org.uddi.api_v3.ServiceDetail;
+import org.uddi.sub_v3.GetSubscriptionResults;
+import org.uddi.sub_v3.SubscriptionResultsList;
+import org.uddi.subr_v3.NotifySubscriptionListener;
+import org.uddi.v3_service.UDDIInquiryPortType;
+import org.uddi.v3_service.UDDIPublicationPortType;
+import org.uddi.v3_service.UDDISubscriptionListenerPortType;
+import org.uddi.v3_service.UDDISubscriptionPortType;
+
+import org.uddi.api_v3.TModel;
+import org.uddi.api_v3.TModelList;
+import org.uddi.api_v3.Name;
+import org.uddi.api_v3.SaveTModel;
+import org.uddi.api_v3.FindTModel;
+
+
+/**
+ * @author <a href="mailto:tcunning@apache.org">Tom Cunningham</a>
+ */
+public class TckSubscriptionListener
+{
+ public final static String SUBSCRIBED_SERVICE_XML = "uddi_data/joepublisher/businessService.xml";
+ public final static String SUBSCRIBED_SERVICE_KEY = "uddi:uddi.joepublisher.com:serviceone";
+
+ final static String JOE_SERVICE_XML = "uddi_data/joepublisher/businessService.xml";
+ final static String JOE_SERVICE_KEY = "uddi:uddi.joepublisher.com:serviceone";
+ final static String SAM_SERVICE_XML = "uddi_data/samsyndicator/businessService.xml";
+ final static String SAM_SERVICE_KEY = "uddi:www.samco.com:listingservice";
+
+ final static String JOE_SUBSCRIPTION_XML = "uddi_data/subscription/subscription1.xml";
+ final static String JOE_SUBSCRIPTION_KEY = "uddi:uddi.joepublisher.com:subscriptionone";
+ final static String JOE_SUBSCRIPTIONRESULTS_XML = "uddi_data/subscription/subscriptionresults1.xml";
+
+ public final static String NOTIFIER_BINDING_XML = "uddi_data/subscriptionnotifier/bindingTemplate.xml";
+ public final static String NOTIFIER_BINDING_KEY = "uddi:uddi.joepublisher.com:bindingnotifier";
+
+ public final static String SUBSCRIPTION_XML = "uddi_data/subscriptionnotifier/subscription1.xml";
+ public final static String SUBSCRIPTION_KEY = "uddi:uddi.joepublisher.com:subscriptionone";
+
+ private Logger logger = Logger.getLogger(this.getClass());
+ private UDDIPublicationPortType publication = null;
+ private UDDIInquiryPortType inquiry = null;
+ private UDDISubscriptionListenerPortType listener = null;
+ private UDDISubscriptionPortType subscription = null;
+ private SaveService ss = null;
+
+ public TckSubscriptionListener(UDDISubscriptionListenerPortType listener,
+ UDDISubscriptionPortType subscription,
+ UDDIInquiryPortType inquiry,
+ UDDIPublicationPortType publication) {
+ super();
+ this.listener = listener;
+ this.subscription = subscription;
+ this.publication = publication;
+ this.inquiry = inquiry;
+ }
+
+ public void saveNotifierBinding(String authInfo, String bindingXML, String bindingKey) {
+ try {
+ SaveBinding sb = new SaveBinding();
+ sb.setAuthInfo(authInfo);
+
+ BindingTemplate btIn = (BindingTemplate)EntityCreator.buildFromDoc(bindingXML, "org.uddi.api_v3");
+ sb.getBindingTemplate().add(btIn);
+ publication.saveBinding(sb);
+ }
+ catch(Exception e) {
+ logger.error(e.getMessage(), e);
+ Assert.fail("No exception should be thrown: " + e.getMessage());
+ }
+ }
+
+ public void deleteBinding(String authInfo, String bindingKey) {
+ try {
+ // Delete the entity and make sure it is removed
+ DeleteBinding db = new DeleteBinding();
+ db.setAuthInfo(authInfo);
+
+ db.getBindingKey().add(bindingKey);
+ publication.deleteBinding(db);
+ }
+ catch(Exception e) {
+ logger.error(e.getMessage(), e);
+ Assert.fail("No exception should be thrown.");
+ }
+
+ }
+
+ public void saveService(String authInfo) {
+ try {
+ // First save the entity
+ ss = new SaveService();
+ ss.setAuthInfo(authInfo);
+
+ org.uddi.api_v3.BusinessService bsIn = (org.uddi.api_v3.BusinessService)EntityCreator.buildFromDoc(SUBSCRIBED_SERVICE_XML, "org.uddi.api_v3");
+ ss.getBusinessService().add(bsIn);
+ publication.saveService(ss);
+
+ }
+ catch(Exception e) {
+ logger.error(e.getMessage(), e);
+ Assert.fail("No exception should be thrown.");
+ }
+ }
+
+ public void changeSubscribedObject(String authInfo) {
+ try {
+ ss.getBusinessService().get(0).getName().get(0).setValue("foo");
+ publication.saveService(ss);
+ Thread.sleep(100000);
+ } catch(Exception e) {
+ e.printStackTrace();
+ logger.error(e.getMessage(), e);
+ Assert.fail("No exception should be thrown. " + e.getMessage());
+ }
+
+ }
+
+ public void notifyService(String authInfo) {
+ try {
+
+ NotifySubscriptionListener nsl = new NotifySubscriptionListener();
+ nsl.setAuthInfo(authInfo);
+ SubscriptionResultsList srl = new SubscriptionResultsList();
+
+// GetSubscriptionResults getSubResultsIn = (GetSubscriptionResults)EntityCreator.buildFromDoc(JOE_SUBSCRIPTIONRESULTS_XML, "org.uddi.sub_v3");
+ // getSubResultsIn.setAuthInfo(authInfo);
+
+// SubscriptionResultsList result = subscription.getSubscriptionResults(getSubResultsIn);
+
+ nsl.setSubscriptionResultsList(srl);
+ }
+ catch(Exception e) {
+ logger.error(e.getMessage(), e);
+ Assert.fail("No exception should be thrown.");
+ }
+
+ }
+}
\ No newline at end of file
Added: webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/subscriptionnotifier/bindingTemplate.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/subscriptionnotifier/bindingTemplate.xml?rev=779694&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/subscriptionnotifier/bindingTemplate.xml (added)
+++ webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/subscriptionnotifier/bindingTemplate.xml Thu May 28 17:45:28 2009
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Copyright 2001-2009 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */ -->
+<bindingTemplate xmlns="urn:uddi-org:api_v3" serviceKey="uddi:uddi.joepublisher.com:serviceone" bindingKey="uddi:uddi.joepublisher.com:bindingnotifier">
+ <description xml:lang="en">This is the endpoint for the subscription listener</description>
+ <accessPoint useType="endPoint">https://localhost:8080/juddi/services/subscription-listener</accessPoint>
+ <tModelInstanceDetails>
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:serverauthenticatedssl3"/>
+ </tModelInstanceDetails>
+ <categoryBag>
+ <keyedReference tModelKey="uddi:tmodelkey:categories:bindings" keyName="category" keyValue="secure" />
+ </categoryBag>
+</bindingTemplate>
Added: webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/subscriptionnotifier/businessService.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/subscriptionnotifier/businessService.xml?rev=779694&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/subscriptionnotifier/businessService.xml (added)
+++ webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/subscriptionnotifier/businessService.xml Thu May 28 17:45:28 2009
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Copyright 2001-2009 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */ -->
+<businessService xmlns="urn:uddi-org:api_v3" xmlns:xml="http://www.w3.org/XML/1998/namespace"
+ businessKey="uddi:uddi.joepublisher.com:businessone" serviceKey="uddi:uddi.joepublisher.com:notifierone">
+ <name xml:lang="en">Notifier One</name>
+ <name xml:lang="es">Notifier Uno</name>
+ <description xml:lang="en">This is the description of notifier one.</description>
+ <description xml:lang="es">Ãsta es la descripción del notifier uno.</description>
+ <bindingTemplates>
+<bindingTemplate xmlns="urn:uddi-org:api_v3" serviceKey="uddi:uddi.joepublisher.com:notifierone" bindingKey="uddi:uddi.joepublisher.com:bindingnotifier">
+ <description xml:lang="en">This is the endpoint for the subscription listener</description>
+ <accessPoint useType="endPoint">https://localhost:8080/juddi/services/subscription-listener</accessPoint>
+ <tModelInstanceDetails>
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:serverauthenticatedssl3"/>
+ </tModelInstanceDetails>
+ <categoryBag>
+ <keyedReference tModelKey="uddi:tmodelkey:categories:bindings" keyName="category" keyValue="secure" />
+ </categoryBag>
+</bindingTemplate>
+ </bindingTemplates>
+ <categoryBag>
+ <keyedReference tModelKey="uddi:tmodelkey:categories" keyName="category" keyValue="peaches" />
+ <keyedReference tModelKey="uddi:tmodelkey:categories" keyName="category" keyValue="plums" />
+ <keyedReferenceGroup tModelKey="uddi:tmodelKey:group">
+ <keyedReference tModelKey="uddi:tmodelKey:blank" keyName="blank" keyValue="blank" />
+ </keyedReferenceGroup>
+ </categoryBag>
+</businessService>
Added: webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/subscriptionnotifier/subscription1.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/subscriptionnotifier/subscription1.xml?rev=779694&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/subscriptionnotifier/subscription1.xml (added)
+++ webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/subscriptionnotifier/subscription1.xml Thu May 28 17:45:28 2009
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Copyright 2001-2009 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+-->
+<subscription xmlns="urn:uddi-org:sub_v3">
+ <subscriptionKey>uddi:uddi.joepublisher.com:subscriptionone</subscriptionKey>
+ <subscriptionFilter>
+ <find_service xmlns="urn:uddi-org:api_v3" xmlns:xml="http://www.w3.org/XML/1998/namespace">
+ <findQualifiers>
+ <findQualifier>exactMatch</findQualifier>
+ </findQualifiers>
+ <name xml:lang="en">Service One</name>
+ <categoryBag>
+ <keyedReference tModelKey="uddi:tmodelkey:categories" keyName="category" keyValue="peaches" />
+ <keyedReference tModelKey="uddi:tmodelkey:categories" keyName="category" keyValue="plums" />
+ <keyedReferenceGroup tModelKey="uddi:tmodelKey:group">
+ <keyedReference tModelKey="uddi:tmodelKey:blank" keyName="blank" keyValue="blank" />
+ </keyedReferenceGroup>
+ </categoryBag>
+ </find_service>
+ </subscriptionFilter>
+ <bindingKey xmlns="urn:uddi-org:api_v3">uddi:uddi.joepublisher.com:bindingnotifier</bindingKey>
+ <notificationInterval>P5D</notificationInterval>
+ <maxEntities>1000</maxEntities>
+</subscription>
---------------------------------------------------------------------
To unsubscribe, e-mail: juddi-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: juddi-cvs-help@ws.apache.org