portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject svn commit: r885673 - in /portals/jetspeed-2/portal/trunk: applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/ applications/jetspeed/src/main/webapp/WEB-INF/pages/ applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/columns/ compon...
Date Tue, 01 Dec 2009 05:10:36 GMT
Author: taylor
Date: Tue Dec  1 05:10:34 2009
New Revision: 885673

URL: http://svn.apache.org/viewvc?rev=885673&view=rev
Log:
https://issues.apache.org/jira/browse/JS2-1084
- dabbling with using templates and lock status on fragments
- adding a template fragment (tpsml) for merging the toolbox and navigator into all pages
under /
  (i am trying to preserve the /portal pipeline behavior for now)

  will give templates a more serious look once I sort out some nesting issues...

Added:
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/definition.fpsml
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/template.tpsml
Modified:
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui.jsp
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/default-page.psml
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/columns/layout.vm
    portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/PageAggregatorImpl.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetPageAction.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/ui/Jetui.java
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/conf/jetspeed/jetspeed.properties
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/seed/j2-seed.xml

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui.jsp
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui.jsp?rev=885673&r1=885672&r2=885673&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui.jsp
(original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui.jsp
Tue Dec  1 05:10:34 2009
@@ -145,22 +145,19 @@
             int subindex = 0;
             for (ContentFragment fragment : collections)
             {
-                if (!(fragment.getName().equals("j2-admin::JetspeedToolbox") || fragment.getName().equals("j2-admin::JetspeedNavigator")))
-                {
-                    //String content = jetui.renderPortletWindow(fragment.getId(), fragment.getName(),
rc);
-                    String content = jetui.getRenderedContent((ContentFragment)fragment,
rc);
-                    request.setAttribute("content", content);                    
-                    String decorator = fragment.getDecorator(); 
-            		if (decorator == null)
-            		    decorator = pageDec;
-                    request.setAttribute("decorator", decorator);                    
-                    request.setAttribute("fragment", fragment);      
-                    request.setAttribute("coordinate", columnLayout.getCoordinate(fragment));
+                   //String content = jetui.renderPortletWindow(fragment.getId(), fragment.getName(),
rc);
+                   String content = jetui.getRenderedContent((ContentFragment)fragment, rc);
+                   request.setAttribute("content", content);                    
+                   String decorator = fragment.getDecorator(); 
+                   if (decorator == null)
+    	       		    decorator = pageDec;
+                   request.setAttribute("decorator", decorator);                    
+                   request.setAttribute("fragment", fragment);      
+                   request.setAttribute("coordinate", columnLayout.getCoordinate(fragment));
 %>
 <jsp:include page="jetui-portlet.jsp"/>
 <%          
                     subindex++;
-                }
             }
             index++;
 %>

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/default-page.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/default-page.psml?rev=885673&r1=885672&r2=885673&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/default-page.psml
(original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/default-page.psml
Tue Dec  1 05:10:34 2009
@@ -46,10 +46,10 @@
       <property layout="TwoColumns" name="row" value="3" />
       <property layout="TwoColumns" name="column" value="1" />
     </fragment>                                
-    <fragment id="dp-24" type="portlet" name="demo::WeatherPortlet">
+    <fragment-reference id="dp-24-wp-reference" refid="wp-definition">
         <property name="row" value="4"/>
         <property name="column" value="1"/>
-    </fragment>
+    </fragment-reference>
     
     <fragment id="dp-7" type="portlet" name="demo::PickANumberPortlet" >
       <property layout="TwoColumns" name="row" value="1" />

Added: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/definition.fpsml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/definition.fpsml?rev=885673&view=auto
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/definition.fpsml
(added)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/definition.fpsml
Tue Dec  1 05:10:34 2009
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<fragment-definition id="definition"
+    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>DEFINITION</title>
+  <fragment id="wp-definition" type="portlet" name="demo::WeatherPortlet"/>
+</fragment-definition>

Added: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/template.tpsml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/template.tpsml?rev=885673&view=auto
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/template.tpsml
(added)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/template.tpsml
Tue Dec  1 05:10:34 2009
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<page-template id="definition"
+    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>TEMPLATE</title>
+  <fragment id="template-top" type="layout" name="jetspeed-layouts::VelocityOneColumn">
+
+    <fragment id="_jsNavigator-1001" type="portlet" name="j2-admin::JetspeedNavigator">
+  	        <property name="z" value="201.0"></property>
+            <property name="row" value="0"></property>
+            <property name="width" value="267.0"></property>
+            <property name="height" value="388.0"></property>
+            <property name="column" value="0"></property>
+            <property name="y" value="104.0"></property>
+            <property name="x" value="1.0"></property>
+            <property name="jsdesktop" value="staticpos=false;fitheight=false"></property>
                       
+    </fragment>
+    <page-fragment id="page-template">
+      <property name="row" value="1"/>
+    </page-fragment>
+    
+    <fragment id="_jsToolbox-1001" type="portlet" name="j2-admin::JetspeedToolbox">
+  	        <property name="z" value="201.0"></property>
+            <property name="row" value="2"></property>
+            <property name="width" value="267.0"></property>
+            <property name="height" value="388.0"></property>
+            <property name="column" value="0"></property>
+            <property name="y" value="500.0"></property>
+            <property name="x" value="1.0"></property>
+            <property name="jsdesktop" value="staticpos=false;fitheight=false"></property>
                       
+    </fragment>
+    
+<!--    
+    <fragment-reference id="page-template-wp-reference" refid="wp-definition">
+      <property name="row" value="1"/>
+    </fragment-reference>
+  -->   
+  </fragment>  
+</page-template>

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/columns/layout.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/columns/layout.vm?rev=885673&r1=885672&r2=885673&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/columns/layout.vm
(original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/columns/layout.vm
Tue Dec  1 05:10:34 2009
@@ -309,7 +309,6 @@
 	     style="float:${columnFloat}; width:${columnWidth};">
 	     
 	  #foreach($f in $column)
-	  #if ($f.getName() != "j2-admin::JetspeedNavigator" && $f.getName() != "j2-admin::JetspeedToolbox")
 	     
       ## Set up coordinates for this fragment
       #set($coords = $columnLayout.getCoordinate($f))	  
       #set($col = $coords.x)
@@ -382,7 +381,6 @@
 			    $f.renderedContent			
 		    #end
 		  </div>
-		  #end
 		#end
 	</div>
 	#set ($columnIndex = $columnIndex + 1)  

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/PageAggregatorImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/PageAggregatorImpl.java?rev=885673&r1=885672&r2=885673&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/PageAggregatorImpl.java
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/PageAggregatorImpl.java
Tue Dec  1 05:10:34 2009
@@ -103,13 +103,9 @@
                     aggregateAndRender(child, context, page);
                 }
             }
