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/11/02 00:26:21 UTC
svn commit: r709799 - in /geronimo/plugins/openid-provider/trunk: ./
default-openid-provider-realm/ default-openid-provider-realm/src/
default-openid-provider-realm/src/main/
default-openid-provider-realm/src/main/history/
default-openid-provider-realm...
Author: djencks
Date: Sat Nov 1 16:26:21 2008
New Revision: 709799
URL: http://svn.apache.org/viewvc?rev=709799&view=rev
Log:
separate openid provider security realm into a separate plugin
Added:
geronimo/plugins/openid-provider/trunk/default-openid-provider-realm/
geronimo/plugins/openid-provider/trunk/default-openid-provider-realm/pom.xml (with props)
geronimo/plugins/openid-provider/trunk/default-openid-provider-realm/src/
geronimo/plugins/openid-provider/trunk/default-openid-provider-realm/src/main/
geronimo/plugins/openid-provider/trunk/default-openid-provider-realm/src/main/history/
geronimo/plugins/openid-provider/trunk/default-openid-provider-realm/src/main/history/dependencies.added.xml (with props)
geronimo/plugins/openid-provider/trunk/default-openid-provider-realm/src/main/history/dependencies.removed.xml (with props)
geronimo/plugins/openid-provider/trunk/default-openid-provider-realm/src/main/history/dependencies.xml (with props)
geronimo/plugins/openid-provider/trunk/default-openid-provider-realm/src/main/plan/
geronimo/plugins/openid-provider/trunk/default-openid-provider-realm/src/main/plan/plan.xml (with props)
geronimo/plugins/openid-provider/trunk/default-openid-provider-realm/src/main/resources/
geronimo/plugins/openid-provider/trunk/default-openid-provider-realm/src/main/resources/openid/
- copied from r709266, geronimo/plugins/openid-provider/trunk/openid-provider-jetty/src/main/resources/openid/
geronimo/plugins/openid-provider/trunk/default-openid-provider-realm/src/main/resources/openid/groups.properties
- copied unchanged from r709798, geronimo/plugins/openid-provider/trunk/openid-provider-jetty/src/main/resources/openid/groups.properties
geronimo/plugins/openid-provider/trunk/default-openid-provider-realm/src/main/resources/openid/users.properties
- copied unchanged from r709798, geronimo/plugins/openid-provider/trunk/openid-provider-jetty/src/main/resources/openid/users.properties
geronimo/plugins/openid-provider/trunk/openid-provider-jetty/src/main/history/
geronimo/plugins/openid-provider/trunk/openid-provider-jetty/src/main/history/dependencies.xml (with props)
Removed:
geronimo/plugins/openid-provider/trunk/openid-provider-jetty/src/main/resources/openid/
Modified:
geronimo/plugins/openid-provider/trunk/openid-provider-jetty/pom.xml
geronimo/plugins/openid-provider/trunk/openid-provider-jetty/src/main/plan/plan.xml
geronimo/plugins/openid-provider/trunk/pom.xml
Added: geronimo/plugins/openid-provider/trunk/default-openid-provider-realm/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openid-provider/trunk/default-openid-provider-realm/pom.xml?rev=709799&view=auto
==============================================================================
--- geronimo/plugins/openid-provider/trunk/default-openid-provider-realm/pom.xml (added)
+++ geronimo/plugins/openid-provider/trunk/default-openid-provider-realm/pom.xml Sat Nov 1 16:26:21 2008
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>openid-provider-parent</artifactId>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>default-openid-provider-realm</artifactId>
+ <packaging>car</packaging>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>j2ee-security</artifactId>
+ <version>${geronimoVersion}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>j2ee-deployer</artifactId>
+ <type>car</type>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.geronimo.buildsupport</groupId>
+ <artifactId>car-maven-plugin</artifactId>
+ <configuration>
+ <deploymentConfigs>
+ <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+ <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+ </deploymentConfigs>
+ <instance>
+ <plugin-artifact>
+ <copy-file relative-to="server" dest-dir="var">openid</copy-file>
+ </plugin-artifact>
+ </instance>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
Propchange: geronimo/plugins/openid-provider/trunk/default-openid-provider-realm/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/plugins/openid-provider/trunk/default-openid-provider-realm/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/plugins/openid-provider/trunk/default-openid-provider-realm/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/plugins/openid-provider/trunk/default-openid-provider-realm/src/main/history/dependencies.added.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openid-provider/trunk/default-openid-provider-realm/src/main/history/dependencies.added.xml?rev=709799&view=auto
==============================================================================
--- geronimo/plugins/openid-provider/trunk/default-openid-provider-realm/src/main/history/dependencies.added.xml (added)
+++ geronimo/plugins/openid-provider/trunk/default-openid-provider-realm/src/main/history/dependencies.added.xml Sat Nov 1 16:26:21 2008
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
+ <module-id>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>default-openid-provider-realm</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <type>car</type>
+ </module-id>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>j2ee-security</artifactId>
+ <type>car</type>
+ </dependency>
+</plugin-artifact>
Propchange: geronimo/plugins/openid-provider/trunk/default-openid-provider-realm/src/main/history/dependencies.added.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/plugins/openid-provider/trunk/default-openid-provider-realm/src/main/history/dependencies.added.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/plugins/openid-provider/trunk/default-openid-provider-realm/src/main/history/dependencies.added.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/plugins/openid-provider/trunk/default-openid-provider-realm/src/main/history/dependencies.removed.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openid-provider/trunk/default-openid-provider-realm/src/main/history/dependencies.removed.xml?rev=709799&view=auto
==============================================================================
--- geronimo/plugins/openid-provider/trunk/default-openid-provider-realm/src/main/history/dependencies.removed.xml (added)
+++ geronimo/plugins/openid-provider/trunk/default-openid-provider-realm/src/main/history/dependencies.removed.xml Sat Nov 1 16:26:21 2008
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
+ <module-id>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>default-openid-provider-realm</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <type>car</type>
+ </module-id>
+</plugin-artifact>
Propchange: geronimo/plugins/openid-provider/trunk/default-openid-provider-realm/src/main/history/dependencies.removed.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/plugins/openid-provider/trunk/default-openid-provider-realm/src/main/history/dependencies.removed.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/plugins/openid-provider/trunk/default-openid-provider-realm/src/main/history/dependencies.removed.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/plugins/openid-provider/trunk/default-openid-provider-realm/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openid-provider/trunk/default-openid-provider-realm/src/main/history/dependencies.xml?rev=709799&view=auto
==============================================================================
--- geronimo/plugins/openid-provider/trunk/default-openid-provider-realm/src/main/history/dependencies.xml (added)
+++ geronimo/plugins/openid-provider/trunk/default-openid-provider-realm/src/main/history/dependencies.xml Sat Nov 1 16:26:21 2008
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
+ <module-id>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>default-openid-provider-realm</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <type>car</type>
+ </module-id>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>j2ee-security</artifactId>
+ <type>car</type>
+ </dependency>
+</plugin-artifact>
Propchange: geronimo/plugins/openid-provider/trunk/default-openid-provider-realm/src/main/history/dependencies.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/plugins/openid-provider/trunk/default-openid-provider-realm/src/main/history/dependencies.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/plugins/openid-provider/trunk/default-openid-provider-realm/src/main/history/dependencies.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/plugins/openid-provider/trunk/default-openid-provider-realm/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openid-provider/trunk/default-openid-provider-realm/src/main/plan/plan.xml?rev=709799&view=auto
==============================================================================
--- geronimo/plugins/openid-provider/trunk/default-openid-provider-realm/src/main/plan/plan.xml (added)
+++ geronimo/plugins/openid-provider/trunk/default-openid-provider-realm/src/main/plan/plan.xml Sat Nov 1 16:26:21 2008
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+
+ <gbean name="openid-provider"
+ class="org.apache.geronimo.security.jaas.LoginModuleGBean">
+ <attribute name="loginModuleClass">org.apache.geronimo.security.realm.providers.PropertiesFileLoginModule</attribute>
+ <attribute name="options">
+ usersURI=var/openid/users.properties
+ groupsURI=var/openid/groups.properties
+ </attribute>
+ <attribute name="loginDomainName">openid-provider</attribute>
+ </gbean>
+
+ <gbean name="openid-provider"
+ class="org.apache.geronimo.security.realm.GenericSecurityRealm">
+ <attribute name="realmName">openid-provider</attribute>
+ <reference name="LoginModuleConfiguration">
+ <name>openid-provider</name>
+ </reference>
+ <reference name="ServerInfo">
+ <name>ServerInfo</name>
+ </reference>
+ </gbean>
+
+ <gbean name="openid-provider" class="org.apache.geronimo.security.jaas.JaasLoginModuleUse">
+ <attribute name="controlFlag">REQUIRED</attribute>
+ <reference name="LoginModule">
+ <name>openid-provider</name>
+ </reference>
+ </gbean>
+
+</module>
Propchange: geronimo/plugins/openid-provider/trunk/default-openid-provider-realm/src/main/plan/plan.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/plugins/openid-provider/trunk/default-openid-provider-realm/src/main/plan/plan.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/plugins/openid-provider/trunk/default-openid-provider-realm/src/main/plan/plan.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: geronimo/plugins/openid-provider/trunk/openid-provider-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openid-provider/trunk/openid-provider-jetty/pom.xml?rev=709799&r1=709798&r2=709799&view=diff
==============================================================================
--- geronimo/plugins/openid-provider/trunk/openid-provider-jetty/pom.xml (original)
+++ geronimo/plugins/openid-provider/trunk/openid-provider-jetty/pom.xml Sat Nov 1 16:26:21 2008
@@ -37,6 +37,12 @@
<type>war</type>
<version>${version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>default-openid-provider-realm</artifactId>
+ <type>car</type>
+ <version>${version}</version>
+ </dependency>
<!-- make sure these get into the plugin dependencies -->
<dependency>
@@ -67,19 +73,6 @@
</dependency>
</dependencies>
<build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>car-maven-plugin</artifactId>
- <version>${geronimoVersion}</version>
- <extensions>true</extensions>
- <configuration>
- <category>Security</category>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.geronimo.buildsupport</groupId>
@@ -98,15 +91,6 @@
<type>war</type>
</module>
<osiApproved>true</osiApproved>
- <useMavenDependencies>
- <value>true</value>
- <includeVersion>true</includeVersion>
- </useMavenDependencies>
- <instance>
- <plugin-artifact>
- <copy-file relative-to="server" dest-dir="var">openid</copy-file>
- </plugin-artifact>
- </instance>
</configuration>
</plugin>
</plugins>
Added: geronimo/plugins/openid-provider/trunk/openid-provider-jetty/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openid-provider/trunk/openid-provider-jetty/src/main/history/dependencies.xml?rev=709799&view=auto
==============================================================================
--- geronimo/plugins/openid-provider/trunk/openid-provider-jetty/src/main/history/dependencies.xml (added)
+++ geronimo/plugins/openid-provider/trunk/openid-provider-jetty/src/main/history/dependencies.xml Sat Nov 1 16:26:21 2008
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
+ <module-id>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>openid-provider-jetty</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <type>car</type>
+ </module-id>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>jasper</artifactId>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>default-openid-provider-realm</artifactId>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>geronimo-openid-provider</artifactId>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>jetty7</artifactId>
+ <type>car</type>
+ </dependency>
+</plugin-artifact>
Propchange: geronimo/plugins/openid-provider/trunk/openid-provider-jetty/src/main/history/dependencies.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/plugins/openid-provider/trunk/openid-provider-jetty/src/main/history/dependencies.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/plugins/openid-provider/trunk/openid-provider-jetty/src/main/history/dependencies.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: geronimo/plugins/openid-provider/trunk/openid-provider-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openid-provider/trunk/openid-provider-jetty/src/main/plan/plan.xml?rev=709799&r1=709798&r2=709799&view=diff
==============================================================================
--- geronimo/plugins/openid-provider/trunk/openid-provider-jetty/src/main/plan/plan.xml (original)
+++ geronimo/plugins/openid-provider/trunk/openid-provider-jetty/src/main/plan/plan.xml Sat Nov 1 16:26:21 2008
@@ -31,29 +31,4 @@
</role-mappings>
</security>
- <gbean name="openid-provider"
- class="org.apache.geronimo.security.jaas.LoginModuleGBean">
- <attribute name="loginModuleClass">org.apache.geronimo.security.realm.providers.PropertiesFileLoginModule</attribute>
- <attribute name="options">
- usersURI=var/openid/users.properties
- groupsURI=var/openid/groups.properties
- </attribute>
- <attribute name="loginDomainName">openid-provider</attribute>
- </gbean>
-
- <gbean name="openid-provider"
- class="org.apache.geronimo.security.realm.GenericSecurityRealm">
- <attribute name="realmName">openid-provider</attribute>
- <reference name="LoginModuleConfiguration">
- <name>openid-provider</name>
- </reference>
- <reference name="ServerInfo"><name>ServerInfo</name></reference>
- </gbean>
-
- <gbean name="openid-provider" class="org.apache.geronimo.security.jaas.JaasLoginModuleUse">
- <attribute name="controlFlag">REQUIRED</attribute>
- <reference name="LoginModule">
- <name>openid-provider</name>
- </reference>
- </gbean>
</web-app>
Modified: geronimo/plugins/openid-provider/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openid-provider/trunk/pom.xml?rev=709799&r1=709798&r2=709799&view=diff
==============================================================================
--- geronimo/plugins/openid-provider/trunk/pom.xml (original)
+++ geronimo/plugins/openid-provider/trunk/pom.xml Sat Nov 1 16:26:21 2008
@@ -14,11 +14,7 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+--><!-- $Rev$ $Date$ --><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -42,6 +38,7 @@
<properties>
<geronimoVersion>2.2-SNAPSHOT</geronimoVersion>
+ <geronimoSchemaVersion>1.2</geronimoSchemaVersion>
<gbeanDeployer>org.apache.geronimo.framework/geronimo-gbean-deployer/${geronimoVersion}/car</gbeanDeployer>
<jettyDeployer>org.apache.geronimo.configs/jetty7-deployer/${geronimoVersion}/car</jettyDeployer>
@@ -83,6 +80,18 @@
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-gbean-deployer</artifactId>
+ <version>${geronimoVersion}</version>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>j2ee-deployer</artifactId>
+ <version>${geronimoVersion}</version>
+ <type>car</type>
+ </dependency>
+ <dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>jetty7-deployer</artifactId>
<version>${geronimoVersion}</version>
@@ -101,7 +110,8 @@
<module>geronimo-openid-provider</module>
<module>openid-provider-jetty</module>
<module>openid-provider-assembly-jetty</module>
- </modules>
+ <module>default-openid-provider-realm</module>
+ </modules>
<build>
<pluginManagement>
@@ -124,6 +134,21 @@
</execution>
</executions>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.geronimo.buildsupport</groupId>
+ <artifactId>car-maven-plugin</artifactId>
+ <version>${geronimoVersion}</version>
+ <extensions>true</extensions>
+ <configuration>
+ <category>Security</category>
+ <useMavenDependencies>
+ <value>true</value>
+ <includeVersion>true</includeVersion>
+ <useTransitiveDependencies>true</useTransitiveDependencies>
+ </useMavenDependencies>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
</build>