You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by jf...@apache.org on 2010/07/13 01:32:28 UTC
svn commit: r963529 - in /webservices/juddi/trunk/juddi-core/src/main:
java/org/apache/juddi/config/Install.java
resources/juddi_install_data/UDDI_tModels.xml
Author: jfaath
Date: Mon Jul 12 23:32:27 2010
New Revision: 963529
URL: http://svn.apache.org/viewvc?rev=963529&view=rev
Log:
JUDDI-170, JUDDI-404: adjusting install process for case-folding of keys
Modified:
webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/Install.java
webservices/juddi/trunk/juddi-core/src/main/resources/juddi_install_data/UDDI_tModels.xml
Modified: webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/Install.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/Install.java?rev=963529&r1=963528&r2=963529&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/Install.java (original)
+++ webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/Install.java Mon Jul 12 23:32:27 2010
@@ -310,6 +310,10 @@ public class Install {
businessEntity.setBusinessKey(entityKey);
}
else {
+ // Per section 4.4: keys must be case-folded
+ entityKey = entityKey.toLowerCase();
+ businessEntity.setBusinessKey(entityKey);
+
ValidateUDDIKey.validateUDDIv3Key(entityKey);
String keyPartition = entityKey.substring(0, entityKey.lastIndexOf(KeyGenerator.PARTITION_SEPARATOR));
if (!rootPartition.equalsIgnoreCase(keyPartition))
@@ -361,6 +365,10 @@ public class Install {
businessService.setServiceKey(entityKey);
}
else {
+ // Per section 4.4: keys must be case-folded
+ entityKey = entityKey.toLowerCase();
+ businessService.setServiceKey(entityKey);
+
ValidateUDDIKey.validateUDDIv3Key(entityKey);
String keyPartition = entityKey.substring(0, entityKey.lastIndexOf(KeyGenerator.PARTITION_SEPARATOR));
if (!rootPartition.equalsIgnoreCase(keyPartition))
@@ -408,6 +416,10 @@ public class Install {
bindingTemplate.setBindingKey(entityKey);
}
else {
+ // Per section 4.4: keys must be case-folded
+ entityKey = entityKey.toLowerCase();
+ bindingTemplate.setBindingKey(entityKey);
+
ValidateUDDIKey.validateUDDIv3Key(entityKey);
String keyPartition = entityKey.substring(0, entityKey.lastIndexOf(KeyGenerator.PARTITION_SEPARATOR));
if (!rootPartition.equalsIgnoreCase(keyPartition))
@@ -434,6 +446,8 @@ public class Install {
}
else {
org.apache.juddi.model.Tmodel modelTModel = new org.apache.juddi.model.Tmodel();
+ apiTModel.setTModelKey(apiTModel.getTModelKey().toLowerCase());
+
MappingApiToModel.mapTModel(apiTModel, modelTModel);
modelTModel.setAuthorizedName(publisher.getAuthorizedName());
Modified: webservices/juddi/trunk/juddi-core/src/main/resources/juddi_install_data/UDDI_tModels.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-core/src/main/resources/juddi_install_data/UDDI_tModels.xml?rev=963529&r1=963528&r2=963529&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-core/src/main/resources/juddi_install_data/UDDI_tModels.xml (original)
+++ webservices/juddi/trunk/juddi-core/src/main/resources/juddi_install_data/UDDI_tModels.xml Mon Jul 12 23:32:27 2010
@@ -658,7 +658,7 @@
<keyedReference keyName="uddi-org:types:findQualifier" keyValue="findQualifier" tModelKey="uddi:uddi.org:categorization:types" />
</categoryBag>
</tModel>
- <tModel tModelKey="uddi:uddi.org:findqualifier:suppressProjectedServices">
+ <tModel tModelKey="uddi:uddi.org:findqualifier:suppressprojectedservices">
<name>uddi-org:suppressProjectedServices
</name>
<description>UDDI find qualifier used to exclude service
---------------------------------------------------------------------
To unsubscribe, e-mail: juddi-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: juddi-cvs-help@ws.apache.org