juddi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ks...@apache.org
Subject svn commit: r730778 - in /webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi: api/impl/UDDISecurityImpl.java config/Property.java keygen/DefaultKeyGenerator.java uuidgen/
Date Fri, 02 Jan 2009 16:38:06 GMT
Author: kstam
Date: Fri Jan  2 08:38:06 2009
New Revision: 730778

URL: http://svn.apache.org/viewvc?rev=730778&view=rev
Log:
JUDDI-168 using java.util.UUID instead.

Removed:
    webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/uuidgen/
Modified:
    webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISecurityImpl.java
    webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/config/Property.java
    webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/keygen/DefaultKeyGenerator.java

Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISecurityImpl.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISecurityImpl.java?rev=730778&r1=730777&r2=730778&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISecurityImpl.java
(original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISecurityImpl.java
Fri Jan  2 08:38:06 2009
@@ -18,6 +18,8 @@
 package org.apache.juddi.api.impl;
 
 import java.util.Date;
+import java.util.UUID;
+
 import javax.jws.WebService;
 import javax.persistence.EntityManager;
 import javax.persistence.EntityTransaction;
@@ -32,8 +34,6 @@
 import org.apache.juddi.auth.Authenticator;
 import org.apache.juddi.error.UnknownUserException;
 import org.apache.juddi.error.ErrorMessage;
-import org.apache.juddi.uuidgen.UUIDGen;
-import org.apache.juddi.uuidgen.UUIDGenFactory;
 import org.apache.juddi.mapping.MappingModelToApi;
 import org.apache.juddi.model.Publisher;
 import org.apache.juddi.query.PersistenceManager;
@@ -89,8 +89,7 @@
 			throw new UnknownUserException(new ErrorMessage("errors.auth.NoPublisher", publisherId));
 				
 		// Generate auth token and store it!
-		UUIDGen uuidgen = UUIDGenFactory.getUUIDGen();
-		String authInfo = AUTH_TOKEN_PREFIX + uuidgen.uuidgen();
+		String authInfo = AUTH_TOKEN_PREFIX + UUID.randomUUID();
 		org.apache.juddi.model.AuthToken modelAuthToken = new org.apache.juddi.model.AuthToken();
 		if (authInfo != null) {
 			modelAuthToken.setAuthToken(authInfo);
@@ -113,5 +112,4 @@
 		
 		return apiAuthToken;
 	}
-
 }

Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/config/Property.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/config/Property.java?rev=730778&r1=730777&r2=730778&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/config/Property.java
(original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/config/Property.java
Fri Jan  2 08:38:06 2009
@@ -13,12 +13,10 @@
 	public final static String JUDDI_MAX_SERVICES_PER_BUSINESS   ="juddi.maxServicesPerBusiness";
 	public final static String JUDDI_MAX_BINDINGS_PER_SERVICE    ="juddi.maxBindingsPerService";
 	public final static String JUDDI_MAX_TMODELS_PER_PUBLISHER   ="juddi.maxTModelsPerPublisher";
-	public final static String JUDDI_UUID_GENERATOR              ="juddi.uuidgen";
-	public final static String JUDDI_UUID_COMMAND                ="juddi.uuidgenCommand";
 	public final static String JUDDI_CRYPTOR                     ="juddi.cryptor";
 	public final static String JUDDI_KEYGENERATOR                ="juddi.keygenerator";
 	public final static String JUDDI_VALIDATOR                   ="juddi.validator";
-	public static final String JUDDI_SECURITY_DOMAIN             ="juddi.securityDomain";
+	public final static String JUDDI_SECURITY_DOMAIN             ="juddi.securityDomain";
 	public final static String JUDDI_USERSFILE                   ="juddi.usersfile";
 	public final static String JUDDI_MAX_ROWS                    ="juddi.maxRows";
 	public final static String JUDDI_MAX_IN_CLAUSE               ="juddi.maxInClause";

Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/keygen/DefaultKeyGenerator.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/keygen/DefaultKeyGenerator.java?rev=730778&r1=730777&r2=730778&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/keygen/DefaultKeyGenerator.java
(original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/keygen/DefaultKeyGenerator.java
Fri Jan  2 08:38:06 2009
@@ -17,13 +17,13 @@
 
 package org.apache.juddi.keygen;
 
+import java.util.UUID;
+
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.juddi.config.AppConfig;
 import org.apache.juddi.config.Property;
 import org.apache.juddi.error.ErrorMessage;
 import org.apache.juddi.error.FatalErrorException;
-import org.apache.juddi.uuidgen.UUIDGenFactory;
-import org.apache.juddi.uuidgen.UUIDGen;
 import org.uddi.v3_service.DispositionReportFaultMessage;
 
 /**
@@ -42,7 +42,6 @@
 		catch(ConfigurationException ce) 
 		{ throw new FatalErrorException(new ErrorMessage("errors.configuration.Retrieval", Property.JUDDI_ROOT_DOMAIN));}
 		
-		UUIDGen uuidgen = UUIDGenFactory.getUUIDGen();
-		return UDDI_SCHEME + PARTITION_SEPARATOR + rootDomain + PARTITION_SEPARATOR + uuidgen.uuidgen();
+		return UDDI_SCHEME + PARTITION_SEPARATOR + rootDomain + PARTITION_SEPARATOR +UUID.randomUUID();
 	}
 }
\ No newline at end of file



---------------------------------------------------------------------
To unsubscribe, e-mail: juddi-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: juddi-cvs-help@ws.apache.org


Mime
View raw message