You can subscribe to this list here.
2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(233) |
Sep
(199) |
Oct
(206) |
Nov
(185) |
Dec
(270) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2006 |
Jan
(232) |
Feb
(426) |
Mar
(623) |
Apr
(592) |
May
(506) |
Jun
(389) |
Jul
(160) |
Aug
(3) |
Sep
(1) |
Oct
(1) |
Nov
(2) |
Dec
(5) |
2007 |
Jan
(1) |
Feb
(1) |
Mar
(2) |
Apr
(2) |
May
(4) |
Jun
(2) |
Jul
|
Aug
(3) |
Sep
(5) |
Oct
(9) |
Nov
(6) |
Dec
(6) |
2008 |
Jan
(3) |
Feb
|
Mar
(1) |
Apr
(3) |
May
(3) |
Jun
(5) |
Jul
(10) |
Aug
(2) |
Sep
(12) |
Oct
(10) |
Nov
(54) |
Dec
(49) |
2009 |
Jan
(19) |
Feb
(13) |
Mar
(20) |
Apr
(24) |
May
(44) |
Jun
(29) |
Jul
(32) |
Aug
(10) |
Sep
(7) |
Oct
(10) |
Nov
(4) |
Dec
(17) |
2010 |
Jan
(14) |
Feb
(5) |
Mar
(23) |
Apr
(50) |
May
(31) |
Jun
(9) |
Jul
(5) |
Aug
(4) |
Sep
(7) |
Oct
(5) |
Nov
(2) |
Dec
(3) |
2011 |
Jan
(12) |
Feb
(5) |
Mar
(5) |
Apr
(3) |
May
(4) |
Jun
(3) |
Jul
(2) |
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
2012 |
Jan
(1) |
Feb
(2) |
Mar
|
Apr
(1) |
May
(1) |
Jun
(2) |
Jul
(4) |
Aug
(1) |
Sep
|
Oct
(1) |
Nov
|
Dec
|
2013 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(2) |
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
2014 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(3) |
Sep
|
Oct
|
Nov
|
Dec
(1) |
2015 |
Jan
|
Feb
|
Mar
(2) |
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: <jbo...@li...> - 2005-09-12 18:05:00
|
Author: dam...@jb... Date: 2005-09-12 14:04:57 -0400 (Mon, 12 Sep 2005) New Revision: 1084 Added: branches/forge/archives/ Log: Added an archives section... to hold on to old versions.. of libraries and applications, such as jspwiki src and mods, that we aren't using anymore. |
From: <jbo...@li...> - 2005-09-12 16:56:43
|
Author: szimano Date: 2005-09-12 12:56:18 -0400 (Mon, 12 Sep 2005) New Revision: 1083 Added: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/etc/JBossWikiLogoMedium.png trunk/forge/portal-extensions/jbosswiki/wiki-common/src/etc/attachButton.png trunk/forge/portal-extensions/jbosswiki/wiki-common/src/etc/editButton.png trunk/forge/portal-extensions/jbosswiki/wiki-common/src/etc/historyButton.png trunk/forge/portal-extensions/jbosswiki/wiki-common/src/etc/permaLinkButton.png Removed: trunk/forge/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/tld/ Modified: trunk/forge/portal-extensions/jbosswiki/forge-wiki/maven.xml trunk/forge/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java trunk/forge/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java trunk/forge/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/jsp/Edit.jsp trunk/forge/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/jsp/PageInfo.jsp trunk/forge/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp trunk/forge/portal-extensions/jbosswiki/maven.xml Log: more accurate version... with some forge-independent things Modified: trunk/forge/portal-extensions/jbosswiki/forge-wiki/maven.xml =================================================================== --- trunk/forge/portal-extensions/jbosswiki/forge-wiki/maven.xml 2005-09-12 15:19:35 UTC (rev 1082) +++ trunk/forge/portal-extensions/jbosswiki/forge-wiki/maven.xml 2005-09-12 16:56:18 UTC (rev 1083) @@ -5,7 +5,6 @@ --> <project xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:u="jelly:util" > <goal name="build"> - <attainGoal name="copy-tld" /> <attainGoal name="war" /> Modified: trunk/forge/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java =================================================================== --- trunk/forge/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java 2005-09-12 15:19:35 UTC (rev 1082) +++ trunk/forge/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java 2005-09-12 16:56:18 UTC (rev 1083) @@ -18,7 +18,7 @@ import javax.portlet.*; import org.jboss.portlet.*; -import org.jboss.wiki.management.WikiServiceMenagement; +import org.jboss.wiki.fileaccess.WikiFileAccessFilter; import org.apache.commons.fileupload.PortletDiskFileUpload; import org.apache.commons.fileupload.FileUploadException; import org.apache.commons.fileupload.FileItem; @@ -41,19 +41,13 @@ private WikiEngine wikiEngine; public void init() { - // set wikiEngine + wikiEngine = new WikiEngine(); - /*WikiCommon wikiCommon = new WikiCommon(); - - WikiServiceMenagement wikiServiceMenagement = wikiCommon - .getWikiManagement(); - - wikiEngine = wikiServiceMenagement.getWikiEngine(); + //WikiCommon wikiCommon = new WikiCommon(); - if (wikiEngine == null) {*/ - wikiEngine = new WikiEngine(); - /*wikiServiceMenagement.setWikiEngine(wikiEngine); - }*/ + //WikiServiceMenagement wikiServiceMenagement = wikiCommon.getWikiManagement(); + + //wikiServiceMenagement.setWikiEngine(wikiEngine); } public void processAction(JBossActionRequest rReq, JBossActionResponse rResp) { @@ -355,9 +349,11 @@ rReq .setAttribute( "wikiName", - "<img src=\"/file-access/default/members/jbosswiki/images/JBossWikiLogoMedium.png\" width=\"100\" border=\"0\" style=\"vertical-align: middle\"/>"); + "<img src=\""+hostURL+"/wiki/"+WikiFileAccessFilter.specialPage+"/JBossWikiLogoMedium.png\" width=\"100\" border=\"0\" style=\"vertical-align: middle\"/>"); rReq.setAttribute("wikiContent", pageToShow.getContent()); + + rReq.setAttribute("wikiImagesUrl", hostURL+"/wiki/"+WikiFileAccessFilter.specialPage+"/"); rReq.setAttribute("wikiPage", wikiPage); Modified: trunk/forge/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java =================================================================== --- trunk/forge/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java 2005-09-12 15:19:35 UTC (rev 1082) +++ trunk/forge/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java 2005-09-12 16:56:18 UTC (rev 1083) @@ -11,6 +11,7 @@ import java.io.File; import java.io.FileInputStream; import java.io.IOException; +import java.io.InputStream; import java.util.Properties; import javax.activation.MimetypesFileTypeMap; @@ -42,13 +43,13 @@ * <code>BUF_SIZE</code> - size of a buffer, which is used while reading a * file and sending it to the client. */ + + public static final String specialPage = "!WikiButtons"; private final int BUF_SIZE = 32768; private String attachementsPath; private String wikiHome; - - private String[] replaces; /* * private ForgeHelper forgeHelper; private ContentManager contentManager; @@ -100,7 +101,30 @@ //System.out.println("length " + tokens.length); - if (tokens.length == 3) { + if (tokens[tokens.length - 2].equals(specialPage)) { + // show apropriate buttons + InputStream imageIS = WikiFileAccessFilter.class.getResourceAsStream("/"+tokens[tokens.length - 1]); + + ServletOutputStream os = response.getOutputStream(); + + response.setContentType("image/png"); + + // Transferring the bytes + try { + byte[] buffer = new byte[BUF_SIZE]; + int read; + while ((read = imageIS.read(buffer)) != -1) + os.write(buffer, 0, read); + } catch (Exception e2) { + // Nothing that we can really do. Just send an incomplete + // file. + } finally { + os.close(); + imageIS.close(); + } + + } + else if (tokens.length == 3) { String hostURL = ((request.isSecure()) ? "https" : "http") + "://"+request.getServerName()+((request.getServerPort() == 80) ? "" : ":"+ request.getServerPort()); httpResponse.sendRedirect(hostURL+wikiHome + "&page=" Modified: trunk/forge/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/jsp/Edit.jsp =================================================================== --- trunk/forge/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/jsp/Edit.jsp 2005-09-12 15:19:35 UTC (rev 1082) +++ trunk/forge/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/jsp/Edit.jsp 2005-09-12 16:56:18 UTC (rev 1083) @@ -5,9 +5,6 @@ --> <%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %> -<%@ taglib uri="/WEB-INF/tld/portlet.tld" prefix="n" %> -<%@ taglib uri="/WEB-INF/tld/forge.tld" prefix="forge" %> -<!--<%@ taglib uri="/WEB-INF/tld/wiki.tld" prefix="wiki" %>--> <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %> <%@ page isELIgnored ="false" %> <portlet:defineObjects/> @@ -19,6 +16,7 @@ String wikiPage = (String)request.getAttribute("wikiPage"); String lockMsg = (String)request.getAttribute("lockMsg"); String defaultPage = (String)request.getAttribute("defaultPage"); + String wikiImagesUrl = (String)request.getAttribute("wikiImagesUrl"); if (lockMsg == null) lockMsg = ""; Modified: trunk/forge/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/jsp/PageInfo.jsp =================================================================== --- trunk/forge/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/jsp/PageInfo.jsp 2005-09-12 15:19:35 UTC (rev 1082) +++ trunk/forge/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/jsp/PageInfo.jsp 2005-09-12 16:56:18 UTC (rev 1083) @@ -5,9 +5,6 @@ --> <%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %> -<%@ taglib uri="/WEB-INF/tld/portlet.tld" prefix="n" %> -<%@ taglib uri="/WEB-INF/tld/forge.tld" prefix="forge" %> -<!--<%@ taglib uri="/WEB-INF/tld/wiki.tld" prefix="wiki" %>--> <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %> <%@ page isELIgnored ="false" %> <portlet:defineObjects/> @@ -18,6 +15,7 @@ //String wikiContent = (String)request.getAttribute("wikiContent"); String wikiPage = (String)request.getAttribute("wikiPage"); String defaultPage = (String)request.getAttribute("defaultPage"); + String wikiImagesUrl = (String)request.getAttribute("wikiImagesUrl"); //java.util.Date editDate = (java.util.Date)request.getAttribute("editDate"); //org.jboss.wiki.Credentials author = (org.jboss.wiki.Credentials)request.getAttribute("author"); %> Modified: trunk/forge/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp =================================================================== --- trunk/forge/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp 2005-09-12 15:19:35 UTC (rev 1082) +++ trunk/forge/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp 2005-09-12 16:56:18 UTC (rev 1083) @@ -1,7 +1,10 @@ +<!-- + JBoss, the OpenSource J2EE webOS + Distributable under LGPL license. + See terms of license at gnu.org. + --> + <%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %> -<%@ taglib uri="/WEB-INF/tld/portlet.tld" prefix="n" %> -<%@ taglib uri="/WEB-INF/tld/forge.tld" prefix="forge" %> -<!--<%@ taglib uri="/WEB-INF/tld/wiki.tld" prefix="wiki" %>--> <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %> <%@ page isELIgnored ="false" %> <portlet:defineObjects/> @@ -16,6 +19,7 @@ String type = (String)request.getParameter("type"); java.util.Date editDate = (java.util.Date)request.getAttribute("editDate"); org.jboss.wiki.Credentials author = (org.jboss.wiki.Credentials)request.getAttribute("author"); + String wikiImagesUrl = (String)request.getAttribute("wikiImagesUrl"); %> <table style="width: 100%" border="0"> @@ -34,7 +38,7 @@ <table style="width: 100%" border="0"> <tr style="vertical-align: bottom;"> <td style="vertical-align: bottom; align-bottom: 0px;"> -<div><a href="<%=friendlyLink%>"><img style="vertical-align: middle" alt="PERM LINK" src="/file-access/default/members/jbosswiki/images/permaLinkButton.png" border="0"/></a> <a href="<%=friendlyLink%>"><%=friendlyLink%></a></div> +<div><a href="<%=friendlyLink%>"><img style="vertical-align: middle" alt="PERM LINK" src="<%=wikiImagesUrl%>permaLinkButton.png" border="0"/></a> <a href="<%=friendlyLink%>"><%=friendlyLink%></a></div> </td> <td style="text-align: right;vertical-align: bottom; align-bottom: 0px;"> @@ -45,8 +49,8 @@ if ((type == null)||(type.equals("HTML"))) { if (logedIn.equals("true")) { - out.print("<a href=\""+actionURL+"&action=Edit&page="+wikiPage+"\"><img alt=\"EDIT\" src=\"/file-access/default/members/jbosswiki/images/editButton.png\" border=\"0\" /></a>\n"+ - "<a href=\""+actionURL+"&action=Attach&page="+wikiPage+"\"><img alt=\"ATTACH\" src=\"/file-access/default/members/jbosswiki/images/attachButton.png\" border=\"0\" /></a>"); + out.print("<a href=\""+actionURL+"&action=Edit&page="+wikiPage+"\"><img alt=\"EDIT\" src=\""+wikiImagesUrl+"editButton.png\" border=\"0\" /></a>\n"+ + "<a href=\""+actionURL+"&action=Attach&page="+wikiPage+"\"><img alt=\"ATTACH\" src=\""+wikiImagesUrl+"attachButton.png\" border=\"0\" /></a>"); } else { @@ -58,7 +62,7 @@ <% if ((type == null)||(type.equals("HTML"))) { - out.println("<a href=\""+actionURL+"&action=Info&page="+wikiPage+"\"><img alt=\"HISTORY\" src=\"/file-access/default/members/jbosswiki/images/historyButton.png\" border=\"0\" /></a><br />"); + out.println("<a href=\""+actionURL+"&action=Info&page="+wikiPage+"\"><img alt=\"HISTORY\" src=\""+wikiImagesUrl+"historyButton.png\" border=\"0\" /></a><br />"); } %> <input type="text" name="searchQuery" /> Modified: trunk/forge/portal-extensions/jbosswiki/maven.xml =================================================================== --- trunk/forge/portal-extensions/jbosswiki/maven.xml 2005-09-12 15:19:35 UTC (rev 1082) +++ trunk/forge/portal-extensions/jbosswiki/maven.xml 2005-09-12 16:56:18 UTC (rev 1083) @@ -11,6 +11,9 @@ <goal name="build"> <!--<attainGoal name="wiki:build" />--> </goal> + + <goal name="prj-install"> + </goal> <goal name="deploy"> <!--<attainGoal name="wiki:deploy" />--> @@ -32,10 +35,6 @@ <attainGoal name="ear" /> </goal> - <goal name="copy-tld"> - <ant:copy todir="src/web/WEB-INF/tld" file="../../forge-common/src/web/WEB-INF/tld/forge.tld" /> - </goal> - <goal name="prepare-ear"> <ant:delete dir="target/ear" /> Added: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/etc/JBossWikiLogoMedium.png =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/etc/JBossWikiLogoMedium.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/etc/attachButton.png =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/etc/attachButton.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/etc/editButton.png =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/etc/editButton.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/etc/historyButton.png =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/etc/historyButton.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/etc/permaLinkButton.png =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/etc/permaLinkButton.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream |
From: <jbo...@li...> - 2005-09-12 15:19:40
|
Author: soh...@jb... Date: 2005-09-12 11:19:35 -0400 (Mon, 12 Sep 2005) New Revision: 1082 Added: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/HttpUtils.java Log: JBLAB-383-Need a SSL Processor for splitting the site up into ssl and non-ssl portions Added: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/HttpUtils.java =================================================================== --- trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/HttpUtils.java 2005-09-12 15:10:07 UTC (rev 1081) +++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/HttpUtils.java 2005-09-12 15:19:35 UTC (rev 1082) @@ -0,0 +1,106 @@ +package org.jboss.forge.common; + +import java.net.URI; +import javax.servlet.http.HttpServletRequest; + +public class HttpUtils +{ + /** + * TODO: eventually roll this method into a utility package accessible globally to all the application components + * + * extracts a relativeURL from an absoluteURL. + * @param absoluteURL + * @return + */ + public static String getRelativeURL(String absoluteURL) + { + String relativeURL = null; + + URI uri = URI.create(absoluteURL); + String query = uri.getRawQuery(); + + if(query==null || query.trim().length()==0) + { + relativeURL = uri.getRawPath(); + } + else + { + relativeURL = uri.getRawPath()+"?"+query; + } + + //make sure relativeURL value is not null, if null return an empty string + if(relativeURL==null) + { + relativeURL = ""; + } + return relativeURL; + } + + /** + * + * @param request + * @param securePort + * @return + */ + public static String getSecureURL(HttpServletRequest request,int securePort) + { + String secureURL = null; + + String serverName = request.getServerName(); + + if(securePort!=443) + { + secureURL = "https://"+serverName+":"+securePort; + } + else + { + secureURL = "https://"+serverName; + } + + return secureURL; + } + + /** + * + * @param request + * @return + */ + public static String getSecureURL(HttpServletRequest request) + { + return HttpUtils.getSecureURL(request,443); + } + + /** + * + * @param request + * @param port + * @return + */ + public static String getPlainURL(HttpServletRequest request,int port) + { + String plainURL = null; + + String serverName = request.getServerName(); + + if(port!=80) + { + plainURL = "http://"+serverName+":"+port; + } + else + { + plainURL = "http://"+serverName; + } + + return plainURL; + } + + /** + * + * @param request + * @return + */ + public static String getPlainURL(HttpServletRequest request) + { + return HttpUtils.getPlainURL(request,80); + } +} |
From: <jbo...@li...> - 2005-09-12 15:11:08
|
Author: soh...@jb... Date: 2005-09-12 11:10:07 -0400 (Mon, 12 Sep 2005) New Revision: 1081 Added: trunk/forge/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/SSLProcessor.java Log: JBLAB-383-Need a SSL Processor for splitting the site up into ssl and non-ssl portions Added: trunk/forge/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/SSLProcessor.java =================================================================== --- trunk/forge/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/SSLProcessor.java 2005-09-12 15:09:12 UTC (rev 1080) +++ trunk/forge/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/SSLProcessor.java 2005-09-12 15:10:07 UTC (rev 1081) @@ -0,0 +1,129 @@ +package org.jboss.forge.portal; + +import java.io.IOException; + +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.jboss.forge.common.HttpUtils; + +public class SSLProcessor implements Filter +{ + public void init(FilterConfig config) throws ServletException + { + } + + public void doFilter(ServletRequest request, + ServletResponse response, FilterChain chain) + throws IOException, ServletException + { + if (request instanceof HttpServletRequest && response instanceof HttpServletResponse) + { + HttpServletRequest httpRequest = (HttpServletRequest) request; + HttpServletResponse httpResponse = (HttpServletResponse)response; + String requestURL = httpRequest.getRequestURL().toString(); + String queryString = httpRequest.getQueryString(); + if(queryString!=null && queryString.trim().length()>0) + { + requestURL += ("?" + queryString); + } + + //store the server ports, ssl and non-ssl + this.storePorts(httpRequest); + + if(httpRequest.isSecure()) + { + //check to see if a switch from ssl-mode to non-ssl-mode is needed + if(this.isSwitchFromSSLNeeded(requestURL)) + { + Integer plainPort = (Integer)httpRequest.getSession().getAttribute("http"); + String relativeURL = HttpUtils.getRelativeURL(requestURL); + String plainURL = HttpUtils. + getPlainURL(httpRequest,plainPort.intValue()); + + //perform the switch from ssl to regular mode + String url = plainURL + "/" + relativeURL; + httpResponse.setContentType("text/html"); + httpResponse.sendRedirect(url); + return; + } + } + else + { + //check to see if a switch from non-ssl-mode to ssl-mode is needed + if(this.isSwitchToSSLNeeded(requestURL)) + { + Integer sslPort = (Integer)httpRequest.getSession().getAttribute("https"); + String relativeURL = HttpUtils.getRelativeURL(requestURL); + String sslURL = HttpUtils. + getSecureURL(httpRequest,sslPort.intValue()); + + //perform the switch from regular to ssl-mode + String url = sslURL + "/" + relativeURL; + httpResponse.setContentType("text/html"); + httpResponse.sendRedirect(url); + return; + } + } + } + //if I get here, process the request further + chain.doFilter(request, response); + } + + public void destroy() + { + } + + private boolean isSwitchFromSSLNeeded(String requestURL) + { + boolean switchNeeded = false; + + //these conditions need to be extracted out into an xml config file + //instead of hardcoding the values. + //The implemenation will work for now + if(requestURL.indexOf("authsec")==-1 && + requestURL.indexOf("j_security_check")==-1 && + requestURL.indexOf("ctrl:id=page.default.login")==-1 && + requestURL.indexOf("ctrl:id=window.default.LoginWindow")==-1 + ) + { + switchNeeded = true; + } + return switchNeeded; + } + + private boolean isSwitchToSSLNeeded(String requestURL) + { + boolean switchNeeded = false; + + //these conditions need to be extracted out into an xml config file + //instead of hardcoding the values. + //The implemenation will work for now + + return switchNeeded; + } + + private void storePorts(HttpServletRequest request) + { + Integer sslPort = (Integer)request.getSession().getAttribute("https"); + Integer plainPort = (Integer)request.getSession().getAttribute("http"); + if(sslPort==null || plainPort==null) + { + Integer port = new Integer(request.getServerPort()); + if(request.isSecure()) + { + request.getSession().setAttribute("https",port); + } + else + { + request.getSession().setAttribute("http",port); + } + } + } +} |
From: <jbo...@li...> - 2005-09-12 15:09:22
|
Author: soh...@jb... Date: 2005-09-12 11:09:12 -0400 (Mon, 12 Sep 2005) New Revision: 1080 Modified: trunk/forge/portal-extensions/forge-login-portlet/project.xml trunk/forge/portal-extensions/forge-login-portlet/src/java/org/jbosslabs/security/filter/Login.java trunk/forge/portal-extensions/forge-portal-attr/project.xml trunk/forge/portal-extensions/forge-portal-attr/to-copy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml trunk/forge/portal-extensions/forge-root-redirect/src/java/org/jboss/forge/redirect/RootRedirectFilter.java Log: JBLAB-383-Need a SSL Processor for splitting the site up into ssl and non-ssl portions Modified: trunk/forge/portal-extensions/forge-login-portlet/project.xml =================================================================== --- trunk/forge/portal-extensions/forge-login-portlet/project.xml 2005-09-10 10:16:49 UTC (rev 1079) +++ trunk/forge/portal-extensions/forge-login-portlet/project.xml 2005-09-12 15:09:12 UTC (rev 1080) @@ -19,11 +19,19 @@ <dependencies> <dependency> + <groupId>jboss-forge</groupId> + <artifactId>forge-common</artifactId> + <version>1.0</version> + </dependency> + + <dependency> <groupId>aslibs</groupId> <artifactId>javax.servlet</artifactId> <version>1.0</version> <jar>javax.servlet.jar</jar> </dependency> + + <!-- <dependency> Modified: trunk/forge/portal-extensions/forge-login-portlet/src/java/org/jbosslabs/security/filter/Login.java =================================================================== --- trunk/forge/portal-extensions/forge-login-portlet/src/java/org/jbosslabs/security/filter/Login.java 2005-09-10 10:16:49 UTC (rev 1079) +++ trunk/forge/portal-extensions/forge-login-portlet/src/java/org/jbosslabs/security/filter/Login.java 2005-09-12 15:09:12 UTC (rev 1080) @@ -15,9 +15,11 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.jboss.forge.common.HttpUtils; + /** * @author sohil shah */ @@ -61,7 +63,7 @@ //calculate the landing page for successful login scenario String referer = httpRequest.getHeader("Referer"); - String landingPage = Login.getRelativeURL(referer); + String landingPage = HttpUtils.getRelativeURL(referer); //perform redirection to the login process String redirectPath = null; @@ -89,36 +91,5 @@ public void destroy() { - } - - /** - * TODO: eventually roll this method into a utility package accessible globally to all the application components - * - * extracts a relativeURL from an absoluteURL. - * @param absoluteURL - * @return - */ - private static String getRelativeURL(String absoluteURL) - { - String relativeURL = null; - - URI uri = URI.create(absoluteURL); - String query = uri.getRawQuery(); - - if(query==null || query.trim().length()==0) - { - relativeURL = uri.getRawPath(); - } - else - { - relativeURL = uri.getRawPath()+"?"+query; - } - - //make sure relativeURL value is not null, if null return an empty string - if(relativeURL==null) - { - relativeURL = ""; - } - return relativeURL; - } + } } Modified: trunk/forge/portal-extensions/forge-portal-attr/project.xml =================================================================== --- trunk/forge/portal-extensions/forge-portal-attr/project.xml 2005-09-10 10:16:49 UTC (rev 1079) +++ trunk/forge/portal-extensions/forge-portal-attr/project.xml 2005-09-12 15:09:12 UTC (rev 1080) @@ -15,7 +15,14 @@ </organization> <description></description> - <dependencies> + <dependencies> + + <dependency> + <groupId>jboss-forge</groupId> + <artifactId>forge-common</artifactId> + <version>1.0</version> + </dependency> + <dependency> <groupId>aslibs</groupId> <artifactId>javax.servlet</artifactId> @@ -29,7 +36,7 @@ <version>1.0</version> <jar>activation.jar</jar> </dependency> - </dependencies> + </dependencies> <build> <sourceDirectory>src/java</sourceDirectory> Modified: trunk/forge/portal-extensions/forge-portal-attr/to-copy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml =================================================================== --- trunk/forge/portal-extensions/forge-portal-attr/to-copy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml 2005-09-10 10:16:49 UTC (rev 1079) +++ trunk/forge/portal-extensions/forge-portal-attr/to-copy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml 2005-09-12 15:09:12 UTC (rev 1080) @@ -12,6 +12,17 @@ <param-value>portal:service=ServerManager</param-value> </context-param> + <!-- SSL Processor --> + <filter> + <filter-name>SSLProcessor</filter-name> + <filter-class>org.jboss.forge.portal.SSLProcessor</filter-class> + </filter> + + <filter-mapping> + <filter-name>SSLProcessor</filter-name> + <servlet-name>PortalServlet</servlet-name> + </filter-mapping> + <!-- Forge filter --> <filter> <filter-name>AttributesFilter</filter-name> Modified: trunk/forge/portal-extensions/forge-root-redirect/src/java/org/jboss/forge/redirect/RootRedirectFilter.java =================================================================== --- trunk/forge/portal-extensions/forge-root-redirect/src/java/org/jboss/forge/redirect/RootRedirectFilter.java 2005-09-10 10:16:49 UTC (rev 1079) +++ trunk/forge/portal-extensions/forge-root-redirect/src/java/org/jboss/forge/redirect/RootRedirectFilter.java 2005-09-12 15:09:12 UTC (rev 1080) @@ -28,9 +28,12 @@ FilterChain chain) throws IOException { if ((request instanceof HttpServletRequest) && (response instanceof HttpServletResponse)) { + HttpServletRequest httpRequest = (HttpServletRequest)request; HttpServletResponse httpResponse = (HttpServletResponse) response; + + String requestURI = httpRequest.getRequestURI(); - httpResponse.sendRedirect("/portal"); + httpResponse.sendRedirect("/portal"+requestURI); } else { response.setContentType("text/html"); response.getWriter().write(WRONG_REQ_RESP); |
From: <jbo...@li...> - 2005-09-10 10:16:54
|
Author: adamw Date: 2005-09-10 06:16:49 -0400 (Sat, 10 Sep 2005) New Revision: 1079 Modified: trunk/forge/portal-extensions/forge-file-access/src/java/org/jboss/forge/fileaccess/FileAccessFilter.java Log: JBLAB-281: Added url decoding for kosmos cache access Modified: trunk/forge/portal-extensions/forge-file-access/src/java/org/jboss/forge/fileaccess/FileAccessFilter.java =================================================================== --- trunk/forge/portal-extensions/forge-file-access/src/java/org/jboss/forge/fileaccess/FileAccessFilter.java 2005-09-10 03:50:09 UTC (rev 1078) +++ trunk/forge/portal-extensions/forge-file-access/src/java/org/jboss/forge/fileaccess/FileAccessFilter.java 2005-09-10 10:16:49 UTC (rev 1079) @@ -11,6 +11,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import java.net.URLDecoder; import javax.activation.MimetypesFileTypeMap; import javax.servlet.Filter; @@ -50,6 +51,7 @@ * enabled to download. */ private final static String FREEZONE_ACCESS = "/freezone/"; + private final static String KOSMOS_CACHE_ACCESS = "/kosmos-cache/"; /** * <code>BUF_SIZE</code> - size of a buffer, which is used while reading a * file and sending it to the client. @@ -79,6 +81,7 @@ if ((toCheck.indexOf(IMAGES_ACCESS) != -1) || (toCheck.indexOf(DOWNLOADS_ACCESS) != -1) + || (toCheck.indexOf(KOSMOS_CACHE_ACCESS) != -1) || (toCheck.indexOf(FREEZONE_ACCESS) != -1)) { // Allowing access to images, downloads and docs } else @@ -97,6 +100,11 @@ * want to get the part /path/to/resource. */ String requestedRes = requestURI.split("[/]", 3)[2]; + + // Decoding the requested resource name for kosmos-cache + if (requestedRes.indexOf(KOSMOS_CACHE_ACCESS) != -1) { + requestedRes = URLDecoder.decode(requestedRes, "utf-8"); + } // The last token is the filename. String[] tokens = requestURI.split("[/]"); |
From: <jbo...@li...> - 2005-09-10 03:50:13
|
Author: soh...@jb... Date: 2005-09-09 23:50:09 -0400 (Fri, 09 Sep 2005) New Revision: 1078 Removed: trunk/forge/portal-extensions/forge-login/src/java/org/jbosslabs/ Log: JBLAB-368 - Login Process: Does Login Take You To Where You Were? |
From: <jbo...@li...> - 2005-09-09 21:34:38
|
Author: soh...@jb... Date: 2005-09-09 17:34:34 -0400 (Fri, 09 Sep 2005) New Revision: 1077 Modified: trunk/forge/portal-extensions/forge-navigation/project.xml Log: JBLAB-368 - Login Process: Does Login Take You To Where You Were? Modified: trunk/forge/portal-extensions/forge-navigation/project.xml =================================================================== --- trunk/forge/portal-extensions/forge-navigation/project.xml 2005-09-09 21:10:35 UTC (rev 1076) +++ trunk/forge/portal-extensions/forge-navigation/project.xml 2005-09-09 21:34:34 UTC (rev 1077) @@ -7,40 +7,34 @@ <project> <pomVersion>3</pomVersion> <extend>../common.xml</extend> - <id>forgeLogin</id> - <name>forgeLogin</name> + <id>navigation-portlet</id> + <name>Navigation portlet</name> <currentVersion>1.0</currentVersion> <organization> - <name>Sohil Shah</name> - <url>http://www.jboss.org</url> + <name>Adam Warski and JBoss portal team</name> + <url>http://mamut.net.pl and http://www.jboss.org</url> </organization> <description></description> - <dependencies> - - <dependency> - <groupId>aslibs</groupId> - <artifactId>javax.servlet</artifactId> - <version>1.0</version> - <jar>javax.servlet.jar</jar> - </dependency> - - <!-- - <dependency> + <dependencies> + <dependency> <groupId>tmate</groupId> <artifactId>javasvn</artifactId> <version>1.0</version> <jar>javasvn.jar</jar> - </dependency> - --> - - <!-- + </dependency> + <dependency> <groupId>tmate</groupId> <artifactId>jsch</artifactId> <version>1.0</version> <jar>jsch.jar</jar> - </dependency> - --> - </dependencies> + </dependency> + + <dependency> + <groupId>jboss-forge</groupId> + <artifactId>forge-common</artifactId> + <version>1.0</version> + </dependency> + </dependencies> </project> |
From: <jbo...@li...> - 2005-09-09 21:10:40
|
Author: soh...@jb... Date: 2005-09-09 17:10:35 -0400 (Fri, 09 Sep 2005) New Revision: 1076 Modified: trunk/forge/portal-extensions/portal-default/src/web/WEB-INF/default-portal.xml Log: JBLAB-368 - Login Process: Does Login Take You To Where You Were? Modified: trunk/forge/portal-extensions/portal-default/src/web/WEB-INF/default-portal.xml =================================================================== --- trunk/forge/portal-extensions/portal-default/src/web/WEB-INF/default-portal.xml 2005-09-09 21:08:47 UTC (rev 1075) +++ trunk/forge/portal-extensions/portal-default/src/web/WEB-INF/default-portal.xml 2005-09-09 21:10:35 UTC (rev 1076) @@ -48,15 +48,15 @@ <pages> <default-page>default</default-page> <page> - <page-name>default</page-name> - <window> + <page-name>default</page-name> + <window> <window-name>BlogPortletWindowDefaultDefault</window-name> <instance-ref>blog.BlogPortlet.BlogPortletInstance</instance-ref> - <default>true</default> + <default>true</default> <region>center</region> <height>0</height> - </window> - <window> + </window> + <window> <window-name>NavigationPortletWindowDefaultDefault</window-name> <instance-ref>navigation.NavigationPortlet.NavigationPortletInstance</instance-ref> <region>left</region> @@ -70,6 +70,32 @@ <height>2</height> <window-state>normal</window-state> </window> + </page> + + <!-- login page --> + <page> + <page-name>login</page-name> + <window> + <window-name>LoginWindow</window-name> + <instance-ref>forgeLogin.Login.LoginInstance</instance-ref> + <default>true</default> + <region>center</region> + <height>0</height> + </window> + <window> + <window-name>NavigationPortletWindowDefaultLogin</window-name> + <instance-ref>navigation.NavigationPortlet.NavigationPortletInstance</instance-ref> + <region>left</region> + <height>0</height> + <window-state>normal</window-state> + </window> + <window> + <window-name>AdsPortletWindowDefaultLogin</window-name> + <instance-ref>ads.AdsPortlet.AdsPortletInstance</instance-ref> + <region>left</region> + <height>2</height> + <window-state>normal</window-state> + </window> </page> <page> @@ -325,6 +351,7 @@ <height>0</height> </window> - </page> + </page> + </pages> </portal> |
From: <jbo...@li...> - 2005-09-09 21:08:51
|
Author: soh...@jb... Date: 2005-09-09 17:08:47 -0400 (Fri, 09 Sep 2005) New Revision: 1075 Modified: trunk/forge/portal-extensions/forge-theme/jbossForgeLayout.war/layouts/jbossForge.jsp Log: JBLAB-368 - Login Process: Does Login Take You To Where You Were? Modified: trunk/forge/portal-extensions/forge-theme/jbossForgeLayout.war/layouts/jbossForge.jsp =================================================================== --- trunk/forge/portal-extensions/forge-theme/jbossForgeLayout.war/layouts/jbossForge.jsp 2005-09-09 21:07:36 UTC (rev 1074) +++ trunk/forge/portal-extensions/forge-theme/jbossForgeLayout.war/layouts/jbossForge.jsp 2005-09-09 21:08:47 UTC (rev 1075) @@ -24,9 +24,9 @@ <SCRIPT TYPE='text/javascript' LANGUAGE='JavaScript' -SRC='jbossForge/elqNow/elqCfg.js'></SCRIPT> +SRC='/jbossForge/elqNow/elqCfg.js'></SCRIPT> <SCRIPT TYPE='text/javascript' LANGUAGE='JavaScript' -SRC='jbossForge/elqNow/elqImg.js'></SCRIPT> +SRC='/jbossForge/elqNow/elqImg.js'></SCRIPT> </head> @@ -53,7 +53,7 @@ <div id="ControlMenu"> <form id="TopSearch" action="http://www.jboss.com/search.jsp"> <ul> - <li><a href="/portal/authsec">Login</a></li> + <li><a href="/login/portal">Login</a></li> <li><a href="http://www.jboss.com/index.html?op=checkage&module=user">Register</a></li> <li><a href="http://www.jboss.com/careers">Careers</a></li> <li><a href="http://www.jboss.com/company/contact">Contact Us</a></li> |
From: <jbo...@li...> - 2005-09-09 21:07:45
|
Author: soh...@jb... Date: 2005-09-09 17:07:36 -0400 (Fri, 09 Sep 2005) New Revision: 1074 Modified: trunk/forge/portal-extensions/forge-portal-attr/to-copy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml Log: JBLAB-368 - Login Process: Does Login Take You To Where You Were? Modified: trunk/forge/portal-extensions/forge-portal-attr/to-copy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml =================================================================== --- trunk/forge/portal-extensions/forge-portal-attr/to-copy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml 2005-09-09 21:04:07 UTC (rev 1073) +++ trunk/forge/portal-extensions/forge-portal-attr/to-copy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml 2005-09-09 21:07:36 UTC (rev 1074) @@ -11,7 +11,7 @@ <param-name>org.jboss.portal.server#SERVER_MANAGER</param-name> <param-value>portal:service=ServerManager</param-value> </context-param> - + <!-- Forge filter --> <filter> <filter-name>AttributesFilter</filter-name> @@ -146,8 +146,8 @@ <auth-method>FORM</auth-method> <realm-name>JBoss Portal</realm-name> <form-login-config> - <form-login-page>/login.jsp</form-login-page> - <form-error-page>/errorpages/wronglogin.html</form-error-page> + <form-login-page>/index.html?ctrl:id=page.default.login</form-login-page> + <form-error-page>/index.html?ctrl:id=window.default.LoginWindow&ctrl:type=action&action=loginFailed</form-error-page> </form-login-config> </login-config> |
From: <jbo...@li...> - 2005-09-09 21:04:10
|
Author: soh...@jb... Date: 2005-09-09 17:04:07 -0400 (Fri, 09 Sep 2005) New Revision: 1073 Removed: trunk/forge/portal-extensions/forge-login-portlet/target/ Log: |
Author: soh...@jb... Date: 2005-09-09 17:02:57 -0400 (Fri, 09 Sep 2005) New Revision: 1072 Added: trunk/forge/portal-extensions/forge-login-portlet/ trunk/forge/portal-extensions/forge-login-portlet/maven.xml trunk/forge/portal-extensions/forge-login-portlet/project.properties trunk/forge/portal-extensions/forge-login-portlet/project.xml trunk/forge/portal-extensions/forge-login-portlet/src/ trunk/forge/portal-extensions/forge-login-portlet/src/java/ trunk/forge/portal-extensions/forge-login-portlet/src/java/org/ trunk/forge/portal-extensions/forge-login-portlet/src/java/org/jbosslabs/ trunk/forge/portal-extensions/forge-login-portlet/src/java/org/jbosslabs/security/ trunk/forge/portal-extensions/forge-login-portlet/src/java/org/jbosslabs/security/Constants.java trunk/forge/portal-extensions/forge-login-portlet/src/java/org/jbosslabs/security/filter/ trunk/forge/portal-extensions/forge-login-portlet/src/java/org/jbosslabs/security/filter/Login.java trunk/forge/portal-extensions/forge-login-portlet/src/java/org/jbosslabs/security/portlet/ trunk/forge/portal-extensions/forge-login-portlet/src/java/org/jbosslabs/security/portlet/Login.java trunk/forge/portal-extensions/forge-login-portlet/src/web/ trunk/forge/portal-extensions/forge-login-portlet/src/web/WEB-INF/ trunk/forge/portal-extensions/forge-login-portlet/src/web/WEB-INF/jboss-app.xml trunk/forge/portal-extensions/forge-login-portlet/src/web/WEB-INF/jboss-portlet.xml trunk/forge/portal-extensions/forge-login-portlet/src/web/WEB-INF/jboss-service.xml trunk/forge/portal-extensions/forge-login-portlet/src/web/WEB-INF/jboss-web.xml trunk/forge/portal-extensions/forge-login-portlet/src/web/WEB-INF/login.jsp trunk/forge/portal-extensions/forge-login-portlet/src/web/WEB-INF/portlet-instances.xml trunk/forge/portal-extensions/forge-login-portlet/src/web/WEB-INF/portlet.xml trunk/forge/portal-extensions/forge-login-portlet/src/web/WEB-INF/web.xml trunk/forge/portal-extensions/forge-login-portlet/target/ trunk/forge/portal-extensions/forge-login-portlet/target/classes/ trunk/forge/portal-extensions/forge-login-portlet/target/classes/org/ trunk/forge/portal-extensions/forge-login-portlet/target/classes/org/jboss/ trunk/forge/portal-extensions/forge-login-portlet/target/classes/org/jboss/portlet/ trunk/forge/portal-extensions/forge-login-portlet/target/classes/org/jbosslabs/ trunk/forge/portal-extensions/forge-login-portlet/target/classes/org/jbosslabs/security/ trunk/forge/portal-extensions/forge-login-portlet/target/classes/org/jbosslabs/security/Constants.class trunk/forge/portal-extensions/forge-login-portlet/target/classes/org/jbosslabs/security/filter/ trunk/forge/portal-extensions/forge-login-portlet/target/classes/org/jbosslabs/security/filter/Login.class trunk/forge/portal-extensions/forge-login-portlet/target/classes/org/jbosslabs/security/portlet/ trunk/forge/portal-extensions/forge-login-portlet/target/classes/org/jbosslabs/security/portlet/Login.class trunk/forge/portal-extensions/forge-login-portlet/target/forgeLogin.war trunk/forge/portal-extensions/forge-login-portlet/target/forgeLogin/ trunk/forge/portal-extensions/forge-login-portlet/target/forgeLogin/WEB-INF/ trunk/forge/portal-extensions/forge-login-portlet/target/forgeLogin/WEB-INF/classes/ trunk/forge/portal-extensions/forge-login-portlet/target/forgeLogin/WEB-INF/classes/org/ trunk/forge/portal-extensions/forge-login-portlet/target/forgeLogin/WEB-INF/classes/org/jboss/ trunk/forge/portal-extensions/forge-login-portlet/target/forgeLogin/WEB-INF/classes/org/jboss/portlet/ trunk/forge/portal-extensions/forge-login-portlet/target/forgeLogin/WEB-INF/classes/org/jbosslabs/ trunk/forge/portal-extensions/forge-login-portlet/target/forgeLogin/WEB-INF/classes/org/jbosslabs/security/ trunk/forge/portal-extensions/forge-login-portlet/target/forgeLogin/WEB-INF/classes/org/jbosslabs/security/Constants.class trunk/forge/portal-extensions/forge-login-portlet/target/forgeLogin/WEB-INF/classes/org/jbosslabs/security/filter/ trunk/forge/portal-extensions/forge-login-portlet/target/forgeLogin/WEB-INF/classes/org/jbosslabs/security/filter/Login.class trunk/forge/portal-extensions/forge-login-portlet/target/forgeLogin/WEB-INF/classes/org/jbosslabs/security/portlet/ trunk/forge/portal-extensions/forge-login-portlet/target/forgeLogin/WEB-INF/classes/org/jbosslabs/security/portlet/Login.class trunk/forge/portal-extensions/forge-login-portlet/target/forgeLogin/WEB-INF/jboss-app.xml trunk/forge/portal-extensions/forge-login-portlet/target/forgeLogin/WEB-INF/jboss-portlet.xml trunk/forge/portal-extensions/forge-login-portlet/target/forgeLogin/WEB-INF/jboss-service.xml trunk/forge/portal-extensions/forge-login-portlet/target/forgeLogin/WEB-INF/jboss-web.xml trunk/forge/portal-extensions/forge-login-portlet/target/forgeLogin/WEB-INF/lib/ trunk/forge/portal-extensions/forge-login-portlet/target/forgeLogin/WEB-INF/login.jsp trunk/forge/portal-extensions/forge-login-portlet/target/forgeLogin/WEB-INF/portlet-instances.xml trunk/forge/portal-extensions/forge-login-portlet/target/forgeLogin/WEB-INF/portlet.xml trunk/forge/portal-extensions/forge-login-portlet/target/forgeLogin/WEB-INF/tld/ trunk/forge/portal-extensions/forge-login-portlet/target/forgeLogin/WEB-INF/tld/forge.tld trunk/forge/portal-extensions/forge-login-portlet/target/forgeLogin/WEB-INF/web.xml trunk/forge/portal-extensions/forge-login-portlet/target/forgeLogin/index.html trunk/forge/portal-extensions/forge-login-portlet/target/jbosswebsite-main/ trunk/forge/portal-extensions/forge-login-portlet/target/jbosswebsite-main/WEB-INF/ trunk/forge/portal-extensions/forge-login-portlet/target/jbosswebsite-main/WEB-INF/classes/ trunk/forge/portal-extensions/forge-login-portlet/target/jbosswebsite-main/WEB-INF/classes/org/ trunk/forge/portal-extensions/forge-login-portlet/target/jbosswebsite-main/WEB-INF/classes/org/jboss/ trunk/forge/portal-extensions/forge-login-portlet/target/jbosswebsite-main/WEB-INF/classes/org/jboss/portlet/ trunk/forge/portal-extensions/forge-login-portlet/target/jbosswebsite-main/WEB-INF/jboss-app.xml trunk/forge/portal-extensions/forge-login-portlet/target/jbosswebsite-main/WEB-INF/jboss-service.xml trunk/forge/portal-extensions/forge-login-portlet/target/jbosswebsite-main/WEB-INF/jboss-web.xml trunk/forge/portal-extensions/forge-login-portlet/target/jbosswebsite-main/WEB-INF/lib/ trunk/forge/portal-extensions/forge-login-portlet/target/jbosswebsite-main/WEB-INF/tld/ trunk/forge/portal-extensions/forge-login-portlet/target/jbosswebsite-main/WEB-INF/tld/forge.tld trunk/forge/portal-extensions/forge-login-portlet/target/test-classes/ trunk/forge/portal-extensions/forge-login-portlet/target/test-reports/ Log: JBLAB-368 - Login Process: Does Login Take You To Where You Were? Added: trunk/forge/portal-extensions/forge-login-portlet/maven.xml =================================================================== --- trunk/forge/portal-extensions/forge-login-portlet/maven.xml 2005-09-09 20:51:12 UTC (rev 1071) +++ trunk/forge/portal-extensions/forge-login-portlet/maven.xml 2005-09-09 21:02:57 UTC (rev 1072) @@ -0,0 +1,20 @@ +<!-- + JBoss, the OpenSource J2EE webOS + Distributable under LGPL license. + See terms of license at gnu.org. + --> +<project xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:u="jelly:util"> + <!-- Default war-project goals --> + + <goal name="all"> + <attainGoal name="prj-all" /> + </goal> + + <goal name="build"> + <attainGoal name="prj-war-build" /> + </goal> + + <goal name="deploy"> + <attainGoal name="prj-war-deploy" /> + </goal> +</project> Added: trunk/forge/portal-extensions/forge-login-portlet/project.properties =================================================================== --- trunk/forge/portal-extensions/forge-login-portlet/project.properties 2005-09-09 20:51:12 UTC (rev 1071) +++ trunk/forge/portal-extensions/forge-login-portlet/project.properties 2005-09-09 21:02:57 UTC (rev 1072) @@ -0,0 +1,3 @@ +maven.repo.remote=http://repository.atlassian.com,http://www.ibiblio.org/maven,http://dist.codehaus.org/ +maven.junit.fork=yes +maven.war.src=${basedir}/src/web Added: trunk/forge/portal-extensions/forge-login-portlet/project.xml =================================================================== --- trunk/forge/portal-extensions/forge-login-portlet/project.xml 2005-09-09 20:51:12 UTC (rev 1071) +++ trunk/forge/portal-extensions/forge-login-portlet/project.xml 2005-09-09 21:02:57 UTC (rev 1072) @@ -0,0 +1,46 @@ +<?xml version='1.0' encoding='ISO-8859-1'?> +<!-- + JBoss, the OpenSource J2EE webOS + Distributable under LGPL license. + See terms of license at gnu.org. + --> +<project> + <pomVersion>3</pomVersion> + <extend>../common.xml</extend> + <id>forgeLogin</id> + <name>forgeLogin</name> + <currentVersion>1.0</currentVersion> + <organization> + <name>Sohil Shah</name> + <url>http://www.jboss.org</url> + </organization> + <description></description> + + <dependencies> + + <dependency> + <groupId>aslibs</groupId> + <artifactId>javax.servlet</artifactId> + <version>1.0</version> + <jar>javax.servlet.jar</jar> + </dependency> + + <!-- + <dependency> + <groupId>tmate</groupId> + <artifactId>javasvn</artifactId> + <version>1.0</version> + <jar>javasvn.jar</jar> + </dependency> + --> + + <!-- + <dependency> + <groupId>tmate</groupId> + <artifactId>jsch</artifactId> + <version>1.0</version> + <jar>jsch.jar</jar> + </dependency> + --> + </dependencies> +</project> Added: trunk/forge/portal-extensions/forge-login-portlet/src/java/org/jbosslabs/security/Constants.java =================================================================== --- trunk/forge/portal-extensions/forge-login-portlet/src/java/org/jbosslabs/security/Constants.java 2005-09-09 20:51:12 UTC (rev 1071) +++ trunk/forge/portal-extensions/forge-login-portlet/src/java/org/jbosslabs/security/Constants.java 2005-09-09 21:02:57 UTC (rev 1072) @@ -0,0 +1,6 @@ +package org.jbosslabs.security; + +public interface Constants +{ + public static final String param1 = "action"; +} Added: trunk/forge/portal-extensions/forge-login-portlet/src/java/org/jbosslabs/security/filter/Login.java =================================================================== --- trunk/forge/portal-extensions/forge-login-portlet/src/java/org/jbosslabs/security/filter/Login.java 2005-09-09 20:51:12 UTC (rev 1071) +++ trunk/forge/portal-extensions/forge-login-portlet/src/java/org/jbosslabs/security/filter/Login.java 2005-09-09 21:02:57 UTC (rev 1072) @@ -0,0 +1,124 @@ +/***************************************** + * * + * JBoss Portal: The OpenSource Portal * + * * + * Distributable under LGPL license. * + * See terms of license at gnu.org. * + * * + *****************************************/ +package org.jbosslabs.security.filter; + +import java.io.IOException; +import java.net.URI; + +import javax.servlet.*; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + + + + +/** + * @author sohil shah + */ +public class Login implements Filter +{ + private final static String WRONG_REQ_RESP = "Error accessing the requested resource."; + + public void init(FilterConfig conf) + { + + } + + public void doFilter(ServletRequest request, ServletResponse response, + FilterChain chain) throws IOException + { + try + { + if ((request instanceof HttpServletRequest) + && (response instanceof HttpServletResponse)) { + HttpServletResponse httpResponse = (HttpServletResponse) response; + HttpServletRequest httpRequest = (HttpServletRequest)request; + + //get the path info + String startPath = ""; + String context = httpRequest.getContextPath(); + String requestURI = httpRequest.getRequestURI(); + startPath = requestURI; + if(requestURI.contains(context)) + { + int contextIndex = requestURI.indexOf(context); + int startIndex = contextIndex + context.length(); + if(startIndex<=requestURI.length()-1) + { + startPath = requestURI.substring(startIndex); + } + else + { + startPath = requestURI; + } + } + + //calculate the landing page for successful login scenario + String referer = httpRequest.getHeader("Referer"); + String landingPage = Login.getRelativeURL(referer); + + //perform redirection to the login process + String redirectPath = null; + if(startPath!=null && startPath.trim().length()>0) + { + redirectPath = startPath.trim()+"/authsec"+landingPage; + } + else + { + redirectPath = "/authsec"+landingPage; + } + httpResponse.sendRedirect(redirectPath); + } + else + { + response.setContentType("text/html"); + response.getWriter().write(WRONG_REQ_RESP); + } + } + catch(Exception e) + { + e.printStackTrace(); + } + } + + public void destroy() + { + } + + /** + * TODO: eventually roll this method into a utility package accessible globally to all the application components + * + * extracts a relativeURL from an absoluteURL. + * @param absoluteURL + * @return + */ + private static String getRelativeURL(String absoluteURL) + { + String relativeURL = null; + + URI uri = URI.create(absoluteURL); + String query = uri.getRawQuery(); + + if(query==null || query.trim().length()==0) + { + relativeURL = uri.getRawPath(); + } + else + { + relativeURL = uri.getRawPath()+"?"+query; + } + + //make sure relativeURL value is not null, if null return an empty string + if(relativeURL==null) + { + relativeURL = ""; + } + return relativeURL; + } +} Added: trunk/forge/portal-extensions/forge-login-portlet/src/java/org/jbosslabs/security/portlet/Login.java =================================================================== --- trunk/forge/portal-extensions/forge-login-portlet/src/java/org/jbosslabs/security/portlet/Login.java 2005-09-09 20:51:12 UTC (rev 1071) +++ trunk/forge/portal-extensions/forge-login-portlet/src/java/org/jbosslabs/security/portlet/Login.java 2005-09-09 21:02:57 UTC (rev 1072) @@ -0,0 +1,72 @@ +/***************************************** + * * + * JBoss Portal: The OpenSource Portal * + * * + * Distributable under LGPL license. * + * See terms of license at gnu.org. * + * * + *****************************************/ +package org.jbosslabs.security.portlet; + + +import org.jboss.portlet.JBossPortlet; +import org.jboss.portlet.JBossRenderRequest; +import org.jboss.portlet.JBossRenderResponse; +import org.jboss.portlet.JBossActionRequest; +import org.jboss.portlet.JBossActionResponse; +import org.jboss.portal.core.CoreConstants; + + +import java.io.IOException; + +import javax.portlet.*; + +import org.jbosslabs.security.Constants; + + +public class Login extends JBossPortlet +{ + + public void init() + { + } + + public void processAction(final JBossActionRequest req, final JBossActionResponse resp) + throws PortletException, PortletSecurityException, IOException + { + try + { + String action = req.getParameter(Constants.param1); + if(action!=null) + { + req.setAttribute(Constants.param1,action); + } + } + catch(Exception e) + { + e.printStackTrace(); + throw new PortletException(e); + } + } + + public void doView(JBossRenderRequest request, JBossRenderResponse response) + throws IOException, PortletException + { + try + { + response.setContentType("text/html"); + PortletRequestDispatcher rd = null; + + rd = this.getPortletContext(). + getRequestDispatcher("/WEB-INF/login.jsp"); + + //render + rd.include(request,response); + } + catch(Exception e) + { + e.printStackTrace(); + throw new PortletException(e); + } + } +} Added: trunk/forge/portal-extensions/forge-login-portlet/src/web/WEB-INF/jboss-app.xml =================================================================== --- trunk/forge/portal-extensions/forge-login-portlet/src/web/WEB-INF/jboss-app.xml 2005-09-09 20:51:12 UTC (rev 1071) +++ trunk/forge/portal-extensions/forge-login-portlet/src/web/WEB-INF/jboss-app.xml 2005-09-09 21:02:57 UTC (rev 1072) @@ -0,0 +1,3 @@ +<jboss-app> + <app-name>forgeLogin</app-name> +</jboss-app> \ No newline at end of file Added: trunk/forge/portal-extensions/forge-login-portlet/src/web/WEB-INF/jboss-portlet.xml =================================================================== --- trunk/forge/portal-extensions/forge-login-portlet/src/web/WEB-INF/jboss-portlet.xml 2005-09-09 20:51:12 UTC (rev 1071) +++ trunk/forge/portal-extensions/forge-login-portlet/src/web/WEB-INF/jboss-portlet.xml 2005-09-09 21:02:57 UTC (rev 1072) @@ -0,0 +1,6 @@ +<portlet-app> + <portlet> + <portlet-name>Login</portlet-name> + <security></security> + </portlet> +</portlet-app> Added: trunk/forge/portal-extensions/forge-login-portlet/src/web/WEB-INF/jboss-service.xml =================================================================== --- trunk/forge/portal-extensions/forge-login-portlet/src/web/WEB-INF/jboss-service.xml 2005-09-09 20:51:12 UTC (rev 1071) +++ trunk/forge/portal-extensions/forge-login-portlet/src/web/WEB-INF/jboss-service.xml 2005-09-09 21:02:57 UTC (rev 1072) @@ -0,0 +1,2 @@ +<server> +</server> Added: trunk/forge/portal-extensions/forge-login-portlet/src/web/WEB-INF/jboss-web.xml =================================================================== --- trunk/forge/portal-extensions/forge-login-portlet/src/web/WEB-INF/jboss-web.xml 2005-09-09 20:51:12 UTC (rev 1071) +++ trunk/forge/portal-extensions/forge-login-portlet/src/web/WEB-INF/jboss-web.xml 2005-09-09 21:02:57 UTC (rev 1072) @@ -0,0 +1,4 @@ +<?xml version="1.0"?> +<jboss-web> + <context-root>/login</context-root> +</jboss-web> Added: trunk/forge/portal-extensions/forge-login-portlet/src/web/WEB-INF/login.jsp =================================================================== --- trunk/forge/portal-extensions/forge-login-portlet/src/web/WEB-INF/login.jsp 2005-09-09 20:51:12 UTC (rev 1071) +++ trunk/forge/portal-extensions/forge-login-portlet/src/web/WEB-INF/login.jsp 2005-09-09 21:02:57 UTC (rev 1072) @@ -0,0 +1,71 @@ +<%@ page import="org.jboss.portal.common.util.Tools,org.jbosslabs.security.Constants"%> + +<% + String action = (String)request.getAttribute(Constants.param1); +%> + +<!-- styles for this fragment --> +<style> +body { background-color:#FFFFFF;} +td { color:#000000; font-family:verdana,arial,sans-serif; font-size: 12px; line-height:130%; } +table.form +{ +background-color:#CCFF99; +border-style: dashed; +border-color: #000000; +border-width: 1px; + +} +</style> + +<form method="POST" action="j_security_check" name="loginform"> + +<table width="100%" height="100%" cellpadding="0" cellspacing="1"> +<tr> + <td valign="middle" align="center">JBoss Portal Login</td> +</tr> +<tr> + <td valign="middle" align="center"> </td> +</tr> + +<%if(action!=null && action.trim().equalsIgnoreCase("loginFailed")){%> +<tr> + <td valign="middle" align="center"> </td> +</tr> +<tr> + <td valign="middle" align="center">Login Failed. Please try again....</td> +</tr> +<%}%> + +<tr> +<td valign="middle" align="center"> + <table width="350" height="200" cellpadding="0" cellspacing="0" class="form"> + <tr><td colspan="2" align="center"> </td></tr> + <tr> + <td align="right" width="100"> + Username: + </td> + <td align="left"> + <input type="text" name="j_username" value=""/> + </td> + </tr> + <tr> + <td align="right" width="100"> + Password: + </td> + <td align="left"> + <input type="password" name="j_password" value=""/> + </td> + </tr> + <tr> + <td colspan="2" align="center"> + <input type="submit" name="login" value="Login"/> + </td> + </tr> + </table> +</td> +</tr> + +</table> + +</form> Added: trunk/forge/portal-extensions/forge-login-portlet/src/web/WEB-INF/portlet-instances.xml =================================================================== --- trunk/forge/portal-extensions/forge-login-portlet/src/web/WEB-INF/portlet-instances.xml 2005-09-09 20:51:12 UTC (rev 1071) +++ trunk/forge/portal-extensions/forge-login-portlet/src/web/WEB-INF/portlet-instances.xml 2005-09-09 21:02:57 UTC (rev 1072) @@ -0,0 +1,7 @@ +<?xml version="1.0" standalone="yes"?> +<instances> + <instance> + <instance-name>LoginInstance</instance-name> + <component-ref>Login</component-ref> + </instance> +</instances> Added: trunk/forge/portal-extensions/forge-login-portlet/src/web/WEB-INF/portlet.xml =================================================================== --- trunk/forge/portal-extensions/forge-login-portlet/src/web/WEB-INF/portlet.xml 2005-09-09 20:51:12 UTC (rev 1071) +++ trunk/forge/portal-extensions/forge-login-portlet/src/web/WEB-INF/portlet.xml 2005-09-09 21:02:57 UTC (rev 1072) @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd /opt/SUNWps/dtd/portlet.xsd" version="1.0"> + <portlet> + <portlet-name>Login</portlet-name> + <portlet-class>org.jbosslabs.security.portlet.Login</portlet-class> + <supported-locale>en</supported-locale> + <supports> + <mime-type>text/html</mime-type> + <portlet-mode>VIEW</portlet-mode> + </supports> + <supported-window-states> + <window-state>normal</window-state> + <window-state>minimized</window-state> + <window-state>maximized</window-state> + </supported-window-states> + <portlet-info> + <title>JBossLabs Login Portlet</title> + </portlet-info> + </portlet> +</portlet-app> Added: trunk/forge/portal-extensions/forge-login-portlet/src/web/WEB-INF/web.xml =================================================================== --- trunk/forge/portal-extensions/forge-login-portlet/src/web/WEB-INF/web.xml 2005-09-09 20:51:12 UTC (rev 1071) +++ trunk/forge/portal-extensions/forge-login-portlet/src/web/WEB-INF/web.xml 2005-09-09 21:02:57 UTC (rev 1072) @@ -0,0 +1,15 @@ +<?xml version="1.0"?> +<!DOCTYPE web-app PUBLIC + "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" + "http://java.sun.com/dtd/web-app_2_3.dtd"> +<web-app> + <filter> + <filter-name>loginFilter</filter-name> + <filter-class>org.jbosslabs.security.filter.Login</filter-class> + </filter> + <filter-mapping> + <filter-name>loginFilter</filter-name> + <url-pattern>/*</url-pattern> + <dispatcher>REQUEST</dispatcher> + </filter-mapping> +</web-app> \ No newline at end of file Added: trunk/forge/portal-extensions/forge-login-portlet/target/classes/org/jbosslabs/security/Constants.class =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/forge-login-portlet/target/classes/org/jbosslabs/security/Constants.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/forge/portal-extensions/forge-login-portlet/target/classes/org/jbosslabs/security/filter/Login.class =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/forge-login-portlet/target/classes/org/jbosslabs/security/filter/Login.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/forge/portal-extensions/forge-login-portlet/target/classes/org/jbosslabs/security/portlet/Login.class =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/forge-login-portlet/target/classes/org/jbosslabs/security/portlet/Login.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/forge/portal-extensions/forge-login-portlet/target/forgeLogin/WEB-INF/classes/org/jbosslabs/security/Constants.class =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/forge-login-portlet/target/forgeLogin/WEB-INF/classes/org/jbosslabs/security/Constants.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/forge/portal-extensions/forge-login-portlet/target/forgeLogin/WEB-INF/classes/org/jbosslabs/security/filter/Login.class =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/forge-login-portlet/target/forgeLogin/WEB-INF/classes/org/jbosslabs/security/filter/Login.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/forge/portal-extensions/forge-login-portlet/target/forgeLogin/WEB-INF/classes/org/jbosslabs/security/portlet/Login.class =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/forge-login-portlet/target/forgeLogin/WEB-INF/classes/org/jbosslabs/security/portlet/Login.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/forge/portal-extensions/forge-login-portlet/target/forgeLogin/WEB-INF/jboss-app.xml =================================================================== --- trunk/forge/portal-extensions/forge-login-portlet/target/forgeLogin/WEB-INF/jboss-app.xml 2005-09-09 20:51:12 UTC (rev 1071) +++ trunk/forge/portal-extensions/forge-login-portlet/target/forgeLogin/WEB-INF/jboss-app.xml 2005-09-09 21:02:57 UTC (rev 1072) @@ -0,0 +1,3 @@ +<jboss-app> + <app-name>forgeLogin</app-name> +</jboss-app> \ No newline at end of file Added: trunk/forge/portal-extensions/forge-login-portlet/target/forgeLogin/WEB-INF/jboss-portlet.xml =================================================================== --- trunk/forge/portal-extensions/forge-login-portlet/target/forgeLogin/WEB-INF/jboss-portlet.xml 2005-09-09 20:51:12 UTC (rev 1071) +++ trunk/forge/portal-extensions/forge-login-portlet/target/forgeLogin/WEB-INF/jboss-portlet.xml 2005-09-09 21:02:57 UTC (rev 1072) @@ -0,0 +1,6 @@ +<portlet-app> + <portlet> + <portlet-name>Login</portlet-name> + <security></security> + </portlet> +</portlet-app> Added: trunk/forge/portal-extensions/forge-login-portlet/target/forgeLogin/WEB-INF/jboss-service.xml =================================================================== --- trunk/forge/portal-extensions/forge-login-portlet/target/forgeLogin/WEB-INF/jboss-service.xml 2005-09-09 20:51:12 UTC (rev 1071) +++ trunk/forge/portal-extensions/forge-login-portlet/target/forgeLogin/WEB-INF/jboss-service.xml 2005-09-09 21:02:57 UTC (rev 1072) @@ -0,0 +1,2 @@ +<server> +</server> Added: trunk/forge/portal-extensions/forge-login-portlet/target/forgeLogin/WEB-INF/jboss-web.xml =================================================================== --- trunk/forge/portal-extensions/forge-login-portlet/target/forgeLogin/WEB-INF/jboss-web.xml 2005-09-09 20:51:12 UTC (rev 1071) +++ trunk/forge/portal-extensions/forge-login-portlet/target/forgeLogin/WEB-INF/jboss-web.xml 2005-09-09 21:02:57 UTC (rev 1072) @@ -0,0 +1,4 @@ +<?xml version="1.0"?> +<jboss-web> + <context-root>/login</context-root> +</jboss-web> Added: trunk/forge/portal-extensions/forge-login-portlet/target/forgeLogin/WEB-INF/login.jsp =================================================================== --- trunk/forge/portal-extensions/forge-login-portlet/target/forgeLogin/WEB-INF/login.jsp 2005-09-09 20:51:12 UTC (rev 1071) +++ trunk/forge/portal-extensions/forge-login-portlet/target/forgeLogin/WEB-INF/login.jsp 2005-09-09 21:02:57 UTC (rev 1072) @@ -0,0 +1,71 @@ +<%@ page import="org.jboss.portal.common.util.Tools,org.jbosslabs.security.Constants"%> + +<% + String action = (String)request.getAttribute(Constants.param1); +%> + +<!-- styles for this fragment --> +<style> +body { background-color:#FFFFFF;} +td { color:#000000; font-family:verdana,arial,sans-serif; font-size: 12px; line-height:130%; } +table.form +{ +background-color:#CCFF99; +border-style: dashed; +border-color: #000000; +border-width: 1px; + +} +</style> + +<form method="POST" action="j_security_check" name="loginform"> + +<table width="100%" height="100%" cellpadding="0" cellspacing="1"> +<tr> + <td valign="middle" align="center">JBoss Portal Login</td> +</tr> +<tr> + <td valign="middle" align="center"> </td> +</tr> + +<%if(action!=null && action.trim().equalsIgnoreCase("loginFailed")){%> +<tr> + <td valign="middle" align="center"> </td> +</tr> +<tr> + <td valign="middle" align="center">Login Failed. Please try again....</td> +</tr> +<%}%> + +<tr> +<td valign="middle" align="center"> + <table width="350" height="200" cellpadding="0" cellspacing="0" class="form"> + <tr><td colspan="2" align="center"> </td></tr> + <tr> + <td align="right" width="100"> + Username: + </td> + <td align="left"> + <input type="text" name="j_username" value=""/> + </td> + </tr> + <tr> + <td align="right" width="100"> + Password: + </td> + <td align="left"> + <input type="password" name="j_password" value=""/> + </td> + </tr> + <tr> + <td colspan="2" align="center"> + <input type="submit" name="login" value="Login"/> + </td> + </tr> + </table> +</td> +</tr> + +</table> + +</form> Added: trunk/forge/portal-extensions/forge-login-portlet/target/forgeLogin/WEB-INF/portlet-instances.xml =================================================================== --- trunk/forge/portal-extensions/forge-login-portlet/target/forgeLogin/WEB-INF/portlet-instances.xml 2005-09-09 20:51:12 UTC (rev 1071) +++ trunk/forge/portal-extensions/forge-login-portlet/target/forgeLogin/WEB-INF/portlet-instances.xml 2005-09-09 21:02:57 UTC (rev 1072) @@ -0,0 +1,7 @@ +<?xml version="1.0" standalone="yes"?> +<instances> + <instance> + <instance-name>LoginInstance</instance-name> + <component-ref>Login</component-ref> + </instance> +</instances> Added: trunk/forge/portal-extensions/forge-login-portlet/target/forgeLogin/WEB-INF/portlet.xml =================================================================== --- trunk/forge/portal-extensions/forge-login-portlet/target/forgeLogin/WEB-INF/portlet.xml 2005-09-09 20:51:12 UTC (rev 1071) +++ trunk/forge/portal-extensions/forge-login-portlet/target/forgeLogin/WEB-INF/portlet.xml 2005-09-09 21:02:57 UTC (rev 1072) @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd /opt/SUNWps/dtd/portlet.xsd" version="1.0"> + <portlet> + <portlet-name>Login</portlet-name> + <portlet-class>org.jbosslabs.security.portlet.Login</portlet-class> + <supported-locale>en</supported-locale> + <supports> + <mime-type>text/html</mime-type> + <portlet-mode>VIEW</portlet-mode> + </supports> + <supported-window-states> + <window-state>normal</window-state> + <window-state>minimized</window-state> + <window-state>maximized</window-state> + </supported-window-states> + <portlet-info> + <title>JBossLabs Login Portlet</title> + </portlet-info> + </portlet> +</portlet-app> Added: trunk/forge/portal-extensions/forge-login-portlet/target/forgeLogin/WEB-INF/tld/forge.tld =================================================================== --- trunk/forge/portal-extensions/forge-login-portlet/target/forgeLogin/WEB-INF/tld/forge.tld 2005-09-09 20:51:12 UTC (rev 1071) +++ trunk/forge/portal-extensions/forge-login-portlet/target/forgeLogin/WEB-INF/tld/forge.tld 2005-09-09 21:02:57 UTC (rev 1072) @@ -0,0 +1,129 @@ +<taglib xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee web-jsptaglibrary_2_0.xsd" + version="2.0"> + <!-- + JBoss, the OpenSource J2EE webOS + Distributable under LGPL license. + See terms of license at gnu.org. + --> + <tlib-version>1.1</tlib-version> + <jsp-version>2.0</jsp-version> + <shortname>forge</shortname> + <info>Forge tags</info> + + <tag> + <name>pageURL</name> + <tagclass>org.jboss.forge.common.taglib.PageURLTag</tagclass> + <attribute> + <name>page</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>form</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>param</name> + <tagclass>org.jboss.forge.common.taglib.ParamTag</tagclass> + <attribute> + <name>name</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>value</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>wikiURL</name> + <tagclass>org.jboss.forge.common.taglib.WikiURLTag</tagclass> + <attribute> + <name>page</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>projectURL</name> + <tagclass>org.jboss.forge.common.taglib.ProjectURLTag</tagclass> + <attribute> + <name>project</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>page</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>form</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>categoryURL</name> + <tagclass>org.jboss.forge.common.taglib.CategoryURLTag</tagclass> + <attribute> + <name>category</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>form</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>selectedProject</name> + <tagclass>org.jboss.forge.common.taglib.SelectedProjectTag</tagclass> + </tag> + + <tag> + <name>imagePath</name> + <tagclass>org.jboss.forge.common.taglib.ImagePathTag</tagclass> + <attribute> + <name>src</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>project</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>attrValue</name> + <tagclass>org.jboss.forge.common.taglib.AttrValueTag</tagclass> + <attribute> + <name>name</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>attrIf</name> + <tagclass>org.jboss.forge.common.taglib.AttrIfTag</tagclass> + <attribute> + <name>name</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> +</taglib> Added: trunk/forge/portal-extensions/forge-login-portlet/target/forgeLogin/WEB-INF/web.xml =================================================================== --- trunk/forge/portal-extensions/forge-login-portlet/target/forgeLogin/WEB-INF/web.xml 2005-09-09 20:51:12 UTC (rev 1071) +++ trunk/forge/portal-extensions/forge-login-portlet/target/forgeLogin/WEB-INF/web.xml 2005-09-09 21:02:57 UTC (rev 1072) @@ -0,0 +1,15 @@ +<?xml version="1.0"?> +<!DOCTYPE web-app PUBLIC + "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" + "http://java.sun.com/dtd/web-app_2_3.dtd"> +<web-app> + <filter> + <filter-name>loginFilter</filter-name> + <filter-class>org.jbosslabs.security.filter.Login</filter-class> + </filter> + <filter-mapping> + <filter-name>loginFilter</filter-name> + <url-pattern>/*</url-pattern> + <dispatcher>REQUEST</dispatcher> + </filter-mapping> +</web-app> \ No newline at end of file Added: trunk/forge/portal-extensions/forge-login-portlet/target/forgeLogin/index.html =================================================================== --- trunk/forge/portal-extensions/forge-login-portlet/target/forgeLogin/index.html 2005-09-09 20:51:12 UTC (rev 1071) +++ trunk/forge/portal-extensions/forge-login-portlet/target/forgeLogin/index.html 2005-09-09 21:02:57 UTC (rev 1072) @@ -0,0 +1,4 @@ +<html> + <head></head> + <body>Forge Login Main Page</body> +</html> \ No newline at end of file Added: trunk/forge/portal-extensions/forge-login-portlet/target/forgeLogin.war =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/forge-login-portlet/target/forgeLogin.war ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/forge/portal-extensions/forge-login-portlet/target/jbosswebsite-main/WEB-INF/jboss-app.xml =================================================================== --- trunk/forge/portal-extensions/forge-login-portlet/target/jbosswebsite-main/WEB-INF/jboss-app.xml 2005-09-09 20:51:12 UTC (rev 1071) +++ trunk/forge/portal-extensions/forge-login-portlet/target/jbosswebsite-main/WEB-INF/jboss-app.xml 2005-09-09 21:02:57 UTC (rev 1072) @@ -0,0 +1,3 @@ +<jboss-app> + <app-name>jbosswebsite</app-name> +</jboss-app> \ No newline at end of file Added: trunk/forge/portal-extensions/forge-login-portlet/target/jbosswebsite-main/WEB-INF/jboss-service.xml =================================================================== --- trunk/forge/portal-extensions/forge-login-portlet/target/jbosswebsite-main/WEB-INF/jboss-service.xml 2005-09-09 20:51:12 UTC (rev 1071) +++ trunk/forge/portal-extensions/forge-login-portlet/target/jbosswebsite-main/WEB-INF/jboss-service.xml 2005-09-09 21:02:57 UTC (rev 1072) @@ -0,0 +1,2 @@ +<server> +</server> Added: trunk/forge/portal-extensions/forge-login-portlet/target/jbosswebsite-main/WEB-INF/jboss-web.xml =================================================================== --- trunk/forge/portal-extensions/forge-login-portlet/target/jbosswebsite-main/WEB-INF/jboss-web.xml 2005-09-09 20:51:12 UTC (rev 1071) +++ trunk/forge/portal-extensions/forge-login-portlet/target/jbosswebsite-main/WEB-INF/jboss-web.xml 2005-09-09 21:02:57 UTC (rev 1072) @@ -0,0 +1,3 @@ +<?xml version="1.0"?> +<jboss-web> +</jboss-web> Added: trunk/forge/portal-extensions/forge-login-portlet/target/jbosswebsite-main/WEB-INF/tld/forge.tld =================================================================== --- trunk/forge/portal-extensions/forge-login-portlet/target/jbosswebsite-main/WEB-INF/tld/forge.tld 2005-09-09 20:51:12 UTC (rev 1071) +++ trunk/forge/portal-extensions/forge-login-portlet/target/jbosswebsite-main/WEB-INF/tld/forge.tld 2005-09-09 21:02:57 UTC (rev 1072) @@ -0,0 +1,129 @@ +<taglib xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee web-jsptaglibrary_2_0.xsd" + version="2.0"> + <!-- + JBoss, the OpenSource J2EE webOS + Distributable under LGPL license. + See terms of license at gnu.org. + --> + <tlib-version>1.1</tlib-version> + <jsp-version>2.0</jsp-version> + <shortname>forge</shortname> + <info>Forge tags</info> + + <tag> + <name>pageURL</name> + <tagclass>org.jboss.forge.common.taglib.PageURLTag</tagclass> + <attribute> + <name>page</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>form</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>param</name> + <tagclass>org.jboss.forge.common.taglib.ParamTag</tagclass> + <attribute> + <name>name</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>value</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>wikiURL</name> + <tagclass>org.jboss.forge.common.taglib.WikiURLTag</tagclass> + <attribute> + <name>page</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>projectURL</name> + <tagclass>org.jboss.forge.common.taglib.ProjectURLTag</tagclass> + <attribute> + <name>project</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>page</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>form</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>categoryURL</name> + <tagclass>org.jboss.forge.common.taglib.CategoryURLTag</tagclass> + <attribute> + <name>category</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>form</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>selectedProject</name> + <tagclass>org.jboss.forge.common.taglib.SelectedProjectTag</tagclass> + </tag> + + <tag> + <name>imagePath</name> + <tagclass>org.jboss.forge.common.taglib.ImagePathTag</tagclass> + <attribute> + <name>src</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>project</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>attrValue</name> + <tagclass>org.jboss.forge.common.taglib.AttrValueTag</tagclass> + <attribute> + <name>name</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>attrIf</name> + <tagclass>org.jboss.forge.common.taglib.AttrIfTag</tagclass> + <attribute> + <name>name</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> +</taglib> |
Author: soh...@jb... Date: 2005-09-09 16:51:12 -0400 (Fri, 09 Sep 2005) New Revision: 1071 Added: trunk/forge/portal-extensions/forge-login/src/java/org/jbosslabs/ trunk/forge/portal-extensions/forge-login/src/java/org/jbosslabs/security/ trunk/forge/portal-extensions/forge-login/src/java/org/jbosslabs/security/Constants.java trunk/forge/portal-extensions/forge-login/src/java/org/jbosslabs/security/filter/ trunk/forge/portal-extensions/forge-login/src/java/org/jbosslabs/security/filter/Login.java trunk/forge/portal-extensions/forge-login/src/java/org/jbosslabs/security/portlet/ trunk/forge/portal-extensions/forge-login/src/java/org/jbosslabs/security/portlet/Login.java Log: JBLAB-368 - Login Process: Does Login Take You To Where You Were? Added: trunk/forge/portal-extensions/forge-login/src/java/org/jbosslabs/security/Constants.java =================================================================== --- trunk/forge/portal-extensions/forge-login/src/java/org/jbosslabs/security/Constants.java 2005-09-09 20:47:18 UTC (rev 1070) +++ trunk/forge/portal-extensions/forge-login/src/java/org/jbosslabs/security/Constants.java 2005-09-09 20:51:12 UTC (rev 1071) @@ -0,0 +1,6 @@ +package org.jbosslabs.security; + +public interface Constants +{ + public static final String param1 = "action"; +} Added: trunk/forge/portal-extensions/forge-login/src/java/org/jbosslabs/security/filter/Login.java =================================================================== --- trunk/forge/portal-extensions/forge-login/src/java/org/jbosslabs/security/filter/Login.java 2005-09-09 20:47:18 UTC (rev 1070) +++ trunk/forge/portal-extensions/forge-login/src/java/org/jbosslabs/security/filter/Login.java 2005-09-09 20:51:12 UTC (rev 1071) @@ -0,0 +1,124 @@ +/***************************************** + * * + * JBoss Portal: The OpenSource Portal * + * * + * Distributable under LGPL license. * + * See terms of license at gnu.org. * + * * + *****************************************/ +package org.jbosslabs.security.filter; + +import java.io.IOException; +import java.net.URI; + +import javax.servlet.*; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + + + + +/** + * @author sohil shah + */ +public class Login implements Filter +{ + private final static String WRONG_REQ_RESP = "Error accessing the requested resource."; + + public void init(FilterConfig conf) + { + + } + + public void doFilter(ServletRequest request, ServletResponse response, + FilterChain chain) throws IOException + { + try + { + if ((request instanceof HttpServletRequest) + && (response instanceof HttpServletResponse)) { + HttpServletResponse httpResponse = (HttpServletResponse) response; + HttpServletRequest httpRequest = (HttpServletRequest)request; + + //get the path info + String startPath = ""; + String context = httpRequest.getContextPath(); + String requestURI = httpRequest.getRequestURI(); + startPath = requestURI; + if(requestURI.contains(context)) + { + int contextIndex = requestURI.indexOf(context); + int startIndex = contextIndex + context.length(); + if(startIndex<=requestURI.length()-1) + { + startPath = requestURI.substring(startIndex); + } + else + { + startPath = requestURI; + } + } + + //calculate the landing page for successful login scenario + String referer = httpRequest.getHeader("Referer"); + String landingPage = Login.getRelativeURL(referer); + + //perform redirection to the login process + String redirectPath = null; + if(startPath!=null && startPath.trim().length()>0) + { + redirectPath = startPath.trim()+"/authsec"+landingPage; + } + else + { + redirectPath = "/authsec"+landingPage; + } + httpResponse.sendRedirect(redirectPath); + } + else + { + response.setContentType("text/html"); + response.getWriter().write(WRONG_REQ_RESP); + } + } + catch(Exception e) + { + e.printStackTrace(); + } + } + + public void destroy() + { + } + + /** + * TODO: eventually roll this method into a utility package accessible globally to all the application components + * + * extracts a relativeURL from an absoluteURL. + * @param absoluteURL + * @return + */ + private static String getRelativeURL(String absoluteURL) + { + String relativeURL = null; + + URI uri = URI.create(absoluteURL); + String query = uri.getRawQuery(); + + if(query==null || query.trim().length()==0) + { + relativeURL = uri.getRawPath(); + } + else + { + relativeURL = uri.getRawPath()+"?"+query; + } + + //make sure relativeURL value is not null, if null return an empty string + if(relativeURL==null) + { + relativeURL = ""; + } + return relativeURL; + } +} Added: trunk/forge/portal-extensions/forge-login/src/java/org/jbosslabs/security/portlet/Login.java =================================================================== --- trunk/forge/portal-extensions/forge-login/src/java/org/jbosslabs/security/portlet/Login.java 2005-09-09 20:47:18 UTC (rev 1070) +++ trunk/forge/portal-extensions/forge-login/src/java/org/jbosslabs/security/portlet/Login.java 2005-09-09 20:51:12 UTC (rev 1071) @@ -0,0 +1,72 @@ +/***************************************** + * * + * JBoss Portal: The OpenSource Portal * + * * + * Distributable under LGPL license. * + * See terms of license at gnu.org. * + * * + *****************************************/ +package org.jbosslabs.security.portlet; + + +import org.jboss.portlet.JBossPortlet; +import org.jboss.portlet.JBossRenderRequest; +import org.jboss.portlet.JBossRenderResponse; +import org.jboss.portlet.JBossActionRequest; +import org.jboss.portlet.JBossActionResponse; +import org.jboss.portal.core.CoreConstants; + + +import java.io.IOException; + +import javax.portlet.*; + +import org.jbosslabs.security.Constants; + + +public class Login extends JBossPortlet +{ + + public void init() + { + } + + public void processAction(final JBossActionRequest req, final JBossActionResponse resp) + throws PortletException, PortletSecurityException, IOException + { + try + { + String action = req.getParameter(Constants.param1); + if(action!=null) + { + req.setAttribute(Constants.param1,action); + } + } + catch(Exception e) + { + e.printStackTrace(); + throw new PortletException(e); + } + } + + public void doView(JBossRenderRequest request, JBossRenderResponse response) + throws IOException, PortletException + { + try + { + response.setContentType("text/html"); + PortletRequestDispatcher rd = null; + + rd = this.getPortletContext(). + getRequestDispatcher("/WEB-INF/login.jsp"); + + //render + rd.include(request,response); + } + catch(Exception e) + { + e.printStackTrace(); + throw new PortletException(e); + } + } +} |
From: <jbo...@li...> - 2005-09-09 20:47:23
|
Author: soh...@jb... Date: 2005-09-09 16:47:18 -0400 (Fri, 09 Sep 2005) New Revision: 1070 Modified: trunk/forge/portal-extensions/forge-navigation/project.xml Log: JBLAB-368 - Login Process: Does Login Take You To Where You Were? Modified: trunk/forge/portal-extensions/forge-navigation/project.xml =================================================================== --- trunk/forge/portal-extensions/forge-navigation/project.xml 2005-09-09 20:31:26 UTC (rev 1069) +++ trunk/forge/portal-extensions/forge-navigation/project.xml 2005-09-09 20:47:18 UTC (rev 1070) @@ -7,34 +7,40 @@ <project> <pomVersion>3</pomVersion> <extend>../common.xml</extend> - <id>navigation-portlet</id> - <name>Navigation portlet</name> + <id>forgeLogin</id> + <name>forgeLogin</name> <currentVersion>1.0</currentVersion> <organization> - <name>Adam Warski and JBoss portal team</name> - <url>http://mamut.net.pl and http://www.jboss.org</url> + <name>Sohil Shah</name> + <url>http://www.jboss.org</url> </organization> <description></description> - <dependencies> - <dependency> + <dependencies> + + <dependency> + <groupId>aslibs</groupId> + <artifactId>javax.servlet</artifactId> + <version>1.0</version> + <jar>javax.servlet.jar</jar> + </dependency> + + <!-- + <dependency> <groupId>tmate</groupId> <artifactId>javasvn</artifactId> <version>1.0</version> <jar>javasvn.jar</jar> - </dependency> - + </dependency> + --> + + <!-- <dependency> <groupId>tmate</groupId> <artifactId>jsch</artifactId> <version>1.0</version> <jar>jsch.jar</jar> - </dependency> - - <dependency> - <groupId>jboss-forge</groupId> - <artifactId>forge-common</artifactId> - <version>1.0</version> - </dependency> - </dependencies> + </dependency> + --> + </dependencies> </project> |
From: <jbo...@li...> - 2005-09-09 20:31:29
|
Author: soh...@jb... Date: 2005-09-09 16:31:26 -0400 (Fri, 09 Sep 2005) New Revision: 1069 Modified: trunk/forge/portal-extensions/forge-ear/src/META-INF/application.xml Log: JBLAB-368 - Login Process: Does Login Take You To Where You Were? Modified: trunk/forge/portal-extensions/forge-ear/src/META-INF/application.xml =================================================================== --- trunk/forge/portal-extensions/forge-ear/src/META-INF/application.xml 2005-09-09 16:23:46 UTC (rev 1068) +++ trunk/forge/portal-extensions/forge-ear/src/META-INF/application.xml 2005-09-09 20:31:26 UTC (rev 1069) @@ -78,4 +78,9 @@ <web-uri>jbossForgeLayout.war</web-uri> </web> </module> + <module> + <web> + <web-uri>forgeLogin.war</web-uri> + </web> + </module> </application> |
From: <jbo...@li...> - 2005-09-09 16:23:51
|
Author: adamw Date: 2005-09-09 12:23:46 -0400 (Fri, 09 Sep 2005) New Revision: 1068 Modified: trunk/forge/portal-extensions/forge-kosmos/kosmos-portlet/web-portlet/WEB-INF/portlet.xml trunk/forge/portal-extensions/forge-kosmos/kosmos-server/web-server/WEB-INF/web.xml Log: Another try to fix the images Modified: trunk/forge/portal-extensions/forge-kosmos/kosmos-portlet/web-portlet/WEB-INF/portlet.xml =================================================================== --- trunk/forge/portal-extensions/forge-kosmos/kosmos-portlet/web-portlet/WEB-INF/portlet.xml 2005-09-09 15:33:45 UTC (rev 1067) +++ trunk/forge/portal-extensions/forge-kosmos/kosmos-portlet/web-portlet/WEB-INF/portlet.xml 2005-09-09 16:23:46 UTC (rev 1068) @@ -47,7 +47,7 @@ http://jira.jboss.com/jira/browse/JBWEB, http://jira.jboss.com/jira/browse/JBXB, http://jira.jboss.com/jira/browse/JBWS, - http://jira.jboss.com/jira/browse/KOSMOS + http://jira.jboss.com/jira/browse/KOSMOS </value> </init-param> <supports> @@ -83,7 +83,8 @@ http://anonsvn.labs.jboss.com/trunk/labs/jrunit/, http://anonsvn.labs.jboss.com/trunk/labs/kosmos/, http://anonsvn.labs.jboss.com/trunk/labs/portletswap/, - http://anonsvn.labs.jboss.com/trunk/labs/reportingservices/ + http://anonsvn.labs.jboss.com/trunk/labs/reportingservices/, + http://anonsvn.labs.jboss.com/trunk/forge/portal-extensions/ </value> </init-param> <supports> Modified: trunk/forge/portal-extensions/forge-kosmos/kosmos-server/web-server/WEB-INF/web.xml =================================================================== --- trunk/forge/portal-extensions/forge-kosmos/kosmos-server/web-server/WEB-INF/web.xml 2005-09-09 15:33:45 UTC (rev 1067) +++ trunk/forge/portal-extensions/forge-kosmos/kosmos-server/web-server/WEB-INF/web.xml 2005-09-09 16:23:46 UTC (rev 1068) @@ -10,7 +10,7 @@ <context-param> <param-name>webdav.url</param-name> - <param-value>https://labs-stats:jbo...@cm.../trunk/forge/portal-content/kosmos</param-value> + <param-value>https://labs-stats:jbo...@cm.../trunk/forge/portal-content/kosmos/images</param-value> </context-param> <context-param> <param-name>webdav.user</param-name> @@ -22,7 +22,7 @@ </context-param> <context-param> <param-name>webdav.clientaccess</param-name> - <param-value>http://labs.jboss.com/file-access/kosmos/images</param-value> + <param-value>/file-access/kosmos/images</param-value> </context-param> <servlet> |
Author: adamw Date: 2005-09-09 11:33:45 -0400 (Fri, 09 Sep 2005) New Revision: 1067 Modified: trunk/forge/portal-extensions/forge-kosmos/kosmos-portlet/src/java/hu/midori/kosmos/server/AbstractKosmosService.java trunk/forge/portal-extensions/forge-kosmos/kosmos-server/src/java/hu/midori/kosmos/server/AbstractKosmosService.java trunk/forge/portal-extensions/forge-kosmos/kosmos-server/web-server/WEB-INF/web.xml Log: JBLAB-381: cache with file-access Modified: trunk/forge/portal-extensions/forge-kosmos/kosmos-portlet/src/java/hu/midori/kosmos/server/AbstractKosmosService.java =================================================================== --- trunk/forge/portal-extensions/forge-kosmos/kosmos-portlet/src/java/hu/midori/kosmos/server/AbstractKosmosService.java 2005-09-09 13:46:45 UTC (rev 1066) +++ trunk/forge/portal-extensions/forge-kosmos/kosmos-portlet/src/java/hu/midori/kosmos/server/AbstractKosmosService.java 2005-09-09 15:33:45 UTC (rev 1067) @@ -15,6 +15,7 @@ import java.util.Map; import org.apache.commons.httpclient.HttpURL; +import org.apache.commons.httpclient.HttpsURL; import org.apache.commons.httpclient.URIException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -104,23 +105,46 @@ String url = ctx.getServletContext().getInitParameter("webdav.url"); String user = ctx.getServletContext().getInitParameter("webdav.user"); String password = ctx.getServletContext().getInitParameter("webdav.password"); + String clientaccess = ctx.getServletContext().getInitParameter("webdav.clientaccess"); + log.debug(String.format("Connecting to \"%s\" as \"%s\" (\"%s\")...", url, user, password)); if((url == null) || (url.trim().length() == 0)) throw new IllegalStateException("'webdav.url' was not specified as servlet-context init-params"); - HttpURL webdavUrl = new HttpURL(url); - if((user != null) && (user.trim().length() != 0)) - webdavUrl.setUser(user); - if((password != null) && (password.trim().length() != 0)) - webdavUrl.setPassword(password); + if((clientaccess == null) || (clientaccess.trim().length() == 0)) + throw new IllegalStateException("'webdav.clientaccess' was not specified as servlet-context init-params"); + // Checking if the url uses http or https. + boolean isHttps = false; + if (url.startsWith("https")) + isHttps = true; + + HttpURL webdavUrl; + + if (isHttps) + webdavUrl = new HttpsURL(url); + else + webdavUrl = new HttpURL(url); + + // TODO: Check this + // If you use the setUser method with a HttpsUrl, a NPE is thrown, in the + // string's init, somewhere from HttpClient - maybe that's a bug there? + if (!isHttps) { + if((user != null) && (user.trim().length() != 0)) + webdavUrl.setUser(user); + if((password != null) && (password.trim().length() != 0)) + webdavUrl.setPassword(password); + } + String cacheDirPath = webdavUrl.getPath() + "/kosmos-cache/"; String cachedFilePath = cacheDirPath + filename; - String cachedFileUrl = webdavUrl.getURI() + "/kosmos-cache/" + URLEncoder.encode(filename, "utf-8"); + String cachedFileUrl = clientaccess + "/kosmos-cache/" + URLEncoder.encode(filename, "utf-8"); // create WebDAV dir if not existing WebdavResource webdavResource = new WebdavResource(webdavUrl); + // Using this with https throws an exception. // TODO check if the dir was not existing yet - webdavResource.mkcolMethod(cacheDirPath); + if (!isHttps) + webdavResource.mkcolMethod(cacheDirPath); // put resource to WebDAV log.debug(String.format("Putting WebDAV resource \"%s\"...", cachedFilePath)); Modified: trunk/forge/portal-extensions/forge-kosmos/kosmos-server/src/java/hu/midori/kosmos/server/AbstractKosmosService.java =================================================================== --- trunk/forge/portal-extensions/forge-kosmos/kosmos-server/src/java/hu/midori/kosmos/server/AbstractKosmosService.java 2005-09-09 13:46:45 UTC (rev 1066) +++ trunk/forge/portal-extensions/forge-kosmos/kosmos-server/src/java/hu/midori/kosmos/server/AbstractKosmosService.java 2005-09-09 15:33:45 UTC (rev 1067) @@ -14,6 +14,7 @@ import java.util.HashMap; import java.util.Map; +import org.apache.commons.httpclient.HttpURL; import org.apache.commons.httpclient.HttpsURL; import org.apache.commons.httpclient.URIException; import org.apache.commons.logging.Log; @@ -104,23 +105,46 @@ String url = ctx.getServletContext().getInitParameter("webdav.url"); String user = ctx.getServletContext().getInitParameter("webdav.user"); String password = ctx.getServletContext().getInitParameter("webdav.password"); + String clientaccess = ctx.getServletContext().getInitParameter("webdav.clientaccess"); + log.debug(String.format("Connecting to \"%s\" as \"%s\" (\"%s\")...", url, user, password)); if((url == null) || (url.trim().length() == 0)) throw new IllegalStateException("'webdav.url' was not specified as servlet-context init-params"); - HttpsURL webdavUrl = new HttpsURL(url); - if((user != null) && (user.trim().length() != 0)) - webdavUrl.setUser(user); - if((password != null) && (password.trim().length() != 0)) - webdavUrl.setPassword(password); + if((clientaccess == null) || (clientaccess.trim().length() == 0)) + throw new IllegalStateException("'webdav.clientaccess' was not specified as servlet-context init-params"); + // Checking if the url uses http or https. + boolean isHttps = false; + if (url.startsWith("https")) + isHttps = true; + + HttpURL webdavUrl; + + if (isHttps) + webdavUrl = new HttpsURL(url); + else + webdavUrl = new HttpURL(url); + + // TODO: Check this + // If you use the setUser method with a HttpsUrl, a NPE is thrown, in the + // string's init, somewhere from HttpClient - maybe that's a bug there? + if (!isHttps) { + if((user != null) && (user.trim().length() != 0)) + webdavUrl.setUser(user); + if((password != null) && (password.trim().length() != 0)) + webdavUrl.setPassword(password); + } + String cacheDirPath = webdavUrl.getPath() + "/kosmos-cache/"; String cachedFilePath = cacheDirPath + filename; - String cachedFileUrl = webdavUrl.getURI() + "/kosmos-cache/" + URLEncoder.encode(filename, "utf-8"); + String cachedFileUrl = clientaccess + "/kosmos-cache/" + URLEncoder.encode(filename, "utf-8"); // create WebDAV dir if not existing WebdavResource webdavResource = new WebdavResource(webdavUrl); + // Using this with https throws an exception. // TODO check if the dir was not existing yet - // webdavResource.mkcolMethod(cacheDirPath); + if (!isHttps) + webdavResource.mkcolMethod(cacheDirPath); // put resource to WebDAV log.debug(String.format("Putting WebDAV resource \"%s\"...", cachedFilePath)); Modified: trunk/forge/portal-extensions/forge-kosmos/kosmos-server/web-server/WEB-INF/web.xml =================================================================== --- trunk/forge/portal-extensions/forge-kosmos/kosmos-server/web-server/WEB-INF/web.xml 2005-09-09 13:46:45 UTC (rev 1066) +++ trunk/forge/portal-extensions/forge-kosmos/kosmos-server/web-server/WEB-INF/web.xml 2005-09-09 15:33:45 UTC (rev 1067) @@ -14,12 +14,16 @@ </context-param> <context-param> <param-name>webdav.user</param-name> - <param-value></param-value> + <param-value>labs-stats</param-value> </context-param> <context-param> <param-name>webdav.password</param-name> - <param-value></param-value> + <param-value>jbossforgeadmin</param-value> </context-param> + <context-param> + <param-name>webdav.clientaccess</param-name> + <param-value>http://labs.jboss.com/file-access/kosmos/images</param-value> + </context-param> <servlet> <servlet-name>kosmos-services</servlet-name> |
From: <jbo...@li...> - 2005-09-09 13:46:55
|
Author: mla...@jb... Date: 2005-09-09 09:46:45 -0400 (Fri, 09 Sep 2005) New Revision: 1066 Modified: trunk/labs/jbossweb/xdocs/project.xml trunk/labs/jbossweb/xdocs/reference/project.xml Log: Fix logo link Modified: trunk/labs/jbossweb/xdocs/project.xml =================================================================== --- trunk/labs/jbossweb/xdocs/project.xml 2005-09-09 13:13:45 UTC (rev 1065) +++ trunk/labs/jbossweb/xdocs/project.xml 2005-09-09 13:46:45 UTC (rev 1066) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="ISO-8859-1"?> <project name="JBossWeb Documentation - Top Level Directory" - href="http://labs.jboss.com/portal/index.html?ctrl:id=page.default.freezone&project=jbossweb&page=index.html"> + href="http://labs.jboss.com/portal/index.html?ctrl:id=page.default.info&project=jbossweb"> <title>JBossWeb</title> <logo href="/images/jbossweblogo.gif">JBossWeb @ JBoss labs</logo> <body> Modified: trunk/labs/jbossweb/xdocs/reference/project.xml =================================================================== --- trunk/labs/jbossweb/xdocs/reference/project.xml 2005-09-09 13:13:45 UTC (rev 1065) +++ trunk/labs/jbossweb/xdocs/reference/project.xml 2005-09-09 13:46:45 UTC (rev 1066) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="ISO-8859-1"?> <project name="JBossWeb Documentation - Top Level Directory" - href="http://labs.jboss.com/portal/index.html?ctrl:id=page.default.freezone&project=jbossweb&page=index.html"> + href="http://labs.jboss.com/portal/index.html?ctrl:id=page.default.info&project=jbossweb"> <title>JBossWeb</title> <logo href="/images/jbossweblogo.gif">JBossWeb @ JBoss labs</logo> <body> |
From: <jbo...@li...> - 2005-09-09 13:13:51
|
Author: mla...@jb... Date: 2005-09-09 09:13:45 -0400 (Fri, 09 Sep 2005) New Revision: 1065 Modified: trunk/labs/jbossweb/xdocs/images/tomcat_pb.gif Log: Update tomcat pb logo Modified: trunk/labs/jbossweb/xdocs/images/tomcat_pb.gif =================================================================== (Binary files differ) |
From: <jbo...@li...> - 2005-09-09 12:11:36
|
Author: mla...@jb... Date: 2005-09-09 08:11:29 -0400 (Fri, 09 Sep 2005) New Revision: 1064 Added: trunk/labs/jbossweb/xdocs/images/tomcat_pb.gif Modified: trunk/labs/jbossweb/xdocs/index.xml trunk/labs/jbossweb/xdocs/style.xsl Log: Add images style tag. Added: trunk/labs/jbossweb/xdocs/images/tomcat_pb.gif =================================================================== (Binary files differ) Property changes on: trunk/labs/jbossweb/xdocs/images/tomcat_pb.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/labs/jbossweb/xdocs/index.xml =================================================================== --- trunk/labs/jbossweb/xdocs/index.xml 2005-09-09 10:50:35 UTC (rev 1063) +++ trunk/labs/jbossweb/xdocs/index.xml 2005-09-09 12:11:29 UTC (rev 1064) @@ -39,7 +39,11 @@ from threading and event processing models, and that makes the JBoss Web Server one of the fastest and most scalable web servers in the market. -</p> +</p> +<p> +<image src="/images/tomcat_pb.gif"/> +<image src="/images/openssl_ics.gif"/> +</p> </section> </body> </document> Modified: trunk/labs/jbossweb/xdocs/style.xsl =================================================================== --- trunk/labs/jbossweb/xdocs/style.xsl 2005-09-09 10:50:35 UTC (rev 1063) +++ trunk/labs/jbossweb/xdocs/style.xsl 2005-09-09 12:11:29 UTC (rev 1064) @@ -184,6 +184,16 @@ </table> </xsl:template> + <xsl:template match="image"> + <xsl:variable name="src"> + <xsl:value-of select="$relative-path"/><xsl:value-of select="@src"/> + </xsl:variable> + <xsl:variable name="alt"> + <xsl:value-of select="@alt"/> + </xsl:variable> + <img src="{$src}" alt="{$alt}" border="0"/> + </xsl:template> + <!-- Process a documentation section --> <xsl:template match="section"> <xsl:variable name="name"> |
From: <jbo...@li...> - 2005-09-09 10:50:45
|
Author: mla...@jb... Date: 2005-09-09 06:50:35 -0400 (Fri, 09 Sep 2005) New Revision: 1063 Modified: trunk/labs/jbossweb/xdocs/images/design/jbosswebblockda.png trunk/labs/jbossweb/xdocs/sources/jbosswebblockda.vsd Log: Use 'Proxy Stream' instead AJP 1.4 Modified: trunk/labs/jbossweb/xdocs/images/design/jbosswebblockda.png =================================================================== (Binary files differ) Modified: trunk/labs/jbossweb/xdocs/sources/jbosswebblockda.vsd =================================================================== (Binary files differ) |
From: <jbo...@li...> - 2005-09-09 09:46:10
|
Author: mla...@jb... Date: 2005-09-09 05:46:03 -0400 (Fri, 09 Sep 2005) New Revision: 1062 Added: trunk/labs/jbossweb/xdocs/reference/ch02.xml trunk/labs/jbossweb/xdocs/reference/ch03.xml Modified: trunk/labs/jbossweb/xdocs/reference/project.xml Log: Add two chapters. Added: trunk/labs/jbossweb/xdocs/reference/ch02.xml =================================================================== --- trunk/labs/jbossweb/xdocs/reference/ch02.xml 2005-09-09 09:34:39 UTC (rev 1061) +++ trunk/labs/jbossweb/xdocs/reference/ch02.xml 2005-09-09 09:46:03 UTC (rev 1062) @@ -0,0 +1,23 @@ +<?xml version="1.0"?> +<!DOCTYPE document [ + <!ENTITY project SYSTEM "project.xml"> +]> +<document url="ch02.html"> + + &project; + + <properties> + <author email="mla...@jb...">Mladen Turk</author> + <title>Tomcat Native</title> + </properties> + +<body> + +<section name="Design"> + <p>Tomcat Native uses <a href="http://apr.apache.org">APR</a> and + <a href="http://www.openssl.org">OpenSSL</a> + </p> + <figure src="/images/design/tcnativeblockda.png" name="Figure 2" text="Tomcat Native"/> +</section> +</body> +</document> Added: trunk/labs/jbossweb/xdocs/reference/ch03.xml =================================================================== --- trunk/labs/jbossweb/xdocs/reference/ch03.xml 2005-09-09 09:34:39 UTC (rev 1061) +++ trunk/labs/jbossweb/xdocs/reference/ch03.xml 2005-09-09 09:46:03 UTC (rev 1062) @@ -0,0 +1,22 @@ +<?xml version="1.0"?> +<!DOCTYPE document [ + <!ENTITY project SYSTEM "project.xml"> +]> +<document url="ch03.html"> + + &project; + + <properties> + <author email="mla...@jb...">Mladen Turk</author> + <title>Hybrid connection model</title> + </properties> + +<body> + +<section name="Design"> + <p>Hybrid connection model + </p> + <figure src="/images/design/acceptflowchart.png" name="Figure 3" text="Accept flowchart"/> +</section> +</body> +</document> Modified: trunk/labs/jbossweb/xdocs/reference/project.xml =================================================================== --- trunk/labs/jbossweb/xdocs/reference/project.xml 2005-09-09 09:34:39 UTC (rev 1061) +++ trunk/labs/jbossweb/xdocs/reference/project.xml 2005-09-09 09:46:03 UTC (rev 1062) @@ -6,10 +6,12 @@ <body> <menu name="JBossWeb"> - <item name="Overview" href="../index.html"/> + <item name="Overview" href="../index.html"/> </menu> <menu name="Architecture"> - <item name="Overview" href="ch01.html"/> + <item name="Overview" href="ch01.html"/> + <item name="Native" href="ch02.html"/> + <item name="Hybrid connection model" href="ch03.html"/> </menu> </body> </project> |
From: <jbo...@li...> - 2005-09-09 09:34:54
|
Author: mla...@jb... Date: 2005-09-09 05:34:39 -0400 (Fri, 09 Sep 2005) New Revision: 1061 Added: trunk/labs/jbossweb/xdocs/images/design/ trunk/labs/jbossweb/xdocs/images/design/acceptflowchart.png trunk/labs/jbossweb/xdocs/images/design/jbosswebblockda.png trunk/labs/jbossweb/xdocs/images/design/tcnativeblockda.png Log: Add design images Added: trunk/labs/jbossweb/xdocs/images/design/acceptflowchart.png =================================================================== (Binary files differ) Property changes on: trunk/labs/jbossweb/xdocs/images/design/acceptflowchart.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/labs/jbossweb/xdocs/images/design/jbosswebblockda.png =================================================================== (Binary files differ) Property changes on: trunk/labs/jbossweb/xdocs/images/design/jbosswebblockda.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/labs/jbossweb/xdocs/images/design/tcnativeblockda.png =================================================================== (Binary files differ) Property changes on: trunk/labs/jbossweb/xdocs/images/design/tcnativeblockda.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream |
From: <jbo...@li...> - 2005-09-09 09:34:13
|
Author: mla...@jb... Date: 2005-09-09 05:33:57 -0400 (Fri, 09 Sep 2005) New Revision: 1060 Modified: trunk/labs/jbossweb/xdocs/sources/tcnativeblockda.vsd Log: Update block diagram Modified: trunk/labs/jbossweb/xdocs/sources/tcnativeblockda.vsd =================================================================== (Binary files differ) |