geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r709719 - in /geronimo/plugins/openid-provider/trunk: ./ geronimo-openid-provider/ geronimo-openid-provider/src/main/webapp/WEB-INF/ openid-provider-jetty/ openid-provider-jetty/src/main/plan/ openid-provider-jetty/src/main/resources/openid/
Date Sat, 01 Nov 2008 16:06:21 GMT
Author: djencks
Date: Sat Nov  1 09:06:20 2008
New Revision: 709719

URL: http://svn.apache.org/viewvc?rev=709719&view=rev
Log:
General build cleanup, provider now works with sample

Modified:
    geronimo/plugins/openid-provider/trunk/geronimo-openid-provider/pom.xml
    geronimo/plugins/openid-provider/trunk/geronimo-openid-provider/src/main/webapp/WEB-INF/web.xml
    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/openid-provider-jetty/src/main/resources/openid/groups.properties
    geronimo/plugins/openid-provider/trunk/openid-provider-jetty/src/main/resources/openid/users.properties
    geronimo/plugins/openid-provider/trunk/pom.xml

Modified: geronimo/plugins/openid-provider/trunk/geronimo-openid-provider/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openid-provider/trunk/geronimo-openid-provider/pom.xml?rev=709719&r1=709718&r2=709719&view=diff
==============================================================================
--- geronimo/plugins/openid-provider/trunk/geronimo-openid-provider/pom.xml (original)
+++ geronimo/plugins/openid-provider/trunk/geronimo-openid-provider/pom.xml Sat Nov  1 09:06:20
2008
@@ -59,6 +59,7 @@
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-servlet_3.0_spec</artifactId>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 </project>
\ No newline at end of file

Modified: geronimo/plugins/openid-provider/trunk/geronimo-openid-provider/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openid-provider/trunk/geronimo-openid-provider/src/main/webapp/WEB-INF/web.xml?rev=709719&r1=709718&r2=709719&view=diff
==============================================================================
--- geronimo/plugins/openid-provider/trunk/geronimo-openid-provider/src/main/webapp/WEB-INF/web.xml
(original)
+++ geronimo/plugins/openid-provider/trunk/geronimo-openid-provider/src/main/webapp/WEB-INF/web.xml
Sat Nov  1 09:06:20 2008
@@ -26,7 +26,7 @@
       <servlet-class>org.apache.geronimo.plugins.openid.provider.ProviderServlet</servlet-class>
       <init-param>
         <param-name>OPEndpointUrl</param-name>
-        <param-value>http://localhost:8080/OP/provider</param-value>
+        <param-value>http://localhost:8080/openid-provider/provider</param-value>
       </init-param>
       <init-param>
           <param-name>EnforceRpId</param-name>
@@ -62,10 +62,10 @@
 
     <login-config>
       <auth-method>FORM</auth-method>
-      <realm-name>geronimo-admin</realm-name>
+      <realm-name>openid-provider</realm-name>
       <form-login-config>
         <form-login-page>/login.jsp</form-login-page>
-        <form-error-page>/loginerror.jsp</form-error-page>
+        <form-error-page>/login.jsp</form-error-page>
       </form-login-config>
     </login-config>
 

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=709719&r1=709718&r2=709719&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 09:06:20
2008
@@ -37,6 +37,7 @@
             <type>war</type>
             <version>${version}</version>
         </dependency>
+
         <!-- make sure these get into the plugin dependencies -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
@@ -47,16 +48,13 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty6</artifactId>
-            <version>${geronimoVersion}</version>
+            <artifactId>jetty7</artifactId>
             <type>car</type>
         </dependency>
- 
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty6-deployer</artifactId>
-            <version>${geronimoVersion}</version>
+            <artifactId>jetty7-deployer</artifactId>
             <type>car</type>
             <scope>provided</scope>
         </dependency>
@@ -64,7 +62,6 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jasper-deployer</artifactId>
-            <version>${geronimoVersion}</version>
             <type>car</type>
             <scope>provided</scope>
         </dependency>