-        }
-        
-        // ** DST: DEMO: Hack
-        if (!"j2-admin::JetspeedNavigator".equals(f.getName()) && !"j2-admin::JetspeedToolbox".equals(f.getName()))
       
-        {
+        }        
+        if (!f.isLocked()) // FIXME: this is still not the desired behavior, need to check
if its docked 
             renderer.renderNow(f, context);
-        }
     }
     
 }

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetPageAction.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetPageAction.java?rev=885673&r1=885672&r2=885673&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetPageAction.java
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetPageAction.java
Tue Dec  1 05:10:34 2009
@@ -32,11 +32,11 @@
 import org.apache.jetspeed.decoration.Theme;
 import org.apache.jetspeed.layout.PortletActionSecurityBehavior;
 import org.apache.jetspeed.om.page.BaseFragmentElement;
+import org.apache.jetspeed.om.page.ContentFragment;
+import org.apache.jetspeed.om.page.ContentPage;
 import org.apache.jetspeed.om.page.Fragment;
 import org.apache.jetspeed.om.page.Page;
 import org.apache.jetspeed.page.PageManager;
-import org.apache.jetspeed.page.PageNotFoundException;
-import org.apache.jetspeed.page.document.NodeException;
 import org.apache.jetspeed.portalsite.PortalSiteRequestContext;
 import org.apache.jetspeed.profiler.impl.ProfilerValveImpl;
 import org.apache.jetspeed.request.RequestContext;
@@ -93,20 +93,16 @@
             // Run the Decoration valve to get actions
             decorationValve.invoke( requestContext, null );
             
-            Page page = requestContext.getPage().getPage();                        
+            ContentPage page = requestContext.getPage();                        
             String pageName = getActionParameter( requestContext, PAGE );
-            if ( pageName != null )
-            {
-                page = retrievePage( requestContext, pageName );
-            }
+//            if ( pageName != null )
+//            {
+//                page = retrievePage( requestContext, pageName );
+//            }
             if (page == null)
             {
                 throw new AJAXException("Missing current page or '" + PAGE + "' parameter");
-            }
-            
-            // ** DST: DEMO: Hack
-            insertNavigator(page);           
-            
+            }            
             resultMap.put( STATUS, status );
             resultMap.put( PAGE, page );
             
