|
From: <jbo...@li...> - 2006-06-11 16:06:17
|
Author: adamw
Date: 2006-06-11 12:06:12 -0400 (Sun, 11 Jun 2006)
New Revision: 4735
Modified:
labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/LabsCommandMapper.java
Log:
Bug fix
Modified: labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/LabsCommandMapper.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/LabsCommandMapper.java 2006-06-11 14:45:27 UTC (rev 4734)
+++ labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/LabsCommandMapper.java 2006-06-11 16:06:12 UTC (rev 4735)
@@ -101,7 +101,6 @@
return (s == null) || ("".equals(s));
}
- @Inject
private ContentManager cm;
private void setParamIfNotNull(Parameters params, String name, String value) {
@@ -208,7 +207,6 @@
sendRedirect(invocation, "/" + ForgeHelper.FILE_ACCESS_DIR + "/" + cmsPath);
}
} catch (Exception e) {
-
}
setAttribute(invocation, Constants.ATTR_REQ_PATH, cmsPath);
@@ -279,10 +277,6 @@
public ControllerCommand doMapping(ServerInvocation invocation,
String portalContextPath, String portalRequestPath)
throws InvocationException, InvocationRuntimeException {
- /* TODO remove
- System.out.println("REQUEST: " + portalRequestPath +
- " ?" + invocation.getRequest().getContext().getClientRequest().getQueryString());*/
-
// TODO temporary for freezone
String projectParam = invocation.getRequest().getContext().getClientRequest()
.getParameter(Constants.PROJECT_PARAM);
@@ -290,6 +284,8 @@
setAttribute(invocation, Constants.PROJECT_PARAM, projectParam);
}
+
+
// Removing unnecessary /.
while (portalRequestPath.indexOf("//") != -1) {
portalRequestPath = portalRequestPath.replace("//", "/");
@@ -430,7 +426,7 @@
@Override
protected void startService() throws Exception {
-
+ cm = ContentManager.getContentManager();
}
@Override
|