@@ -91,7 +88,7 @@
                     <deploymentConfigs>
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
-                        <deploymentConfig>${jetty6Deployer}</deploymentConfig>
+                        <deploymentConfig>${jettyDeployer}</deploymentConfig>
                         <deploymentConfig>${jasperDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <module>
@@ -114,10 +111,4 @@
             </plugin>
         </plugins>
     </build>
-    <properties>
-        <gbeanDeployer>org.apache.geronimo.framework/geronimo-gbean-deployer/${geronimoVersion}/car</gbeanDeployer>
-        <jetty6Deployer>org.apache.geronimo.configs/jetty6-deployer/${geronimoVersion}/car</jetty6Deployer>
-        <jasperDeployer>org.apache.geronimo.configs/jasper-deployer/${geronimoVersion}/car</jasperDeployer>
-        <j2eeDeployer>org.apache.geronimo.configs/j2ee-deployer/${geronimoVersion}/car</j2eeDeployer>
-    </properties>
 </project>
\ No newline at end of file

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=709719&r1=709718&r2=709719&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 09:06:20 2008
@@ -20,7 +20,7 @@
 
 <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2">
 
-    <context-root>/OP</context-root>
+    <context-root>/openid-provider</context-root>
 
     <security-realm-name>openid-provider</security-realm-name>
     <security xmlns="http://geronimo.apache.org/xml/ns/security-1.2">

Modified: geronimo/plugins/openid-provider/trunk/openid-provider-jetty/src/main/resources/openid/groups.properties
URL: http://svn.apache.org/viewvc/geronimo/plugins/openid-provider/trunk/openid-provider-jetty/src/main/resources/openid/groups.properties?rev=709719&r1=709718&r2=709719&view=diff
==============================================================================
--- geronimo/plugins/openid-provider/trunk/openid-provider-jetty/src/main/resources/openid/groups.properties
(original)
+++ geronimo/plugins/openid-provider/trunk/openid-provider-jetty/src/main/resources/openid/groups.properties
Sat Nov  1 09:06:20 2008
@@ -14,4 +14,4 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #=====================================================================
-openid-user=http://localhost:8989/user
+openid-user=http://localhost:8080/openid-xrds/users/david

Modified: geronimo/plugins/openid-provider/trunk/openid-provider-jetty/src/main/resources/openid/users.properties
URL: http://svn.apache.org/viewvc/geronimo/plugins/openid-provider/trunk/openid-provider-jetty/src/main/resources/openid/users.properties?rev=709719&r1=709718&r2=709719&view=diff
==============================================================================
--- geronimo/plugins/openid-provider/trunk/openid-provider-jetty/src/main/resources/openid/users.properties
(original)
+++ geronimo/plugins/openid-provider/trunk/openid-provider-jetty/src/main/resources/openid/users.properties
Sat Nov  1 09:06:20 2008
@@ -14,4 +14,4 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #=====================================================================
-http\://localhost\:8989/user=pw
+http\://localhost\:8080/openid-xrds/users/david=david

Modified: geronimo/plugins/openid-provider/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openid-provider/trunk/pom.xml?rev=709719&r1=709718&r2=709719&view=diff
==============================================================================
--- geronimo/plugins/openid-provider/trunk/pom.xml (original)
+++ geronimo/plugins/openid-provider/trunk/pom.xml Sat Nov  1 09:06:20 2008
@@ -42,7 +42,13 @@
 
     <properties>
         <geronimoVersion>2.2-SNAPSHOT</geronimoVersion>
+
+        <gbeanDeployer>org.apache.geronimo.framework/geronimo-gbean-deployer/${geronimoVersion}/car</gbeanDeployer>
+        <jettyDeployer>org.apache.geronimo.configs/jetty7-deployer/${geronimoVersion}/car</jettyDeployer>
+        <jasperDeployer>org.apache.geronimo.configs/jasper-deployer/${geronimoVersion}/car</jasperDeployer>
+        <j2eeDeployer>org.apache.geronimo.configs/j2ee-deployer/${geronimoVersion}/car</j2eeDeployer>
     </properties>
+
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -55,6 +61,40 @@
                 <artifactId>geronimo-servlet_3.0_spec</artifactId>
                 <version>1.0-EA-SNAPSHOT</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>jasper</artifactId>
+                <version>${geronimoVersion}</version>
+                <type>car</type>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>jetty7</artifactId>
+                <version>${geronimoVersion}</version>
+                <type>car</type>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>jasper</artifactId>
+                <version>${geronimoVersion}</version>
+                <type>car</type>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>jetty7-deployer</artifactId>
+                <version>${geronimoVersion}</version>
+                <type>car</type>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>jasper-deployer</artifactId>
+                <version>${geronimoVersion}</version>
+                <type>car</type>
+            </dependency>
         </dependencies>
     </dependencyManagement>
     <modules>



Mime
View raw message