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 2009/02/07 09:57:13 UTC
svn commit: r741858 - in /geronimo/server/trunk:
buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/
framework/configs/j2ee-security/src/main/plan/
framework/configs/server-security-config/src/main/plan/
framework/configs/ser...
Author: djencks
Date: Sat Feb 7 08:57:13 2009
New Revision: 741858
URL: http://svn.apache.org/viewvc?rev=741858&view=rev
Log:
GERONIMO-741679 revert rest of accidentally committed files
Removed:
geronimo/server/trunk/framework/configs/server-security-config/src/main/resources/security/rbac-base.xml
Modified:
geronimo/server/trunk/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.xml
geronimo/server/trunk/framework/configs/j2ee-security/src/main/plan/plan.xml
geronimo/server/trunk/framework/configs/server-security-config/src/main/plan/plan.xml
geronimo/server/trunk/plugins/connector/connector-deployer/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/pom.xml
geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/xsd/geronimo-application-2.0.xsd
geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/pom.xml
geronimo/server/trunk/plugins/jetty/geronimo-jetty6-builder/src/main/xsd/geronimo-jetty-2.0.2.xsd
geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/xsd/geronimo-openejb-2.0.xsd
geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/src/main/xsd/geronimo-tomcat-2.0.1.xsd
Modified: geronimo/server/trunk/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.xml?rev=741858&r1=741857&r2=741858&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.xml (original)
+++ geronimo/server/trunk/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.xml Sat Feb 7 08:57:13 2009
@@ -21,7 +21,7 @@
<cxfDeployer>org.apache.geronimo.configs/cxf-deployer/${geronimoVersion}/car</cxfDeployer>
<axis2Deployer>org.apache.geronimo.configs/axis2-deployer/${geronimoVersion}/car</axis2Deployer>
<tomcatDeployer>org.apache.geronimo.configs/tomcat6-deployer/${geronimoVersion}/car</tomcatDeployer>
- <jetty6Deployer>org.apache.geronimo.configs/jetty7-deployer/${geronimoVersion}/car</jetty7Deployer>
+ <jetty6Deployer>org.apache.geronimo.configs/jetty6-deployer/${geronimoVersion}/car</jetty6Deployer>
<jasperDeployer>org.apache.geronimo.configs/jasper-deployer/${geronimoVersion}/car</jasperDeployer>
<jpaDeployer>org.apache.geronimo.configs/persistence-jpa10-deployer/${geronimoVersion}/car</jpaDeployer>
</properties>
@@ -61,7 +61,7 @@
<!-- gbean deployer is default. For jee apps include all deployers your app needs, see properties -->
<!--<deploymentConfig>${gbeanDeployer}</deploymentConfig>-->
<!--<deploymentConfig>${j2eeDeployer}</deploymentConfig>-->
- <!--<deploymentConfig>${jetty7Deployer}</deploymentConfig>-->
+ <!--<deploymentConfig>${jetty6Deployer}</deploymentConfig>-->
<!--<deploymentConfig>${jasperDeployer}</deploymentConfig>-->
<!--<deploymentConfig>${jpaDeployer}</deploymentConfig>-->
</deploymentConfigs>
Modified: geronimo/server/trunk/framework/configs/j2ee-security/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/j2ee-security/src/main/plan/plan.xml?rev=741858&r1=741857&r2=741858&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/j2ee-security/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/framework/configs/j2ee-security/src/main/plan/plan.xml Sat Feb 7 08:57:13 2009
@@ -25,16 +25,8 @@
<reference name="ServerInfo"><name>ServerInfo</name></reference>
<attribute name="policyConfigurationFactory">org.apache.geronimo.security.jacc.mappingprovider.GeronimoPolicyConfigurationFactory</attribute>
<attribute name="policyProvider">org.apache.geronimo.security.jacc.mappingprovider.GeronimoPolicy</attribute>
- <!--<attribute name="policyConfigurationFactory">org.soter.rbac.jacc.RbacPolicyConfigurationFactory</attribute>-->
- <!--<attribute name="policyProvider">org.soter.rbac.jacc.RbacPolicy</attribute>-->
</gbean>
- <!--<gbean name="Rbac" class="org.apache.geronimo.security.jacc.rbac.RbacConfiguration">-->
- <!--<attribute name="principalClass">org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal</attribute>-->
- <!--<attribute name="configuration">var/security/rbac-base.xml</attribute>-->
- <!--<reference name="ServerInfo"><name>ServerInfo</name></reference>-->
- <!--</gbean>-->
-
<!-- Register GeronimoLoginConfiguration as the LoginConfiguration handler -->
<gbean name="LoginConfiguration" class="org.apache.geronimo.security.jaas.GeronimoLoginConfiguration">
<references name="Configurations">
Modified: geronimo/server/trunk/framework/configs/server-security-config/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/server-security-config/src/main/plan/plan.xml?rev=741858&r1=741857&r2=741858&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/server-security-config/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/framework/configs/server-security-config/src/main/plan/plan.xml Sat Feb 7 08:57:13 2009
@@ -50,14 +50,6 @@
</reference>
</gbean>
- <!--<gbean name="SystemRbac" class="org.apache.geronimo.security.jacc.rbac.RbacConfiguration">-->
- <!--<attribute name="principalClass">org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal</attribute>-->
- <!--<attribute name="configuration">var/security/rbac-base.xml</attribute>-->
- <!--<reference name="ServerInfo">-->
- <!--<name>ServerInfo</name>-->
- <!--</reference>-->
- <!--</gbean>-->
-
<gbean name="geronimo-default" class="org.apache.geronimo.security.keystore.FileKeystoreInstance">
<attribute name="keystoreName">geronimo-default</attribute>
<attribute name="keystorePath">var/security/keystores/geronimo-default</attribute>
Modified: geronimo/server/trunk/plugins/connector/connector-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector/connector-deployer/src/main/history/dependencies.xml?rev=741858&r1=741857&r2=741858&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector/connector-deployer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/connector/connector-deployer/src/main/history/dependencies.xml Sat Feb 7 08:57:13 2009
@@ -6,17 +6,17 @@
<version>2.2-SNAPSHOT</version>
<type>car</type>
</module-id>
- <dependency start="true">
+ <dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-connector-builder</artifactId>
<type>jar</type>
</dependency>
- <dependency start="true">
+ <dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>transaction</artifactId>
<type>car</type>
</dependency>
- <dependency start="true">
+ <dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>j2ee-deployer</artifactId>
<type>car</type>
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/pom.xml?rev=741858&r1=741857&r2=741858&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/pom.xml Sat Feb 7 08:57:13 2009
@@ -74,12 +74,6 @@
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.testsupport</groupId>
- <artifactId>testsupport-common</artifactId>
- <version>${version}</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/xsd/geronimo-application-2.0.xsd
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/xsd/geronimo-application-2.0.xsd?rev=741858&r1=741857&r2=741858&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/xsd/geronimo-application-2.0.xsd (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/xsd/geronimo-application-2.0.xsd Sat Feb 7 08:57:13 2009
@@ -105,7 +105,7 @@
</xs:annotation>
</xs:element>
- <xs:element ref="geronimo:security" minOccurs="0" maxOccurs="unbounded">
+ <xs:element ref="geronimo:security" minOccurs="0">
<xs:annotation>
<xs:documentation>
Reference to security element defined in this schema. If
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/pom.xml?rev=741858&r1=741857&r2=741858&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/pom.xml Sat Feb 7 08:57:13 2009
@@ -27,7 +27,7 @@
<artifactId>j2ee</artifactId>
<version>2.2-SNAPSHOT</version>
</parent>
-
+
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-security-builder</artifactId>
<name>Geronimo Plugins, J2EE :: Security Builder</name>
@@ -53,77 +53,16 @@
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
-<!--
- <dependency>
- <groupId>org.soter.rbac</groupId>
- <artifactId>rbac-xml-model</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.soter.rbac</groupId>
- <artifactId>rbac-jacc</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
--->
- </dependencies>
+ </dependencies>
+
<build>
<plugins>
-
-<!--
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jaxb2-maven-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>xjc</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <packageName>org.geronimo.security.rbac.model</packageName>
- <schemaFiles>geronimo-soter-1.0.xsd</schemaFiles>
- <extension>true</extension>
- </configuration>
- </plugin>
--->
- <!-- experiment with 2.1 episodes for multi-schema compilations. -->
-<!--
- <plugin>
- <groupId>org.jvnet.jaxb2.maven2</groupId>
- <artifactId>maven-jaxb2-plugin</artifactId>
- <version>0.5</version>
- <executions>
- <execution>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <schemaDirectory>src/main/xsd</schemaDirectory>
- <packageName>org.geronimo.security.rbac.model</packageName>
- <schemaFiles>geronimo-soter-1.0.xsd</schemaFiles>
- <extension>true</extension>
- -->
-<!--<arguments>-episode rbac.episode</arguments>-->
-<!--
- <episodes>
- <episode>
- <groupId>org.soter.rbac</groupId>
- <artifactId>rbac-xml-model</artifactId>
- </episode>
- </episodes>
- </configuration>
- </plugin>
--->
-
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>xmlbeans-maven-plugin</artifactId>
</plugin>
-
+
<!--
HACK: Copy XmlBeans generated schemas.
-->
Modified: geronimo/server/trunk/plugins/jetty/geronimo-jetty6-builder/src/main/xsd/geronimo-jetty-2.0.2.xsd
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty/geronimo-jetty6-builder/src/main/xsd/geronimo-jetty-2.0.2.xsd?rev=741858&r1=741857&r2=741858&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty/geronimo-jetty6-builder/src/main/xsd/geronimo-jetty-2.0.2.xsd (original)
+++ geronimo/server/trunk/plugins/jetty/geronimo-jetty6-builder/src/main/xsd/geronimo-jetty-2.0.2.xsd Sat Feb 7 08:57:13 2009
@@ -219,7 +219,7 @@
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element ref="app:security" minOccurs="0" maxOccurs="unbounded">
+ <xs:element ref="app:security" minOccurs="0">
<xs:annotation>
<xs:documentation>
Reference to security element defined in imported
Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/xsd/geronimo-openejb-2.0.xsd
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/xsd/geronimo-openejb-2.0.xsd?rev=741858&r1=741857&r2=741858&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/xsd/geronimo-openejb-2.0.xsd (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/xsd/geronimo-openejb-2.0.xsd Sat Feb 7 08:57:13 2009
@@ -63,7 +63,7 @@
<xs:element name="web-service-binding" type="openejb:web-service-bindingType" minOccurs="0" maxOccurs="unbounded"/>
<!-- Security -->
- <xs:element ref="app:security" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element ref="app:security" minOccurs="0"/>
<!-- GBeans -->
<xs:choice minOccurs="0" maxOccurs="unbounded">
Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/src/main/xsd/geronimo-tomcat-2.0.1.xsd
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/src/main/xsd/geronimo-tomcat-2.0.1.xsd?rev=741858&r1=741857&r2=741858&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/src/main/xsd/geronimo-tomcat-2.0.1.xsd (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/src/main/xsd/geronimo-tomcat-2.0.1.xsd Sat Feb 7 08:57:13 2009
@@ -246,7 +246,7 @@
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element ref="app:security" minOccurs="0" maxOccurs="unbounded">
+ <xs:element ref="app:security" minOccurs="0">
<xs:annotation>
<xs:documentation>
Reference to security element defined in imported