svnno****@sourc*****
svnno****@sourc*****
2008年 4月 30日 (水) 10:29:50 JST
Revision: 898
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=898
Author: sone
Date: 2008-04-30 10:29:49 +0900 (Wed, 30 Apr 2008)
Log Message:
-----------
remove patches
Removed Paths:
-------------
pal-portal/trunk/portal/patches/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/CastorFileSystemDocumentHandler.java
pal-portal/trunk/portal/patches/components/page-manager/src/java/org/apache/jetspeed/page/psml/CastorXmlPageManager.java
pal-portal/trunk/portal/patches/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/PortalSiteSessionContextImpl.java
pal-portal/trunk/portal/patches/components/portal-site/src/java/org/apache/jetspeed/portalsite/view/SiteView.java
pal-portal/trunk/portal/patches/etc/sql/j2-seed.xml
pal-portal/trunk/portal/patches/etc/sql/min/j2-seed.xml
pal-portal/trunk/portal/patches/etc/sql/mysql/populate-userinfo-for-default-psml.sql
pal-portal/trunk/portal/patches/etc/sql/populate-db-default.sql
pal-portal/trunk/portal/patches/etc/sql/populate-userinfo-for-default-psml.sql
pal-portal/trunk/portal/patches/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/MultiColumnPortlet.java
pal-portal/trunk/portal/patches/src/webapp/WEB-INF/assembly/portal-url-generation.xml
pal-portal/trunk/portal/patches/src/webapp/WEB-INF/conf/Log4j.properties
pal-portal/trunk/portal/patches/src/webapp/WEB-INF/templates/layout/html/maximized/layout.vm
pal-portal/trunk/portal/patches/src/webapp/WEB-INF/templates/layout/html/tcolumns/layout.vm
pal-portal/trunk/portal/patches/src/webapp/index.jsp
-------------- next part --------------
Deleted: pal-portal/trunk/portal/patches/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/CastorFileSystemDocumentHandler.java
===================================================================
--- pal-portal/trunk/portal/patches/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/CastorFileSystemDocumentHandler.java 2008-04-28 09:21:50 UTC (rev 897)
+++ pal-portal/trunk/portal/patches/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/CastorFileSystemDocumentHandler.java 2008-04-30 01:29:49 UTC (rev 898)
@@ -1,16 +0,0 @@
-Index: components/page-manager/src/java/org/apache/jetspeed/page/document/psml/CastorFileSystemDocumentHandler.java
-===================================================================
---- components/page-manager/src/java/org/apache/jetspeed/page/document/psml/CastorFileSystemDocumentHandler.java (リビジョン 552638)
-+++ components/page-manager/src/java/org/apache/jetspeed/page/document/psml/CastorFileSystemDocumentHandler.java (作業コピー)
-@@ -211,6 +211,11 @@
- {
- fileName = path + this.documentType;
- }
-+ // Check "_page"
-+ if (fileName.startsWith("/_page/"))
-+ {
-+ fileName = path.substring("/_page".length());
-+ }
- File f = new File(this.documentRootDir, fileName);
- Writer writer = null;
-
Deleted: pal-portal/trunk/portal/patches/components/page-manager/src/java/org/apache/jetspeed/page/psml/CastorXmlPageManager.java
===================================================================
--- pal-portal/trunk/portal/patches/components/page-manager/src/java/org/apache/jetspeed/page/psml/CastorXmlPageManager.java 2008-04-28 09:21:50 UTC (rev 897)
+++ pal-portal/trunk/portal/patches/components/page-manager/src/java/org/apache/jetspeed/page/psml/CastorXmlPageManager.java 2008-04-30 01:29:49 UTC (rev 898)
@@ -1,17 +0,0 @@
-Index: components/page-manager/src/java/org/apache/jetspeed/page/psml/CastorXmlPageManager.java
-===================================================================
---- components/page-manager/src/java/org/apache/jetspeed/page/psml/CastorXmlPageManager.java (リビジョン 545568)
-+++ components/page-manager/src/java/org/apache/jetspeed/page/psml/CastorXmlPageManager.java (作業コピー)
-@@ -921,6 +921,12 @@
- */
- private FolderImpl getNodeFolder(String nodePath) throws NodeException, InvalidFolderException, FolderNotFoundException
- {
-+ // Check "_page"
-+ if (nodePath.startsWith("/_page"))
-+ {
-+ nodePath = nodePath.substring("/_page".length());
-+ }
-+
- int folderIndex = nodePath.lastIndexOf(Folder.PATH_SEPARATOR);
- if (folderIndex > 0)
- {
Deleted: pal-portal/trunk/portal/patches/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/PortalSiteSessionContextImpl.java
===================================================================
--- pal-portal/trunk/portal/patches/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/PortalSiteSessionContextImpl.java 2008-04-28 09:21:50 UTC (rev 897)
+++ pal-portal/trunk/portal/patches/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/PortalSiteSessionContextImpl.java 2008-04-30 01:29:49 UTC (rev 898)
@@ -1,106 +0,0 @@
-Index: components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/PortalSiteSessionContextImpl.java
-===================================================================
---- components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/PortalSiteSessionContextImpl.java (リビジョン 553019)
-+++ components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/PortalSiteSessionContextImpl.java (作業コピー)
-@@ -34,9 +34,13 @@
- import org.apache.commons.logging.Log;
- import org.apache.commons.logging.LogFactory;
- import org.apache.jetspeed.om.folder.Folder;
-+import org.apache.jetspeed.om.folder.FolderNotFoundException;
-+import org.apache.jetspeed.om.folder.InvalidFolderException;
-+import org.apache.jetspeed.om.page.ContentPageImpl;
- import org.apache.jetspeed.om.page.Page;
- import org.apache.jetspeed.page.PageManager;
- import org.apache.jetspeed.page.PageManagerEventListener;
-+import org.apache.jetspeed.page.PageNotFoundException;
- import org.apache.jetspeed.page.document.Node;
- import org.apache.jetspeed.page.document.NodeException;
- import org.apache.jetspeed.page.document.NodeNotFoundException;
-@@ -47,6 +51,7 @@
- import org.apache.jetspeed.portalsite.view.SiteViewMenuDefinitionLocator;
- import org.apache.jetspeed.profiler.ProfileLocator;
- import org.apache.jetspeed.profiler.ProfileLocatorProperty;
-+import org.apache.jetspeed.request.RequestContext;
- import org.apache.jetspeed.security.JSSubject;
- import org.apache.jetspeed.security.UserPrincipal;
-
-@@ -207,6 +212,13 @@
- requestPath = locator.getRequestPath();
- }
-
-+ // Check "/_page/"
-+ Page page = getRequestedPage(requestPath);
-+ if (page != null)
-+ {
-+ return page;
-+ }
-+
- // attempt to select request page or folder using
- // profile locators and site view; if fallback
- // enabled, fallback on missing node or access
-@@ -1259,4 +1271,65 @@
- }
- return folderPageHistory;
- }
-+
-+ public static final String PAGE_PATH_NAVIGATION = "/_page/";
-+
-+ protected Page getRequestedPage(String path)
-+ {
-+ if (path == null || !path.startsWith(PAGE_PATH_NAVIGATION))
-+ {
-+ return null;
-+ }
-+
-+ Page page = null;
-+
-+ path = path.substring(PAGE_PATH_NAVIGATION.length() - 1);
-+
-+ try
-+ {
-+ if (path.endsWith(Page.DOCUMENT_TYPE))
-+ {
-+ page = getPageManager().getPage(path);
-+ }
-+ else
-+ {
-+ Folder folder = getPageManager().getFolder(path);
-+ if (folder != null)
-+ {
-+ String defaultPage = folder.getDefaultPage();
-+ if (defaultPage != null)
-+ {
-+ page = folder.getPage(defaultPage);
-+ }
-+ //TODO
-+ }
-+ }
-+ if (page != null)
-+ {
-+ page.setPath(PAGE_PATH_NAVIGATION + path.substring(1));
-+ return page;
-+ }
-+ }
-+ catch (PageNotFoundException e)
-+ {
-+ log.warn("Exception in request pipeline: " + e.getMessage(), e);
-+ }
-+ catch (FolderNotFoundException e)
-+ {
-+ log.warn("Exception in request pipeline: " + e.getMessage(), e);
-+ }
-+ catch (InvalidFolderException e)
-+ {
-+ log.warn("Exception in request pipeline: " + e.getMessage(), e);
-+ }
-+ catch (NodeException e)
-+ {
-+ log.warn("Exception in request pipeline: " + e.getMessage(), e);
-+ }
-+ catch (Exception e)
-+ {
-+ log.warn("Exception in request pipeline: " + e.getMessage(), e);
-+ }
-+ return null;
-+ }
- }
Deleted: pal-portal/trunk/portal/patches/components/portal-site/src/java/org/apache/jetspeed/portalsite/view/SiteView.java
===================================================================
--- pal-portal/trunk/portal/patches/components/portal-site/src/java/org/apache/jetspeed/portalsite/view/SiteView.java 2008-04-28 09:21:50 UTC (rev 897)
+++ pal-portal/trunk/portal/patches/components/portal-site/src/java/org/apache/jetspeed/portalsite/view/SiteView.java 2008-04-30 01:29:49 UTC (rev 898)
@@ -1,15 +0,0 @@
-Index: components/portal-site/src/java/org/apache/jetspeed/portalsite/view/SiteView.java
-===================================================================
---- components/portal-site/src/java/org/apache/jetspeed/portalsite/view/SiteView.java (リビジョン 545114)
-+++ components/portal-site/src/java/org/apache/jetspeed/portalsite/view/SiteView.java (作業コピー)
-@@ -1233,6 +1233,10 @@
- {
- return pageProxy.getPage();
- }
-+ else if(page instanceof Page)
-+ {
-+ return page;
-+ }
- return null;
- }
- }
Deleted: pal-portal/trunk/portal/patches/etc/sql/j2-seed.xml
===================================================================
--- pal-portal/trunk/portal/patches/etc/sql/j2-seed.xml 2008-04-28 09:21:50 UTC (rev 897)
+++ pal-portal/trunk/portal/patches/etc/sql/j2-seed.xml 2008-04-30 01:29:49 UTC (rev 898)
@@ -1,189 +0,0 @@
-Index: etc/sql/j2-seed.xml
-===================================================================
---- etc/sql/j2-seed.xml (リビジョン 519203)
-+++ etc/sql/j2-seed.xml (作業コピー)
-@@ -262,10 +262,13 @@
- <Role>manager</Role>
- <Role>user</Role>
- <Role>guest</Role>
-+ <Role>site</Role>
-+<!--
- <Role>subsite</Role>
- <Role>subsite2</Role>
- <Role>dev</Role>
- <Role>devmgr</Role>
-+-->
- </Roles>
- <Groups>
- <Group>accounting</Group>
-@@ -274,9 +277,10 @@
- </Groups>
- <Users>
- <User name="admin">
-- <credentials password="admin" enabled="TRUE" requiresUpdate="TRUE"/>
-+ <credentials password="##ADMIN_PASSWORD##" enabled="TRUE" requiresUpdate="TRUE"/>
- <roles>user,manager,admin</roles>
- <groups></groups>
-+<!--
- <preferences>
- <preference>
- <name value="org.apache.jetspeed.prefered.locale"/>
-@@ -293,16 +297,18 @@
- <value value="Dudley"/>
- </preference>
- </userinfo>
-+-->
- <Rules/>
- </User>
- <User name="manager">
-- <credentials password="manager" enabled="TRUE" requiresUpdate="FALSE"/>
-+ <credentials password="##MANAGER_PASSWORD##" enabled="TRUE" requiresUpdate="FALSE"/>
- <roles>user,manager</roles>
- <groups></groups>
- <preferences/>
- <userinfo/>
- <Rules/>
- </User>
-+<!--
- <User name="user">
- <credentials password="user" enabled="TRUE" requiresUpdate="FALSE"/>
- <roles>user</roles>
-@@ -333,16 +339,18 @@
- <Rule locator="page" rule="role-fallback"/>
- </Rules>
- </User>
-+-->
- <User name="guest">
- <Null/>
-- <roles>guest</roles>
-+ <roles>guest,site</roles>
- <groups></groups>
- <preferences/>
- <userinfo/>
- <Rules>
-- <Rule locator="page" rule="j2"/>
-+ <Rule locator="page" rule="site"/>
- </Rules>
- </User>
-+<!--
- <User name="subsite">
- <credentials password="subsite" enabled="TRUE" requiresUpdate="FALSE"/>
- <roles>user,subsite,subsite2</roles>
-@@ -381,10 +389,21 @@
- <Rule locator="page" rule="user-role-fallback"/>
- </Rules>
- </User>
-+-->
-+ <User name="site">
-+ <credentials password="##SITE_PASSWORD##" enabled="TRUE" requiresUpdate="FALSE"/>
-+ <roles>user,site</roles>
-+ <groups></groups>
-+ <preferences/>
-+ <userinfo/>
-+ <Rules>
-+ <Rule locator="page" rule="site"/>
-+ </Rules>
-+ </User>
- </Users>
- <Permissions>
- <Permission type="folder" resource="/" actions="view">
-- <roles>user,guest,subsite,subsite2</roles>
-+ <roles>user,guest</roles>
- <groups></groups>
- <users></users>
- </Permission>
-@@ -393,6 +412,7 @@
- <groups></groups>
- <users></users>
- </Permission>
-+<!--
- <Permission type="folder" resource="/anotherdir/-" actions="view">
- <roles>user</roles>
- <groups></groups>
-@@ -453,6 +473,7 @@
- <groups></groups>
- <users>subsite2</users>
- </Permission>
-+-->
- <Permission type="folder" resource="<<ALL FILES>>" actions="view, edit">
- <roles>admin</roles>
- <groups></groups>
-@@ -468,6 +489,7 @@
- <groups></groups>
- <users></users>
- </Permission>
-+<!--
- <Permission type="page" resource="/rss.psml" actions="view">
- <roles>guest</roles>
- <groups></groups>
-@@ -478,6 +500,7 @@
- <groups></groups>
- <users></users>
- </Permission>
-+-->
- <Permission type="portal" resource="j2-admin::*" actions="view, edit">
- <roles>admin</roles>
- <groups></groups>
-@@ -488,11 +511,13 @@
- <groups></groups>
- <users></users>
- </Permission>
-+<!--
- <Permission type="portal" resource="rss::*" actions="view, edit">
- <roles>user</roles>
- <groups></groups>
- <users></users>
- </Permission>
-+-->
- </Permissions>
- <ProfilingRules>
- <ProfilingRule id="group-fallback" standardRule="false">
-@@ -632,6 +657,7 @@
- </Criterion>
- </Criteria>
- </ProfilingRule>
-+<!--
- <ProfilingRule id="subsite-role-fallback-home" standardRule="false">
- <description value="A rule based on role fallback algorithm with specified subsite and home page"/>
- <Criteria>
-@@ -676,6 +702,7 @@
- </Criterion>
- </Criteria>
- </ProfilingRule>
-+-->
- <ProfilingRule id="user-role-fallback" standardRule="false">
- <description value="A role based fallback algorithm based on Jetspeed-1 role-based fallback"/>
- <Criteria>
-@@ -730,5 +757,32 @@
- </Criterion>
- </Criteria>
- </ProfilingRule>
-+ <ProfilingRule id="site" standardRule="false">
-+ <description value="A role based fallback algorithm for editing site"/>
-+ <Criteria>
-+ <Criterion name="user">
-+ <type value="user"/>
-+ <fallBackOrder value="0"/>
-+ <fallBackType value="2"/>
-+ </Criterion>
-+ <Criterion name="navigation">
-+ <type value="navigation"/>
-+ <value value="/"/>
-+ <fallBackOrder value="1"/>
-+ <fallBackType value="2"/>
-+ </Criterion>
-+ <Criterion name="role">
-+ <type value="role"/>
-+ <fallBackOrder value="2"/>
-+ <fallBackType value="2"/>
-+ </Criterion>
-+ <Criterion name="page">
-+ <type value="path.session"/>
-+ <value value="default-page"/>
-+ <fallBackOrder value="3"/>
-+ <fallBackType value="1"/>
-+ </Criterion>
-+ </Criteria>
-+ </ProfilingRule>
- </ProfilingRules>
- </Snapshot>
Deleted: pal-portal/trunk/portal/patches/etc/sql/min/j2-seed.xml
===================================================================
--- pal-portal/trunk/portal/patches/etc/sql/min/j2-seed.xml 2008-04-28 09:21:50 UTC (rev 897)
+++ pal-portal/trunk/portal/patches/etc/sql/min/j2-seed.xml 2008-04-30 01:29:49 UTC (rev 898)
@@ -1,137 +0,0 @@
-Index: etc/sql/min/j2-seed.xml
-===================================================================
---- etc/sql/min/j2-seed.xml (リビジョン 530210)
-+++ etc/sql/min/j2-seed.xml (作業コピー)
-@@ -261,14 +261,18 @@
- <Role>admin</Role>
- <Role>guest</Role>
- <Role>user</Role>
-+ <Role>site</Role>
-+ <Role>siteadmin</Role>
-+<!--
- <Role>dev</Role>
- <Role>devmgr</Role>
-+-->
- </Roles>
- <Groups>
- </Groups>
- <Users>
- <User name="admin">
-- <credentials password="admin" enabled="TRUE" requiresUpdate="TRUE"/>
-+ <credentials password="##ADMIN_PASSWORD##" enabled="TRUE" requiresUpdate="TRUE"/>
- <roles>user,admin</roles>
- <groups></groups>
- <userinfo>
-@@ -285,14 +289,15 @@
- </User>
- <User name="guest">
- <Null/>
-- <roles>guest</roles>
-+ <roles>guest,site</roles>
- <groups></groups>
- <preferences/>
- <userinfo/>
- <Rules>
-- <Rule locator="page" rule="j2"/>
-+ <Rule locator="page" rule="site"/>
- </Rules>
- </User>
-+<!--
- <User name="devmgr">
- <credentials password="devmgr" enabled="TRUE"/>
- <roles>user,dev,devmgr</roles>
-@@ -311,8 +316,35 @@
- <Rule locator="page" rule="user-role-fallback"/>
- </Rules>
- </User>
-+-->
-+ <User name="site">
-+ <credentials password="##SITE_PASSWORD##" enabled="TRUE" requiresUpdate="FALSE"/>
-+ <roles>user,site,siteadmin</roles>
-+ <groups></groups>
-+ <preferences/>
-+ <userinfo/>
-+ <Rules>
-+ <Rule locator="page" rule="site"/>
-+ </Rules>
-+ </User>
- </Users>
- <Permissions>
-+ <Permission type="folder" resource="/" actions="view">
-+ <roles>user,guest</roles>
-+ <groups></groups>
-+ <users></users>
-+ </Permission>
-+ <Permission type="folder" resource="/*" actions="view">
-+ <roles>user</roles>
-+ <groups></groups>
-+ <users></users>
-+ </Permission>
-+ <Permission type="folder" resource="<<ALL FILES>>" actions="view, edit">
-+ <roles>admin</roles>
-+ <groups></groups>
-+ <users></users>
-+ </Permission>
-+
- <Permission type="portal" resource="j2-admin::*" actions="view, edit">
- <roles>admin</roles>
- <groups></groups>
-@@ -385,6 +417,12 @@
- <ProfilingRule id="j2" standardRule="true">
- <description value="The default profiling rule for users and mediatype minus language and country."/>
- <Criteria>
-+ <Criterion name="page">
-+ <type value="path.session"/>
-+ <value value="default-page"/>
-+ <fallBackOrder value="0"/>
-+ <fallBackType value="0"/>
-+ </Criterion>
- <Criterion name="user">
- <type value="group.role.user"/>
- <fallBackOrder value="1"/>
-@@ -395,12 +433,6 @@
- <fallBackOrder value="2"/>
- <fallBackType value="1"/>
- </Criterion>
-- <Criterion name="page">
-- <type value="path.session"/>
-- <value value="default-page"/>
-- <fallBackOrder value="0"/>
-- <fallBackType value="0"/>
-- </Criterion>
- </Criteria>
- </ProfilingRule>
- <ProfilingRule id="path" standardRule="true">
-@@ -516,5 +548,32 @@
- </Criterion>
- </Criteria>
- </ProfilingRule>
-+ <ProfilingRule id="site" standardRule="false">
-+ <description value="A role based fallback algorithm for editing site"/>
-+ <Criteria>
-+ <Criterion name="user">
-+ <type value="user"/>
-+ <fallBackOrder value="0"/>
-+ <fallBackType value="2"/>
-+ </Criterion>
-+ <Criterion name="navigation">
-+ <type value="navigation"/>
-+ <value value="/"/>
-+ <fallBackOrder value="1"/>
-+ <fallBackType value="2"/>
-+ </Criterion>
-+ <Criterion name="role">
-+ <type value="role"/>
-+ <fallBackOrder value="2"/>
-+ <fallBackType value="2"/>
-+ </Criterion>
-+ <Criterion name="page">
-+ <type value="path.session"/>
-+ <value value="default-page"/>
-+ <fallBackOrder value="3"/>
-+ <fallBackType value="1"/>
-+ </Criterion>
-+ </Criteria>
-+ </ProfilingRule>
- </ProfilingRules>
- </Snapshot>
Deleted: pal-portal/trunk/portal/patches/etc/sql/mysql/populate-userinfo-for-default-psml.sql
===================================================================
--- pal-portal/trunk/portal/patches/etc/sql/mysql/populate-userinfo-for-default-psml.sql 2008-04-28 09:21:50 UTC (rev 897)
+++ pal-portal/trunk/portal/patches/etc/sql/mysql/populate-userinfo-for-default-psml.sql 2008-04-30 01:29:49 UTC (rev 898)
@@ -1,127 +0,0 @@
-Index: etc/sql/mysql/populate-userinfo-for-default-psml.sql
-===================================================================
---- etc/sql/mysql/populate-userinfo-for-default-psml.sql (リビジョン 488564)
-+++ etc/sql/mysql/populate-userinfo-for-default-psml.sql (作業コピー)
-@@ -6,9 +6,9 @@
- INSERT INTO PREFS_PROPERTY_VALUE VALUES(41,103,'user.name.given','Test Dude','2004-05-22 16:27:12.562','2004-05-22 16:27:12.562');
- INSERT INTO PREFS_PROPERTY_VALUE VALUES(42,103,'user.name.family','Dudley','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
- INSERT INTO SECURITY_PRINCIPAL VALUES(2,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl',0,1,'/user/manager','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
--INSERT INTO SECURITY_PRINCIPAL VALUES(3,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl',0,1,'/user/user','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
--INSERT INTO SECURITY_PRINCIPAL VALUES(4,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl',0,1,'/user/tomcat','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
--INSERT INTO SECURITY_PRINCIPAL VALUES(5,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl',0,1,'/user/jetspeed','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
-+--INSERT INTO SECURITY_PRINCIPAL VALUES(3,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl',0,1,'/user/user','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
-+--INSERT INTO SECURITY_PRINCIPAL VALUES(4,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl',0,1,'/user/tomcat','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
-+--INSERT INTO SECURITY_PRINCIPAL VALUES(5,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl',0,1,'/user/jetspeed','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
- INSERT INTO SECURITY_PRINCIPAL VALUES(6,'org.apache.jetspeed.security.JetspeedRolePrincipalImpl',0,1,'/role/admin','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
- INSERT INTO SECURITY_PRINCIPAL VALUES(7,'org.apache.jetspeed.security.JetspeedRolePrincipalImpl',0,1,'/role/manager','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
- INSERT INTO SECURITY_PRINCIPAL VALUES(8,'org.apache.jetspeed.security.JetspeedRolePrincipalImpl',0,1,'/role/user','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
-@@ -17,21 +17,23 @@
- INSERT INTO SECURITY_PRINCIPAL VALUES(11,'org.apache.jetspeed.security.JetspeedGroupPrincipalImpl',0,1,'/group/accounting','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
- INSERT INTO SECURITY_PRINCIPAL VALUES(12,'org.apache.jetspeed.security.JetspeedGroupPrincipalImpl',0,1,'/group/marketing','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
- INSERT INTO SECURITY_PRINCIPAL VALUES(13,'org.apache.jetspeed.security.JetspeedGroupPrincipalImpl',0,1,'/group/engineering','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
--INSERT INTO SECURITY_CREDENTIAL VALUES(1,1,'admin',0,'org.apache.jetspeed.security.spi.impl.DefaultPasswordCredentialImpl',1,0,1,0,0,'2004-05-22 16:27:12.572','2004-05-22 16:27:12.572',null,null,null);
--INSERT INTO SECURITY_CREDENTIAL VALUES(2,2,'manager',0,'org.apache.jetspeed.security.spi.impl.DefaultPasswordCredentialImpl',0,0,1,0,0,'2004-05-22 16:27:12.572','2004-05-22 16:27:12.572',null,null,null);
--INSERT INTO SECURITY_CREDENTIAL VALUES(3,3,'user',0,'org.apache.jetspeed.security.spi.impl.DefaultPasswordCredentialImpl',0,0,1,0,0,'2004-05-22 16:27:12.572','2004-05-22 16:27:12.572',null,null,null);
--INSERT INTO SECURITY_CREDENTIAL VALUES(4,4,'tomcat',0,'org.apache.jetspeed.security.spi.impl.DefaultPasswordCredentialImpl',0,0,1,0,0,'2004-05-22 16:27:12.572','2004-05-22 16:27:12.572',null,null,null);
--INSERT INTO SECURITY_CREDENTIAL VALUES(5,5,'jetspeed',0,'org.apache.jetspeed.security.spi.impl.DefaultPasswordCredentialImpl',0,0,1,0,0,'2004-05-22 16:27:12.572','2004-05-22 16:27:12.572',null,null,null);
-+INSERT INTO SECURITY_PRINCIPAL VALUES(14,'org.apache.jetspeed.security.JetspeedRolePrincipalImpl',0,1,'/role/site','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
-+INSERT INTO SECURITY_CREDENTIAL VALUES(1,1,'@@ADMIN_PASSWORD@@',0,'org.apache.jetspeed.security.spi.impl.DefaultPasswordCredentialImpl',1,0,1,0,0,'2004-05-22 16:27:12.572','2004-05-22 16:27:12.572',null,null,null);
-+INSERT INTO SECURITY_CREDENTIAL VALUES(2,2,'@@MANAGER_PASSWORD@@',0,'org.apache.jetspeed.security.spi.impl.DefaultPasswordCredentialImpl',0,0,1,0,0,'2004-05-22 16:27:12.572','2004-05-22 16:27:12.572',null,null,null);
-+--INSERT INTO SECURITY_CREDENTIAL VALUES(3,3,'user',0,'org.apache.jetspeed.security.spi.impl.DefaultPasswordCredentialImpl',0,0,1,0,0,'2004-05-22 16:27:12.572','2004-05-22 16:27:12.572',null,null,null);
-+--INSERT INTO SECURITY_CREDENTIAL VALUES(4,4,'tomcat',0,'org.apache.jetspeed.security.spi.impl.DefaultPasswordCredentialImpl',0,0,1,0,0,'2004-05-22 16:27:12.572','2004-05-22 16:27:12.572',null,null,null);
-+--INSERT INTO SECURITY_CREDENTIAL VALUES(5,5,'jetspeed',0,'org.apache.jetspeed.security.spi.impl.DefaultPasswordCredentialImpl',0,0,1,0,0,'2004-05-22 16:27:12.572','2004-05-22 16:27:12.572',null,null,null);
- INSERT INTO SECURITY_USER_ROLE VALUES(1,6);
- INSERT INTO SECURITY_USER_ROLE VALUES(1,7);
- INSERT INTO SECURITY_USER_ROLE VALUES(1,8);
- INSERT INTO SECURITY_USER_ROLE VALUES(2,7);
- INSERT INTO SECURITY_USER_ROLE VALUES(2,8);
--INSERT INTO SECURITY_USER_ROLE VALUES(3,8);
-+--INSERT INTO SECURITY_USER_ROLE VALUES(3,8);
- INSERT INTO SECURITY_USER_ROLE VALUES(9,10);
--INSERT INTO SECURITY_USER_ROLE VALUES(5,7);
--INSERT INTO SECURITY_USER_GROUP VALUES(3,11);
--INSERT INTO SECURITY_USER_GROUP VALUES(5,13);
-+INSERT INTO SECURITY_USER_ROLE VALUES(9,14);
-+--INSERT INTO SECURITY_USER_ROLE VALUES(5,7);
-+--INSERT INTO SECURITY_USER_GROUP VALUES(3,11);
-+--INSERT INTO SECURITY_USER_GROUP VALUES(5,13);
- INSERT INTO SECURITY_PERMISSION VALUES(1,'org.apache.jetspeed.security.FolderPermission','<<ALL FILES>>','view, edit','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
- INSERT INTO SECURITY_PERMISSION VALUES(2,'org.apache.jetspeed.security.FolderPermission','<<ALL FILES>>','view','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
- INSERT INTO SECURITY_PERMISSION VALUES(3,'org.apache.jetspeed.security.FolderPermission','/','view','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
-@@ -46,8 +48,8 @@
- INSERT INTO SECURITY_PERMISSION VALUES(12,'org.apache.jetspeed.security.PagePermission','/rss.psml','view','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
- INSERT INTO SECURITY_PERMISSION VALUES(13,'org.apache.jetspeed.security.FolderPermission','/_user/user','view, edit','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
- INSERT INTO SECURITY_PERMISSION VALUES(14,'org.apache.jetspeed.security.FolderPermission','/_user/user/-','view, edit','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
--INSERT INTO PRINCIPAL_PERMISSION VALUES(3,13);
--INSERT INTO PRINCIPAL_PERMISSION VALUES(3,14);
-+--INSERT INTO PRINCIPAL_PERMISSION VALUES(3,13);
-+--INSERT INTO PRINCIPAL_PERMISSION VALUES(3,14);
- INSERT INTO PRINCIPAL_PERMISSION VALUES(6,1);
- INSERT INTO PRINCIPAL_PERMISSION VALUES(7,2);
- INSERT INTO PRINCIPAL_PERMISSION VALUES(8,3);
-@@ -64,36 +66,39 @@
- INSERT INTO PRINCIPAL_PERMISSION VALUES(10,12);
-
-
--INSERT INTO SECURITY_PRINCIPAL VALUES(50,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl',0,1,'/user/subsite','2005-01-01 00:00:00.000','2005-01-01 00:00:00.000');
--INSERT INTO SECURITY_PRINCIPAL VALUES(51,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl',0,1,'/user/subsite2','2005-01-01 00:00:00.000','2005-01-01 00:00:00.000');
--INSERT INTO SECURITY_CREDENTIAL VALUES(50,50,'subsite',0,'org.apache.jetspeed.security.spi.impl.DefaultPasswordCredentialImpl',0,0,1,0,0,'2005-01-01 00:00:00.000','2005-01-01 00:00:00.000',null,null,null);
--INSERT INTO SECURITY_CREDENTIAL VALUES(51,51,'subsite2',0,'org.apache.jetspeed.security.spi.impl.DefaultPasswordCredentialImpl',0,0,1,0,0,'2005-01-01 00:00:00.000','2005-01-01 00:00:00.000',null,null,null);
-+--INSERT INTO SECURITY_PRINCIPAL VALUES(50,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl',0,1,'/user/subsite','2005-01-01 00:00:00.000','2005-01-01 00:00:00.000');
-+--INSERT INTO SECURITY_PRINCIPAL VALUES(51,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl',0,1,'/user/subsite2','2005-01-01 00:00:00.000','2005-01-01 00:00:00.000');
-+--INSERT INTO SECURITY_CREDENTIAL VALUES(50,50,'subsite',0,'org.apache.jetspeed.security.spi.impl.DefaultPasswordCredentialImpl',0,0,1,0,0,'2005-01-01 00:00:00.000','2005-01-01 00:00:00.000',null,null,null);
-+--INSERT INTO SECURITY_CREDENTIAL VALUES(51,51,'subsite2',0,'org.apache.jetspeed.security.spi.impl.DefaultPasswordCredentialImpl',0,0,1,0,0,'2005-01-01 00:00:00.000','2005-01-01 00:00:00.000',null,null,null);
-
--INSERT INTO SECURITY_PRINCIPAL VALUES(52,'org.apache.jetspeed.security.JetspeedRolePrincipalImpl',0,1,'/role/subsite','2005-01-01 00:00:00.000','2005-01-01 00:00:00.000');
--INSERT INTO SECURITY_PRINCIPAL VALUES(53,'org.apache.jetspeed.security.JetspeedRolePrincipalImpl',0,1,'/role/subsite2','2005-01-01 00:00:00.000','2005-01-01 00:00:00.000');
-+--INSERT INTO SECURITY_PRINCIPAL VALUES(52,'org.apache.jetspeed.security.JetspeedRolePrincipalImpl',0,1,'/role/subsite','2005-01-01 00:00:00.000','2005-01-01 00:00:00.000');
-+--INSERT INTO SECURITY_PRINCIPAL VALUES(53,'org.apache.jetspeed.security.JetspeedRolePrincipalImpl',0,1,'/role/subsite2','2005-01-01 00:00:00.000','2005-01-01 00:00:00.000');
-
--INSERT INTO SECURITY_USER_ROLE VALUES(50,52);
--INSERT INTO SECURITY_USER_ROLE VALUES(50,53);
--INSERT INTO SECURITY_USER_ROLE VALUES(51,52);
--INSERT INTO SECURITY_USER_ROLE VALUES(51,53);
-+--INSERT INTO SECURITY_USER_ROLE VALUES(50,52);
-+--INSERT INTO SECURITY_USER_ROLE VALUES(50,53);
-+--INSERT INTO SECURITY_USER_ROLE VALUES(51,52);
-+--INSERT INTO SECURITY_USER_ROLE VALUES(51,53);
-
--INSERT INTO SECURITY_PERMISSION VALUES(50,'org.apache.jetspeed.security.FolderPermission','/__subsite-root','view','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
--INSERT INTO SECURITY_PERMISSION VALUES(51,'org.apache.jetspeed.security.FolderPermission','/__subsite-root/-','view','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
--INSERT INTO SECURITY_PERMISSION VALUES(52,'org.apache.jetspeed.security.FolderPermission','/__subsite-root/_role/subsite','view, edit','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
--INSERT INTO SECURITY_PERMISSION VALUES(53,'org.apache.jetspeed.security.FolderPermission','/__subsite-root/_role/subsite/-','view, edit','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
--INSERT INTO SECURITY_PERMISSION VALUES(54,'org.apache.jetspeed.security.FolderPermission','/__subsite-root/_role/subsite2','view, edit','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
--INSERT INTO SECURITY_PERMISSION VALUES(55,'org.apache.jetspeed.security.FolderPermission','/__subsite-root/_role/subsite2/-','view, edit','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
--INSERT INTO PRINCIPAL_PERMISSION VALUES(50,52);
--INSERT INTO PRINCIPAL_PERMISSION VALUES(50,53);
--INSERT INTO PRINCIPAL_PERMISSION VALUES(51,54);
--INSERT INTO PRINCIPAL_PERMISSION VALUES(51,55);
--INSERT INTO PRINCIPAL_PERMISSION VALUES(52,3);
--INSERT INTO PRINCIPAL_PERMISSION VALUES(52,50);
--INSERT INTO PRINCIPAL_PERMISSION VALUES(52,51);
--INSERT INTO PRINCIPAL_PERMISSION VALUES(53,3);
--INSERT INTO PRINCIPAL_PERMISSION VALUES(53,50);
--INSERT INTO PRINCIPAL_PERMISSION VALUES(53,51);
-+--INSERT INTO SECURITY_PERMISSION VALUES(50,'org.apache.jetspeed.security.FolderPermission','/__subsite-root','view','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
-+--INSERT INTO SECURITY_PERMISSION VALUES(51,'org.apache.jetspeed.security.FolderPermission','/__subsite-root/-','view','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
-+--INSERT INTO SECURITY_PERMISSION VALUES(52,'org.apache.jetspeed.security.FolderPermission','/__subsite-root/_role/subsite','view, edit','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
-+--INSERT INTO SECURITY_PERMISSION VALUES(53,'org.apache.jetspeed.security.FolderPermission','/__subsite-root/_role/subsite/-','view, edit','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
-+--INSERT INTO SECURITY_PERMISSION VALUES(54,'org.apache.jetspeed.security.FolderPermission','/__subsite-root/_role/subsite2','view, edit','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
-+--INSERT INTO SECURITY_PERMISSION VALUES(55,'org.apache.jetspeed.security.FolderPermission','/__subsite-root/_role/subsite2/-','view, edit','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
-+--INSERT INTO PRINCIPAL_PERMISSION VALUES(50,52);
-+--INSERT INTO PRINCIPAL_PERMISSION VALUES(50,53);
-+--INSERT INTO PRINCIPAL_PERMISSION VALUES(51,54);
-+--INSERT INTO PRINCIPAL_PERMISSION VALUES(51,55);
-+--INSERT INTO PRINCIPAL_PERMISSION VALUES(52,3);
-+--INSERT INTO PRINCIPAL_PERMISSION VALUES(52,50);
-+--INSERT INTO PRINCIPAL_PERMISSION VALUES(52,51);
-+--INSERT INTO PRINCIPAL_PERMISSION VALUES(53,3);
-+--INSERT INTO PRINCIPAL_PERMISSION VALUES(53,50);
-+--INSERT INTO PRINCIPAL_PERMISSION VALUES(53,51);
-
- INSERT INTO SECURITY_PERMISSION VALUES(100,'org.apache.jetspeed.security.PortletPermission','j2-admin::*','view, edit','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
- INSERT INTO PRINCIPAL_PERMISSION VALUES(6,100);
-
-+INSERT INTO SECURITY_PERMISSION VALUES(101,'org.apache.jetspeed.security.PortletPermission','cms-portlets::*','view, edit','2006-12-23 22:37:42','2006-12-23 22:37:42');
-+INSERT INTO PRINCIPAL_PERMISSION VALUES(14,101);
-+
Deleted: pal-portal/trunk/portal/patches/etc/sql/populate-db-default.sql
===================================================================
--- pal-portal/trunk/portal/patches/etc/sql/populate-db-default.sql 2008-04-28 09:21:50 UTC (rev 897)
+++ pal-portal/trunk/portal/patches/etc/sql/populate-db-default.sql 2008-04-30 01:29:49 UTC (rev 898)
@@ -1,13 +0,0 @@
-Index: etc/sql/populate-db-default.sql
-===================================================================
---- etc/sql/populate-db-default.sql (リビジョン 474669)
-+++ etc/sql/populate-db-default.sql (作業コピー)
-@@ -429,7 +429,7 @@
- 'Resolves pages based on the clients remote IP address.');
- insert into RULE_CRITERION values ('60', 'ip-address', 0, 'ip', 'ip', null, 0);
-
--insert into PRINCIPAL_RULE_ASSOC values ( 'guest', 'page', 'j2' );
-+insert into PRINCIPAL_RULE_ASSOC values ( 'guest', 'page', 'user-role-fallback' );
- insert into PRINCIPAL_RULE_ASSOC values ( 'jetspeed', 'page', 'role-fallback' );
- insert into PRINCIPAL_RULE_ASSOC values ( 'jetspeed', 'menu', 'role-group' );
- insert into PRINCIPAL_RULE_ASSOC values ( 'user', 'page', 'j2' );
Deleted: pal-portal/trunk/portal/patches/etc/sql/populate-userinfo-for-default-psml.sql
===================================================================
--- pal-portal/trunk/portal/patches/etc/sql/populate-userinfo-for-default-psml.sql 2008-04-28 09:21:50 UTC (rev 897)
+++ pal-portal/trunk/portal/patches/etc/sql/populate-userinfo-for-default-psml.sql 2008-04-30 01:29:49 UTC (rev 898)
@@ -1,128 +0,0 @@
-Index: etc/sql/populate-userinfo-for-default-psml.sql
-===================================================================
---- etc/sql/populate-userinfo-for-default-psml.sql (リビジョン 488564)
-+++ etc/sql/populate-userinfo-for-default-psml.sql (作業コピー)
-@@ -6,9 +6,9 @@
- INSERT INTO PREFS_PROPERTY_VALUE VALUES(41,103,'user.name.given','Test Dude','2004-05-22 16:27:12.562','2004-05-22 16:27:12.562');
- INSERT INTO PREFS_PROPERTY_VALUE VALUES(42,103,'user.name.family','Dudley','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
- INSERT INTO SECURITY_PRINCIPAL VALUES(2,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl',0,1,'/user/manager','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
--INSERT INTO SECURITY_PRINCIPAL VALUES(3,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl',0,1,'/user/user','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
--INSERT INTO SECURITY_PRINCIPAL VALUES(4,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl',0,1,'/user/tomcat','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
--INSERT INTO SECURITY_PRINCIPAL VALUES(5,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl',0,1,'/user/jetspeed','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
-+-- INSERT INTO SECURITY_PRINCIPAL VALUES(3,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl',0,1,'/user/user','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
-+-- INSERT INTO SECURITY_PRINCIPAL VALUES(4,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl',0,1,'/user/tomcat','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
-+-- INSERT INTO SECURITY_PRINCIPAL VALUES(5,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl',0,1,'/user/jetspeed','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
- INSERT INTO SECURITY_PRINCIPAL VALUES(6,'org.apache.jetspeed.security.JetspeedRolePrincipalImpl',0,1,'/role/admin','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
- INSERT INTO SECURITY_PRINCIPAL VALUES(7,'org.apache.jetspeed.security.JetspeedRolePrincipalImpl',0,1,'/role/manager','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
- INSERT INTO SECURITY_PRINCIPAL VALUES(8,'org.apache.jetspeed.security.JetspeedRolePrincipalImpl',0,1,'/role/user','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
-@@ -17,21 +17,23 @@
- INSERT INTO SECURITY_PRINCIPAL VALUES(11,'org.apache.jetspeed.security.JetspeedGroupPrincipalImpl',0,1,'/group/accounting','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
- INSERT INTO SECURITY_PRINCIPAL VALUES(12,'org.apache.jetspeed.security.JetspeedGroupPrincipalImpl',0,1,'/group/marketing','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
- INSERT INTO SECURITY_PRINCIPAL VALUES(13,'org.apache.jetspeed.security.JetspeedGroupPrincipalImpl',0,1,'/group/engineering','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
--INSERT INTO SECURITY_CREDENTIAL VALUES(1,1,'admin',0,'org.apache.jetspeed.security.spi.impl.DefaultPasswordCredentialImpl',1,0,1,0,0,'2004-05-22 16:27:12.572','2004-05-22 16:27:12.572',null,null,null);
--INSERT INTO SECURITY_CREDENTIAL VALUES(2,2,'manager',0,'org.apache.jetspeed.security.spi.impl.DefaultPasswordCredentialImpl',0,0,1,0,0,'2004-05-22 16:27:12.572','2004-05-22 16:27:12.572',null,null,null);
--INSERT INTO SECURITY_CREDENTIAL VALUES(3,3,'user',0,'org.apache.jetspeed.security.spi.impl.DefaultPasswordCredentialImpl',0,0,1,0,0,'2004-05-22 16:27:12.572','2004-05-22 16:27:12.572',null,null,null);
--INSERT INTO SECURITY_CREDENTIAL VALUES(4,4,'tomcat',0,'org.apache.jetspeed.security.spi.impl.DefaultPasswordCredentialImpl',0,0,1,0,0,'2004-05-22 16:27:12.572','2004-05-22 16:27:12.572',null,null,null);
--INSERT INTO SECURITY_CREDENTIAL VALUES(5,5,'jetspeed',0,'org.apache.jetspeed.security.spi.impl.DefaultPasswordCredentialImpl',0,0,1,0,0,'2004-05-22 16:27:12.572','2004-05-22 16:27:12.572',null,null,null);
-+INSERT INTO SECURITY_PRINCIPAL VALUES(14,'org.apache.jetspeed.security.JetspeedRolePrincipalImpl',0,1,'/role/site','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
-+INSERT INTO SECURITY_CREDENTIAL VALUES(1,1,'@@ADMIN_PASSWORD@@',0,'org.apache.jetspeed.security.spi.impl.DefaultPasswordCredentialImpl',1,0,1,0,0,'2004-05-22 16:27:12.572','2004-05-22 16:27:12.572',null,null,null);
-+INSERT INTO SECURITY_CREDENTIAL VALUES(2,2,'@@MANAGER_PASSWORD@@',0,'org.apache.jetspeed.security.spi.impl.DefaultPasswordCredentialImpl',0,0,1,0,0,'2004-05-22 16:27:12.572','2004-05-22 16:27:12.572',null,null,null);
-+-- INSERT INTO SECURITY_CREDENTIAL VALUES(3,3,'user',0,'org.apache.jetspeed.security.spi.impl.DefaultPasswordCredentialImpl',0,0,1,0,0,'2004-05-22 16:27:12.572','2004-05-22 16:27:12.572',null,null,null);
-+-- INSERT INTO SECURITY_CREDENTIAL VALUES(4,4,'tomcat',0,'org.apache.jetspeed.security.spi.impl.DefaultPasswordCredentialImpl',0,0,1,0,0,'2004-05-22 16:27:12.572','2004-05-22 16:27:12.572',null,null,null);
-+-- INSERT INTO SECURITY_CREDENTIAL VALUES(5,5,'jetspeed',0,'org.apache.jetspeed.security.spi.impl.DefaultPasswordCredentialImpl',0,0,1,0,0,'2004-05-22 16:27:12.572','2004-05-22 16:27:12.572',null,null,null);
- INSERT INTO SECURITY_USER_ROLE VALUES(1,6);
- INSERT INTO SECURITY_USER_ROLE VALUES(1,7);
- INSERT INTO SECURITY_USER_ROLE VALUES(1,8);
- INSERT INTO SECURITY_USER_ROLE VALUES(2,7);
- INSERT INTO SECURITY_USER_ROLE VALUES(2,8);
--INSERT INTO SECURITY_USER_ROLE VALUES(3,8);
-+-- INSERT INTO SECURITY_USER_ROLE VALUES(3,8);
- INSERT INTO SECURITY_USER_ROLE VALUES(9,10);
--INSERT INTO SECURITY_USER_ROLE VALUES(5,7);
--INSERT INTO SECURITY_USER_GROUP VALUES(3,11);
--INSERT INTO SECURITY_USER_GROUP VALUES(5,13);
-+INSERT INTO SECURITY_USER_ROLE VALUES(9,14);
-+-- INSERT INTO SECURITY_USER_ROLE VALUES(5,7);
-+-- INSERT INTO SECURITY_USER_GROUP VALUES(3,11);
-+-- INSERT INTO SECURITY_USER_GROUP VALUES(5,13);
- INSERT INTO SECURITY_PERMISSION VALUES(1,'org.apache.jetspeed.security.FolderPermission','<<ALL FILES>>','view, edit','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
- INSERT INTO SECURITY_PERMISSION VALUES(2,'org.apache.jetspeed.security.FolderPermission','<<ALL FILES>>','view','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
- INSERT INTO SECURITY_PERMISSION VALUES(3,'org.apache.jetspeed.security.FolderPermission','/','view','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
-@@ -46,8 +48,8 @@
- INSERT INTO SECURITY_PERMISSION VALUES(12,'org.apache.jetspeed.security.PagePermission','/rss.psml','view','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
- INSERT INTO SECURITY_PERMISSION VALUES(13,'org.apache.jetspeed.security.FolderPermission','/_user/user','view, edit','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
- INSERT INTO SECURITY_PERMISSION VALUES(14,'org.apache.jetspeed.security.FolderPermission','/_user/user/-','view, edit','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
--INSERT INTO PRINCIPAL_PERMISSION VALUES(3,13);
--INSERT INTO PRINCIPAL_PERMISSION VALUES(3,14);
-+-- INSERT INTO PRINCIPAL_PERMISSION VALUES(3,13);
-+-- INSERT INTO PRINCIPAL_PERMISSION VALUES(3,14);
- INSERT INTO PRINCIPAL_PERMISSION VALUES(6,1);
- INSERT INTO PRINCIPAL_PERMISSION VALUES(7,2);
- INSERT INTO PRINCIPAL_PERMISSION VALUES(8,3);
-@@ -63,18 +65,18 @@
- INSERT INTO PRINCIPAL_PERMISSION VALUES(10,11);
- INSERT INTO PRINCIPAL_PERMISSION VALUES(10,12);
-
--INSERT INTO SECURITY_PRINCIPAL VALUES(50,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl',0,1,'/user/subsite','2005-01-01 00:00:00.000','2005-01-01 00:00:00.000');
--INSERT INTO SECURITY_PRINCIPAL VALUES(51,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl',0,1,'/user/subsite2','2005-01-01 00:00:00.000','2005-01-01 00:00:00.000');
--INSERT INTO SECURITY_CREDENTIAL VALUES(50,50,'subsite',0,'org.apache.jetspeed.security.spi.impl.DefaultPasswordCredentialImpl',0,0,1,0,0,'2005-01-01 00:00:00.000','2005-01-01 00:00:00.000',null,null,null);
--INSERT INTO SECURITY_CREDENTIAL VALUES(51,51,'subsite2',0,'org.apache.jetspeed.security.spi.impl.DefaultPasswordCredentialImpl',0,0,1,0,0,'2005-01-01 00:00:00.000','2005-01-01 00:00:00.000',null,null,null);
-+-- INSERT INTO SECURITY_PRINCIPAL VALUES(50,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl',0,1,'/user/subsite','2005-01-01 00:00:00.000','2005-01-01 00:00:00.000');
-+-- INSERT INTO SECURITY_PRINCIPAL VALUES(51,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl',0,1,'/user/subsite2','2005-01-01 00:00:00.000','2005-01-01 00:00:00.000');
-+-- INSERT INTO SECURITY_CREDENTIAL VALUES(50,50,'subsite',0,'org.apache.jetspeed.security.spi.impl.DefaultPasswordCredentialImpl',0,0,1,0,0,'2005-01-01 00:00:00.000','2005-01-01 00:00:00.000',null,null,null);
-+-- INSERT INTO SECURITY_CREDENTIAL VALUES(51,51,'subsite2',0,'org.apache.jetspeed.security.spi.impl.DefaultPasswordCredentialImpl',0,0,1,0,0,'2005-01-01 00:00:00.000','2005-01-01 00:00:00.000',null,null,null);
-
--INSERT INTO SECURITY_PRINCIPAL VALUES(52,'org.apache.jetspeed.security.JetspeedRolePrincipalImpl',0,1,'/role/subsite','2005-01-01 00:00:00.000','2005-01-01 00:00:00.000');
--INSERT INTO SECURITY_PRINCIPAL VALUES(53,'org.apache.jetspeed.security.JetspeedRolePrincipalImpl',0,1,'/role/subsite2','2005-01-01 00:00:00.000','2005-01-01 00:00:00.000');
-+-- INSERT INTO SECURITY_PRINCIPAL VALUES(52,'org.apache.jetspeed.security.JetspeedRolePrincipalImpl',0,1,'/role/subsite','2005-01-01 00:00:00.000','2005-01-01 00:00:00.000');
-+-- INSERT INTO SECURITY_PRINCIPAL VALUES(53,'org.apache.jetspeed.security.JetspeedRolePrincipalImpl',0,1,'/role/subsite2','2005-01-01 00:00:00.000','2005-01-01 00:00:00.000');
-
--INSERT INTO SECURITY_USER_ROLE VALUES(50,52);
--INSERT INTO SECURITY_USER_ROLE VALUES(50,53);
--INSERT INTO SECURITY_USER_ROLE VALUES(51,52);
--INSERT INTO SECURITY_USER_ROLE VALUES(51,53);
-+-- INSERT INTO SECURITY_USER_ROLE VALUES(50,52);
-+-- INSERT INTO SECURITY_USER_ROLE VALUES(50,53);
-+-- INSERT INTO SECURITY_USER_ROLE VALUES(51,52);
-+-- INSERT INTO SECURITY_USER_ROLE VALUES(51,53);
-
-
- INSERT INTO SECURITY_PERMISSION VALUES(50,'org.apache.jetspeed.security.FolderPermission','/__subsite-root','view','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
-@@ -83,21 +85,24 @@
- INSERT INTO SECURITY_PERMISSION VALUES(53,'org.apache.jetspeed.security.FolderPermission','/__subsite-root/_role/subsite/-','view, edit','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
- INSERT INTO SECURITY_PERMISSION VALUES(54,'org.apache.jetspeed.security.FolderPermission','/__subsite-root/_role/subsite2','view, edit','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
- INSERT INTO SECURITY_PERMISSION VALUES(55,'org.apache.jetspeed.security.FolderPermission','/__subsite-root/_role/subsite2/-','view, edit','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
--INSERT INTO PRINCIPAL_PERMISSION VALUES(50,52);
--INSERT INTO PRINCIPAL_PERMISSION VALUES(50,53);
--INSERT INTO PRINCIPAL_PERMISSION VALUES(51,54);
--INSERT INTO PRINCIPAL_PERMISSION VALUES(51,55);
--INSERT INTO PRINCIPAL_PERMISSION VALUES(52,3);
--INSERT INTO PRINCIPAL_PERMISSION VALUES(52,50);
--INSERT INTO PRINCIPAL_PERMISSION VALUES(52,51);
--INSERT INTO PRINCIPAL_PERMISSION VALUES(53,3);
--INSERT INTO PRINCIPAL_PERMISSION VALUES(53,50);
--INSERT INTO PRINCIPAL_PERMISSION VALUES(53,51);
-+-- INSERT INTO PRINCIPAL_PERMISSION VALUES(50,52);
-+-- INSERT INTO PRINCIPAL_PERMISSION VALUES(50,53);
-+-- INSERT INTO PRINCIPAL_PERMISSION VALUES(51,54);
-+-- INSERT INTO PRINCIPAL_PERMISSION VALUES(51,55);
-+-- INSERT INTO PRINCIPAL_PERMISSION VALUES(52,3);
-+-- INSERT INTO PRINCIPAL_PERMISSION VALUES(52,50);
-+-- INSERT INTO PRINCIPAL_PERMISSION VALUES(52,51);
-+-- INSERT INTO PRINCIPAL_PERMISSION VALUES(53,3);
-+-- INSERT INTO PRINCIPAL_PERMISSION VALUES(53,50);
-+-- INSERT INTO PRINCIPAL_PERMISSION VALUES(53,51);
-
- INSERT INTO SECURITY_PERMISSION VALUES(100,'org.apache.jetspeed.security.PortletPermission','j2-admin::*','view, edit','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
- INSERT INTO PRINCIPAL_PERMISSION VALUES(6,100);
-
-+INSERT INTO SECURITY_PERMISSION VALUES(101,'org.apache.jetspeed.security.PortletPermission','cms-portlets::*','view, edit','2006-12-23 22:37:42','2006-12-23 22:37:42');
-+INSERT INTO PRINCIPAL_PERMISSION VALUES(14,101);
-+
- -- Test User for Mapping IP addresses to geographic locations
- -- And ip-address Profile rule
--INSERT INTO SECURITY_PRINCIPAL VALUES(60,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl',0,1,'/user/geo','2006-09-03 12:07:25.234','2006-09-03 12:07:25.234');
--INSERT INTO SECURITY_CREDENTIAL VALUES(60,60,'geo',0,'org.apache.jetspeed.security.spi.impl.DefaultPasswordCredentialImpl',0,0,1,0,0,'2006-09-03 12:07:25.234','2006-09-03 12:07:25.234',null,null,null);
-\ No newline at end of file
-+-- INSERT INTO SECURITY_PRINCIPAL VALUES(60,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl',0,1,'/user/geo','2006-09-03 12:07:25.234','2006-09-03 12:07:25.234');
-+-- INSERT INTO SECURITY_CREDENTIAL VALUES(60,60,'geo',0,'org.apache.jetspeed.security.spi.impl.DefaultPasswordCredentialImpl',0,0,1,0,0,'2006-09-03 12:07:25.234','2006-09-03 12:07:25.234',null,null,null);
Deleted: pal-portal/trunk/portal/patches/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/MultiColumnPortlet.java
===================================================================
--- pal-portal/trunk/portal/patches/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/MultiColumnPortlet.java 2008-04-28 09:21:50 UTC (rev 897)
+++ pal-portal/trunk/portal/patches/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/MultiColumnPortlet.java 2008-04-30 01:29:49 UTC (rev 898)
@@ -1,1782 +0,0 @@
-Index: layout-portlets/src/java/org/apache/jetspeed/portlets/layout/MultiColumnPortlet.java
-===================================================================
---- layout-portlets/src/java/org/apache/jetspeed/portlets/layout/MultiColumnPortlet.java (リビジョン 539124)
-+++ layout-portlets/src/java/org/apache/jetspeed/portlets/layout/MultiColumnPortlet.java (作業コピー)
-@@ -55,21 +55,32 @@
- protected final static Log log = LogFactory.getLog(MultiColumnPortlet.class);
-
- protected final static String PARAM_NUM_COLUMN = "columns";
-+
- protected final static int DEFAULT_NUM_COLUMN = 2;
-+
- protected final static String PARAM_COLUMN_SIZES = "sizes";
-+
- protected final static String DEFAULT_ONE_COLUMN_SIZES = "100%";
-+
- protected final static String DEFAULT_TWO_COLUMN_SIZES = "50%,50%";
-+
- protected final static String DEFAULT_THREE_COLUMN_SIZES = "34%,33%,33%";
-
- private int numColumns = 0;
-+
- private String columnSizes = null;
-+
- private String portletName = null;
-+
- private String layoutType;
-+
- private String editorType = null;
-+
- protected DecorationFactory decorators;
-+
- protected JetspeedDesktop desktop;
-
-- public void init( PortletConfig config ) throws PortletException
-+ public void init(PortletConfig config) throws PortletException
- {
- super.init(config);
- this.portletName = config.getPortletName();
-@@ -89,50 +100,57 @@
- {
- switch (this.numColumns)
- {
-- case 1: this.columnSizes = DEFAULT_ONE_COLUMN_SIZES; break;
-- case 2: this.columnSizes = DEFAULT_TWO_COLUMN_SIZES; break;
-- case 3: this.columnSizes = DEFAULT_THREE_COLUMN_SIZES; break;
-- default: this.columnSizes = null; break;
-+ case 1:
-+ this.columnSizes = DEFAULT_ONE_COLUMN_SIZES;
-+ break;
-+ case 2:
-+ this.columnSizes = DEFAULT_TWO_COLUMN_SIZES;
-+ break;
-+ case 3:
-+ this.columnSizes = DEFAULT_THREE_COLUMN_SIZES;
-+ break;
-+ default:
-+ this.columnSizes = null;
-+ break;
- }
- }
- if (this.columnSizes == null)
- {
-- throw new PortletException("Column sizes cannot be defaulted for " + this.numColumns + " columns and are not specified for " + this.portletName);
-+ throw new PortletException("Column sizes cannot be defaulted for " + this.numColumns
-+ + " columns and are not specified for " + this.portletName);
- }
--
-- this.decorators = (DecorationFactory)getPortletContext().getAttribute(CommonPortletServices.CPS_DECORATION_FACTORY);
-+
-+ this.decorators = (DecorationFactory) getPortletContext().getAttribute(CommonPortletServices.CPS_DECORATION_FACTORY);
- if (null == this.decorators)
- {
- throw new PortletException("Failed to find the Decoration Factory on portlet initialization");
- }
--
-- this.desktop = (JetspeedDesktop)getPortletContext().getAttribute(CommonPortletServices.CPS_DESKTOP);
-+
-+ this.desktop = (JetspeedDesktop) getPortletContext().getAttribute(CommonPortletServices.CPS_DESKTOP);
- }
-
-- public void doView( RenderRequest request, RenderResponse response ) throws PortletException, IOException
-+ public void doView(RenderRequest request, RenderResponse response) throws PortletException, IOException
- {
- RequestContext context = getRequestContext(request);
-
-- ContentPage requestPage = context.getPage();
-- PageEditAccess pageEditAccess = (PageEditAccess)context.getAttribute(PortalReservedParameters.PAGE_EDIT_ACCESS_ATTRIBUTE);
-- if ( requestPage == null || pageEditAccess == null )
-+ ContentPage requestPage = context.getPage();
-+ PageEditAccess pageEditAccess = (PageEditAccess) context.getAttribute(PortalReservedParameters.PAGE_EDIT_ACCESS_ATTRIBUTE);
-+ if (requestPage == null || pageEditAccess == null)
- {
- // Targetting this portlet REQUIRES that the ProfilerValve has been invoked!
- throw new PortletException("Current request page or PageEditAccess not available.");
- }
--
-- Boolean editing = ( pageEditAccess.isEditing() &&
-- PortletMode.VIEW.equals(request.getPortletMode()) &&
-- request.isPortletModeAllowed(PortletMode.EDIT))
-- ? Boolean.TRUE : Boolean.FALSE;
--
-+
-+ Boolean editing = (pageEditAccess.isEditing() && PortletMode.VIEW.equals(request.getPortletMode()) && request
-+ .isPortletModeAllowed(PortletMode.EDIT)) ? Boolean.TRUE : Boolean.FALSE;
-+
- PortletWindow window = context.getPortalURL().getNavigationalState().getMaximizedWindow();
- if (window != null)
- {
- super.doView(request, response);
- return;
- }
--
-+
- // get fragment column sizes
- Fragment f = getFragment(request, false);
- String fragmentColumnSizes = columnSizes;
-@@ -141,7 +159,7 @@
- {
- fragmentColumnSizes = fragmentColumnSizesProperty;
- }
-- String [] fragmentColumnSizesArray = fragmentColumnSizes.split("\\,");
-+ String[] fragmentColumnSizesArray = fragmentColumnSizes.split("\\,");
- List fragmentColumnSizesList = new ArrayList(fragmentColumnSizesArray.length);
- for (int i = 0; (i < fragmentColumnSizesArray.length); i++)
- {
-@@ -157,16 +175,35 @@
- }
- catch (LayoutEventException e1)
- {
-- throw new PortletException("Failed to build ColumnLayout "+e1.getMessage(), e1);
-+ throw new PortletException("Failed to build ColumnLayout " + e1.getMessage(), e1);
- }
-
-+ String prefName = request.getParameter("preferenceName");
-+ if (prefName != null)
-+ {
-+ request.setAttribute("preferenceName", prefName);
-+ }
-+ else
-+ {
-+ request.setAttribute("preferenceName", "");
-+ }
-+ String prefState = request.getParameter("preferenceState");
-+ if (prefState != null)
-+ {
-+ request.setAttribute("preferenceState", prefState);
-+ }
-+ else
-+ {
-+ request.setAttribute("preferenceState", "hide");
-+ }
-+
- // invoke the JSP associated with this portlet
- request.setAttribute("columnLayout", layout);
- request.setAttribute("numberOfColumns", new Integer(numColumns));
- request.setAttribute("decorationFactory", this.decorators);
- request.setAttribute("columnSizes", fragmentColumnSizesList);
-- request.setAttribute("editing",editing);
-- request.setAttribute("fragmentNestingLevel",new Integer(getFragmentNestingLevel(requestPage,f.getId())));
-+ request.setAttribute("editing", editing);
-+ request.setAttribute("fragmentNestingLevel", new Integer(getFragmentNestingLevel(requestPage, f.getId())));
- super.doView(request, response);
- request.removeAttribute("decorationFactory");
- request.removeAttribute("columnLayout");
-@@ -176,794 +213,956 @@
- request.removeAttribute(("fragmentNestingLevel"));
- }
-
-- public void processAction(ActionRequest request, ActionResponse response) throws PortletException, IOException
-+ protected void addLayout(ActionRequest request, ActionResponse response) throws PortletException
- {
-- RequestContext requestContext = (RequestContext)request.getAttribute(PortalReservedParameters.REQUEST_CONTEXT_ATTRIBUTE);
--
-- ContentPage requestPage = requestContext.getPage();
-- PageEditAccess pageEditAccess = (PageEditAccess)requestContext.getAttribute(PortalReservedParameters.PAGE_EDIT_ACCESS_ATTRIBUTE);
-- if ( requestPage == null || pageEditAccess == null )
-+ RequestContext requestContext = (RequestContext) request.getAttribute(PortalReservedParameters.REQUEST_CONTEXT_ATTRIBUTE);
-+ ContentPage requestPage = requestContext.getPage();
-+ String layout = request.getParameter("layout");
-+ if (layout != null && layout.length() > 0)
- {
-- // Targetting this portlet with an ActionRequest REQUIRES that the ProfilerValve has been invoked!
-- throw new PortletException("Current request page or PageEditAccess not available.");
-+ PortletWindow window = requestContext.getActionWindow();
-+ ContentFragment targetFragment = requestPage.getContentFragmentById(window.getId().toString());
-+
-+ if (targetFragment == null)
-+ {
-+ // ignore no longer consistent page definition
-+ return;
-+ }
-+
-+ try
-+ {
-+ Fragment fragment = pageManager.newFragment();
-+ fragment.setType(Fragment.LAYOUT);
-+ fragment.setName(layout);
-+
-+ targetFragment.getFragments().add(fragment);
-+ pageManager.updatePage(requestPage);
-+ }
-+ catch (Exception e)
-+ {
-+ throw new PortletException("failed to add portlet " + layout + " to page: " + requestPage + ": " + e.getMessage(),
-+ e);
-+ }
- }
--
-- String pageMode = request.getParameter("pageMode");
-- if ( pageMode != null )
-+
-+ }
-+
-+ protected void changeLayout(ActionRequest request, ActionResponse response) throws PortletException
-+ {
-+ RequestContext requestContext = (RequestContext) request.getAttribute(PortalReservedParameters.REQUEST_CONTEXT_ATTRIBUTE);
-+ ContentPage requestPage = requestContext.getPage();
-+ String layout = request.getParameter("layout");
-+ if (layout != null && layout.length() > 0)
- {
-- if ( "view".equals(pageMode) )
-+ PortletWindow window = requestContext.getActionWindow();
-+ ContentFragment targetFragment = requestPage.getContentFragmentById(window.getId().toString());
-+
-+ if (targetFragment == null)
- {
-- pageEditAccess.setEditing(false);
-+ // ignore no longer consistent page definition
-+ return;
- }
-- else if ( "edit".equals(pageMode) && pageEditAccess.isEditAllowed() )
-+
-+ if (!layout.equals(targetFragment.getName()))
- {
-- if ( this.editorType != null && this.editorType.equals( "desktop" ) )
-+ try
- {
-- String redirectUrl = this.desktop.getPortalUrl( requestContext, requestContext.getPath() );
-- redirectUrl += "?editPage=true&portal=true";
-- response.sendRedirect( redirectUrl );
-+ // layout portlet change
-+ targetFragment.setName(layout);
-+ pageManager.updatePage(requestPage);
-+ entityAccess.updatePortletEntity(window.getPortletEntity(), targetFragment);
-+ entityAccess.storePortletEntity(window.getPortletEntity());
-+
-+ windowAccess.createPortletWindow(window.getPortletEntity(), targetFragment.getId());
-+ return;
- }
-- else
-+ catch (Exception e)
- {
-- pageEditAccess.setEditing(true);
-+ throw new PortletException("Unable to update page: " + e.getMessage(), e);
- }
- }
-- return;
- }
--
-- if ( pageEditAccess.isEditAllowed() && request.isPortletModeAllowed(PortletMode.EDIT) )
-+
-+ }
-+
-+ protected void addPage(ActionRequest request, ActionResponse response) throws PortletException
-+ {
-+ RequestContext requestContext = (RequestContext) request.getAttribute(PortalReservedParameters.REQUEST_CONTEXT_ATTRIBUTE);
-+ ContentPage requestPage = requestContext.getPage();
-+
-+ String jsPageName = request.getParameter("jsNewPageName");
-+ String jsPageTitle = request.getParameter("jsNewPageTitle");
-+ String jsPageShortTitle = request.getParameter("jsNewPageShortTitle");
-+ if (jsPageName != null && jsPageName.length() > 0 && jsPageName.indexOf(Folder.PATH_SEPARATOR) == -1)
- {
-- String layout = null;
--
-- boolean addLayout = request.getParameter("jsAddLayout") != null;
-- if ( addLayout || request.getParameter("jsChangeLayout") != null )
-+ try
- {
-- layout = request.getParameter("layout");
-- if ( layout != null && layout.length() > 0 )
-+ Folder parent = (Folder) requestPage.getParent();
-+ if (parent != null)
- {
-- PortletWindow window = requestContext.getActionWindow();
-- ContentFragment targetFragment = requestPage.getContentFragmentById(window.getId().toString());
--
-- if ( targetFragment == null )
-+ String path = parent.getPath();
-+ if (path.endsWith(Folder.PATH_SEPARATOR))
- {
-- // ignore no longer consistent page definition
-- return;
-+ path = path + getEscapedName(jsPageName);
- }
--
-- if ( addLayout )
-+ else
- {
-- try
-- {
-- Fragment fragment = pageManager.newFragment();
-- fragment.setType(Fragment.LAYOUT);
-- fragment.setName(layout);
--
-- targetFragment.getFragments().add(fragment);
-- pageManager.updatePage(requestPage);
-- }
-- catch (Exception e)
-- {
-- throw new PortletException("failed to add portlet " + layout + " to page: " + requestPage+": "+e.getMessage(), e);
-- }
-+ path = path + Folder.PATH_SEPARATOR + getEscapedName(jsPageName);
- }
-- else if ( !layout.equals(targetFragment.getName()) )
-+ Page page = pageManager.newPage(path);
-+ String layout = requestPage.getRootFragment().getName();
-+ page.getRootFragment().setName(layout);
-+ page.setDefaultDecorator(requestPage.getDefaultDecorator(Fragment.LAYOUT), Fragment.LAYOUT);
-+ page.setDefaultDecorator(requestPage.getDefaultDecorator(Fragment.PORTLET), Fragment.PORTLET);
-+ page.setTitle(jsPageTitle != null && !jsPageTitle.equals("") ? jsPageTitle : jsPageName);
-+ page.setShortTitle(jsPageShortTitle != null && !jsPageShortTitle.equals("") ? jsPageShortTitle : jsPageName);
-+ pageManager.updatePage(page);
-+
-+ List orderList = parent.getDocumentOrder();
-+ if (orderList != null)
- {
-- try
-+ String name = page.getName();
-+ if (orderList.indexOf(name) < 0)
- {
-- // layout portlet change
-- targetFragment.setName(layout);
-- pageManager.updatePage(requestPage);
-- entityAccess.updatePortletEntity(window.getPortletEntity(), targetFragment);
-- entityAccess.storePortletEntity(window.getPortletEntity());
--
-- windowAccess.createPortletWindow(window.getPortletEntity(), targetFragment.getId());
-- return;
-+ orderList.add(name);
-+ parent.setDocumentOrder(orderList);
-+ pageManager.updateFolder(parent);
- }
-- catch (Exception e)
-- {
-- throw new PortletException("Unable to update page: "+e.getMessage(), e);
-- }
- }
- }
-- return;
- }
-+ catch (Exception e)
-+ {
-+ throw new PortletException("Unable to access page for editing: " + e.getMessage(), e);
-+ }
-+ }
-
-- if ( request.getParameter("jsSubmitPage" ) != null )
-+ }
-+
-+ protected void updatePage(ActionRequest request, ActionResponse response) throws PortletException
-+ {
-+ RequestContext requestContext = (RequestContext) request.getAttribute(PortalReservedParameters.REQUEST_CONTEXT_ATTRIBUTE);
-+ ContentPage requestPage = requestContext.getPage();
-+
-+ String jsPageTitle = request.getParameter("jsPageTitle");
-+ String jsPageShortTitle = request.getParameter("jsPageShortTitle");
-+ try
-+ {
-+ if (jsPageTitle != null && !jsPageTitle.equals(""))
- {
-- String jsPageName = request.getParameter("jsPageName");
-- String jsPageTitle = request.getParameter("jsPageTitle");
-- String jsPageShortTitle = request.getParameter("jsPageShortTitle");
-- if ( jsPageName != null && jsPageName.length() > 0 && jsPageName.indexOf(Folder.PATH_SEPARATOR) == -1 )
-- {
-- try
-- {
-- Folder parent = (Folder)requestPage.getParent();
-- if (parent != null)
-- {
-- String path = parent.getPath();
-- if (path.endsWith(Folder.PATH_SEPARATOR))
-- {
-- path = path + getEscapedName(jsPageName);
-- }
-- else
-- {
-- path = path + Folder.PATH_SEPARATOR
-- + getEscapedName(jsPageName);
-- }
-- Page page = pageManager.newPage(path);
-- if ( layout == null || layout.length() == 0 )
-- {
-- layout = requestPage.getRootFragment().getName();
-- }
-- page.getRootFragment().setName(layout);
-- page.setDefaultDecorator(requestPage.getDefaultDecorator(Fragment.LAYOUT), Fragment.LAYOUT);
-- page.setDefaultDecorator(requestPage.getDefaultDecorator(Fragment.PORTLET), Fragment.PORTLET);
-- page.setTitle(jsPageTitle != null && !jsPageTitle.equals("") ? jsPageTitle : jsPageName);
-- page.setShortTitle(jsPageShortTitle != null
-- && !jsPageShortTitle.equals("") ? jsPageShortTitle
-- : jsPageName);
-- pageManager.updatePage(page);
--
-- List orderList = parent.getDocumentOrder();
-- if (orderList != null)
-- {
-- String name = page.getName();
-- if (orderList.indexOf(name) < 0)
-- {
-- orderList.add(name);
-- parent.setDocumentOrder(orderList);
-- pageManager.updateFolder(parent);
-- }
-- }
-- }
-- }
-- catch (Exception e)
-- {
-- throw new PortletException("Unable to access page for editing: "+e.getMessage(), e);
-- }
-- }
-- return;
-+ requestPage.setTitle(jsPageTitle);
- }
-+ if (jsPageShortTitle != null && !jsPageShortTitle.equals(""))
-+ {
-+ requestPage.setShortTitle(jsPageShortTitle);
-+ }
-+ pageManager.updatePage(requestPage);
-+ }
-+ catch (Exception e)
-+ {
-+ throw new PortletException("Unable to access page for editing: " + e.getMessage(), e);
-+ }
-
-- if (request.getParameter("jsChangePageName") != null)
-+ }
-+
-+ protected void deletePage(ActionRequest request, ActionResponse response) throws PortletException
-+ {
-+ RequestContext requestContext = (RequestContext) request.getAttribute(PortalReservedParameters.REQUEST_CONTEXT_ATTRIBUTE);
-+ ContentPage requestPage = requestContext.getPage();
-+
-+ try
-+ {
-+ Folder parent = (Folder) requestPage.getParent();
-+ if (parent != null)
- {
-- String jsPageTitle = request.getParameter("jsPageTitle");
-- String jsPageShortTitle = request
-- .getParameter("jsPageShortTitle");
-- try
-+ List orderList = parent.getDocumentOrder();
-+ if (orderList != null)
- {
-- if (jsPageTitle != null && !jsPageTitle.equals(""))
-+ String name = requestPage.getName();
-+ if (orderList.indexOf(name) > -1)
- {
-- requestPage.setTitle(jsPageTitle);
-+ orderList.remove(name);
-+ parent.setDocumentOrder(orderList);
-+ pageManager.updateFolder(parent);
- }
-- if (jsPageShortTitle != null
-- && !jsPageShortTitle.equals(""))
-- {
-- requestPage.setShortTitle(jsPageShortTitle);
-- }
-- pageManager.updatePage(requestPage);
- }
-- catch (Exception e)
-- {
-- throw new PortletException(
-- "Unable to access page for editing: "
-- + e.getMessage(), e);
-- }
-- return;
- }
-
-- if ( request.getParameter("jsDeletePage" ) != null )
-+ pageManager.removePage(requestPage);
-+ }
-+ catch (Exception e)
-+ {
-+ throw new PortletException("Unable to access page for removing: " + e.getMessage(), e);
-+ }
-+
-+ }
-+
-+ protected void movePageToLeft(ActionRequest request, ActionResponse response) throws PortletException
-+ {
-+ RequestContext requestContext = (RequestContext) request.getAttribute(PortalReservedParameters.REQUEST_CONTEXT_ATTRIBUTE);
-+ ContentPage requestPage = requestContext.getPage();
-+
-+ try
-+ {
-+ Folder parent = (Folder) requestPage.getParent();
-+ if (parent != null)
- {
-- try
-+ List orderList = parent.getDocumentOrder();
-+ String name = requestPage.getName();
-+ if (orderList != null)
- {
-- Folder parent = (Folder)requestPage.getParent();
-- if (parent != null)
-+ int index = orderList.indexOf(name);
-+ if (index > -1)
- {
-- List orderList = parent.getDocumentOrder();
-- if (orderList != null)
-+ String type = requestPage.getType();
-+ int i = index - 1;
-+ while (i >= 0)
- {
-- String name = requestPage.getName();
-- if (orderList.indexOf(name) > -1)
-+ String value = (String) orderList.get(i);
-+ if (value.endsWith(type))
- {
-- orderList.remove(name);
-+ orderList.remove(index);
-+ orderList.add(i, name);
- parent.setDocumentOrder(orderList);
- pageManager.updateFolder(parent);
-+ break;
- }
-+ i--;
- }
- }
--
-- pageManager.removePage(requestPage);
-+ else
-+ {
-+ orderList.add(name);
-+ parent.setDocumentOrder(orderList);
-+ pageManager.updateFolder(parent);
-+ }
- }
-- catch (Exception e)
-+ else
- {
-- throw new PortletException("Unable to access page for removing: "+e.getMessage(), e);
-+ orderList = new ArrayList(4);
-+ orderList.add(name);
-+ parent.setDocumentOrder(orderList);
-+ pageManager.updateFolder(parent);
- }
-- return;
- }
-+ }
-+ catch (Exception e)
-+ {
-+ throw new PortletException("Unable to access page for changing the document order: " + e.getMessage(), e);
-+ }
-
-- if (request.getParameter("jsMovePageLeft") != null)
-+ }
-+
-+ protected void movePageToRight(ActionRequest request, ActionResponse response) throws PortletException
-+ {
-+ RequestContext requestContext = (RequestContext) request.getAttribute(PortalReservedParameters.REQUEST_CONTEXT_ATTRIBUTE);
-+ ContentPage requestPage = requestContext.getPage();
-+
-+ try
-+ {
-+ Folder parent = (Folder) requestPage.getParent();
-+ if (parent != null)
- {
-- try
-+ List orderList = parent.getDocumentOrder();
-+ String name = requestPage.getName();
-+ if (orderList != null)
- {
-- Folder parent = (Folder) requestPage.getParent();
-- if (parent != null)
-+ int index = orderList.indexOf(name);
-+ if (index > -1)
- {
-- List orderList = parent.getDocumentOrder();
-- String name = requestPage.getName();
-- if (orderList != null)
-+ String type = requestPage.getType();
-+ int i = index + 1;
-+ while (i < orderList.size())
- {
-- int index = orderList.indexOf(name);
-- if (index > -1)
-+ String value = (String) orderList.get(i);
-+ if (value.endsWith(type))
- {
-- String type = requestPage.getType();
-- int i = index - 1;
-- while (i >= 0)
-- {
-- String value = (String) orderList.get(i);
-- if (value.endsWith(type))
-- {
-- orderList.remove(index);
-- orderList.add(i, name);
-- parent.setDocumentOrder(orderList);
-- pageManager.updateFolder(parent);
-- break;
-- }
-- i--;
-- }
-- }
-- else
-- {
-- orderList.add(name);
-+ orderList.remove(index);
-+ orderList.add(i, name);
- parent.setDocumentOrder(orderList);
- pageManager.updateFolder(parent);
-+ break;
- }
-+ i++;
- }
-- else
-- {
-- orderList = new ArrayList(4);
-- orderList.add(name);
-- parent.setDocumentOrder(orderList);
-- pageManager.updateFolder(parent);
-- }
- }
-+ else
-+ {
-+ orderList.add(name);
-+ parent.setDocumentOrder(orderList);
-+ pageManager.updateFolder(parent);
-+ }
- }
-- catch (Exception e)
-+ else
- {
-- throw new PortletException(
-- "Unable to access page for changing the document order: "
-- + e.getMessage(), e);
-+ orderList = new ArrayList(4);
-+ orderList.add(name);
-+ parent.setDocumentOrder(orderList);
-+ pageManager.updateFolder(parent);
- }
-- return;
- }
-+ }
-+ catch (Exception e)
-+ {
-+ throw new PortletException("Unable to access page for changing the document order: " + e.getMessage(), e);
-+ }
-
-- if (request.getParameter("jsMovePageRight") != null)
-+ }
-+
-+ protected void addFolder(ActionRequest request, ActionResponse response) throws PortletException
-+ {
-+ RequestContext requestContext = (RequestContext) request.getAttribute(PortalReservedParameters.REQUEST_CONTEXT_ATTRIBUTE);
-+ ContentPage requestPage = requestContext.getPage();
-+
-+ String jsFolderName = request.getParameter("jsNewFolderName");
-+ String jsFolderTitle = request.getParameter("jsNewFolderTitle");
-+ String jsFolderShortTitle = request.getParameter("jsNewFolderShortTitle");
-+ if (jsFolderName != null && jsFolderName.length() > 0 && jsFolderName.indexOf(Folder.PATH_SEPARATOR) == -1)
-+ {
-+ try
- {
-- try
-+ Folder parent = (Folder) requestPage.getParent();
-+ if (parent != null)
- {
-- Folder parent = (Folder) requestPage.getParent();
-- if (parent != null)
-+ String path = parent.getPath();
-+ if (path.endsWith(Folder.PATH_SEPARATOR))
- {
-- List orderList = parent.getDocumentOrder();
-- String name = requestPage.getName();
-- if (orderList != null)
-+ path = path + getEscapedName(jsFolderName);
-+ }
-+ else
-+ {
-+ path = path + Folder.PATH_SEPARATOR + getEscapedName(jsFolderName);
-+ }
-+ Folder folder = pageManager.newFolder(path);
-+ String layout = requestPage.getRootFragment().getName();
-+ folder.setDefaultDecorator(requestPage.getDefaultDecorator(Fragment.LAYOUT), Fragment.LAYOUT);
-+ folder.setDefaultDecorator(requestPage.getDefaultDecorator(Fragment.PORTLET), Fragment.PORTLET);
-+ folder.setTitle(jsFolderTitle != null && !jsFolderTitle.equals("") ? jsFolderTitle : jsFolderName);
-+ folder.setShortTitle(jsFolderShortTitle != null && !jsFolderShortTitle.equals("") ? jsFolderShortTitle
-+ : jsFolderName);
-+ pageManager.updateFolder(folder);
-+
-+ List orderList = parent.getDocumentOrder();
-+ if (orderList != null)
-+ {
-+ String name = folder.getName();
-+ if (orderList.indexOf(name) < 0)
- {
-- int index = orderList.indexOf(name);
-- if (index > -1)
-- {
-- String type = requestPage.getType();
-- int i = index + 1;
-- while (i < orderList.size())
-- {
-- String value = (String) orderList.get(i);
-- if (value.endsWith(type))
-- {
-- orderList.remove(index);
-- orderList.add(i, name);
-- parent.setDocumentOrder(orderList);
-- pageManager.updateFolder(parent);
-- break;
-- }
-- i++;
-- }
-- }
-- else
-- {
-- orderList.add(name);
-- parent.setDocumentOrder(orderList);
-- pageManager.updateFolder(parent);
-- }
-- }
-- else
-- {
-- orderList = new ArrayList(4);
- orderList.add(name);
- parent.setDocumentOrder(orderList);
- pageManager.updateFolder(parent);
- }
- }
-- }
-- catch (Exception e)
-- {
-- throw new PortletException(
-- "Unable to access page for changing the document order: "
-- + e.getMessage(), e);
-- }
-- return;
-- }
-
-- if (request.getParameter("jsSubmitFolder") != null)
-- {
-- String jsFolderName = request.getParameter("jsFolderName");
-- String jsFolderTitle = request.getParameter("jsFolderTitle");
-- String jsFolderShortTitle = request.getParameter("jsFolderShortTitle");
-- if (jsFolderName != null && jsFolderName.length() > 0
-- && jsFolderName.indexOf(Folder.PATH_SEPARATOR) == -1)
-- {
-- try
-+ // add default page
-+ path = folder.getPath();
-+ if (path.endsWith(Folder.PATH_SEPARATOR))
- {
-- Folder parent = (Folder) requestPage.getParent();
-- if (parent != null)
-+ path = path + getEscapedName("default-page");
-+ }
-+ else
-+ {
-+ path = path + Folder.PATH_SEPARATOR + getEscapedName("default-page");
-+ }
-+ Page page = pageManager.newPage(path);
-+ if (layout == null || layout.length() == 0)
-+ {
-+ layout = requestPage.getRootFragment().getName();
-+ }
-+ page.getRootFragment().setName(layout);
-+ page.setDefaultDecorator(requestPage.getDefaultDecorator(Fragment.LAYOUT), Fragment.LAYOUT);
-+ page.setDefaultDecorator(requestPage.getDefaultDecorator(Fragment.PORTLET), Fragment.PORTLET);
-+ page.setTitle(jsFolderName);
-+ pageManager.updatePage(page);
-+
-+ orderList = folder.getDocumentOrder();
-+ if (orderList != null)
-+ {
-+ String name = page.getName();
-+ if (orderList.indexOf(name) < 0)
- {
-- String path = parent.getPath();
-- if (path.endsWith(Folder.PATH_SEPARATOR))
-- {
-- path = path + getEscapedName(jsFolderName);
-- }
-- else
-- {
-- path = path + Folder.PATH_SEPARATOR
-- + getEscapedName(jsFolderName);
-- }
-- Folder folder = pageManager.newFolder(path);
-- if (layout == null || layout.length() == 0)
-- {
-- layout = requestPage.getRootFragment()
-- .getName();
-- }
-- folder.setDefaultDecorator(requestPage
-- .getDefaultDecorator(Fragment.LAYOUT),
-- Fragment.LAYOUT);
-- folder.setDefaultDecorator(requestPage
-- .getDefaultDecorator(Fragment.PORTLET),
-- Fragment.PORTLET);
-- folder
-- .setTitle(jsFolderTitle != null
-- && !jsFolderTitle.equals("") ? jsFolderTitle
-- : jsFolderName);
-- folder
-- .setShortTitle(jsFolderShortTitle != null
-- && !jsFolderShortTitle.equals("") ? jsFolderShortTitle
-- : jsFolderName);
-+ orderList.add(name);
-+ folder.setDocumentOrder(orderList);
- pageManager.updateFolder(folder);
--
-- List orderList = parent.getDocumentOrder();
-- if (orderList != null)
-- {
-- String name = folder.getName();
-- if (orderList.indexOf(name) < 0)
-- {
-- orderList.add(name);
-- parent.setDocumentOrder(orderList);
-- pageManager.updateFolder(parent);
-- }
-- }
--
-- // add default page
-- path = folder.getPath();
-- if (path.endsWith(Folder.PATH_SEPARATOR))
-- {
-- path = path + getEscapedName("default-page");
-- }
-- else
-- {
-- path = path + Folder.PATH_SEPARATOR
-- + getEscapedName("default-page");
-- }
-- Page page = pageManager.newPage(path);
-- if (layout == null || layout.length() == 0)
-- {
-- layout = requestPage.getRootFragment()
-- .getName();
-- }
-- page.getRootFragment().setName(layout);
-- page.setDefaultDecorator(requestPage
-- .getDefaultDecorator(Fragment.LAYOUT),
-- Fragment.LAYOUT);
-- page.setDefaultDecorator(requestPage
-- .getDefaultDecorator(Fragment.PORTLET),
-- Fragment.PORTLET);
-- page.setTitle(jsFolderName);
-- pageManager.updatePage(page);
--
-- orderList = folder.getDocumentOrder();
-- if (orderList != null)
-- {
-- String name = page.getName();
-- if (orderList.indexOf(name) < 0)
-- {
-- orderList.add(name);
-- folder.setDocumentOrder(orderList);
-- pageManager.updateFolder(folder);
-- }
-- }
- }
- }
-- catch (Exception e)
-- {
-- throw new PortletException(
-- "Unable to access folder for editing: "
-- + e.getMessage(), e);
-- }
- }
-- return;
- }
-+ catch (Exception e)
-+ {
-+ throw new PortletException("Unable to access folder for editing: " + e.getMessage(), e);
-+ }
-+ }
-
-- if (request.getParameter("jsChangeFolderName") != null)
-+ }
-+
-+ protected void updateFolder(ActionRequest request, ActionResponse response) throws PortletException
-+ {
-+ RequestContext requestContext = (RequestContext) request.getAttribute(PortalReservedParameters.REQUEST_CONTEXT_ATTRIBUTE);
-+ ContentPage requestPage = requestContext.getPage();
-+
-+ String jsFolderTitle = request.getParameter("jsFolderTitle");
-+ String jsFolderShortTitle = request.getParameter("jsFolderShortTitle");
-+ try
-+ {
-+ Folder parent = (Folder) requestPage.getParent();
-+ if (parent != null)
- {
-- String jsFolderTitle = request.getParameter("jsFolderTitle");
-- String jsFolderShortTitle = request
-- .getParameter("jsFolderShortTitle");
-- try
-+ if (jsFolderTitle != null && !jsFolderTitle.equals(""))
- {
-- Folder parent = (Folder) requestPage.getParent();
-- if (parent != null)
-- {
-- if (jsFolderTitle != null && !jsFolderTitle.equals(""))
-- {
-- parent.setTitle(jsFolderTitle);
-- }
-- if (jsFolderShortTitle != null
-- && !jsFolderShortTitle.equals(""))
-- {
-- parent.setShortTitle(jsFolderShortTitle);
-- }
-- pageManager.updateFolder(parent);
-- }
--
-+ parent.setTitle(jsFolderTitle);
- }
-- catch (Exception e)
-+ if (jsFolderShortTitle != null && !jsFolderShortTitle.equals(""))
- {
-- throw new PortletException(
-- "Unable to access folder for editing: "
-- + e.getMessage(), e);
-+ parent.setShortTitle(jsFolderShortTitle);
- }
-- return;
-+ pageManager.updateFolder(parent);
- }
--
-- if (request.getParameter("jsDeleteFolder") != null)
-+
-+ }
-+ catch (Exception e)
-+ {
-+ throw new PortletException("Unable to access folder for editing: " + e.getMessage(), e);
-+ }
-+
-+ }
-+
-+ protected void deleteFolder(ActionRequest request, ActionResponse response) throws PortletException
-+ {
-+ RequestContext requestContext = (RequestContext) request.getAttribute(PortalReservedParameters.REQUEST_CONTEXT_ATTRIBUTE);
-+ ContentPage requestPage = requestContext.getPage();
-+
-+ try
-+ {
-+ Folder targetFolder = (Folder) requestPage.getParent();
-+ Folder parent = (Folder) targetFolder.getParent();
-+ if (parent != null)
- {
-- try
-+ List orderList = parent.getDocumentOrder();
-+ if (orderList != null)
- {
-- Folder targetFolder = (Folder) requestPage.getParent();
-- Folder parent = (Folder) targetFolder.getParent();
-- if (parent != null)
-+ String name = targetFolder.getName();
-+ if (orderList.indexOf(name) > -1)
- {
-- List orderList = parent.getDocumentOrder();
-- if (orderList != null)
-- {
-- String name = targetFolder.getName();
-- if (orderList.indexOf(name) > -1)
-- {
-- orderList.remove(name);
-- parent.setDocumentOrder(orderList);
-- pageManager.updateFolder(parent);
-- }
-- }
--
-- // do not remove if the folder is root.
-- pageManager.removeFolder(targetFolder);
-+ orderList.remove(name);
-+ parent.setDocumentOrder(orderList);
-+ pageManager.updateFolder(parent);
- }
- }
-- catch (Exception e)
-- {
-- throw new PortletException(
-- "Unable to access folder for removing: "
-- + e.getMessage(), e);
-- }
-- return;
-+
-+ // do not remove if the folder is root.
-+ pageManager.removeFolder(targetFolder);
- }
-+ }
-+ catch (Exception e)
-+ {
-+ throw new PortletException("Unable to access folder for removing: " + e.getMessage(), e);
-+ }
-
-- if (request.getParameter("jsMoveFolderLeft") != null)
-+ }
-+
-+ protected void moveFolderToLeft(ActionRequest request, ActionResponse response) throws PortletException
-+ {
-+ RequestContext requestContext = (RequestContext) request.getAttribute(PortalReservedParameters.REQUEST_CONTEXT_ATTRIBUTE);
-+ ContentPage requestPage = requestContext.getPage();
-+
-+ try
-+ {
-+ Folder targetFolder = (Folder) requestPage.getParent();
-+ Folder parent = (Folder) targetFolder.getParent();
-+ if (parent != null)
- {
-- try
-+ List orderList = parent.getDocumentOrder();
-+ String name = targetFolder.getName();
-+ if (orderList != null)
- {
-- Folder targetFolder = (Folder) requestPage.getParent();
-- Folder parent = (Folder) targetFolder.getParent();
-- if (parent != null)
-+ int index = orderList.indexOf(name);
-+ if (index > -1)
- {
-- List orderList = parent.getDocumentOrder();
-- String name = targetFolder.getName();
-- if (orderList != null)
-+ int i = index - 1;
-+ while (i >= 0)
- {
-- int index = orderList.indexOf(name);
-- if (index > -1)
-+ String value = (String) orderList.get(i);
-+ if (!value.endsWith(".psml") && !value.endsWith(".link"))
- {
-- int i = index - 1;
-- while (i >= 0)
-- {
-- String value = (String) orderList.get(i);
-- if (!value.endsWith(".psml")
-- && !value.endsWith(".link"))
-- {
-- orderList.remove(index);
-- orderList.add(i, name);
-- parent.setDocumentOrder(orderList);
-- pageManager.updateFolder(parent);
-- break;
-- }
-- i--;
-- }
-- }
-- else
-- {
-- orderList.add(name);
-+ orderList.remove(index);
-+ orderList.add(i, name);
- parent.setDocumentOrder(orderList);
- pageManager.updateFolder(parent);
-+ break;
- }
-+ i--;
- }
-- else
-- {
-- orderList = new ArrayList(4);
-- orderList.add(name);
-- parent.setDocumentOrder(orderList);
-- pageManager.updateFolder(parent);
-- }
- }
-+ else
-+ {
-+ orderList.add(name);
-+ parent.setDocumentOrder(orderList);
-+ pageManager.updateFolder(parent);
-+ }
- }
-- catch (Exception e)
-+ else
- {
-- throw new PortletException(
-- "Unable to access folder for changing the document order: "
-- + e.getMessage(), e);
-+ orderList = new ArrayList(4);
-+ orderList.add(name);
-+ parent.setDocumentOrder(orderList);
-+ pageManager.updateFolder(parent);
- }
-- return;
- }
-+ }
-+ catch (Exception e)
-+ {
-+ throw new PortletException("Unable to access folder for changing the document order: " + e.getMessage(), e);
-+ }
-
-- if (request.getParameter("jsMoveFolderRight") != null)
-+ }
-+
-+ protected void moveFolderToRight(ActionRequest request, ActionResponse response) throws PortletException
-+ {
-+ RequestContext requestContext = (RequestContext) request.getAttribute(PortalReservedParameters.REQUEST_CONTEXT_ATTRIBUTE);
-+ ContentPage requestPage = requestContext.getPage();
-+
-+ try
-+ {
-+ Folder targetFolder = (Folder) requestPage.getParent();
-+ Folder parent = (Folder) targetFolder.getParent();
-+ if (parent != null)
- {
-- try
-+ List orderList = parent.getDocumentOrder();
-+ String name = targetFolder.getName();
-+ if (orderList != null)
- {
-- Folder targetFolder = (Folder) requestPage.getParent();
-- Folder parent = (Folder) targetFolder.getParent();
-- if (parent != null)
-+ int index = orderList.indexOf(name);
-+ if (index > -1)
- {
-- List orderList = parent.getDocumentOrder();
-- String name = targetFolder.getName();
-- if (orderList != null)
-+ int i = index + 1;
-+ while (i < orderList.size())
- {
-- int index = orderList.indexOf(name);
-- if (index > -1)
-+ String value = (String) orderList.get(i);
-+ if (!value.endsWith(".psml") && !value.endsWith(".link"))
- {
-- int i = index + 1;
-- while (i < orderList.size())
-- {
-- String value = (String) orderList.get(i);
-- if (!value.endsWith(".psml")
-- && !value.endsWith(".link"))
-- {
-- orderList.remove(index);
-- orderList.add(i, name);
-- parent.setDocumentOrder(orderList);
-- pageManager.updateFolder(parent);
-- break;
-- }
-- i++;
-- }
-- }
-- else
-- {
-- orderList.add(name);
-+ orderList.remove(index);
-+ orderList.add(i, name);
- parent.setDocumentOrder(orderList);
- pageManager.updateFolder(parent);
-+ break;
- }
-+ i++;
- }
-- else
-- {
-- orderList = new ArrayList(4);
-- orderList.add(name);
-- parent.setDocumentOrder(orderList);
-- pageManager.updateFolder(parent);
-- }
- }
-+ else
-+ {
-+ orderList.add(name);
-+ parent.setDocumentOrder(orderList);
-+ pageManager.updateFolder(parent);
-+ }
- }
-- catch (Exception e)
-+ else
- {
-- throw new PortletException(
-- "Unable to access folder for changing the document order: "
-- + e.getMessage(), e);
-+ orderList = new ArrayList(4);
-+ orderList.add(name);
-+ parent.setDocumentOrder(orderList);
-+ pageManager.updateFolder(parent);
- }
-+ }
-+ }
-+ catch (Exception e)
-+ {
-+ throw new PortletException("Unable to access folder for changing the document order: " + e.getMessage(), e);
-+ }
-+
-+ }
-+
-+ protected void updateDefaultLayoutDecorator(ActionRequest request, ActionResponse response) throws PortletException
-+ {
-+ RequestContext requestContext = (RequestContext) request.getAttribute(PortalReservedParameters.REQUEST_CONTEXT_ATTRIBUTE);
-+ ContentPage requestPage = requestContext.getPage();
-+
-+ String theme = request.getParameter("theme");
-+
-+ requestPage.setDefaultDecorator(theme, Fragment.LAYOUT);
-+ try
-+ {
-+ pageManager.updatePage(requestPage);
-+ }
-+ catch (Exception e)
-+ {
-+ throw new PortletException("Unable to update page: " + e.getMessage(), e);
-+ }
-+ }
-+
-+ protected void moveFragment(ActionRequest request, ActionResponse response) throws PortletException
-+ {
-+ RequestContext requestContext = (RequestContext) request.getAttribute(PortalReservedParameters.REQUEST_CONTEXT_ATTRIBUTE);
-+ ContentPage requestPage = requestContext.getPage();
-+
-+ String fragmentId = request.getParameter("fragment");
-+ String move = request.getParameter("move");
-+
-+ int moveCode = Integer.parseInt(move);
-+ PortletWindow window = requestContext.getActionWindow();
-+ Fragment currentFragment = requestPage.getFragmentById(window.getId().toString());
-+ Fragment fragmentToMove = requestPage.getFragmentById(fragmentId);
-+
-+ if (currentFragment == null || fragmentToMove == null)
-+ {
-+ // ignore no longer consistent page definition
-+ return;
-+ }
-+
-+ ColumnLayout columnLayout;
-+ try
-+ {
-+ columnLayout = new ColumnLayout(numColumns, layoutType, currentFragment.getFragments(), null);
-+ columnLayout.addLayoutEventListener(new PageManagerLayoutEventListener(pageManager, requestPage, layoutType));
-+ }
-+ catch (LayoutEventException e1)
-+ {
-+ throw new PortletException("Failed to build ColumnLayout " + e1.getMessage(), e1);
-+ }
-+
-+ try
-+ {
-+ switch (moveCode)
-+ {
-+ case LayoutEvent.MOVED_UP:
-+ columnLayout.moveUp(fragmentToMove);
-+ break;
-+ case LayoutEvent.MOVED_DOWN:
-+ columnLayout.moveDown(fragmentToMove);
-+ break;
-+ case LayoutEvent.MOVED_RIGHT:
-+ columnLayout.moveRight(fragmentToMove);
-+ break;
-+ case LayoutEvent.MOVED_LEFT:
-+ columnLayout.moveLeft(fragmentToMove);
-+ break;
-+ default:
-+ throw new PortletException("Invalid movement code " + moveCode);
-+ }
-+
-+ }
-+ catch (SecurityException se)
-+ {
-+ // ignore page security constraint violations, only
-+ // permitted users can edit managed pages; page
-+ // update will remain transient
-+ log.info("Unable to update page " + requestPage.getId() + " layout due to security permission/constraint.", se);
-+ }
-+ catch (Exception e)
-+ {
-+ if (e instanceof PortletException)
-+ {
-+ throw (PortletException) e;
-+ }
-+ else
-+ {
-+ throw new PortletException("Unable to process layout for page " + requestPage.getId() + " layout: " + e.toString(),
-+ e);
-+ }
-+ }
-+
-+ }
-+
-+ protected void removeFragment(ActionRequest request, ActionResponse response) throws PortletException
-+ {
-+ RequestContext requestContext = (RequestContext) request.getAttribute(PortalReservedParameters.REQUEST_CONTEXT_ATTRIBUTE);
-+ ContentPage requestPage = requestContext.getPage();
-+
-+ String fragmentId = request.getParameter("fragment");
-+
-+ Page page = null;
-+ try
-+ {
-+ // TODO: for now retrieve the real Page instead of ContentPage
-+ // because removing fragments isn't working through the ContentFragment wrapping
-+ page = pageManager.getPage(requestPage.getPath());
-+ }
-+ catch (Exception e)
-+ {
-+ throw new PortletException("Unable to retrieve page " + requestPage.getId(), e);
-+ }
-+
-+ PortletWindow window = requestContext.getActionWindow();
-+ Fragment currentFragment = page.getFragmentById(window.getId().toString());
-+
-+ if (currentFragment == null)
-+ {
-+ // ignore no longer consistent page definition
-+ return;
-+ }
-+
-+ removeFragment(page, currentFragment, fragmentId);
-+
-+ }
-+
-+ protected void updateFragmentDecorator(ActionRequest request, ActionResponse response) throws PortletException
-+ {
-+ RequestContext requestContext = (RequestContext) request.getAttribute(PortalReservedParameters.REQUEST_CONTEXT_ATTRIBUTE);
-+ ContentPage requestPage = requestContext.getPage();
-+
-+ String fragmentId = request.getParameter("fragment");
-+ String decorator = request.getParameter("decorator");
-+
-+ Fragment fragment = requestPage.getFragmentById(fragmentId);
-+
-+ if (fragment == null)
-+ {
-+ // ignore no longer consistent page definition
-+ return;
-+ }
-+
-+ if (decorator.trim().length() == 0)
-+ fragment.setDecorator(null);
-+ else
-+ fragment.setDecorator(decorator);
-+ try
-+ {
-+ pageManager.updatePage(requestPage);
-+ }
-+ catch (Exception e)
-+ {
-+ throw new PortletException("Unable to update page for fragment decorator: " + e.getMessage(), e);
-+ }
-+
-+ }
-+
-+ protected void updateFragmentDecorators(ActionRequest request, ActionResponse response) throws PortletException
-+ {
-+ RequestContext requestContext = (RequestContext) request.getAttribute(PortalReservedParameters.REQUEST_CONTEXT_ATTRIBUTE);
-+ ContentPage requestPage = requestContext.getPage();
-+
-+ String decorators = request.getParameter("decorators");
-+
-+ Iterator fragmentsIter = requestPage.getRootFragment().getFragments().iterator();
-+ while (fragmentsIter.hasNext())
-+ {
-+ Fragment fragment = (Fragment) fragmentsIter.next();
-+ if (fragment == null)
-+ {
-+ // ignore no longer consistent page definition
- return;
- }
-
-- String theme = request.getParameter("theme");
-- if ( theme != null && theme.length() > 0 && !theme.equals(requestPage.getDefaultDecorator(Fragment.LAYOUT)) )
-+ if (decorators.trim().length() == 0)
-+ fragment.setDecorator(null);
-+ else
-+ fragment.setDecorator(decorators);
-+ }
-+ try
-+ {
-+ pageManager.updatePage(requestPage);
-+ }
-+ catch (Exception e)
-+ {
-+ throw new PortletException("Unable to update page for fragment decorator: " + e.getMessage(), e);
-+ }
-+
-+ }
-+
-+ protected void updatePreferenceWindowState(ActionRequest request, ActionResponse response)
-+ {
-+ String prefName = request.getParameter("preferenceName");
-+ if (prefName != null)
-+ {
-+ response.setRenderParameter("preferenceName", prefName);
-+ }
-+ String prefState = request.getParameter("preferenceState");
-+ if (prefState != null)
-+ {
-+ response.setRenderParameter("preferenceState", prefState);
-+ }
-+ }
-+
-+ public void processAction(ActionRequest request, ActionResponse response) throws PortletException, IOException
-+ {
-+ // pass preferenceName and preferenceState to render
-+ updatePreferenceWindowState(request, response);
-+
-+ RequestContext requestContext = (RequestContext) request.getAttribute(PortalReservedParameters.REQUEST_CONTEXT_ATTRIBUTE);
-+
-+ ContentPage requestPage = requestContext.getPage();
-+ PageEditAccess pageEditAccess = (PageEditAccess) requestContext
-+ .getAttribute(PortalReservedParameters.PAGE_EDIT_ACCESS_ATTRIBUTE);
-+ if (requestPage == null || pageEditAccess == null)
-+ {
-+ // Targetting this portlet with an ActionRequest REQUIRES that the ProfilerValve has been invoked!
-+ throw new PortletException("Current request page or PageEditAccess not available.");
-+ }
-+
-+ String pageMode = request.getParameter("pageMode");
-+ if (pageMode != null)
-+ {
-+ if ("view".equals(pageMode))
- {
-- requestPage.setDefaultDecorator(theme, Fragment.LAYOUT);
-- try
-+ pageEditAccess.setEditing(false);
-+ }
-+ else if ("edit".equals(pageMode) && pageEditAccess.isEditAllowed())
-+ {
-+ if (this.editorType != null && this.editorType.equals("desktop"))
- {
-- pageManager.updatePage(requestPage);
-+ String redirectUrl = this.desktop.getPortalUrl(requestContext, requestContext.getPath());
-+ redirectUrl += "?editPage=true&portal=true";
-+ response.sendRedirect(redirectUrl);
- }
-- catch (Exception e)
-+ else
- {
-- throw new PortletException("Unable to update page: "+e.getMessage(), e);
-+ pageEditAccess.setEditing(true);
- }
-+ }
-+ return;
-+ }
-+
-+ if (pageEditAccess.isEditAllowed() && request.isPortletModeAllowed(PortletMode.EDIT))
-+ {
-+
-+ // Add Layout
-+ if (request.getParameter("jsAddLayout") != null)
-+ {
-+ addLayout(request, response);
- return;
- }
--
-+
-+ // Change Layout
-+ if (request.getParameter("jsChangeLayout") != null)
-+ {
-+ changeLayout(request, response);
-+ return;
-+ }
-+
-+ // Add Page
-+ if (request.getParameter("jsSubmitPage") != null)
-+ {
-+ addPage(request, response);
-+ return;
-+ }
-+
-+ // Update Page
-+ if (request.getParameter("jsChangePageName") != null)
-+ {
-+ updatePage(request, response);
-+ return;
-+ }
-+
-+ // Delete Page
-+ if (request.getParameter("jsDeletePage") != null)
-+ {
-+ deletePage(request, response);
-+ return;
-+ }
-+
-+ // Move Page To Left
-+ if (request.getParameter("jsMovePageLeft") != null)
-+ {
-+ movePageToLeft(request, response);
-+ return;
-+ }
-+
-+ // Move Page To Right
-+ if (request.getParameter("jsMovePageRight") != null)
-+ {
-+ movePageToRight(request, response);
-+ return;
-+ }
-+
-+ // Add Folder
-+ if (request.getParameter("jsSubmitFolder") != null)
-+ {
-+ addFolder(request, response);
-+ return;
-+ }
-+
-+ // Update Folder
-+ if (request.getParameter("jsChangeFolderName") != null)
-+ {
-+ updateFolder(request, response);
-+ return;
-+ }
-+
-+ // Delete Folder
-+ if (request.getParameter("jsDeleteFolder") != null)
-+ {
-+ deleteFolder(request, response);
-+ return;
-+ }
-+
-+ // Move Folder To Left
-+ if (request.getParameter("jsMoveFolderLeft") != null)
-+ {
-+ moveFolderToLeft(request, response);
-+ return;
-+ }
-+
-+ // Move Folder To Right
-+ if (request.getParameter("jsMoveFolderRight") != null)
-+ {
-+ moveFolderToRight(request, response);
-+ return;
-+ }
-+
-+ // Update Default Layout Decorator
-+ String theme = request.getParameter("theme");
-+ if (theme != null && theme.length() > 0 && !theme.equals(requestPage.getDefaultDecorator(Fragment.LAYOUT)))
-+ {
-+ updateDefaultLayoutDecorator(request, response);
-+ return;
-+ }
-+
- String fragmentId = request.getParameter("fragment");
-- if ( fragmentId != null && fragmentId.length() > 0 )
-+ if (fragmentId != null && fragmentId.length() > 0)
- {
- String move = request.getParameter("move");
-- if ( move != null && move.length() > 0 )
-+ if (move != null && move.length() > 0)
- {
-- int moveCode = Integer.parseInt(move);
-- PortletWindow window = requestContext.getActionWindow();
-- Fragment currentFragment = requestPage.getFragmentById(window.getId().toString());
-- Fragment fragmentToMove = requestPage.getFragmentById(fragmentId);
--
-- if ( currentFragment == null || fragmentToMove == null )
-- {
-- // ignore no longer consistent page definition
-- return;
-- }
--
-- ColumnLayout columnLayout;
-- try
-- {
-- columnLayout = new ColumnLayout(numColumns, layoutType, currentFragment.getFragments(), null);
-- columnLayout.addLayoutEventListener(new PageManagerLayoutEventListener(pageManager, requestPage, layoutType));
-- }
-- catch (LayoutEventException e1)
-- {
-- throw new PortletException("Failed to build ColumnLayout "+e1.getMessage(), e1);
-- }
--
-- try
-- {
-- switch (moveCode)
-- {
-- case LayoutEvent.MOVED_UP:
-- columnLayout.moveUp(fragmentToMove);
-- break;
-- case LayoutEvent.MOVED_DOWN:
-- columnLayout.moveDown(fragmentToMove);
-- break;
-- case LayoutEvent.MOVED_RIGHT:
-- columnLayout.moveRight(fragmentToMove);
-- break;
-- case LayoutEvent.MOVED_LEFT:
-- columnLayout.moveLeft(fragmentToMove);
-- break;
-- default:
-- throw new PortletException("Invalid movement code " + moveCode);
-- }
--
-- }
-- catch (SecurityException se)
-- {
-- // ignore page security constraint violations, only
-- // permitted users can edit managed pages; page
-- // update will remain transient
-- log.info("Unable to update page " + requestPage.getId() + " layout due to security permission/constraint.", se);
-- }
-- catch (Exception e)
-- {
-- if (e instanceof PortletException)
-- {
-- throw (PortletException)e;
-- }
-- else
-- {
-- throw new PortletException("Unable to process layout for page " + requestPage.getId() + " layout: " + e.toString(), e);
-- }
-- }
-+ // Move Fragment
-+ moveFragment(request, response);
- return;
- }
--
-+
- String remove = request.getParameter("remove");
-- if ( remove != null && remove.length() > 0 )
-+ if (remove != null && remove.length() > 0)
- {
-- Page page = null;
-- try
-- {
-- // TODO: for now retrieve the real Page instead of ContentPage
-- // because removing fragments isn't working through the ContentFragment wrapping
-- page = pageManager.getPage(requestPage.getPath());
-- }
-- catch (Exception e)
-- {
-- throw new PortletException("Unable to retrieve page "+requestPage.getId(),e);
-- }
--
-- PortletWindow window = requestContext.getActionWindow();
-- Fragment currentFragment = page.getFragmentById(window.getId().toString());
--
-- if ( currentFragment == null )
-- {
-- // ignore no longer consistent page definition
-- return;
-- }
--
-- removeFragment(page, currentFragment, fragmentId);
-+ // Remove Fragment
-+ removeFragment(request, response);
- return;
- }
--
-+
- String decorator = request.getParameter("decorator");
-- if ( decorator != null )
-+ if (decorator != null)
- {
-- Fragment fragment = requestPage.getFragmentById(fragmentId);
--
-- if ( fragment == null )
-- {
-- // ignore no longer consistent page definition
-- return;
-- }
--
-- if (decorator.trim().length() == 0)
-- fragment.setDecorator(null);
-- else
-- fragment.setDecorator(decorator);
-- try
-- {
-- pageManager.updatePage(requestPage);
-- }
-- catch (Exception e)
-- {
-- throw new PortletException("Unable to update page for fragment decorator: "+e.getMessage(), e);
-- }
-+ // Update Fragment Decorator
-+ updateFragmentDecorator(request, response);
- return;
- }
- // evlach
- String decorators = request.getParameter("decorators");
-- if ( decorators != null )
-+ if (decorators != null)
- {
-- Iterator fragmentsIter = requestPage.getRootFragment().getFragments().iterator();
-- while(fragmentsIter.hasNext())
-- {
-- Fragment fragment = (Fragment) fragmentsIter.next();
-- if ( fragment == null )
-- {
-- // ignore no longer consistent page definition
-- return;
-- }
--
-- if (decorators.trim().length() == 0)
-- fragment.setDecorator(null);
-- else
-- fragment.setDecorator(decorators);
-- }
-- try
-- {
-- pageManager.updatePage(requestPage);
-- }
-- catch (Exception e)
-- {
-- throw new PortletException("Unable to update page for fragment decorator: "+e.getMessage(), e);
-- }
-+ updateFragmentDecorators(request, response);
- return;
-- }
-+ }
- //end evlach
- }
--
-+
- String portlets = request.getParameter("portlets");
-- if ( portlets != null && portlets.length() > 0 )
-+ if (portlets != null && portlets.length() > 0)
- {
- PortletWindow window = requestContext.getActionWindow();
- Fragment targetFragment = requestPage.getFragmentById(window.getId().toString());
-
-- if ( targetFragment == null )
-+ if (targetFragment == null)
- {
- // ignore no longer consistent page definition
- return;
- }
--
-- StringTokenizer tokenizer = new StringTokenizer(portlets, ",");
-+
-+ StringTokenizer tokenizer = new StringTokenizer(portlets, ",");
- while (tokenizer.hasMoreTokens())
- {
- String portlet = tokenizer.nextToken();
- if (portlet.startsWith("box_"))
- {
-- portlet = portlet.substring("box_".length());
-+ portlet = portlet.substring("box_".length());
- addPortletToPage(requestPage, targetFragment, portlet);
- }
- }
-@@ -971,11 +1170,11 @@
- }
- }
- }
--
-+
- protected int getFragmentNestingLevel(Page page, String fragmentId)
- {
- Fragment root = page.getRootFragment();
-- if ( root.getId().equals(fragmentId) )
-+ if (root.getId().equals(fragmentId))
- {
- return 0;
- }
-@@ -984,23 +1183,23 @@
- return getFragmentNestingLevel(root, 1, fragmentId);
- }
- }
--
-+
- protected int getFragmentNestingLevel(Fragment parent, int level, String fragmentId)
- {
- Iterator iter = parent.getFragments().iterator();
- Fragment child;
- int childLevel;
-- while ( iter.hasNext() )
-+ while (iter.hasNext())
- {
-- child = (Fragment)iter.next();
-+ child = (Fragment) iter.next();
- if (child.getId().equals(fragmentId))
- {
- return level;
- }
- else
- {
-- childLevel = getFragmentNestingLevel(child, level+1, fragmentId);
-- if ( childLevel != -1 )
-+ childLevel = getFragmentNestingLevel(child, level + 1, fragmentId);
-+ if (childLevel != -1)
- {
- return childLevel;
- }
Deleted: pal-portal/trunk/portal/patches/src/webapp/WEB-INF/assembly/portal-url-generation.xml
===================================================================
--- pal-portal/trunk/portal/patches/src/webapp/WEB-INF/assembly/portal-url-generation.xml 2008-04-28 09:21:50 UTC (rev 897)
+++ pal-portal/trunk/portal/patches/src/webapp/WEB-INF/assembly/portal-url-generation.xml 2008-04-30 01:29:49 UTC (rev 898)
@@ -1,13 +0,0 @@
-Index: src/webapp/WEB-INF/assembly/portal-url-generation.xml
-===================================================================
---- src/webapp/WEB-INF/assembly/portal-url-generation.xml (リビジョン 554520)
-+++ src/webapp/WEB-INF/assembly/portal-url-generation.xml (作業コピー)
-@@ -27,7 +27,7 @@
-
- <!-- Navigation state we are currently using -->
- <bean id="NavigationalState"
-- class="org.apache.jetspeed.container.state.impl.SessionFullNavigationalState"
-+ class="org.apache.jetspeed.container.state.impl.SessionNavigationalState"
- singleton="false"
- >
- <constructor-arg><ref bean="NavigationalStateCodec"/></constructor-arg>
Deleted: pal-portal/trunk/portal/patches/src/webapp/WEB-INF/conf/Log4j.properties
===================================================================
--- pal-portal/trunk/portal/patches/src/webapp/WEB-INF/conf/Log4j.properties 2008-04-28 09:21:50 UTC (rev 897)
+++ pal-portal/trunk/portal/patches/src/webapp/WEB-INF/conf/Log4j.properties 2008-04-30 01:29:49 UTC (rev 898)
@@ -1,64 +0,0 @@
-Index: src/webapp/WEB-INF/conf/Log4j.properties
-===================================================================
---- src/webapp/WEB-INF/conf/Log4j.properties (リビジョン 555425)
-+++ src/webapp/WEB-INF/conf/Log4j.properties (作業コピー)
-@@ -88,13 +88,13 @@
- # jetspeed.log
- #
- log4j.appender.jetspeed = org.apache.log4j.FileAppender
--log4j.appender.jetspeed.file = ${applicationRoot}/logs/jetspeed.log
-+log4j.appender.jetspeed.file = ${applicationRoot}/WEB-INF/logs/jetspeed.log
- log4j.appender.jetspeed.layout = org.apache.log4j.PatternLayout
- log4j.appender.jetspeed.layout.conversionPattern = %d [%t] %-5p %c - %m%n
- log4j.appender.jetspeed.append = false
-
- log4j.appender.digester = org.apache.log4j.FileAppender
--log4j.appender.digester.file = ${applicationRoot}/logs/digester.log
-+log4j.appender.digester.file = ${applicationRoot}/WEB-INF/logs/digester.log
- log4j.appender.digester.layout = org.apache.log4j.PatternLayout
- log4j.appender.digester.layout.conversionPattern = %d [%t] %-5p %c - %m%n
- log4j.appender.digester.append = false
-@@ -103,7 +103,7 @@
- # pluto.log
- #
- log4j.appender.PLUTO = org.apache.log4j.FileAppender
--log4j.appender.PLUTO.file = ${applicationRoot}/logs/pluto.log
-+log4j.appender.PLUTO.file = ${applicationRoot}/WEB-INF/logs/pluto.log
- log4j.appender.PLUTO.layout = org.apache.log4j.PatternLayout
- log4j.appender.PLUTO.layout.conversionPattern = %d [%t] %-5p %c - %m%n
- log4j.appender.PLUTO.append = false
-@@ -112,7 +112,7 @@
- # deployment.log
- #
- log4j.appender.DEPLOYMENT = org.apache.log4j.FileAppender
--log4j.appender.DEPLOYMENT.file = ${applicationRoot}/logs/deployment.log
-+log4j.appender.DEPLOYMENT.file = ${applicationRoot}/WEB-INF/logs/deployment.log
- log4j.appender.DEPLOYMENT.layout = org.apache.log4j.PatternLayout
- log4j.appender.DEPLOYMENT.layout.conversionPattern = %d [%t] %-5p %c - %m%n
- log4j.appender.DEPLOYMENT.append = false
-@@ -121,7 +121,7 @@
- # Scheduler Output
- #
- log4j.appender.scheduler = org.apache.log4j.FileAppender
--log4j.appender.scheduler.file = ${applicationRoot}/logs/scheduler.log
-+log4j.appender.scheduler.file = ${applicationRoot}/WEB-INF/logs/scheduler.log
- log4j.appender.scheduler.layout = org.apache.log4j.PatternLayout
- log4j.appender.scheduler.layout.conversionPattern = %d [%t] %-5p %c - %m%n
- log4j.appender.scheduler.append = false
-@@ -131,14 +131,14 @@
- # category.
- #
- log4j.appender.velocity = org.apache.log4j.FileAppender
--log4j.appender.velocity.file = ${applicationRoot}/logs/velocity.log
-+log4j.appender.velocity.file = ${applicationRoot}/WEB-INF/logs/velocity.log
- log4j.appender.velocity.layout = org.apache.log4j.PatternLayout
- log4j.appender.velocity.layout.conversionPattern = %d [%t] %-5p %c - %m%n
- log4j.appender.velocity.append = false
-
-
- log4j.appender.ojb = org.apache.log4j.FileAppender
--log4j.appender.ojb.file = ${applicationRoot}/logs/ojb.log
-+log4j.appender.ojb.file = ${applicationRoot}/WEB-INF/logs/ojb.log
- log4j.appender.ojb.layout = org.apache.log4j.PatternLayout
- log4j.appender.ojb.layout.conversionPattern = %d [%t] %-5p %c - %m%n
- log4j.appender.ojb.append = false
Deleted: pal-portal/trunk/portal/patches/src/webapp/WEB-INF/templates/layout/html/maximized/layout.vm
===================================================================
--- pal-portal/trunk/portal/patches/src/webapp/WEB-INF/templates/layout/html/maximized/layout.vm 2008-04-28 09:21:50 UTC (rev 897)
+++ pal-portal/trunk/portal/patches/src/webapp/WEB-INF/templates/layout/html/maximized/layout.vm 2008-04-30 01:29:49 UTC (rev 898)
@@ -1,9 +0,0 @@
-Index: src/webapp/WEB-INF/templates/layout/html/maximized/layout.vm
-===================================================================
---- src/webapp/WEB-INF/templates/layout/html/maximized/layout.vm (リビジョン 519203)
-+++ src/webapp/WEB-INF/templates/layout/html/maximized/layout.vm (作業コピー)
-@@ -1,4 +1,3 @@
--<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
- #*
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
Deleted: pal-portal/trunk/portal/patches/src/webapp/WEB-INF/templates/layout/html/tcolumns/layout.vm
===================================================================
--- pal-portal/trunk/portal/patches/src/webapp/WEB-INF/templates/layout/html/tcolumns/layout.vm 2008-04-28 09:21:50 UTC (rev 897)
+++ pal-portal/trunk/portal/patches/src/webapp/WEB-INF/templates/layout/html/tcolumns/layout.vm 2008-04-30 01:29:49 UTC (rev 898)
@@ -1,30 +0,0 @@
-Index: src/webapp/WEB-INF/templates/layout/html/tcolumns/layout.vm
-===================================================================
---- src/webapp/WEB-INF/templates/layout/html/tcolumns/layout.vm (リビジョン 453273)
-+++ src/webapp/WEB-INF/templates/layout/html/tcolumns/layout.vm (作業コピー)
-@@ -1,4 +1,3 @@
--<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
- #*
- Copyright 2004 The Apache Software Foundation
-
-@@ -90,6 +89,7 @@
- <option value='$td' #if($rootDecorator.Name == $td) SELECTED #end>$td
- #end
- </select>
-+ <br/>
- #end
- #if($allowAddLayout||$allowChangeLayout)
- <label>$messages.getString("portal.page.editing.layout")</label>
-@@ -105,10 +105,12 @@
- #if($allowAddLayout)
- <input type="submit" name="jsAddLayout" value="$messages.getString("portal.page.editing.addlayout")" />
- #end
-+ <br/>
- #if($allowAddPage)
- <label>$messages.getString("portal.page.editing.page")</label>
- <input id='newpage' name='jsPageName'/>
- <input type="submit" name="jsSubmitPage" value="$messages.getString("portal.page.editing.addpage")"/>
-+ <br/>
- #end
- </form>
- </div>
Deleted: pal-portal/trunk/portal/patches/src/webapp/index.jsp
===================================================================
--- pal-portal/trunk/portal/patches/src/webapp/index.jsp 2008-04-28 09:21:50 UTC (rev 897)
+++ pal-portal/trunk/portal/patches/src/webapp/index.jsp 2008-04-30 01:29:49 UTC (rev 898)
@@ -1,12 +0,0 @@
-Index: src/webapp/index.jsp
-===================================================================
---- src/webapp/index.jsp (リビジョン 421428)
-+++ src/webapp/index.jsp (作業コピー)
-@@ -13,6 +13,6 @@
- See the License for the specific language governing permissions and
- limitations under the License.
- --%>
--<jsp:forward page="portal/"/>
-+<jsp:forward page="desktop/"/>
-
-