You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by ks...@apache.org on 2009/10/15 09:37:57 UTC

svn commit: r825423 - in /webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi: api/impl/UDDISecurityImpl.java subscription/SubscriptionNotifier.java v3/auth/JUDDIAuthenticator.java

Author: kstam
Date: Thu Oct 15 07:37:57 2009
New Revision: 825423

URL: http://svn.apache.org/viewvc?rev=825423&view=rev
Log:
JUDDI-240 creating sync request

Modified:
    webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISecurityImpl.java
    webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/subscription/SubscriptionNotifier.java
    webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/v3/auth/JUDDIAuthenticator.java

Modified: webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISecurityImpl.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISecurityImpl.java?rev=825423&r1=825422&r2=825423&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISecurityImpl.java (original)
+++ webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISecurityImpl.java Thu Oct 15 07:37:57 2009
@@ -81,15 +81,21 @@
 		
 		String publisherId = authenticator.authenticate(body.getUserID(), body.getCred());
 		
+		return getAuthToken(publisherId);
+	}
+	
+	public AuthToken getAuthToken(String publisherId)
+	throws DispositionReportFaultMessage {
+
 		if (publisherId == null || publisherId.length() == 0)
 			throw new UnknownUserException(new ErrorMessage("errors.auth.InvalidCredentials", publisherId));
-		
+
 		EntityManager em = PersistenceManager.getEntityManager();
 		EntityTransaction tx = em.getTransaction();
 		try {
 			tx.begin();
-	
-					
+
+
 			// Generate auth token and store it!
 			String authInfo = AUTH_TOKEN_PREFIX + UUID.randomUUID();
 			org.apache.juddi.model.AuthToken modelAuthToken = new org.apache.juddi.model.AuthToken();
@@ -100,14 +106,14 @@
 				modelAuthToken.setAuthorizedName(publisherId);
 				modelAuthToken.setNumberOfUses(0);
 				modelAuthToken.setTokenState(AUTHTOKEN_ACTIVE);
-				
+
 				em.persist(modelAuthToken);
 			}
-			
+
 			org.uddi.api_v3.AuthToken apiAuthToken = new org.uddi.api_v3.AuthToken();
-			
+
 			MappingModelToApi.mapAuthToken(modelAuthToken, apiAuthToken);
-			
+
 			tx.commit();
 			return apiAuthToken;
 		} finally {

Modified: webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/subscription/SubscriptionNotifier.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/subscription/SubscriptionNotifier.java?rev=825423&r1=825422&r2=825423&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/subscription/SubscriptionNotifier.java (original)
+++ webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/subscription/SubscriptionNotifier.java Thu Oct 15 07:37:57 2009
@@ -35,6 +35,7 @@
 import javax.xml.ws.Service;
 
 import org.apache.commons.configuration.ConfigurationException;
+import org.apache.juddi.api.impl.UDDISecurityImpl;
 import org.apache.juddi.api.impl.UDDISubscriptionImpl;
 import org.apache.juddi.api_v3.AccessPointType;
 import org.apache.juddi.config.AppConfig;
@@ -177,7 +178,7 @@
 		EntityTransaction tx = em.getTransaction();
 		try {
 			tx.begin();
-			Query query = em.createQuery("SELECT s FROM Subscription s");
+			Query query = em.createQuery("SELECT s FROM Subscription s WHERE s.bindingKey IS NOT NULL");
 		    subscriptions = (Collection<Subscription>) query.getResultList();
 		    tx.commit();
 		} finally {
@@ -214,11 +215,22 @@
 			}
 			org.apache.juddi.model.BindingTemplate bindingTemplate= em.find(org.apache.juddi.model.BindingTemplate.class, modelSubscription.getBindingKey());
 			NotifySubscriptionListener body = new NotifySubscriptionListener();
-			if (resultList.getServiceList().getServiceInfos().getServiceInfo().size() == 0) {
+			if (resultList.getServiceList().getServiceInfos()!=null &&
+					resultList.getServiceList().getServiceInfos().getServiceInfo().size() == 0) {
 				resultList.getServiceList().setServiceInfos(null);
 			}
 			body.setSubscriptionResultsList(resultList);
-			//body.setAuthInfo();  //where would I get the authInfo from? 
+			String authorizedName = modelSubscription.getAuthorizedName();
+			UDDISecurityImpl security = new UDDISecurityImpl();
+			try {
+				//obtain a token for this publisher
+				org.uddi.api_v3.AuthToken token = security.getAuthToken(authorizedName);
+				body.setAuthInfo(token.getAuthInfo());
+			} catch (DispositionReportFaultMessage e) {
+				body.setAuthInfo("Failed to generate token, please contact UDDI admin");
+				log.error(e.getMessage(),e);
+			}
+			
 			if (bindingTemplate!=null) {
 				if (AccessPointType.END_POINT.toString().equalsIgnoreCase(bindingTemplate.getAccessPointType())) {
 					QName qName = new QName(SUBR_V3_NAMESPACE, SUBSCRIPTION_LISTENER);

Modified: webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/v3/auth/JUDDIAuthenticator.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/v3/auth/JUDDIAuthenticator.java?rev=825423&r1=825422&r2=825423&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/v3/auth/JUDDIAuthenticator.java (original)
+++ webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/v3/auth/JUDDIAuthenticator.java Thu Oct 15 07:37:57 2009
@@ -54,7 +54,7 @@
 			tx.begin();
 			Publisher publisher = em.find(Publisher.class, authorizedName);
 			if (publisher == null) {
-				log.info("Publisher was not found, adding the publisher in on the fly.");
+				log.warn("Publisher was not found, adding the publisher in on the fly.");
 				publisher = new Publisher();
 				publisher.setAuthorizedName(authorizedName);
 				publisher.setIsAdmin("false");



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