You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by jf...@apache.org on 2009/01/24 00:11:52 UTC
svn commit: r737242 - in
/webservices/juddi/branches/v3_trunk/juddi-core/src: main/resources/
test/java/org/apache/juddi/api/impl/ test/resources/api_xml_data/find/
test/resources/api_xml_data/joepublisher/
Author: jfaath
Date: Fri Jan 23 23:11:51 2009
New Revision: 737242
URL: http://svn.apache.org/viewvc?rev=737242&view=rev
Log:
Added more unit tests including a bindingTemplate test and a test for the four "find" operations
Added:
webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_050_BindingTemplateTest.java (with props)
webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_060_PublisherAssertionTest.java
- copied, changed from r737160, webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_050_PublisherAssertionTest.java
webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_070_FindEntityTest.java (with props)
webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_080_SubscriberSaveTest.java
- copied, changed from r737160, webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_060_SubscriberSaveTest.java
webservices/juddi/branches/v3_trunk/juddi-core/src/test/resources/api_xml_data/joepublisher/bindingTemplate.xml (with props)
Removed:
webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_050_PublisherAssertionTest.java
webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_060_SubscriberSaveTest.java
Modified:
webservices/juddi/branches/v3_trunk/juddi-core/src/main/resources/messages_en.properties
webservices/juddi/branches/v3_trunk/juddi-core/src/test/resources/api_xml_data/find/findBinding1.xml
webservices/juddi/branches/v3_trunk/juddi-core/src/test/resources/api_xml_data/find/findBusiness1.xml
webservices/juddi/branches/v3_trunk/juddi-core/src/test/resources/api_xml_data/find/findService1.xml
webservices/juddi/branches/v3_trunk/juddi-core/src/test/resources/api_xml_data/find/findTModel1.xml
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/resources/messages_en.properties
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/resources/messages_en.properties?rev=737242&r1=737241&r2=737242&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/resources/messages_en.properties (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/resources/messages_en.properties Fri Jan 23 23:11:51 2009
@@ -27,6 +27,7 @@
E_fatalError=
E_invalidCategory=
E_invalidCompletionStatus=
+E_invalidCombination=Invalid find qualifier combination
E_invalidKeyPassed=An invalid key has been passed
E_invalidProjection=
E_invalidTime=
Added: webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_050_BindingTemplateTest.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_050_BindingTemplateTest.java?rev=737242&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_050_BindingTemplateTest.java (added)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_050_BindingTemplateTest.java Fri Jan 23 23:11:51 2009
@@ -0,0 +1,133 @@
+/*
+ * 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.
+ */
+package org.apache.juddi.api.impl;
+
+import static junit.framework.Assert.assertEquals;
+import java.util.List;
+
+import org.apache.juddi.api.impl.UDDIInquiryImpl;
+import org.apache.juddi.api.impl.UDDIPublicationImpl;
+import org.apache.log4j.Logger;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+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.v3_service.DispositionReportFaultMessage;
+
+/**
+ * @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
+ */
+public class API_050_BindingTemplateTest
+{
+ final static String JOE_BINDING_XML = "api_xml_data/joepublisher/bindingTemplate.xml";
+ final static String JOE_BINDING_KEY = "uddi:juddi.apache.org:joepublisher:bindingtwo";
+
+ private static Logger logger = Logger.getLogger(API_050_BindingTemplateTest.class);
+ private UDDIPublicationImpl publish = new UDDIPublicationImpl();
+ private UDDIInquiryImpl inquiry = new UDDIInquiryImpl();
+
+ private static API_010_PublisherTest api010 = new API_010_PublisherTest();
+ private static API_020_TmodelTest api020 = new API_020_TmodelTest();
+ private static API_030_BusinessEntityTest api030 = new API_030_BusinessEntityTest();
+ private static API_040_BusinessServiceTest api040 = new API_040_BusinessServiceTest();
+ private static String authInfoJoe = null;
+
+ @BeforeClass
+ public static void setup() {
+ logger.debug("Getting auth token..");
+ try {
+ api010.saveJoePublisher();
+ authInfoJoe = API_010_PublisherTest.authInfoJoe();
+ } catch (DispositionReportFaultMessage e) {
+ logger.error(e.getMessage(), e);
+ Assert.fail("Could not obtain authInfo token.");
+ }
+ }
+
+ @Test
+ public void joepublisher() {
+ try {
+ api020.saveJoePublisherTmodel(authInfoJoe);
+ api030.saveJoePublisherBusiness(authInfoJoe);
+ api040.saveJoePublisherService(authInfoJoe);
+ saveJoePublisherBinding(authInfoJoe);
+ deleteJoePublisherBinding(authInfoJoe);
+ } finally {
+ api040.deleteJoePublisherService(authInfoJoe);
+ api030.deleteJoePublisherBusiness(authInfoJoe);
+ api020.deleteJoePublisherTmodel(authInfoJoe);
+ }
+ }
+
+ protected void saveJoePublisherBinding(String authInfoJoe) {
+ saveBinding(authInfoJoe, JOE_BINDING_XML, JOE_BINDING_KEY);
+ }
+
+ protected void deleteJoePublisherBinding(String authInfoJoe) {
+ deleteBinding(authInfoJoe, JOE_BINDING_KEY);
+ }
+
+ private void saveBinding(String authInfo, String bindingXML, String bindingKey) {
+ try {
+ // First save the entity
+ SaveBinding sb = new SaveBinding();
+ sb.setAuthInfo(authInfo);
+
+ BindingTemplate btIn = (BindingTemplate)UDDIApiTestHelper.buildEntityFromDoc(bindingXML, "org.uddi.api_v3");
+ sb.getBindingTemplate().add(btIn);
+ publish.saveBinding(sb);
+
+ // Now get the entity and check the values
+ GetBindingDetail gb = new GetBindingDetail();
+ gb.getBindingKey().add(bindingKey);
+ BindingDetail bd = inquiry.getBindingDetail(gb);
+ List<BindingTemplate> btOutList = bd.getBindingTemplate();
+ BindingTemplate btOut = btOutList.get(0);
+
+ assertEquals(btIn.getServiceKey(), btOut.getServiceKey());
+ assertEquals(btIn.getBindingKey(), btOut.getBindingKey());
+
+ UDDIApiTestHelper.checkDescriptions(btIn.getDescription(), btOut.getDescription());
+ UDDIApiTestHelper.checkCategories(btIn.getCategoryBag(), btOut.getCategoryBag());
+ }
+ catch(Exception e) {
+ logger.error(e.getMessage(), e);
+ Assert.fail("No exception should be thrown: " + e.getMessage());
+ }
+
+ }
+
+ private 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);
+ publish.deleteBinding(db);
+ }
+ catch(Exception e) {
+ logger.error(e.getMessage(), e);
+ Assert.fail("No exception should be thrown.");
+ }
+
+ }
+
+}
Propchange: webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_050_BindingTemplateTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_060_PublisherAssertionTest.java (from r737160, webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_050_PublisherAssertionTest.java)
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_060_PublisherAssertionTest.java?p2=webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_060_PublisherAssertionTest.java&p1=webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_050_PublisherAssertionTest.java&r1=737160&r2=737242&rev=737242&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_050_PublisherAssertionTest.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_060_PublisherAssertionTest.java Fri Jan 23 23:11:51 2009
@@ -32,10 +32,10 @@
import org.uddi.api_v3.PublisherAssertion;
import org.uddi.v3_service.DispositionReportFaultMessage;
-public class API_050_PublisherAssertionTest {
+public class API_060_PublisherAssertionTest {
final static String JOE_ASSERT_XML = "api_xml_data/joepublisher/publisherAssertion.xml";
- private static Logger logger = Logger.getLogger(API_050_PublisherAssertionTest.class);
+ private static Logger logger = Logger.getLogger(API_060_PublisherAssertionTest.class);
private UDDIPublicationImpl publish = new UDDIPublicationImpl();
Added: webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_070_FindEntityTest.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_070_FindEntityTest.java?rev=737242&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_070_FindEntityTest.java (added)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_070_FindEntityTest.java Fri Jan 23 23:11:51 2009
@@ -0,0 +1,206 @@
+/*
+ * 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.
+ */
+package org.apache.juddi.api.impl;
+
+import static junit.framework.Assert.assertEquals;
+import java.util.List;
+
+import org.apache.juddi.api.impl.UDDIInquiryImpl;
+import org.apache.log4j.Logger;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import org.uddi.api_v3.BindingDetail;
+import org.uddi.api_v3.BindingTemplate;
+import org.uddi.api_v3.BusinessEntity;
+import org.uddi.api_v3.BusinessInfo;
+import org.uddi.api_v3.BusinessInfos;
+import org.uddi.api_v3.BusinessList;
+import org.uddi.api_v3.BusinessService;
+import org.uddi.api_v3.FindBinding;
+import org.uddi.api_v3.FindBusiness;
+import org.uddi.api_v3.FindService;
+import org.uddi.api_v3.FindTModel;
+import org.uddi.api_v3.ServiceInfo;
+import org.uddi.api_v3.ServiceInfos;
+import org.uddi.api_v3.ServiceList;
+import org.uddi.api_v3.TModel;
+import org.uddi.api_v3.TModelInfo;
+import org.uddi.api_v3.TModelInfos;
+import org.uddi.api_v3.TModelList;
+import org.uddi.v3_service.DispositionReportFaultMessage;
+
+/**
+ * @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
+ */
+public class API_070_FindEntityTest
+{
+ final static String FIND_BUSINESS_XML = "api_xml_data/find/findBusiness1.xml";
+ final static String FIND_SERVICE_XML = "api_xml_data/find/findService1.xml";
+ final static String FIND_BINDING_XML = "api_xml_data/find/findBinding1.xml";
+ final static String FIND_TMODEL_XML = "api_xml_data/find/findTModel1.xml";
+
+ private static Logger logger = Logger.getLogger(API_070_FindEntityTest.class);
+ private UDDIInquiryImpl inquiry = new UDDIInquiryImpl();
+
+ private static API_010_PublisherTest api010 = new API_010_PublisherTest();
+ private static API_020_TmodelTest api020 = new API_020_TmodelTest();
+ private static API_030_BusinessEntityTest api030 = new API_030_BusinessEntityTest();
+ private static API_040_BusinessServiceTest api040 = new API_040_BusinessServiceTest();
+ private static API_050_BindingTemplateTest api050 = new API_050_BindingTemplateTest();
+ private static String authInfoJoe = null;
+
+ @BeforeClass
+ public static void setup() {
+ logger.debug("Getting auth token..");
+ try {
+ api010.saveJoePublisher();
+ api010.saveSamSyndicator();
+ authInfoJoe = API_010_PublisherTest.authInfoJoe();
+ } catch (DispositionReportFaultMessage e) {
+ logger.error(e.getMessage(), e);
+ Assert.fail("Could not obtain authInfo token.");
+ }
+ }
+
+ @Test
+ public void findEntities() {
+ try {
+ api020.saveJoePublisherTmodel(authInfoJoe);
+ api030.saveJoePublisherBusiness(authInfoJoe);
+ api040.saveJoePublisherService(authInfoJoe);
+ api050.saveJoePublisherBinding(authInfoJoe);
+ findBusiness();
+ findService();
+ findBinding();
+ findTModel();
+ }
+ finally {
+ api050.deleteJoePublisherBinding(authInfoJoe);
+ api040.deleteJoePublisherService(authInfoJoe);
+ api030.deleteJoePublisherBusiness(authInfoJoe);
+ api020.deleteJoePublisherTmodel(authInfoJoe);
+ }
+
+ }
+
+ private void findBusiness() {
+ try {
+ FindBusiness body = (FindBusiness)UDDIApiTestHelper.buildEntityFromDoc(FIND_BUSINESS_XML, "org.uddi.api_v3");
+ BusinessList result = inquiry.findBusiness(body);
+ if (result == null)
+ Assert.fail("Null result from find business operation");
+ BusinessInfos bInfos = result.getBusinessInfos();
+ if (bInfos == null)
+ Assert.fail("No result from find business operation");
+ List<BusinessInfo> biList = bInfos.getBusinessInfo();
+ if (biList == null || biList.size() == 0)
+ Assert.fail("No result from find business operation");
+ BusinessInfo biOut = biList.get(0);
+
+ BusinessEntity beIn = (BusinessEntity)UDDIApiTestHelper.buildEntityFromDoc(API_030_BusinessEntityTest.JOE_BUSINESS_XML, "org.uddi.api_v3");
+
+ assertEquals(beIn.getBusinessKey(), biOut.getBusinessKey());
+
+ UDDIApiTestHelper.checkNames(beIn.getName(), biOut.getName());
+ UDDIApiTestHelper.checkDescriptions(beIn.getDescription(), biOut.getDescription());
+ }
+ catch(Exception e) {
+ logger.error(e.getMessage(), e);
+ Assert.fail("No exception should be thrown.");
+ }
+ }
+
+ private void findService() {
+ try {
+ FindService body = (FindService)UDDIApiTestHelper.buildEntityFromDoc(FIND_SERVICE_XML, "org.uddi.api_v3");
+ ServiceList result = inquiry.findService(body);
+ if (result == null)
+ Assert.fail("Null result from find service operation");
+ ServiceInfos sInfos = result.getServiceInfos();
+ if (sInfos == null)
+ Assert.fail("No result from find service operation");
+ List<ServiceInfo> siList = sInfos.getServiceInfo();
+ if (siList == null || siList.size() == 0)
+ Assert.fail("No result from find service operation");
+ ServiceInfo siOut = siList.get(0);
+
+ BusinessService bsIn = (BusinessService)UDDIApiTestHelper.buildEntityFromDoc(API_040_BusinessServiceTest.JOE_SERVICE_XML, "org.uddi.api_v3");
+
+ assertEquals(bsIn.getServiceKey(), siOut.getServiceKey());
+
+ UDDIApiTestHelper.checkNames(bsIn.getName(), siOut.getName());
+ }
+ catch(Exception e) {
+ logger.error(e.getMessage(), e);
+ Assert.fail("No exception should be thrown.");
+ }
+ }
+
+ private void findBinding() {
+ try {
+ FindBinding body = (FindBinding)UDDIApiTestHelper.buildEntityFromDoc(FIND_BINDING_XML, "org.uddi.api_v3");
+ BindingDetail result = inquiry.findBinding(body);
+ if (result == null)
+ Assert.fail("Null result from find binding operation");
+ List<BindingTemplate> btList = result.getBindingTemplate();
+ if (btList == null || btList.size() == 0)
+ Assert.fail("No result from find binding operation");
+ BindingTemplate btOut = btList.get(0);
+
+ BindingTemplate btIn = (BindingTemplate)UDDIApiTestHelper.buildEntityFromDoc(API_050_BindingTemplateTest.JOE_BINDING_XML, "org.uddi.api_v3");
+
+ assertEquals(btIn.getServiceKey(), btOut.getServiceKey());
+ assertEquals(btIn.getBindingKey(), btOut.getBindingKey());
+
+ UDDIApiTestHelper.checkDescriptions(btIn.getDescription(), btOut.getDescription());
+ UDDIApiTestHelper.checkCategories(btIn.getCategoryBag(), btOut.getCategoryBag());
+ }
+ catch(Exception e) {
+ logger.error(e.getMessage(), e);
+ Assert.fail("No exception should be thrown: " + e.getMessage());
+ }
+ }
+
+ private void findTModel() {
+ try {
+ FindTModel body = (FindTModel)UDDIApiTestHelper.buildEntityFromDoc(FIND_TMODEL_XML, "org.uddi.api_v3");
+ TModelList result = inquiry.findTModel(body);
+ if (result == null)
+ Assert.fail("Null result from find tModel operation");
+ TModelInfos tInfos = result.getTModelInfos();
+ if (tInfos == null)
+ Assert.fail("No result from find tModel operation");
+ List<TModelInfo> tiList = tInfos.getTModelInfo();
+ if (tiList == null || tiList.size() == 0)
+ Assert.fail("No result from find tModel operation");
+ TModelInfo tiOut = tiList.get(0);
+
+ TModel tmIn = (TModel)UDDIApiTestHelper.buildEntityFromDoc(API_020_TmodelTest.JOE_PUBLISHER_TMODEL_XML, "org.uddi.api_v3");
+
+ assertEquals(tmIn.getTModelKey(), tiOut.getTModelKey());
+ assertEquals(tmIn.getName().getLang(), tiOut.getName().getLang());
+ assertEquals(tmIn.getName().getValue(), tiOut.getName().getValue());
+
+ UDDIApiTestHelper.checkDescriptions(tmIn.getDescription(), tiOut.getDescription());
+ }
+ catch(Exception e) {
+ logger.error(e.getMessage(), e);
+ Assert.fail("No exception should be thrown.");
+ }
+ }
+
+}
Propchange: webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_070_FindEntityTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_080_SubscriberSaveTest.java (from r737160, webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_060_SubscriberSaveTest.java)
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_080_SubscriberSaveTest.java?p2=webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_080_SubscriberSaveTest.java&p1=webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_060_SubscriberSaveTest.java&r1=737160&r2=737242&rev=737242&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_060_SubscriberSaveTest.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_080_SubscriberSaveTest.java Fri Jan 23 23:11:51 2009
@@ -26,7 +26,7 @@
* @author <a href="mailto:tcunningh@apache.org">Tom Cunningham</a>
* @author <a href="mailto:kstam@apache.org">Kurt T Stam</a>
*/
-public class API_060_SubscriberSaveTest {
+public class API_080_SubscriberSaveTest {
final static String SUBSCRIPTION_XML = "api_xml_data/subscription/subscription1.xml";
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/test/resources/api_xml_data/find/findBinding1.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/test/resources/api_xml_data/find/findBinding1.xml?rev=737242&r1=737241&r2=737242&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/test/resources/api_xml_data/find/findBinding1.xml (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/test/resources/api_xml_data/find/findBinding1.xml Fri Jan 23 23:11:51 2009
@@ -4,6 +4,9 @@
<findQualifier>orAllKeys</findQualifier>
</findQualifiers>
<tModelBag>
- <tModelKey>uddi:businessone.com:services:serviceone:wsdlSpec</tModelKey>
+ <tModelKey>uddi:uddi.org:protocol:serverauthenticatedssl3</tModelKey>
</tModelBag>
+ <categoryBag>
+ <keyedReference tModelKey="uddi:tmodelkey:categories:bindings" keyName="category" keyValue="secure" />
+ </categoryBag>
</find_binding>
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/test/resources/api_xml_data/find/findBusiness1.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/test/resources/api_xml_data/find/findBusiness1.xml?rev=737242&r1=737241&r2=737242&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/test/resources/api_xml_data/find/findBusiness1.xml (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/test/resources/api_xml_data/find/findBusiness1.xml Fri Jan 23 23:11:51 2009
@@ -5,14 +5,29 @@
<findQualifier>caseInsensitiveMatch</findQualifier>
<findQualifier>approximateMatch</findQualifier>
</findQualifiers>
- <name xml:lang="en">John</name>
+ <name xml:lang="en">john</name>
<name xml:lang="en">A-1</name>
<identifierBag>
<keyedReference tModelKey="uddi:tmodelkey:identifier" keyName="identify" keyValue="identity" />
<keyedReference tModelKey="uddi:tmodelkey:identifier" keyName="identify" keyValue="identityX" />
</identifierBag>
+ <categoryBag>
+ <keyedReference tModelKey="uddi:tmodelkey:categories:fruit" keyName="category" keyValue="apples" />
+ <keyedReference tModelKey="uddi:tmodelkey:categories:music" keyName="category" keyValue="blues" />
+ <keyedReferenceGroup tModelKey="uddi:tmodelKey:group">
+ <keyedReference tModelKey="uddi:tmodelKey:blank" keyName="blank" keyValue="blank" />
+ </keyedReferenceGroup>
+ </categoryBag>
<discoveryURLs>
<discoveryURL useType="home">http://www.businessone.com</discoveryURL>
- <discoveryURL useType="serviceList">http://www.businessthree.com/services</discoveryURL>
+ <discoveryURL useType="serviceList">http://www.businessone.com/services</discoveryURL>
</discoveryURLs>
+ <find_tModel xmlns="urn:uddi-org:api_v3" xmlns:xml="http://www.w3.org/XML/1998/namespace">
+ <findQualifiers>
+ <findQualifier>caseInsensitiveMatch</findQualifier>
+ <findQualifier>approximateMatch</findQualifier>
+ <findQualifier>andAllKeys</findQualifier>
+ </findQualifiers>
+ <name>uddi-org:serverAuthenticatedSSL3</name>
+ </find_tModel>
</find_business>
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/test/resources/api_xml_data/find/findService1.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/test/resources/api_xml_data/find/findService1.xml?rev=737242&r1=737241&r2=737242&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/test/resources/api_xml_data/find/findService1.xml (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/test/resources/api_xml_data/find/findService1.xml Fri Jan 23 23:11:51 2009
@@ -1,8 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<find_service xmlns="urn:uddi-org:api_v3" xmlns:xml="http://www.w3.org/XML/1998/namespace">
<findQualifiers>
- <findQualifier>caseInsensitiveMatch</findQualifier>
- <findQualifier>approximateMatch</findQualifier>
+ <findQualifier>exactMatch</findQualifier>
</findQualifiers>
- <name xml:lang="en">service</name>
+ <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>
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/test/resources/api_xml_data/find/findTModel1.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/test/resources/api_xml_data/find/findTModel1.xml?rev=737242&r1=737241&r2=737242&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/test/resources/api_xml_data/find/findTModel1.xml (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/test/resources/api_xml_data/find/findTModel1.xml Fri Jan 23 23:11:51 2009
@@ -5,9 +5,9 @@
<findQualifier>approximateMatch</findQualifier>
<findQualifier>andAllKeys</findQualifier>
</findQualifiers>
- <name xml:lang="en">tmodel</name>
- <identifierBag>
- <keyedReference tModelKey="uddi:tmodelkey:identifier" keyName="identify" keyValue="identity" />
- <keyedReference tModelKey="uddi:tmodelkey:identifierx" keyName="identify" keyValue="identity" />
- </identifierBag>
+ <name>Joe Publisher</name>
+ <categoryBag>
+ <keyedReference tModelKey="uddi:uddi.org:categorization:types" keyName="uddi-org:types:keyGenerator"
+ keyValue="keyGenerator" />
+ </categoryBag>
</find_tModel>
Added: webservices/juddi/branches/v3_trunk/juddi-core/src/test/resources/api_xml_data/joepublisher/bindingTemplate.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/test/resources/api_xml_data/joepublisher/bindingTemplate.xml?rev=737242&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/test/resources/api_xml_data/joepublisher/bindingTemplate.xml (added)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/test/resources/api_xml_data/joepublisher/bindingTemplate.xml Fri Jan 23 23:11:51 2009
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<bindingTemplate xmlns="urn:uddi-org:api_v3" serviceKey="uddi:juddi.apache.org:joepublisher:serviceone" bindingKey="uddi:juddi.apache.org:joepublisher:bindingtwo">
+ <description xml:lang="en">This is the secure access point for service one</description>
+ <accessPoint useType="endPoint">https://businessone.com/services/serviceone</accessPoint>
+ <tModelInstanceDetails>
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:serverauthenticatedssl3"/>
+ </tModelInstanceDetails>
+ <categoryBag>
+ <keyedReference tModelKey="uddi:tmodelkey:categories:bindings" keyName="category" keyValue="secure" />
+ </categoryBag>
+</bindingTemplate>
Propchange: webservices/juddi/branches/v3_trunk/juddi-core/src/test/resources/api_xml_data/joepublisher/bindingTemplate.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
---------------------------------------------------------------------
To unsubscribe, e-mail: juddi-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: juddi-cvs-help@ws.apache.org