geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r941388 - in /geronimo/components/jaspi/trunk/geronimo-jaspi-openid: ./ src/main/java/org/apache/geronimo/components/jaspi/modules/openid/ src/test/java/org/apache/geronimo/components/jaspi/modules/openid/
Date Wed, 05 May 2010 17:11:08 GMT
Author: djencks
Date: Wed May  5 17:11:07 2010
New Revision: 941388

URL: http://svn.apache.org/viewvc?rev=941388&view=rev
Log:
make openid auth module work, sort of

Modified:
    geronimo/components/jaspi/trunk/geronimo-jaspi-openid/pom.xml
    geronimo/components/jaspi/trunk/geronimo-jaspi-openid/src/main/java/org/apache/geronimo/components/jaspi/modules/openid/OpenIDServerAuthModule.java
    geronimo/components/jaspi/trunk/geronimo-jaspi-openid/src/test/java/org/apache/geronimo/components/jaspi/modules/openid/OpenIDServerAuthModuleTest.java

Modified: geronimo/components/jaspi/trunk/geronimo-jaspi-openid/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/components/jaspi/trunk/geronimo-jaspi-openid/pom.xml?rev=941388&r1=941387&r2=941388&view=diff
==============================================================================
--- geronimo/components/jaspi/trunk/geronimo-jaspi-openid/pom.xml (original)
+++ geronimo/components/jaspi/trunk/geronimo-jaspi-openid/pom.xml Wed May  5 17:11:07 2010
@@ -25,11 +25,13 @@
         <groupId>org.apache.geronimo.genesis</groupId>
         <artifactId>genesis-java5-flava</artifactId>
         <version>2.0</version>
+        <relativePath/>
     </parent>
 
     <groupId>org.apache.geronimo.components</groupId>
     <artifactId>geronimo-jaspi-openid</artifactId>
     <packaging>bundle</packaging>
+    <version>1.0-SNAPSHOT</version>
     <name>geronimo-jaspi-openid</name>
 
     <description>Geronimo openid JASPI module implementation based on openid4java.</description>
@@ -42,14 +44,14 @@
 
     <url>http://geronimo.apache.org/maven/${siteId}/${version}</url>
     <properties>
-        <siteId>components/${artifactId}</siteId>
+        <siteId>components/${project.artifactId}</siteId>
     </properties>
-    
+
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jaspic_1.0_spec</artifactId>
-            <version>1.0</version>
+            <version>1.1</version>
         </dependency>
         <dependency>
             <groupId>org.openid4java</groupId>
@@ -58,14 +60,14 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
-            <version>1.3-SNAPSHOT</version>
+            <artifactId>geronimo-servlet_3.0_spec</artifactId>
+            <version>1.0</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.components</groupId>
             <artifactId>geronimo-jaspi</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>1.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -84,7 +86,35 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Export-Package>org.apache.geronimo.components.jaspi.modules.openid*;version=0.1</Export-Package>
