svnno****@sourc*****
svnno****@sourc*****
2007年 6月 10日 (日) 07:39:22 JST
Revision: 183
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=183
Author: shinsuke
Date: 2007-06-10 07:39:21 +0900 (Sun, 10 Jun 2007)
Log Message:
-----------
sync up with the latest j2. updated site manager.
Modified Paths:
--------------
pal-portal/trunk/build.properties
pal-portal/trunk/portal/patches/src/webapp/WEB-INF/assembly/jetspeed-services.xml
pal-portal/trunk/portal/patches/src/webapp/WEB-INF/assembly/pipelines.xml
Added Paths:
-----------
pal-portal/trunk/portal/patches/applications/j2-admin/src/webapp/WEB-INF/view/
pal-portal/trunk/portal/patches/applications/j2-admin/src/webapp/WEB-INF/view/site/
pal-portal/trunk/portal/patches/applications/j2-admin/src/webapp/WEB-INF/view/site/site-view.vm
pal-portal/trunk/portal/patches/components/page-manager/
pal-portal/trunk/portal/patches/components/page-manager/src/
pal-portal/trunk/portal/patches/components/page-manager/src/java/
pal-portal/trunk/portal/patches/components/page-manager/src/java/org/
pal-portal/trunk/portal/patches/components/page-manager/src/java/org/apache/
pal-portal/trunk/portal/patches/components/page-manager/src/java/org/apache/jetspeed/
pal-portal/trunk/portal/patches/components/page-manager/src/java/org/apache/jetspeed/page/
pal-portal/trunk/portal/patches/components/page-manager/src/java/org/apache/jetspeed/page/document/
pal-portal/trunk/portal/patches/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/
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/
pal-portal/trunk/portal/patches/components/page-manager/src/java/org/apache/jetspeed/page/psml/CastorXmlPageManager.java
-------------- next part --------------
Modified: pal-portal/trunk/build.properties
===================================================================
--- pal-portal/trunk/build.properties 2007-06-09 22:37:40 UTC (rev 182)
+++ pal-portal/trunk/build.properties 2007-06-09 22:39:21 UTC (rev 183)
@@ -63,7 +63,7 @@
org.apache.jetspeed.portal.currentVersion=${portal.version}
# Jetspeed SVN revision
-jetspeed2.revision=545114
+jetspeed2.revision=545568
# Dependencies for Jetspeed
jetspeed.version=2.2-dev_pal-${portal.version}
@@ -160,6 +160,8 @@
portal.patch.files=\
components/capability/src/java/org/apache/jetspeed/capabilities/impl/JetspeedCapabilities.java,\
+components/page-manager/src/java/org/apache/jetspeed/page/psml/CastorXmlPageManager.java,\
+components/page-manager/src/java/org/apache/jetspeed/page/document/psml/CastorFileSystemDocumentHandler.java,\
components/portal/src/java/org/apache/jetspeed/login/LoginErrorServlet.java,\
components/portal/src/java/org/apache/jetspeed/login/resources/LoginViewResources_ja.properties,\
components/portal/src/java/org/apache/jetspeed/login/resources/LoginViewResources.properties,\
@@ -172,6 +174,7 @@
components/security/src/java/org/apache/jetspeed/security/spi/impl/SecurityAccessImpl.java,\
applications/j2-admin/src/java/org/apache/jetspeed/portlets/registration/UserRegistrationPortlet.java,\
applications/j2-admin/src/webapp/WEB-INF/portlet.xml,\
+applications/j2-admin/src/webapp/WEB-INF/view/site/site-view.vm,\
layout-portlets/src/java/org/apache/jetspeed/portlets/layout/MultiColumnPortlet.java,\
layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource.properties,\
layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource_en.properties,\
Added: pal-portal/trunk/portal/patches/applications/j2-admin/src/webapp/WEB-INF/view/site/site-view.vm
===================================================================
--- pal-portal/trunk/portal/patches/applications/j2-admin/src/webapp/WEB-INF/view/site/site-view.vm 2007-06-09 22:37:40 UTC (rev 182)
+++ pal-portal/trunk/portal/patches/applications/j2-admin/src/webapp/WEB-INF/view/site/site-view.vm 2007-06-09 22:39:21 UTC (rev 183)
@@ -0,0 +1,13 @@
+Index: applications/j2-admin/src/webapp/WEB-INF/view/site/site-view.vm
+===================================================================
+--- applications/j2-admin/src/webapp/WEB-INF/view/site/site-view.vm (リビジョン 545568)
++++ applications/j2-admin/src/webapp/WEB-INF/view/site/site-view.vm (作業コピー)
+@@ -1164,7 +1164,7 @@
+ else
+ servletPath = "desktop";
+ }
+- window.open("${rooturl}" + servletPath + node.widgetId, 'w-' + node.title);
++ window.open("${rooturl}" + servletPath + "/_page" + node.widgetId, 'w-' + node.title);
+ }
+ }
+ function newResource(kind, xnode)
Added: 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 2007-06-09 22:37:40 UTC (rev 182)
+++ pal-portal/trunk/portal/patches/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/CastorFileSystemDocumentHandler.java 2007-06-09 22:39:21 UTC (rev 183)
@@ -0,0 +1,16 @@
+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 (リビジョン 545568)
++++ components/page-manager/src/java/org/apache/jetspeed/page/document/psml/CastorFileSystemDocumentHandler.java (作業コピー)
+@@ -186,6 +186,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;
+
Property changes on: pal-portal/trunk/portal/patches/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/CastorFileSystemDocumentHandler.java
___________________________________________________________________
Name: svn:eol-style
+ native
Added: 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 2007-06-09 22:37:40 UTC (rev 182)
+++ pal-portal/trunk/portal/patches/components/page-manager/src/java/org/apache/jetspeed/page/psml/CastorXmlPageManager.java 2007-06-09 22:39:21 UTC (rev 183)
@@ -0,0 +1,17 @@
+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)
+ {
Property changes on: pal-portal/trunk/portal/patches/components/page-manager/src/java/org/apache/jetspeed/page/psml/CastorXmlPageManager.java
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: pal-portal/trunk/portal/patches/src/webapp/WEB-INF/assembly/jetspeed-services.xml
===================================================================
--- pal-portal/trunk/portal/patches/src/webapp/WEB-INF/assembly/jetspeed-services.xml 2007-06-09 22:37:40 UTC (rev 182)
+++ pal-portal/trunk/portal/patches/src/webapp/WEB-INF/assembly/jetspeed-services.xml 2007-06-09 22:39:21 UTC (rev 183)
@@ -1,10 +1,10 @@
Index: src/webapp/WEB-INF/assembly/jetspeed-services.xml
===================================================================
---- src/webapp/WEB-INF/assembly/jetspeed-services.xml (リビジョン 519203)
+--- src/webapp/WEB-INF/assembly/jetspeed-services.xml (リビジョン 545568)
+++ src/webapp/WEB-INF/assembly/jetspeed-services.xml (作業コピー)
-@@ -108,6 +108,11 @@
- <entry key="PortletTrackingManager">
- <ref bean="org.apache.jetspeed.aggregator.PortletTrackingManager"/>
+@@ -114,6 +114,11 @@
+ <entry key ="PortalConfiguration">
+ <ref bean="PortalConfiguration"/>
</entry>
+
+ <!-- PAL -->
Modified: pal-portal/trunk/portal/patches/src/webapp/WEB-INF/assembly/pipelines.xml
===================================================================
--- pal-portal/trunk/portal/patches/src/webapp/WEB-INF/assembly/pipelines.xml 2007-06-09 22:37:40 UTC (rev 182)
+++ pal-portal/trunk/portal/patches/src/webapp/WEB-INF/assembly/pipelines.xml 2007-06-09 22:39:21 UTC (rev 183)
@@ -1,8 +1,8 @@
Index: src/webapp/WEB-INF/assembly/pipelines.xml
===================================================================
---- src/webapp/WEB-INF/assembly/pipelines.xml (リビジョン 543176)
+--- src/webapp/WEB-INF/assembly/pipelines.xml (リビジョン 545568)
+++ src/webapp/WEB-INF/assembly/pipelines.xml (作業コピー)
-@@ -317,6 +367,7 @@
+@@ -327,6 +327,7 @@
<list>
<ref bean="capabilityValve"/>
<ref bean="localizationValve"/>