geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r743186 - in /geronimo/sandbox/djencks/jetty7: geronimo-jetty7-builder/src/main/java/org/apache/geronimo/jetty7/deployment/ geronimo-jetty7-builder/src/test/java/org/apache/geronimo/jetty7/deployment/ geronimo-jetty7-clustering-builder-wadi...
Date Wed, 11 Feb 2009 00:55:50 GMT
Author: djencks
Date: Wed Feb 11 00:55:50 2009
New Revision: 743186

URL: http://svn.apache.org/viewvc?rev=743186&view=rev
Log:
GERONIMO-4523 NamespaceDrivenBuilder updates, new security arrangement

Modified:
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7-builder/src/main/java/org/apache/geronimo/jetty7/deployment/JettyModuleBuilder.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7-builder/src/test/java/org/apache/geronimo/jetty7/deployment/JettyModuleBuilderTest.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7-builder/src/test/java/org/apache/geronimo/jetty7/deployment/PlanParsingTest.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7-clustering-builder-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/wadi/builder/WADIJettyClusteringBuilder.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/AbstractWebModuleTest.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/SecurityTest.java
    geronimo/sandbox/djencks/jetty7/jetty7-deployer/src/main/plan/plan.xml

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7-builder/src/main/java/org/apache/geronimo/jetty7/deployment/JettyModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7-builder/src/main/java/org/apache/geronimo/jetty7/deployment/JettyModuleBuilder.java?rev=743186&r1=743185&r2=743186&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7-builder/src/main/java/org/apache/geronimo/jetty7/deployment/JettyModuleBuilder.java
(original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7-builder/src/main/java/org/apache/geronimo/jetty7/deployment/JettyModuleBuilder.java
Wed Feb 11 00:55:50 2009
@@ -142,6 +142,7 @@
  */
 public class JettyModuleBuilder extends AbstractWebModuleBuilder implements GBeanLifecycle
{
     private static final Logger log = LoggerFactory.getLogger(JettyModuleBuilder.class);
+    static final String ROLE_MAPPER_DATA_NAME = "roleMapperDataName";
 
     private static final Map<String, String> NAMESPACE_UPDATES = new HashMap<String,
String>();
     private static final Map<String, ElementConverter> GERONIMO_SCHEMA_CONVERSIONS
= new HashMap<String, ElementConverter>();
@@ -195,13 +196,12 @@
                               Object pojoWebServiceTemplate,
                               Collection<WebServiceBuilder> webServiceBuilder,
                               Collection clusteringBuilders,
-                              Collection securityBuilders,
                               Collection serviceBuilders,
                               NamingBuilder namingBuilders,
                               Collection<ModuleBuilderExtension> moduleBuilderExtensions,
                               ResourceEnvironmentSetter resourceEnvironmentSetter,
                               Kernel kernel) throws GBeanNotFoundException {
-        super(kernel, securityBuilders, serviceBuilders, namingBuilders, resourceEnvironmentSetter,
webServiceBuilder, moduleBuilderExtensions);
+        super(kernel, serviceBuilders, namingBuilders, resourceEnvironmentSetter, webServiceBuilder,
moduleBuilderExtensions);
         this.defaultEnvironment = defaultEnvironment;
         this.defaultSessionTimeoutSeconds = (defaultSessionTimeoutSeconds == null) ? 30 *
60 : defaultSessionTimeoutSeconds;
         this.jettyContainerObjectName = jettyContainerName;
@@ -210,7 +210,7 @@
         this.defaultFilters = defaultFilters;
         this.defaultFilterMappings = defaultFilterMappings;
         this.pojoWebServiceTemplate = getGBeanData(kernel, pojoWebServiceTemplate);
-        this.clusteringBuilders = new NamespaceDrivenBuilderCollection(clusteringBuilders,
GerClusteringDocument.type.getDocumentElementName());
+        this.clusteringBuilders = new NamespaceDrivenBuilderCollection(clusteringBuilders);//,
GerClusteringDocument.type.getDocumentElementName());
 
         this.defaultWelcomeFiles = defaultWelcomeFiles == null ? new ArrayList<String>()
: defaultWelcomeFiles;
         this.defaultLocaleEncodingMappings = defaultLocaleEncodingMappings == null ? new
HashMap<String, String>() : defaultLocaleEncodingMappings;
@@ -584,7 +584,7 @@
         }
         String securityRealmName = jettyWebApp.getSecurityRealmName().trim();
         webModuleData.setAttribute("securityRealmName", securityRealmName);
