[jboss-svn-commits] JBL Code SVN: r21200 - in labs/jbossesb/workspace/dbevenius/security/product: rosetta/src/org/jboss/soa/esb/listeners/message and 1 other directories.

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

Author: beve
Date: 2008-07-23 17:05:15 -0400 (Wed, 23 Jul 2008)
New Revision: 21200

Modified:
   labs/jbossesb/workspace/dbevenius/security/product/etc/schemas/xml/jbossesb-1.0.1.xsd
   labs/jbossesb/workspace/dbevenius/security/product/rosetta/src/org/jboss/soa/esb/listeners/message/ActionProcessingPipeline.java
   labs/jbossesb/workspace/dbevenius/security/product/samples/quickstarts/helloworld_secured/jboss-esb.xml
Log:
Clean up


Modified: labs/jbossesb/workspace/dbevenius/security/product/etc/schemas/xml/jbossesb-1.0.1.xsd
===================================================================
--- labs/jbossesb/workspace/dbevenius/security/product/etc/schemas/xml/jbossesb-1.0.1.xsd	2008-07-23 17:27:03 UTC (rev 21199)
+++ labs/jbossesb/workspace/dbevenius/security/product/etc/schemas/xml/jbossesb-1.0.1.xsd	2008-07-23 21:05:15 UTC (rev 21200)
@@ -400,7 +400,7 @@
 					</xsd:documentation>
 				</xsd:annotation>
 			</xsd:attribute>
-			<xsd:attribute name="moduleName" type="xsd:string" use="optional">
+			<xsd:attribute name="moduleName" type="xsd:string" use="required">
 				<xsd:annotation>
 					<xsd:documentation xml:lang="en">
 					</xsd:documentation>

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-07-23 17:27:03 UTC (rev 21199)
+++ labs/jbossesb/workspace/dbevenius/security/product/rosetta/src/org/jboss/soa/esb/listeners/message/ActionProcessingPipeline.java	2008-07-23 21:05:15 UTC (rev 21200)
@@ -373,17 +373,6 @@
     			return false;
     		}
 		}
-		else if ( securityContext.hasRunAs() )
-		{
-			LOGGER.debug("Service will run as Role [" + securityContext.getConfigInfo().getRunAs() + "]");
-			if (!SecurityServiceFactory.getSecurityService().isCallerInRole(subject, securityContext))
-			{
-    			LOGGER.warn("Access was denied to the Service as the caller does not belong to the correct Role. Please check the services security configuration.");
-				final SecurityException e = new SecurityException("Caller was not in the role [" + securityContext.getConfigInfo().getRunAs() + "] which is requried by the service");
-    			faultTo(callDetails, Factory.createErrorMessage(Factory.UNEXPECTED_ERROR, message, e));
-    			return false;
-			}
-		}
 		
 		PrivilegedAction<Boolean> action = new PrivilegedAction<Boolean>() 
 		{

Modified: labs/jbossesb/workspace/dbevenius/security/product/samples/quickstarts/helloworld_secured/jboss-esb.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/security/product/samples/quickstarts/helloworld_secured/jboss-esb.xml	2008-07-23 17:27:03 UTC (rev 21199)
+++ labs/jbossesb/workspace/dbevenius/security/product/samples/quickstarts/helloworld_secured/jboss-esb.xml	2008-07-23 21:05:15 UTC (rev 21200)
@@ -59,7 +59,7 @@
         </service>
 
         <service category="HelloWorld" name="Service2" description="Service 2" invmScope="GLOBAL">
-			<security runAs="adminRole"/>
+			<security moduleName="SuccessfulLogin" runAs="adminRole"/>
             <actions mep="OneWay">
 				<action name="action2" class="org.jboss.soa.esb.actions.SystemPrintln">
 				  <property name="printfull" value="false"/>