[jboss-svn-commits] JBL Code SVN: r19456 - in labs/jbosslabs/qa/portal-extensions: configuration/to-copy/server/default/deploy/jboss-portal.sar/META-INF and 12 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Apr 7 11:31:35 EDT 2008
Author: adamw
Date: 2008-04-07 11:31:35 -0400 (Mon, 07 Apr 2008)
New Revision: 19456
Added:
labs/jbosslabs/qa/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-core.war/
labs/jbosslabs/qa/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-core.war/WEB-INF/
labs/jbosslabs/qa/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/
labs/jbosslabs/qa/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/header/
labs/jbosslabs/qa/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/header/header.jsp
labs/jbosslabs/qa/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/header/tabs.jsp
labs/jbosslabs/qa/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/RedirectCommand.java
Removed:
labs/jbosslabs/qa/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-core.war/WEB-INF/
labs/jbosslabs/qa/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/
labs/jbosslabs/qa/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/header/
labs/jbosslabs/qa/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/header/header.jsp
labs/jbosslabs/qa/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/header/tabs.jsp
labs/jbosslabs/qa/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/delegating/page/BlogCF.java
labs/jbosslabs/qa/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/url/BlogUrlFactory.java
Modified:
labs/jbosslabs/qa/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/META-INF/jboss-service.xml
labs/jbosslabs/qa/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml
labs/jbosslabs/qa/portal-extensions/configuration/to-copy/server/default/deploy/jboss-web.deployer/server.xml
labs/jbosslabs/qa/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/AbstractBaseCF.java
labs/jbosslabs/qa/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/MainCF.java
labs/jbosslabs/qa/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/PortalObjectCFImpl.java
labs/jbosslabs/qa/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/delegating/page/WikiCF.java
labs/jbosslabs/qa/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/SSLProcessor.java
labs/jbosslabs/qa/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/WikiRedirectFilter.java
labs/jbosslabs/qa/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileAttachmentDataSource.java
labs/jbosslabs/qa/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileMediaDataSource.java
Log:
MERGE 19304:19455 from trunk to qa
Modified: labs/jbosslabs/qa/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/META-INF/jboss-service.xml
===================================================================
--- labs/jbosslabs/qa/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/META-INF/jboss-service.xml 2008-04-07 15:23:33 UTC (rev 19455)
+++ labs/jbosslabs/qa/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/META-INF/jboss-service.xml 2008-04-07 15:31:35 UTC (rev 19456)
@@ -961,23 +961,6 @@
optional-attribute-name="PortalObjectCF"
proxy-type="attribute">portal:commandFactory=LabsPortalObject</depends>
</mbean>
- <mbean
- code="org.jboss.labs.mapper.command.delegating.page.BlogCF"
- name="portal:commandFactory=Blog"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
- <xmbean/>
- <attribute name="Path">blog</attribute>
- <depends
- optional-attribute-name="Container"
- proxy-type="attribute">portal:container=PortalObject</depends>
- <depends
- optional-attribute-name="PageDelegatingCF"
- proxy-type="attribute">portal:commandFactory=LabsPageDelegating</depends>
- <depends
- optional-attribute-name="PortalObjectCF"
- proxy-type="attribute">portal:commandFactory=LabsPortalObject</depends>
- </mbean>
<mbean
code="org.jboss.labs.mapper.command.delegating.page.MetricsCF"
@@ -1112,20 +1095,6 @@
optional-attribute-name="Factory"
proxy-type="attribute">portal:urlFactory=Delegating</depends>
</mbean>
- <mbean
- code="org.jboss.labs.mapper.url.BlogUrlFactory"
- name="portal:urlFactory=Blog"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
- <attribute name="Path">blog</attribute>
- <xmbean/>
- <depends
- optional-attribute-name="Container"
- proxy-type="attribute">portal:container=PortalObject</depends>
- <depends
- optional-attribute-name="Factory"
- proxy-type="attribute">portal:urlFactory=Delegating</depends>
- </mbean>
<mbean
code="org.jboss.labs.mapper.url.MetricsUrlFactory"
name="portal:urlFactory=Metrics"
Copied: labs/jbosslabs/qa/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-core.war (from rev 19455, labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-core.war)
Copied: labs/jbosslabs/qa/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-core.war/WEB-INF (from rev 19455, labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-core.war/WEB-INF)
Copied: labs/jbosslabs/qa/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-core.war/WEB-INF/jsp (from rev 19455, labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-core.war/WEB-INF/jsp)
Copied: labs/jbosslabs/qa/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/header (from rev 19455, labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/header)
Deleted: labs/jbosslabs/qa/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/header/header.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/header/header.jsp 2008-04-07 15:23:33 UTC (rev 19455)
+++ labs/jbosslabs/qa/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/header/header.jsp 2008-04-07 15:31:35 UTC (rev 19456)
@@ -1,57 +0,0 @@
-<%@ page import="org.jboss.portal.api.PortalURL" %>
-<%@ page import="org.jboss.portal.identity.User" %>
-
-<%
- if (1+1 == 2) { return; }
-
- User user = (User)request.getAttribute("org.jboss.portal.header.USER");
- PortalURL dashboardURL = (PortalURL)request.getAttribute("org.jboss.portal.header.DASHBOARD_URL");
- PortalURL loginURL = (PortalURL)request.getAttribute("org.jboss.portal.header.LOGIN_URL");
- PortalURL defaultPortalURL = (PortalURL)request.getAttribute("org.jboss.portal.header.DEFAULT_PORTAL_URL");
- PortalURL adminPortalURL = (PortalURL)request.getAttribute("org.jboss.portal.header.ADMIN_PORTAL_URL");
- PortalURL editDashboardURL = (PortalURL)request.getAttribute("org.jboss.portal.header.EDIT_DASHBOARD_URL");
- PortalURL copyToDashboardURL = (PortalURL)request.getAttribute("org.jboss.portal.header.COPY_TO_DASHBOARD_URL");
- PortalURL signOutURL = (PortalURL)request.getAttribute("org.jboss.portal.header.SIGN_OUT_URL");
-%>
-
-<%
- if (user == null)
- {
-%>
-<a href="<%= loginURL %>">Login</a>
-<%
-}
-else
-{
-%>
-Logged in as: <%= user.getUserName() %><br/><br/>
-
-<%
- if (dashboardURL != null)
- {
-%> <a href="<%= dashboardURL %>">Dashboard</a> |<%
- }
-
- if (defaultPortalURL != null)
- {
-%> <a href="<%= defaultPortalURL %>">Portal</a> |<%
- }
-
- if (adminPortalURL != null)
- {
-%> <a href="<%= adminPortalURL %>">Admin</a> |<%
- }
-
- if (editDashboardURL != null)
- {
-%> <a href="<%= editDashboardURL %>">Configure dashboard</a> |<%
- }
-
- if (copyToDashboardURL != null)
- {
-%> <a href="<%= copyToDashboardURL %>">Copy to my dashboard</a> |<%
- }
-%> <a href="<%= signOutURL %>">Logout</a>
-<%
- }
-%>
Copied: labs/jbosslabs/qa/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/header/header.jsp (from rev 19455, labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/header/header.jsp)
===================================================================
--- labs/jbosslabs/qa/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/header/header.jsp (rev 0)
+++ labs/jbosslabs/qa/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/header/header.jsp 2008-04-07 15:31:35 UTC (rev 19456)
@@ -0,0 +1,57 @@
+<%@ page import="org.jboss.portal.api.PortalURL" %>
+<%@ page import="org.jboss.portal.identity.User" %>
+
+<%
+ if (1+1 == 2) { return; }
+
+ User user = (User)request.getAttribute("org.jboss.portal.header.USER");
+ PortalURL dashboardURL = (PortalURL)request.getAttribute("org.jboss.portal.header.DASHBOARD_URL");
+ PortalURL loginURL = (PortalURL)request.getAttribute("org.jboss.portal.header.LOGIN_URL");
+ PortalURL defaultPortalURL = (PortalURL)request.getAttribute("org.jboss.portal.header.DEFAULT_PORTAL_URL");
+ PortalURL adminPortalURL = (PortalURL)request.getAttribute("org.jboss.portal.header.ADMIN_PORTAL_URL");
+ PortalURL editDashboardURL = (PortalURL)request.getAttribute("org.jboss.portal.header.EDIT_DASHBOARD_URL");
+ PortalURL copyToDashboardURL = (PortalURL)request.getAttribute("org.jboss.portal.header.COPY_TO_DASHBOARD_URL");
+ PortalURL signOutURL = (PortalURL)request.getAttribute("org.jboss.portal.header.SIGN_OUT_URL");
+%>
+
+<%
+ if (user == null)
+ {
+%>
+<a href="<%= loginURL %>">Login</a>
+<%
+}
+else
+{
+%>
+Logged in as: <%= user.getUserName() %><br/><br/>
+
+<%
+ if (dashboardURL != null)
+ {
+%> <a href="<%= dashboardURL %>">Dashboard</a> |<%
+ }
+
+ if (defaultPortalURL != null)
+ {
+%> <a href="<%= defaultPortalURL %>">Portal</a> |<%
+ }
+
+ if (adminPortalURL != null)
+ {
+%> <a href="<%= adminPortalURL %>">Admin</a> |<%
+ }
+
+ if (editDashboardURL != null)
+ {
+%> <a href="<%= editDashboardURL %>">Configure dashboard</a> |<%
+ }
+
+ if (copyToDashboardURL != null)
+ {
+%> <a href="<%= copyToDashboardURL %>">Copy to my dashboard</a> |<%
+ }
+%> <a href="<%= signOutURL %>">Logout</a>
+<%
+ }
+%>
Deleted: labs/jbosslabs/qa/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/header/tabs.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/header/tabs.jsp 2008-04-07 15:23:33 UTC (rev 19455)
+++ labs/jbosslabs/qa/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/header/tabs.jsp 2008-04-07 15:31:35 UTC (rev 19456)
@@ -1,80 +0,0 @@
-<%@ page import="java.util.Iterator" %>
-<%@ page import="org.jboss.portal.api.node.PortalNode" %>
-<%@ page import="java.util.Locale" %>
-<%@ page import="java.util.ArrayList" %>
-<%@ page import="org.jboss.portal.api.PortalRuntimeContext" %>
-
-<%
- if (1+1 == 2) { return; }
-
- PortalNode root = (PortalNode)request.getAttribute("org.jboss.portal.api.PORTAL_NODE");
- PortalNode portal = root;
- PortalNode mainPage = portal;
-
- while (portal.getType() != PortalNode.TYPE_PORTAL)
- {
- mainPage = portal;
- portal = portal.getParent();
- }
-
- PortalRuntimeContext context = (PortalRuntimeContext)request.getAttribute("org.jboss.portal.api.PORTAL_RUNTIME_CONTEXT");
-
- // Get a locale
- Locale locale = request.getLocale();
- if (locale == null)
- {
- locale = Locale.getDefault();
- }
-%>
-
-<ul id="tabsHeader">
-<%
- ArrayList tmp = new ArrayList(10);
- Iterator childrenIt = portal.getChildren().iterator();
- while (childrenIt.hasNext())
- {
- PortalNode child = (PortalNode)childrenIt.next();
-
- // Get the list of child pages
- tmp.clear();
- for (Iterator i = child.getChildren().iterator();i.hasNext();)
- {
- PortalNode childChild = (PortalNode)i.next();
- if (childChild.getType() == PortalNode.TYPE_PAGE)
- {
- tmp.add(childChild);
- }
- }
-%>
- <li <% if(child == mainPage) out.println(" id=\"current\""); %> onmouseover="this.className='hoverOn'" onmouseout="this.className='hoverOff'"><a href="<%= child.createURL(context) %>"><%= child.getDisplayName(locale) %><%
- if (tmp.size() == 0)
- {
-%></a>
-<%
- }
- else
- {
-%>
- <!--[if IE 7]><!--></a><!--<![endif]-->
- <!--[if lte IE 6]> <table><tr><td><![endif]-->
- <ul>
-<%
- for (Iterator j = tmp.iterator(); j.hasNext();)
- {
- PortalNode childChild = (PortalNode)j.next();
-%>
- <li><a href='<%= childChild.createURL(context) %>'><%= childChild.getDisplayName(locale) %></a></li>
-<%
- }
-%>
- </ul>
- <!--[if lte IE 6]></td></tr></table></a><![endif]-->
-<%
- }
-%>
- </li>
-<%
- }
-
-%>
-</ul>
Copied: labs/jbosslabs/qa/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/header/tabs.jsp (from rev 19455, labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/header/tabs.jsp)
===================================================================
--- labs/jbosslabs/qa/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/header/tabs.jsp (rev 0)
+++ labs/jbosslabs/qa/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/header/tabs.jsp 2008-04-07 15:31:35 UTC (rev 19456)
@@ -0,0 +1,80 @@
+<%@ page import="java.util.Iterator" %>
+<%@ page import="org.jboss.portal.api.node.PortalNode" %>
+<%@ page import="java.util.Locale" %>
+<%@ page import="java.util.ArrayList" %>
+<%@ page import="org.jboss.portal.api.PortalRuntimeContext" %>
+
+<%
+ if (1+1 == 2) { return; }
+
+ PortalNode root = (PortalNode)request.getAttribute("org.jboss.portal.api.PORTAL_NODE");
+ PortalNode portal = root;
+ PortalNode mainPage = portal;
+
+ while (portal.getType() != PortalNode.TYPE_PORTAL)
+ {
+ mainPage = portal;
+ portal = portal.getParent();
+ }
+
+ PortalRuntimeContext context = (PortalRuntimeContext)request.getAttribute("org.jboss.portal.api.PORTAL_RUNTIME_CONTEXT");
+
+ // Get a locale
+ Locale locale = request.getLocale();
+ if (locale == null)
+ {
+ locale = Locale.getDefault();
+ }
+%>
+
+<ul id="tabsHeader">
+<%
+ ArrayList tmp = new ArrayList(10);
+ Iterator childrenIt = portal.getChildren().iterator();
+ while (childrenIt.hasNext())
+ {
+ PortalNode child = (PortalNode)childrenIt.next();
+
+ // Get the list of child pages
+ tmp.clear();
+ for (Iterator i = child.getChildren().iterator();i.hasNext();)
+ {
+ PortalNode childChild = (PortalNode)i.next();
+ if (childChild.getType() == PortalNode.TYPE_PAGE)
+ {
+ tmp.add(childChild);
+ }
+ }
+%>
+ <li <% if(child == mainPage) out.println(" id=\"current\""); %> onmouseover="this.className='hoverOn'" onmouseout="this.className='hoverOff'"><a href="<%= child.createURL(context) %>"><%= child.getDisplayName(locale) %><%
+ if (tmp.size() == 0)
+ {
+%></a>
+<%
+ }
+ else
+ {
+%>
+ <!--[if IE 7]><!--></a><!--<![endif]-->
+ <!--[if lte IE 6]> <table><tr><td><![endif]-->
+ <ul>
+<%
+ for (Iterator j = tmp.iterator(); j.hasNext();)
+ {
+ PortalNode childChild = (PortalNode)j.next();
+%>
+ <li><a href='<%= childChild.createURL(context) %>'><%= childChild.getDisplayName(locale) %></a></li>
+<%
+ }
+%>
+ </ul>
+ <!--[if lte IE 6]></td></tr></table></a><![endif]-->
+<%
+ }
+%>
+ </li>
+<%
+ }
+
+%>
+</ul>
Modified: labs/jbosslabs/qa/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml
===================================================================
--- labs/jbosslabs/qa/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml 2008-04-07 15:23:33 UTC (rev 19455)
+++ labs/jbosslabs/qa/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml 2008-04-07 15:31:35 UTC (rev 19456)
@@ -83,7 +83,7 @@
<url-pattern>/logout</url-pattern>
</servlet-mapping>
- <!-- <filter>
+ <filter>
<filter-name>wikiRedirect</filter-name>
<filter-class>org.jboss.forge.portal.WikiRedirectFilter</filter-class>
<init-param>
@@ -93,12 +93,12 @@
</init-param>
<init-param>
<param-name>JBOSS_ORG_DOMAIN</param-name>
- <param-value>labs.jboss.com</param-value>
+ <param-value>www.jboss.org</param-value>
<description>Domain that jboss.org is running on</description>
</init-param>
<init-param>
<param-name>WIKI_CONTEXT</param-name>
- <param-value>/wiki,/auth/wiki,/authsec/wiki</param-value>
+ <param-value>/wiki,/auth/wiki,/authsec/wiki,/loginPage,/auth/loginPage,/authsec/loginPage,/showLogin,/logout,/loginAction,/loginFailed</param-value>
<description>Wiki context</description>
</init-param>
</filter>
@@ -106,9 +106,9 @@
<filter-mapping>
<filter-name>wikiRedirect</filter-name>
<url-pattern>/*</url-pattern>
- </filter-mapping> -->
+ </filter-mapping>
-<!--<filter>
+ <!--filter>
<filter-name>wikiComRedirect</filter-name>
<filter-class>org.jboss.forge.portal.WikiComRedirectFilter</filter-class>
<init-param>
Modified: labs/jbosslabs/qa/portal-extensions/configuration/to-copy/server/default/deploy/jboss-web.deployer/server.xml
===================================================================
--- labs/jbosslabs/qa/portal-extensions/configuration/to-copy/server/default/deploy/jboss-web.deployer/server.xml 2008-04-07 15:23:33 UTC (rev 19455)
+++ labs/jbosslabs/qa/portal-extensions/configuration/to-copy/server/default/deploy/jboss-web.deployer/server.xml 2008-04-07 15:31:35 UTC (rev 19456)
@@ -12,6 +12,9 @@
-->
<Service name="jboss.web">
+ <!-- SSL/TLS Connector configuration using the admin devl guide keystore -->
+ URIEncoding="UTF-8" />
+
<!-- A "Connector" represents an endpoint by which requests are received
and responses are returned. Documentation at :
Java HTTP Connector: /docs/config/http.html (blocking & non-blocking)
@@ -20,22 +23,49 @@
Define a non-SSL HTTP/1.1 Connector on port 8080
-->
<Connector port="8080" address="${jboss.bind.address}"
- maxThreads="250" maxHttpHeaderSize="8192"
+ maxThreads="1000" strategy="ms" maxHttpHeaderSize="8192"
emptySessionPath="true" protocol="HTTP/1.1"
- enableLookups="false" redirectPort="8443" acceptCount="100"
- connectionTimeout="20000" disableUploadTimeout="true" />
+ enableLookups="false" redirectPort="443" acceptCount="100"
+ connectionTimeout="10000" disableUploadTimeout="true" URIEncoding="UTF-8"
+ proxyName="www.jboss.org" proxyPort="80"
+ />
+ <Connector port="8081" address="${jboss.bind.address}"
+ maxThreads="1000" strategy="ms" maxHttpHeaderSize="8192"
+ emptySessionPath="true" protocol="HTTP/1.1"
+ enableLookups="false" redirectPort="443" acceptCount="100"
+ connectionTimeout="10000" disableUploadTimeout="true" URIEncoding="UTF-8"
+ proxyName="wiki.jboss.org" proxyPort="80"
+ />
+
+ <Connector port="8443" address="${jboss.bind.address}"
+ maxThreads="1000" strategy="ms" maxHttpHeaderSize="8192"
+ emptySessionPath="true" protocol="HTTP/1.1"
+ enableLookups="false" redirectPort="443" acceptCount="100"
+ connectionTimeout="10000" disableUploadTimeout="true" URIEncoding="UTF-8"
+ proxyName="www.jboss.org" proxyPort="443" secure="true" scheme="https"
+ />
+
+ <Connector port="8444" address="${jboss.bind.address}"
+ maxThreads="1000" strategy="ms" maxHttpHeaderSize="8192"
+ emptySessionPath="true" protocol="HTTP/1.1"
+ enableLookups="false" redirectPort="443" acceptCount="100"
+ connectionTimeout="10000" disableUploadTimeout="true" URIEncoding="UTF-8"
+ proxyName="wiki.jboss.org" proxyPort="443" secure="true" scheme="https"
+ />
+
<!-- Define a SSL HTTP/1.1 Connector on port 8443
This connector uses the JSSE configuration, when using APR, the
connector should be using the OpenSSL style configuration
described in the APR documentation -->
- <Connector port="8443" protocol="HTTP/1.1" SSLEnabled="true" URIEncoding="UTF-8"
+ <!--<Connector port="8443" protocol="HTTP/1.1" SSLEnabled="true" URIEncoding="UTF-8"
maxThreads="250" scheme="https" secure="true" address="${jboss.bind.address}"
- clientAuth="false" sslProtocol="TLS" keystoreFile="${jboss.server.home.dir}/conf/server.keystore"
+ clientAuth="false" sslProtocol="TLS"
+ keystoreFile="${jboss.server.home.dir}/conf/labs.jboss.com.p12"
+ keystorePass="eei5th3pLacc2be" keystoreType="PKCS12"
strategy="ms" maxHttpHeaderSize="8192"
- emptySessionPath="true"
- keystorePass="labs-ssl" />
+ emptySessionPath="true" />-->
<!-- Define an AJP 1.3 Connector on port 8009 -->
<Connector port="8009" address="${jboss.bind.address}" protocol="AJP/1.3"
Copied: labs/jbosslabs/qa/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/RedirectCommand.java (from rev 19455, labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/RedirectCommand.java)
===================================================================
--- labs/jbosslabs/qa/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/RedirectCommand.java (rev 0)
+++ labs/jbosslabs/qa/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/RedirectCommand.java 2008-04-07 15:31:35 UTC (rev 19456)
@@ -0,0 +1,26 @@
+package org.jboss.labs.mapper;
+
+import org.jboss.portal.core.controller.ControllerCommand;
+import org.jboss.portal.core.controller.ControllerException;
+import org.jboss.portal.core.controller.ControllerResponse;
+import org.jboss.portal.core.controller.command.info.CommandInfo;
+import org.jboss.portal.core.controller.command.response.RedirectionResponse;
+
+public class RedirectCommand extends ControllerCommand {
+ private String redirectTo;
+
+ public RedirectCommand(String redirectTo) {
+ this.redirectTo = redirectTo;
+ }
+
+ @Override
+ public ControllerResponse execute() throws ControllerException {
+ return new RedirectionResponse(redirectTo);
+ }
+
+ @Override
+ public CommandInfo getInfo() {
+ return null;
+ }
+
+}
Modified: labs/jbosslabs/qa/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/AbstractBaseCF.java
===================================================================
--- labs/jbosslabs/qa/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/AbstractBaseCF.java 2008-04-07 15:23:33 UTC (rev 19455)
+++ labs/jbosslabs/qa/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/AbstractBaseCF.java 2008-04-07 15:31:35 UTC (rev 19456)
@@ -1,8 +1,8 @@
package org.jboss.labs.mapper.command;
import org.jboss.portal.core.model.portal.*;
-import org.jboss.portal.core.model.portal.navstate.WindowNavigationalState;
import org.jboss.portal.core.model.portal.command.action.InvokePortletWindowRenderCommand;
+import org.jboss.portal.core.model.portal.navstate.WindowNavigationalState;
import org.jboss.portal.core.controller.ControllerCommand;
import org.jboss.portal.core.controller.ControllerContext;
import org.jboss.portal.jems.as.system.AbstractJBossService;
@@ -10,9 +10,8 @@
import org.jboss.portal.portlet.StateString;
import org.jboss.portal.portlet.impl.PortletRequestDecoder;
import org.jboss.labs.mapper.MapperTools;
+import org.jboss.labs.mapper.RedirectCommand;
-import java.io.IOException;
-
/**
* A base class for Labs command factories.
* @author <a href="mailto:adamw at aster.pl">Adam Warski</a>
@@ -42,16 +41,13 @@
PortletRequestDecoder.META_PARAMETER) != null;
}
- protected void sendRedirect(ServerInvocation invocation, String where) {
- try {
- String queryString = invocation.getServerContext().getClientRequest().getQueryString();
- if (queryString != null) {
- where += "?" + queryString;
- }
- invocation.getServerContext().getClientResponse().sendRedirect(where);
- } catch (IOException e) {
- // Oh well ...
+ protected ControllerCommand sendRedirect(ServerInvocation invocation, String where) {
+ String queryString = invocation.getServerContext().getClientRequest().getQueryString();
+ if (queryString != null) {
+ where += "?" + queryString;
}
+
+ return new RedirectCommand(where);
}
/*
Modified: labs/jbosslabs/qa/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/MainCF.java
===================================================================
--- labs/jbosslabs/qa/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/MainCF.java 2008-04-07 15:23:33 UTC (rev 19455)
+++ labs/jbosslabs/qa/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/MainCF.java 2008-04-07 15:31:35 UTC (rev 19456)
@@ -1,6 +1,7 @@
package org.jboss.labs.mapper.command;
import org.jboss.portal.core.controller.command.mapper.CommandFactory;
+import org.jboss.portal.core.controller.command.response.RedirectionResponse;
import org.jboss.portal.core.controller.ControllerCommand;
import org.jboss.portal.core.controller.ControllerContext;
import org.jboss.portal.core.model.portal.*;
@@ -86,7 +87,7 @@
ServerInvocation invocation, String host, String contextPath,
String requestPath) {
PathParser parser = new PathParser(requestPath);
-
+
// Redirects.
if ("portal".equals(parser.getFirstToken())) {
String rest = parser.getRest();
@@ -100,8 +101,7 @@
rest = "";
}
- sendRedirect(invocation, "/developers/" + rest);
- return null;
+ return sendRedirect(invocation, "/developers/" + rest);
}
}
@@ -109,8 +109,7 @@
rest = "";
}
- sendRedirect(invocation, "/" + rest);
- return null;
+ return sendRedirect(invocation, "/" + rest);
} else if ("jbossrules".equals(parser.getFirstToken())) {
String rest = parser.getRest();
@@ -118,12 +117,7 @@
rest = "";
}
- sendRedirect(invocation, "/drools/" + rest);
- return null;
- } else if ("feeds".equals(parser.getFirstToken()) && parser.hasMoreTokens()) {
- parser.proceed();
- sendRedirect(invocation, "/feeds/xml/" + parser.getFirstToken() + "?type=atom");
- return null;
+ return sendRedirect(invocation, "/drools/" + rest);
}
// End of redirects.
@@ -140,8 +134,7 @@
if (lastSlash != -1) {
String lastToken = rest.substring(lastSlash + 1);
if (!lastToken.contains(".") && !lastToken.equals("")) {
- sendRedirect(invocation, parser.getFullPath() + "/");
- return null;
+ return sendRedirect(invocation, parser.getFullPath() + "/");
}
}
}
Modified: labs/jbosslabs/qa/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/PortalObjectCFImpl.java
===================================================================
--- labs/jbosslabs/qa/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/PortalObjectCFImpl.java 2008-04-07 15:23:33 UTC (rev 19455)
+++ labs/jbosslabs/qa/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/PortalObjectCFImpl.java 2008-04-07 15:31:35 UTC (rev 19456)
@@ -170,8 +170,7 @@
path);
if (!Constants.PAGES_MIME_TYPE.equals(cm.getNode(absPath).getMimeType())) {
// A binary request; redirecting to file-access.
- sendRedirect(invocation, ForgeHelper.createFileAccessPath(absPath));
- return null;
+ return sendRedirect(invocation, ForgeHelper.createFileAccessPath(absPath));
}
} catch (ResourceDoesNotExist resourceDoesNotExist) {
// The page does not exist; proceeding.
Deleted: labs/jbosslabs/qa/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/delegating/page/BlogCF.java
===================================================================
--- labs/jbosslabs/qa/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/delegating/page/BlogCF.java 2008-04-07 15:23:33 UTC (rev 19455)
+++ labs/jbosslabs/qa/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/delegating/page/BlogCF.java 2008-04-07 15:31:35 UTC (rev 19456)
@@ -1,96 +0,0 @@
-package org.jboss.labs.mapper.command.delegating.page;
-
-import org.jboss.labs.mapper.PathParser;
-import org.jboss.portal.server.ServerInvocation;
-import org.jboss.portal.portlet.impl.PortletRequestDecoder;
-import org.jboss.portal.core.controller.ControllerCommand;
-import org.jboss.portal.core.controller.ControllerContext;
-import org.jboss.portal.core.model.portal.Page;
-import org.jboss.portal.core.model.portal.PortalObjectPath;
-import org.jboss.portal.core.model.portal.Window;
-import org.jboss.portal.core.model.portal.PortalObjectId;
-import org.jboss.forge.common.Constants;
-import org.jboss.forge.common.exceptions.ServiceRetrievalException;
-import org.jboss.forge.common.ejb3.ProjectPagesService;
-import org.jboss.forge.common.ejb3.LabsServices;
-
-import java.util.Map;
-import java.util.HashMap;
-
-/**
- * @author <a href="mailto:adamw at aster.pl">Adam Warski</a>
- */
-public class BlogCF extends AbstractProjectPortletDelegateCF {
- public String getPortletName() {
- return "blog";
- }
-
- public void fillParams(ControllerContext controllerContext, ServerInvocation invocation, PathParser parser, Map<String, Object> params) {
- String current = parser.getCurrent();
- if (current != null) {
- params.put("post", parser.getCurrent());
- }
-
- params.put("windowstate", "maximized");
- params.put(PortletRequestDecoder.META_PARAMETER, Integer
- .toHexString((PortletRequestDecoder.RENDER_MASK | PortletRequestDecoder.WINDOW_STATE_MASK)));
- }
-
- /**
- * Portal id of the labs portal.
- */
- private PortalObjectId defaultProjectPagePath = PortalObjectId.parse(
- "/" + Constants.LABS_PORTAL + "/" + "default",
- PortalObjectPath.CANONICAL_FORMAT);
-
- public ControllerCommand doMapping(ControllerContext controllerContext, ServerInvocation invocation, String host,
- String contextPath, PathParser parser, Page page) {
- String projectId = page.getDeclaredProperty(Constants.PORTAL_OBJECT_LABS_MARKER);
-
- if (projectId == null) {
- // If the page from which the request came isn't a project page, trying to
- // display the blog on the default page.
- page = (Page) getContainer().getObject(defaultProjectPagePath);
- }
-
- ProjectPagesService pps;
-
- try {
- pps = LabsServices.getProjectPagesService();
- } catch (ServiceRetrievalException e) {
- return null;
- }
-
- String pageName = null;
- if (!page.getName().equals(projectId)) {
- pageName = page.getName();
- }
-
- // First trying a window with a possible unique-id
- Window portletWindow = page.getWindow(pps.createWindowId(getPortletName(), projectId, pageName,
- parser.getFirstToken()));
- if (portletWindow == null) {
- // Trying if there is no single downloads window.
- portletWindow = page.getWindow(pps.createWindowId(getPortletName(), projectId, pageName, null));
- } else {
- // Forgetting the unique-id.
- parser.proceed();
- }
-
- // Checking if a downloads window was found on the page.
- if (portletWindow == null) {
- return null;
- }
-
- Map<String, Object> params = new HashMap<String, Object>();
- fillParams(controllerContext, invocation, parser, params);
-
- if (!params.containsKey(PortletRequestDecoder.META_PARAMETER)) {
- params.put(PortletRequestDecoder.META_PARAMETER, Integer
- .toHexString(PortletRequestDecoder.RENDER_MASK));
- }
-
- return getPortalObjectCF().doMapping(controllerContext, invocation, portletWindow,
- params, false);
- }
-}
Modified: labs/jbosslabs/qa/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/delegating/page/WikiCF.java
===================================================================
--- labs/jbosslabs/qa/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/delegating/page/WikiCF.java 2008-04-07 15:23:33 UTC (rev 19455)
+++ labs/jbosslabs/qa/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/delegating/page/WikiCF.java 2008-04-07 15:31:35 UTC (rev 19456)
@@ -87,8 +87,7 @@
page += "/" + firstToken;
}
} else {
- sendRedirect(invocation, "/wiki-files/" + current);
- return null;
+ return sendRedirect(invocation, "/wiki-files/" + current);
}
parser.proceed();
Deleted: labs/jbosslabs/qa/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/url/BlogUrlFactory.java
===================================================================
--- labs/jbosslabs/qa/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/url/BlogUrlFactory.java 2008-04-07 15:23:33 UTC (rev 19455)
+++ labs/jbosslabs/qa/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/url/BlogUrlFactory.java 2008-04-07 15:31:35 UTC (rev 19456)
@@ -1,91 +0,0 @@
-package org.jboss.labs.mapper.url;
-
-import org.jboss.portal.server.ServerURL;
-import org.jboss.portal.server.ServerInvocation;
-import org.jboss.portal.portlet.PortletParametersStateString;
-import org.jboss.portal.portlet.StateString;
-import org.jboss.portal.core.controller.ControllerCommand;
-import org.jboss.portal.core.controller.ControllerContext;
-import org.jboss.portal.core.model.portal.command.action.InvokeWindowCommand;
-import org.jboss.portal.core.model.portal.command.action.InvokePortletWindowActionCommand;
-import org.jboss.portal.core.model.portal.command.action.InvokePortletWindowRenderCommand;
-import org.jboss.portal.core.model.portal.command.PortalObjectCommand;
-import org.jboss.portal.core.model.portal.PortalObjectId;
-import org.jboss.portal.core.model.portal.PortalObject;
-import org.jboss.forge.common.Constants;
-
-/**
- * @author <a href="mailto:adamw at aster.pl">Adam Warski</a>
- */
-public class BlogUrlFactory extends AbstractLabsProjectPortletUrlFactory {
- public void buildPathFromPortletParameters(StringBuffer sb, PortletParametersStateString ppss) {
- if (ppss.getValue("post") != null) {
- addTokenToPath(sb, ppss.getValue("post").toLowerCase());
- }
- }
-
- public void finishUrl(ServerURL url) {
- url.getParameterMap().remove("post");
- }
-
- public ServerURL doMapping(ControllerContext context, ServerInvocation invocation, ControllerCommand cmd) {
- if (cmd == null) {
- throw new IllegalArgumentException("No null command accepted");
- }
-
- if (cmd instanceof InvokeWindowCommand) {
- PortalObjectCommand poc = (PortalObjectCommand) cmd;
- PortalObjectId targetId = poc.getTargetId();
-
- if (targetId.getPath().getLength() <= 0) {
- return null;
- }
-
- if (targetId.getPath().getName(targetId.getPath().getLength() - 1).toLowerCase().contains(getPath())) {
- PortalObject po = getContainer().getObject(targetId);
- StringBuffer sb = new StringBuffer();
-
- if (po.getDeclaredProperty(Constants.PORTAL_OBJECT_LABS_MARKER) != null) {
- addToPath(sb, targetId, false);
- }
-
- addTokenToPath(sb, getPath());
-
- InvokePortletWindowActionCommand actionCmd = null;
- InvokePortletWindowRenderCommand renderCmd = null;
-
- StateString navigationalState = null;
-
- if (poc instanceof InvokePortletWindowActionCommand) {
- actionCmd = (InvokePortletWindowActionCommand) poc;
- navigationalState = actionCmd.getNavigationalState();
- } else if (poc instanceof InvokePortletWindowRenderCommand) {
- renderCmd = (InvokePortletWindowRenderCommand) poc;
- navigationalState = renderCmd.getNavigationalState();
- }
-
- String uniqueId = po.getDeclaredProperty(
- Constants.PORTAL_OBJECT_UNIQUE_ID_MARKER);
- if (uniqueId != null) {
- addTokenToPath(sb, uniqueId);
- }
-
- if (navigationalState instanceof PortletParametersStateString) {
- PortletParametersStateString ppss =
- (PortletParametersStateString) navigationalState;
-
- buildPathFromPortletParameters(sb, ppss);
- }
-
- ServerURL url = convertToURL(sb);
- encodeUrl(actionCmd, renderCmd, url, navigationalState);
-
- finishUrl(url);
-
- return url;
- }
- }
-
- return null;
- }
-}
Modified: labs/jbosslabs/qa/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/SSLProcessor.java
===================================================================
--- labs/jbosslabs/qa/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/SSLProcessor.java 2008-04-07 15:23:33 UTC (rev 19455)
+++ labs/jbosslabs/qa/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/SSLProcessor.java 2008-04-07 15:31:35 UTC (rev 19456)
@@ -61,7 +61,7 @@
if(httpRequest.isSecure())
{
//check to see if a switch from ssl-mode to non-ssl-mode is needed
- if(this.isSwitchFromSSLNeeded(requestURL))
+ if(this.isSwitchFromSSLNeeded(httpRequest))
{
Integer plainPort = (Integer)httpRequest.getSession().getAttribute("http");
if(plainPort!=null)
@@ -73,6 +73,10 @@
//perform the switch from ssl to regular mode
String url = plainURL + relativeURL;
+ if (url.indexOf("/authsec") != -1) {
+ url = url.replaceFirst("/authsec", "");
+ }
+
httpResponse.setContentType("text/html");
httpResponse.sendRedirect(url);
return;
@@ -93,6 +97,8 @@
//perform the switch from regular to ssl-mode
String url = sslURL + "/" + relativeURL;
+
+
httpResponse.setContentType("text/html");
httpResponse.sendRedirect(url);
return;
@@ -108,14 +114,14 @@
{
}
- private boolean isSwitchFromSSLNeeded(String requestURL)
+ private boolean isSwitchFromSSLNeeded(HttpServletRequest httpRequest)
{
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 &&
+ /*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
@@ -123,7 +129,9 @@
{
switchNeeded = true;
}
- return switchNeeded;
+ return switchNeeded;*/
+
+ return httpRequest.getUserPrincipal() != null;
}
private boolean isSwitchToSSLNeeded(String requestURL)
Modified: labs/jbosslabs/qa/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/WikiRedirectFilter.java
===================================================================
--- labs/jbosslabs/qa/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/WikiRedirectFilter.java 2008-04-07 15:23:33 UTC (rev 19455)
+++ labs/jbosslabs/qa/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/WikiRedirectFilter.java 2008-04-07 15:31:35 UTC (rev 19456)
@@ -55,8 +55,6 @@
.sendRedirect((htReq.isSecure() ? "https" : "http")
+ "://"
+ wikiDomain[0]
- + (htReq.getLocalPort() == 80 ? "" : ":"
- + htReq.getLocalPort())
+ "/wiki");
return;
}
@@ -71,8 +69,6 @@
.sendRedirect((htReq.isSecure() ? "https" : "http")
+ "://"
+ jbossOrgDomain
- + (htReq.getLocalPort() == 80 ? "" : ":"
- + htReq.getLocalPort())
+ htReq.getRequestURI());
return;
}
Modified: labs/jbosslabs/qa/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileAttachmentDataSource.java
===================================================================
--- labs/jbosslabs/qa/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileAttachmentDataSource.java 2008-04-07 15:23:33 UTC (rev 19455)
+++ labs/jbosslabs/qa/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileAttachmentDataSource.java 2008-04-07 15:31:35 UTC (rev 19456)
@@ -35,24 +35,24 @@
import org.apache.log4j.Logger;
import org.jboss.wiki.configuration.ConfigurationParser;
-public class FileAttachmentDataSource implements AttachmentDataSource{
+public class FileAttachmentDataSource implements AttachmentDataSource {
private final static String OTHER_LANG_DIR = "LANG/";
-
+
private String pathToAttachments;
-
+
private String pathToAttTrash;
-
+
private final int BUF_SIZE = 32768;
-
+
private Logger log = Logger.getLogger(this.getClass());
-
+
private String langCode;
-
+
public FileAttachmentDataSource() {
init("");
}
-
+
private void init(String prefix) {
log = Logger.getLogger(FileMediaDataSource.class);
@@ -66,7 +66,8 @@
.getResourceAsStream(FileMediaDataSource.propFileName));
} catch (IOException ioe) {
- log.error("Can't load the file " + FileMediaDataSource.propFileName + "\n", ioe);
+ log.error("Can't load the file " + FileMediaDataSource.propFileName
+ + "\n", ioe);
}
loadProperties(fileDSProps, prefix);
@@ -78,7 +79,8 @@
// create trash directory for deleted attachments if it doesn't exists
- pathToAttTrash = pathToAttachments + "/" + AttachmentDataSource.attTrashName;
+ pathToAttTrash = pathToAttachments + "/"
+ + AttachmentDataSource.attTrashName;
File pathToAttachmentsFile = new File(pathToAttTrash);
@@ -87,15 +89,15 @@
}
}
-
+
private void loadProperties(Properties fileDSProps, String prefix) {
if (fileDSProps.getProperty("pathToMedia") != null) {
pathToAttachments = fileDSProps.getProperty("pathToAttachements")
+ (prefix.length() > 0 ? "/" + OTHER_LANG_DIR + prefix : "");
log.info("Path to attachements is: " + pathToAttachments);
-
+
File attDir = new File(pathToAttachments);
-
+
if (!attDir.exists()) {
attDir.mkdirs();
log.info("Dir for attachments created");
@@ -106,7 +108,7 @@
+ FileMediaDataSource.propFileName);
}
}
-
+
public WikiAttachment getAttachment(String pageName, String attachementName) {
return getAttachment(pageName, attachementName,
getLastAttachmentVersion(pageName, attachementName));
@@ -137,7 +139,7 @@
+ ((attachementName.indexOf(".") != -1) ? tokens[tokens.length - 1]
: "bin"));
- FileInputStream fis;
+ FileInputStream fis = null;
try {
fis = new FileInputStream(file);
return new WikiAttachment(attachementName, new Date(file
@@ -146,7 +148,6 @@
e.printStackTrace();
return null;
}
-
}
public int getLastAttachmentVersion(String pageName, String attachementName) {
@@ -189,7 +190,7 @@
if (langCode == null)
langCode = ConfigurationParser.getDefaultLangugeCode();
}
-
+
public synchronized boolean deleteAttachment(String pageName,
String attachmentName) {
@@ -279,9 +280,9 @@
}
public void addLangCode(String langCode, String langDesc) {
-
+
}
-
+
public void addAttachment(InputStream attFile, String attName, String uid,
String user) {
String pageName = uid;
@@ -366,13 +367,13 @@
return attSet;
}
-
+
public void setLanguageCode(String langCode) {
init(langCode);
this.langCode = langCode;
}
-
+
private Properties getAttProps(String pageName, String attName,
boolean createProps) {
Properties attProps = new Properties();
@@ -393,8 +394,10 @@
propFile = new File(pathToAttachments + "/" + pageName + "-att/"
+ attName + "-dir/attachment.properties");
+ FileInputStream fis = null;
try {
- attProps.load(new FileInputStream(propFile));
+ fis = new FileInputStream(propFile);
+ attProps.load(fis);
} catch (IOException ioe) {
System.err
.println("Cannot read attachment.properties for attachement: "
@@ -403,16 +406,28 @@
+ pageName
+ "-att/"
+ attName + "-dir/attachment.properties\n" + ioe);
+ } finally {
+ try {
+ if (fis != null) {
+ fis.close();
+ }
+ } catch (IOException e) {
+ log.error(e);
+ }
}
return attProps;
}
-
+
private void saveAttProps(Properties props, String pageName, String attName) {
+ FileOutputStream fos = null;
+
try {
- props.store(new FileOutputStream(new File(pathToAttachments + "/"
+ fos = new FileOutputStream(new File(pathToAttachments + "/"
+ pageName + "-att/" + attName
- + "-dir/attachment.properties")), FileMediaDataSource.SAVE_COMMENT);
+ + "-dir/attachment.properties"));
+ props.store(fos,
+ FileMediaDataSource.SAVE_COMMENT);
} catch (Exception ioe) {
System.err
.println("Cannot store attchement.properties for attachement: "
@@ -421,7 +436,16 @@
+ pageName
+ "-att/"
+ attName + "-dir/attachments.properties\n" + ioe);
+ } finally {
+ try {
+ if (fos != null) {
+ fos.close();
+ }
+ } catch (IOException e) {
+ log.error(e);
+ }
}
+
}
}
Modified: labs/jbosslabs/qa/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileMediaDataSource.java
===================================================================
--- labs/jbosslabs/qa/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileMediaDataSource.java 2008-04-07 15:23:33 UTC (rev 19455)
+++ labs/jbosslabs/qa/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileMediaDataSource.java 2008-04-07 15:31:35 UTC (rev 19456)
@@ -206,8 +206,8 @@
File pageOldFile = new File(pathToMedia + "/" + uidTranslated
+ ".txt");
- PrintWriter pageFileWriter;
- InputStreamReader pageFileReader;
+ PrintWriter pageFileWriter = null;
+ InputStreamReader pageFileReader = null;
try {
pageFileWriter = new PrintWriter(pageFile, CHARSET);
@@ -241,10 +241,26 @@
throw new WikiSaveException(fnfe);
} catch (IOException ioe) {
throw new WikiSaveException(ioe);
+ } finally {
+ if (pageFileWriter != null) {
+ pageFileWriter.close();
+ }
+
+ try {
+ if (pageFileReader != null) {
+ pageFileReader.close();
+ }
+ } catch (IOException e) {
+ throw new WikiSaveException(e);
+ }
}
} else { // there is no page on disk. We have to create new one.
+ FileOutputStream pageProps = null;
+
+ PrintWriter pageWriter = null;
+
try {
// create needed dirs
@@ -256,7 +272,7 @@
newPageFile = new File(pathToMedia + "/OLD/" + uidTranslated
+ "/page.properties");
- FileOutputStream pageProps = new FileOutputStream(newPageFile);
+ pageProps = new FileOutputStream(newPageFile);
Properties properties = new Properties();
properties.setProperty(page.getLastVersion() + ".author", page
@@ -264,8 +280,6 @@
properties.store(pageProps, SAVE_COMMENT);
- pageProps.close();
-
String pageDirName = pathToMedia;
String[] pageNames = uidTranslated.split("/");
@@ -277,8 +291,8 @@
pageDir.mkdirs();
- PrintWriter pageWriter = new PrintWriter(new File(pathToMedia
- + "/" + uidTranslated + ".txt"), CHARSET);
+ pageWriter = new PrintWriter(new File(pathToMedia + "/"
+ + uidTranslated + ".txt"), CHARSET);
String pageContent = page.getContent();
@@ -293,6 +307,19 @@
} catch (Exception e) {
throw new WikiSaveException(e);
+ } finally {
+
+ try {
+ if (pageProps != null) {
+ pageProps.close();
+ }
+ } catch (IOException e) {
+ throw new WikiSaveException(e);
+ } finally {
+ if (pageWriter != null) {
+ pageWriter.close();
+ }
+ }
}
}
@@ -310,11 +337,12 @@
Properties pageProps = new Properties();
String translatedPageName = FileDSCommons.translateToFileName(pageName);
+ FileInputStream fpi = null;
+
try {
- FileInputStream fpi = new FileInputStream(new File(pathToMedia
- + "/OLD/" + translatedPageName + "/page.properties"));
+ fpi = new FileInputStream(new File(pathToMedia + "/OLD/"
+ + translatedPageName + "/page.properties"));
pageProps.load(fpi);
- fpi.close();
} catch (IOException ioe) {
// There is no prop file for some reson - create one.
@@ -328,25 +356,45 @@
pagePropsFile = new File(pathToMedia + "/OLD/" + translatedPageName
+ "/page.properties");
+ FileOutputStream fpo = null;
+
try {
pagePropsFile.createNewFile();
if (pageExists(pageName)) {
// if page exists it looks like there is lack of the props
// structure
- FileOutputStream fpo = new FileOutputStream(pagePropsFile);
+ fpo = new FileOutputStream(pagePropsFile);
pageProps.setProperty("1.author", "unknown");
pageProps.store(fpo, SAVE_COMMENT);
- fpo.close();
+
}
} catch (IOException e) {
log.error(
"Cannot create page props file for page: " + pageName,
e);
+ } finally {
+ try {
+ if (fpo != null) {
+ fpo.close();
+ }
+ } catch (IOException e) {
+ log.error(e);
+ }
}
+
return pageProps;
+ } finally {
+
+ try {
+ if (fpi != null) {
+ fpi.close();
+ }
+ } catch (IOException e) {
+ log.error(e);
+ }
}
return pageProps;
@@ -383,12 +431,15 @@
} catch (FileNotFoundException e) {
throw new DataSourceException(e);
} catch (IOException e) {
+ throw new DataSourceException(e);
+ } finally {
try {
- fos.close();
+ if (fos != null) {
+ fos.close();
+ }
} catch (IOException e1) {
- throw new DataSourceException(e);
+ throw new DataSourceException(e1);
}
- throw new DataSourceException(e);
}
}
@@ -464,8 +515,10 @@
StringBuilder pageContent = new StringBuilder();
+ InputStreamReader input = null;
+
try {
- InputStreamReader input = new InputStreamReader(
+ input = new InputStreamReader(
new FileInputStream(pageFile), CHARSET);
// FileInputStream input = new FileInputStream(pageFile);
@@ -477,6 +530,14 @@
}
} catch (IOException ioe) {
log.error(ioe);
+ } finally {
+ try {
+ if (input != null) {
+ input.close();
+ }
+ } catch (IOException e) {
+ log.error(e);
+ }
}
Set<String> viewRoles = null;
@@ -576,10 +637,12 @@
+ ".txt");
if (loadContent) {
+ InputStreamReader input = null;
+
try {
- InputStreamReader input = new InputStreamReader(
- new FileInputStream(pageFile), CHARSET);
+ input = new InputStreamReader(new FileInputStream(pageFile),
+ CHARSET);
int nextChr = input.read();
@@ -595,6 +658,14 @@
} catch (IOException ioe) {
log.error(ioe);
+ } finally {
+ try {
+ if (input != null) {
+ input.close();
+ }
+ } catch (IOException e) {
+ log.error(e);
+ }
}
} else {
page.setLength(pageFile.length());
@@ -887,22 +958,20 @@
try {
fis = new FileInputStream(propsFile);
- } catch (FileNotFoundException e1) {
- log.error(e1);
- }
- try {
props.load(fis);
- } catch (IOException e) {
- log.error(e);
+ } catch (IOException e1) {
+ log.error(e1);
+ } finally {
+ try {
+ if (fis != null) {
+ fis.close();
+ }
+ } catch (IOException e) {
+ log.error(e);
+ }
}
- try {
- fis.close();
- } catch (IOException e) {
- log.error(e);
- }
-
return props;
}
@@ -917,21 +986,19 @@
try {
fos = new FileOutputStream(propsFile);
- } catch (FileNotFoundException e) {
- log.error(e);
- }
- try {
props.store(fos, SAVE_COMMENT);
} catch (IOException e) {
log.error(e);
+ } finally {
+ try {
+ if (fos != null) {
+ fos.close();
+ }
+ } catch (IOException e) {
+ log.error(e);
+ }
}
-
- try {
- fos.close();
- } catch (IOException e) {
- log.error(e);
- }
}
public void setLanguageCode(String langCode) {
@@ -945,9 +1012,12 @@
Map<String, String> map = new TreeMap<String, String>();
- map.put(ConfigurationParser.getDefaultLangugeCode(), wikiEngine.getAllLanguageCodes()
- .get(ConfigurationParser.getDefaultLangugeCode()));
+ map.put(ConfigurationParser.getDefaultLangugeCode(), wikiEngine
+ .getAllLanguageCodes().get(
+ ConfigurationParser.getDefaultLangugeCode()));
+ FileInputStream fis = null;
+
try {
File f = new File(pathToMedia + "/" + LANG_FILE);
@@ -955,7 +1025,7 @@
f.createNewFile();
}
- FileInputStream fis = new FileInputStream(f);
+ fis = new FileInputStream(f);
props.load(fis);
@@ -964,6 +1034,14 @@
map.putAll((Map<String, String>) mapd);
} catch (IOException e) {
log.error("Couldn't load properties with language list", e);
+ } finally {
+ if (fis != null) {
+ try {
+ fis.close();
+ } catch (IOException e) {
+ log.error(e);
+ }
+ }
}
return map;
@@ -976,14 +1054,24 @@
props.put(langCode, langDesc);
+ FileOutputStream fos = null;
+
try {
File f = new File(pathToMedia + "/" + LANG_FILE);
- FileOutputStream fos = new FileOutputStream(f);
+ fos = new FileOutputStream(f);
props.store(fos, SAVE_COMMENT);
} catch (IOException e) {
log.error("Couldn't save properties with language list", e);
+ } finally {
+ if (fos != null) {
+ try {
+ fos.close();
+ } catch (IOException e) {
+ log.error(e);
+ }
+ }
}
}
More information about the jboss-svn-commits
mailing list