taylor 2002/06/30 22:54:10
Modified: src/java/org/apache/jetspeed/modules/actions/portlets
CustomizeAction.java
src/java/org/apache/jetspeed/portal BasePortletSet.java
Portlet.java
src/java/org/apache/jetspeed/portal/portlets
AbstractPortlet.java BogusPortlet.java
ContainerTestPortlet.java
src/java/org/apache/jetspeed/portal/security/portlets
PortletWrapper.java
webapp/WEB-INF/conf JetspeedResources.properties
JetspeedSecurity.properties demo-portlets.xreg
webapp/WEB-INF/psml/user/anon/html default.psml
webapp/WEB-INF/psml/user/anon/html/en default.psml
Removed: src/java/org/apache/jetspeed/portal/service
JetspeedPersistenceService.java
PersistenceService.java Service.java
ServiceException.java ServiceFactory.java
Log:
Replaced all references to
org.apache.jetspeed.portal.service.PersistenceService
with
org.apache.jetspeed.services.persistence.PersistenceManager
Revision Changes Path
1.9 +19 -14
jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/CustomizeAction.java
Index: CustomizeAction.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/CustomizeAction.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- CustomizeAction.java 30 Jun 2002 18:55:38 -0000 1.8
+++ CustomizeAction.java 1 Jul 2002 05:54:09 -0000 1.9
@@ -61,9 +61,8 @@
import org.apache.jetspeed.portal.PortletException;
import org.apache.jetspeed.portal.PortletSkin;
import org.apache.jetspeed.portal.portlets.VelocityPortlet;
-import org.apache.jetspeed.portal.service.PersistenceService;
-import org.apache.jetspeed.portal.service.ServiceFactory;
-import org.apache.jetspeed.portal.service.ServiceException;
+import org.apache.jetspeed.services.persistence.PersistenceManager;
+import org.apache.jetspeed.services.persistence.PortalPersistenceException;
import org.apache.jetspeed.services.Registry;
import org.apache.jetspeed.services.rundata.JetspeedRunData;
import org.apache.jetspeed.om.BaseSecurityReference;
@@ -78,6 +77,7 @@
import org.apache.jetspeed.services.JetspeedSecurity;
import org.apache.jetspeed.services.PortalToolkit;
import org.apache.jetspeed.services.security.PortalResource;
+import org.apache.jetspeed.portal.PortletInstance;
// Turbine stuff
import org.apache.turbine.util.Log;
@@ -268,11 +268,7 @@
// Update paramaters
try
{
- Object[] obj = { p };
- PersistenceService ps = (PersistenceService)ServiceFactory
- .getService( PersistenceService.class,
- rundata, obj);
- PersistenceService.Page page = ps.getPage();
+ PortletInstance instance = PersistenceManager.getInstance(p, rundata);
Iterator i = params.iterator();
@@ -288,14 +284,14 @@
{
// this will fail if the parameter is currently set in the
registry
// but not in the PSML entry. This is a good thing !
- page.removeAttribute(name);
+ instance.removeAttribute(name);
}
else
{
// only update if the value changed
if
(!newValue.equals(p.getPortletConfig().getInitParameter(name)))
{
- page.setAttribute(name,newValue);
+ instance.setAttribute(name,newValue);
pc.setInitParameter(name,newValue);
madePsChange = true;
}
@@ -304,8 +300,17 @@
// save all the changes
if (madePsChange == true)
- ps.store();
-
+ {
+ try
+ {
+ PersistenceManager.store(instance);
+ }
+ catch(PortalPersistenceException e)
+ {
+ Log.error("Exception occured while saving instance",e);
+ }
+ }
+ /* redundant
if (madePcChange == true)
{
try
@@ -317,7 +322,7 @@
Log.error("Exception occured while saving PSML",e);
}
}
-
+ */
//FIXME: this hack is due to the corrupted lifecycle of the portlet in
the
//current API when caching is activated
try
@@ -333,7 +338,7 @@
// session
doCancel(rundata, context);
}
- catch (ServiceException e)
+ catch (Exception e)
{
Log.error(e);
}
1.21 +50 -12
jakarta-jetspeed/src/java/org/apache/jetspeed/portal/BasePortletSet.java
Index: BasePortletSet.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/BasePortletSet.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- BasePortletSet.java 28 Jun 2002 05:37:32 -0000 1.20
+++ BasePortletSet.java 1 Jul 2002 05:54:09 -0000 1.21
@@ -61,12 +61,14 @@
//Jetspeed stuff
import org.apache.jetspeed.om.security.JetspeedUser;
-import org.apache.jetspeed.portal.service.PersistenceService;
-import org.apache.jetspeed.portal.service.ServiceFactory;
import org.apache.jetspeed.services.JetspeedSecurity;
import org.apache.jetspeed.util.MetaData;
import org.apache.jetspeed.util.MimeType;
+import org.apache.jetspeed.services.persistence.PersistenceManager;
+import org.apache.jetspeed.services.persistence.PortalPersistenceException;
+import org.apache.jetspeed.portal.PortletInstance;
+
//turbine stuff
import org.apache.turbine.util.Log;
import org.apache.turbine.util.RunData;
@@ -618,19 +620,55 @@
//Portlet interface
+ /**
+ * Retrieve a portlet attribute from persistent storage
+ *
+ * @param attrName The attribute to retrieve
+ * @param attrDefValue The value if the attr doesn't exists
+ * @param rundata The RunData object for the current request
+ * @return The attribute value
+ */
+ public String getAttribute( String attrName, String attrDefValue, RunData
rundata )
+ {
+ String attrValue = null ;
+
+ PortletInstance instance = PersistenceManager.getInstance(this, rundata);
+ attrValue = instance.getAttribute(attrName, attrDefValue);
+
+ return attrValue;
+ }
+
/**
- Retrieve a portlet attribute from persistent storage
+ * Stores a portlet attribute in persistent storage
+ *
+ * @param attrName The attribute to retrieve
+ * @paarm attrValue The value to store
+ * @param rundata The RunData object for the current request
+ */
+ public void setAttribute( String attrName, String attrValue, RunData rundata )
+ {
+ try
+ {
+ PortletInstance instance = PersistenceManager.getInstance(this,
rundata);
+ instance.setAttribute(attrName, attrValue);
+ PersistenceManager.store(instance);
+ }
+ catch (PortalPersistenceException e)
+ {
+ Log.error("Exception while setting attribute "+attrName+" for portlet
"+getName(),e);
+ }
+ }
- @param attrName The attribute to retrieve
- @parm attrDefValue The value if the attr doesn't exists
- @param rundata A RunData object
- @return The attribute value
- */
- public String getAttribute( String attrName, String attrDefValue, RunData
rundata )
+ /**
+ * Gets the portlet instance associated with this portlet.
+ *
+ * @return PortletInstance
+ */
+ public PortletInstance getInstance(RunData rundata)
{
- // TODO: figure out if we can get an attribute for a portlet set...
- return attrDefValue;
+ return PersistenceManager.getInstance(this, rundata);
}
+
public String getID()
{
1.44 +26 -8
jakarta-jetspeed/src/java/org/apache/jetspeed/portal/Portlet.java
Index: Portlet.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/Portlet.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- Portlet.java 29 Mar 2002 20:12:32 -0000 1.43
+++ Portlet.java 1 Jul 2002 05:54:09 -0000 1.44
@@ -192,14 +192,32 @@
public boolean supportsType( MimeType mimeType );
/**
- Retrieve a portlet attribute from persistent storage
-
- @param attrName The attribute to retrieve
- @parm attrDefValue The value if the attr doesn't exists
- @param rundata A RunData object
- @return The attribute value
- */
+ * Retrieve a portlet attribute from persistent storage
+ *
+ * @param attrName The attribute to retrieve
+ * @param attrDefValue The value if the attr doesn't exists
+ * @param rundata The RunData object for the current request
+ * @return The attribute value
+ */
public String getAttribute( String attrName, String attrDefValue, RunData
rundata );
+
+
+ /**
+ * Stores a portlet attribute in persistent storage
+ *
+ * @param attrName The attribute to retrieve
+ * @paarm attrValue The value to store
+ * @param rundata The RunData object for the current request
+ */
+ public void setAttribute( String attrName, String attrValue, RunData rundata );
+
+
+ /**
+ * Gets the portlet instance associated with this portlet.
+ *
+ * @return PortletInstance
+ */
+ public PortletInstance getInstance(RunData rundata);
/**
Retrieve a unique portlet id
1.56 +24 -36
jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/AbstractPortlet.java
Index: AbstractPortlet.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/AbstractPortlet.java,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- AbstractPortlet.java 29 Mar 2002 20:12:33 -0000 1.55
+++ AbstractPortlet.java 1 Jul 2002 05:54:09 -0000 1.56
@@ -66,8 +66,9 @@
import org.apache.jetspeed.portal.PortletConfig;
import org.apache.jetspeed.portal.PortletException;
import org.apache.jetspeed.portal.PortletState;
-import org.apache.jetspeed.portal.service.PersistenceService;
-import org.apache.jetspeed.portal.service.ServiceFactory;
+import org.apache.jetspeed.services.persistence.PersistenceManager;
+import org.apache.jetspeed.services.persistence.PortalPersistenceException;
+import org.apache.jetspeed.portal.PortletInstance;
import org.apache.jetspeed.services.portletcache.Cacheable;
import org.apache.jetspeed.services.portletcache.GlobalCache;
import org.apache.jetspeed.services.Registry;
@@ -748,32 +749,14 @@
{
String attrValue = null ;
- try
- {
- Object[] params = { this };
- PersistenceService ps = (PersistenceService)ServiceFactory
- .getService( PersistenceService.class,
- rundata, params);
- PersistenceService.Page page = ps.getPage();
- if (page != null)
- attrValue = page.getAttribute( attrName );
-
- if( attrValue == null )
- {
- attrValue = attrDefValue ;
- }
- }
- catch ( Exception e )
- {
- Log.debug("Exception while retrieving attribute "+attrName+" for
portlet "+getName(),e);
- attrValue = attrDefValue ;
- }
+ PortletInstance instance = PersistenceManager.getInstance(this, rundata);
+ attrValue = instance.getAttribute(attrName, attrDefValue);
return attrValue;
}
/**
- * A way to store a portlet attribute in persistent storage
+ * Stores a portlet attribute in persistent storage
*
* @param attrName The attribute to retrieve
* @paarm attrValue The value to store
@@ -783,24 +766,29 @@
{
try
{
- Object[] params = { this };
- PersistenceService ps = (PersistenceService)ServiceFactory
- .getService( PersistenceService.class,
- rundata, params);
- ps.getPage().setAttribute( attrName, attrValue );
-
- // only allow to persist if user is logged in
- if (rundata.getUser().hasLoggedIn())
- {
- ps.store();
- }
+ PortletInstance instance = PersistenceManager.getInstance(this,
rundata);
+ instance.setAttribute(attrName, attrValue);
+ PersistenceManager.store(instance);
}
- catch ( Exception e )
+ catch (PortalPersistenceException e)
{
Log.error("Exception while setting attribute "+attrName+" for portlet
"+getName(),e);
}
}
+ /**
+ * Gets the portlet instance associated with this portlet.
+ *
+ * @return PortletInstance
+ */
+ public PortletInstance getInstance(RunData rundata)
+ {
+ return PersistenceManager.getInstance(this, rundata);
+ }
+
+ //
+ // DST: Shouldn't getID and setID be deprecated and added to PortletInstance...
+ //
public String getID()
{
return id;
1.2 +8 -9
jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/BogusPortlet.java
Index: BogusPortlet.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/BogusPortlet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BogusPortlet.java 14 May 2002 06:32:59 -0000 1.1
+++ BogusPortlet.java 1 Jul 2002 05:54:09 -0000 1.2
@@ -55,26 +55,25 @@
*/
import org.apache.jetspeed.portal.PortletConfig;
+import org.apache.jetspeed.services.persistence.PersistenceManager;
+import org.apache.jetspeed.portal.PortletInstance;
- /** ClearPortlet
- * Empty Portlet which displays no content
+ /**
+ * Bogus Portlet. Use to test portlet instance persistence
+ *
* @author <a href="mailto:[EMAIL PROTECTED]";>David Sean Taylor</a>
*/
public class BogusPortlet extends AbstractInstancePortlet
{
- /**
- * Insert the method's description here.
- * Creation date: (12/4/2000 1:49:50 PM)
- * @return org.apache.ecs.ConcreteElement
- * @param data org.apache.turbine.util.RunData
- */
public org.apache.ecs.ConcreteElement
getContent(org.apache.turbine.util.RunData data)
{
String s1 = "Config ID: " + getPortletConfig().getPortletId();
String s2 = ", Portlet ID: " + getID();
String s3 = ", Page ID: " + getPortletConfig().getPageId();
- return new org.apache.ecs.ClearElement( s1 + s2 + s3);
+ PortletInstance instance = PersistenceManager.getInstance(this,data);
+ String s4 = instance.getAttribute("country");
+ return new org.apache.ecs.ClearElement( s1 + s2 + s3 + ", " + s4);
}
}
1.2 +52 -10
jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/ContainerTestPortlet.java
Index: ContainerTestPortlet.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/ContainerTestPortlet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ContainerTestPortlet.java 4 Apr 2002 18:39:49 -0000 1.1
+++ ContainerTestPortlet.java 1 Jul 2002 05:54:09 -0000 1.2
@@ -67,6 +67,10 @@
import org.apache.jetspeed.portal.PortletSet;
import org.apache.jetspeed.services.rundata.JetspeedRunData;
+import org.apache.jetspeed.services.persistence.PersistenceManager;
+import org.apache.jetspeed.services.persistence.PortalPersistenceException;
+import org.apache.jetspeed.portal.PortletInstance;
+
import org.apache.jetspeed.util.MimeType;
import org.apache.turbine.services.cache.Refreshable;
@@ -314,19 +318,57 @@
return true;
}
+ /**
+ * Retrieve a portlet attribute from persistent storage
+ *
+ * @param attrName The attribute to retrieve
+ * @param attrDefValue The value if the attr doesn't exists
+ * @param rundata The RunData object for the current request
+ * @return The attribute value
+ */
+ public String getAttribute( String attrName, String attrDefValue, RunData
rundata )
+ {
+ String attrValue = null ;
+
+ PortletInstance instance = PersistenceManager.getInstance(this, rundata);
+ attrValue = instance.getAttribute(attrName, attrDefValue);
+
+ return attrValue;
+ }
+
/**
- Retrieve a portlet attribute from persistent storage
+ * Stores a portlet attribute in persistent storage
+ *
+ * @param attrName The attribute to retrieve
+ * @paarm attrValue The value to store
+ * @param rundata The RunData object for the current request
+ */
+ public void setAttribute( String attrName, String attrValue, RunData rundata )
+ {
+ try
+ {
+ PortletInstance instance = PersistenceManager.getInstance(this,
rundata);
+ instance.setAttribute(attrName, attrValue);
+ PersistenceManager.store(instance);
+ }
+ catch (PortalPersistenceException e)
+ {
+ Log.error("Exception while setting attribute "+attrName+" for portlet
"+getName(),e);
+ }
+ }
- @param attrName The attribute to retrieve
- @parm attrDefValue The value if the attr doesn't exists
- @param rundata A RunData object
- @return The attribute value
- */
- public String getAttribute( String attrName, String attrDefValue, RunData
rundata )
+ /**
+ * Gets the portlet instance associated with this portlet.
+ *
+ * @return PortletInstance
+ */
+ public PortletInstance getInstance(RunData rundata)
{
- System.out.println("calling getAttribute");
- return "whatever";
+ return PersistenceManager.getInstance(this, rundata);
}
+
+
+
/**
Retrieve a unique portlet id
1.7 +36 -1
jakarta-jetspeed/src/java/org/apache/jetspeed/portal/security/portlets/PortletWrapper.java
Index: PortletWrapper.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/security/portlets/PortletWrapper.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- PortletWrapper.java 28 Jun 2002 05:37:32 -0000 1.6
+++ PortletWrapper.java 1 Jul 2002 05:54:10 -0000 1.7
@@ -61,6 +61,7 @@
import org.apache.jetspeed.portal.PortletConfig;
import org.apache.jetspeed.portal.PortletException;
import org.apache.jetspeed.util.MimeType;
+import org.apache.jetspeed.portal.PortletInstance;
import org.apache.jetspeed.services.portletcache.Cacheable;
@@ -316,6 +317,40 @@
return wrappedPortlet.getAttribute( attrName, attrDefValue, rundata );
}
+ }
+
+ /**
+ Sets a portlet attribute to persistent storage
+
+ @param attrName The attribute to retrieve
+ @parm attrValue The value
+ @param rundata A RunData object
+ @return The attribute value
+ */
+ public void setAttribute( String attrName, String attrValue, RunData rundata )
+ {
+ if( checkPermission( rundata,
+ JetspeedSecurity.PERMISSION_VIEW) )
+ {
+ wrappedPortlet.setAttribute( attrName, attrValue, rundata );
+ }
+ else
+ {
+ //FIXME: for the moment we will allow this call to succeed...
+ //throw new TurbineRuntimeException( "Security check failed" );
+ wrappedPortlet.setAttribute( attrName, attrValue, rundata );
+ }
+
+ }
+
+ /**
+ * Gets the portlet instance associated with this portlet.
+ *
+ * @return PortletInstance
+ */
+ public PortletInstance getInstance(RunData rundata)
+ {
+ return wrappedPortlet.getInstance(rundata);
}
/**
1.80 +6 -1
jakarta-jetspeed/webapp/WEB-INF/conf/JetspeedResources.properties
Index: JetspeedResources.properties
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/JetspeedResources.properties,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- JetspeedResources.properties 28 Jun 2002 05:37:37 -0000 1.79
+++ JetspeedResources.properties 1 Jul 2002 05:54:10 -0000 1.80
@@ -422,6 +422,11 @@
# The Template Locator is implemented as a Turbine service.
services.StockQuoteService.classname=org.apache.jetspeed.webservices.finance.stockmarket.JetspeedStockQuoteService
+#########################################
+# Persistence Manager Service #
+#########################################
+services.PortalPersistenceService.classname=org.apache.jetspeed.services.persistence.JetspeedPortalPersistenceService
+
##########################################
# Diskcache configuration #
##########################################
1.3 +1 -1 jakarta-jetspeed/webapp/WEB-INF/conf/JetspeedSecurity.properties
Index: JetspeedSecurity.properties
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/JetspeedSecurity.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
1.15 +2 -2 jakarta-jetspeed/webapp/WEB-INF/conf/demo-portlets.xreg
Index: demo-portlets.xreg
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/demo-portlets.xreg,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- demo-portlets.xreg 14 May 2002 16:25:17 -0000 1.14
+++ demo-portlets.xreg 1 Jul 2002 05:54:10 -0000 1.15
@@ -206,11 +206,11 @@
<parameter name="windowSize" value="5" hidden="false"/>
<media-type ref="html"/>
</portlet-entry>
- <portlet-entry name="Bogus" hidden="false" type="instance" application="false">
+ <portlet-entry name="InstanceExample" hidden="false" type="instance"
application="false">
<classname>org.apache.jetspeed.portal.portlets.BogusPortlet</classname>
<media-type ref="html"/>
<meta-info>
- <title>Bogus</title>
+ <title>Instance Attribute Example</title>
</meta-info>
</portlet-entry>
</registry>
1.3 +45 -36 jakarta-jetspeed/webapp/WEB-INF/psml/user/anon/html/default.psml
Index: default.psml
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/psml/user/anon/html/default.psml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- default.psml 28 Jun 2002 05:37:38 -0000 1.2
+++ default.psml 1 Jul 2002 05:54:10 -0000 1.3
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<portlets xmlns="http://xml.apache.org/jetspeed/2000/psml";>
<metainfo>
- <title>Default Jetspeed page (for default locale)</title>
+ <title>Default Jetspeed Page</title>
</metainfo>
<control name="TabControl"/>
@@ -13,7 +13,7 @@
<skin name="orange-grey"/>
<portlets>
- <controller name="TwoColumns">
+ <controller name="RowController">
<parameter name="sizes" value="66%,34%"/>
</controller>
@@ -21,24 +21,20 @@
<title>Home Page</title>
</metainfo>
- <entry parent="JetspeedContent">
- <layout>
- <property name="row" value="0"/>
- <property name="column" value="0"/>
- </layout>
- </entry>
- <entry parent="Jetspeed">
- <layout>
- <property name="row" value="0"/>
- <property name="column" value="1"/>
- </layout>
- </entry>
- <entry parent="Welcome">
- <layout>
- <property name="row" value="1"/>
- <property name="column" value="1"/>
- </layout>
+ <portlets>
+ <entry parent="JetspeedContent"/>
+ </portlets>
+
+ <portlets>
+ <entry id="808" parent="InstanceExample">
+ <parameter name="country" value="Brazil"/>
+ </entry>
+ <entry id="809" parent="InstanceExample">
+ <parameter name="country" value="Germany"/>
</entry>
+ <entry parent="Jetspeed"/>
+ <entry parent="Welcome"/>
+ </portlets>
</portlets>
@@ -82,30 +78,43 @@
</portlets>
<portlets>
- <controller name="TwoColumns" />
+ <controller name="TwoColumns"/>
<metainfo>
<title>Dynamic</title>
</metainfo>
- <entry parent="JetspeedContent">
- <layout>
- <property name="row" value="0"/>
- <property name="column" value="0"/>
- </layout>
- </entry>
- <entry parent="HelloVelocity">
- <layout>
- <property name="row" value="0"/>
- <property name="column" value="1"/>
- </layout>
- </entry>
- <entry parent="HelloVelocityCached">
+ <portlets>
+ <entry parent="JetspeedContent"/>
+ <layout>
+ <property name="row" value="0"/>
+ <property name="column" value="0"/>
+ </layout>
+ </portlets>
+
+ <portlets>
+ <entry parent="HelloVelocity"/>
<layout>
- <property name="row" value="1"/>
- <property name="column" value="1"/>
+ <property name="row" value="0"/>
+ <property name="column" value="1"/>
</layout>
- </entry>
+ </portlets>
+ <portlets>
+ <entry parent="HelloVelocityCached"/>
+ <layout>
+ <property name="row" value="1"/>
+ <property name="column" value="1"/>
+ </layout>
+ </portlets>
+
+ <portlets>
+ <entry parent="HelloJSP"/>
+ <layout>
+ <property name="row" value="1"/>
+ <property name="column" value="0"/>
+ </layout>
+ </portlets>
+
</portlets>
</portlets>
1.3 +6 -2
jakarta-jetspeed/webapp/WEB-INF/psml/user/anon/html/en/default.psml
Index: default.psml
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/psml/user/anon/html/en/default.psml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- default.psml 28 Jun 2002 05:37:38 -0000 1.2
+++ default.psml 1 Jul 2002 05:54:10 -0000 1.3
@@ -26,8 +26,12 @@
</portlets>
<portlets>
- <entry id="808" parent="Bogus"/>
- <entry id="809" parent="Bogus"/>
+ <entry id="808" parent="InstanceExample">
+ <parameter name="country" value="Brazil"/>
+ </entry>
+ <entry id="809" parent="InstanceExample">
+ <parameter name="country" value="Germany"/>
+ </entry>
<entry parent="Jetspeed"/>
<entry parent="Welcome"/>
</portlets>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
