[jboss-svn-commits] JBL Code SVN: r19516 - in labs/jbosslabs/trunk/portal-extensions: binaries/maven-repo-addons/jboss and 6 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Thu Apr 10 11:11:11 EDT 2008


Author: szimano
Date: 2008-04-10 11:11:11 -0400 (Thu, 10 Apr 2008)
New Revision: 19516

Added:
   labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/jboss/
   labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/jboss/jars/
   labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/jboss/jars/jbossweb.jar
   labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/context.xml
   labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/login/
   labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/login/LabsFormAuthenticator.java
Removed:
   labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/LoginServlet.java
Modified:
   labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml
   labs/jbosslabs/trunk/portal-extensions/forge-ejb3/project.xml
   labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/project.xml
Log:
login only with posting username/pass with custom formauthenticator

Added: labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/jboss/jars/jbossweb.jar
===================================================================
(Binary files differ)


Property changes on: labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/jboss/jars/jbossweb.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/context.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/context.xml	                        (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/context.xml	2008-04-10 15:11:11 UTC (rev 19516)
@@ -0,0 +1,41 @@
+<?xml version="1.0"?>
+<Context>
+
+	<Valve className="org.jboss.forge.portal.login.LabsFormAuthenticator" authType="FORM" />
+
+   <!--
+     | Uncomment to enable CAS server based SSO authentication.
+   -->
+
+   <!--
+   <Valve className="org.jboss.portal.identity.sso.cas.CASAuthenticationValve"
+   	casLogin="https://localhost/cas/login"
+   	casValidate="https://localhost/cas/serviceValidate"
+   	casServerName="localhost"
+   	authType="FORM"
+   />
+    -->
+
+   <!--
+     | Uncomment to enable JOSSO server based SSO authentication.
+   -->
+
+   <!--
+   <Valve className="org.jboss.portal.identity.sso.josso.JOSSOLogoutValve"/>
+   -->
+
+   <!--
+     | Uncomment to enable OpenSSO server based SSO authentication.
+   -->
+
+   <!--
+   <Valve className="org.jboss.portal.identity.sso.opensso.OpenSSOAuthenticationValve"
+   	loginURL="http://www.domain.com/opensso"
+   	logoutURL="http://www.domain.com/opensso/UI/Logout"
+   	appendLoginGoto="true"
+   	appendLogoutGoto="true"
+   	authType="FORM"
+   />
+   -->
+   
+</Context>
\ No newline at end of file

Modified: labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml	2008-04-10 11:59:53 UTC (rev 19515)
+++ labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml	2008-04-10 15:11:11 UTC (rev 19516)
@@ -32,17 +32,7 @@
    -->
 
     <!-- LABS FILTERS -->   
-    
-   <servlet>
-   	<servlet-name>loginServlet</servlet-name>
-   	<servlet-class>org.jboss.forge.portal.LoginServlet</servlet-class>
-   </servlet>
 
-   <servlet-mapping>
-   	<servlet-name>loginServlet</servlet-name>
-   	<url-pattern>/loginAction</url-pattern>
-   </servlet-mapping>
-
    <servlet>
    	<servlet-name>wrongLoginServlet</servlet-name>
    	<servlet-class>org.jboss.forge.portal.WrongLoginServlet</servlet-class>
@@ -106,9 +96,9 @@
    <filter-mapping>
    	<filter-name>wikiRedirect</filter-name>
    	<url-pattern>/*</url-pattern>
-   </filter-mapping>  -->
+   </filter-mapping> 
 
-<!--<filter>
+<filter>
         <filter-name>wikiComRedirect</filter-name>
         <filter-class>org.jboss.forge.portal.WikiComRedirectFilter</filter-class>
         <init-param>
@@ -126,8 +116,8 @@
    <filter-mapping>
         <filter-name>wikiComRedirect</filter-name>
         <url-pattern>/*</url-pattern>
-   </filter-mapping> 
-   -->
+   </filter-mapping>  -->
+   
     <filter>
       <filter-name>redirectFilter</filter-name>
       <filter-class>org.jboss.forge.redirect.RootRedirectFilter</filter-class>

Modified: labs/jbosslabs/trunk/portal-extensions/forge-ejb3/project.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-ejb3/project.xml	2008-04-10 11:59:53 UTC (rev 19515)
+++ labs/jbosslabs/trunk/portal-extensions/forge-ejb3/project.xml	2008-04-10 15:11:11 UTC (rev 19516)
@@ -116,5 +116,11 @@
             <artifactId>jgroups</artifactId>
             <jar>jgroups.jar</jar>
         </dependency>
+    	
+    	<dependency>
+    		<groupId>jboss</groupId>
+    		<artifactId>jboss-jaxws</artifactId>
+    		<jar>jboss-jaxws.jar</jar>
+    	</dependency>
     </dependencies>
 </project>

Modified: labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/project.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/project.xml	2008-04-10 11:59:53 UTC (rev 19515)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/project.xml	2008-04-10 15:11:11 UTC (rev 19516)
@@ -5,71 +5,81 @@
   See terms of license at gnu.org. 
  -->
 <project>
-    <pomVersion>3</pomVersion>
-    <id>portal-attr</id>
-    <name>Portal attributes</name>
-    <extend>../common.xml</extend>
-    <currentVersion>1.0</currentVersion>
-    <organization>
-        <name>Adam Warski</name>
-        <url>http://mamut.net.pl</url>
-    </organization>
-    <description></description>
-    
-    <dependencies>
-        <dependency>
-	    <groupId>jboss-forge</groupId>
-	    <artifactId>forge-common</artifactId>
-	    <version>1.0</version>
-	</dependency>
-    
-	<dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>jsp-api</artifactId>
-            <version>2.0</version>
-        </dependency>
+	<pomVersion>3</pomVersion>
+	<id>portal-attr</id>
+	<name>Portal attributes</name>
+	<extend>../common.xml</extend>
+	<currentVersion>1.0</currentVersion>
+	<organization>
+		<name>Adam Warski</name>
+		<url>http://mamut.net.pl</url>
+	</organization>
+	<description>
+	</description>
 
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.4</version>
-        </dependency>
-	
-	<dependency>
-            <groupId>jboss</groupId>
-            <artifactId>activation</artifactId>
-            <version>1.0</version>
-            <jar>activation.jar</jar>
-        </dependency>
+	<dependencies>
+		<dependency>
+			<groupId>jboss-forge</groupId>
+			<artifactId>forge-common</artifactId>
+			<version>1.0</version>
+		</dependency>
 
-	<dependency>
-	    <groupId>jboss</groupId>
-	    <artifactId>jboss-common</artifactId>
-	    <version>1.0</version>
-	    <jar>jboss-common.jar</jar>
-	</dependency>
-	
-	<dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>jsp-api</artifactId>
+			<version>2.0</version>
+		</dependency>
+
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>servlet-api</artifactId>
+			<version>2.4</version>
+		</dependency>
+
+		<dependency>
+			<groupId>jboss</groupId>
+			<artifactId>activation</artifactId>
+			<version>1.0</version>
+			<jar>activation.jar</jar>
+		</dependency>
+
+		<dependency>
+			<groupId>jboss</groupId>
+			<artifactId>jboss-common</artifactId>
+			<version>1.0</version>
+			<jar>jboss-common.jar</jar>
+		</dependency>
+
+		<dependency>
+			<groupId>jboss</groupId>
+			<artifactId>jbossweb</artifactId>
+			<version>1.0</version>
+			<jar>jbossweb.jar</jar>
+		</dependency>
+
+		<dependency>
 	    <groupId>jboss</groupId>
 	    <artifactId>hibernate</artifactId>
 	    <version>3.0</version>
-	    <jar>hibernate3.jar</jar>
-	</dependency>
-	<dependency>
+			<jar>hibernate3.jar</jar>
+		</dependency>
+		
+		<dependency>
 	    <groupId>jboss</groupId>
 	    <artifactId>jboss-j2ee</artifactId>
 	    <version>3.2.3</version>
-	</dependency>
-	<dependency>
+		</dependency>
+		
+		<dependency>
 	    <groupId>jboss</groupId>
 	    <artifactId>jbosssx</artifactId>
 	    <version>3.2.3</version>
-	    <jar>jbosssx.jar</jar>
-	</dependency>
+			<jar>jbosssx.jar</jar>
+		</dependency>
 
-    </dependencies>        
+	</dependencies>
 
-    <build>
-	<sourceDirectory>src/java</sourceDirectory>
-    </build>
+	<build>
+		<sourceDirectory>src/java</sourceDirectory>
+	</build>
 </project>

Deleted: labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/LoginServlet.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/LoginServlet.java	2008-04-10 11:59:53 UTC (rev 19515)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/LoginServlet.java	2008-04-10 15:11:11 UTC (rev 19516)
@@ -1,46 +0,0 @@
-package org.jboss.forge.portal;
-
-import java.io.IOException;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.jboss.logging.Logger;
-
-public class LoginServlet extends HttpServlet {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-
-	private static final String AUTOLOGIN_NAME = "autologin";
-
-	private static final Logger log = Logger.getLogger(LoginServlet.class);
-	
-	protected void doPost(HttpServletRequest request,
-			HttpServletResponse response) throws ServletException, IOException {
-
-		// if Remember me ticked - set autlogin cookies
-		if (request.getParameter(AUTOLOGIN_NAME) != null
-				&& request.getParameter(AUTOLOGIN_NAME).equals("Remember me")) {
-			log.debug("Autologin enabled");
-			request.getSession().setAttribute(
-					AutologinFilter.REQUEST_AUTOLOGIN, true);
-		}
-		else {
-			log.debug("autologin disabled");
-		}
-
-		String url = response.encodeRedirectURL("j_security_check?j_username="
-				+ request.getParameter("j_username") + "&j_password="
-				+ request.getParameter("j_password"));
-		
-		response.sendRedirect(url);
-		
-		//request.getRequestDispatcher(url).forward(request, response);
-	}
-
-}

Added: labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/login/LabsFormAuthenticator.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/login/LabsFormAuthenticator.java	                        (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/login/LabsFormAuthenticator.java	2008-04-10 15:11:11 UTC (rev 19516)
@@ -0,0 +1,37 @@
+package org.jboss.forge.portal.login;
+
+import java.io.IOException;
+
+import org.apache.catalina.authenticator.FormAuthenticator;
+import org.apache.catalina.connector.Request;
+import org.apache.catalina.connector.Response;
+import org.apache.catalina.deploy.LoginConfig;
+import org.jboss.forge.portal.AutologinFilter;
+import org.jboss.logging.Logger;
+
+public class LabsFormAuthenticator extends FormAuthenticator{
+
+	private static final String AUTOLOGIN_NAME = "autologin";
+
+	private static final Logger log = Logger.getLogger(LabsFormAuthenticator.class);
+	
+	@Override
+	public boolean authenticate(Request request, Response response, LoginConfig config)
+			throws IOException {
+		
+		log.debug("labs auth valve eexecuted");
+		
+		if (request.getParameter(AUTOLOGIN_NAME) != null
+				&& request.getParameter(AUTOLOGIN_NAME).equals("Remember me")) {
+			log.debug("Autologin enabled");
+			request.getSession().setAttribute(
+					AutologinFilter.REQUEST_AUTOLOGIN, true);
+		}
+		else {
+			log.debug("autologin disabled");
+		}
+		
+		return super.authenticate(request, response, config);
+	}
+
+}




More information about the jboss-svn-commits mailing list