Author: alexoree
Date: Sat May 18 13:27:23 2013
New Revision: 1484114
URL: http://svn.apache.org/r1484114
Log:
attempting to fix the build
Modified:
juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusinessService.java
juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSubscription.java
Modified:
juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusinessService.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusinessService.java?rev=1484114&r1=1484113&r2=1484114&view=diff
==============================================================================
---
juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusinessService.java
(original)
+++
juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusinessService.java
Sat May 18 13:27:23 2013
@@ -65,8 +65,8 @@ public class TckBusinessService
this.inquiry = inquiry;
}
- public void saveJoePublisherService(String authInfoJoe) {
- saveService(authInfoJoe, JOE_SERVICE_XML, JOE_SERVICE_KEY);
+ public String saveJoePublisherService(String authInfoJoe) {
+ return saveService(authInfoJoe, JOE_SERVICE_XML,
JOE_SERVICE_KEY);
}
public void updateJoePublisherService(String authInfoJoe, String
description) {
@@ -150,11 +150,11 @@ public class TckBusinessService
}
}
- public void saveService(String authInfo, String serviceXML, String
serviceKey) {
- saveService(authInfo, serviceXML, serviceKey, null);
+ public String saveService(String authInfo, String serviceXML, String
serviceKey) {
+ return saveService(authInfo, serviceXML, serviceKey, null);
}
- public void saveService(String authInfo, String serviceXML, String
serviceKey, String description) {
+ public String saveService(String authInfo, String serviceXML, String
serviceKey, String description) {
try {
// First save the entity
SaveService ss = new SaveService();
@@ -179,13 +179,14 @@ public class TckBusinessService
TckValidator.checkDescriptions(bsIn.getDescription(),
bsOut.getDescription());
TckValidator.checkBindingTemplates(bsIn.getBindingTemplates(),
bsOut.getBindingTemplates());
TckValidator.checkCategories(bsIn.getCategoryBag(),
bsOut.getCategoryBag());
-
+ if (bsOut.getBindingTemplates()!=null &&
!bsOut.getBindingTemplates().getBindingTemplate().isEmpty())
+ return
bsOut.getBindingTemplates().getBindingTemplate().get(0).getBindingKey();
}
catch(Exception e) {
logger.error(e.getMessage(), e);
Assert.fail("No exception should be thrown.");
}
-
+ return null;
}
public void saveService2(String authInfo, String serviceKey, String
serviceXML2, String serviceKey2) {
Modified:
juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSubscription.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSubscription.java?rev=1484114&r1=1484113&r2=1484114&view=diff
==============================================================================
---
juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSubscription.java
(original)
+++
juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSubscription.java
Sat May 18 13:27:23 2013
@@ -74,13 +74,16 @@ public class TckSubscription
this.security = security;
}
- public void saveJoePublisherSubscription(String authInfoJoe, String
subscriptionXML,
- String subscriptionKey) {
- saveSubscription(authInfoJoe, subscriptionXML, subscriptionKey);
+ public void saveJoePublisherSubscription(String authInfoJoe, String
subscriptionXML,String subscriptionKey) {
+ saveSubscription(authInfoJoe, subscriptionXML, subscriptionKey,
null);
}
public void saveJoePublisherSubscription(String authInfoJoe) {
- saveSubscription(authInfoJoe, JOE_SUBSCRIPTION_XML,
JOE_SUBSCRIPTION_KEY);
+ saveSubscription(authInfoJoe, JOE_SUBSCRIPTION_XML,
JOE_SUBSCRIPTION_KEY, null);
+ }
+
+ public void saveJoePublisherSubscription(String authInfoJoe, String
bindingkey) {
+ saveSubscription(authInfoJoe, JOE_SUBSCRIPTION_XML,
JOE_SUBSCRIPTION_KEY, bindingkey);
}
public void deleteJoePublisherSubscription(String authInfoJoe) {
@@ -118,15 +121,15 @@ public class TckSubscription
}
public void saveSamSyndicatorSubscription(String authInfoSam) {
- saveSubscription(authInfoSam, SAM_SUBSCRIPTION_XML,
SAM_SUBSCRIPTION_KEY);
+ saveSubscription(authInfoSam, SAM_SUBSCRIPTION_XML,
SAM_SUBSCRIPTION_KEY, null);
}
public void saveSamSyndicatorSubscriptionWithChunkingOnFind(String
authInfoSam) {
- saveSubscription(authInfoSam, SAM_SUBSCRIPTION2_XML,
SAM_SUBSCRIPTION2_KEY);
+ saveSubscription(authInfoSam, SAM_SUBSCRIPTION2_XML,
SAM_SUBSCRIPTION2_KEY, null);
}
public void saveSamSyndicatorSubscriptionWithChunkingOnGet(String
authInfoSam) {
- saveSubscription(authInfoSam, SAM_SUBSCRIPTION3_XML,
SAM_SUBSCRIPTION3_KEY);
+ saveSubscription(authInfoSam, SAM_SUBSCRIPTION3_XML,
SAM_SUBSCRIPTION3_KEY, null);
}
public void deleteSamSyndicatorSubscription(String authInfoSam) {
@@ -280,14 +283,15 @@ public class TckSubscription
}
- public void saveSubscription(String authInfo, String subscriptionXML,
String subscriptionKey) {
+ public void saveSubscription(String authInfo, String subscriptionXML,
String subscriptionKey, String bindingkey) {
try {
Subscription subIn =
(Subscription)EntityCreator.buildFromDoc(subscriptionXML, "org.uddi.sub_v3");
List<Subscription> subscriptionList = new
ArrayList<Subscription>();
subIn.setSubscriptionKey(subscriptionKey);
- if (subIn.getBindingKey()!=null &&
subIn.getBindingKey().length()==0){
- subIn.setBindingKey(null);
- }
+ // if (subIn.getBindingKey()!=null &&
subIn.getBindingKey().length()==0){
+ // subIn.setBindingKey(null);
+ //}
+ subIn.setBindingKey(bindingkey);
subscriptionList.add(subIn);
Holder<List<Subscription>> subscriptionHolder = new
Holder<List<Subscription>>();
subscriptionHolder.value = subscriptionList;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