-        webModuleData.setReferencePattern("RunAsSource", earContext.getJaccManagerName());
+        webModuleData.setReferencePattern("RunAsSource", (AbstractNameQuery)earContext.getGeneralData().get(ROLE_MAPPER_DATA_NAME));
 
         /**
          * TODO - go back to commented version when possible.
@@ -1175,7 +1175,6 @@
         infoBuilder.addReference("PojoWebServiceTemplate", Object.class, NameFactory.SERVLET_WEB_SERVICE_TEMPLATE);
         infoBuilder.addReference("WebServiceBuilder", WebServiceBuilder.class, NameFactory.MODULE_BUILDER);
         infoBuilder.addReference("ClusteringBuilders", NamespaceDrivenBuilder.class, NameFactory.MODULE_BUILDER);
-        infoBuilder.addReference("SecurityBuilders", NamespaceDrivenBuilder.class, NameFactory.MODULE_BUILDER);
         infoBuilder.addReference("ServiceBuilders", NamespaceDrivenBuilder.class, NameFactory.MODULE_BUILDER);
         infoBuilder.addReference("NamingBuilders", NamingBuilder.class, NameFactory.MODULE_BUILDER);
         infoBuilder.addReference("ModuleBuilderExtensions", ModuleBuilderExtension.class,
NameFactory.MODULE_BUILDER);
@@ -1197,7 +1196,6 @@
                 "PojoWebServiceTemplate",
                 "WebServiceBuilder",
                 "ClusteringBuilders",
-                "SecurityBuilders",
                 "ServiceBuilders",
                 "NamingBuilders",
                 "ModuleBuilderExtensions",

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7-builder/src/test/java/org/apache/geronimo/jetty7/deployment/JettyModuleBuilderTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7-builder/src/test/java/org/apache/geronimo/jetty7/deployment/JettyModuleBuilderTest.java?rev=743186&r1=743185&r2=743186&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7-builder/src/test/java/org/apache/geronimo/jetty7/deployment/JettyModuleBuilderTest.java
(original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7-builder/src/test/java/org/apache/geronimo/jetty7/deployment/JettyModuleBuilderTest.java
Wed Feb 11 00:55:50 2009
@@ -24,6 +24,7 @@
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
+import java.util.Arrays;
 
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinatorGBean;
@@ -277,6 +278,7 @@
         defaultEnvironment.addDependency(baseId, ImportType.ALL);
         defaultEnvironment.setConfigId(webModuleArtifact);
         Collection<ModuleBuilderExtension> moduleBuilderExtensions = new ArrayList<ModuleBuilderExtension>();
+        GeronimoSecurityBuilderImpl securityBuilder = new GeronimoSecurityBuilderImpl(null,
null, null);
         builder = new JettyModuleBuilder(defaultEnvironment,
                 new Integer(1800),
                 Collections.EMPTY_LIST,
@@ -290,15 +292,13 @@
                 pojoWebServiceTemplate,
                 Collections.singleton(webServiceBuilder),
                 null,
-                Collections.singleton(new GeronimoSecurityBuilderImpl(null)),
-                Collections.singleton(new GBeanBuilder(null, null)),
-                new NamingBuilderCollection(null, null),
+                Arrays.asList(new GBeanBuilder(null, null), securityBuilder),
+                new NamingBuilderCollection(null),
                 moduleBuilderExtensions,
                 new MockResourceEnvironmentSetter(),
                 kernel);
         builder.doStart();
 
-        GeronimoSecurityBuilderImpl securityBuilder = new GeronimoSecurityBuilderImpl(null);
         securityBuilder.doStart();
     }
 

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7-builder/src/test/java/org/apache/geronimo/jetty7/deployment/PlanParsingTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7-builder/src/test/java/org/apache/geronimo/jetty7/deployment/PlanParsingTest.java?rev=743186&r1=743185&r2=743186&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7-builder/src/test/java/org/apache/geronimo/jetty7/deployment/PlanParsingTest.java
(original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7-builder/src/test/java/org/apache/geronimo/jetty7/deployment/PlanParsingTest.java
Wed Feb 11 00:55:50 2009
@@ -22,8 +22,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
-import java.util.Map;
-import java.util.HashMap;
+import java.util.Arrays;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.jar.JarFile;
 
@@ -33,6 +32,7 @@
 import org.apache.geronimo.deployment.xbeans.ArtifactType;
 import org.apache.geronimo.deployment.xbeans.EnvironmentType;
 import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
+import org.apache.geronimo.deployment.NamespaceDrivenBuilder;
 import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.gbean.AbstractNameQuery;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
@@ -44,8 +44,6 @@
 import org.apache.geronimo.kernel.repository.Artifact;
 import org.apache.geronimo.kernel.repository.Environment;
 import org.apache.geronimo.schema.SchemaConversionUtils;
-import org.apache.geronimo.schema.ElementConverter;
-import org.apache.geronimo.schema.SecurityElementConverter;
 import org.apache.geronimo.security.deployment.GeronimoSecurityBuilderImpl;
 import org.apache.geronimo.testsupport.XmlBeansTestSupport;
 import org.apache.geronimo.web.deployment.GenericToSpecificPlanConverter;
@@ -55,10 +53,9 @@
 import org.apache.geronimo.xbeans.geronimo.web.jetty.config.GerJettyDocument;
 import org.apache.geronimo.xbeans.javaee.WebAppDocument;
 import org.apache.geronimo.xbeans.javaee.WebAppType;
-import org.apache.geronimo.jetty7.deployment.MockResourceEnvironmentSetter;
 import org.apache.xmlbeans.XmlCursor;
-import org.apache.xmlbeans.XmlObject;
 import org.apache.xmlbeans.XmlException;
+import org.apache.xmlbeans.XmlObject;
 
 /**
  */
