Author: kstam
Date: Thu Apr 18 14:44:45 2013
New Revision: 1469351
URL: http://svn.apache.org/r1469351
Log:
JUDDI-575 fixing tests so that they conform to referential integrity rules.
Added:
juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_140_NegativePublicationTest.java
juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_141_JIRATest.java
Modified:
juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3.properties
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/keygen/KeyGeneratorFactory.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/UddiEntityPublisher.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateUDDIKey.java
juddi/trunk/juddi-core/src/main/resources/messages.properties
juddi/trunk/juddi-core/src/test/java/org/apache/juddi/keygen/KeyGeneratorTest.java
juddi/trunk/juddi-core/src/test/resources/juddiv3.properties
juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/juddiv3.properties
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/tmodels/tmodels.xml
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_140_NegativePublicationIntegrationTest.java
Modified: juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3.properties
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3.properties?rev=1469351&r1=1469350&r2=1469351&view=diff
==============================================================================
--- juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3.properties
(original)
+++ juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3.properties Thu
Apr 18 14:44:45 2013
@@ -86,5 +86,5 @@ juddi.auth.token.Timeout=15
# category bags, bindingTemplate/AccessPoint/hostingRedirector (referencing
another host),
# tModelinstanceparms and anything else that references a KeyName
# default value is true.
-# set to false for backword compatability or for a more lax registry
-juddi.validation.enforceReferentialIntegrity=false
\ No newline at end of file
+# set to false for backwards compatibility or for a more lax registry
+juddi.validation.enforceReferentialIntegrity=true
\ No newline at end of file
Modified:
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/keygen/KeyGeneratorFactory.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/keygen/KeyGeneratorFactory.java?rev=1469351&r1=1469350&r2=1469351&view=diff
==============================================================================
---
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/keygen/KeyGeneratorFactory.java
(original)
+++
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/keygen/KeyGeneratorFactory.java
Thu Apr 18 14:44:45 2013
@@ -51,6 +51,12 @@ public abstract class KeyGeneratorFactor
keyGenerator = createKeyGenerator();
return keyGenerator;
}
+
+ public static KeyGenerator forceNewKeyGenerator() {
+ keyGenerator = null;
+ keyGenerator = createKeyGenerator();
+ return keyGenerator;
+ }
/*
* Returns a new instance of a Cryptor.
Modified:
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/UddiEntityPublisher.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/UddiEntityPublisher.java?rev=1469351&r1=1469350&r2=1469351&view=diff
==============================================================================
---
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/UddiEntityPublisher.java
(original)
+++
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/UddiEntityPublisher.java
Thu Apr 18 14:44:45 2013
@@ -104,7 +104,7 @@ public class UddiEntityPublisher {
if (keyGeneratorKeys == null)
populateKeyGeneratorKeys(em);
-
+ if (! key.contains(KeyGenerator.PARTITION_SEPARATOR)) return
true; //v2 style key
String keyPartition = key.substring(0,
key.lastIndexOf(KeyGenerator.PARTITION_SEPARATOR));
for (String keyGenKey : keyGeneratorKeys) {
Modified:
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateUDDIKey.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateUDDIKey.java?rev=1469351&r1=1469350&r2=1469351&view=diff
==============================================================================
---
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateUDDIKey.java
(original)
+++
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateUDDIKey.java
Thu Apr 18 14:44:45 2013
@@ -36,14 +36,14 @@ public class ValidateUDDIKey {
if (key == null)
throw new InvalidKeyPassedException(new
ErrorMessage("errors.invalidkey.NullKey"));
+ if (! key.contains(KeyGenerator.PARTITION_SEPARATOR)) return;
//v2 style key; no other validation rules apply
+
String keyToTest = key.trim();
if (keyToTest.endsWith(KeyGenerator.PARTITION_SEPARATOR))
throw new InvalidKeyPassedException(new
ErrorMessage("errors.invalidkey.MalformedKey", key));
StringTokenizer tokenizer = new
StringTokenizer(key.toLowerCase(), KeyGenerator.PARTITION_SEPARATOR);
- int tokensCount = tokenizer.countTokens();
- if(tokensCount <= 1)
- throw new InvalidKeyPassedException(new
ErrorMessage("errors.invalidkey.MalformedKey", key));
+
for(int count = 0; tokenizer.hasMoreTokens(); count++) {
String nextToken = tokenizer.nextToken();
Modified: juddi/trunk/juddi-core/src/main/resources/messages.properties
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/resources/messages.properties?rev=1469351&r1=1469350&r2=1469351&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/resources/messages.properties (original)
+++ juddi/trunk/juddi-core/src/main/resources/messages.properties Thu Apr 18
14:44:45 2013
@@ -128,7 +128,7 @@ errors.names.TooLong=At least one name i
errors.names.NoValue=A name was provided with no value
errors.names.LangTooLong=A name language was provided that is too long, only
26 characters are permitted.
errors.names.UseTypeTooLong=The field 'useType' must be less than 256
characters
-errors.DescriptionTooLong=The field 'useType' must be less than 256 characters
+errors.DescriptionTooLong=The field 'description' must be less than 256
characters
errors.keys.TooLong=Key lengths are limited to 255 characters or less
errors.url.overviewTooLong=Overview URLs are limited to 4096 characters
errors.accessPoint.TooLong=Access points are limited to 4096 characters
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
