You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by al...@apache.org on 2014/12/09 04:13:39 UTC
[18/28] juddi git commit: JUDDI-891 done
JUDDI-891 done
Project: http://git-wip-us.apache.org/repos/asf/juddi/repo
Commit: http://git-wip-us.apache.org/repos/asf/juddi/commit/20d9dff5
Tree: http://git-wip-us.apache.org/repos/asf/juddi/tree/20d9dff5
Diff: http://git-wip-us.apache.org/repos/asf/juddi/diff/20d9dff5
Branch: refs/heads/master
Commit: 20d9dff566b3a79bcfafbdf4b6f72728f85cbbd6
Parents: 22a846d
Author: Alex <al...@apache.org>
Authored: Mon Nov 24 22:13:29 2014 -0500
Committer: Alex <al...@apache.org>
Committed: Mon Nov 24 22:13:29 2014 -0500
----------------------------------------------------------------------
.../juddi_install_data/root_BusinessEntity.xml | 28 ++++++++++----------
.../impl/API_150_ValueSetValidationTest.java | 6 ++---
.../api/impl/rest/UDDIInquiryJAXRSTest.java | 2 +-
.../src/main/webapp/WEB-INF/classes/juddiv3.xml | 2 +-
4 files changed, 19 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/juddi/blob/20d9dff5/juddi-core/src/main/resources/juddi_install_data/root_BusinessEntity.xml
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/resources/juddi_install_data/root_BusinessEntity.xml b/juddi-core/src/main/resources/juddi_install_data/root_BusinessEntity.xml
index 2682dc5..74cdbb6 100644
--- a/juddi-core/src/main/resources/juddi_install_data/root_BusinessEntity.xml
+++ b/juddi-core/src/main/resources/juddi_install_data/root_BusinessEntity.xml
@@ -38,7 +38,7 @@
See below for other fields that you may want to edit...
-->
-<businessEntity xmlns="urn:uddi-org:api_v3" xmlns:xml="http://www.w3.org/XML/1998/namespace" businessKey="uddi:juddi.apache.org:businesses-asf">
+<businessEntity xmlns="urn:uddi-org:api_v3" xmlns:xml="http://www.w3.org/XML/1998/namespace" businessKey="uddi:juddi.apache.org:node1">
<!-- Change the name field to represent the name of your registry -->
<name xml:lang="en">An Apache jUDDI Node</name>
<!-- Change the description field to provided a brief description of your registry -->
@@ -54,7 +54,7 @@ See below for other fields that you may want to edit...
<!-- As mentioned above, you may want to provide user-defined keys for these (and the services/bindingTemplates below. Services that you
don't intend to support should be removed entirely -->
<!-- inquiry v3 -->
- <businessService serviceKey="uddi:juddi.apache.org:services-inquiry" businessKey="uddi:juddi.apache.org:businesses-asf">
+ <businessService serviceKey="uddi:juddi.apache.org:services-inquiry" businessKey="uddi:juddi.apache.org:node1">
<name xml:lang="en">UDDI Inquiry Service</name>
<description xml:lang="en">Web Service supporting UDDI Inquiry API</description>
<bindingTemplates>
@@ -124,7 +124,7 @@ See below for other fields that you may want to edit...
</categoryBag>
</businessService>
<!-- inquiry v2 -->
- <businessService serviceKey="uddi:juddi.apache.org:services-inquiryv2" businessKey="uddi:juddi.apache.org:businesses-asf">
+ <businessService serviceKey="uddi:juddi.apache.org:services-inquiryv2" businessKey="uddi:juddi.apache.org:node1">
<name xml:lang="en">UDDIv2 Inquiry Service</name>
<description xml:lang="en">Web Service supporting UDDIv2 Inquiry API</description>
<bindingTemplates>
@@ -165,7 +165,7 @@ See below for other fields that you may want to edit...
</categoryBag>
</businessService>
<!-- inquiry v3 REST -->
- <businessService serviceKey="uddi:juddi.apache.org:services-inquiry-rest" businessKey="uddi:juddi.apache.org:businesses-asf">
+ <businessService serviceKey="uddi:juddi.apache.org:services-inquiry-rest" businessKey="uddi:juddi.apache.org:node1">
<name xml:lang="en">UDDI Inquiry REST Service</name>
<description xml:lang="en">Web Service supporting UDDI Inquiry API via HTTP GET</description>
<bindingTemplates>
@@ -200,7 +200,7 @@ See below for other fields that you may want to edit...
</categoryBag>
</businessService>
<!-- publish v3 -->
- <businessService serviceKey="uddi:juddi.apache.org:services-publish" businessKey="uddi:juddi.apache.org:businesses-asf">
+ <businessService serviceKey="uddi:juddi.apache.org:services-publish" businessKey="uddi:juddi.apache.org:node1">
<name xml:lang="en">UDDI Publish Service</name>
<description xml:lang="en">Web Service supporting UDDI Publish API</description>
<bindingTemplates>
@@ -265,7 +265,7 @@ See below for other fields that you may want to edit...
</businessService>
<!-- publish v2 -->
- <businessService serviceKey="uddi:juddi.apache.org:services-publishv2" businessKey="uddi:juddi.apache.org:businesses-asf">
+ <businessService serviceKey="uddi:juddi.apache.org:services-publishv2" businessKey="uddi:juddi.apache.org:node1">
<name xml:lang="en">UDDIv2 Publish Service</name>
<description xml:lang="en">Web Service supporting UDDIv2 Publish API</description>
<bindingTemplates>
@@ -302,7 +302,7 @@ See below for other fields that you may want to edit...
<!-- security v3 -->
- <businessService serviceKey="uddi:juddi.apache.org:services-security" businessKey="uddi:juddi.apache.org:businesses-asf">
+ <businessService serviceKey="uddi:juddi.apache.org:services-security" businessKey="uddi:juddi.apache.org:node1">
<name xml:lang="en">UDDI Security Service</name>
<description xml:lang="en">Web Service supporting UDDI Security API</description>
<bindingTemplates>
@@ -342,7 +342,7 @@ See below for other fields that you may want to edit...
</categoryBag>
</businessService>
<!-- custody v3 -->
- <businessService serviceKey="uddi:juddi.apache.org:services-custodytransfer" businessKey="uddi:juddi.apache.org:businesses-asf">
+ <businessService serviceKey="uddi:juddi.apache.org:services-custodytransfer" businessKey="uddi:juddi.apache.org:node1">
<name xml:lang="en">UDDI Custody and Ownership Transfer Service</name>
<description xml:lang="en">Web Service supporting UDDI Custody and Ownership Transfer API</description>
<bindingTemplates>
@@ -411,7 +411,7 @@ See below for other fields that you may want to edit...
</businessService>
<!-- subscription v3 -->
- <businessService serviceKey="uddi:juddi.apache.org:services-subscription" businessKey="uddi:juddi.apache.org:businesses-asf">
+ <businessService serviceKey="uddi:juddi.apache.org:services-subscription" businessKey="uddi:juddi.apache.org:node1">
<name xml:lang="en">UDDI Subscription Service</name>
<description xml:lang="en">Web Service supporting UDDI Subscription API</description>
<bindingTemplates>
@@ -477,7 +477,7 @@ See below for other fields that you may want to edit...
</categoryBag>
</businessService>
<!-- subscription listener v3 -->
- <businessService serviceKey="uddi:juddi.apache.org:services-subscriptionlistener" businessKey="uddi:juddi.apache.org:businesses-asf">
+ <businessService serviceKey="uddi:juddi.apache.org:services-subscriptionlistener" businessKey="uddi:juddi.apache.org:node1">
<name xml:lang="en">UDDI Subscription Listener Service</name>
<description xml:lang="en">Web Service supporting UDDI Subscription Listener API</description>
<bindingTemplates>
@@ -520,7 +520,7 @@ See below for other fields that you may want to edit...
</businessService>
- <businessService serviceKey="uddi:juddi.apache.org:services-valueset" businessKey="uddi:juddi.apache.org:businesses-asf">
+ <businessService serviceKey="uddi:juddi.apache.org:services-valueset" businessKey="uddi:juddi.apache.org:node1">
<name xml:lang="en">UDDI Value Set API Service</name>
<description xml:lang="en">Web Service supporting UDDI Value Set Validation service. This service provides tModel value validation and is
configured using the jUDDI Publisher Service</description>
@@ -562,7 +562,7 @@ See below for other fields that you may want to edit...
</businessService>
- <businessService serviceKey="uddi:juddi.apache.org:services-valueset-cache" businessKey="uddi:juddi.apache.org:businesses-asf">
+ <businessService serviceKey="uddi:juddi.apache.org:services-valueset-cache" businessKey="uddi:juddi.apache.org:node1">
<name xml:lang="en">UDDI Value Set Caching API Service</name>
<description xml:lang="en">Web Service supporting UDDI Value Set Caching service. This service provides tModel value validation and is
configured using the jUDDI Publisher Service</description>
@@ -601,7 +601,7 @@ See below for other fields that you may want to edit...
- <businessService serviceKey="uddi:juddi.apache.org:replication" businessKey="uddi:juddi.apache.org:businesses-asf">
+ <businessService serviceKey="uddi:juddi.apache.org:replication" businessKey="uddi:juddi.apache.org:node1">
<name xml:lang="en">UDDI Replication API Version 3</name>
<description xml:lang="en">UDDI Replication API Version 3</description>
<bindingTemplates>
@@ -625,7 +625,7 @@ See below for other fields that you may want to edit...
<!-- juddi api service -->
- <businessService serviceKey="uddi:juddi.apache.org:services-publisher" businessKey="uddi:juddi.apache.org:businesses-asf">
+ <businessService serviceKey="uddi:juddi.apache.org:services-publisher" businessKey="uddi:juddi.apache.org:node1">
<name xml:lang="en">jUDDI Publisher Service</name>
<description xml:lang="en">Web Service supporting jUDDI specific API</description>
<bindingTemplates>
http://git-wip-us.apache.org/repos/asf/juddi/blob/20d9dff5/juddi-core/src/test/java/org/apache/juddi/api/impl/API_150_ValueSetValidationTest.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/test/java/org/apache/juddi/api/impl/API_150_ValueSetValidationTest.java b/juddi-core/src/test/java/org/apache/juddi/api/impl/API_150_ValueSetValidationTest.java
index b797aaa..2e63c35 100644
--- a/juddi-core/src/test/java/org/apache/juddi/api/impl/API_150_ValueSetValidationTest.java
+++ b/juddi-core/src/test/java/org/apache/juddi/api/impl/API_150_ValueSetValidationTest.java
@@ -104,7 +104,7 @@ public class API_150_ValueSetValidationTest {
Assert.fail("Could not obtain authInfo token.");
}
}
- final static String VSV_KEY = "uddi:juddi.apache.org:businesses-asf";
+ static String VSV_KEY = "uddi:juddi.apache.org:node1";
//VIA InVM transport
final static String VSV_BT_KEY = "uddi:juddi.apache.org:servicebindings-valueset-cp";
//VIA JAXWS Transport "uddi:juddi.apache.org:servicebindings-valueset-ws";
@@ -341,7 +341,7 @@ public class API_150_ValueSetValidationTest {
tm.setCategoryBag(new CategoryBag());
tm.setName(new Name("My Custom validated key", "en"));
tm.getDescription().add(new Description("valid values include 'one', 'two', 'three'", "en"));
- tm.getCategoryBag().getKeyedReference().add(new KeyedReference(UDDIConstants.OWNING_BUSINESS, "", "uddi:juddi.apache.org:businesses-asf"));
+ tm.getCategoryBag().getKeyedReference().add(new KeyedReference(UDDIConstants.OWNING_BUSINESS, "",VSV_KEY));
SaveTModel stm = new SaveTModel();
stm.setAuthInfo(authInfoJoe);
stm.getTModel().add(tm);
@@ -632,7 +632,7 @@ public class API_150_ValueSetValidationTest {
tm.setName(new Name("My new tmodel", "en"));
tm.getDescription().add(new Description("valid values include 'one', 'two', 'three'", "en"));
tm.setCategoryBag(new CategoryBag());
- tm.getCategoryBag().getKeyedReference().add(new KeyedReference(UDDIConstants.IS_REPLACED_BY, "", "uddi:juddi.apache.org:businesses-asf"));
+ tm.getCategoryBag().getKeyedReference().add(new KeyedReference(UDDIConstants.IS_REPLACED_BY, "",VSV_KEY));
SaveTModel stm = new SaveTModel();
stm.setAuthInfo(authInfoJoe);
stm.getTModel().add(tm);
http://git-wip-us.apache.org/repos/asf/juddi/blob/20d9dff5/juddi-rest-cxf/src/test/java/org/apache/juddi/api/impl/rest/UDDIInquiryJAXRSTest.java
----------------------------------------------------------------------
diff --git a/juddi-rest-cxf/src/test/java/org/apache/juddi/api/impl/rest/UDDIInquiryJAXRSTest.java b/juddi-rest-cxf/src/test/java/org/apache/juddi/api/impl/rest/UDDIInquiryJAXRSTest.java
index 61d066a..c62d288 100644
--- a/juddi-rest-cxf/src/test/java/org/apache/juddi/api/impl/rest/UDDIInquiryJAXRSTest.java
+++ b/juddi-rest-cxf/src/test/java/org/apache/juddi/api/impl/rest/UDDIInquiryJAXRSTest.java
@@ -56,7 +56,7 @@ import org.uddi.sub_v3.KeyBag;
public class UDDIInquiryJAXRSTest extends Assert {
private final static String ENDPOINT_ADDRESS = "http://localhost:8080/rest";
- private final static String JUDDI_BIZ = "uddi:juddi.apache.org:businesses-asf";
+ private final static String JUDDI_BIZ ="uddi:juddi.apache.org:node1";
private final static String JUDDI_SVC = "uddi:juddi.apache.org:services-inquiry";
private final static String JUDDI_BT = "uddi:juddi.apache.org:servicebindings-inquiry-ws";
private final static String JUDDI_TMODEL = "uddi:uddi.org:transport:smtp";
http://git-wip-us.apache.org/repos/asf/juddi/blob/20d9dff5/juddiv3-war/src/main/webapp/WEB-INF/classes/juddiv3.xml
----------------------------------------------------------------------
diff --git a/juddiv3-war/src/main/webapp/WEB-INF/classes/juddiv3.xml b/juddiv3-war/src/main/webapp/WEB-INF/classes/juddiv3.xml
index 788fdf1..f7c5555 100644
--- a/juddiv3-war/src/main/webapp/WEB-INF/classes/juddiv3.xml
+++ b/juddiv3-war/src/main/webapp/WEB-INF/classes/juddiv3.xml
@@ -26,7 +26,7 @@
<!-- this is the 'root' username, or owner of the node -->
<publisher>root</publisher>
<!-- The key of the root business that all of the UDDI services are registered in, as defined in the install_data -->
- <businessId>uddi:juddi.apache.org:businesses-asf</businessId>
+ <businessId>uddi:juddi.apache.org:node1</businessId>
<partition>uddi:juddi.apache.org</partition>
</root>
<seed>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org