[Bedework-commit] webapps r819 - in trunk: webadmin/war/WEB-INF
webclient/war/WEB-INF webcommon/src/org/bedework/webcommon
websubmit/war/WEB-INF
svnadmin at bedework.org
svnadmin at bedework.org
Wed Oct 29 17:26:18 EDT 2008
Author: douglm
Date: 2008-10-29 17:26:17 -0400 (Wed, 29 Oct 2008)
New Revision: 819
Removed:
trunk/webadmin/war/WEB-INF/liferay-display.xml
trunk/webadmin/war/WEB-INF/liferay-portlet.xml
trunk/webclient/war/WEB-INF/liferay-display.xml
trunk/webclient/war/WEB-INF/liferay-portlet.xml
trunk/websubmit/war/WEB-INF/liferay-display.xml
trunk/websubmit/war/WEB-INF/liferay-portlet.xml
Modified:
trunk/webcommon/src/org/bedework/webcommon/BwAbstractAction.java
Log:
Major reorganization of the build process mostly affecting handling of portal builds.
Removed portal specific directories from teh deployment directory.
Removed portal sepcific code from buildwar.xml and added new portal specific files to be imported. These are in a section of teh bwbuild config directory.
All portal customization is now part of building the war file.
Deleted: trunk/webadmin/war/WEB-INF/liferay-display.xml
===================================================================
--- trunk/webadmin/war/WEB-INF/liferay-display.xml 2008-10-28 14:12:22 UTC (rev 818)
+++ trunk/webadmin/war/WEB-INF/liferay-display.xml 2008-10-29 21:26:17 UTC (rev 819)
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE display PUBLIC "-//Liferay//DTD Display 4.0.0//EN" "http://www.liferay.com/dtd/liferay-display_4_0_0.dtd">
-
-<display>
- <category name="category.test">
- <portlet id="@PORTLET-NAME@" />
- </category>
-</display>
\ No newline at end of file
Deleted: trunk/webadmin/war/WEB-INF/liferay-portlet.xml
===================================================================
--- trunk/webadmin/war/WEB-INF/liferay-portlet.xml 2008-10-28 14:12:22 UTC (rev 818)
+++ trunk/webadmin/war/WEB-INF/liferay-portlet.xml 2008-10-29 21:26:17 UTC (rev 819)
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE liferay-portlet-app PUBLIC "-//Liferay//DTD Portlet Application 4.1.0//EN" "http://www.liferay.com/dtd/liferay-portlet-app_4_1_0.dtd">
-
-<liferay-portlet-app>
- <portlet>
- <portlet-name>@PORTLET-NAME@</portlet-name>
- <portlet-url-class>com.liferay.portal.apache.bridges.struts.LiferayStrutsPortletURLImpl</portlet-url-class>
- <use-default-template>true</use-default-template>
- <restore-current-view>true</restore-current-view>
- <instanceable>true</instanceable>
- <private-request-attributes>true</private-request-attributes>
- </portlet>
- <role-mapper>
- <role-name>administrator</role-name>
- <role-link>Administrator</role-link>
- </role-mapper>
- <role-mapper>
- <role-name>guest</role-name>
- <role-link>Guest</role-link>
- </role-mapper>
- <role-mapper>
- <role-name>power-user</role-name>
- <role-link>Power User</role-link>
- </role-mapper>
- <role-mapper>
- <role-name>user</role-name>
- <role-link>User</role-link>
- </role-mapper>
-</liferay-portlet-app>
\ No newline at end of file
Deleted: trunk/webclient/war/WEB-INF/liferay-display.xml
===================================================================
--- trunk/webclient/war/WEB-INF/liferay-display.xml 2008-10-28 14:12:22 UTC (rev 818)
+++ trunk/webclient/war/WEB-INF/liferay-display.xml 2008-10-29 21:26:17 UTC (rev 819)
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE display PUBLIC "-//Liferay//DTD Display 4.0.0//EN" "http://www.liferay.com/dtd/liferay-display_4_0_0.dtd">
-
-<display>
- <category name="category.Collaboration">
- <portlet id="@PORTLET-NAME@" />
- </category>
-</display>
\ No newline at end of file
Deleted: trunk/webclient/war/WEB-INF/liferay-portlet.xml
===================================================================
--- trunk/webclient/war/WEB-INF/liferay-portlet.xml 2008-10-28 14:12:22 UTC (rev 818)
+++ trunk/webclient/war/WEB-INF/liferay-portlet.xml 2008-10-29 21:26:17 UTC (rev 819)
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE liferay-portlet-app PUBLIC "-//Liferay//DTD Portlet Application 4.1.0//EN" "http://www.liferay.com/dtd/liferay-portlet-app_4_1_0.dtd">
-
-<liferay-portlet-app>
- <portlet>
- <portlet-name>@PORTLET-NAME@</portlet-name>
- <portlet-url-class>com.liferay.portal.apache.bridges.struts.LiferayStrutsPortletURLImpl</portlet-url-class>
- <use-default-template>true</use-default-template>
- <restore-current-view>true</restore-current-view>
- <instanceable>true</instanceable>
- <private-request-attributes>true</private-request-attributes>
- </portlet>
- <role-mapper>
- <role-name>administrator</role-name>
- <role-link>Administrator</role-link>
- </role-mapper>
- <role-mapper>
- <role-name>guest</role-name>
- <role-link>Guest</role-link>
- </role-mapper>
- <role-mapper>
- <role-name>power-user</role-name>
- <role-link>Power User</role-link>
- </role-mapper>
- <role-mapper>
- <role-name>user</role-name>
- <role-link>User</role-link>
- </role-mapper>
-</liferay-portlet-app>
\ No newline at end of file
Modified: trunk/webcommon/src/org/bedework/webcommon/BwAbstractAction.java
===================================================================
--- trunk/webcommon/src/org/bedework/webcommon/BwAbstractAction.java 2008-10-28 14:12:22 UTC (rev 818)
+++ trunk/webcommon/src/org/bedework/webcommon/BwAbstractAction.java 2008-10-29 21:26:17 UTC (rev 819)
@@ -2218,7 +2218,8 @@
/* If we're running as a portlet change the app root to point to a
* portlet specific directory.
*/
- String portalPlatform = form.retrieveConfig().getPortalPlatform();
+ String portalPlatform = CalOptionsFactory.getOptions(null, false).
+ getOptStringProperty("portalPlatform");
if (isPortlet && (portalPlatform != null)) {
appRoot += "." + portalPlatform;
}
Deleted: trunk/websubmit/war/WEB-INF/liferay-display.xml
===================================================================
--- trunk/websubmit/war/WEB-INF/liferay-display.xml 2008-10-28 14:12:22 UTC (rev 818)
+++ trunk/websubmit/war/WEB-INF/liferay-display.xml 2008-10-29 21:26:17 UTC (rev 819)
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE display PUBLIC "-//Liferay//DTD Display 4.0.0//EN" "http://www.liferay.com/dtd/liferay-display_4_0_0.dtd">
-
-<display>
- <category name="category.test">
- <portlet id="@PORTLET-NAME@" />
- </category>
-</display>
\ No newline at end of file
Deleted: trunk/websubmit/war/WEB-INF/liferay-portlet.xml
===================================================================
--- trunk/websubmit/war/WEB-INF/liferay-portlet.xml 2008-10-28 14:12:22 UTC (rev 818)
+++ trunk/websubmit/war/WEB-INF/liferay-portlet.xml 2008-10-29 21:26:17 UTC (rev 819)
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE liferay-portlet-app PUBLIC "-//Liferay//DTD Portlet Application 4.1.0//EN" "http://www.liferay.com/dtd/liferay-portlet-app_4_1_0.dtd">
-
-<liferay-portlet-app>
- <portlet>
- <portlet-name>@PORTLET-NAME@</portlet-name>
- <portlet-url-class>com.liferay.portal.apache.bridges.struts.LiferayStrutsPortletURLImpl</portlet-url-class>
- <use-default-template>true</use-default-template>
- <restore-current-view>true</restore-current-view>
- <instanceable>true</instanceable>
- <private-request-attributes>true</private-request-attributes>
- </portlet>
- <role-mapper>
- <role-name>administrator</role-name>
- <role-link>Administrator</role-link>
- </role-mapper>
- <role-mapper>
- <role-name>guest</role-name>
- <role-link>Guest</role-link>
- </role-mapper>
- <role-mapper>
- <role-name>power-user</role-name>
- <role-link>Power User</role-link>
- </role-mapper>
- <role-mapper>
- <role-name>user</role-name>
- <role-link>User</role-link>
- </role-mapper>
-</liferay-portlet-app>
\ No newline at end of file
More information about the Bedework-commit
mailing list