[jboss-svn-commits] JBL Code SVN: r21560 - in labs/jbossesb/workspace/dbevenius/security/product/rosetta/src/org/jboss/soa/esb: services/security and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: beve
Date: 2008-08-15 02:06:51 -0400 (Fri, 15 Aug 2008)
New Revision: 21560

Modified:
   labs/jbossesb/workspace/dbevenius/security/product/rosetta/src/org/jboss/soa/esb/listeners/message/ActionProcessingPipeline.java
   labs/jbossesb/workspace/dbevenius/security/product/rosetta/src/org/jboss/soa/esb/services/security/SecurityServiceFactory.java
Log:
Updated the security factory code. Now calls refreshConfiguration explicitly


Modified: labs/jbossesb/workspace/dbevenius/security/product/rosetta/src/org/jboss/soa/esb/listeners/message/ActionProcessingPipeline.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/security/product/rosetta/src/org/jboss/soa/esb/listeners/message/ActionProcessingPipeline.java	2008-08-15 05:41:04 UTC (rev 21559)
+++ labs/jbossesb/workspace/dbevenius/security/product/rosetta/src/org/jboss/soa/esb/listeners/message/ActionProcessingPipeline.java	2008-08-15 06:06:51 UTC (rev 21560)
@@ -108,8 +108,6 @@
 
 	private SecurityConfig securityConf;
 	
-	private SecurityService securityService;
-	
 	/**
 	 * public constructor
 	 * 
@@ -260,8 +258,9 @@
 		{
 			securityConf = SecurityConfigUtil.createSecurityConfig(securityConfigs[0]);
 			LOGGER.info(securityConf);
-			securityService = SecurityServiceFactory.getSecurityService();
-			securityService.configure();
+			final SecurityService securitySerivce = SecurityServiceFactory.getSecurityService();
+			securitySerivce.configure();
+			securitySerivce.refreshSecurityConfig();
 		}
 	}
 
@@ -370,7 +369,7 @@
     		AuthenticationRequest authRequest = (AuthenticationRequest) message.getProperties().getProperty( SecurityService.AUTH_REQUEST );
 		
     		//	perform the authentication
-			securityService.authenticate(securityConf, securityContext, authRequest);
+			SecurityServiceFactory.getSecurityService().authenticate(securityConf, securityContext, authRequest);
 			
 			//	add the security context to the message
 			message.getProperties().setProperty( SecurityService.CONTEXT, securityContext );
@@ -382,14 +381,12 @@
 			faultTo(callDetails, Factory.createErrorMessage(Factory.UNEXPECTED_ERROR, message, e));
 			return false;
 		} 
-		/*
 		catch (final ConfigurationException e)
 		{
 			LOGGER.error( "Authentication exception : ", e);
 			faultTo(callDetails, Factory.createErrorMessage(Factory.UNEXPECTED_ERROR, message, e));
 			return false;
 		}
-		*/
 		finally
 		{
 			//	always remove the authentication request as it contains sensitive information

Modified: labs/jbossesb/workspace/dbevenius/security/product/rosetta/src/org/jboss/soa/esb/services/security/SecurityServiceFactory.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/security/product/rosetta/src/org/jboss/soa/esb/services/security/SecurityServiceFactory.java	2008-08-15 05:41:04 UTC (rev 21559)
+++ labs/jbossesb/workspace/dbevenius/security/product/rosetta/src/org/jboss/soa/esb/services/security/SecurityServiceFactory.java	2008-08-15 06:06:51 UTC (rev 21560)
@@ -37,7 +37,6 @@
 	{
 		if (instance != null)
 		{
-			instance.refreshSecurityConfig();
 			return instance;
 		}