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 2011/05/04 19:58:53 UTC
svn commit: r1099545 - in /juddi/trunk/uddi-tck-base/src/main:
java/org/apache/juddi/v3/tck/ resources/uddi_data/joepublisher/
Author: kstam
Date: Wed May 4 17:58:52 2011
New Revision: 1099545
URL: http://svn.apache.org/viewvc?rev=1099545&view=rev
Log:
JUDDI-456, adding data used by testing
Added:
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/joepublisher/combineCatBagsBusinessServices.xml
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/joepublisher/combineCatBagsFindServices.xml
Modified:
juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusiness.java
juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckFindEntity.java
Modified: juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusiness.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusiness.java?rev=1099545&r1=1099544&r2=1099545&view=diff
==============================================================================
--- juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusiness.java (original)
+++ juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusiness.java Wed May 4 17:58:52 2011
@@ -48,6 +48,8 @@ public class TckBusiness
final static String SAM_BUSINESS_XML = "uddi_data/samsyndicator/businessEntity.xml";
final static String SAM_BUSINESS_WITHPROJECTION_XML = "uddi_data/samsyndicator/businessEntity_withProjection.xml";
final static String SAM_BUSINESS_KEY = "uddi:www.samco.com:samco";
+ final static String COMBINE_CATBAGS_BIZ_XML = "uddi_data/joepublisher/combineCatBagsBusinessServices.xml";
+ final static String COMBINE_CATBAGS_BIZ_KEY = "uddi:uddi.joepublisher.com:business01";
private Log logger = LogFactory.getLog(this.getClass());
private UDDIPublicationPortType publication = null;
@@ -84,6 +86,10 @@ public class TckBusiness
saveBusiness(authInfoJoe, JOE_BUSINESS_XML, JOE_BUSINESS_KEY);
}
+ public void saveCombineCatBagsPublisherBusiness(String authInfoJoe) {
+ saveBusiness(authInfoJoe, COMBINE_CATBAGS_BIZ_XML, COMBINE_CATBAGS_BIZ_KEY);
+ }
+
public void saveJoePublisherBusiness3(String authInfoJoe) {
saveBusiness(authInfoJoe, JOE_BUSINESS3_XML, JOE_BUSINESS3_KEY);
}
Modified: juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckFindEntity.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckFindEntity.java?rev=1099545&r1=1099544&r2=1099545&view=diff
==============================================================================
--- juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckFindEntity.java (original)
+++ juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckFindEntity.java Wed May 4 17:58:52 2011
@@ -71,6 +71,8 @@ public class TckFindEntity
final static String FIND_SERVICE_XML = "uddi_data/find/findService1.xml";
final static String FIND_BINDING_XML = "uddi_data/find/findBinding1.xml";
final static String FIND_TMODEL_XML = "uddi_data/find/findTModel1.xml";
+ final static String COMBINE_CAT_FIND_SERVICES = "uddi_data/joepublisher/combineCatBagsFindServices.xml";
+
private Log logger = LogFactory.getLog(this.getClass());
UDDIInquiryPortType inquiry =null;
@@ -268,6 +270,30 @@ public class TckFindEntity
}
return serviceKey;
}
+
+ public String findService_CombinedCatBag() {
+ String serviceKey = null;
+ try {
+ FindService body = (FindService)EntityCreator.buildFromDoc(COMBINE_CAT_FIND_SERVICES, "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);
+
+ serviceKey = siOut.getServiceKey();
+ }
+ catch(Exception e) {
+ logger.error(e.getMessage(), e);
+ Assert.fail("No exception should be thrown.");
+ }
+ return serviceKey;
+ }
public void findServiceDetail(String serviceKey) {
try {
Added: juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/joepublisher/combineCatBagsBusinessServices.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/joepublisher/combineCatBagsBusinessServices.xml?rev=1099545&view=auto
==============================================================================
--- juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/joepublisher/combineCatBagsBusinessServices.xml (added)
+++ juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/joepublisher/combineCatBagsBusinessServices.xml Wed May 4 17:58:52 2011
@@ -0,0 +1,50 @@
+<?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.
+ *
+ */ -->
+<businessEntity xmlns="urn:uddi-org:api_v3" xmlns:xml="http://www.w3.org/XML/1998/namespace" businessKey="uddi:uddi.joepublisher.com:business01">
+ <name>uddi:business:01</name>
+ <businessServices>
+ <businessService businessKey="uddi:uddi.joepublisher.com:business01" serviceKey="uddi:uddi.joepublisher.com:service01">
+ <name>uddi:service:01</name>
+ <bindingTemplates>
+ <bindingTemplate serviceKey="uddi:uddi.joepublisher.com:service01" bindingKey="uddi:uddi.joepublisher.com:binding01">
+ <accessPoint>http://www.testing.com/binding</accessPoint>
+ <categoryBag>
+ <keyedReference tModelKey="uddi:uddi.joepublisher.com:tmodel01" keyValue="value-y"/>
+ </categoryBag>
+ </bindingTemplate>
+ </bindingTemplates>
+ <categoryBag>
+ <keyedReference tModelKey="uddi:uddi.joepublisher.com:tmodel02" keyValue="value-x"/>
+ </categoryBag>
+ </businessService>
+ <businessService businessKey="uddi:uddi.joepublisher.com:business01" serviceKey="uddi:uddi.joepublisher.com:service02">
+ <name>uddi:service:02</name>
+ <bindingTemplates>
+ <bindingTemplate serviceKey="uddi:uddi.joepublisher.com:service02" bindingKey="uddi:uddi.joepublisher.com:binding02">
+ <accessPoint>http://www.testing.com/binding</accessPoint>
+ <categoryBag>
+ <keyedReference tModelKey="uddi:uddi.joepublisher.com:tmodel01" keyValue="value-z"/>
+ </categoryBag>
+ </bindingTemplate>
+ </bindingTemplates>
+ <categoryBag>
+ <keyedReference tModelKey="uddi:uddi.joepublisher.com:tmodel02" keyValue="value-x"/>
+ </categoryBag>
+ </businessService>
+ </businessServices>
+</businessEntity>
\ No newline at end of file
Added: juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/joepublisher/combineCatBagsFindServices.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/joepublisher/combineCatBagsFindServices.xml?rev=1099545&view=auto
==============================================================================
--- juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/joepublisher/combineCatBagsFindServices.xml (added)
+++ juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/joepublisher/combineCatBagsFindServices.xml Wed May 4 17:58:52 2011
@@ -0,0 +1,26 @@
+<?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.
+ *
+ */ -->
+<find_service xmlns="urn:uddi-org:api_v3" xmlns:xml="http://www.w3.org/XML/1998/namespace" listHead="0">
+ <findQualifiers>
+ <findQualifier>combineCategoryBags</findQualifier>
+ </findQualifiers>
+ <categoryBag>
+ <keyedReference keyValue="value-z" tModelKey="uddi:uddi.joepublisher.com:tmodel01"/>
+ <keyedReference keyValue="value-x" tModelKey="uddi:uddi.joepublisher.com:tmodel02"/>
+ </categoryBag>
+</find_service>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org