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/02/28 18:34:41 UTC
[3/6] git commit: JUDDI-863 fixed JUDDI-751 complete all test pass
via mvn and tck-runner
JUDDI-863 fixed
JUDDI-751 complete all test pass via mvn and tck-runner
Project: http://git-wip-us.apache.org/repos/asf/juddi/repo
Commit: http://git-wip-us.apache.org/repos/asf/juddi/commit/6eda2289
Tree: http://git-wip-us.apache.org/repos/asf/juddi/tree/6eda2289
Diff: http://git-wip-us.apache.org/repos/asf/juddi/diff/6eda2289
Branch: refs/heads/master
Commit: 6eda22894c15585a6cc9d013d45b531b1d2920b9
Parents: f0099f0
Author: alexoree <al...@apache.org>
Authored: Thu Feb 27 06:57:17 2014 -0500
Committer: alexoree <al...@apache.org>
Committed: Thu Feb 27 06:57:17 2014 -0500
----------------------------------------------------------------------
.../java/org/apache/juddi/validation/ValidatePublish.java | 2 +-
.../org/apache/juddi/validation/ValidateSubscription.java | 3 ++-
.../src/main/java/org/apache/juddi/tckrunner/App.java | 7 ++++---
uddi-tck-runner/uddi.xml | 2 +-
uddi-tck/src/main/resources/META-INF/uddi.xml | 2 +-
5 files changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/juddi/blob/6eda2289/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java b/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java
index 413ecb4..184a68e 100644
--- a/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java
+++ b/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java
@@ -1660,7 +1660,7 @@ public class ValidatePublish extends ValidateUDDIApi {
}
}
- private static void validateKeyLength(String value) throws ValueNotAllowedException {
+ public static void validateKeyLength(String value) throws ValueNotAllowedException {
if (value != null && value.length() > ValidationConstants.MAX_Key) {
throw new ValueNotAllowedException(new ErrorMessage("errors.keys.TooLong"));
}
http://git-wip-us.apache.org/repos/asf/juddi/blob/6eda2289/juddi-core/src/main/java/org/apache/juddi/validation/ValidateSubscription.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/validation/ValidateSubscription.java b/juddi-core/src/main/java/org/apache/juddi/validation/ValidateSubscription.java
index f334f78..f067a1e 100644
--- a/juddi-core/src/main/java/org/apache/juddi/validation/ValidateSubscription.java
+++ b/juddi-core/src/main/java/org/apache/juddi/validation/ValidateSubscription.java
@@ -91,7 +91,7 @@ public class ValidateSubscription extends ValidateUDDIApi {
// Per section 4.4: keys must be case-folded
entityKey = entityKey.toLowerCase();
subscription.setSubscriptionKey(entityKey);
-
+ ValidatePublish.validateKeyLength(entityKey);
Object obj = em.find(org.apache.juddi.model.Subscription.class, entityKey);
if (obj != null) {
entityExists = true;
@@ -106,6 +106,7 @@ public class ValidateSubscription extends ValidateUDDIApi {
// Validate key and then check to see that the proposed key is valid for this publisher
ValidateUDDIKey.validateUDDIv3Key(entityKey);
+
if (!publisher.isValidPublisherKey(em, entityKey)) {
throw new KeyUnavailableException(new ErrorMessage("errors.keyunavailable.BadPartition", entityKey));
}
http://git-wip-us.apache.org/repos/asf/juddi/blob/6eda2289/uddi-tck-runner/src/main/java/org/apache/juddi/tckrunner/App.java
----------------------------------------------------------------------
diff --git a/uddi-tck-runner/src/main/java/org/apache/juddi/tckrunner/App.java b/uddi-tck-runner/src/main/java/org/apache/juddi/tckrunner/App.java
index d192a2b..9de092c 100644
--- a/uddi-tck-runner/src/main/java/org/apache/juddi/tckrunner/App.java
+++ b/uddi-tck-runner/src/main/java/org/apache/juddi/tckrunner/App.java
@@ -86,10 +86,11 @@ public class App {
org.apache.juddi.v3.tck.UDDI_080_SubscriptionIntegrationTest.class,
//note that this is different, there is an IntegrationTest version
//however it's for hosting our own mail server and reconfiguring juddi
- org.apache.juddi.v3.tck.UDDI_090_SubscriptionListenerExternalTest.class,
+ //org.apache.juddi.v3.tck.UDDI_090_SubscriptionListenerExternalTest.class,
org.apache.juddi.v3.tck.UDDI_090_HttpExternalTest.class,
org.apache.juddi.v3.tck.UDDI_090_Smtp_ExternalTest.class,
- org.apache.juddi.v3.tck.JUDDI_091_RMISubscriptionListenerIntegrationTest.class,
+ org.apache.juddi.v3.tck.UDDI_090_RMIIntegrationTest.class,
+ //org.apache.juddi.v3.tck.JUDDI_091_RMISubscriptionListenerIntegrationTest.class,
org.apache.juddi.v3.tck.JUDDI_100_ClientSubscriptionInfoIntegrationTest.class,
org.apache.juddi.v3.tck.UDDI_110_FindBusinessIntegrationTest.class,
org.apache.juddi.v3.tck.UDDI_120_CombineCategoryBagsFindServiceIntegrationTest.class,
@@ -137,7 +138,7 @@ public class App {
bw.write("Failed Test cases");
bw.newLine();
bw.write("____________________________________________");
-
+ bw.newLine();
for (int i = 0; i < result.getFailures().size(); i++) {
try {
try {
http://git-wip-us.apache.org/repos/asf/juddi/blob/6eda2289/uddi-tck-runner/uddi.xml
----------------------------------------------------------------------
diff --git a/uddi-tck-runner/uddi.xml b/uddi-tck-runner/uddi.xml
index 652c8e5..1d74e72 100644
--- a/uddi-tck-runner/uddi.xml
+++ b/uddi-tck-runner/uddi.xml
@@ -24,7 +24,7 @@
<proxyTransport>org.apache.juddi.v3.client.transport.JAXWSTransport</proxyTransport>
<custodyTransferUrl>http://${serverName}:${serverPort}/juddiv3/services/custody-transfer</custodyTransferUrl>
<inquiryUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiry</inquiryUrl>
- <inquiryRESTUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiryRest</inquiryRESTUrl>
+ <inquiryRESTUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiryRest/XML/getDetail</inquiryRESTUrl>
<publishUrl>http://${serverName}:${serverPort}/juddiv3/services/publish</publishUrl>
<securityUrl>http://${serverName}:${serverPort}/juddiv3/services/security</securityUrl>
<subscriptionUrl>http://${serverName}:${serverPort}/juddiv3/services/subscription</subscriptionUrl>
http://git-wip-us.apache.org/repos/asf/juddi/blob/6eda2289/uddi-tck/src/main/resources/META-INF/uddi.xml
----------------------------------------------------------------------
diff --git a/uddi-tck/src/main/resources/META-INF/uddi.xml b/uddi-tck/src/main/resources/META-INF/uddi.xml
index fb2e7ca..7fbed44 100644
--- a/uddi-tck/src/main/resources/META-INF/uddi.xml
+++ b/uddi-tck/src/main/resources/META-INF/uddi.xml
@@ -25,7 +25,7 @@
<proxyTransport>org.apache.juddi.v3.client.transport.JAXWSTransport</proxyTransport>
<custodyTransferUrl>http://${serverName}:${serverPort}/juddiv3/services/custody-transfer</custodyTransferUrl>
<inquiryUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiry</inquiryUrl>
- <inquiryRESTUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiryRest</inquiryRESTUrl>
+ <inquiryRESTUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiryRest/XML/getDetail</inquiryRESTUrl>
<publishUrl>http://${serverName}:${serverPort}/juddiv3/services/publish</publishUrl>
<securityUrl>http://${serverName}:${serverPort}/juddiv3/services/security</securityUrl>
<subscriptionUrl>http://${serverName}:${serverPort}/juddiv3/services/subscription</subscriptionUrl>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org