You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by vk...@apache.org on 2009/04/29 14:52:57 UTC
svn commit: r769776 - in /portals/jetspeed-2/portal/trunk:
applications/jetspeed/src/main/webapp/WEB-INF/min-pages/Administrative/portal-admin/
components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/
components/jetspeed-portal/src...
Author: vkumar
Date: Wed Apr 29 12:52:56 2009
New Revision: 769776
URL: http://svn.apache.org/viewvc?rev=769776&view=rev
Log:
Applying JS-880-removeAjaxExport.patch and removing old and un-used psmls
Added:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/Administrative/portal-admin/serializer.psml
Removed:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/Administrative/portal-admin/export.psml
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/export.vm
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/ajax-xml/jetspeedSchema.vm
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/ExportJetspeedSchema.java
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/ExportObject.java
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/Administrative/portal-admin/folder.metadata
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/ajax-layout.xml
Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/Administrative/portal-admin/folder.metadata
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/Administrative/portal-admin/folder.metadata?rev=769776&r1=769775&r2=769776&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/Administrative/portal-admin/folder.metadata (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/Administrative/portal-admin/folder.metadata Wed Apr 29 12:52:56 2009
@@ -32,7 +32,7 @@
<document-order>entities.psml</document-order>
<document-order>statistics.psml</document-order>
<document-order>tracking.psml</document-order>
- <document-order>export.psml</document-order>
+ <document-order>serializer.psml</document-order>
<security-constraints>
<security-constraints-ref>admin</security-constraints-ref>
Added: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/Administrative/portal-admin/serializer.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/Administrative/portal-admin/serializer.psml?rev=769776&view=auto
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/Administrative/portal-admin/serializer.psml (added)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/Administrative/portal-admin/serializer.psml Wed Apr 29 12:52:56 2009
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<page id="export"
+ xmlns="http://portals.apache.org/jetspeed"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd">
+
+ <title>Import/Export Service</title>
+ <metadata name="short-title" xml:lang="es">Import-Export</metadata>
+
+ <fragment id="export-layout-1" type="layout" name="jetspeed-layouts::VelocityOneColumn">
+ <fragment id="export-2" type="portlet" name="j2-admin::PortalDataSerializer"/>
+ </fragment>
+
+</page>
Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/ajax-layout.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/ajax-layout.xml?rev=769776&r1=769775&r2=769776&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/ajax-layout.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/ajax-layout.xml Wed Apr 29 12:52:56 2009
@@ -6,9 +6,9 @@
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,8 +18,8 @@
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
- <!-- AJAX Actions
-
+ <!-- AJAX Actions
+
== Constructor Arguments ==
index 0 = render response VM template, generates XML NORMAL response
index 1 = render response VM template, generates XML ERROR response
@@ -48,7 +48,7 @@
<bean id="RolesSecurityBehavior" class="org.apache.jetspeed.layout.impl.RolesSecurityBehavior">
<meta key="j2:cat" value="default" />
- <!-- List of required roles (comma-separated)
+ <!-- List of required roles (comma-separated)
Only need to match one of the listed roles to pass security requirements
-->
<constructor-arg>
@@ -536,7 +536,7 @@
</constructor-arg>
</bean>
- <!--
+ <!--
== AjaxGetUserList Constructor Arguments ==
index 0 = render response VM template, generates XML NORMAL response
index 1 = render response VM template, generates XML ERROR response
@@ -571,49 +571,7 @@
<value>private</value>
</constructor-arg>
</bean>
- <bean id="AjaxJetspeedSchemaExportObject" class="org.apache.jetspeed.layout.impl.ExportJetspeedSchema">
- <meta key="j2:cat" value="default" />
- <constructor-arg index="0">
- <value>org/apache/jetspeed/layout/ajax-xml/jetspeedSchema.vm</value>
- </constructor-arg>
- <constructor-arg index="1">
- <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
- </constructor-arg>
- <constructor-arg index='2'>
- <ref bean="org.apache.jetspeed.page.PageManager" />
- </constructor-arg>
- <constructor-arg index='3'>
- <ref bean="PortletActionSecurityBehavior" />
- </constructor-arg>
- <constructor-arg index='4'>
- <ref bean="JetspeedSerializer" />
- </constructor-arg>
- <constructor-arg index='5'>
- <value>${java.io.tmpdir}</value>
- </constructor-arg>
- </bean>
- <bean id="AjaxExportObject" class="org.apache.jetspeed.layout.impl.ExportObject">
- <meta key="j2:cat" value="default" />
- <constructor-arg index="0">
- <value>org/apache/jetspeed/layout/ajax-xml/export.vm</value>
- </constructor-arg>
- <constructor-arg index="1">
- <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
- </constructor-arg>
- <constructor-arg index='2'>
- <ref bean="org.apache.jetspeed.page.PageManager" />
- </constructor-arg>
- <constructor-arg index='3'>
- <ref bean="PortletActionSecurityBehavior" />
- </constructor-arg>
- <constructor-arg index='4'>
- <ref bean="importerCastorPageManager" />
- </constructor-arg>
- <constructor-arg index='5'>
- <value>${java.io.tmpdir}</value>
- </constructor-arg>
- </bean>
<bean id="AjaxActionMap" class="java.util.HashMap">
<meta key="j2:cat" value="default" />
<constructor-arg index="0">
@@ -699,12 +657,6 @@
<entry key="getuserlist">
<ref bean="AjaxGetUserList" />
</entry>
- <entry key="export">
- <ref bean="AjaxExportObject" />
- </entry>
- <entry key="jetspeedexport">
- <ref bean="AjaxJetspeedSchemaExportObject" />
- </entry>
</map>
</constructor-arg>
</bean>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org