juddi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jfa...@apache.org
Subject svn commit: r778908 - in /webservices/juddi/branches/v3_trunk: juddi-core/src/test/java/org/apache/juddi/api/impl/ uddi-tck/src/main/java/org/uddi/api_v3/tck/ uddi-tck/src/main/resources/uddi_data/samsyndicator/
Date Tue, 26 May 2009 22:07:09 GMT
Author: jfaath
Date: Tue May 26 22:07:08 2009
New Revision: 778908

URL: http://svn.apache.org/viewvc?rev=778908&view=rev
Log:
altered tests to handle service projections

Added:
    webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/samsyndicator/businessEntity_withProjection.xml
  (with props)
Modified:
    webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_040_BusinessServiceTest.java
    webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckBusiness.java

Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_040_BusinessServiceTest.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_040_BusinessServiceTest.java?rev=778908&r1=778907&r2=778908&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_040_BusinessServiceTest.java
(original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_040_BusinessServiceTest.java
Tue May 26 22:07:08 2009
@@ -74,14 +74,22 @@
 	@Test
 	public void samsyndicator() {
 		try {
+			// For sam's service projection, joe's information must be loaded
+			tckTModel.saveJoePublisherTmodel(authInfoJoe);
+			tckBusiness.saveJoePublisherBusiness(authInfoJoe);
+			tckBusinessService.saveJoePublisherService(authInfoJoe);
 			
 			tckTModel.saveSamSyndicatorTmodel(authInfoSam);
-			tckBusiness.saveSamSyndicatorBusiness(authInfoSam);
+			tckBusiness.saveSamSyndicatorBusinessWithProjection(authInfoSam);
 			tckBusinessService.saveSamSyndicatorService(authInfoSam);
 			tckBusinessService.deleteSamSyndicatorService(authInfoSam);
 		} finally {
 			tckBusiness.deleteSamSyndicatorBusiness(authInfoSam);
 			tckTModel.deleteSamSyndicatorTmodel(authInfoSam);
+			
+			tckBusinessService.deleteJoePublisherService(authInfoJoe);
+			tckBusiness.deleteJoePublisherBusiness(authInfoJoe);
+			tckTModel.deleteJoePublisherTmodel(authInfoJoe);
 		}
 	}
 	

Modified: webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckBusiness.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckBusiness.java?rev=778908&r1=778907&r2=778908&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckBusiness.java
(original)
+++ webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckBusiness.java
Tue May 26 22:07:08 2009
@@ -36,6 +36,7 @@
 	final static String JOE_BUSINESS_XML        = "uddi_data/joepublisher/businessEntity.xml";
     final static String JOE_BUSINESS_KEY        = "uddi:uddi.joepublisher.com:businessone";
     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";
     
 	private Logger logger = Logger.getLogger(this.getClass());
@@ -57,6 +58,10 @@
 		saveBusinesses(authInfoSam, SAM_BUSINESS_XML, SAM_BUSINESS_KEY, numberOfCopies);
 	}
 	
+	public void saveSamSyndicatorBusinessWithProjection(String authInfoSam) {
+		saveBusiness(authInfoSam, SAM_BUSINESS_WITHPROJECTION_XML, SAM_BUSINESS_KEY);
+	}
+	
 	public void deleteSamSyndicatorBusiness(String authInfoSam) {
 		deleteBusiness(authInfoSam, SAM_BUSINESS_XML, SAM_BUSINESS_KEY);
 	}

Added: webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/samsyndicator/businessEntity_withProjection.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/samsyndicator/businessEntity_withProjection.xml?rev=778908&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/samsyndicator/businessEntity_withProjection.xml
(added)
+++ webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/samsyndicator/businessEntity_withProjection.xml
Tue May 26 22:07:08 2009
@@ -0,0 +1,88 @@
+<?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:www.samco.com:samco">
+  <discoveryURLs>
+    <discoveryURL useType="home">http://www.samco.com</discoveryURL>
+    <discoveryURL useType="serviceList">http://www.samco.com/services</discoveryURL>
+  </discoveryURLs>
+  <name xml:lang="en">SamCo, Inc.</name>
+  <description xml:lang="en">SamCo provides a suite of digital assets.</description>
+  <contacts>
+    <contact useType="administrator">
+      <personName xml:lang="en">Sam Syndicator</personName>
+      <description xml:lang="en">This is the administrator of the service offerings.</description>
+      <phtwo useType="office">123-456-7890</phtwo>
+      <phtwo useType="mobile">987-654-3210</phtwo>
+      <email useType="work">ssyndicator@samco.com</email>
+      <address xml:lang="en" useType="headquarters" sortCode="1" tModelKey="uddi:tmodelKey:address">
+        <addressLine keyName="street" keyValue="street">1515 Main St</addressLine>
+        <addressLine keyName="citystatezip" keyValue="citystatezip">Ann Arbor, MI 41804</addressLine>
+        <addressLine keyName="country" keyValue="country">USA</addressLine>
+      </address>
+    </contact>
+  </contacts>
+  <categoryBag>
+    <keyedReference tModelKey="uddi:tmodelkey:categories:fruit" keyName="category" keyValue="bananas"
/>
+    <keyedReference tModelKey="uddi:tmodelkey:categories:fruit" keyName="category" keyValue="kiwi"
/>
+    <keyedReference tModelKey="uddi:tmodelkey:categories:music" keyName="category" keyValue="progressive-rock"
/>
+    <keyedReference tModelKey="uddi:tmodelkey:categories:music" keyName="category" keyValue="country"
/>
+    <keyedReferenceGroup tModelKey="uddi:tmodelKey:group">
+      <keyedReference tModelKey="uddi:tmodelKey:blank" keyName="blank" keyValue="blank"
/>
+    </keyedReferenceGroup>
+  </categoryBag>
+  <identifierBag>
+    <keyedReference tModelKey="uddi:tmodelkey:identifier" keyName="identify" keyValue="identity"
/>
+  </identifierBag>
+  <businessServices>
+    <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:serviceone">
+      <name xml:lang="en">Service One</name>
+      <name xml:lang="es">Servicio Uno</name>
+      <description xml:lang="en">This is the description of service one.</description>
+      <description xml:lang="es">Ésta es la descripción del servicio uno.</description>
+      <bindingTemplates>
+        <bindingTemplate bindingKey="uddi:uddi.joepublisher.com:bindingone">
+          <description xml:lang="en">This is the access point for service one.</description>
+          <accessPoint useType="endPoint">http://businessone.com/services/serviceone</accessPoint>
+          <tModelInstanceDetails>
+            <tModelInstanceInfo tModelKey="uddi:uddi.joepublisher.com:services:serviceone:wsdlSpec">
+              <description xml:lang="en">The wsdl for this service: service one</description>
+              <instanceDetails>
+                <overviewDoc>
+                  <description xml:lang="en">Help document to describe the WSDL</description>
+                  <overviewURL useType="text">http://www.w3.org/TR/wsdl</overviewURL>
+                </overviewDoc>
+                <instanceParms>instanceParms</instanceParms>
+              </instanceDetails>
+            </tModelInstanceInfo>
+          </tModelInstanceDetails>
+        <categoryBag>
+          <keyedReference tModelKey="uddi:tmodelkey:categories:bindings" keyName="category"
keyValue="accesspoint" />
+        </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>
+  </businessServices>
+</businessEntity>
\ No newline at end of file

Propchange: webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/samsyndicator/businessEntity_withProjection.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


Mime
View raw message