portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject svn commit: r348269 - in /portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages: ./ Administrative/ Administrative/choosers/ __subsite-root/_role/subsite/ __subsite-root/_role/subsite2/ _role/manager/ _role/user/top-links/ _user/admin/_mediatype/xhtml-basi...
Date Tue, 22 Nov 2005 22:14:22 GMT
Author: taylor
Date: Tue Nov 22 14:14:14 2005
New Revision: 348269

URL: http://svn.apache.org/viewcvs?rev=348269&view=rev
Log:
http://issues.apache.org/jira/browse/JS2-413

Simplify Build, step one
Combine security, pam, palm --> j2-admin single portlet app

Modified:
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/Administrative/choosers/groups.psml
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/Administrative/choosers/multiusers.psml
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/Administrative/choosers/roles.psml
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/Administrative/choosers/users.psml
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/Administrative/group-mgt.psml
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/Administrative/palm.psml
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/Administrative/pam.psml
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/Administrative/profiler.psml
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/Administrative/role-mgt.psml
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/Administrative/site.psml
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/Administrative/sso-admin.psml
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/Administrative/statistics.psml
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/Administrative/user-mgt.psml
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/__subsite-root/_role/subsite/subsite-default-page.psml
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/__subsite-root/_role/subsite2/subsite2-default-page.psml
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_role/manager/default-page.psml
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_role/user/top-links/top-page.psml
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/admin/_mediatype/xhtml-basic/default-page.psml
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/guest/_mediatype/xhtml-basic/default-page.psml
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/template/default-page.psml
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/user/nested-layout.psml
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/default-page.psml
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/my-account.psml
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/system/customizer/portlet-selector.psml

Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/Administrative/choosers/groups.psml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/Administrative/choosers/groups.psml?rev=348269&r1=348268&r2=348269&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/Administrative/choosers/groups.psml
(original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/Administrative/choosers/groups.psml
Tue Nov 22 14:14:14 2005
@@ -21,7 +21,7 @@
   <metadata name="title" xml:lang="zh">用户组选择器</metadata>
 
   <fragment id="chooser-groups" type="layout" name="jetspeed-layouts::VelocityOneColumnNoActions">
-    <fragment id="chooser-groups-1" type="portlet" name="security::GroupChooser" >
+    <fragment id="chooser-groups-1" type="portlet" name="j2-admin::GroupChooser" >
     </fragment>
   </fragment>
 </page>

Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/Administrative/choosers/multiusers.psml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/Administrative/choosers/multiusers.psml?rev=348269&r1=348268&r2=348269&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/Administrative/choosers/multiusers.psml
(original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/Administrative/choosers/multiusers.psml
Tue Nov 22 14:14:14 2005
@@ -21,7 +21,7 @@
   <metadata name="title" xml:lang="zh">用户选择器</metadata>
 
   <fragment id="mchooser-users" type="layout" name="jetspeed-layouts::VelocityOneColumnNoActions">
-    <fragment id="mchooser-users-1" type="portlet" name="security::UserMultiChooser" >
+    <fragment id="mchooser-users-1" type="portlet" name="j2-admin::UserMultiChooser" >
     </fragment>
   </fragment>
 </page>

Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/Administrative/choosers/roles.psml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/Administrative/choosers/roles.psml?rev=348269&r1=348268&r2=348269&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/Administrative/choosers/roles.psml (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/Administrative/choosers/roles.psml Tue
Nov 22 14:14:14 2005
@@ -21,7 +21,7 @@
   <metadata name="title" xml:lang="zh">角色选择器</metadata>
 
   <fragment id="chooser-roles" type="layout" name="jetspeed-layouts::VelocityOneColumnNoActions">
-    <fragment id="chooser-roles-1" type="portlet" name="security::RoleChooser" >
+    <fragment id="chooser-roles-1" type="portlet" name="j2-admin::RoleChooser" >
     </fragment>
   </fragment>
 </page>

Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/Administrative/choosers/users.psml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/Administrative/choosers/users.psml?rev=348269&r1=348268&r2=348269&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/Administrative/choosers/users.psml (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/Administrative/choosers/users.psml Tue
Nov 22 14:14:14 2005
@@ -21,7 +21,7 @@
   <metadata name="title" xml:lang="zh">用户选择</metadata>
 
   <fragment id="chooser-users" type="layout" name="jetspeed-layouts::VelocityOneColumnNoActions">
-    <fragment id="chooser-users-1" type="portlet" name="security::UserChooser" >
+    <fragment id="chooser-users-1" type="portlet" name="j2-admin::UserChooser" >
     </fragment>
   </fragment>
 </page>

Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/Administrative/group-mgt.psml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/Administrative/group-mgt.psml?rev=348269&r1=348268&r2=348269&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/Administrative/group-mgt.psml (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/Administrative/group-mgt.psml Tue Nov
22 14:14:14 2005
@@ -23,11 +23,11 @@
   <metadata name="title" xml:lang="hu">Csoport beállítások</metadata>
   <metadata name="title" xml:lang="zh">用户组管理</metadata>
   <fragment id="gm-2" type="layout" name="jetspeed-layouts::VelocityTwoColumns2575">
-    <fragment id="gm-3" type="portlet" name="security::GroupBrowserPortlet">
+    <fragment id="gm-3" type="portlet" name="j2-admin::GroupBrowserPortlet">
       <property layout="TwoColumns" name="row" value="0" />
       <property layout="TwoColumns" name="column" value="0" />
     </fragment>
-    <fragment id="gm-4" type="portlet" name="security::GroupDetailsPortlet">
+    <fragment id="gm-4" type="portlet" name="j2-admin::GroupDetailsPortlet">
       <property layout="TwoColumns" name="row" value="0" />
       <property layout="TwoColumns" name="column" value="1" />
     </fragment>    

Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/Administrative/palm.psml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/Administrative/palm.psml?rev=348269&r1=348268&r2=348269&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/Administrative/palm.psml (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/Administrative/palm.psml Tue Nov 22
14:14:14 2005
@@ -25,7 +25,7 @@
   <metadata name="title" xml:lang="zh">Portlet应用生命周期管理</metadata>
 
   <fragment id="palm-layout" type="layout" name="jetspeed-layouts::VelocityOneColumn">
-    <fragment id="palm-app" type="portlet" name="palm::PortletApplicationLifecycleManager">
+    <fragment id="palm-app" type="portlet" name="j2-admin::PortletApplicationLifecycleManager">
       <property name="row" value="0" layout="OneColumn"/>
       <property name="column" value="0" layout="OneColumn"/>
     </fragment>

Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/Administrative/pam.psml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/Administrative/pam.psml?rev=348269&r1=348268&r2=348269&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/Administrative/pam.psml (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/Administrative/pam.psml Tue Nov 22 14:14:14
2005
@@ -24,19 +24,19 @@
   <metadata name="title" xml:lang="zh">Portlet应用程序管理</metadata>
 
   <fragment id="pam-2" type="layout" name="jetspeed-layouts::VelocityTwoColumns">
-    <fragment id="13" type="portlet" name="pam::PortletApplicationBrowser" >
+    <fragment id="13" type="portlet" name="j2-admin::PortletApplicationBrowser" >
       <property layout="TwoColumns" name="row" value="0" />
       <property layout="TwoColumns" name="column" value="0" />
     </fragment>
-    <fragment id="14" type="portlet" name="pam::PortletApplicationDetail" >
+    <fragment id="14" type="portlet" name="j2-admin::PortletApplicationDetail" >
       <property layout="TwoColumns" name="row" value="0" />
       <property layout="TwoColumns" name="column" value="1" />
     </fragment>
-   <fragment id="pemp-1" type="portlet" name="pam::PortletEntityBrowserPortlet" >
+   <fragment id="pemp-1" type="portlet" name="j2-admin::PortletEntityBrowserPortlet" >
       <property layout="TwoColumns" name="row" value="1" />
       <property layout="TwoColumns" name="column" value="0" />
     </fragment>
-   <fragment id="pemp-2" type="portlet" name="pam::PortletEntityEditorPortlet" >
+   <fragment id="pemp-2" type="portlet" name="j2-admin::PortletEntityEditorPortlet" >
       <property layout="TwoColumns" name="row" value="1" />
       <property layout="TwoColumns" name="column" value="1" />
     </fragment>

Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/Administrative/profiler.psml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/Administrative/profiler.psml?rev=348269&r1=348268&r2=348269&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/Administrative/profiler.psml (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/Administrative/profiler.psml Tue Nov
22 14:14:14 2005
@@ -25,7 +25,7 @@
   
 
   <fragment id="pa-site" type="layout" name="jetspeed-layouts::VelocityTwoColumns">
-    <fragment id="prof-1" type="portlet" name="pam::ProfilerAdmin" >
+    <fragment id="prof-1" type="portlet" name="j2-admin::ProfilerAdmin" >
       <property layout="TwoColumns" name="row" value="0" />
       <property layout="TwoColumns" name="column" value="0" />
     </fragment>

Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/Administrative/role-mgt.psml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/Administrative/role-mgt.psml?rev=348269&r1=348268&r2=348269&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/Administrative/role-mgt.psml (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/Administrative/role-mgt.psml Tue Nov
22 14:14:14 2005
@@ -24,11 +24,11 @@
   <metadata name="title" xml:lang="zh">角色管理</metadata>
 
   <fragment id="rm-2" type="layout" name="jetspeed-layouts::VelocityTwoColumns2575">
-    <fragment id="rm-3" type="portlet" name="security::RoleBrowserPortlet">
+    <fragment id="rm-3" type="portlet" name="j2-admin::RoleBrowserPortlet">
       <property layout="TwoColumns" name="row" value="0" />
       <property layout="TwoColumns" name="column" value="0" />
     </fragment>
-    <fragment id="rm-4" type="portlet" name="security::RoleDetailsPortlet">
+    <fragment id="rm-4" type="portlet" name="j2-admin::RoleDetailsPortlet">
       <property layout="TwoColumns" name="row" value="0" />
       <property layout="TwoColumns" name="column" value="1" />
     </fragment>    

Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/Administrative/site.psml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/Administrative/site.psml?rev=348269&r1=348268&r2=348269&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/Administrative/site.psml (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/Administrative/site.psml Tue Nov 22
14:14:14 2005
@@ -25,11 +25,11 @@
       
 
   <fragment id="js-site" type="layout" name="jetspeed-layouts::VelocityTwoColumns2575">
-    <fragment id="pdb-1" type="portlet" name="pam::PortalSiteBrowser" >
+    <fragment id="pdb-1" type="portlet" name="j2-admin::PortalSiteBrowser" >
       <property layout="TwoColumns" name="row" value="0" />
       <property layout="TwoColumns" name="column" value="0" />
     </fragment>
-    <fragment id="psd-1" type="portlet" name="pam::PortalSiteDetail" >
+    <fragment id="psd-1" type="portlet" name="j2-admin::PortalSiteDetail" >
       <property layout="TwoColumns" name="row" value="0" />
       <property layout="TwoColumns" name="column" value="1" />
     </fragment>

Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/Administrative/sso-admin.psml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/Administrative/sso-admin.psml?rev=348269&r1=348268&r2=348269&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/Administrative/sso-admin.psml (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/Administrative/sso-admin.psml Tue Nov
22 14:14:14 2005
@@ -23,11 +23,11 @@
   <metadata name="title" xml:lang="zh">SSO 管理</metadata>
 
   <fragment id="ssoa-2" type="layout" name="jetspeed-layouts::VelocityTwoColumns">
-    <fragment id="ssoa-200" type="portlet" name="security::SSOBrowserPortlet">
+    <fragment id="ssoa-200" type="portlet" name="j2-admin::SSOBrowserPortlet">
       <property layout="TwoColumns" name="row" value="0" />
       <property layout="TwoColumns" name="column" value="0" />
     </fragment>
-    <fragment id="ssoa-201" type="portlet" name="security::SSODetailsPortlet">
+    <fragment id="ssoa-201" type="portlet" name="j2-admin::SSODetailsPortlet">
       <property layout="TwoColumns" name="row" value="0" />
       <property layout="TwoColumns" name="column" value="1" />
     </fragment>    

Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/Administrative/statistics.psml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/Administrative/statistics.psml?rev=348269&r1=348268&r2=348269&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/Administrative/statistics.psml (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/Administrative/statistics.psml Tue Nov
22 14:14:14 2005
@@ -19,6 +19,6 @@
   <title>Portal Statistics</title>
 
   <fragment id="stats-2" type="layout" name="jetspeed-layouts::VelocityOneColumn">
-    <fragment id="stats-3" type="portlet" name="pam::StatisticsPortlet" />
+    <fragment id="stats-3" type="portlet" name="j2-admin::StatisticsPortlet" />
   </fragment>
 </page>

Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/Administrative/user-mgt.psml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/Administrative/user-mgt.psml?rev=348269&r1=348268&r2=348269&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/Administrative/user-mgt.psml (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/Administrative/user-mgt.psml Tue Nov
22 14:14:14 2005
@@ -24,11 +24,11 @@
   <metadata name="title" xml:lang="zh">用户管理</metadata>
 
   <fragment id="um-2" type="layout" name="jetspeed-layouts::VelocityTwoColumns2575">
-    <fragment id="um-3" type="portlet" name="security::UserBrowserPortlet">
+    <fragment id="um-3" type="portlet" name="j2-admin::UserBrowserPortlet">
       <property layout="TwoColumns" name="row" value="0" />
       <property layout="TwoColumns" name="column" value="0" />
     </fragment>
-    <fragment id="um-4" type="portlet" name="security::UserDetailsPortlet">
+    <fragment id="um-4" type="portlet" name="j2-admin::UserDetailsPortlet">
       <property layout="TwoColumns" name="row" value="0" />
       <property layout="TwoColumns" name="column" value="1" />
     </fragment>    

Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/__subsite-root/_role/subsite/subsite-default-page.psml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/__subsite-root/_role/subsite/subsite-default-page.psml?rev=348269&r1=348268&r2=348269&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/__subsite-root/_role/subsite/subsite-default-page.psml
(original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/__subsite-root/_role/subsite/subsite-default-page.psml
Tue Nov 22 14:14:14 2005
@@ -11,10 +11,10 @@
 
 
   <fragment id="sub-0" type="layout" name="jetspeed-layouts::VelocityOneColumn">
-    <fragment id="sub-1" type="portlet" name="pam::LocaleSelector">
+    <fragment id="sub-1" type="portlet" name="j2-admin::LocaleSelector">
       <property layout="OneColumn" name="row" value="3" />
     </fragment>                                
-    <fragment id="sub-2" type="portlet" name="security::LoginPortlet">
+    <fragment id="sub-2" type="portlet" name="j2-admin::LoginPortlet">
       <property layout="OneColumn" name="row" value="1" />
     </fragment>                                
   </fragment>

Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/__subsite-root/_role/subsite2/subsite2-default-page.psml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/__subsite-root/_role/subsite2/subsite2-default-page.psml?rev=348269&r1=348268&r2=348269&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/__subsite-root/_role/subsite2/subsite2-default-page.psml
(original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/__subsite-root/_role/subsite2/subsite2-default-page.psml
Tue Nov 22 14:14:14 2005
@@ -10,10 +10,10 @@
 
 
   <fragment id="sub2-0" type="layout" name="jetspeed-layouts::VelocityOneColumn">
-    <fragment id="sub2-1" type="portlet" name="pam::LocaleSelector">
+    <fragment id="sub2-1" type="portlet" name="j2-admin::LocaleSelector">
       <property layout="OneColumn" name="row" value="3" />
     </fragment>                                
-    <fragment id="sub2-2" type="portlet" name="security::LoginPortlet">
+    <fragment id="sub2-2" type="portlet" name="j2-admin::LoginPortlet">
       <property layout="OneColumn" name="row" value="1" />
     </fragment>                                
   </fragment>

Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_role/manager/default-page.psml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_role/manager/default-page.psml?rev=348269&r1=348268&r2=348269&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_role/manager/default-page.psml (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_role/manager/default-page.psml Tue
Nov 22 14:14:14 2005
@@ -35,7 +35,7 @@
       <property layout="TwoColumns" name="row" value="0" />
       <property layout="TwoColumns" name="column" value="1" />
     </fragment>
-    <fragment id="mrp-xx6" type="portlet" name="security::LoginPortlet">
+    <fragment id="mrp-xx6" type="portlet" name="j2-admin::LoginPortlet">
       <property layout="TwoColumns" name="row" value="0" />
       <property layout="TwoColumns" name="column" value="2" />
     </fragment>                                    

Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_role/user/top-links/top-page.psml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_role/user/top-links/top-page.psml?rev=348269&r1=348268&r2=348269&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_role/user/top-links/top-page.psml (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_role/user/top-links/top-page.psml Tue
Nov 22 14:14:14 2005
@@ -22,7 +22,7 @@
   <metadata name="title" xml:lang="zh">[用户] 顶层页</metadata>
 
   <fragment id="utp-1" type="layout" name="jetspeed-layouts::VelocityTwoColumns">
-    <fragment id="utp-2" type="portlet" name="security::LoginPortlet">
+    <fragment id="utp-2" type="portlet" name="j2-admin::LoginPortlet">
       <property layout="TwoColumns" name="row" value="0" />
       <property layout="TwoColumns" name="column" value="0" />
     </fragment>                                

Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/admin/_mediatype/xhtml-basic/default-page.psml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/admin/_mediatype/xhtml-basic/default-page.psml?rev=348269&r1=348268&r2=348269&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/admin/_mediatype/xhtml-basic/default-page.psml
(original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/admin/_mediatype/xhtml-basic/default-page.psml
Tue Nov 22 14:14:14 2005
@@ -25,7 +25,7 @@
   <metadata name="title" xml:lang="zh">欢迎来到Jetspeed 2</metadata>
 
   <fragment id="dp-xhtml-basic-1" type="layout" name="jetspeed-layouts::VelocityOneColumn">
-    <fragment id="dp-xhtml-basic-11" type="portlet" name="security::LoginPortletForXHTMLBasic">
+    <fragment id="dp-xhtml-basic-11" type="portlet" name="j2-admin::LoginPortletForXHTMLBasic">
       <property layout="OneColumn" name="row" value="0" />
     </fragment>                                
     <fragment id="dp-xhtml-basic-12" type="portlet" name="demo::BookmarkPortletForXHTMLBasic">

Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/guest/_mediatype/xhtml-basic/default-page.psml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/guest/_mediatype/xhtml-basic/default-page.psml?rev=348269&r1=348268&r2=348269&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/guest/_mediatype/xhtml-basic/default-page.psml
(original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/guest/_mediatype/xhtml-basic/default-page.psml
Tue Nov 22 14:14:14 2005
@@ -25,7 +25,7 @@
   <metadata name="title" xml:lang="zh">欢迎来到Jetspeed 2</metadata>
 
   <fragment id="dp-xhtml-basic-1" type="layout" name="jetspeed-layouts::VelocityOneColumn">
-    <fragment id="dp-xhtml-basic-11" type="portlet" name="security::LoginPortletForXHTMLBasic">
+    <fragment id="dp-xhtml-basic-11" type="portlet" name="j2-admin::LoginPortletForXHTMLBasic">
       <property layout="OneColumn" name="row" value="0" />
     </fragment>                                
     <fragment id="dp-xhtml-basic-12" type="portlet" name="demo::BookmarkPortletForXHTMLBasic">

Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/template/default-page.psml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/template/default-page.psml?rev=348269&r1=348268&r2=348269&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/template/default-page.psml (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/template/default-page.psml Tue
Nov 22 14:14:14 2005
@@ -27,7 +27,7 @@
       <property layout="TwoColumns" name="row" value="0" />
       <property layout="TwoColumns" name="column" value="0" />
     </fragment>
-    <fragment id="uhtemp-1010" type="portlet" name="security::LoginPortlet">
+    <fragment id="uhtemp-1010" type="portlet" name="j2-admin::LoginPortlet">
       <property layout="TwoColumns" name="row" value="0" />
       <property layout="TwoColumns" name="column" value="1" />
     </fragment>	    

Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/user/nested-layout.psml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/user/nested-layout.psml?rev=348269&r1=348268&r2=348269&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/user/nested-layout.psml (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/user/nested-layout.psml Tue Nov
22 14:14:14 2005
@@ -14,12 +14,12 @@
   <metadata name="short-title" xml:lang="zh">内嵌布局</metadata>
 
   <fragment id="100393" type="layout" name="jetspeed-layouts::VelocityOneColumn">
-    <fragment id="100939" type="portlet" name="pam::LocaleSelector">
+    <fragment id="100939" type="portlet" name="j2-admin::LocaleSelector">
       <property layout="OneColumn" name="row" value="0"/>
     </fragment>                                
     <fragment id="100345" type="layout" name="jetspeed-layouts::VelocityTwoColumns">
       <property layout="OneColumn" name="row" value="1"/>
-      <fragment id="100121" type="portlet" name="security::LoginPortlet">
+      <fragment id="100121" type="portlet" name="j2-admin::LoginPortlet">
         <property layout="TwoColumns" name="row" value="0"/>
         <property layout="TwoColumns" name="column" value="0"/>
       </fragment>                                

Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/default-page.psml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/default-page.psml?rev=348269&r1=348268&r2=348269&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/default-page.psml (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/default-page.psml Tue Nov 22 14:14:14
2005
@@ -27,11 +27,11 @@
   <metadata name="title" xml:lang="zh">欢迎来到Jetspeed 2</metadata>
 
   <fragment id="dp-1" type="layout" name="jetspeed-layouts::VelocityTwoColumns">
-    <fragment id="dp-3" type="portlet" name="pam::LocaleSelector">
+    <fragment id="dp-3" type="portlet" name="j2-admin::LocaleSelector">
       <property layout="TwoColumns" name="row" value="0" />
       <property layout="TwoColumns" name="column" value="0" />
     </fragment>                                
-    <fragment id="dp-12" type="portlet" name="security::LoginPortlet">
+    <fragment id="dp-12" type="portlet" name="j2-admin::LoginPortlet">
       <property layout="TwoColumns" name="row" value="0" />
       <property layout="TwoColumns" name="column" value="1" />
     </fragment>                                

Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/my-account.psml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/my-account.psml?rev=348269&r1=348268&r2=348269&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/my-account.psml (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/my-account.psml Tue Nov 22 14:14:14
2005
@@ -23,7 +23,7 @@
   <metadata name="title" xml:lang="zh">我的帐户配置</metadata>
 
   <fragment id="cpwd-1" type="layout" name="jetspeed-layouts::VelocityTwoColumns">
-    <fragment id="cpwd-2" type="portlet" name="security::ChangePasswordPortlet">
+    <fragment id="cpwd-2" type="portlet" name="j2-admin::ChangePasswordPortlet">
       <property layout="TwoColumns" name="row" value="0" />
       <property layout="TwoColumns" name="column" value="0" />
     </fragment>

Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/system/customizer/portlet-selector.psml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/system/customizer/portlet-selector.psml?rev=348269&r1=348268&r2=348269&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/system/customizer/portlet-selector.psml
(original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/system/customizer/portlet-selector.psml
Tue Nov 22 14:14:14 2005
@@ -21,7 +21,7 @@
   <metadata name="title" xml:lang="zh">Portlet选择器</metadata>
 
   <fragment id="portlet-selector" type="layout" name="jetspeed-layouts::VelocityOneColumnNoActions">
-    <fragment id="portlet-selector-1" type="portlet" name="pam::PortletSelector" >
+    <fragment id="portlet-selector-1" type="portlet" name="j2-admin::PortletSelector"
>
     </fragment>
   </fragment>
 </page>



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message