@@ -79,6 +76,7 @@
 
     protected void setUp() throws Exception {
         super.setUp();
+        GeronimoSecurityBuilderImpl securityBuilder = new GeronimoSecurityBuilderImpl(null,
null, null);
         builder = new JettyModuleBuilder(defaultEnvironment,
                 new Integer(1800),
                 null,
@@ -91,14 +89,12 @@
                 pojoWebServiceTemplate,
                 Collections.singleton(webServiceBuilder),
                 null,
-                Collections.singleton(new GeronimoSecurityBuilderImpl(null)),
-                Collections.singleton(new GBeanBuilder(null, null)),
-                new NamingBuilderCollection(null, null),
+                Arrays.asList(new GBeanBuilder(null, null), securityBuilder),
+                new NamingBuilderCollection(null),
                 null,
                 new MockResourceEnvironmentSetter(),
                 null);
         builder.doStart();
-        GeronimoSecurityBuilderImpl securityBuilder = new GeronimoSecurityBuilderImpl(null);
         securityBuilder.doStart();
     }
 

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7-clustering-builder-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/wadi/builder/WADIJettyClusteringBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7-clustering-builder-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/wadi/builder/WADIJettyClusteringBuilder.java?rev=743186&r1=743185&r2=743186&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7-clustering-builder-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/wadi/builder/WADIJettyClusteringBuilder.java
(original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7-clustering-builder-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/wadi/builder/WADIJettyClusteringBuilder.java
Wed Feb 11 00:55:50 2009
@@ -49,6 +49,7 @@
 import org.apache.geronimo.schema.SchemaConversionUtils;
 import org.apache.geronimo.xbeans.geronimo.GerClusteringWadiDocument;
 import org.apache.geronimo.xbeans.geronimo.GerClusteringWadiType;
+import org.apache.geronimo.xbeans.geronimo.j2ee.GerClusteringDocument;
 import org.apache.geronimo.xbeans.geronimo.naming.GerPatternType;
 import org.apache.xmlbeans.QNameSet;
 import org.apache.xmlbeans.XmlObject;
@@ -59,6 +60,7 @@
  */
 @GBean(name="WADIJettyClusteringBuilder", j2eeType=NameFactory.MODULE_BUILDER)
 public class WADIJettyClusteringBuilder implements NamespaceDrivenBuilder {
+    private static final QName BASE_CLUSTERING_QNAME = GerClusteringDocument.type.getDocumentElementName();
     private static final QName CLUSTERING_WADI_QNAME = GerClusteringWadiDocument.type.getDocumentElementName();
     private static final QNameSet CLUSTERING_WADI_QNAME_SET = QNameSet.singleton(CLUSTERING_WADI_QNAME);
 
@@ -135,6 +137,10 @@
         return CLUSTERING_WADI_QNAME_SET;
     }
 
+    public QName getBaseQName() {
+        return BASE_CLUSTERING_QNAME;
+    }
+
     protected GerClusteringWadiType getWadiClusterConfig(XmlObject container) throws DeploymentException
{
         XmlObject[] items = container.selectChildren(CLUSTERING_WADI_QNAME_SET);
         if (items.length > 1) {

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/AbstractWebModuleTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/AbstractWebModuleTest.java?rev=743186&r1=743185&r2=743186&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/AbstractWebModuleTest.java
(original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/AbstractWebModuleTest.java
Wed Feb 11 00:55:50 2009
@@ -176,10 +176,10 @@
 
     private ApplicationPolicyConfigurationManager setUpJACC(Map<String, SubjectInfo>
roleDesignates, Map<Principal, Set<String>> principalRoleMap, ComponentPermissions
componentPermissions, String policyContextId) throws Exception {
         setUpSecurityService();
-        PrincipalRoleMapper roleMapper = new ApplicationPrincipalRoleConfigurationManager(principalRoleMap);
+        PrincipalRoleMapper roleMapper = new ApplicationPrincipalRoleConfigurationManager(principalRoleMap,
null, roleDesignates, null);
         Map<String, ComponentPermissions> contextIDToPermissionsMap = new HashMap<String,
ComponentPermissions>();
         contextIDToPermissionsMap.put(policyContextId, componentPermissions);
-        ApplicationPolicyConfigurationManager jacc = new ApplicationPolicyConfigurationManager(contextIDToPermissionsMap,
null, roleDesignates, cl, null, roleMapper);
+        ApplicationPolicyConfigurationManager jacc = new ApplicationPolicyConfigurationManager(contextIDToPermissionsMap,
roleMapper, cl);
         jacc.doStart();
         return jacc;
     }

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/SecurityTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/SecurityTest.java?rev=743186&r1=743185&r2=743186&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/SecurityTest.java
(original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/SecurityTest.java
Wed Feb 11 00:55:50 2009
@@ -24,20 +24,19 @@
 import java.net.URL;
 import java.security.PermissionCollection;
 import java.security.Permissions;
+import java.security.Principal;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
+
 import javax.security.jacc.WebResourcePermission;
 import javax.security.jacc.WebUserDataPermission;
 
-import org.apache.geronimo.security.deploy.PrincipalInfo;
-import org.apache.geronimo.security.deploy.Role;
-import org.apache.geronimo.security.deploy.Security;
 import org.apache.geronimo.security.deploy.SubjectInfo;
-import org.apache.geronimo.security.deployment.GeronimoSecurityBuilderImpl;
 import org.apache.geronimo.security.jacc.ComponentPermissions;
+import org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal;
 
 
 /**
@@ -53,24 +52,13 @@
      * @throws Exception thrown if an error in the test occurs
      */
     public void testExplicitMapping() throws Exception {
-        Security securityConfig = new Security();
-        securityConfig.setUseContextHandler(false);
 
         String securityRealmName = "demo-properties-realm";
         String defaultPrincipalId = "izumi";
         SubjectInfo defaultSubjectInfo = new SubjectInfo(securityRealmName, defaultPrincipalId);
-        securityConfig.setDefaultSubjectInfo(defaultSubjectInfo);
 
-        Role role = new Role();
-        role.setRoleName("content-administrator");
-        PrincipalInfo principalInfo = new PrincipalInfo("org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal",
"it");
-        role.getPrincipals().add(principalInfo);
-
-        securityConfig.getRoleMappings().put(role.getRoleName(), role);
-
-        Map roleDesignates = new HashMap();
-        Map principalRoleMap = new HashMap();
-        buildPrincipalRoleMap(securityConfig, roleDesignates, principalRoleMap);
+        Map<String, SubjectInfo> roleDesignates = Collections.emptyMap();
+        Map<Principal, Set<String>> principalRoleMap = Collections.singletonMap((Principal)new
GeronimoGroupPrincipal("it"), Collections.singleton("content-administrator"));
 
         PermissionCollection uncheckedPermissions = new Permissions();
         uncheckedPermissions.add(new WebUserDataPermission("/protected/*", ""));
@@ -81,13 +69,13 @@
 //        uncheckedPermissions.add(new WebResourcePermission("/auth/j_security_check", ""));
         uncheckedPermissions.add(new WebUserDataPermission("/auth/j_security_check", ""));
 
-        Map rolePermissions = new HashMap();
+        Map<String, PermissionCollection> rolePermissions = new HashMap<String,
PermissionCollection>();
         PermissionCollection permissions = new Permissions();
         permissions.add(new WebResourcePermission("/protected/*", ""));
         rolePermissions.put("content-administrator", permissions);
         rolePermissions.put("auto-administrator", permissions);
 
-        Set securityRoles = new HashSet();
+        Set<String> securityRoles = new HashSet<String>();
         securityRoles.add("content-administrator");
         securityRoles.add("auto-administrator");
 
@@ -160,7 +148,7 @@
         stopWebApp();
     }
 
-    protected void startWebApp(Map roleDesignates, Map principalRoleMap, ComponentPermissions
componentPermissions, SubjectInfo defaultSubjectInfo, PermissionCollection checked, Set securityRoles)
throws Exception {
+    protected void startWebApp(Map<String, SubjectInfo> roleDesignates, Map<Principal,
Set<String>> principalRoleMap, ComponentPermissions componentPermissions, SubjectInfo
defaultSubjectInfo, PermissionCollection checked, Set securityRoles) throws Exception {
         JettyWebAppContext app = setUpSecureAppContext(securityRealmName, roleDesignates,
principalRoleMap, componentPermissions, defaultSubjectInfo, checked, securityRoles);
         setUpStaticContentServlet(app);
 //        start(appName, app);
@@ -178,30 +166,4 @@
         tearDownSecurity();
         super.tearDown();
     }
-
-    //copied from SecurityBuilder
-    public void buildPrincipalRoleMap(Security security, Map roleDesignates, Map principalRoleMap)
{
-        Map roleToPrincipalMap = new HashMap();
-        GeronimoSecurityBuilderImpl.buildRolePrincipalMap(security, roleToPrincipalMap, getClass().getClassLoader());
-        invertMap(roleToPrincipalMap, principalRoleMap);
-    }
-
-    private static Map invertMap(Map roleToPrincipalMap, Map principalRoleMapping) {
-        for (Iterator roles = roleToPrincipalMap.entrySet().iterator(); roles.hasNext();)
{
-            Map.Entry entry = (Map.Entry) roles.next();
-            String role = (String) entry.getKey();
-            Set principals = (Set) entry.getValue();
-            for (Iterator iter = principals.iterator(); iter.hasNext();) {
-                java.security.Principal principal = (java.security.Principal) iter.next();
-
-                HashSet roleSet = (HashSet) principalRoleMapping.get(principal);
-                if (roleSet == null) {
-                    roleSet = new HashSet();
-                    principalRoleMapping.put(principal, roleSet);
-                }
-                roleSet.add(role);
-            }
-        }
-        return principalRoleMapping;
-    }
 }

Modified: geronimo/sandbox/djencks/jetty7/jetty7-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/jetty7-deployer/src/main/plan/plan.xml?rev=743186&r1=743185&r2=743186&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/jetty7-deployer/src/main/plan/plan.xml (original)
+++ geronimo/sandbox/djencks/jetty7/jetty7-deployer/src/main/plan/plan.xml Wed Feb 11 00:55:50
2009
@@ -79,13 +79,13 @@
         <reference name="PojoWebServiceTemplate">
             <name>POJOTemplate</name>
         </reference>
-        <reference name="SecurityBuilders">
-            <name>SecurityBuilder</name>
-        </reference>
         <references name="ServiceBuilders">
             <pattern>
                 <name>GBeanBuilder</name>
             </pattern>
+            <pattern>
+                <name>SecurityBuilder</name>
+            </pattern>
         </references>
         <references name="WebServiceBuilder">
             <pattern>
@@ -117,6 +117,9 @@
             <pattern>
                 <name>JspModuleBuilderExtension</name>
             </pattern>
+            <pattern>
+                <name>SecurityBuilder</name>
+            </pattern>
         </references>
         <reference name="ResourceEnvironmentSetter">
             <name>ResourceRefBuilder</name>



Mime
View raw message