+                        <Export-Package>org.apache.geronimo.components.jaspi.modules.openid*;version=0.1,
+                            org.openid4java*,
+                            org.openxri*,
+                            com.ibm.icu*,
+                            org.apache.bcel*,
+                            org.apache.commons.codec*,
+                            org.apache.commons.httpclient*,
+                            org.apache.xalan*,
+                            org.apache.xerces*,
+                            org.apache.xml*,
+                            org.apache.xpath*,
+                            org.cyberneko.html*
+                        </Export-Package>
+                        <Export-SPI-Provider>org.apache.geronimo.components.jaspi.modules.openid.OpenIDServerAuthModule</Export-SPI-Provider>
+                        <Import-Package>
+                            java_cup*;resolution:="optional",
+                            org.apache.axiom*;resolution:="optional",
+                            org.apache.html*;resolution:="optional",
+                            org.apache.regexp*;resolution:="optional",
+                            org.bouncycastle*;resolution:="optional",
+                            org.springframework*;resolution:="optional",
+                            org.eclipse*;resolution:="optional",
+                            org.doomdark*;resolution:="optional",
+                            net.sf.ehcache*;resolution:="optional",
+                            sun.io*;resolution:="optional",
+                            sun.security*;resolution:="optional",
+                            *
+                        </Import-Package>
+                        <DynamicImport-Package>*</DynamicImport-Package>
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/components/jaspi/trunk/geronimo-jaspi-openid/src/main/java/org/apache/geronimo/components/jaspi/modules/openid/OpenIDServerAuthModule.java
URL: http://svn.apache.org/viewvc/geronimo/components/jaspi/trunk/geronimo-jaspi-openid/src/main/java/org/apache/geronimo/components/jaspi/modules/openid/OpenIDServerAuthModule.java?rev=941388&r1=941387&r2=941388&view=diff
==============================================================================
--- geronimo/components/jaspi/trunk/geronimo-jaspi-openid/src/main/java/org/apache/geronimo/components/jaspi/modules/openid/OpenIDServerAuthModule.java
(original)
+++ geronimo/components/jaspi/trunk/geronimo-jaspi-openid/src/main/java/org/apache/geronimo/components/jaspi/modules/openid/OpenIDServerAuthModule.java
Wed May  5 17:11:07 2010
@@ -143,7 +143,7 @@ public class OpenIDServerAuthModule impl
         HttpServletResponse response = (HttpServletResponse) messageInfo.getResponseMessage();
         boolean isMandatory = isMandatory(messageInfo);
         HttpSession session = request.getSession(isMandatory);
-        String uri = request.getPathInfo();
+        String uri = request.getRequestURI();
         if (session == null || isLoginOrErrorPage(uri)) {
             //auth not mandatory and not logged in.
             return AuthStatus.SUCCESS;

Modified: geronimo/components/jaspi/trunk/geronimo-jaspi-openid/src/test/java/org/apache/geronimo/components/jaspi/modules/openid/OpenIDServerAuthModuleTest.java
URL: http://svn.apache.org/viewvc/geronimo/components/jaspi/trunk/geronimo-jaspi-openid/src/test/java/org/apache/geronimo/components/jaspi/modules/openid/OpenIDServerAuthModuleTest.java?rev=941388&r1=941387&r2=941388&view=diff
==============================================================================
--- geronimo/components/jaspi/trunk/geronimo-jaspi-openid/src/test/java/org/apache/geronimo/components/jaspi/modules/openid/OpenIDServerAuthModuleTest.java
(original)
+++ geronimo/components/jaspi/trunk/geronimo-jaspi-openid/src/test/java/org/apache/geronimo/components/jaspi/modules/openid/OpenIDServerAuthModuleTest.java
Wed May  5 17:11:07 2010
@@ -30,7 +30,6 @@ import javax.security.auth.message.confi
 import javax.security.auth.message.config.ServerAuthContext;
 import javax.security.auth.message.module.ServerAuthModule;
 
-import org.apache.geronimo.components.jaspi.ConstantClassLoaderLookup;
 import org.apache.geronimo.components.jaspi.model.JaspiUtil;
 import org.apache.geronimo.components.jaspi.model.AuthModuleType;
 import org.testng.annotations.Test;
@@ -51,7 +50,7 @@ public class OpenIDServerAuthModuleTest 
         options.put(OpenIDServerAuthModule.LOGIN_PAGE_KEY, "/login.jsp");
         options.put(OpenIDServerAuthModule.ERROR_PAGE_KEY, "/error.jsp");
         authModuleType.setOptions(options);
-        AuthConfigProvider authConfigProvider = JaspiUtil.wrapServerAuthModule("Http", "testApp",
"id", authModuleType, true, new ConstantClassLoaderLookup(getClass().getClassLoader()));
+        AuthConfigProvider authConfigProvider = JaspiUtil.wrapServerAuthModule("Http", "testApp",
"id", authModuleType, true);
         factory1.registerConfigProvider(authConfigProvider, "Http", "testApp", "description");
         AuthConfigProvider authConfigProvider2 = factory1.getConfigProvider("Http", "testApp",
null);
         ServerAuthConfig serverAuthConfig = authConfigProvider2.getServerAuthConfig("Http",
"testApp", callbackHandler);



Mime
View raw message