svnno****@sourc*****
svnno****@sourc*****
2008年 9月 9日 (火) 14:33:11 JST
Revision: 1146
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1146
Author: shinsuke
Date: 2008-09-09 14:33:10 +0900 (Tue, 09 Sep 2008)
Log Message:
-----------
added AjaxConfigurePipeline.
Modified Paths:
--------------
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal-site/src/java/org/apache/jetspeed/om/folder/proxy/FolderProxy.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/PortalReservedParameters.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/assembly/pipelines.xml
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/web.xml
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/decorations/layout/default/header.vm
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/decorations/layout/nextgen/header.vm
-------------- next part --------------
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal-site/src/java/org/apache/jetspeed/om/folder/proxy/FolderProxy.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal-site/src/java/org/apache/jetspeed/om/folder/proxy/FolderProxy.java 2008-09-09 03:08:20 UTC (rev 1145)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal-site/src/java/org/apache/jetspeed/om/folder/proxy/FolderProxy.java 2008-09-09 05:33:10 UTC (rev 1146)
@@ -852,6 +852,11 @@
.getPipeline()
.getName()
.equals(
+ PortalReservedParameters.AJAX_CONFIG_PIPELINE_NAME)
+ || rc
+ .getPipeline()
+ .getName()
+ .equals(
PortalReservedParameters.DESKTOP_CONFIG_PIPELINE_NAME))
{
configureMode = true;
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/PortalReservedParameters.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/PortalReservedParameters.java 2008-09-09 03:08:20 UTC (rev 1145)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/PortalReservedParameters.java 2008-09-09 05:33:10 UTC (rev 1146)
@@ -49,6 +49,8 @@
public final static String CONFIG_PIPELINE_NAME = "ConfigurePipeline";
+ public final static String AJAX_CONFIG_PIPELINE_NAME = "AjaxConfigurePipeline";
+
public final static String DESKTOP_CONFIG_PIPELINE_NAME = "DesktopConfigurePipeline";
public final static String JETSPEED_CONFIG_PIPELINE_NAME = "JetspeedPipeline";
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/assembly/pipelines.xml
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/assembly/pipelines.xml 2008-09-09 03:08:20 UTC (rev 1145)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/assembly/pipelines.xml 2008-09-09 05:33:10 UTC (rev 1146)
@@ -574,6 +574,27 @@
</constructor-arg>
</bean>
+ <bean id="ajax-configure-pipeline"
+ class="org.apache.jetspeed.pipeline.JetspeedPipeline"
+ init-method="initialize"
+ >
+ <constructor-arg>
+ <value>AjaxConfigurePipeline</value>
+ </constructor-arg>
+ <constructor-arg>
+ <list>
+ <ref bean="capabilityValve"/>
+ <ref bean="portalURLValve"/>
+ <ref bean="securityValve"/>
+ <ref bean="localizationValve"/>
+ <ref bean="profilerValve"/>
+ <ref bean="containerValve"/>
+ <!-- this is the standard Jetspeed API entry point -->
+ <ref bean="layoutValve"/>
+ </list>
+ </constructor-arg>
+ </bean>
+
<bean id="ajax-direct-pipeline"
class="org.apache.jetspeed.pipeline.JetspeedPipeline"
init-method="initialize"
@@ -639,6 +660,9 @@
<entry key='/ajaxapi'>
<value>ajax-pipeline</value>
</entry>
+ <entry key='/ajaxapiconfigure'>
+ <value>ajax-configure-pipeline</value>
+ </entry>
<entry key='/login'>
<value>jetspeed-pipeline</value>
</entry>
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/web.xml
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/web.xml 2008-09-09 03:08:20 UTC (rev 1145)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/web.xml 2008-09-09 05:33:10 UTC (rev 1146)
@@ -183,6 +183,12 @@
<servlet-name>
jetspeed
</servlet-name>
+ <url-pattern>/ajaxapiconfigure/*</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>
+ jetspeed
+ </servlet-name>
<url-pattern>/ajax/*</url-pattern>
</servlet-mapping>
<servlet-mapping>
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/decorations/layout/default/header.vm
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/decorations/layout/default/header.vm 2008-09-09 03:08:20 UTC (rev 1145)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/decorations/layout/default/header.vm 2008-09-09 05:33:10 UTC (rev 1146)
@@ -47,7 +47,7 @@
<script type="text/javascript" src="#GetPageResource('js/main.js')"></script>
</head>
<body class="#PageBaseCSSClass()">
- <input type="hidden" id="ajaxUrl" value="#BaseHref()ajaxapi$JS2RequestContext.request.pathInfo"/>
+ <input type="hidden" id="ajaxUrl" value="#BaseHref()ajaxapi#if($servletName == "/configure")configure#end$JS2RequestContext.request.pathInfo"/>
<div class="#PageBaseCSSClass()">
<div id="container">
<div id="header">
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/decorations/layout/nextgen/header.vm
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/decorations/layout/nextgen/header.vm 2008-09-09 03:08:20 UTC (rev 1145)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/decorations/layout/nextgen/header.vm 2008-09-09 05:33:10 UTC (rev 1146)
@@ -22,6 +22,7 @@
#defineNavigationConstants()
## Username
#set($username = $JS2RequestContext.request.remoteUser)
+#set($servletName = $JS2RequestContext.request.servletPath)##
<html>
<head>
#includeHeaderResource()
@@ -38,7 +39,7 @@
<script type="text/javascript" src="#GetPageResource('js/main.js')"></script>
</head>
<body class="#PageBaseCSSClass()">
- <input type="hidden" id="ajaxUrl" value="#BaseHref()ajaxapi$JS2RequestContext.request.pathInfo"/>
+ <input type="hidden" id="ajaxUrl" value="#BaseHref()ajaxapi#if($servletName == "/configure")configure#end$JS2RequestContext.request.pathInfo"/>
<div class="#PageBaseCSSClass()">
<div id="container">
<div id="topbar">