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 2009/01/23 01:47:24 UTC
svn commit: r736871 - in
/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi:
api/impl/ config/ model/ validation/
Author: jfaath
Date: Thu Jan 22 16:47:23 2009
New Revision: 736871
URL: http://svn.apache.org/viewvc?rev=736871&view=rev
Log:
fixed bug where key gen keys were not deleting, some other minor code cleanup.
Modified:
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDICustodyTransferImpl.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIPublicationImpl.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/config/AppConfig.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessEntity.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/Publisher.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/UddiEntityPublisher.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDICustodyTransferImpl.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDICustodyTransferImpl.java?rev=736871&r1=736870&r2=736871&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDICustodyTransferImpl.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDICustodyTransferImpl.java Thu Jan 22 16:47:23 2009
@@ -39,7 +39,6 @@
import org.apache.juddi.model.BindingTemplate;
import org.apache.juddi.model.BusinessEntity;
import org.apache.juddi.model.BusinessService;
-import org.apache.juddi.model.Tmodel;
import org.apache.juddi.model.TransferTokenKey;
import org.apache.juddi.model.UddiEntity;
import org.apache.juddi.model.UddiEntityPublisher;
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIPublicationImpl.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIPublicationImpl.java?rev=736871&r1=736870&r2=736871&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIPublicationImpl.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIPublicationImpl.java Thu Jan 22 16:47:23 2009
@@ -50,6 +50,7 @@
import org.uddi.v3_service.UDDIPublicationPortType;
import org.apache.commons.configuration.ConfigurationException;
+import org.apache.juddi.keygen.KeyGenerator;
import org.apache.juddi.mapping.MappingApiToModel;
import org.apache.juddi.mapping.MappingModelToApi;
import org.apache.juddi.validation.ValidatePublish;
@@ -250,8 +251,13 @@
for (String entityKey : entityKeyList) {
Object obj = em.find(org.apache.juddi.model.Tmodel.class, entityKey);
((org.apache.juddi.model.Tmodel)obj).setDeleted(true);
- }
+ // Must check if tModel is a Key Generator, and if so, it must be removed from publisher collection
+ if (entityKey.toUpperCase().contains(KeyGenerator.KEYGENERATOR_SUFFIX.toUpperCase()))
+ publisher.removeKeyGeneratorKey(em, entityKey);
+
+ }
+
tx.commit();
em.close();
}
@@ -501,6 +507,10 @@
em.persist(modelTModel);
result.getTModel().add(apiTModel);
+
+ // If the TModel is a key generator, it must be added to the publisher's key generators.
+ if (modelTModel.getEntityKey().toUpperCase().contains(KeyGenerator.KEYGENERATOR_SUFFIX.toUpperCase()))
+ publisher.addKeyGeneratorKey(modelTModel.getEntityKey());
}
tx.commit();
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/config/AppConfig.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/config/AppConfig.java?rev=736871&r1=736870&r2=736871&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/config/AppConfig.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/config/AppConfig.java Thu Jan 22 16:47:23 2009
@@ -19,7 +19,6 @@
import java.io.IOException;
import java.util.List;
import java.util.Properties;
-import java.util.Set;
import javax.persistence.EntityManager;
import javax.persistence.EntityTransaction;
@@ -119,7 +118,7 @@
tx.commit();
tx.begin();
UddiEntityPublisher rootPublisher = em.find(UddiEntityPublisher.class, Constants.ROOT_PUBLISHER);
- Set<KeyGeneratorKey> rootKeyGenList = rootPublisher.getKeyGeneratorKeys();
+ List<KeyGeneratorKey> rootKeyGenList = rootPublisher.getKeyGeneratorKeys();
if (rootKeyGenList == null || rootKeyGenList.size() == 0)
throw new ConfigurationException("The 'root' publisher key generator was not found. Please make sure that the application is properly installed.");
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessEntity.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessEntity.java?rev=736871&r1=736870&r2=736871&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessEntity.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessEntity.java Thu Jan 22 16:47:23 2009
@@ -25,7 +25,6 @@
import javax.persistence.OneToMany;
import javax.persistence.OneToOne;
import javax.persistence.OrderBy;
-import javax.persistence.PrimaryKeyJoinColumn;
import javax.persistence.Table;
/**
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/Publisher.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/Publisher.java?rev=736871&r1=736870&r2=736871&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/Publisher.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/Publisher.java Thu Jan 22 16:47:23 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import java.util.Set;
+import java.util.List;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -53,7 +53,7 @@
String emailAddress, String isAdmin, String isEnabled,
Integer maxBusinesses, Integer maxServicesPerBusiness,
Integer maxBindingsPerService, Integer maxTmodels,
- Set<KeyGeneratorKey> keyGenerators) {
+ List<KeyGeneratorKey> keyGenerators) {
this.authorizedName = publisherId;
this.publisherName = publisherName;
this.emailAddress = emailAddress;
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/UddiEntityPublisher.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/UddiEntityPublisher.java?rev=736871&r1=736870&r2=736871&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/UddiEntityPublisher.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/UddiEntityPublisher.java Thu Jan 22 16:47:23 2009
@@ -17,10 +17,9 @@
package org.apache.juddi.model;
-import java.util.HashSet;
+import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import java.util.Set;
import java.util.StringTokenizer;
import java.util.Vector;
@@ -52,7 +51,7 @@
protected String authorizedName;
- protected Set<KeyGeneratorKey> keyGeneratorKeys = new HashSet<KeyGeneratorKey>(0);
+ protected List<KeyGeneratorKey> keyGeneratorKeys = new ArrayList<KeyGeneratorKey>(0);
@Id
@Column(name = "authorized_name", nullable = false, length = 20)
@@ -66,17 +65,17 @@
@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "publisher")
@OrderBy
- public Set<KeyGeneratorKey> getKeyGeneratorKeys() {
+ public List<KeyGeneratorKey> getKeyGeneratorKeys() {
return this.keyGeneratorKeys;
}
- public void setKeyGeneratorKeys(Set<KeyGeneratorKey> keyGeneratorKeys) {
+ public void setKeyGeneratorKeys(List<KeyGeneratorKey> keyGeneratorKeys) {
this.keyGeneratorKeys = keyGeneratorKeys;
}
public void addKeyGeneratorKey(String keygenTModelKey) {
KeyGeneratorKey keyGenKey = new KeyGeneratorKey(this, keygenTModelKey);
keyGeneratorKeys.add(keyGenKey);
}
- public void removeKeyGeneratorKey(String keygenTModelKey) {
+ public void removeKeyGeneratorKey(EntityManager em, String keygenTModelKey) {
// Must use iterator to remove while iterating.
Iterator<KeyGeneratorKey> keyGenItr = keyGeneratorKeys.iterator();
while(keyGenItr.hasNext()) {
@@ -84,6 +83,7 @@
if (keyGen.getKeygenTModelKey().equalsIgnoreCase(keygenTModelKey)) {
keyGenItr.remove();
keyGeneratorKeys.remove(keyGen);
+ em.remove(keyGen);
}
}
}
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=736871&r1=736870&r2=736871&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 Thu Jan 22 16:47:23 2009
@@ -169,9 +169,6 @@
if (!publisher.isOwner((UddiEntity)obj))
throw new UserMismatchException(new ErrorMessage("errors.usermismatch.InvalidOwner", entityKey));
- // Must check if tModel is a Key Generator, and if so, removed from publisher collection
- if (entityKey.toUpperCase().contains(KeyGenerator.KEYGENERATOR_SUFFIX.toUpperCase()))
- publisher.removeKeyGeneratorKey(entityKey);
}
}
@@ -657,10 +654,6 @@
// It's a valid Key Generator, but is it available for this publisher?
if (!publisher.isKeyGeneratorAvailable(em, entityKey))
throw new KeyUnavailableException(new ErrorMessage("errors.keyunavailable.BadPartition", entityKey));
- else {
- // The key generator is available, must now add it to the publisher's key generators.
- publisher.addKeyGeneratorKey(entityKey);
- }
}
else {
---------------------------------------------------------------------
To unsubscribe, e-mail: juddi-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: juddi-cvs-help@ws.apache.org