svn commit: r769863 - in /portals/jetspeed-2/portal/trunk: applications/jetspeed/src/main/webapp/WEB-INF/min-pages/Administrative/portal-admin/ applications/jetspeed/src/main/webapp/WEB-INF/pages/Administrative/ components/jetspeed-registry/src/main/ja...

Wed, 29 Apr 2009 11:29:20 -0700 

Author: woonsan
Date: Wed Apr 29 18:28:53 2009
New Revision: 769863

URL: http://svn.apache.org/viewvc?rev=769863&view=rev
Log:
JS2-946: Changed pam.psml to use new Wicket based portlets and fixed duplicate 
portlet default preferences.

Modified:
    
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/Administrative/portal-admin/pam.psml
    
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/Administrative/pam.psml
    
portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/PortletDefinitionImpl.java

Modified: 
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/Administrative/portal-admin/pam.psml
URL: 
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/Administrative/portal-admin/pam.psml?rev=769863&r1=769862&r2=769863&view=diff
==============================================================================
--- 
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/Administrative/portal-admin/pam.psml
 (original)
+++ 
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/Administrative/portal-admin/pam.psml
 Wed Apr 29 18:28:53 2009
@@ -30,11 +30,15 @@
   <metadata name="title" xml:lang="ko">포틀릿 애플리케이션 
관리</metadata>
 
   <fragment id="pam-2" type="layout" 
name="jetspeed-layouts::VelocityTwoColumns">
-    <fragment id="pam-4" type="portlet" 
name="j2-admin::PortletApplicationBrowser" >
+    <fragment id="pam-3" type="portlet" 
name="j2-admin::RegistryApplicationsList" >
       <property layout="TwoColumns" name="row" value="0" />
       <property layout="TwoColumns" name="column" value="0" />
     </fragment>
-    <fragment id="pam-5" type="portlet" 
name="j2-admin::PortletApplicationDetail" >
+    <fragment id="pam-4" type="portlet" name="j2-admin::PortletDetailsManager" 
>
+      <property layout="TwoColumns" name="row" value="1" />
+      <property layout="TwoColumns" name="column" value="0" />
+    </fragment>
+    <fragment id="pam-5" type="portlet" name="j2-admin::ApplicationDetails" >
       <property layout="TwoColumns" name="row" value="0" />
       <property layout="TwoColumns" name="column" value="1" />
     </fragment>

Modified: 
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/Administrative/pam.psml
URL: 
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/Administrative/pam.psml?rev=769863&r1=769862&r2=769863&view=diff
==============================================================================
--- 
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/Administrative/pam.psml
 (original)
+++ 
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/Administrative/pam.psml
 Wed Apr 29 18:28:53 2009
@@ -19,7 +19,7 @@
     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>Portlet Application Manager</title>
   <metadata name="title" xml:lang="ja">PAM</metadata>
   <metadata name="title" xml:lang="es">PAM (Gestor de aplicaciones de 
portlets</metadata>
@@ -30,20 +30,16 @@
   <metadata name="title" xml:lang="ko">포틀릿 애플리케이션 
관리</metadata>
 
   <fragment id="pam-2" type="layout" 
name="jetspeed-layouts::VelocityTwoColumns">
-    <fragment id="13" type="portlet" 
name="j2-admin::PortletApplicationBrowser" >
+    <fragment id="pam-3" type="portlet" 
name="j2-admin::RegistryApplicationsList" >
       <property layout="TwoColumns" name="row" value="0" />
       <property layout="TwoColumns" name="column" value="0" />
     </fragment>
-    <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="j2-admin::PortletEntityBrowserPortlet" >
+    <fragment id="pam-4" type="portlet" name="j2-admin::PortletDetailsManager" 
>
       <property layout="TwoColumns" name="row" value="1" />
       <property layout="TwoColumns" name="column" value="0" />
     </fragment>
-   <fragment id="pemp-2" type="portlet" 
name="j2-admin::PortletEntityEditorPortlet" >
-      <property layout="TwoColumns" name="row" value="1" />
+    <fragment id="pam-5" type="portlet" name="j2-admin::ApplicationDetails" >
+      <property layout="TwoColumns" name="row" value="0" />
       <property layout="TwoColumns" name="column" value="1" />
     </fragment>
   </fragment>

Modified: 
portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/PortletDefinitionImpl.java
URL: 
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/PortletDefinitionImpl.java?rev=769863&r1=769862&r2=769863&view=diff
==============================================================================
--- 
portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/PortletDefinitionImpl.java
 (original)
+++ 
portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/PortletDefinitionImpl.java
 Wed Apr 29 18:28:53 2009
@@ -158,7 +158,6 @@
             {
                 p.addValue(s);
             }
-            list.add(p);
         }
         return preferences;
     }



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to