[jboss-svn-commits] JBL Code SVN: r9289 - in labs/jbosslabs/trunk/portal-extensions-newprj: forge-ads/src/java/org/jbosslabs/portlet/ads and 5 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Feb 2 09:39:15 EST 2007
Author: adamw
Date: 2007-02-02 09:39:15 -0500 (Fri, 02 Feb 2007)
New Revision: 9289
Modified:
labs/jbosslabs/trunk/portal-extensions-newprj/forge-ads/src/java/org/jbosslabs/portlet/ads/AdsPortlet.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/portlet/JBossLabsPortlet.java
labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/src/java/org/jboss/forge/common/projects/ProjectsDescriptor.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/src/java/org/jboss/forge/ejb3/projectpages/ProjectPagesServiceBean.java
labs/jbosslabs/trunk/portal-extensions-newprj/forge-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java
labs/jbosslabs/trunk/portal-extensions-newprj/maven.xml
Log:
http://jira.jboss.com/jira/browse/JBLAB-818
Modified: labs/jbosslabs/trunk/portal-extensions-newprj/forge-ads/src/java/org/jbosslabs/portlet/ads/AdsPortlet.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-newprj/forge-ads/src/java/org/jbosslabs/portlet/ads/AdsPortlet.java 2007-02-02 14:31:30 UTC (rev 9288)
+++ labs/jbosslabs/trunk/portal-extensions-newprj/forge-ads/src/java/org/jbosslabs/portlet/ads/AdsPortlet.java 2007-02-02 14:39:15 UTC (rev 9289)
@@ -104,7 +104,6 @@
}
public void prepareRequest(JBossRenderRequest rReq) {
- ForgeHelper.prepareRequest(rReq);
}
protected void displayContent(JBossRenderRequest rReq,
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-02-02 14:31:30 UTC (rev 9288)
+++ labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/src/java/org/jboss/forge/common/ForgeHelper.java 2007-02-02 14:39:15 UTC (rev 9289)
@@ -247,17 +247,6 @@
}
/**
- * Prepares a request object for generating a JSP. As for now, the
- * PORTAL_NAME attribute is set to an appropriate value.
- *
- * @param request
- * Request to prepare.
- */
- public static void prepareRequest(JBossRenderRequest request) {
- request.setAttribute(ForgeHelper.PORTAL_NAME, getPortalName(request));
- }
-
- /**
* Sends an e-mail message.
*
* @param recipient
Modified: labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/src/java/org/jboss/forge/common/portlet/JBossLabsPortlet.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/src/java/org/jboss/forge/common/portlet/JBossLabsPortlet.java 2007-02-02 14:31:30 UTC (rev 9288)
+++ labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/src/java/org/jboss/forge/common/portlet/JBossLabsPortlet.java 2007-02-02 14:39:15 UTC (rev 9289)
@@ -43,11 +43,6 @@
JBossRenderResponse response)
throws PortletException, IOException;
-
- protected final String getProjectId(RenderRequest request) {
- return request.getPreferences().getValue("projectId", "default");
- }
-
@Override
protected final void doView(JBossRenderRequest request, JBossRenderResponse response)
throws PortletException, IOException {
Modified: labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/src/java/org/jboss/forge/common/projects/ProjectsDescriptor.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/src/java/org/jboss/forge/common/projects/ProjectsDescriptor.java 2007-02-02 14:31:30 UTC (rev 9288)
+++ labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/src/java/org/jboss/forge/common/projects/ProjectsDescriptor.java 2007-02-02 14:39:15 UTC (rev 9289)
@@ -157,7 +157,7 @@
log.error("Projects descriptor constructor.", e);
}
- /*try {
+ try {
ProjectPagesService pps = LabsServices.getProjectPagesService();
for (String projectId : getProjectIds()) {
pps.updatePages(projectId);
@@ -166,7 +166,7 @@
pps.removeExcessPages(getProjectIds());
} catch (NamingException e) {
log.error("Error getting labs project pages service.", e);
- } */
+ }
}
private final static String PROJECT_EL = "project";
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-02-02 14:31:30 UTC (rev 9288)
+++ labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/src/java/org/jboss/forge/common/projects/ProjectsHelper.java 2007-02-02 14:39:15 UTC (rev 9289)
@@ -27,6 +27,8 @@
import javax.management.MBeanServer;
import javax.management.MalformedObjectNameException;
+import javax.portlet.RenderRequest;
+import javax.portlet.PortletRequest;
import org.jboss.forge.common.Constants;
import org.jboss.forge.common.ForgeHelper;
@@ -126,7 +128,11 @@
return projects;
}
- /**
+ private static String getSeletedProjectId(PortletRequest request) {
+ return request.getPreferences().getValue("projectId", "default");
+ }
+
+ /**
* Equivalent to <code>getSelectedProjectId(request, false)</code>.
* @param request
* A request object from which the selected project name will be
@@ -147,15 +153,14 @@
* 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) {
- String projectId = null;
+ String projectId = getSeletedProjectId(request);
- if ((withDefault)) {
+ if ((projectId == null) && (withDefault)) {
projectId = DEFAULT_PROJECT;
- } else if (DEFAULT_PROJECT.equals(projectId)) {
+ } else if ((!withDefault) && (DEFAULT_PROJECT.equals(projectId))) {
projectId = null;
} else if ((!DEFAULT_PROJECT.equals(projectId)) &&
(getProjects(ForgeHelper.getPortalName(request)).getProjectContext(
@@ -174,7 +179,6 @@
* 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);
@@ -193,11 +197,11 @@
*/
public static String getSelectedProjectId(JBossActionRequest request,
boolean withDefault) {
- String projectId = null;
+ String projectId = getSeletedProjectId(request);
- if ((withDefault)) {
+ if ((projectId == null) && (withDefault)) {
projectId = DEFAULT_PROJECT;
- } else if ((DEFAULT_PROJECT.equals(projectId))) {
+ } else if ((!withDefault) && (DEFAULT_PROJECT.equals(projectId))) {
projectId = null;
} else if ((!DEFAULT_PROJECT.equals(projectId)) &&
(getProjects(ForgeHelper.getPortalName(request)).getProjectContext(
@@ -206,7 +210,7 @@
projectId = null;
}
- return projectId;
+ return projectId;
}
/**
@@ -217,11 +221,6 @@
* Request to prepare.
*/
public static void prepareRequest(JBossRenderRequest request) {
- ForgeHelper.prepareRequest(request);
- String projectId = getSelectedProjectId(request);
- request.setAttribute(PROJECT_ID, projectId);
- request.setAttribute(LEVEL_ID, getProjects(
- ForgeHelper.getPortalName(request)).getProjectLevel(projectId));
}
/**
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-02-02 14:31:30 UTC (rev 9288)
+++ labs/jbosslabs/trunk/portal-extensions-newprj/forge-ejb3/src/java/org/jboss/forge/ejb3/projectpages/ProjectPagesServiceBean.java 2007-02-02 14:39:15 UTC (rev 9289)
@@ -326,11 +326,13 @@
try {
Instance freezone = getProjectPortletInstance(projectId, null, "freezone");
Instance downloads = getProjectPortletInstance(projectId, null, "downloads");
+ Instance info = getProjectPortletInstance(projectId, null, "info");
addInstanceToPage(projectId, pageName, "freezoneNavigation", page,
pic.getDefinition("FreezoneNavigationInstance"), "left", 0);
addInstanceToPage(projectId, pageName, "freezone", page, freezone, "center", 0);
addInstanceToPage(projectId, pageName, "downloads", page, downloads, "center", 1);
+ addInstanceToPage(projectId, pageName, "info", page, info, "center", 2);
} catch (UnknownPortletException e) {
e.printStackTrace();
} catch (UnknownPortalException e) {
Modified: labs/jbosslabs/trunk/portal-extensions-newprj/forge-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-newprj/forge-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java 2007-02-02 14:31:30 UTC (rev 9288)
+++ labs/jbosslabs/trunk/portal-extensions-newprj/forge-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java 2007-02-02 14:39:15 UTC (rev 9289)
@@ -71,7 +71,7 @@
* Checking if the user has access to the selected project (this isn't
* checked in the url mapper).
*/
- String projectId = getProjectId(request);
+ String projectId = ProjectsHelper.getSelectedProjectId(request);
System.out.println("PROJECT ID: " + projectId);
String portalName = ForgeHelper.getPortalName(request);
@@ -81,7 +81,7 @@
.projectExists(
new RenderRequestPermissionsChecker(request),
projectId))) {
- sendResponseNotFound(response);
+ sendResponseNotFound(response);
return;
}
@@ -108,8 +108,8 @@
}
if (requestedPath == null) {
- sendResponseNotFound(response);
- return;
+ requestedPath = "default/members/" + projectId + "/freezone/index.html";
+ //sendResponseNotFound(response);
}
Node requestedNode;
Modified: labs/jbosslabs/trunk/portal-extensions-newprj/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-newprj/maven.xml 2007-02-02 14:31:30 UTC (rev 9288)
+++ labs/jbosslabs/trunk/portal-extensions-newprj/maven.xml 2007-02-02 14:39:15 UTC (rev 9289)
@@ -262,8 +262,9 @@
<goal name="all">
<!-- Removing legacy packages -->
<ant:delete file="${local.deploy.dir}/forge-navigation-portlet.sar" />
+ <ant:delete file="${local.deploy.dir}/forge-common-1.0.ejb3" />
- <ant:delete dir="${forge.jar.dest}" />
+ <ant:delete dir="${forge.jar.dest}" />
<attainGoal name="prepare-repo" />
More information about the jboss-svn-commits
mailing list