[jboss-svn-commits] JBL Code SVN: r9221 - in labs/jbosslabs/trunk/portal-extensions-newprj: forge-common/src/java/org/jboss/forge/common/ejb3 and 10 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Jan 31 15:15:28 EST 2007
Author: adamw
Date: 2007-01-31 15:15:28 -0500 (Wed, 31 Jan 2007)
New Revision: 9221
Added:
labs/jbosslabs/trunk/portal-extensions-newprj/forge-freezone/src/java/org/jboss/forge/projects/freezone/TestServlet.java
Removed:
labs/jbosslabs/trunk/portal-extensions-newprj/forge-portal-attr/src/java/org/jboss/forge/portal/AttributesFilter.java
Modified:
labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/src/java/org/jboss/forge/common/Constants.java
labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/src/java/org/jboss/forge/common/ForgeHelper.java
labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/src/java/org/jboss/forge/common/ejb3/ProjectsService.java
labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/src/java/org/jboss/forge/common/projects/ProjectsHelper.java
labs/jbosslabs/trunk/portal-extensions-newprj/forge-ejb3/forge-ejb3.iml
labs/jbosslabs/trunk/portal-extensions-newprj/forge-ejb3/src/java/org/jboss/forge/ejb3/projectpages/ProjectPagesServiceBean.java
labs/jbosslabs/trunk/portal-extensions-newprj/forge-ejb3/src/java/org/jboss/forge/ejb3/projects/ProjectsServiceImpl.java
labs/jbosslabs/trunk/portal-extensions-newprj/forge-feeds/src/java/org/jboss/forge/feeds/CmsLinkParser.java
labs/jbosslabs/trunk/portal-extensions-newprj/forge-freezone/src/web/WEB-INF/web.xml
labs/jbosslabs/trunk/portal-extensions-newprj/forge-mapper/src/java/org/jboss/labs/mapper/LabsCommandFactory.java
labs/jbosslabs/trunk/portal-extensions-newprj/jmm/jmm-common/src/java/org/jboss/forge/jmm/common/tools/ProjectTools.java
Log:
Labs EJB3 components
Modified: labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/src/java/org/jboss/forge/common/Constants.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/src/java/org/jboss/forge/common/Constants.java 2007-01-31 19:38:54 UTC (rev 9220)
+++ labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/src/java/org/jboss/forge/common/Constants.java 2007-01-31 20:15:28 UTC (rev 9221)
@@ -64,33 +64,8 @@
* directory for this portal.
*/
public final static String PROP_SHOTOKU_PORTAL_DIRECTORY = "shotoku.main.directory";
-
- /**
- * An url parameter that should be set when a link does not point
- * to a project site.
- */
- public final static String NO_PROJECT_PARAM_NAME = "noproject";
/**
- * An url parameter+value pair that should be set when a link does not
- * point to a project site.
- */
- public final static String NO_PROJECT_PARAM = Constants.NO_PROJECT_PARAM_NAME + "=" +
- Constants.TRUE_VALUE;
-
- /**
- * Name of the paramter in the URL
- * depicting the selected project.
- */
- public final static String PROJECT_PARAM = "project";
-
- /**
- * An url parameter that should be set when it is known if the projects list
- * should be expanded or not when showing a projects' menu.
- */
- public static final String PROJECT_LIST_PARAM = "prjlist";
-
- /**
* A string representing a true value.
*/
public final static String TRUE_VALUE = "true";
@@ -99,4 +74,8 @@
* A string representing a false value.
*/
public final static String FALSE_VALUE = "false";
+ /**
+ * <code>LABS_PORTAL</code> - name of the portal where the labs page is.
+ */
+ public final static String LABS_PORTAL = "default";
}
Modified: labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/src/java/org/jboss/forge/common/ForgeHelper.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/src/java/org/jboss/forge/common/ForgeHelper.java 2007-01-31 19:38:54 UTC (rev 9220)
+++ labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/src/java/org/jboss/forge/common/ForgeHelper.java 2007-01-31 20:15:28 UTC (rev 9221)
@@ -105,12 +105,7 @@
*/
public final static String FORGE_SERVICE_NAME = "forge:service=cacheAndUpdate";
- /**
- * <code>LABS_PORTAL</code> - name of the portal where the labs page is.
- */
- public final static String LABS_PORTAL = "default";
-
- private static Vector<String> tempFiles;
+ private static Vector<String> tempFiles;
public static final String FILES_PREFIX = "labsTempFile";
@@ -399,16 +394,6 @@
if (link == null)
return link;
- // To each link, adding a noproject param, unless it's a project link.
- if ((!link.contains(Constants.NO_PROJECT_PARAM)) &&
- (!Tools.isOutsideLink(link))) {
- // Checking if this is a first parameter.
- if (link.contains("?"))
- return link + "&" + Constants.NO_PROJECT_PARAM;
- else
- return link + "?" + Constants.NO_PROJECT_PARAM;
- }
-
return link;
}
@@ -427,13 +412,6 @@
link = ForgeHelper.createPageLink(portalName, "default");
}
- // Deleting the noproject parameter, as it is not present in the generated links.
- // There are three possibilites: it is the first parameter and there are no more
- // parameters, there are more parameters, or it is a not-first parameter.
- link = removeParameter(link, Constants.NO_PROJECT_PARAM);
- link = removeParameter(link, Constants.PROJECT_LIST_PARAM+"="+Constants.FALSE_VALUE);
- link = removeParameter(link, Constants.PROJECT_LIST_PARAM+"="+Constants.TRUE_VALUE);
-
while (link.contains("//")) {
link = link.replace("//", "/");
}
Modified: labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/src/java/org/jboss/forge/common/ejb3/ProjectsService.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/src/java/org/jboss/forge/common/ejb3/ProjectsService.java 2007-01-31 19:38:54 UTC (rev 9220)
+++ labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/src/java/org/jboss/forge/common/ejb3/ProjectsService.java 2007-01-31 20:15:28 UTC (rev 9221)
@@ -76,7 +76,7 @@
public List<Documentation> getProjectDocumentation (String projectId);
- public long getOverallDownloadsForProject(String projectId, String portalName);
+ public long getOverallDownloadsForProject(String projectId);
public boolean getPackagedForDownload(String projectId);
Modified: labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/src/java/org/jboss/forge/common/projects/ProjectsHelper.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/src/java/org/jboss/forge/common/projects/ProjectsHelper.java 2007-01-31 19:38:54 UTC (rev 9220)
+++ labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/src/java/org/jboss/forge/common/projects/ProjectsHelper.java 2007-01-31 20:15:28 UTC (rev 9221)
@@ -147,15 +147,15 @@
* is selected. False if null should be returned in such case.
* @return Selected project's id, or the default project's id/ null, depending
* on <code>withDefault</code>, if no project is selected.
+ * @deprecated
*/
public static String getSelectedProjectId(JBossRenderRequest request,
boolean withDefault) {
- Object projectIdObj = request.getAttribute(Constants.PROJECT_PARAM);
- String projectId = projectIdObj == null ? null : projectIdObj.toString();
+ String projectId = null;
- if ((withDefault) && ((projectId == null) || ("".equals(projectId)))) {
+ if ((withDefault)) {
projectId = DEFAULT_PROJECT;
- } else if ((!withDefault) && (DEFAULT_PROJECT.equals(projectId))) {
+ } else if (DEFAULT_PROJECT.equals(projectId)) {
projectId = null;
} else if ((!DEFAULT_PROJECT.equals(projectId)) &&
(getProjects(ForgeHelper.getPortalName(request)).getProjectContext(
@@ -174,6 +174,7 @@
* read.
* @return Selected project's id, or null, if no project is selected (never
* the default project, as it cannot be selected).
+ * @deprecated
*/
public static String getSelectedProjectId(JBossActionRequest request) {
return getSelectedProjectId(request, false);
@@ -188,15 +189,15 @@
* is selected. False if null should be returned in such case.
* @return Selected project's id, or the default project's id/ null, depending
* on <code>withDefault</code>, if no project is selected.
+ * @deprecated
*/
public static String getSelectedProjectId(JBossActionRequest request,
boolean withDefault) {
- Object projectIdObj = request.getAttribute(Constants.PROJECT_PARAM);
- String projectId = projectIdObj == null ? null : projectIdObj.toString();
+ String projectId = null;
- if ((withDefault) && (projectId == null)) {
+ if ((withDefault)) {
projectId = DEFAULT_PROJECT;
- } else if ((!withDefault) && (DEFAULT_PROJECT.equals(projectId))) {
+ } else if ((DEFAULT_PROJECT.equals(projectId))) {
projectId = null;
} else if ((!DEFAULT_PROJECT.equals(projectId)) &&
(getProjects(ForgeHelper.getPortalName(request)).getProjectContext(
Modified: labs/jbosslabs/trunk/portal-extensions-newprj/forge-ejb3/forge-ejb3.iml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-newprj/forge-ejb3/forge-ejb3.iml 2007-01-31 19:38:54 UTC (rev 9220)
+++ labs/jbosslabs/trunk/portal-extensions-newprj/forge-ejb3/forge-ejb3.iml 2007-01-31 20:15:28 UTC (rev 9221)
@@ -15,6 +15,7 @@
<orderEntry type="library" name="jboss" level="application" />
<orderEntry type="library" name="portal" level="application" />
<orderEntry type="library" name="portlet" level="application" />
+ <orderEntry type="library" name="myfaces" level="application" />
<orderEntryProperties />
</component>
</module>
Modified: labs/jbosslabs/trunk/portal-extensions-newprj/forge-ejb3/src/java/org/jboss/forge/ejb3/projectpages/ProjectPagesServiceBean.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-newprj/forge-ejb3/src/java/org/jboss/forge/ejb3/projectpages/ProjectPagesServiceBean.java 2007-01-31 19:38:54 UTC (rev 9220)
+++ labs/jbosslabs/trunk/portal-extensions-newprj/forge-ejb3/src/java/org/jboss/forge/ejb3/projectpages/ProjectPagesServiceBean.java 2007-01-31 20:15:28 UTC (rev 9221)
@@ -1,8 +1,12 @@
package org.jboss.forge.ejb3.projectpages;
import org.jboss.forge.common.ejb3.ProjectPagesService;
+import org.jboss.portal.core.model.portal.PortalObjectContainer;
+import org.jboss.portal.core.model.instance.InstanceContainer;
+import org.jboss.annotation.ejb.Depends;
import javax.ejb.Stateless;
+import javax.annotation.Resource;
import java.util.Set;
/**
@@ -10,8 +14,15 @@
*/
@Stateless
public class ProjectPagesServiceBean implements ProjectPagesService {
+ @Depends("portal:container=PortalObject")
+ PortalObjectContainer poc;
+
+ @Depends("portal:container=Instance")
+ InstanceContainer pic;
+
public void updatePages(String projectId) {
System.out.println("UPDATING PROJECT PAGES: " + projectId);
+ System.out.println("POC: " + poc.getRootObject().getClass().getName());
}
public void removeExcessPages(Set<String> projectIds) {
Modified: labs/jbosslabs/trunk/portal-extensions-newprj/forge-ejb3/src/java/org/jboss/forge/ejb3/projects/ProjectsServiceImpl.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-newprj/forge-ejb3/src/java/org/jboss/forge/ejb3/projects/ProjectsServiceImpl.java 2007-01-31 19:38:54 UTC (rev 9220)
+++ labs/jbosslabs/trunk/portal-extensions-newprj/forge-ejb3/src/java/org/jboss/forge/ejb3/projects/ProjectsServiceImpl.java 2007-01-31 20:15:28 UTC (rev 9221)
@@ -52,10 +52,10 @@
import org.jboss.forge.common.projects.project.Repository;
import org.jboss.forge.common.projects.project.SupportService;
import org.jboss.forge.common.ejb3.ProjectsService;
+import org.jboss.forge.common.Constants;
import org.jboss.logging.Logger;
import org.jboss.shotoku.ContentManager;
import org.jboss.shotoku.Node;
-import org.jboss.shotoku.tools.Constants;
import org.jboss.shotoku.aop.Inject;
@@ -66,13 +66,10 @@
@Service(objectName = ProjectsService.PROJECTS_SERVICE)
@Management(ProjectsService.class)
@Remote(ProjectsService.class)
- at Depends(Constants.SHOTOKU_SERVICE_NAME)
+ at Depends(org.jboss.shotoku.tools.Constants.SHOTOKU_SERVICE_NAME)
public class ProjectsServiceImpl implements ProjectsService {
-
private static final Logger log = Logger.getLogger(ProjectsService.class);
- private static final String PORTAL_NAME = "default";
-
private static final JAXBContext jc;
static {
@@ -92,13 +89,13 @@
private ContentManager cm;
public Collection<Project> getProjects() {
- Projects projectsClass = ProjectsHelper.getProjects(PORTAL_NAME);
+ Projects projectsClass = ProjectsHelper.getProjects(Constants.LABS_PORTAL);
Map<String,Project> projects = projectsClass.getProjectsDescriptor().getNewProjects();
return projects.values();
}
public Project getProjectByName(String projectId) {
- Projects projectsClass = ProjectsHelper.getProjects(PORTAL_NAME);
+ Projects projectsClass = ProjectsHelper.getProjects(Constants.LABS_PORTAL);
Map<String,Project> projects = projectsClass.getProjectsDescriptor().getNewProjects();
return projects.get(projectId);
}
@@ -175,9 +172,8 @@
return project.getDocumentation();
}
- public long getOverallDownloadsForProject(String projectId, String portalName) {
-
- return DownloadCounterTools.getOverallDownloadsForProject(projectId, portalName);
+ public long getOverallDownloadsForProject(String projectId) {
+ return DownloadCounterTools.getOverallDownloadsForProject(projectId, Constants.LABS_PORTAL);
}
public boolean getPackagedForDownload(String projectId) {
@@ -202,7 +198,7 @@
m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
Node node = cm.getRootDirectory().
- getDirectory(PORTAL_NAME).
+ getDirectory(Constants.LABS_PORTAL).
getDirectory(ProjectsHelper.MEMBERS_DIR).
getDirectory(project.getId()).
getNode(ProjectsHelper.PROJECT_DESC);
Modified: labs/jbosslabs/trunk/portal-extensions-newprj/forge-feeds/src/java/org/jboss/forge/feeds/CmsLinkParser.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-newprj/forge-feeds/src/java/org/jboss/forge/feeds/CmsLinkParser.java 2007-01-31 19:38:54 UTC (rev 9220)
+++ labs/jbosslabs/trunk/portal-extensions-newprj/forge-feeds/src/java/org/jboss/forge/feeds/CmsLinkParser.java 2007-01-31 20:15:28 UTC (rev 9221)
@@ -2,6 +2,7 @@
import org.jboss.shotoku.tools.Tools;
import org.jboss.forge.common.ForgeHelper;
+import org.jboss.forge.common.Constants;
import org.jboss.forge.common.projects.ProjectsHelper;
/**
@@ -9,7 +10,7 @@
*/
public class CmsLinkParser {
public static final String PRJ_FREEZONE_LINK_PREFIX =
- ForgeHelper.LABS_PORTAL + "/" +
+ Constants.LABS_PORTAL + "/" +
ProjectsHelper.MEMBERS_DIR + "/";
public static final int PRJ_FREEZONE_LINK_PREFIX_LEN =
PRJ_FREEZONE_LINK_PREFIX.length();
Added: labs/jbosslabs/trunk/portal-extensions-newprj/forge-freezone/src/java/org/jboss/forge/projects/freezone/TestServlet.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-newprj/forge-freezone/src/java/org/jboss/forge/projects/freezone/TestServlet.java (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions-newprj/forge-freezone/src/java/org/jboss/forge/projects/freezone/TestServlet.java 2007-01-31 20:15:28 UTC (rev 9221)
@@ -0,0 +1,28 @@
+package org.jboss.forge.projects.freezone;
+
+import org.jboss.forge.common.ejb3.LabsServices;
+
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.ServletException;
+import javax.naming.NamingException;
+import java.io.IOException;
+
+/**
+ * TO REMOVE! Just for testing.
+ * @author <a href="mailto:adamw at aster.pl">Adam Warski</a>
+ */
+public class TestServlet extends HttpServlet {
+
+ protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ response.setContentType("text/html");
+ response.getWriter().println("Calling project pages service bean.");
+
+ try {
+ LabsServices.getProjectPagesService().updatePages("jbossas");
+ } catch (NamingException e) {
+ e.printStackTrace();
+ }
+ }
+}
Modified: labs/jbosslabs/trunk/portal-extensions-newprj/forge-freezone/src/web/WEB-INF/web.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-newprj/forge-freezone/src/web/WEB-INF/web.xml 2007-01-31 19:38:54 UTC (rev 9220)
+++ labs/jbosslabs/trunk/portal-extensions-newprj/forge-freezone/src/web/WEB-INF/web.xml 2007-01-31 20:15:28 UTC (rev 9221)
@@ -14,4 +14,14 @@
<url-pattern>/repo-access/*</url-pattern>
<dispatcher>INCLUDE</dispatcher>
</filter-mapping>
+
+ <servlet>
+ <servlet-name>Test</servlet-name>
+ <servlet-class>org.jboss.forge.projects.freezone.TestServlet</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>Test</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
</web-app>
\ No newline at end of file
Modified: labs/jbosslabs/trunk/portal-extensions-newprj/forge-mapper/src/java/org/jboss/labs/mapper/LabsCommandFactory.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-newprj/forge-mapper/src/java/org/jboss/labs/mapper/LabsCommandFactory.java 2007-01-31 19:38:54 UTC (rev 9220)
+++ labs/jbosslabs/trunk/portal-extensions-newprj/forge-mapper/src/java/org/jboss/labs/mapper/LabsCommandFactory.java 2007-01-31 20:15:28 UTC (rev 9221)
@@ -152,7 +152,7 @@
* - the requested resource is of another mime type - in this case,
* we send a redirect to the file-access servlet.
*/
- String cmsPath = getCmsPath(ForgeHelper.LABS_PORTAL, projectId, path);
+ String cmsPath = getCmsPath(Constants.LABS_PORTAL, projectId, path);
try {
if (!Constants.PAGES_MIME_TYPE.equalsIgnoreCase(cm.getNode(cmsPath).getMimeType())) {
@@ -215,7 +215,7 @@
redirect = freezonePage;
} else {
redirect = ProjectsHelper.createFreezonePageLink(
- ForgeHelper.LABS_PORTAL, projectId, freezonePage);
+ Constants.LABS_PORTAL, projectId, freezonePage);
}
sendRedirect(invocation, redirect);
@@ -229,13 +229,6 @@
public ControllerCommand doMapping(ServerInvocation invocation, String host, String portalContextPath,
String portalRequestPath) {
- // TODO temporary for freezone
- String projectParam = invocation.getServerContext().getClientRequest()
- .getParameter(Constants.PROJECT_PARAM);
- if (projectParam != null) {
- setAttribute(invocation, Constants.PROJECT_PARAM, projectParam);
- }
-
// Removing unnecessary /.
while (portalRequestPath.indexOf("//") != -1) {
portalRequestPath = portalRequestPath.replace("//", "/");
@@ -266,14 +259,8 @@
ControllerCommand c;
String[] tokens = portalRequestPath.split("[/]", 3);
- Projects projects = ProjectsHelper.getProjects(ForgeHelper.LABS_PORTAL);
+ Projects projects = ProjectsHelper.getProjects(Constants.LABS_PORTAL);
if ((tokens.length > 1) && (projects.projectExists(tokens[1]))) {
- /*
- * The user requested a project page (/projectId). It will be
- * unset, if necessary, in the AttributesFilter.
- */
- setAttribute(invocation, Constants.PROJECT_PARAM, tokens[1]);
-
try {
c = getProjectCommand(invocation, tokens.length > 2 ? tokens[2] : null,
tokens[1], projects);
Deleted: labs/jbosslabs/trunk/portal-extensions-newprj/forge-portal-attr/src/java/org/jboss/forge/portal/AttributesFilter.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-newprj/forge-portal-attr/src/java/org/jboss/forge/portal/AttributesFilter.java 2007-01-31 19:38:54 UTC (rev 9220)
+++ labs/jbosslabs/trunk/portal-extensions-newprj/forge-portal-attr/src/java/org/jboss/forge/portal/AttributesFilter.java 2007-01-31 20:15:28 UTC (rev 9221)
@@ -1,108 +0,0 @@
-/*
- * 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 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 org.jboss.forge.common.Constants;
-
-/**
- * Filter which sets attributes that are necessary for labs portlets to be
- * fully functional.
- * @author Adam Warski (adamw at aster.pl)
- */
-public class AttributesFilter implements Filter {
- public void init(FilterConfig config) throws ServletException {
-
- }
-
- public void doFilter(ServletRequest request,
- ServletResponse response, FilterChain chain)
- throws IOException, ServletException {
- if (request instanceof HttpServletRequest) {
- HttpServletRequest httpRequest = (HttpServletRequest) request;
-
- // Getting the request parameters.
- String noproject = request.getParameter(Constants.NO_PROJECT_PARAM_NAME);
- String project = request.getParameter(Constants.PROJECT_PARAM);
- String prjList = request.getParameter(Constants.PROJECT_LIST_PARAM);
-
- // The project doesn't have to be passed as a parameter. It can be
- // passed in the requestURI, when accessing freezone pages. This
- // only applies to the default portal.
- String requestURI = httpRequest.getRequestURI();
-
- // ProjectId handling.
- if (Constants.TRUE_VALUE.equals(noproject)) {
- // Removing project from session info.
- httpRequest.getSession().removeAttribute(Constants.PROJECT_PARAM);
- httpRequest.removeAttribute(Constants.PROJECT_PARAM);
- } else if ((project != null) && (!"".equals(project))) {
- httpRequest.getSession().setAttribute(Constants.PROJECT_PARAM, project);
- httpRequest.setAttribute(Constants.PROJECT_PARAM, project);
- } else {
- Object val = httpRequest.getSession().getAttribute(Constants.PROJECT_PARAM);
- if (val != null) {
- httpRequest.setAttribute(Constants.PROJECT_PARAM, val.toString());
- }
- }
-
- // ProjectList handling.
- if (Constants.TRUE_VALUE.equals(noproject)) {
- httpRequest.getSession().removeAttribute(Constants.PROJECT_LIST_PARAM);
- httpRequest.removeAttribute(Constants.PROJECT_LIST_PARAM);
- } else if ((prjList != null) && (!"".equals(prjList))) {
- Object val = Constants.TRUE_VALUE.equals(prjList);
-
- httpRequest.getSession().setAttribute(Constants.PROJECT_LIST_PARAM, val);
- httpRequest.setAttribute(Constants.PROJECT_LIST_PARAM, val);
- } else {
- Object val = httpRequest.getSession().getAttribute(Constants.PROJECT_LIST_PARAM);
- if (val != null) {
- httpRequest.setAttribute(Constants.PROJECT_LIST_PARAM, val);
- }
- }
-
- // Putting the full requested url into session for navigation.
- String fullUrl = requestURI;
- if (httpRequest.getQueryString() != null) {
- fullUrl += "?" + httpRequest.getQueryString();
- }
-
- httpRequest.setAttribute(Constants.ATTR_URL, fullUrl);
- }
-
- chain.doFilter(request, response);
- }
-
- public void destroy() {
-
- }
-}
Modified: labs/jbosslabs/trunk/portal-extensions-newprj/jmm/jmm-common/src/java/org/jboss/forge/jmm/common/tools/ProjectTools.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-newprj/jmm/jmm-common/src/java/org/jboss/forge/jmm/common/tools/ProjectTools.java 2007-01-31 19:38:54 UTC (rev 9220)
+++ labs/jbosslabs/trunk/portal-extensions-newprj/jmm/jmm-common/src/java/org/jboss/forge/jmm/common/tools/ProjectTools.java 2007-01-31 20:15:28 UTC (rev 9221)
@@ -113,7 +113,7 @@
public static long getOverallDownloadsForProject(String projectId, String portalName) {
- return service.getOverallDownloadsForProject(projectId, portalName);
+ return service.getOverallDownloadsForProject(projectId);
}
public static boolean getPackagedForDownload(String projectId) {
More information about the jboss-svn-commits
mailing list