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 2008/12/06 01:45:54 UTC
svn commit: r723935 [3/3] - in
/webservices/juddi/branches/v3_trunk/juddi-core/src:
main/java/org/apache/juddi/api/impl/ main/java/org/apache/juddi/mapping/
main/java/org/apache/juddi/model/ main/java/org/apache/juddi/query/
main/java/org/apache/juddi/...
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/TModelQuery.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/TModelQuery.java?rev=723935&r1=723934&r2=723935&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/TModelQuery.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/TModelQuery.java Fri Dec 5 16:45:52 2008
@@ -24,7 +24,6 @@
public static final String ENTITY_NAME = "Tmodel";
public static final String ENTITY_ALIAS = "t";
- public static final String KEY_NAME = "tmodelKey";
protected static String selectSQL;
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/util/Install.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/util/Install.java?rev=723935&r1=723934&r2=723935&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/util/Install.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/util/Install.java Fri Dec 5 16:45:52 2008
@@ -212,7 +212,7 @@
KeyGeneratorKey keyGenKey = new KeyGeneratorKey();
keyGenKey.setId(new KeyGeneratorKeyId(publisher.getPublisherId(), id));
keyGenKey.setPublisher(publisher);
- keyGenKey.setKeygenTModelKey(modelTModel.getTmodelKey());
+ keyGenKey.setKeygenTModelKey(modelTModel.getEntityKey());
publisher.getKeyGeneratorKeys().add(keyGenKey);
}
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java?rev=723935&r1=723934&r2=723935&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java Fri Dec 5 16:45:52 2008
@@ -409,8 +409,8 @@
else {
// If the supplied business key doesn't match the existing service's business key, the projection is invalid.
org.apache.juddi.model.BusinessService bs = (org.apache.juddi.model.BusinessService)obj;
- if (!businessService.getBusinessKey().equals(bs.getBusinessEntity().getBusinessKey()))
- throw new InvalidProjectionException(new ErrorMessage("errors.invalidprojection.ParentMismatch", businessService.getBusinessKey() + ", " + bs.getBusinessEntity().getBusinessKey()));
+ if (!businessService.getBusinessKey().equals(bs.getBusinessEntity().getEntityKey()))
+ throw new InvalidProjectionException(new ErrorMessage("errors.invalidprojection.ParentMismatch", businessService.getBusinessKey() + ", " + bs.getBusinessEntity().getEntityKey()));
}
}
else {
@@ -428,8 +428,8 @@
// If existing service trying to be saved has a different parent key, then we have a problem
// TODO: moving services is allowed according to spec?
org.apache.juddi.model.BusinessService bs = (org.apache.juddi.model.BusinessService)obj;
- if (!parentKey.equals(bs.getBusinessEntity().getBusinessKey()))
- throw new InvalidKeyPassedException(new ErrorMessage("errors.invalidkey.businessservice.ParentMismatch", parentKey + ", " + bs.getBusinessEntity().getBusinessKey()));
+ if (!parentKey.equals(bs.getBusinessEntity().getEntityKey()))
+ throw new InvalidKeyPassedException(new ErrorMessage("errors.invalidkey.businessservice.ParentMismatch", parentKey + ", " + bs.getBusinessEntity().getEntityKey()));
// Make sure publisher owns this entity.
if (!publisher.isOwner((UddiEntity)obj))
@@ -535,8 +535,8 @@
// If existing binding trying to be saved has a different parent key, then we have a problem
// TODO: moving bindings is allowed according to spec?
org.apache.juddi.model.BindingTemplate bt = (org.apache.juddi.model.BindingTemplate)obj;
- if (!parentKey.equals(bt.getBusinessService().getServiceKey()))
- throw new InvalidKeyPassedException(new ErrorMessage("errors.invalidkey.bindingtemplate.ParentMismatch", parentKey + ", " + bt.getBusinessService().getServiceKey()));
+ if (!parentKey.equals(bt.getBusinessService().getEntityKey()))
+ throw new InvalidKeyPassedException(new ErrorMessage("errors.invalidkey.bindingtemplate.ParentMismatch", parentKey + ", " + bt.getBusinessService().getEntityKey()));
// Make sure publisher owns this entity.
if (!publisher.isOwner((UddiEntity)obj))
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/test/UDDIApiTestHelper.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/test/UDDIApiTestHelper.java?rev=723935&r1=723934&r2=723935&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/test/UDDIApiTestHelper.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/test/UDDIApiTestHelper.java Fri Dec 5 16:45:52 2008
@@ -82,7 +82,7 @@
KeyGeneratorKey keyGenKey = new KeyGeneratorKey();
keyGenKey.setId(new KeyGeneratorKeyId(rootPublisher.getPublisherId(), 0));
keyGenKey.setPublisher(rootPublisher);
- keyGenKey.setKeygenTModelKey(modelTModel.getTmodelKey());
+ keyGenKey.setKeygenTModelKey(modelTModel.getEntityKey());
rootPublisher.getKeyGeneratorKeys().add(keyGenKey);
tx.commit();
---------------------------------------------------------------------
To unsubscribe, e-mail: juddi-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: juddi-cvs-help@ws.apache.org