[jboss-svn-commits] JBL Code SVN: r10541 - in labs/jbosslabs/trunk/portal-extensions: binaries/maven-repo-addons/ajax4jsf and 7 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Mar 26 17:28:53 EDT 2007
Author: szimano
Date: 2007-03-26 17:28:53 -0400 (Mon, 26 Mar 2007)
New Revision: 10541
Added:
labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/ajax4jsf/
labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/ajax4jsf/jars/
labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/ajax4jsf/jars/ajax4jsf-1.1.0.jar
labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/ajax4jsf/jars/oscache-2.3.2.jar
labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/DownloadsFilter.java
Modified:
labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml
labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/WrongLoginServlet.java
labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/downloads/Downloads.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/.project
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/project.xml
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/web.xml
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_template.xhtml
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_view.xhtml
Log:
wiki stuff, downloads
Added: labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/ajax4jsf/jars/ajax4jsf-1.1.0.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/ajax4jsf/jars/ajax4jsf-1.1.0.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/ajax4jsf/jars/oscache-2.3.2.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/ajax4jsf/jars/oscache-2.3.2.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml 2007-03-26 20:14:29 UTC (rev 10540)
+++ labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml 2007-03-26 21:28:53 UTC (rev 10541)
@@ -22,10 +22,10 @@
~ 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>
+<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+
<description>JBoss Portal</description>
<!-- Comment/Uncomment to enable portal session replication
<distributable/>
@@ -46,9 +46,9 @@
<servlet-name>wrongLoginServlet</servlet-name>
<servlet-class>org.jboss.forge.portal.WrongLoginServlet</servlet-class>
<init-param>
+ <description>Page with information that the login was failed</description>
<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>
@@ -61,14 +61,14 @@
<servlet-name>ShowLoginPage</servlet-name>
<servlet-class>org.jboss.forge.portal.ShowLoginPageServlet</servlet-class>
<init-param>
+ <description>Login page that will get forwarded (dispatched) to</description>
<param-name>LOGIN_PAGE</param-name>
<param-value>/loginPage</param-value>
- <description>Login page that will get forwarded (dispatched) to</description>
</init-param>
<init-param>
+ <description>Logout page that will get forwarded to</description>
<param-name>LOGOUT_PAGE</param-name>
<param-value>/</param-value>
- <description>Logout page that will get forwarded to</description>
</init-param>
</servlet>
@@ -82,6 +82,16 @@
<url-pattern>/logout</url-pattern>
</servlet-mapping>
+ <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>
<filter-name>redirectFilter</filter-name>
<filter-class>org.jboss.forge.redirect.RootRedirectFilter</filter-class>
@@ -184,14 +194,14 @@
<servlet-name>PortalServletWithPathMapping</servlet-name>
<servlet-class>org.jboss.portal.server.servlet.PortalServlet</servlet-class>
<init-param>
+ <description>The servlet needs to know wether it is set as a default servlet or not</description>
<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>
+ <description>The request controller for the portal servlet</description>
<param-name>controllerName</param-name>
<param-value>portal:controller=Core</param-value>
- <description>The request controller for the portal servlet</description>
</init-param>
<load-on-startup>0</load-on-startup>
<security-role-ref>
@@ -205,14 +215,14 @@
<servlet-name>PortalServletWithDefaultServletMapping</servlet-name>
<servlet-class>org.jboss.portal.server.servlet.PortalServlet</servlet-class>
<init-param>
+ <description>The servlet needs to know wether it is set as a default servlet or not</description>
<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>
+ <description>The request controller for the portal servlet</description>
<param-name>controllerName</param-name>
<param-value>portal:controller=Core</param-value>
- <description>The request controller for the portal servlet</description>
</init-param>
<load-on-startup>0</load-on-startup>
<security-role-ref>
@@ -384,14 +394,14 @@
<servlet-name>PortalServletForAjax</servlet-name>
<servlet-class>org.jboss.portal.server.servlet.PortalServlet</servlet-class>
<init-param>
+ <description>The servlet needs to know wether it is set as a default servlet or not</description>
<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>
+ <description>The request controller for the portal servlet</description>
<param-name>controllerName</param-name>
<param-value>portal:controller=Ajax</param-value>
- <description>The request controller for the portal servlet</description>
</init-param>
<load-on-startup>0</load-on-startup>
<security-role-ref>
Added: labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/DownloadsFilter.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/DownloadsFilter.java (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/DownloadsFilter.java 2007-03-26 21:28:53 UTC (rev 10541)
@@ -0,0 +1,181 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., 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.
+ */
+
+package org.jboss.forge.portal;
+
+import java.io.IOException;
+import java.util.List;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.jboss.forge.common.ejb3.LabsServices;
+import org.jboss.forge.common.exceptions.ServiceRetrievalException;
+import org.jboss.forge.common.projects.project.Categories;
+import org.jboss.forge.common.projects.project.Category;
+import org.jboss.forge.common.projects.project.Downloads;
+import org.jboss.forge.common.projects.project.File;
+import org.jboss.logging.Logger;
+
+/**
+ * DownloadsFilter.java
+ *
+ * @author <a href="mailto:tomasz.szymanski at jboss.com">Tomasz Szymanski</a>
+ */
+
+public class DownloadsFilter implements Filter {
+
+ private static final String PROJ_DOWNLOAD = "[\\w\\d-]+/downloads/([\\w\\d-]+/)*[\\w\\d-]+(\\.[\\w\\d-]+)*";
+
+ private static final Logger log = Logger.getLogger(DownloadsFilter.class);
+
+ public void destroy() {
+
+ }
+
+ public void doFilter(ServletRequest request, ServletResponse response,
+ FilterChain chain) throws IOException, ServletException {
+ if (request instanceof HttpServletRequest) {
+ HttpServletRequest htReq = (HttpServletRequest) request;
+
+ String uri = htReq.getRequestURI();
+
+ if (uri.startsWith("/auth")) {
+ uri = uri.substring("/auth".length());
+ } else if (uri.startsWith("/authsec")) {
+ uri = uri.substring("/authsec".length());
+ }
+
+ if (uri.startsWith("/")) {
+ uri = uri.substring(1);
+ }
+
+ //log.info(uri + " " + uri.matches(PROJ_DOWNLOAD));
+
+ if (uri.matches(PROJ_DOWNLOAD)) {
+ String projectId = uri.substring(0, uri.indexOf('/'));
+
+ try {
+ Downloads downl = LabsServices.getProjectsService()
+ .getProjectDownloads(projectId);
+
+ String[] tokens = uri.split("/");
+
+ //log.info("tokens lenght: "+tokens.length);
+
+ Category cat = null;
+
+ // first check if url is leading to file
+
+ //there are categories
+ if (tokens.length > 3) {
+ for (int i = 2; i < tokens.length - 1; i++) {
+ if (cat == null) {
+ cat = getCategory(tokens[i], downl
+ .getCategories());
+ } else {
+ cat = getCategory(tokens[i], cat
+ .getCategories());
+ }
+
+ if (cat == null) {
+ // url is invalid (no such categories) - forward
+ // request
+
+ chain.doFilter(request, response);
+ return;
+ }
+ }
+
+ String fileURI = getUri(tokens[tokens.length - 1], cat
+ .getFiles().getFile(), uri);
+
+ //log.info("FILE URI: "+fileURI);
+
+ if (fileURI != null) {
+ //htReq.getRequestDispatcher(fileURI).forward(
+ // request, response);
+ ((HttpServletResponse)response).sendRedirect(fileURI);
+ return;
+ }
+ } else {
+ //no categories just check file
+
+ String fileURI = getUri(tokens[tokens.length - 1],
+ downl.getFiles().getFile(), uri);
+
+ //log.info("FILE URI: "+fileURI);
+
+ if (fileURI != null) {
+ //htReq.getRequestDispatcher(fileURI).forward(
+ // request, response);
+ ((HttpServletResponse)response).sendRedirect(fileURI);
+
+ return;
+ }
+ }
+ } catch (ServiceRetrievalException e) {
+ log.error(e);
+ }
+ }
+
+ }
+
+ chain.doFilter(request, response);
+ }
+
+ private String getUri(String fileName, List<? extends File> files,
+ String uri) {
+ //log.info("Execute: "+fileName);
+ for (File f : files) {
+ //log.info("another file: "+f.getId());
+ if (f.getId().equals(fileName)) {
+ // it's a file. include.
+
+ return "/file-access/default/members/" + uri;
+ }
+ }
+
+ return null;
+ }
+
+ private Category getCategory(String catId, Categories categories) {
+ for (Category cat : categories.getCategory()) {
+ if (cat.getId().equals(catId)) {
+ return cat;
+ }
+ }
+
+ return null;
+ }
+
+ public void init(FilterConfig arg0) throws ServletException {
+
+ }
+
+}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/WrongLoginServlet.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/WrongLoginServlet.java 2007-03-26 20:14:29 UTC (rev 10540)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/WrongLoginServlet.java 2007-03-26 21:28:53 UTC (rev 10541)
@@ -38,7 +38,7 @@
response.sendRedirect(request.getSession().getAttribute(
AutologinFilter.ENTER_URI).toString());
} else {
- response.sendRedirect("/portal");
+ response.sendRedirect("/");
}
} else {
response.sendRedirect(getInitParameter(LOGIN_FAILED));
Modified: labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/downloads/Downloads.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/downloads/Downloads.java 2007-03-26 20:14:29 UTC (rev 10540)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/downloads/Downloads.java 2007-03-26 21:28:53 UTC (rev 10541)
@@ -34,6 +34,7 @@
import org.jboss.forge.common.exceptions.ServiceRetrievalException;
import org.jboss.forge.common.projects.Projects;
import org.jboss.forge.common.projects.ProjectsHelper;
+import org.jboss.forge.common.projects.project.Categories;
import org.jboss.forge.common.projects.project.Category;
import org.jboss.forge.common.projects.project.File;
import org.jboss.portlet.JBossPortlet;
@@ -64,9 +65,41 @@
// Getting the selected category (null if no selected category)
String categoryId = request.getParameter("category");
+
+ List<? extends File> files = null;
+ List<? extends Category> categories = null;
+
+ org.jboss.forge.common.projects.project.Downloads d = LabsServices
+ .getProjectsService().getProjectDownloads(projectId);
+
+ if (categoryId == null) {
+ files = d.getFiles().getFile();
+ categories = d.getCategories().getCategory();
+ }
+ else {
+ String[] cats = categoryId.split("/");
+
+ Category cat = getCategory(cats[0], d.getCategories());
+
+ if (cat == null) {
+ throw new Exception("No such category: "+categoryId);
+ }
+
+ for (int i = 1; i < cats.length; i++) {
+ cat = getCategory(cats[i], cat.getCategories());
+
+ if (cat == null) {
+ throw new Exception("No such category: "+categoryId);
+ }
+ }
+
+ files = cat.getFiles().getFile();
+ categories = cat.getCategories().getCategory();
+ }
+
+ request.setAttribute(DownloadsConstants.FILES, files);
+ request.setAttribute(DownloadsConstants.CATEGORIES, categories);
- request.setAttribute(DownloadsConstants.FILES, getAllFiles(projectId));
-
// Setting the attributes
request.setAttribute(ProjectsHelper.PROJECT_ID, projectId);
@@ -75,7 +108,8 @@
+ "/downloads/" + ((categoryId != null) ? categoryId : ""));
if (request.getUser() != null) {
- request.setAttribute("DOWNLOAD-USER", request.getUser().getUserName());
+ request.setAttribute("DOWNLOAD-USER", request.getUser()
+ .getUserName());
}
// Displaying the JSP
@@ -86,60 +120,18 @@
rd.include(request, response);
} catch (Exception e) {
- e.printStackTrace();
- response.getWriter().write("ERROR: " + e.getMessage());
+ e.printStackTrace();
+ response.getWriter().write("ERROR: " + e.getMessage());
}
}
-
- private Set<File> getAllFiles(String projectId)
- throws ServiceRetrievalException {
- Set<File> allFiles = new TreeSet<File>(new Comparator<File>() {
-
- public int compare(File o1, File o2) {
- if (o1 == null) {
- if (o2 == null) return 0;
- return -1;
- }
-
- if (o1.getRelease() == null) {
- if (o2.getRelease() == null) {
- return 0;
- }
-
- return -1;
- }
-
- return o1.getRelease().compareTo(o2.getRelease());
+
+ private Category getCategory(String catId, Categories categories) {
+ for (Category cat : categories.getCategory()) {
+ if (cat.getId().equals(catId)) {
+ return cat;
}
-
- });
-
- addFiles(allFiles, LabsServices.getProjectsService()
- .getProjectDownloads(projectId).getFiles().getFile());
-
- for (Category c : LabsServices.getProjectsService()
- .getProjectDownloads(projectId).getCategories().getCategory()) {
- addFilesFromCategory(allFiles, c);
}
- return allFiles;
+ return null;
}
-
- private void addFilesFromCategory(Set<File> allFiles, Category category) {
- if (category.getCategories() == null) {
- return;
- }
-
- for (Category c : category.getCategories().getCategory()) {
- addFilesFromCategory(allFiles, c);
- }
-
- addFiles(allFiles, category.getFiles().getFile());
- }
-
- private void addFiles(Set<File> allFiles, List<? extends File> filesToAdd) {
-
- allFiles.addAll(filesToAdd);
-
- }
}
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/.project
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/.project 2007-03-26 20:14:29 UTC (rev 10540)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/.project 2007-03-26 21:28:53 UTC (rev 10541)
@@ -1,19 +1,44 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<projectDescription>
- <name>wiki</name>
- <comment>
+ <name>wiki-backend</name>
+ <comment>
</comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
\ No newline at end of file
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>com.exadel.verification.verifybuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+ <nature>com.exadel.jsf.jsfnature</nature>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+ </natures>
+ <linkedResources>
+ <link>
+ <name>WEB-ROOT</name>
+ <type>2</type>
+ <location>/home/tomek/java/sandbox/portal-extensions/jbosswiki/forge-wiki/src/web</location>
+ </link>
+ </linkedResources>
+</projectDescription>
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/project.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/project.xml 2007-03-26 20:14:29 UTC (rev 10540)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/project.xml 2007-03-26 21:28:53 UTC (rev 10541)
@@ -33,8 +33,25 @@
</organization>
<dependencies>
-
<dependency>
+ <groupId>ajax4jsf</groupId>
+ <artifactId>ajax4jsf</artifactId>
+ <version>1.1.0</version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>ajax4jsf</groupId>
+ <artifactId>oscache</artifactId>
+ <version>2.3.2</version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+
+ <dependency>
<groupId>jboss</groupId>
<artifactId>javax.servlet</artifactId>
<version>1.0</version>
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/web.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/web.xml 2007-03-26 20:14:29 UTC (rev 10540)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/web.xml 2007-03-26 21:28:53 UTC (rev 10541)
@@ -1,88 +1,103 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0"?>
-<!DOCTYPE web-app
- PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN"
- "http://java.sun.com/j2ee/dtds/web-app_2.2.dtd">
+ <web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+ <!-- <context-param>
+ <param-name>org.ajax4jsf.VIEW_HANDLERS</param-name>
+ <param-value>com.sun.facelets.FaceletViewHandler</param-value>
+ </context-param>
+
+ <filter>
+ <display-name>Ajax4jsf Filter</display-name>
+ <filter-name>ajax4jsf</filter-name>
+ <filter-class>org.ajax4jsf.Filter</filter-class>
+ </filter>
+
+ <filter-mapping>
+ <filter-name>ajax4jsf</filter-name>
+ <servlet-name>Faces Servlet</servlet-name>
+ <dispatcher>REQUEST</dispatcher>
+ <dispatcher>FORWARD</dispatcher>
+ <dispatcher>INCLUDE</dispatcher>
+ </filter-mapping> -->
-
-<web-app>
-
<filter>
<filter-name>MyFacesExtensionsFilter</filter-name>
- <filter-class>org.apache.myfaces.webapp.filter.ExtensionsFilter</filter-class>
- <init-param>
- <param-name>maxFileSize</param-name>
- <param-value>20m</param-value>
- <description>Set the size limit for uploaded files.
- Format: 10 - 10 bytes
- 10k - 10 KB
- 10m - 10 MB
- 1g - 1 GB
- </description>
- </init-param>
+ <filter-class>
+ org.apache.myfaces.webapp.filter.ExtensionsFilter
+ </filter-class>
+ <init-param>
+ <description>
+ Set the size limit for uploaded files. Format: 10 - 10
+ bytes 10k - 10 KB 10m - 10 MB 1g - 1 GB
+ </description>
+ <param-name>maxFileSize</param-name>
+ <param-value>20m</param-value>
+ </init-param>
</filter>
-
+
<!-- extension mapping for adding <script/>, <link/>, and other resource tags to JSF-pages -->
<filter-mapping>
- <filter-name>MyFacesExtensionsFilter</filter-name>
- <!-- servlet-name must match the name of your javax.faces.webapp.FacesServlet entry -->
- <servlet-name>Faces Servlet</servlet-name>
+ <filter-name>MyFacesExtensionsFilter</filter-name>
+ <!-- servlet-name must match the name of your javax.faces.webapp.FacesServlet entry -->
+ <servlet-name>Faces Servlet</servlet-name>
</filter-mapping>
-
+
<!-- extension mapping for serving page-independent resources (javascript, stylesheets, images, etc.) -->
<filter-mapping>
- <filter-name>MyFacesExtensionsFilter</filter-name>
- <url-pattern>/faces/myFacesExtensionResource/*</url-pattern>
+ <filter-name>MyFacesExtensionsFilter</filter-name>
+ <url-pattern>/faces/myFacesExtensionResource/*</url-pattern>
</filter-mapping>
<!-- Use Documents Saved as *.xhtml -->
- <context-param>
- <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
- <param-value>.xhtml</param-value>
- </context-param>
+ <context-param>
+ <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
+ <param-value>.xhtml</param-value>
+ </context-param>
- <!-- Special Debug Output for Development -->
- <context-param>
- <param-name>facelets.DEVELOPMENT</param-name>
- <param-value>true</param-value>
- </context-param>
+ <!-- Special Debug Output for Development -->
+ <context-param>
+ <param-name>facelets.DEVELOPMENT</param-name>
+ <param-value>true</param-value>
+ </context-param>
<context-param>
- <param-name>facelets.LIBRARIES</param-name>
- <param-value>/WEB-INF/tomahawk.taglib.xml</param-value>
+ <param-name>facelets.LIBRARIES</param-name>
+ <param-value>/WEB-INF/tomahawk.taglib.xml</param-value>
</context-param>
-
- <!-- <context-param>
- <param-name>facelets.LIBRARIES</param-name>
- <param-value>/WEB-INF/wiki.taglib.xml</param-value>
- </context-param> -->
-
- <listener>
- <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
- </listener>
- <servlet>
- <servlet-name>Faces Servlet</servlet-name>
- <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
+ <!-- <context-param>
+ <param-name>facelets.LIBRARIES</param-name>
+ <param-value>/WEB-INF/wiki.taglib.xml</param-value>
+ </context-param> -->
- <servlet-mapping>
- <servlet-name>Faces Servlet</servlet-name>
- <url-pattern>*.jsf</url-pattern>
- </servlet-mapping>
-
+ <listener>
+ <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
+ </listener>
+
+ <servlet>
+ <servlet-name>Faces Servlet</servlet-name>
+ <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>Faces Servlet</servlet-name>
+ <url-pattern>*.jsf</url-pattern>
+ </servlet-mapping>
+
<filter>
<filter-name>wikiFileAccessFilter</filter-name>
<filter-class>org.jboss.wiki.fileaccess.WikiFileAccessFilter</filter-class>
</filter>
-
+
<!-- <filter>
<filter-name>wikiFileAccessFilter</filter-name>
<filter-class>org.jboss.wiki.redirect.WikiRedirectFilter</filter-class>
- </filter> -->
-
+ </filter> -->
+
<filter-mapping>
<filter-name>wikiFileAccessFilter</filter-name>
<url-pattern>/*</url-pattern>
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_template.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_template.xhtml 2007-03-26 20:14:29 UTC (rev 10540)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_template.xhtml 2007-03-26 21:28:53 UTC (rev 10541)
@@ -24,7 +24,7 @@
<h:panelGroup rendered="#{wikiCommon.userLoggedIn}" id="tagMeWiki" />
- <h:panelGroup styleClass="floatright">
+ <h:panelGroup styleClass="floatright">
<h:form>
<h:inputText value="#{wikiView.searchQuery}" required="true" />
<h:commandButton value="#{msg.search}" action="#{wikiView.search}" />
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_view.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_view.xhtml 2007-03-26 20:14:29 UTC (rev 10540)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_view.xhtml 2007-03-26 21:28:53 UTC (rev 10541)
@@ -23,7 +23,9 @@
<h:form rendered="#{wikiCommon.userLoggedIn}">
<h:outputText value="["/><h:commandLink action="edit">
- <f:param name="version" value="#{wikiView.pageVersion}" rendered="#{wikiView.pageVersion ne null}"/>
+ <c:if test="#{wikiView.pageVersion ne null}">
+ <f:param name="version" value="#{wikiView.pageVersion}" />
+ </c:if>
<f:param name="page" value="#{wikiView.pageName}" />
<h:outputText value="#{msg.edit}" />
</h:commandLink>
More information about the jboss-svn-commits
mailing list