taylor 2002/11/20 11:48:30
Modified: webapp/WEB-INF/psml/group/Jetspeed/html news.psml
security_example.psml
webapp/WEB-INF/psml/group/apache/html default.psml news.psml
webapp/WEB-INF/psml/role/user/html default.psml
Log:
problems with referencing PSML resources with hard-coded ids such as 100, in that
they conflicted with ids in the current page.
This was giving me some real headaches, so I removed all the common ids from any
psml that may be referenced
Revision Changes Path
1.4 +1 -1
jakarta-jetspeed/webapp/WEB-INF/psml/group/Jetspeed/html/news.psml
Index: news.psml
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/psml/group/Jetspeed/html/news.psml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- news.psml 20 Nov 2002 00:18:54 -0000 1.3
+++ news.psml 20 Nov 2002 19:48:30 -0000 1.4
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<portlets id="100" user="default" xmlns="http://xml.apache.org/jetspeed/2000/psml";>
+<portlets user="default" xmlns="http://xml.apache.org/jetspeed/2000/psml";>
<metainfo>
<title>Default Jetspeed News page</title>
</metainfo>
1.5 +9 -9
jakarta-jetspeed/webapp/WEB-INF/psml/group/Jetspeed/html/security_example.psml
Index: security_example.psml
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/psml/group/Jetspeed/html/security_example.psml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- security_example.psml 20 Nov 2002 00:18:54 -0000 1.4
+++ security_example.psml 20 Nov 2002 19:48:30 -0000 1.5
@@ -1,34 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
-<portlets id="100">
+<portlets>
<security-ref parent="admin-only"/>
<metainfo>
<title>Security Example</title>
</metainfo>
<control name="TabControl"/>
<controller name="TabController"/>
- <portlets id="101">
+ <portlets >
<security-ref parent="user-only"/>
<metainfo>
<title>User group can Customize</title>
</metainfo>
<controller name="TwoColumns"/>
- <entry id="102" parent="LoggedInWelcome"/>
- <entry id="103" parent="SecurityExample"/>
- <entry id="104" parent="Search"/>
+ <entry parent="LoggedInWelcome"/>
+ <entry parent="SecurityExample"/>
+ <entry parent="Search"/>
</portlets>
- <portlets id="105">
+ <portlets>
<security-ref parent="admin-only"/>
<metainfo>
<title>Admin group can Customize</title>
</metainfo>
<controller name="TwoColumns"/>
- <entry id="106" parent="LoggedInWelcome"/>
- <entry id="107" parent="SecurityExample">
+ <entry parent="LoggedInWelcome"/>
+ <entry parent="SecurityExample">
<metainfo>
<title>Security Example in Admin Tab</title>
</metainfo>
</entry>
- <entry id="108" parent="Search">
+ <entry parent="Search">
<metainfo>
<title>Search in Admin Tab</title>
</metainfo>
1.4 +5 -9
jakarta-jetspeed/webapp/WEB-INF/psml/group/apache/html/default.psml
Index: default.psml
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/psml/group/apache/html/default.psml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- default.psml 20 Nov 2002 00:18:54 -0000 1.3
+++ default.psml 20 Nov 2002 19:48:30 -0000 1.4
@@ -1,17 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<portlets id="100" user="default" >
+<portlets xmlns="http://xml.apache.org/jetspeed/2000/psml";>
<metainfo>
<title>Default Apache Group page</title>
</metainfo>
- <controller name="RowController"/>
- <control name="TitlePortletControl"/>
+ <controller name="ColumnController"/>
- <entry id="101" type="ref" parent="Apacheweek"/>
- <entry id="102" type="ref" parent="Mozilla">
- <parameter name="itemDisplayed" value="5"/>
- </entry>
-
- <entry id="103" type="ref" parent="XMLHack"/>
+ <entry type="ref" parent="Apacheweek"/>
+ <entry type="ref" parent="Mozilla"/>
+ <entry type="ref" parent="XMLHack"/>
</portlets>
1.4 +3 -3 jakarta-jetspeed/webapp/WEB-INF/psml/group/apache/html/news.psml
Index: news.psml
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/psml/group/apache/html/news.psml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- news.psml 20 Nov 2002 00:18:54 -0000 1.3
+++ news.psml 20 Nov 2002 19:48:30 -0000 1.4
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<portlets id='5000' xmlns="http://xml.apache.org/jetspeed/2000/psml";>
+<portlets xmlns="http://xml.apache.org/jetspeed/2000/psml";>
<metainfo>
<title>Default Apache News page</title>
</metainfo>
@@ -7,10 +7,10 @@
<controller name="ColumnController"/>
- <entry id='5001' type="ref" parent="Apacheweek">
+ <entry type="ref" parent="Apacheweek">
</entry>
- <entry id='5002' type="ref" parent="XMLHack">
+ <entry type="ref" parent="XMLHack">
</entry>
1.4 +4 -4 jakarta-jetspeed/webapp/WEB-INF/psml/role/user/html/default.psml
Index: default.psml
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/psml/role/user/html/default.psml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- default.psml 20 Nov 2002 00:18:54 -0000 1.3
+++ default.psml 20 Nov 2002 19:48:30 -0000 1.4
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<portlets id="100" user="default" xmlns="http://xml.apache.org/jetspeed/2000/psml";>
+<portlets user="default" xmlns="http://xml.apache.org/jetspeed/2000/psml";>
<controller name="TwoColumns" />
- <entry id="101" type="ref" parent="Apacheweek">
+ <entry type="ref" parent="Apacheweek">
<layout>
<property name="row" value="0"/>
<property name="column" value="0"/>
</layout>
</entry>
- <entry id="102" type="ref" parent="Mozilla">
+ <entry type="ref" parent="Mozilla">
<parameter name="itemDisplayed" value="5"/>
<layout>
<property name="row" value="1"/>
@@ -18,7 +18,7 @@
</layout>
</entry>
- <entry id="103" type="ref" parent="XMLHack">
+ <entry type="ref" parent="XMLHack">
<layout>
<property name="row" value="0"/>
<property name="column" value="1"/>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
