You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jb...@apache.org on 2008/03/11 16:16:48 UTC
svn commit: r635968 - in
/geronimo/server/branches/2.1/plugins/j2ee/j2ee-deployer: pom.xml
src/main/plan/plan.xml
Author: jbohn
Date: Tue Mar 11 08:16:46 2008
New Revision: 635968
URL: http://svn.apache.org/viewvc?rev=635968&view=rev
Log:
merge from trunk 634581 - use more appropriate dependency, remove apparently useless securityService gbean
Modified:
geronimo/server/branches/2.1/plugins/j2ee/j2ee-deployer/pom.xml
geronimo/server/branches/2.1/plugins/j2ee/j2ee-deployer/src/main/plan/plan.xml
Modified: geronimo/server/branches/2.1/plugins/j2ee/j2ee-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/j2ee/j2ee-deployer/pom.xml?rev=635968&r1=635967&r2=635968&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/j2ee/j2ee-deployer/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/j2ee/j2ee-deployer/pom.xml Tue Mar 11 08:16:46 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.1.1-SNAPSHOT</version>
<type>car</type>
<import>classes</import>
Modified: geronimo/server/branches/2.1/plugins/j2ee/j2ee-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/j2ee/j2ee-deployer/src/main/plan/plan.xml?rev=635968&r1=635967&r2=635968&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/j2ee/j2ee-deployer/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/2.1/plugins/j2ee/j2ee-deployer/src/main/plan/plan.xml Tue Mar 11 08:16:46 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>