[jboss-svn-commits] JBL Code SVN: r9029 - in labs/jbosslabs/trunk/portal-extensions-newprj: configuration/to-copy/server/default/deploy/jboss-portal.sar/META-INF and 10 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Jan 25 18:59:22 EST 2007
Author: adamw
Date: 2007-01-25 18:59:22 -0500 (Thu, 25 Jan 2007)
New Revision: 9029
Added:
labs/jbosslabs/trunk/portal-extensions-newprj/forge-prj-info/forge-prj-info.iml
Removed:
labs/jbosslabs/trunk/portal-extensions-newprj/forge-blog/src/java/org/jboss/portlet/blog/
labs/jbosslabs/trunk/portal-extensions-newprj/forge-blog/src/web/WEB-INF/
Modified:
labs/jbosslabs/trunk/portal-extensions-newprj/configuration/to-copy/server/default/deploy/jboss-portal.sar/META-INF/jboss-service.xml
labs/jbosslabs/trunk/portal-extensions-newprj/forge-blog/maven.xml
labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/src/java/org/jboss/forge/common/portlet/JBossLabsPortlet.java
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/web/WEB-INF/jboss-app.xml
labs/jbosslabs/trunk/portal-extensions-newprj/forge-freezone/src/web/WEB-INF/portlet-instances.xml
labs/jbosslabs/trunk/portal-extensions-newprj/forge-freezone/src/web/WEB-INF/portlet.xml
labs/jbosslabs/trunk/portal-extensions-newprj/forge-freezone/src/web/WEB-INF/web.xml
labs/jbosslabs/trunk/portal-extensions-newprj/forge-prj-info/src/java/org/jboss/forge/projects/info/Info.java
labs/jbosslabs/trunk/portal-extensions-newprj/forge-prj-info/src/web/WEB-INF/portlet.xml
labs/jbosslabs/trunk/portal-extensions-newprj/forge-prj-info/src/web/WEB-INF/web.xml
labs/jbosslabs/trunk/portal-extensions-newprj/maven.xml
labs/jbosslabs/trunk/portal-extensions-newprj/portal-default/src/web/WEB-INF/default-object.xml
labs/jbosslabs/trunk/portal-extensions-newprj/portal-default/src/web/WEB-INF/portlet-instances.xml
Log:
http://jira.jboss.com/jira/browse/JBLAB-818
Modified: labs/jbosslabs/trunk/portal-extensions-newprj/configuration/to-copy/server/default/deploy/jboss-portal.sar/META-INF/jboss-service.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-newprj/configuration/to-copy/server/default/deploy/jboss-portal.sar/META-INF/jboss-service.xml 2007-01-25 23:38:48 UTC (rev 9028)
+++ labs/jbosslabs/trunk/portal-extensions-newprj/configuration/to-copy/server/default/deploy/jboss-portal.sar/META-INF/jboss-service.xml 2007-01-25 23:59:22 UTC (rev 9029)
@@ -619,22 +619,6 @@
<attribute name="DashboardContextId">dashboard</attribute>
</mbean>
- <!-- Labs command factory -->
- <mbean
- code="org.jboss.labs.mapper.LabsCommandFactory"
- name="portal:commandFactory=Labs"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
- <xmbean/>
- <depends>shotoku:service=svn</depends>
- <depends
- optional-attribute-name="NextFactory"
- proxy-type="attribute">portal:commandFactory=DefaultPortal</depends>
- <depends
- optional-attribute-name="Container"
- proxy-type="attribute">portal:container=PortalObject</depends>
- </mbean>
-
<!-- Command factories -->
<mbean
code="org.jboss.portal.core.controller.command.mapper.DelegatingCommandFactoryService"
@@ -933,7 +917,7 @@
proxy-type="attribute">portal:service=PageService</depends>
<depends
optional-attribute-name="CommandFactory"
- proxy-type="attribute">portal:commandFactory=Labs</depends>
+ proxy-type="attribute">portal:commandFactory=DefaultPortal</depends>
<depends
optional-attribute-name="URLFactory"
proxy-type="attribute">portal:urlFactory=Delegating</depends>
Modified: labs/jbosslabs/trunk/portal-extensions-newprj/forge-blog/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-newprj/forge-blog/maven.xml 2007-01-25 23:38:48 UTC (rev 9028)
+++ labs/jbosslabs/trunk/portal-extensions-newprj/forge-blog/maven.xml 2007-01-25 23:59:22 UTC (rev 9029)
@@ -11,14 +11,14 @@
</goal>
<goal name="build">
- <attainGoal name="prj-war-build" />
+ <!--<attainGoal name="prj-war-build" />-->
</goal>
<goal name="deploy">
- <attainGoal name="prj-war-deploy" />
+ <!--<attainGoal name="prj-war-deploy" />-->
</goal>
<goal name="clean">
- <attainGoal name="prj-clean" />
+ <!--<attainGoal name="prj-clean" />-->
</goal>
</project>
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-01-25 23:38:48 UTC (rev 9028)
+++ labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/src/java/org/jboss/forge/common/portlet/JBossLabsPortlet.java 2007-01-25 23:59:22 UTC (rev 9029)
@@ -25,32 +25,41 @@
import javax.portlet.PortletException;
import javax.portlet.PortletSecurityException;
+import javax.portlet.PortletConfig;
+import javax.portlet.RenderRequest;
import org.jboss.portlet.JBossPortlet;
import org.jboss.portlet.JBossRenderRequest;
import org.jboss.portlet.JBossRenderResponse;
public abstract class JBossLabsPortlet extends JBossPortlet {
- private final static String errorMsg = "403 - not authorized<br />I'm sorry but you need to login to view this page.";
+ private final static String errorMsg =
+ "403 - not authorized<br />I'm sorry but you need to login to view this page.";
- protected abstract boolean isAllowed(JBossRenderRequest request, JBossRenderResponse response);
-
- protected abstract void labsDoView(JBossRenderRequest request, JBossRenderResponse response) throws PortletException, PortletSecurityException, IOException;
-
- @Override
- protected final void doView(JBossRenderRequest request, JBossRenderResponse response) throws PortletException, PortletSecurityException, IOException {
- if (isAllowed(request, response)) {
- labsDoView(request, response);
- }
- else {
- //show error message
- showErrorMessage(response);
- }
- }
-
- private void showErrorMessage(JBossRenderResponse response) throws IOException{
- response.setContentType("text/html");
- response.getWriter().write(errorMsg);
- }
+ protected abstract boolean isAllowed(JBossRenderRequest request,
+ JBossRenderResponse response);
+ protected abstract void labsDoView(JBossRenderRequest request,
+ 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 {
+ if (isAllowed(request, response)) {
+ labsDoView(request, response);
+ } else {
+ showErrorMessage(response);
+ }
+ }
+
+ private void showErrorMessage(JBossRenderResponse response) throws IOException{
+ response.setContentType("text/html");
+ response.getWriter().write(errorMsg);
+ }
}
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-01-25 23:38:48 UTC (rev 9028)
+++ labs/jbosslabs/trunk/portal-extensions-newprj/forge-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java 2007-01-25 23:59:22 UTC (rev 9029)
@@ -71,10 +71,12 @@
* Checking if the user has access to the selected project (this isn't
* checked in the url mapper).
*/
- String projectId = ProjectsHelper.getSelectedProjectId(request);
- String portalName = ForgeHelper.getPortalName(request);
+ String projectId = getProjectId(request);
+ System.out.println("PROJECT ID: " + projectId);
- if ((projectId != null)
+ String portalName = ForgeHelper.getPortalName(request);
+
+ if ((projectId != null) && (!"default".equals(projectId))
&& (!ProjectsHelper.getProjects(portalName)
.projectExists(
new RenderRequestPermissionsChecker(request),
@@ -99,7 +101,9 @@
Object requestedPathFromPref = request.getPreferences().getValue(
"page", null);
- if (requestedPathFromPref != null) {
+ System.out.println("REQ PATH FROM PREF: " + requestedPathFromPref);
+
+ if (!Tools.isEmpty((String) requestedPathFromPref)) {
requestedPath = (String) requestedPathFromPref;
}
@@ -244,7 +248,7 @@
protected void doEdit(JBossRenderRequest request,
JBossRenderResponse response) throws PortletException,
- PortletSecurityException, IOException {
+ IOException {
String portalName = ForgeHelper.getPortalName(request);
// We'll be sending text/html for sure.
@@ -273,7 +277,7 @@
}
public void processAction(ActionRequest request, ActionResponse response)
- throws PortletException, PortletSecurityException, IOException {
+ throws PortletException, IOException {
// Passing necessary parameters.
response.setRenderParameter(Constants.ATTR_REQ_PATH, request
.getParameter(Constants.ATTR_REQ_PATH));
Modified: labs/jbosslabs/trunk/portal-extensions-newprj/forge-freezone/src/web/WEB-INF/jboss-app.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-newprj/forge-freezone/src/web/WEB-INF/jboss-app.xml 2007-01-25 23:38:48 UTC (rev 9028)
+++ labs/jbosslabs/trunk/portal-extensions-newprj/forge-freezone/src/web/WEB-INF/jboss-app.xml 2007-01-25 23:59:22 UTC (rev 9029)
@@ -1,3 +1,3 @@
<jboss-app>
- <app-name>prj-freezone</app-name>
+ <app-name>freezone</app-name>
</jboss-app>
Modified: labs/jbosslabs/trunk/portal-extensions-newprj/forge-freezone/src/web/WEB-INF/portlet-instances.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-newprj/forge-freezone/src/web/WEB-INF/portlet-instances.xml 2007-01-25 23:38:48 UTC (rev 9028)
+++ labs/jbosslabs/trunk/portal-extensions-newprj/forge-freezone/src/web/WEB-INF/portlet-instances.xml 2007-01-25 23:59:22 UTC (rev 9029)
@@ -1,49 +1,55 @@
<?xml version="1.0" encoding="UTF-8"?>
<deployments>
- <deployment>
- <if-exists>overwrite</if-exists>
- <instance>
- <instance-id>PrjFreezonePortletInstance</instance-id>
- <portlet-ref>PrjFreezonePortlet</portlet-ref>
- </instance>
- </deployment>
- <deployment>
- <if-exists>overwrite</if-exists>
- <instance>
- <instance-id>FreezoneDefaultPagePortletInstance</instance-id>
- <portlet-ref>PrjFreezonePortlet</portlet-ref>
- <preferences>
- <preference>
- <name>page</name>
- <value>default/members/default/freezone/welcome.html</value>
- </preference>
- </preferences>
- </instance>
- </deployment>
- <deployment>
- <if-exists>overwrite</if-exists>
- <instance>
- <instance-id>FreezoneRightPanelPortletInstance</instance-id>
- <portlet-ref>PrjFreezonePortlet</portlet-ref>
- <preferences>
- <preference>
- <name>page</name>
- <value>default/members/default/freezone/rightPanelContent.html</value>
- </preference>
- </preferences>
- </instance>
- </deployment>
- <deployment>
- <if-exists>overwrite</if-exists>
- <instance>
- <instance-id>FreezoneMostDownloadedPortletInstance</instance-id>
- <portlet-ref>PrjFreezonePortlet</portlet-ref>
- <preferences>
- <preference>
- <name>page</name>
- <value>default/members/default/freezone/mostdownloaded.html</value>
- </preference>
- </preferences>
- </instance>
- </deployment>
+ <deployment>
+ <if-exists>overwrite</if-exists>
+ <instance>
+ <instance-id>FreezoneDefaultPageInstance</instance-id>
+ <portlet-ref>FreezonePortlet</portlet-ref>
+ <preferences>
+ <preference>
+ <name>page</name>
+ <value>default/members/default/freezone/welcome.html</value>
+ </preference>
+ </preferences>
+ </instance>
+ </deployment>
+ <deployment>
+ <if-exists>overwrite</if-exists>
+ <instance>
+ <instance-id>FreezoneRightPanelInstance</instance-id>
+ <portlet-ref>FreezonePortlet</portlet-ref>
+ <preferences>
+ <preference>
+ <name>page</name>
+ <value>default/members/default/freezone/rightPanelContent.html</value>
+ </preference>
+ </preferences>
+ </instance>
+ </deployment>
+ <deployment>
+ <if-exists>overwrite</if-exists>
+ <instance>
+ <instance-id>FreezoneMostDownloadedInstance</instance-id>
+ <portlet-ref>FreezonePortlet</portlet-ref>
+ <preferences>
+ <preference>
+ <name>page</name>
+ <value>default/members/default/freezone/mostdownloaded.html</value>
+ </preference>
+ </preferences>
+ </instance>
+ </deployment>
+ <deployment>
+ <if-exists>overwrite</if-exists>
+ <instance>
+ <instance-id>FreezoneNavigationInstance</instance-id>
+ <portlet-ref>FreezonePortlet</portlet-ref>
+ <preferences>
+ <preference>
+ <name>page</name>
+ <value>default/members/default/freezone/navigation.html</value>
+ </preference>
+ </preferences>
+ </instance>
+ </deployment>
</deployments>
Modified: labs/jbosslabs/trunk/portal-extensions-newprj/forge-freezone/src/web/WEB-INF/portlet.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-newprj/forge-freezone/src/web/WEB-INF/portlet.xml 2007-01-25 23:38:48 UTC (rev 9028)
+++ labs/jbosslabs/trunk/portal-extensions-newprj/forge-freezone/src/web/WEB-INF/portlet.xml 2007-01-25 23:59:22 UTC (rev 9029)
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd">
<portlet>
<description>Forge project freezone portlet</description>
- <portlet-name>PrjFreezonePortlet</portlet-name>
+ <portlet-name>FreezonePortlet</portlet-name>
<display-name>Project freezone</display-name>
<portlet-class>org.jboss.forge.projects.freezone.Freezone</portlet-class>
<supports>
@@ -15,5 +15,15 @@
<portlet-info>
<title>Project freezone</title>
</portlet-info>
+ <portlet-preferences>
+ <preference>
+ <name>projectId</name>
+ <value>default</value>
+ </preference>
+ <preference>
+ <name>page</name>
+ <value></value>
+ </preference>
+ </portlet-preferences>
</portlet>
</portlet-app>
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-25 23:38:48 UTC (rev 9028)
+++ labs/jbosslabs/trunk/portal-extensions-newprj/forge-freezone/src/web/WEB-INF/web.xml 2007-01-25 23:59:22 UTC (rev 9029)
@@ -1,8 +1,9 @@
<?xml version="1.0"?>
-<!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 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"
+ version="2.4">
<filter>
<filter-name>filesFromRepoFilter</filter-name>
<filter-class>org.jboss.forge.common.FilesFromRepoFilter</filter-class>
Added: labs/jbosslabs/trunk/portal-extensions-newprj/forge-prj-info/forge-prj-info.iml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-newprj/forge-prj-info/forge-prj-info.iml (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions-newprj/forge-prj-info/forge-prj-info.iml 2007-01-25 23:59:22 UTC (rev 9029)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4" relativePaths="true" type="JAVA_MODULE">
+ <component name="ModuleRootManager" />
+ <component name="NewModuleRootManager" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/target" />
+ <exclude-output />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module" module-name="shotoku-base" />
+ <orderEntry type="module" module-name="shotoku-aop" />
+ <orderEntry type="module" module-name="forge-common" />
+ <orderEntry type="library" name="jboss" level="application" />
+ <orderEntry type="library" name="portal" level="application" />
+ <orderEntry type="library" name="portlet" level="application" />
+ <orderEntryProperties />
+ </component>
+</module>
+
Modified: labs/jbosslabs/trunk/portal-extensions-newprj/forge-prj-info/src/java/org/jboss/forge/projects/info/Info.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-newprj/forge-prj-info/src/java/org/jboss/forge/projects/info/Info.java 2007-01-25 23:38:48 UTC (rev 9028)
+++ labs/jbosslabs/trunk/portal-extensions-newprj/forge-prj-info/src/java/org/jboss/forge/projects/info/Info.java 2007-01-25 23:59:22 UTC (rev 9029)
@@ -23,13 +23,11 @@
import java.io.IOException;
-import java.io.InputStream;
-
import javax.portlet.PortletException;
import javax.portlet.PortletRequestDispatcher;
import org.jboss.forge.common.ForgeHelper;
-import org.jboss.forge.common.projects.ProjectDescriptor;
+import org.jboss.forge.common.portlet.JBossLabsPortlet;
import org.jboss.forge.common.projects.Projects;
import org.jboss.forge.common.projects.ProjectsHelper;
import org.jboss.forge.common.projects.permissions.PermissionsChecker;
@@ -37,7 +35,6 @@
import org.jboss.logging.Logger;
import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext;
import org.jboss.portal.core.servlet.jsp.PortalJsp;
-import org.jboss.portlet.JBossPortlet;
import org.jboss.portlet.JBossRenderRequest;
import org.jboss.portlet.JBossRenderResponse;
import org.jboss.shotoku.ContentManager;
@@ -50,7 +47,7 @@
*
* @author adamw
*/
-public class Info extends JBossPortlet {
+public class Info extends JBossLabsPortlet {
private final static String INFO_JSP = "prj-info/info.jsp";
private final static String INFO_ERROR_JSP = "prj-info/info_error.jsp";
@@ -60,11 +57,15 @@
@Inject
private ContentManager cm;
- public void doView(JBossRenderRequest request, JBossRenderResponse response)
+ protected boolean isAllowed(JBossRenderRequest request, JBossRenderResponse response) {
+ return true;
+ }
+
+ public void labsDoView(JBossRenderRequest request, JBossRenderResponse response)
throws IOException, PortletException {
response.setContentType("text/html");
- String projectId = ProjectsHelper.getSelectedProjectId(request);
+ String projectId = ProjectsHelper.getSelectedProjectId(request);
String portalName = ForgeHelper.getPortalName(request);
Projects projects = ProjectsHelper.getProjects(portalName);
@@ -75,7 +76,7 @@
}
DelegateContext context = null;
- PortletRequestDispatcher rd = null;
+ PortletRequestDispatcher rd;
PermissionsChecker pc = new RenderRequestPermissionsChecker(request);
Modified: labs/jbosslabs/trunk/portal-extensions-newprj/forge-prj-info/src/web/WEB-INF/portlet.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-newprj/forge-prj-info/src/web/WEB-INF/portlet.xml 2007-01-25 23:38:48 UTC (rev 9028)
+++ labs/jbosslabs/trunk/portal-extensions-newprj/forge-prj-info/src/web/WEB-INF/portlet.xml 2007-01-25 23:59:22 UTC (rev 9029)
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
- version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd">
- <!--
+<portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+ version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd">
+ <!--
<portlet>
<description>Forge project info portlet</description>
<portlet-name>PrjInfoPortlet</portlet-name>
@@ -15,27 +15,27 @@
<portlet-info>
<title>Project information</title>
</portlet-info>
- </portlet>
--->
-
-<portlet>
- <description>Forge project info portlet</description>
- <portlet-name>PrjInfoPortlet</portlet-name>
- <display-name>Project information</display-name>
- <portlet-class>org.apache.myfaces.portlet.MyFacesGenericPortlet</portlet-class>
- <init-param>
- <name>default-view</name>
- <value>/repo-access/default/prj-info/info.jsp</value>
- </init-param>
- <expiration-cache>0</expiration-cache>
- <supports>
- <mime-type>text/html</mime-type>
- <portlet-mode>VIEW</portlet-mode>
- </supports>
- <portlet-info>
- <title>Project information</title>
- </portlet-info>
- </portlet>
-
+ </portlet>
+-->
+
+<portlet>
+ <description>Forge project info portlet</description>
+ <portlet-name>PrjInfoPortlet</portlet-name>
+ <display-name>Project information</display-name>
+ <portlet-class>org.apache.myfaces.portlet.MyFacesGenericPortlet</portlet-class>
+ <init-param>
+ <name>default-view</name>
+ <value>/repo-access/default/prj-info/info.jsp</value>
+ </init-param>
+ <expiration-cache>0</expiration-cache>
+ <supports>
+ <mime-type>text/html</mime-type>
+ <portlet-mode>VIEW</portlet-mode>
+ </supports>
+ <portlet-info>
+ <title>Project information</title>
+ </portlet-info>
+ </portlet>
+
</portlet-app>
Modified: labs/jbosslabs/trunk/portal-extensions-newprj/forge-prj-info/src/web/WEB-INF/web.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-newprj/forge-prj-info/src/web/WEB-INF/web.xml 2007-01-25 23:38:48 UTC (rev 9028)
+++ labs/jbosslabs/trunk/portal-extensions-newprj/forge-prj-info/src/web/WEB-INF/web.xml 2007-01-25 23:59:22 UTC (rev 9029)
@@ -1,8 +1,9 @@
<?xml version="1.0"?>
-<!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 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"
+ version="2.4">
<listener>
<listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
</listener>
Modified: labs/jbosslabs/trunk/portal-extensions-newprj/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-newprj/maven.xml 2007-01-25 23:38:48 UTC (rev 9028)
+++ labs/jbosslabs/trunk/portal-extensions-newprj/maven.xml 2007-01-25 23:59:22 UTC (rev 9029)
@@ -78,11 +78,6 @@
<attainGoal name="clean" />
<attainGoal name="build" />
<attainGoal name="deploy" />
- <ant:copy todir="${local.deploy.dir}" flatten="true" overwrite="true">
- <ant:fileset dir=".">
- <ant:filename name="target/*.war" />
- </ant:fileset>
- </ant:copy>
</goal>
<!--
Modified: labs/jbosslabs/trunk/portal-extensions-newprj/portal-default/src/web/WEB-INF/default-object.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-newprj/portal-default/src/web/WEB-INF/default-object.xml 2007-01-25 23:38:48 UTC (rev 9028)
+++ labs/jbosslabs/trunk/portal-extensions-newprj/portal-default/src/web/WEB-INF/default-object.xml 2007-01-25 23:59:22 UTC (rev 9029)
@@ -35,14 +35,6 @@
<!-- Labs properties -->
<property>
- <name>org.jboss.portlet.blog.mainportlet</name>
- <value>yes</value>
- </property>
- <property>
- <name>org.jboss.portlet.blog.specialpage</name>
- <value>no</value>
- </property>
- <property>
<name>shotoku.main.directory</name>
<value>default</value>
</property>
@@ -65,59 +57,41 @@
<page>
<page-name>default</page-name>
<window>
- <window-name>FreezonePortletWindowDefaultDefault</window-name>
- <instance-ref>FreezoneDefaultPagePortletInstance</instance-ref>
+ <window-name>FreezoneNavigationWindow</window-name>
+ <instance-ref>FreezoneNavigationInstance</instance-ref>
+ <region>left</region>
+ <height>0</height>
+ </window>
+ <window>
+ <window-name>FreezoneDefaultPageWindow</window-name>
+ <instance-ref>FreezoneDefaultPageInstance</instance-ref>
<region>center</region>
<height>0</height>
</window>
<window>
- <window-name>PodcastPortletWindowDefaultDefault</window-name>
+ <window-name>PodcastPortletWindow</window-name>
<instance-ref>PodcastPortletInstanceSmall</instance-ref>
<region>right</region>
<height>1</height>
</window>
<window>
- <window-name>PrimatesPortletWindowDefaultDefault</window-name>
+ <window-name>PrimatesPortletWindow</window-name>
<instance-ref>PrimatesPortletMugshotInstance</instance-ref>
<region>innerright</region>
<height>0</height>
</window>
<window>
- <window-name>BlogPortletWindowDefaultDefault</window-name>
- <instance-ref>BlogPortletInstance</instance-ref>
- <region>innerleft</region>
- <height>0</height>
- </window>
- <window>
- <window-name>NavigationPortletWindowDefaultDefault</window-name>
- <instance-ref>LabsNavigationPortletInstance</instance-ref>
- <region>left</region>
- <height>0</height>
- </window>
- <window>
- <window-name>AdsPortletWindowDefaultDefault</window-name>
+ <window-name>AdsPortletWindow</window-name>
<instance-ref>AdsPortletInstance</instance-ref>
<region>left</region>
<height>2</height>
</window>
- <!-- <window>
- <window-name>PollsPortletWindowDefaultRandom</window-name>
- <instance-ref>PollsPortletInstanceRandom</instance-ref>
- <region>right</region>
- <height>1</height>
- </window> -->
<window>
- <window-name>FreezonePortletWindowDefaultRight</window-name>
- <instance-ref>FreezoneRightPanelPortletInstance</instance-ref>
+ <window-name>FreezoneRightPanelWindow</window-name>
+ <instance-ref>FreezoneRightPanelInstance</instance-ref>
<region>right</region>
<height>0</height>
</window>
- <!--<window>
- <window-name>FreezonePortletWindowDefaultDownloads</window-name>
- <instance-ref>FreezoneMostDownloadedPortletInstance</instance-ref>
- <region>innerright</region>
- <height>0</height>
- </window>-->
<window>
<window-name>UserPortletWindow</window-name>
<instance-ref>UserPortletInstance</instance-ref>
@@ -158,32 +132,6 @@
<deployment>
<if-exists>overwrite</if-exists>
<parent-ref>default</parent-ref>
- <!-- timetracker page -->
- <page>
- <page-name>TTS</page-name>
- <window>
- <window-name>TimeTrackerWindow</window-name>
- <instance-ref>TimetrackerPortletInstance</instance-ref>
- <region>center</region>
- <height>0</height>
- </window>
- <window>
- <window-name>NavigationPortletWindowDefaultTTS</window-name>
- <instance-ref>LabsNavigationPortletInstance</instance-ref>
- <region>left</region>
- <height>0</height>
- </window>
- <window>
- <window-name>AdsPortletWindowDefaultTTS</window-name>
- <instance-ref>AdsPortletInstance</instance-ref>
- <region>left</region>
- <height>2</height>
- </window>
- </page>
- </deployment>
- <deployment>
- <if-exists>overwrite</if-exists>
- <parent-ref>default</parent-ref>
<!-- community page -->
<page>
<page-name>community</page-name>
@@ -217,31 +165,6 @@
<if-exists>overwrite</if-exists>
<parent-ref>default</parent-ref>
<page>
- <page-name>softwaremap</page-name>
- <window>
- <window-name>NavigationPortletWindowDefaultMap</window-name>
- <instance-ref>LabsNavigationPortletInstance</instance-ref>
- <region>left</region>
- <height>0</height>
- </window>
- <window>
- <window-name>AdsPortletWindowDefaultMap</window-name>
- <instance-ref>AdsPortletInstance</instance-ref>
- <region>left</region>
- <height>2</height>
- </window>
- <window>
- <window-name>MapWindowDefaultMap</window-name>
- <instance-ref>MapPortletInstance</instance-ref>
- <region>center</region>
- <height>0</height>
- </window>
- </page>
- </deployment>
- <deployment>
- <if-exists>overwrite</if-exists>
- <parent-ref>default</parent-ref>
- <page>
<page-name>wiki</page-name>
<window>
<window-name>NavigationPortletWindowDefaultWiki</window-name>
@@ -267,64 +190,6 @@
<if-exists>overwrite</if-exists>
<parent-ref>default</parent-ref>
<page>
- <page-name>info</page-name>
-
- <window>
- <window-name>NavigationPortletWindowDefaultInfo</window-name>
- <instance-ref>LabsNavigationPortletInstance</instance-ref>
- <region>left</region>
- <height>0</height>
- </window>
- <window>
- <window-name>AdsPortletWindowDefaultInfo</window-name>
- <instance-ref>AdsPortletInstance</instance-ref>
- <region>left</region>
- <height>2</height>
- </window>
- <window>
- <window-name>PrjInfoPortletWindowDefaultInfo</window-name>
- <instance-ref>PrjInfoPortletInstance</instance-ref>
- <region>center</region>
- <height>0</height>
- </window>
- <window>
- <window-name>PollsPortletWindowInfo</window-name>
- <instance-ref>PollsPortletInstance</instance-ref>
- <region>right</region>
- <height>1</height>
- </window>
- </page>
- </deployment>
- <deployment>
- <if-exists>overwrite</if-exists>
- <parent-ref>default</parent-ref>
- <page>
- <page-name>blog</page-name>
- <window>
- <window-name>NavigationPortletWindowDefaultBlog</window-name>
- <instance-ref>LabsNavigationPortletInstance</instance-ref>
- <region>left</region>
- <height>0</height>
- </window>
- <window>
- <window-name>AdsPortletWindowDefaultBlog</window-name>
- <instance-ref>AdsPortletInstance</instance-ref>
- <region>left</region>
- <height>2</height>
- </window>
-
- <window>
- <window-name>PrjBlogPortletWindowDefaultBlog</window-name>
- <instance-ref>PrjBlogPortletInstance</instance-ref>
- <region>center</region>
- <height>0</height>
- </window>
- </page>
- </deployment>
- <deployment>
- <if-exists>overwrite</if-exists>
- <parent-ref>default</parent-ref>
- <page>
<page-name>downloads</page-name>
<window>
@@ -382,31 +247,6 @@
<if-exists>overwrite</if-exists>
<parent-ref>default</parent-ref>
<page>
- <page-name>feeds</page-name>
- <window>
- <window-name>NavigationPortletWindowDefaultFeeds</window-name>
- <instance-ref>LabsNavigationPortletInstance</instance-ref>
- <region>left</region>
- <height>0</height>
- </window>
- <window>
- <window-name>AdsPortletWindowDefaultFeeds</window-name>
- <instance-ref>AdsPortletInstance</instance-ref>
- <region>left</region>
- <height>2</height>
- </window>
- <window>
- <window-name>FeedsPortletWindowDefault</window-name>
- <instance-ref>FeedsPortletInstance</instance-ref>
- <region>center</region>
- <height>0</height>
- </window>
- </page>
- </deployment>
- <deployment>
- <if-exists>overwrite</if-exists>
- <parent-ref>default</parent-ref>
- <page>
<page-name>freezone</page-name>
<window>
<window-name>NavigationPortletWindowDefaultFreezone</window-name>
@@ -428,33 +268,6 @@
</window>
</page>
</deployment>
- <!--<deployment>
- <if-exists>overwrite</if-exists>
- <parent-ref>default</parent-ref>
- <page>
- <page-name>forgeforums</page-name>
-
- <window>
- <window-name>NavigationPortletWindowDefaultForums</window-name>
- <instance-ref>LabsNavigationPortletInstance</instance-ref>
- <region>left</region>
- <height>0</height>
- </window>
- <window>
- <window-name>AdsPortletWindowDefaultForums</window-name>
- <instance-ref>AdsPortletInstance</instance-ref>
- <region>left</region>
- <height>2</height>
- </window>
- <window>
- <window-name>ForumsPortletWindowDefaultForums</window-name>
- <instance-ref>ForumsPortletInstance</instance-ref>
- <region>center</region>
- <height>0</height>
- </window>
-
- </page>
- </deployment>-->
<deployment>
<if-exists>overwrite</if-exists>
<parent-ref>default</parent-ref>
@@ -509,56 +322,6 @@
<if-exists>overwrite</if-exists>
<parent-ref>default</parent-ref>
<page>
- <page-name>kosmos-jira</page-name>
- <window>
- <window-name>NavigationPortletWindowDefaultKosmosJira</window-name>
- <instance-ref>LabsNavigationPortletInstance</instance-ref>
- <region>left</region>
- <height>0</height>
- </window>
- <window>
- <window-name>AdsPortletWindowDefaulKosmosJira</window-name>
- <instance-ref>AdsPortletInstance</instance-ref>
- <region>left</region>
- <height>2</height>
- </window>
- <window>
- <window-name>KosmosJiraPortletWindowDefaultKosmosJira</window-name>
- <instance-ref>KosmosJiraPortletInstance</instance-ref>
- <region>center</region>
- <height>0</height>
- </window>
- </page>
- </deployment>
- <deployment>
- <if-exists>overwrite</if-exists>
- <parent-ref>default</parent-ref>
- <page>
- <page-name>kosmos-svn</page-name>
- <window>
- <window-name>NavigationPortletWindowDefaultKosmosSvn</window-name>
- <instance-ref>LabsNavigationPortletInstance</instance-ref>
- <region>left</region>
- <height>0</height>
- </window>
- <window>
- <window-name>AdsPortletWindowDefaultKosmosSvn</window-name>
- <instance-ref>AdsPortletInstance</instance-ref>
- <region>left</region>
- <height>2</height>
- </window>
- <window>
- <window-name>KosmosSvnPortletWindowDefaultKosmosSvn</window-name>
- <instance-ref>KosmosSvnPortletInstance</instance-ref>
- <region>center</region>
- <height>0</height>
- </window>
- </page>
- </deployment>
- <deployment>
- <if-exists>overwrite</if-exists>
- <parent-ref>default</parent-ref>
- <page>
<page-name>admin</page-name>
<window>
<window-name>NavigationPortletWindowDefaultAdmin</window-name>
@@ -610,29 +373,4 @@
</security-constraint>
</page>
</deployment>
- <deployment>
- <if-exists>overwrite</if-exists>
- <parent-ref>default</parent-ref>
- <page>
- <page-name>cmsadmin</page-name>
- <window>
- <window-name>NavigationPortletWindowCMSDefaultAdmin</window-name>
- <instance-ref>LabsNavigationPortletInstance</instance-ref>
- <region>left</region>
- <height>0</height>
- </window>
- <window>
- <window-name>CMSAdminPortletWindow</window-name>
- <instance-ref>CMSAdminPortletInstance</instance-ref>
- <region>center</region>
- <height>0</height>
- </window>
- <security-constraint>
- <policy-permission>
- <role-name>Admin</role-name>
- <action-name>view</action-name>
- </policy-permission>
- </security-constraint>
- </page>
- </deployment>
</deployments>
Modified: labs/jbosslabs/trunk/portal-extensions-newprj/portal-default/src/web/WEB-INF/portlet-instances.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-newprj/portal-default/src/web/WEB-INF/portlet-instances.xml 2007-01-25 23:38:48 UTC (rev 9028)
+++ labs/jbosslabs/trunk/portal-extensions-newprj/portal-default/src/web/WEB-INF/portlet-instances.xml 2007-01-25 23:59:22 UTC (rev 9029)
@@ -16,19 +16,6 @@
<deployment>
<if-exists>overwrite</if-exists>
<instance>
- <instance-name>CMSAdminPortletInstance</instance-name>
- <component-ref>portal.CMSAdminPortlet</component-ref>
- <security-constraint>
- <policy-permission>
- <role-name>Admin</role-name>
- <action-name>view</action-name>
- </policy-permission>
- </security-constraint>
- </instance>
- </deployment>
- <deployment>
- <if-exists>overwrite</if-exists>
- <instance>
<instance-name>UserPortletInstance</instance-name>
<component-ref>portal.UserPortlet</component-ref>
</instance>
More information about the jboss-svn-commits
mailing list