[jboss-svn-commits] JBL Code SVN: r11315 - in labs/jbosslabs/branches/qa/portal-extensions: forge-portal-attr/src/java/org/jboss/forge/portal and 7 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Apr 24 16:39:40 EDT 2007
Author: adamw
Date: 2007-04-24 16:39:40 -0400 (Tue, 24 Apr 2007)
New Revision: 11315
Modified:
labs/jbosslabs/branches/qa/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/MainCF.java
labs/jbosslabs/branches/qa/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/DownloadsFilter.java
labs/jbosslabs/branches/qa/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/downloads/Downloads.java
labs/jbosslabs/branches/qa/portal-extensions/forge-portlets/src/web/WEB-INF/portlet-instances.xml
labs/jbosslabs/branches/qa/portal-extensions/forge-portlets/src/web/WEB-INF/portlet.xml
labs/jbosslabs/branches/qa/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/attributesextractor/impl/PortletAttributesExctractor.java
labs/jbosslabs/branches/qa/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java
labs/jbosslabs/branches/qa/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/portlet/WikiPortletMyFaces.java
labs/jbosslabs/branches/qa/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiCommonSession.java
labs/jbosslabs/branches/qa/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiView.java
labs/jbosslabs/branches/qa/portal-extensions/jbosswiki/project.properties
Log:
MERGE 11293:11314
Modified: labs/jbosslabs/branches/qa/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/MainCF.java
===================================================================
--- labs/jbosslabs/branches/qa/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/MainCF.java 2007-04-24 20:34:41 UTC (rev 11314)
+++ labs/jbosslabs/branches/qa/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/MainCF.java 2007-04-24 20:39:40 UTC (rev 11315)
@@ -83,7 +83,12 @@
PathParser parser = new PathParser(requestPath);
if ("portal".equals(parser.getFirstToken())) {
- sendRedirect(invocation, "/" + parser.getRest());
+ String rest = parser.getRest();
+ if (rest == null) {
+ rest = "";
+ }
+
+ sendRedirect(invocation, "/" + rest);
return null;
}
Modified: labs/jbosslabs/branches/qa/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/DownloadsFilter.java
===================================================================
--- labs/jbosslabs/branches/qa/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/DownloadsFilter.java 2007-04-24 20:34:41 UTC (rev 11314)
+++ labs/jbosslabs/branches/qa/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/DownloadsFilter.java 2007-04-24 20:39:40 UTC (rev 11315)
@@ -39,117 +39,113 @@
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.forge.common.projects.project.Files;
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 String PROJ_DOWNLOAD = "[\\w\\d-]+/downloads/([\\w\\d-]+/)*[\\w\\d-]+(\\.[\\w\\d-]+)*";
- private static final Logger log = Logger.getLogger(DownloadsFilter.class);
+ private static final Logger log = Logger.getLogger(DownloadsFilter.class);
- public void destroy() {
+ public void destroy() {
- }
+ }
public boolean process(HttpServletRequest htReq, ServletResponse response) throws IOException {
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("/auth")) {
+ uri = uri.substring("/auth".length());
+ } else if (uri.startsWith("/authsec")) {
+ uri = uri.substring("/authsec".length());
+ }
- if (uri.startsWith("/")) {
- uri = uri.substring(1);
- }
+ if (uri.startsWith("/")) {
+ uri = uri.substring(1);
+ }
- //log.info(uri + " " + uri.matches(PROJ_DOWNLOAD));
+ //log.info(uri + " " + uri.matches(PROJ_DOWNLOAD));
- if (uri.matches(PROJ_DOWNLOAD)) {
- String projectId = uri.substring(0, uri.indexOf('/'));
+ if (uri.matches(PROJ_DOWNLOAD)) {
+ String projectId = uri.substring(0, uri.indexOf('/'));
- try {
- Downloads downl = LabsServices.getProjectsService()
- .getProjectDownloads(projectId);
+ try {
+ Downloads downl = LabsServices.getProjectsService().getProjectDownloads(projectId);
- String[] tokens = uri.split("/");
+ if (downl == null) {
+ return true;
+ }
- //log.info("tokens lenght: "+tokens.length);
+ Category cat;
- Category cat = null;
+ String[] tokens = uri.split("/", 3);
- // first check if url is leading to file
+ if (tokens.length < 3) {
+ return true;
+ }
- //there are categories
- if (tokens.length > 3) {
- for (int i = 2; i < tokens.length - 1; i++) {
- if (cat == null) {
- cat = downl.getCategories().getCategory(tokens[i]);
- } else {
- cat = cat.getCategories().getCategory(tokens[i]);
- }
+ String current = tokens[2];
+ tokens = current.split("/", 2);
+ cat = downl.getCategories().getCategory(tokens[0]);
+ Category newCat = cat;
- if (cat == null) {
- // url is invalid (no such categories) - forward
- // request
+ while (newCat != null) {
+ if (tokens.length < 2) {
+ return true;
+ }
- return true;
- }
- }
+ current = tokens[1];
+ tokens = current.split("/", 2);
+ cat = newCat;
- if (cat == null || cat.getFiles() == null) {
- return true;
- }
+ if (cat.getCategories() == null) {
+ newCat = null;
+ } else {
+ newCat = cat.getCategories().getCategory(tokens[0]);
+ }
+ }
- String fileURI = getUri(tokens[tokens.length - 1], cat.getFiles().getFile(), uri);
+ String fileURI;
+ if (cat == null) {
+ if (downl.getFiles() == null) {
+ return true;
+ }
- //log.info("FILE URI: "+fileURI);
+ fileURI = getUri(current, downl.getFiles(), uri);
+ } else {
+ if (cat.getFiles() == null) {
+ return true;
+ }
- if (fileURI != null) {
- //htReq.getRequestDispatcher(fileURI).forward(
- // request, response);
- ((HttpServletResponse)response).sendRedirect(fileURI);
- return false;
- }
- } else {
- //no categories just check file
-
- if (downl == null || downl.getFiles() == null) {
- return true;
- }
+ fileURI = getUri(current, cat.getFiles(), uri);
+ }
- String fileURI = getUri(tokens[tokens.length - 1],
- downl.getFiles().getFile(), uri);
+ if (fileURI != null) {
+ ((HttpServletResponse)response).sendRedirect(fileURI);
- //log.info("FILE URI: "+fileURI);
+ return false;
+ } else {
+ return true;
+ }
+ } catch (ServiceRetrievalException e) {
+ log.error(e);
+ }
+ }
- if (fileURI != null) {
- //htReq.getRequestDispatcher(fileURI).forward(
- // request, response);
- ((HttpServletResponse)response).sendRedirect(fileURI);
-
- return false;
- }
- }
- } catch (ServiceRetrievalException e) {
- log.error(e);
- }
- }
-
return true;
}
public void doFilter(ServletRequest request, ServletResponse response,
- FilterChain chain) throws IOException, ServletException {
- if (request instanceof HttpServletRequest) {
- HttpServletRequest htReq = (HttpServletRequest) request;
+ FilterChain chain) throws IOException, ServletException {
+ if (request instanceof HttpServletRequest) {
+ HttpServletRequest htReq = (HttpServletRequest) request;
if (process(htReq, response)) {
chain.doFilter(request, response);
@@ -157,25 +153,28 @@
} else {
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.
+ private String getUri(String fileName, Files files,
+ String uri) {
+ File f = files.getFile(fileName);
- return "/file-access/default/members/" + uri;
- }
- }
+ if (f != null) {
+ return "/file-access/default/members/" + uri;
+ }
- return null;
- }
+ /*for (File f : files) {
+ if (f.getId().equals(fileName)) {
- public void init(FilterConfig arg0) throws ServletException {
+ return "/file-access/default/members/" + uri;
+ }
+ }*/
- }
+ return null;
+ }
+ public void init(FilterConfig arg0) throws ServletException {
+
+ }
+
}
Modified: labs/jbosslabs/branches/qa/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/downloads/Downloads.java
===================================================================
--- labs/jbosslabs/branches/qa/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/downloads/Downloads.java 2007-04-24 20:34:41 UTC (rev 11314)
+++ labs/jbosslabs/branches/qa/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/downloads/Downloads.java 2007-04-24 20:39:40 UTC (rev 11315)
@@ -134,21 +134,29 @@
name = d.getName();
}
} else {
- String[] cats = categoryId.split("/");
+ Category cat = null;
- Category cat = d.getCategories().getCategory(cats[0]);
+ try {
+ String[] cats = categoryId.split("/");
- if (cat == null) {
- throw new Exception("No such category: " + categoryId);
- }
+ cat = d.getCategories().getCategory(cats[0]);
- for (int i = 1; i < cats.length; i++) {
- cat = cat.getCategories().getCategory(cats[i]);
-
if (cat == null) {
throw new Exception("No such category: "
+ categoryId);
}
+
+ for (int i = 1; i < cats.length; i++) {
+ cat = cat.getCategories().getCategory(cats[i]);
+
+ if (cat == null) {
+ throw new Exception("No such category: "
+ + categoryId);
+ }
+ }
+ } catch (Exception e) {
+ response.getWriter().write("ERROR: " + e.getMessage());
+ return;
}
if (cat.getFiles() != null)
Modified: labs/jbosslabs/branches/qa/portal-extensions/forge-portlets/src/web/WEB-INF/portlet-instances.xml
===================================================================
--- labs/jbosslabs/branches/qa/portal-extensions/forge-portlets/src/web/WEB-INF/portlet-instances.xml 2007-04-24 20:34:41 UTC (rev 11314)
+++ labs/jbosslabs/branches/qa/portal-extensions/forge-portlets/src/web/WEB-INF/portlet-instances.xml 2007-04-24 20:39:40 UTC (rev 11315)
@@ -282,7 +282,7 @@
</preference>
<preference>
<name>title</name>
- <value>Architect's library</value>
+ <value>Articles & Whitepapers</value>
</preference>
</preferences>
</instance>
Modified: labs/jbosslabs/branches/qa/portal-extensions/forge-portlets/src/web/WEB-INF/portlet.xml
===================================================================
--- labs/jbosslabs/branches/qa/portal-extensions/forge-portlets/src/web/WEB-INF/portlet.xml 2007-04-24 20:34:41 UTC (rev 11314)
+++ labs/jbosslabs/branches/qa/portal-extensions/forge-portlets/src/web/WEB-INF/portlet.xml 2007-04-24 20:39:40 UTC (rev 11315)
@@ -44,6 +44,10 @@
<name>page</name>
<value></value>
</preference>
+ <preference>
+ <name>title</name>
+ <value></value>
+ </preference>
</portlet-preferences>
</portlet>
Modified: labs/jbosslabs/branches/qa/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/attributesextractor/impl/PortletAttributesExctractor.java
===================================================================
--- labs/jbosslabs/branches/qa/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/attributesextractor/impl/PortletAttributesExctractor.java 2007-04-24 20:34:41 UTC (rev 11314)
+++ labs/jbosslabs/branches/qa/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/attributesextractor/impl/PortletAttributesExctractor.java 2007-04-24 20:39:40 UTC (rev 11315)
@@ -107,7 +107,7 @@
language = rReq.getParameter("language");
- log.info("Version = "+rReq.getParameter("version"));
+ log.debug("Version = "+rReq.getParameter("version"));
pageVersion = (rReq.getParameter("version") != null) ? Integer
.valueOf(rReq.getParameter("version")) : null;
Modified: labs/jbosslabs/branches/qa/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java
===================================================================
--- labs/jbosslabs/branches/qa/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java 2007-04-24 20:34:41 UTC (rev 11314)
+++ labs/jbosslabs/branches/qa/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java 2007-04-24 20:39:40 UTC (rev 11315)
@@ -124,7 +124,7 @@
log.error(e);
}
- log.info("Loaded attachements path: " + attachementsPath);
+ log.debug("Loaded attachements path: " + attachementsPath);
}
public void doFilter(ServletRequest request, ServletResponse response,
@@ -150,7 +150,7 @@
String requestURI = URLDecoder.decode(httpRequest.getRequestURI(),
"UTF-8");
- log.info("RequestURI: " + requestURI);
+ log.debug("RequestURI: " + requestURI);
// get off "/wiki/" from the begining
requestURI = requestURI
Modified: labs/jbosslabs/branches/qa/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/portlet/WikiPortletMyFaces.java
===================================================================
--- labs/jbosslabs/branches/qa/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/portlet/WikiPortletMyFaces.java 2007-04-24 20:34:41 UTC (rev 11314)
+++ labs/jbosslabs/branches/qa/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/portlet/WikiPortletMyFaces.java 2007-04-24 20:39:40 UTC (rev 11315)
@@ -79,7 +79,7 @@
protected void doEdit(RenderRequest request, RenderResponse response) throws PortletException, IOException {
setPortletRequestFlag(request);
- log.info("edit");
+ log.debug("edit");
nonFacesRequest(request, response, EDIT_VIEW);
}
@@ -87,7 +87,7 @@
protected void doView(RenderRequest request, RenderResponse response)
throws PortletException, IOException {
- log.info("current" + request.getParameter(VIEW_ID));
+ log.debug("current" + request.getParameter(VIEW_ID));
Map paramMap = request.getParameterMap();
@@ -96,14 +96,14 @@
WikiHelper.getAttributesExtractor(request, response)
.getWikiSession().setAttribute(key,
((String[]) paramMap.get(key))[0]);
- log.info("Wiki Param: " + key + " = "
+ log.debug("Wiki Param: " + key + " = "
+ ((String[]) paramMap.get(key))[0]);
}
}
//if default view - do nonFacesRequest
if (request.getParameter(VIEW_ID).equals(getInitParameter(DEFAULT_VIEW))) {
- log.info("performing nonFacesRender");
+ log.debug("performing nonFacesRender");
setPortletRequestFlag(request);
nonFacesRequest(request, response, getInitParameter(DEFAULT_VIEW));
return;
@@ -189,7 +189,7 @@
response.setRenderParameter(fieldName, value);
paramMap.put(fieldName, new String[] { value });
- log.info("new render param: " + fieldName + " = "
+ log.debug("new render param: " + fieldName + " = "
+ value);
} else {
// write the uploaded file to a new location
@@ -229,7 +229,7 @@
item.write(serverFile);
- log.info("serverFileName : " + tempDir + "/"
+ log.debug("serverFileName : " + tempDir + "/"
+ serverFileName + " filename: " + fileName);
// save file
@@ -250,13 +250,13 @@
}
private void prepareParams(ActionRequest request, ActionResponse response) {
- log.info("pp param");
+ log.debug("pp param");
Map paramMap = request.getParameterMap();
for (String key : (Set<String>) paramMap.keySet()) {
if (paramMatches(key)) {
response.setRenderParameter(key, request.getParameter(key));
- log.info("Param: " + key + " = " + request.getParameter(key));
+ log.debug("Param: " + key + " = " + request.getParameter(key));
}
}
}
Modified: labs/jbosslabs/branches/qa/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiCommonSession.java
===================================================================
--- labs/jbosslabs/branches/qa/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiCommonSession.java 2007-04-24 20:34:41 UTC (rev 11314)
+++ labs/jbosslabs/branches/qa/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiCommonSession.java 2007-04-24 20:39:40 UTC (rev 11315)
@@ -60,7 +60,7 @@
public void update(AttributesExtractor attrExtractor) {
if (attrExtractor.getRequestedPageName() != null && attrExtractor.getRequestedPageName().length() > 0) {
pageName = attrExtractor.getRequestedPageName();
- log.info("Page name: " + pageName);
+ log.debug("Page name: " + pageName);
} else {
if (pageName == null
&& (pageName = attrExtractor.getUserDefaultPage()) == null) {
Modified: labs/jbosslabs/branches/qa/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiView.java
===================================================================
--- labs/jbosslabs/branches/qa/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiView.java 2007-04-24 20:34:41 UTC (rev 11314)
+++ labs/jbosslabs/branches/qa/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiView.java 2007-04-24 20:39:40 UTC (rev 11315)
@@ -132,7 +132,7 @@
type = attrExtractor.getType();
}
- log.info("Loading page: "
+ log.debug("Loading page: "
+ WikiHelper.getWikiCommonSession().getPageName() + " ["
+ WikiHelper.getWikiCommonSession().getLangCode() + "] type: "
+ type);
@@ -157,7 +157,7 @@
- log.info("page loaded: " + currentPage.getName());
+ log.debug("page loaded: " + currentPage.getName());
return currentPage;
}
Modified: labs/jbosslabs/branches/qa/portal-extensions/jbosswiki/project.properties
===================================================================
--- labs/jbosslabs/branches/qa/portal-extensions/jbosswiki/project.properties 2007-04-24 20:34:41 UTC (rev 11314)
+++ labs/jbosslabs/branches/qa/portal-extensions/jbosswiki/project.properties 2007-04-24 20:39:40 UTC (rev 11315)
@@ -5,6 +5,7 @@
maven.jar.override=on
maven.jar.shotoku-base=${ext.root.dir}/shotoku/shotoku-base/target/shotoku-base.jar
+maven.jar.shotoku-aop=${ext.root.dir}/shotoku/shotoku-aop/target/shotoku-aop.jar
maven.war.classes.excludes=
maven.jar.includes=**/*
More information about the jboss-svn-commits
mailing list