[jboss-svn-commits] JBL Code SVN: r19923 - in labs/jbosslabs/qa/portal-extensions: forge-mapper/src/java/org/jboss/labs/mapper/url and 8 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sat May 10 08:23:27 EDT 2008
Author: szimano
Date: 2008-05-10 08:23:27 -0400 (Sat, 10 May 2008)
New Revision: 19923
Added:
labs/jbosslabs/qa/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/CharacterEncodingFilter.java
Removed:
labs/jbosslabs/qa/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/WrongLoginServlet.java
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/forge-mapper/src/java/org/jboss/labs/mapper/url/WikiUrlFactory.java
labs/jbosslabs/qa/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/AutologinFilter.java
labs/jbosslabs/qa/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/login/LabsFormAuthenticator.java
labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/portlet/WikiPortletMyFaces.java
labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_attach.xhtml
labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_diff.xhtml
labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_edit.xhtml
labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_history.xhtml
labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_preferences.xhtml
labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_view.xhtml
labs/jbosslabs/qa/portal-extensions/jbosswiki/wiki-common/src/etc/WikiTypes.xml
labs/jbosslabs/qa/portal-extensions/jbosswiki/wiki-common/src/java/com/ecyrd/jspwiki/plugin/RecentChangesPlugin.java
labs/jbosslabs/qa/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiInsidePlugin.java
labs/jbosslabs/qa/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/HTMLTranslatorNoPlugins.java
labs/jbosslabs/qa/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/HTMLTranslatorParts.java
Log:
svn merge -r 19711:19922 https://svn.labs.jboss.org/labs/jbosslabs/trunk/portal-extensions .
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-05-10 12:16:25 UTC (rev 19922)
+++ labs/jbosslabs/qa/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml 2008-05-10 12:23:27 UTC (rev 19923)
@@ -1,65 +1,71 @@
<?xml version="1.0"?>
<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ JBoss, a division of Red Hat ~
- ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
- ~ contributors as indicated by the @authors tag. See the ~
- ~ copyright.txt in the distribution for a full listing of ~
- ~ individual contributors. ~
- ~ ~
- ~ This is free software; you can redistribute it and/or modify it ~
- ~ under the terms of the GNU Lesser General Public License as ~
- ~ published by the Free Software Foundation; either version 2.1 of ~
- ~ the License, or (at your option) any later version. ~
- ~ ~
- ~ This software is distributed in the hope that it will be useful, ~
- ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~
- ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~
- ~ Lesser General Public License for more details. ~
- ~ ~
- ~ You should have received a copy of the GNU Lesser General Public ~
- ~ License along with this software; if not, write to the Free ~
- ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
- ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
+ ~ contributors as indicated by the @authors tag. See the ~
+ ~ copyright.txt in the distribution for a full listing of ~
+ ~ individual contributors. ~
+ ~ ~
+ ~ This is free software; you can redistribute it and/or modify it ~
+ ~ under the terms of the GNU Lesser General Public License as ~
+ ~ published by the Free Software Foundation; either version 2.1 of ~
+ ~ the License, or (at your option) any later version. ~
+ ~ ~
+ ~ This software is distributed in the hope that it will be useful, ~
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~
+ ~ Lesser General Public License for more details. ~
+ ~ ~
+ ~ You should have received a copy of the GNU Lesser General Public ~
+ ~ License along with this software; if not, write to the Free ~
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
<!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>
- <description>JBoss Portal</description>
- <!-- Comment/Uncomment to enable portal session replication
- <distributable/>
- -->
+ <description>JBoss Portal</description>
+ <!-- Comment/Uncomment to enable portal session replication
+ <distributable/>
+ -->
- <!-- LABS FILTERS -->
+ <!-- LABS FILTERS -->
- <servlet>
- <servlet-name>wrongLoginServlet</servlet-name>
- <servlet-class>org.jboss.forge.portal.WrongLoginServlet</servlet-class>
- <init-param>
- <param-name>LOGIN_FAILED</param-name>
- <param-value>/loginPage/LoginWindow?action=2&loginFailed=loginFailed</param-value>
- <description>Page with information that the login was failed</description>
- </init-param>
- </servlet>
+ <!-- servlet>
+ <servlet-name>wrongLoginServlet</servlet-name>
+ <servlet-class>org.jboss.forge.portal.WrongLoginServlet</servlet-class>
+ <init-param>
+ <param-name>LOGIN_FAILED</param-name>
+ <param-value>/loginPage/LoginWindow?action=2&loginFailed=loginFailed</param-value>
+ <description>Page with information that the login was failed</description>
+ </init-param>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>wrongLoginServlet</servlet-name>
+ <url-pattern>/loginFailed</url-pattern>
+ </servlet-mapping -->
- <servlet-mapping>
- <servlet-name>wrongLoginServlet</servlet-name>
- <url-pattern>/loginFailed</url-pattern>
- </servlet-mapping>
-
<servlet>
<servlet-name>ShowLoginPage</servlet-name>
- <servlet-class>org.jboss.forge.portal.ShowLoginPageServlet</servlet-class>
+ <servlet-class>
+ org.jboss.forge.portal.ShowLoginPageServlet
+ </servlet-class>
<init-param>
<param-name>LOGIN_PAGE</param-name>
<param-value>/loginPage</param-value>
- <description>Login page that will get forwarded (dispatched) to</description>
+ <description>
+ Login page that will get forwarded (dispatched) to
+ </description>
</init-param>
<init-param>
<param-name>LOGOUT_PAGE</param-name>
<param-value>/</param-value>
- <description>Logout page that will get forwarded to</description>
+ <description>
+ Logout page that will get forwarded to
+ </description>
</init-param>
</servlet>
@@ -73,6 +79,7 @@
<url-pattern>/logout</url-pattern>
</servlet-mapping>
+<<<<<<< .working
<filter>
<filter-name>wikiRedirect</filter-name>
<filter-class>org.jboss.forge.portal.WikiRedirectFilter</filter-class>
@@ -92,13 +99,23 @@
<description>Wiki context</description>
</init-param>
</filter>
+ <filter>
+ <filter-name>Character Encoding Filter</filter-name>
+ <filter-class>
+ org.jboss.forge.portal.CharacterEncodingFilter
+ </filter-class>
+ <init-param>
+ <param-name>encoding</param-name>
+ <param-value>UTF-8</param-value>
+ </init-param>
+ </filter>
- <filter-mapping>
- <filter-name>wikiRedirect</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
+ <filter-mapping>
+ <filter-name>Character Encoding Filter</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
- <!--filter>
+ <filter>
<filter-name>wikiComRedirect</filter-name>
<filter-class>org.jboss.forge.portal.WikiComRedirectFilter</filter-class>
<init-param>
@@ -112,316 +129,350 @@
<description>Wiki context</description>
</init-param>
</filter>
+ <filter>
+ <filter-name>redirectFilter</filter-name>
+ <filter-class>
+ org.jboss.forge.redirect.RootRedirectFilter
+ </filter-class>
+ </filter>
+ <filter-mapping>
+ <filter-name>redirectFilter</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
- <filter-mapping>
- <filter-name>wikiComRedirect</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
- -->
- <filter>
- <filter-name>redirectFilter</filter-name>
- <filter-class>org.jboss.forge.redirect.RootRedirectFilter</filter-class>
- </filter>
+ <filter>
+ <filter-name>titleAndTimestampFilter</filter-name>
+ <filter-class>
+ org.jboss.forge.portal.TitleChangeFilter
+ </filter-class>
+ </filter>
- <filter-mapping>
- <filter-name>redirectFilter</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
+ <filter-mapping>
+ <filter-name>titleAndTimestampFilter</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
- <filter>
- <filter-name>titleAndTimestampFilter</filter-name>
- <filter-class>org.jboss.forge.portal.TitleChangeFilter</filter-class>
- </filter>
+ <filter>
+ <filter-name>injectLoginLinkFilter</filter-name>
+ <filter-class>
+ org.jboss.forge.portal.InjectLoginLinks
+ </filter-class>
+ </filter>
- <filter-mapping>
- <filter-name>titleAndTimestampFilter</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
+ <filter-mapping>
+ <filter-name>injectLoginLinkFilter</filter-name>
+ <!-- <url-pattern>/*</url-pattern> -->
+ <servlet-name>PortalServletWithPathMapping</servlet-name>
+ </filter-mapping>
- <filter>
- <filter-name>injectLoginLinkFilter</filter-name>
- <filter-class>org.jboss.forge.portal.InjectLoginLinks</filter-class>
- </filter>
+ <filter>
+ <filter-name>autologinFilter</filter-name>
+ <filter-class>
+ org.jboss.forge.portal.AutologinFilter
+ </filter-class>
+ </filter>
- <filter-mapping>
- <filter-name>injectLoginLinkFilter</filter-name>
- <!-- <url-pattern>/*</url-pattern> -->
- <servlet-name>PortalServletWithPathMapping</servlet-name>
- </filter-mapping>
+ <filter-mapping>
+ <filter-name>autologinFilter</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
- <filter>
- <filter-name>autologinFilter</filter-name>
- <filter-class>org.jboss.forge.portal.AutologinFilter</filter-class>
- </filter>
+ <filter>
+ <filter-name>moveMeta</filter-name>
+ <filter-class>
+ org.jboss.forge.portal.MetaMoveFilter
+ </filter-class>
+ </filter>
- <filter-mapping>
- <filter-name>autologinFilter</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
+ <filter-mapping>
+ <filter-name>moveMeta</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
- <filter>
- <filter-name>moveMeta</filter-name>
- <filter-class>org.jboss.forge.portal.MetaMoveFilter</filter-class>
- </filter>
+ <!-- SSL Processor -->
+ <filter>
+ <filter-name>SSLProcessor</filter-name>
+ <filter-class>org.jboss.forge.portal.SSLProcessor</filter-class>
+ </filter>
- <filter-mapping>
- <filter-name>moveMeta</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
-
- <!-- 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>PortalServletWithPathMapping</servlet-name>
+ </filter-mapping>
- <filter-mapping>
- <filter-name>SSLProcessor</filter-name>
- <servlet-name>PortalServletWithPathMapping</servlet-name>
- </filter-mapping>
+ <filter-mapping>
+ <filter-name>SSLProcessor</filter-name>
+ <servlet-name>
+ PortalServletWithDefaultServletMapping
+ </servlet-name>
+ </filter-mapping>
- <filter-mapping>
- <filter-name>SSLProcessor</filter-name>
- <servlet-name>PortalServletWithDefaultServletMapping</servlet-name>
- </filter-mapping>
+ <filter>
+ <filter-name>PrimaryNavigationFilter</filter-name>
+ <filter-class>
+ org.jboss.forge.portal.PrimaryNavigationFilter
+ </filter-class>
+ </filter>
- <filter>
- <filter-name>PrimaryNavigationFilter</filter-name>
- <filter-class>org.jboss.forge.portal.PrimaryNavigationFilter</filter-class>
- </filter>
+ <filter-mapping>
+ <filter-name>PrimaryNavigationFilter</filter-name>
+ <servlet-name>PortalServletWithPathMapping</servlet-name>
+ </filter-mapping>
- <filter-mapping>
- <filter-name>PrimaryNavigationFilter</filter-name>
- <servlet-name>PortalServletWithPathMapping</servlet-name>
- </filter-mapping>
+ <filter-mapping>
+ <filter-name>PrimaryNavigationFilter</filter-name>
+ <servlet-name>
+ PortalServletWithDefaultServletMapping
+ </servlet-name>
+ </filter-mapping>
- <filter-mapping>
- <filter-name>PrimaryNavigationFilter</filter-name>
- <servlet-name>PortalServletWithDefaultServletMapping</servlet-name>
- </filter-mapping>
+ <filter>
+ <filter-name>downloadingFilter</filter-name>
+ <filter-class>
+ org.jboss.forge.portal.DownloadingFilter
+ </filter-class>
+ </filter>
- <filter>
- <filter-name>downloadingFilter</filter-name>
- <filter-class>org.jboss.forge.portal.DownloadingFilter</filter-class>
- </filter>
+ <filter-mapping>
+ <filter-name>downloadingFilter</filter-name>
+ <url-pattern>/downloading/*</url-pattern>
+ </filter-mapping>
- <filter-mapping>
- <filter-name>downloadingFilter</filter-name>
- <url-pattern>/downloading/*</url-pattern>
- </filter-mapping>
+ <filter>
+ <filter-name>downloadsFilter</filter-name>
+ <filter-class>
+ org.jboss.forge.portal.DownloadsFilter
+ </filter-class>
+ </filter>
- <filter>
- <filter-name>downloadsFilter</filter-name>
- <filter-class>org.jboss.forge.portal.DownloadsFilter</filter-class>
- </filter>
+ <filter-mapping>
+ <filter-name>downloadsFilter</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
- <filter-mapping>
- <filter-name>downloadsFilter</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
-
- <filter>
- <filter-name>methodFilter</filter-name>
- <filter-class>org.jboss.forge.portal.MethodFilter</filter-class>
- </filter>
+ <filter>
+ <filter-name>methodFilter</filter-name>
+ <filter-class>org.jboss.forge.portal.MethodFilter</filter-class>
+ </filter>
- <filter-mapping>
- <filter-name>methodFilter</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
+ <filter-mapping>
+ <filter-name>methodFilter</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
- <!-- END OF LABS FILTERS -->
+ <!-- END OF LABS FILTERS -->
- <!-- Bridge portal user events -->
- <listener>
- <listener-class>org.jboss.portal.core.impl.api.event.ServletEventBridge</listener-class>
- </listener>
+ <!-- Bridge portal user events -->
+ <listener>
+ <listener-class>
+ org.jboss.portal.core.impl.api.event.ServletEventBridge
+ </listener-class>
+ </listener>
- <!-- The portal servlet is the main entrance point -->
- <servlet>
- <servlet-name>PortalServletWithPathMapping</servlet-name>
- <servlet-class>org.jboss.portal.server.servlet.PortalServlet</servlet-class>
- <init-param>
- <param-name>asDefaultServlet</param-name>
- <param-value>false</param-value>
- <description>The servlet needs to know wether it is set as a default servlet or not</description>
- </init-param>
- <init-param>
- <param-name>controllerFactoryName</param-name>
- <param-value>portal:service=ControllerFactory</param-value>
- <description>The request controller factory for the portal servlet</description>
- </init-param>
- <load-on-startup>0</load-on-startup>
- <security-role-ref>
- <role-name>Authenticated</role-name>
- <role-link>Authenticated</role-link>
- </security-role-ref>
- </servlet>
+ <!-- The portal servlet is the main entrance point -->
+ <servlet>
+ <servlet-name>PortalServletWithPathMapping</servlet-name>
+ <servlet-class>
+ org.jboss.portal.server.servlet.PortalServlet
+ </servlet-class>
+ <init-param>
+ <param-name>asDefaultServlet</param-name>
+ <param-value>false</param-value>
+ <description>
+ The servlet needs to know wether it is set as a default
+ servlet or not
+ </description>
+ </init-param>
+ <init-param>
+ <param-name>controllerFactoryName</param-name>
+ <param-value>portal:service=ControllerFactory</param-value>
+ <description>
+ The request controller factory for the portal servlet
+ </description>
+ </init-param>
+ <load-on-startup>0</load-on-startup>
+ <security-role-ref>
+ <role-name>Authenticated</role-name>
+ <role-link>Authenticated</role-link>
+ </security-role-ref>
+ </servlet>
- <!-- The portal servlet is the main entrance point -->
- <servlet>
- <servlet-name>PortalServletWithDefaultServletMapping</servlet-name>
- <servlet-class>org.jboss.portal.server.servlet.PortalServlet</servlet-class>
- <init-param>
- <param-name>asDefaultServlet</param-name>
- <param-value>true</param-value>
- <description>The servlet needs to know wether it is set as a default servlet or not</description>
- </init-param>
- <init-param>
- <param-name>controllerFactoryName</param-name>
- <param-value>portal:service=ControllerFactory</param-value>
- <description>The request controller factory for the portal servlet</description>
- </init-param>
- <load-on-startup>0</load-on-startup>
- <security-role-ref>
- <role-name>Authenticated</role-name>
- <role-link>Authenticated</role-link>
- </security-role-ref>
- </servlet>
+ <!-- The portal servlet is the main entrance point -->
+ <servlet>
+ <servlet-name>
+ PortalServletWithDefaultServletMapping
+ </servlet-name>
+ <servlet-class>
+ org.jboss.portal.server.servlet.PortalServlet
+ </servlet-class>
+ <init-param>
+ <param-name>asDefaultServlet</param-name>
+ <param-value>true</param-value>
+ <description>
+ The servlet needs to know wether it is set as a default
+ servlet or not
+ </description>
+ </init-param>
+ <init-param>
+ <param-name>controllerFactoryName</param-name>
+ <param-value>portal:service=ControllerFactory</param-value>
+ <description>
+ The request controller factory for the portal servlet
+ </description>
+ </init-param>
+ <load-on-startup>0</load-on-startup>
+ <security-role-ref>
+ <role-name>Authenticated</role-name>
+ <role-link>Authenticated</role-link>
+ </security-role-ref>
+ </servlet>
- <!-- Provide access to unauthenticated users -->
- <servlet-mapping>
- <servlet-name>PortalServletWithPathMapping</servlet-name>
- <url-pattern>/*</url-pattern>
- </servlet-mapping>
+ <!-- Provide access to unauthenticated users -->
+ <servlet-mapping>
+ <servlet-name>PortalServletWithPathMapping</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
- <!-- Provide secure access to unauthenticated users -->
- <servlet-mapping>
- <servlet-name>PortalServletWithPathMapping</servlet-name>
- <url-pattern>/sec/*</url-pattern>
- </servlet-mapping>
+ <!-- Provide secure access to unauthenticated users -->
+ <servlet-mapping>
+ <servlet-name>PortalServletWithPathMapping</servlet-name>
+ <url-pattern>/sec/*</url-pattern>
+ </servlet-mapping>
- <!-- Provide access to authenticated users -->
- <servlet-mapping>
- <servlet-name>PortalServletWithPathMapping</servlet-name>
- <url-pattern>/auth/*</url-pattern>
- </servlet-mapping>
+ <!-- Provide access to authenticated users -->
+ <servlet-mapping>
+ <servlet-name>PortalServletWithPathMapping</servlet-name>
+ <url-pattern>/auth/*</url-pattern>
+ </servlet-mapping>
- <!-- Provide secure access to authenticated users -->
- <servlet-mapping>
- <servlet-name>PortalServletWithPathMapping</servlet-name>
- <url-pattern>/authsec/*</url-pattern>
- </servlet-mapping>
+ <!-- Provide secure access to authenticated users -->
+ <servlet-mapping>
+ <servlet-name>PortalServletWithPathMapping</servlet-name>
+ <url-pattern>/authsec/*</url-pattern>
+ </servlet-mapping>
- <!-- Force the mapping of the jsp and images because of the default servlet replacement -->
- <servlet-mapping>
- <servlet-name>jsp</servlet-name>
- <url-pattern>/login.jsp</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>jsp</servlet-name>
- <url-pattern>/error.jsp</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>default</servlet-name>
- <url-pattern>/images/login_bottom.png</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>default</servlet-name>
- <url-pattern>/images/login_bottom_left.png</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>default</servlet-name>
- <url-pattern>/images/login_bottom_right.png</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>default</servlet-name>
- <url-pattern>/images/login_left.png</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>default</servlet-name>
- <url-pattern>/images/login_right.png</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>default</servlet-name>
- <url-pattern>/images/login_top.png</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>default</servlet-name>
- <url-pattern>/images/login_top_left.png</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>default</servlet-name>
- <url-pattern>/images/login_top_right.png</url-pattern>
- </servlet-mapping>
+ <!-- Force the mapping of the jsp and images because of the default servlet replacement -->
+ <servlet-mapping>
+ <servlet-name>jsp</servlet-name>
+ <url-pattern>/login.jsp</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>jsp</servlet-name>
+ <url-pattern>/error.jsp</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>default</servlet-name>
+ <url-pattern>/images/login_bottom.png</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>default</servlet-name>
+ <url-pattern>/images/login_bottom_left.png</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>default</servlet-name>
+ <url-pattern>/images/login_bottom_right.png</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>default</servlet-name>
+ <url-pattern>/images/login_left.png</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>default</servlet-name>
+ <url-pattern>/images/login_right.png</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>default</servlet-name>
+ <url-pattern>/images/login_top.png</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>default</servlet-name>
+ <url-pattern>/images/login_top_left.png</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>default</servlet-name>
+ <url-pattern>/images/login_top_right.png</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>15</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>15</session-timeout>
+ </session-config>
- <!--
- | JDBC usage must be done with
- | DataSource ds = (DataSource)ctx.lookup("java:comp/env/jdbc/PortalDS";
- -->
- <resource-ref>
- <res-ref-name>jdbc/PortalDS</res-ref-name>
- <res-type>javax.sql.DataSource</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
+ <!--
+ | JDBC usage must be done with
+ | DataSource ds = (DataSource)ctx.lookup("java:comp/env/jdbc/PortalDS";
+ -->
+ <resource-ref>
+ <res-ref-name>jdbc/PortalDS</res-ref-name>
+ <res-type>javax.sql.DataSource</res-type>
+ <res-auth>Container</res-auth>
+ <res-sharing-scope>Shareable</res-sharing-scope>
+ </resource-ref>
- <security-constraint>
- <web-resource-collection>
- <web-resource-name>Authenticated</web-resource-name>
- <description></description>
- <url-pattern>/auth/*</url-pattern>
- </web-resource-collection>
- <auth-constraint>
- <role-name>Authenticated</role-name>
- </auth-constraint>
- </security-constraint>
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>Authenticated</web-resource-name>
+ <description></description>
+ <url-pattern>/auth/*</url-pattern>
+ </web-resource-collection>
+ <auth-constraint>
+ <role-name>Authenticated</role-name>
+ </auth-constraint>
+ </security-constraint>
- <security-constraint>
- <web-resource-collection>
- <web-resource-name>Secure</web-resource-name>
- <url-pattern>/sec/*</url-pattern>
- </web-resource-collection>
- <user-data-constraint>
- <transport-guarantee>CONFIDENTIAL</transport-guarantee>
- </user-data-constraint>
- </security-constraint>
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>Secure</web-resource-name>
+ <url-pattern>/sec/*</url-pattern>
+ </web-resource-collection>
+ <user-data-constraint>
+ <transport-guarantee>CONFIDENTIAL</transport-guarantee>
+ </user-data-constraint>
+ </security-constraint>
- <security-constraint>
- <web-resource-collection>
- <web-resource-name>Secure+Authenticated</web-resource-name>
- <url-pattern>/authsec/*</url-pattern>
- </web-resource-collection>
- <auth-constraint>
- <role-name>Authenticated</role-name>
- </auth-constraint>
- <user-data-constraint>
- <transport-guarantee>CONFIDENTIAL</transport-guarantee>
- </user-data-constraint>
- </security-constraint>
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>Secure+Authenticated</web-resource-name>
+ <url-pattern>/authsec/*</url-pattern>
+ </web-resource-collection>
+ <auth-constraint>
+ <role-name>Authenticated</role-name>
+ </auth-constraint>
+ <user-data-constraint>
+ <transport-guarantee>CONFIDENTIAL</transport-guarantee>
+ </user-data-constraint>
+ </security-constraint>
- <!--
- | Uncomment to use BASIC authentication scheme. Don't forget to comment other
- | form authentication.
- -->
- <!--
- <login-config>
- <auth-method>BASIC</auth-method>
- <realm-name>JBoss Portal</realm-name>
- </login-config>
- -->
+ <!--
+ | Uncomment to use BASIC authentication scheme. Don't forget to comment other
+ | form authentication.
+ -->
+ <!--
+ <login-config>
+ <auth-method>BASIC</auth-method>
+ <realm-name>JBoss Portal</realm-name>
+ </login-config>
+ -->
- <!--
- | Uncomment to use FORM authentication scheme. Don't forget to comment other
- | form authentication.
- -->
- <!--
- -->
- <login-config>
- <auth-method>FORM</auth-method>
- <realm-name>JBoss Portal</realm-name>
- <form-login-config>
- <form-login-page>/showLogin</form-login-page>
- <form-error-page>/loginFailed</form-error-page>
- </form-login-config>
- </login-config>
+ <!--
+ | Uncomment to use FORM authentication scheme. Don't forget to comment other
+ | form authentication.
+ -->
+ <!--
+ -->
+ <login-config>
+ <auth-method>FORM</auth-method>
+ <realm-name>JBoss Portal</realm-name>
+ <form-login-config>
+ <form-login-page>/showLogin</form-login-page>
+ <!-- form-error-page>/loginFailed</form-error-page-->
+ <form-error-page>
+ /loginPage/LoginWindow?action=2&loginFailed=loginFailed
+ </form-error-page>
+ </form-login-config>
+ </login-config>
- <security-role>
- <role-name>Authenticated</role-name>
- </security-role>
+ <security-role>
+ <role-name>Authenticated</role-name>
+ </security-role>
</web-app>
Modified: labs/jbosslabs/qa/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/url/WikiUrlFactory.java
===================================================================
--- labs/jbosslabs/qa/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/url/WikiUrlFactory.java 2008-05-10 12:16:25 UTC (rev 19922)
+++ labs/jbosslabs/qa/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/url/WikiUrlFactory.java 2008-05-10 12:23:27 UTC (rev 19923)
@@ -1,5 +1,8 @@
package org.jboss.labs.mapper.url;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+
import org.jboss.portal.core.controller.ControllerCommand;
import org.jboss.portal.core.controller.ControllerContext;
import org.jboss.portal.core.model.portal.command.*;
@@ -61,13 +64,20 @@
if (navigationalState instanceof PortletParametersStateString) {
PortletParametersStateString ppss = (PortletParametersStateString) navigationalState;
- if (ppss.getValue("language") != null) {
+ if (ppss.getValue("language") != null
+ && !ppss.getValue("language").toLowerCase()
+ .equals("en")) {
addTokenToPath(sb, ppss.getValue("language")
.toLowerCase());
}
if (ppss.getValue("page") != null) {
- addTokenToPath(sb, ppss.getValue("page"));
+ try {
+ addTokenToPath(sb, URLDecoder.decode(ppss
+ .getValue("page"), "UTF-8"));
+ } catch (UnsupportedEncodingException e) {
+ throw new RuntimeException(e);
+ }
}
if (ppss.getValue("version") != null) {
Modified: labs/jbosslabs/qa/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/AutologinFilter.java
===================================================================
--- labs/jbosslabs/qa/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/AutologinFilter.java 2008-05-10 12:16:25 UTC (rev 19922)
+++ labs/jbosslabs/qa/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/AutologinFilter.java 2008-05-10 12:23:27 UTC (rev 19923)
@@ -115,8 +115,9 @@
if ((cred = hasCookies(httpReq)) != null
&& cred.length == COOKIE_DESC_LEN) {
+ log.debug("enter uri: "+httpReq.getRequestURI() + "?" + httpReq.getQueryString());
httpReq.getSession().setAttribute(ENTER_URI,
- httpReq.getRequestURI() + httpReq.getQueryString());
+ httpReq.getRequestURI() + "?" + httpReq.getQueryString());
String url = httpReq.getContextPath()
+ (httpReq.isSecure() ? "/authsec" : "/auth")
Copied: labs/jbosslabs/qa/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/CharacterEncodingFilter.java (from rev 19922, labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/CharacterEncodingFilter.java)
===================================================================
--- labs/jbosslabs/qa/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/CharacterEncodingFilter.java (rev 0)
+++ labs/jbosslabs/qa/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/CharacterEncodingFilter.java 2008-05-10 12:23:27 UTC (rev 19923)
@@ -0,0 +1,37 @@
+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;
+
+public class CharacterEncodingFilter implements Filter {
+
+ private static final String DEFAULT_ENCODING = "UTF-8";
+
+ private String encoding = DEFAULT_ENCODING;
+
+ public void init(FilterConfig config) throws ServletException {
+ String enc = config.getInitParameter("encoding");
+ if (enc != null) {
+ encoding = enc;
+ }
+ }
+
+ public void doFilter(ServletRequest request, ServletResponse response,
+ FilterChain chain) throws IOException, ServletException{
+ HttpServletRequest req = (HttpServletRequest) request;
+ HttpServletResponse res = (HttpServletResponse) response;
+ req.setCharacterEncoding(encoding);
+ res.setCharacterEncoding(encoding);
+ chain.doFilter(req, res);
+ }
+
+ public void destroy() {
+ }
+}
Deleted: labs/jbosslabs/qa/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/WrongLoginServlet.java
===================================================================
--- labs/jbosslabs/qa/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/WrongLoginServlet.java 2008-05-10 12:16:25 UTC (rev 19922)
+++ labs/jbosslabs/qa/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/WrongLoginServlet.java 2008-05-10 12:23:27 UTC (rev 19923)
@@ -1,48 +0,0 @@
-package org.jboss.forge.portal;
-
-import java.io.IOException;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-public class WrongLoginServlet extends HttpServlet {
-
- /**
- *
- */
- private static final long serialVersionUID = 1L;
-
- private final static String LOGIN_FAILED = "LOGIN_FAILED";
-
- @Override
- public void init() throws ServletException {
- if (getInitParameter(LOGIN_FAILED) == null) {
- throw new ServletException("LOGIN_FAILED parameter not set for "
- + this.getClass().getName());
- }
-
- super.init();
- }
-
- protected void doGet(HttpServletRequest request,
- HttpServletResponse response) throws ServletException, IOException {
- String[] cred;
-
- if ((cred = AutologinFilter.hasCookies(request)) != null
- && (cred.length == AutologinFilter.COOKIE_DESC_LEN)) {
- AutologinFilter.clearCookies(request, response);
-
- if (request.getSession().getAttribute(AutologinFilter.ENTER_URI) != null) {
- response.sendRedirect(request.getSession().getAttribute(
- AutologinFilter.ENTER_URI).toString());
- } else {
- response.sendRedirect("/");
- }
- } else {
- response.sendRedirect(getInitParameter(LOGIN_FAILED));
- }
- }
-
-}
Modified: labs/jbosslabs/qa/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/login/LabsFormAuthenticator.java
===================================================================
--- labs/jbosslabs/qa/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/login/LabsFormAuthenticator.java 2008-05-10 12:16:25 UTC (rev 19922)
+++ labs/jbosslabs/qa/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/login/LabsFormAuthenticator.java 2008-05-10 12:23:27 UTC (rev 19923)
@@ -2,36 +2,99 @@
import java.io.IOException;
+import javax.servlet.RequestDispatcher;
+
+import org.apache.catalina.Session;
+import org.apache.catalina.authenticator.Constants;
import org.apache.catalina.authenticator.FormAuthenticator;
+import org.apache.catalina.authenticator.SavedRequest;
import org.apache.catalina.connector.Request;
import org.apache.catalina.connector.Response;
import org.apache.catalina.deploy.LoginConfig;
import org.jboss.forge.portal.AutologinFilter;
import org.jboss.logging.Logger;
-public class LabsFormAuthenticator extends FormAuthenticator{
+public class LabsFormAuthenticator extends FormAuthenticator {
private static final String AUTOLOGIN_NAME = "autologin";
- private static final Logger log = Logger.getLogger(LabsFormAuthenticator.class);
-
+ private static final Logger log = Logger
+ .getLogger(LabsFormAuthenticator.class);
+
@Override
- public boolean authenticate(Request request, Response response, LoginConfig config)
- throws IOException {
-
+ public boolean authenticate(Request request, Response response,
+ LoginConfig config) throws IOException {
+
log.debug("labs auth valve eexecuted");
-
+
+ if (request.getSession().getAttribute(AutologinFilter.ENTER_URI) != null) {
+ Session session = request.getSessionInternal(true);
+ session.setNote(AutologinFilter.ENTER_URI, request.getSession()
+ .getAttribute(AutologinFilter.ENTER_URI));
+ log
+ .debug("saved uri: "
+ + session.getNote(AutologinFilter.ENTER_URI));
+ }
+
if (request.getParameter(AUTOLOGIN_NAME) != null
&& request.getParameter(AUTOLOGIN_NAME).equals("Remember me")) {
log.debug("Autologin enabled");
request.getSession().setAttribute(
AutologinFilter.REQUEST_AUTOLOGIN, true);
- }
- else {
+ } else {
log.debug("autologin disabled");
}
-
+
return super.authenticate(request, response, config);
}
+ protected void forwardToErrorPage(Request request, Response response,
+ LoginConfig config) {
+
+ try {
+ String[] cred;
+ if ((cred = AutologinFilter.hasCookies(request)) != null
+ && (cred.length == AutologinFilter.COOKIE_DESC_LEN)) {
+ AutologinFilter.clearCookies(request, response);
+
+ if (request.getSession()
+ .getAttribute(AutologinFilter.ENTER_URI) != null) {
+ response.sendRedirect(request.getSession().getAttribute(
+ AutologinFilter.ENTER_URI).toString());
+ } else {
+ response.sendRedirect("/");
+ }
+ } else {
+ response.sendRedirect(config.getErrorPage());
+ }
+ } catch (IOException e) {
+ log.error("Couldn't redirect to error login page", e);
+ }
+ }
+
+ @Override
+ protected String savedRequestURL(Session session) {
+ if (session.getNote(AutologinFilter.ENTER_URI) != null) {
+ return (String) session.getNote(AutologinFilter.ENTER_URI);
+ } else {
+
+ return super.savedRequestURL(session);
+ }
+ }
+
+ @Override
+ protected boolean restoreRequest(Request request, Session session)
+ throws IOException {
+ boolean b = super.restoreRequest(request, session);
+
+ String labsReqUri = (String) session.getNote(AutologinFilter.ENTER_URI);
+
+ if (labsReqUri != null && labsReqUri.indexOf('?') != -1) {
+ request.getCoyoteRequest().queryString().setString(labsReqUri
+ .substring(labsReqUri.indexOf('?') + 1));
+ }
+
+ return b;
+ }
+
}
Modified: labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/portlet/WikiPortletMyFaces.java
===================================================================
--- labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/portlet/WikiPortletMyFaces.java 2008-05-10 12:16:25 UTC (rev 19922)
+++ labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/portlet/WikiPortletMyFaces.java 2008-05-10 12:23:27 UTC (rev 19923)
@@ -307,7 +307,6 @@
}
protected void setContentType(RenderRequest request, RenderResponse response) {
-
response.setContentType("text/html; charset=UTF-8");
}
Modified: labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_attach.xhtml
===================================================================
--- labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_attach.xhtml 2008-05-10 12:16:25 UTC (rev 19922)
+++ labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_attach.xhtml 2008-05-10 12:23:27 UTC (rev 19923)
@@ -1,3 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<div xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:c="http://java.sun.com/jstl/core"
Modified: labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_diff.xhtml
===================================================================
--- labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_diff.xhtml 2008-05-10 12:16:25 UTC (rev 19922)
+++ labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_diff.xhtml 2008-05-10 12:23:27 UTC (rev 19923)
@@ -1,3 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<div xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:c="http://java.sun.com/jstl/core"
Modified: labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_edit.xhtml
===================================================================
--- labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_edit.xhtml 2008-05-10 12:16:25 UTC (rev 19922)
+++ labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_edit.xhtml 2008-05-10 12:23:27 UTC (rev 19923)
@@ -1,3 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<div xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:c="http://java.sun.com/jstl/core"
@@ -17,7 +19,7 @@
</h:panelGrid>
<h:outputText value="#{wikiEdit.showEditHTML}" escape="false" />
- <h:form acceptCharset="UTF-8">
+ <h:form acceptcharset="UTF-8">
<h:panelGrid styleClass="editPageArea">
<h:inputTextarea rows="40" cols="80" value="#{wikiEdit.pageContent}"
styleClass="editPageArea" />
Modified: labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_history.xhtml
===================================================================
--- labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_history.xhtml 2008-05-10 12:16:25 UTC (rev 19922)
+++ labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_history.xhtml 2008-05-10 12:23:27 UTC (rev 19923)
@@ -1,3 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<div xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:c="http://java.sun.com/jstl/core"
Modified: labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_preferences.xhtml
===================================================================
--- labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_preferences.xhtml 2008-05-10 12:16:25 UTC (rev 19922)
+++ labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_preferences.xhtml 2008-05-10 12:23:27 UTC (rev 19923)
@@ -1,3 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<div xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:c="http://java.sun.com/jstl/core"
Modified: labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_view.xhtml
===================================================================
--- labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_view.xhtml 2008-05-10 12:16:25 UTC (rev 19922)
+++ labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_view.xhtml 2008-05-10 12:23:27 UTC (rev 19923)
@@ -1,3 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<div xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:c="http://java.sun.com/jstl/core"
Modified: labs/jbosslabs/qa/portal-extensions/jbosswiki/wiki-common/src/etc/WikiTypes.xml
===================================================================
--- labs/jbosslabs/qa/portal-extensions/jbosswiki/wiki-common/src/etc/WikiTypes.xml 2008-05-10 12:16:25 UTC (rev 19922)
+++ labs/jbosslabs/qa/portal-extensions/jbosswiki/wiki-common/src/etc/WikiTypes.xml 2008-05-10 12:23:27 UTC (rev 19923)
@@ -13,10 +13,6 @@
<class>org.jboss.wiki.plugins.TrailPlugin</class>
</plugin>
<plugin>
- <name>wikiToHtmlTranslator</name>
- <class>org.jboss.wiki.plugins.HTMLTranslatorParts</class>
- </plugin>
- <plugin>
<name>wikiToHtmlTranslatorNoPlugins</name>
<class>org.jboss.wiki.plugins.HTMLTranslatorNoPlugins</class>
</plugin>
@@ -50,6 +46,10 @@
<class>org.jboss.wiki.plugins.AttachmentListPlugin</class>
</plugin>
<plugin>
+ <name>wikiToHtmlTranslator</name>
+ <class>org.jboss.wiki.plugins.HTMLTranslatorParts</class>
+ </plugin>
+ <plugin>
<name>wikiToHtmlTranslatorNoPlugins</name>
<class>org.jboss.wiki.plugins.HTMLTranslatorNoPlugins</class>
</plugin>
Modified: labs/jbosslabs/qa/portal-extensions/jbosswiki/wiki-common/src/java/com/ecyrd/jspwiki/plugin/RecentChangesPlugin.java
===================================================================
--- labs/jbosslabs/qa/portal-extensions/jbosswiki/wiki-common/src/java/com/ecyrd/jspwiki/plugin/RecentChangesPlugin.java 2008-05-10 12:16:25 UTC (rev 19922)
+++ labs/jbosslabs/qa/portal-extensions/jbosswiki/wiki-common/src/java/com/ecyrd/jspwiki/plugin/RecentChangesPlugin.java 2008-05-10 12:23:27 UTC (rev 19923)
@@ -18,6 +18,7 @@
@Override
public String process(WikiPage wikiPage, WikiSession wikiSession,
HashMap<String, String> attributes) {
+ log.info("plugin executed");
StringBuilder recentChanges = new StringBuilder();
Integer numOfDays = Integer.MAX_VALUE;
Modified: labs/jbosslabs/qa/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiInsidePlugin.java
===================================================================
--- labs/jbosslabs/qa/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiInsidePlugin.java 2008-05-10 12:16:25 UTC (rev 19922)
+++ labs/jbosslabs/qa/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiInsidePlugin.java 2008-05-10 12:23:27 UTC (rev 19923)
@@ -25,6 +25,8 @@
import java.util.HashMap;
import java.util.Properties;
+import org.apache.log4j.Logger;
+
/**
*
* @author <a href="mailto:dsicore at jboss.org">Damon Sicore</a><br />
@@ -54,6 +56,8 @@
private String name;
final static String propFileName = "wikiPlugins.properties";
+
+ protected Logger log = Logger.getLogger(this.getClass());
/**
* Processes the given page, and attributes and return String to show in the apropriate place on the page.
Modified: labs/jbosslabs/qa/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/HTMLTranslatorNoPlugins.java
===================================================================
--- labs/jbosslabs/qa/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/HTMLTranslatorNoPlugins.java 2008-05-10 12:16:25 UTC (rev 19922)
+++ labs/jbosslabs/qa/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/HTMLTranslatorNoPlugins.java 2008-05-10 12:23:27 UTC (rev 19923)
@@ -1,5 +1,7 @@
package org.jboss.wiki.plugins;
public class HTMLTranslatorNoPlugins extends HTMLTranslatorParts {
- private boolean executePlugins = true;
+ protected boolean executePlugins() {
+ return false;
+ }
}
Modified: labs/jbosslabs/qa/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/HTMLTranslatorParts.java
===================================================================
--- labs/jbosslabs/qa/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/HTMLTranslatorParts.java 2008-05-10 12:16:25 UTC (rev 19922)
+++ labs/jbosslabs/qa/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/HTMLTranslatorParts.java 2008-05-10 12:23:27 UTC (rev 19923)
@@ -128,8 +128,6 @@
// stores the name of the wiki page we are currently processing
private String pageName = "";
- private boolean executePlugins = true;
-
public HTMLTranslatorParts() {
}
@@ -826,10 +824,10 @@
if (isPluginLink(link)) {
// return null; // we do not include plugin links for now
- if (executePlugins) {
+ if (executePlugins()) {
return wikiEngine.executeInsidePlugin(link, wPage, wikiSession);
} else {
- return link;
+ return pagePartRegexStart + "[" + link + "]" + pagePartRegexEnd;
}
}
int border = link.indexOf('|');
@@ -1105,5 +1103,9 @@
mediaPatterns = getProperty("imagePatterns");
}
+
+ protected boolean executePlugins() {
+ return true;
+ }
}
More information about the jboss-svn-commits
mailing list