@@ -133,7 +129,7 @@
             
             String profiledPath = siteRequestContext.getPage().getPath();
             resultMap.put( PROFILED_PATH, profiledPath );
-            putSecurityInformation( resultMap, page );
+            putSecurityInformation( resultMap, page.getPage() ); //TODO: REVIEW: RANDY 
      
             PageActionAccess pageActionAccess = (PageActionAccess)requestContext.getAttribute(
PortalReservedParameters.PAGE_EDIT_ACCESS_ATTRIBUTE );
             Boolean userIsAnonymous = Boolean.TRUE;
@@ -170,43 +166,43 @@
             String singleLayoutId = getActionParameter( requestContext, LAYOUTID );
             if ( singleLayoutId != null )
             {   // build page representation with single layout
-                BaseFragmentElement singleLayoutFragment = page.getFragmentById( singleLayoutId
);
-                if ( ! ( singleLayoutFragment instanceof Fragment) )
-                {
-                    throw new Exception( "layout id not found: " + singleLayoutId );
-                }
-                Fragment currentLayoutFragment = (Fragment) singleLayoutFragment;
-                Fragment currentPortletFragment = null;
-                
-                String singlePortletId = getActionParameter( requestContext, PORTLETENTITY
);
-                if ( singlePortletId != null )
-                {
-                    Iterator layoutChildIter = currentLayoutFragment.getFragments().iterator();
-                    while ( layoutChildIter.hasNext() )
-                    {
-                        Fragment childFrag = (Fragment)layoutChildIter.next();
-                        if ( childFrag != null )
-                        {
-                            if ( singlePortletId.equals( childFrag.getId() ) )
-                            {
-                                currentPortletFragment = childFrag;
-                                break;
-                            }
-                        }
-                    }
-                    if ( currentPortletFragment == null )
-                    {
-                        throw new Exception( "portlet id " + singlePortletId + " not found
in layout " + singleLayoutId );
-                    }
-                    resultMap.put( "portletsingleId", currentPortletFragment.getId() );
-                }
-                
-                retrieveFragmentSpecialProperties( requestContext, currentLayoutFragment,
fragSizes, portletIcons );
-                resultMap.put( "layoutsingle", currentLayoutFragment );
+//                BaseFragmentElement singleLayoutFragment = page.getPage().getFragmentById(
singleLayoutId ); //TODO: REVIEW: RANDY
+//                if ( ! ( singleLayoutFragment instanceof ContentFragment) )
+//                {
+//                    throw new Exception( "layout id not found: " + singleLayoutId );
+//                }
+//                ContentFragment currentLayoutFragment =  singleLayoutFragment;
+//                ContentFragment currentPortletFragment = null;
+//                
+//                String singlePortletId = getActionParameter( requestContext, PORTLETENTITY
);
+//                if ( singlePortletId != null )
+//                {
+//                    Iterator layoutChildIter = currentLayoutFragment.getFragments().iterator();
+//                    while ( layoutChildIter.hasNext() )
+//                    {
+//                        Fragment childFrag = (Fragment)layoutChildIter.next();
+//                        if ( childFrag != null )
+//                        {
+//                            if ( singlePortletId.equals( childFrag.getId() ) )
+//                            {
+//                                currentPortletFragment = childFrag;
+//                                break;
+//                            }
+//                        }
+//                    }
+//                    if ( currentPortletFragment == null )
+//                    {
+//                        throw new Exception( "portlet id " + singlePortletId + " not found
in layout " + singleLayoutId );
+//                    }
+//                    resultMap.put( "portletsingleId", currentPortletFragment.getId() );
+//                }
+//                
+//                retrieveFragmentSpecialProperties( requestContext, currentLayoutFragment,
fragSizes, portletIcons );
+//                resultMap.put( "layoutsingle", currentLayoutFragment );
             }
-            else if (page.getRootFragment() instanceof Fragment)
+            else if (page.getRootFragment() instanceof ContentFragment)
             {
-                retrieveFragmentSpecialProperties( requestContext, (Fragment)page.getRootFragment(),
fragSizes, portletIcons );
+                retrieveFragmentSpecialProperties( requestContext, page.getRootFragment(),
fragSizes, portletIcons );
             }
             else
             {
@@ -239,7 +235,7 @@
     }        
     
     
