You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2008/03/07 09:26:11 UTC

svn commit: r634581 - in /geronimo/server/trunk/plugins/j2ee/j2ee-deployer: pom.xml src/main/plan/plan.xml

Author: djencks
Date: Fri Mar  7 00:26:10 2008
New Revision: 634581

URL: http://svn.apache.org/viewvc?rev=634581&view=rev
Log:
use more appropriate dependency, remove apparently useless securityService gbean

Modified:
    geronimo/server/trunk/plugins/j2ee/j2ee-deployer/pom.xml
    geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/plan/plan.xml

Modified: geronimo/server/trunk/plugins/j2ee/j2ee-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/j2ee-deployer/pom.xml?rev=634581&r1=634580&r2=634581&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/j2ee-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/j2ee-deployer/pom.xml Fri Mar  7 00:26:10 2008
@@ -55,7 +55,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>j2ee-security</artifactId>
+            <artifactId>server-security-config</artifactId>
             <version>${version}</version>
             <type>car</type>
             <scope>runtime</scope>
@@ -183,7 +183,7 @@
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.framework</groupId>
-                            <artifactId>j2ee-security</artifactId>
+                            <artifactId>server-security-config</artifactId>
                             <version>2.2-SNAPSHOT</version>
                             <type>car</type>
                             <import>classes</import>

Modified: geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/plan/plan.xml?rev=634581&r1=634580&r2=634581&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/plan/plan.xml Fri Mar  7 00:26:10 2008
@@ -100,13 +100,6 @@
 
     <gbean name="CredentialStoreBuilder" class="org.apache.geronimo.security.deployment.CredentialStoreBuilder"/>
 
-    <!-- TODO remove or document why SecurityService is here -->
-    <gbean name="SecurityService" class="org.apache.geronimo.security.SecurityServiceImpl">
-        <attribute name="policyConfigurationFactory">
-            org.apache.geronimo.security.jacc.mappingprovider.GeronimoPolicyConfigurationFactory</attribute>
-        <attribute name="policyProvider">org.apache.geronimo.security.jacc.mappingprovider.GeronimoPolicy</attribute>
-    </gbean>
-
     <gbean name="NamingBuilders" class="org.apache.geronimo.j2ee.deployment.NamingBuilderCollectionGBean">
         <attribute name="baseElementQNameNamespaceURI">http://geronimo.apache.org/xml/ns/naming-${geronimoSchemaVersion}</attribute>
         <attribute name="baseElementQNameLocalPart">abstract-naming-entry</attribute>