-    protected void retrieveFragmentSpecialProperties( RequestContext requestContext, Fragment
frag, Map fragSizes, Map portletIcons )
+    protected void retrieveFragmentSpecialProperties( RequestContext requestContext, ContentFragment
frag, Map fragSizes, Map portletIcons )
     {
         if ( frag == null )
         {
@@ -259,7 +255,7 @@
     			Iterator childFragIter = childFragments.iterator();
     			while ( childFragIter.hasNext() )
     			{
-    				Fragment childFrag = (Fragment)childFragIter.next();
+    				ContentFragment childFrag = (ContentFragment)childFragIter.next();
                     retrieveFragmentSpecialProperties( requestContext, childFrag, fragSizes,
portletIcons );
     			}
     		}
@@ -288,62 +284,5 @@
         }
     }
     
-    private void insertNavigator(Page page)
-    {
-        Page nav;
-        try
-        {
-            if (page.getRootFragment() instanceof Fragment)
-            {
-                Fragment root = (Fragment)page.getRootFragment();
-                boolean found = findFragment(root);
-                if (!found)
-                {
-                    nav = this.pageManager.getPage("/_user/template/navigator.psml");
-                    if (nav.getRootFragment() instanceof Fragment)
-                    {
-                        List<Fragment> navFragments = ((Fragment)nav.getRootFragment()).getFragments();
-                        Fragment source1 = navFragments.get(0);
-                        root.getFragments().add(0, source1);
-                        Fragment source2 = navFragments.get(1);
-                        root.getFragments().add(1, source2);
-                        // save?
-                    }
-                }
-            }
-        }
-        catch (PageNotFoundException e)
-        {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        }
-        catch (NodeException e)
-        {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        }        
-    }
-    
-    private boolean findFragment(Fragment f)
-    {
-        List<Fragment> fragments = f.getFragments();
-        
-        //if ("_jsNavigator-1001".equals(f.getId())) // BUG: won't work on db psml
-        if ("j2-admin::JetspeedNavigator".equals(f.getName()) || "j2-admin::JetspeedToolbox".equals(f.getName()))
-        {
-            return true;
-        }
-        
-        if (fragments != null && !fragments.isEmpty())
-        {
-            for (Fragment child : fragments)
-            {
-                boolean found = findFragment(child);
-                if (found)
-                    return true;
-            }
-        }
-        return false;
-    }
     
 }

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/ui/Jetui.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/ui/Jetui.java?rev=885673&r1=885672&r2=885673&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/ui/Jetui.java
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/ui/Jetui.java
Tue Dec  1 05:10:34 2009
@@ -64,9 +64,20 @@
         {
             RequestDispatcher dispatcher = request.getRequest().getRequestDispatcher(layoutTemplate);
             request.setAttribute("jetui", this);
+            ContentFragment rootFragment = request.getPage().getRootFragment();     
+            if (rootFragment.isLocked())
+            {
+                for (ContentFragment f : (List<ContentFragment>)rootFragment.getFragments())
+                {
+                    if (!f.isLocked() && f.getType().equals(ContentFragment.LAYOUT))
+                    {
+                        rootFragment = f;
+                        break;
+                    }
+                }
+            }            
             if (maximized == null)
             {
-                ContentFragment rootFragment = request.getPage().getRootFragment();
                 String jetspeedLayout = rootFragment.getName();
                 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
                 // BOGUS: I would prefer to put all layout information directly in PSML,
not in portlet.xml, right now its mixed
@@ -93,13 +104,13 @@
                     fragmentColumnSizes = "25%,25%,25%,25%";                            
   
                 }                
                 String [] fragmentColumnSizesArray = fragmentColumnSizes.split("\\,");
-                /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
           
+                /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
                 ColumnLayout columnLayout = new ColumnLayout(numberOfColumns, layoutType,
rootFragment.getFragments(), fragmentColumnSizesArray);
                 request.setAttribute("columnLayout", columnLayout);
             }
             else
             {
-                ColumnLayout columnLayout = new ColumnLayout(1, "maximized", request.getPage().getRootFragment().getFragments(),
new String[] { "100%" });
+                ColumnLayout columnLayout = new ColumnLayout(1, "maximized", rootFragment.getFragments(),
new String[] { "100%" });
                 request.setAttribute("columnLayout", columnLayout);                
             }
             dispatcher.include(request.getRequest(), request.getResponse());            

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/conf/jetspeed/jetspeed.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/conf/jetspeed/jetspeed.properties?rev=885673&r1=885672&r2=885673&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/conf/jetspeed/jetspeed.properties
(original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/conf/jetspeed/jetspeed.properties
Tue Dec  1 05:10:34 2009
@@ -363,3 +363,11 @@
 # Registration default profiling rules assigned during registration or new user creation
 # comma separated list
 registration.rules.default = 
+
+#-------------------------------------------------------------------------
+# J E T U I
+#-------------------------------------------------------------------------
+# client | server
+jetui.render.engine = server
+# xml | json
+jetui.ajax.transport = json

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/seed/j2-seed.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/seed/j2-seed.xml?rev=885673&r1=885672&r2=885673&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/seed/j2-seed.xml
(original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/seed/j2-seed.xml
Tue Dec  1 05:10:34 2009
@@ -316,11 +316,11 @@
 			<userinfo>
 				<preference>
 					<name value="user.name.given"/>
-					<value value="Test Dude"/>
+					<value value="Portal"/>
 				</preference>
 				<preference>
 					<name value="user.name.family"/>
-					<value value="Dudley"/>
+					<value value="Administrator"/>
 				</preference>
 			</userinfo>
 			<Rules/>
@@ -330,7 +330,16 @@
 			<roles>user,manager</roles>
 			<groups></groups>
 			<preferences/>
-			<userinfo/>
+			<userinfo>
+				<preference>
+					<name value="user.name.given"/>
+					<value value="Site"/>
+				</preference>
+				<preference>
+					<name value="user.name.family"/>
+					<value value="Manager"/>
+				</preference>
+			</userinfo>
 			<Rules/>
 		</User>
 		<User name="user">
@@ -338,7 +347,16 @@
 			<roles>user</roles>
 			<groups>accounting</groups>
 			<preferences/>
-			<userinfo/>
+			<userinfo>
+				<preference>
+					<name value="user.name.given"/>
+					<value value="Portal"/>
+				</preference>
+				<preference>
+					<name value="user.name.family"/>
+					<value value="User"/>
+				</preference>
+			</userinfo>
 			<Rules>
 				<Rule locator="menu" rule="role-group"/>
 				<Rule locator="page" rule="j2"/>
@@ -349,7 +367,16 @@
 			<roles>user</roles>
 			<groups>accounting</groups>
 			<preferences/>
-			<userinfo/>
+			<userinfo>
+				<preference>
+					<name value="user.name.given"/>
+					<value value="Local"/>
+				</preference>
+				<preference>
+					<name value="user.name.family"/>
+					<value value="User"/>
+				</preference>
+			</userinfo>
 			<Rules>
 				<Rule locator="page" rule="localhost-fallback"/>
 			</Rules>
@@ -359,7 +386,16 @@
 			<roles>user</roles>
 			<groups>accounting</groups>
 			<preferences/>
-			<userinfo/>
+			<userinfo>
+				<preference>
+					<name value="user.name.given"/>
+					<value value="Sublocal"/>
+				</preference>
+				<preference>
+					<name value="user.name.family"/>
+					<value value="User"/>
+				</preference>
+			</userinfo>
 			<Rules>
 				<Rule locator="page" rule="subsite-by-hostname"/>
 			</Rules>
@@ -369,7 +405,16 @@
 			<roles></roles>
 			<groups></groups>
 			<preferences/>
-			<userinfo/>
+			<userinfo>
+				<preference>
+					<name value="user.name.given"/>
+					<value value="Tomcat"/>
+				</preference>
+				<preference>
+					<name value="user.name.family"/>
+					<value value="User"/>
+				</preference>
+			</userinfo>
 			<Rules/>
 		</User>
 		<User name="jetspeed">
@@ -377,7 +422,16 @@
 			<roles>manager</roles>
 			<groups>engineering</groups>
 			<preferences/>
-			<userinfo/>
+			<userinfo>
+				<preference>
+					<name value="user.name.given"/>
+					<value value="Jetspeed"/>
+				</preference>
+				<preference>
+					<name value="user.name.family"/>
+					<value value="User"/>
+				</preference>
+			</userinfo>
 			<Rules>
 				<Rule locator="menu" rule="role-group"/>
 				<Rule locator="page" rule="role-fallback"/>
@@ -388,7 +442,16 @@
 			<roles>guest</roles>
 			<groups></groups>
 			<preferences/>
-			<userinfo/>
+			<userinfo>
+				<preference>
+					<name value="user.name.given"/>
+					<value value=""/>
+				</preference>
+				<preference>
+					<name value="user.name.family"/>
+					<value value="Guest"/>
+				</preference>
+			</userinfo>
 			<Rules>
 				<Rule locator="page" rule="j2"/>
 			</Rules>



---------------------------------------------------------------------
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