You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2006/07/23 13:37:48 UTC
svn commit: r424720 - in /cocoon/trunk/blocks/cocoon-portal:
cocoon-portal-impl/
cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/
cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/
cocoon-portal-impl/src/main/java/org/ap...
Author: cziegeler
Date: Sun Jul 23 04:37:47 2006
New Revision: 424720
URL: http://svn.apache.org/viewvc?rev=424720&view=rev
Log:
Update Castor to 1.0 final
Fix portal sample ids
Add workaround for castor bugs resolving references to objects
Modified:
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/pom.xml
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletBaseData.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletData.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletInstanceData.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/Layout.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/persistence/castor/CastorSourceConverter.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/xconf/cocoon-portal-sample.xconf
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/copletdata/portal.xml
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/copletinstancedata/portal-user-anonymous.xml
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/copletinstancedata/portal-user-cocoon.xml
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/copletinstancedata/portal-user-test.xml
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/copletinstancedata/portal.xml
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/layout/portal-user-anonymous.xml
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/layout/portal-user-cocoon.xml
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/layout/portal-user-test.xml
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/layout/portal.xml
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/pom.xml?rev=424720&r1=424719&r2=424720&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/pom.xml Sun Jul 23 04:37:47 2006
@@ -48,7 +48,7 @@
<dependency>
<groupId>castor</groupId>
<artifactId>castor</artifactId>
- <version>1.0M1</version>
+ <version>1.0</version>
<exclusions>
<exclusion>
<groupId>xerces</groupId>
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletBaseData.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletBaseData.java?rev=424720&r1=424719&r2=424720&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletBaseData.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletBaseData.java Sun Jul 23 04:37:47 2006
@@ -43,6 +43,11 @@
* @see PortalUtils#testId(String)
*/
public CopletBaseData(String id) {
+ // FIXME - Due to a bug in castor, we have to allow null ids for now
+ if ( id == null ) {
+ this.id = null;
+ return;
+ }
final String idErrorMsg = PortalUtils.testId(id);
if ( idErrorMsg != null ) {
throw new IllegalArgumentException(idErrorMsg);
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletData.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletData.java?rev=424720&r1=424719&r2=424720&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletData.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletData.java Sun Jul 23 04:37:47 2006
@@ -54,6 +54,11 @@
* @see PortalUtils#testId(String)
*/
public CopletData(String id) {
+ // FIXME - Due to a bug in castor, we have to allow null ids for now
+ if ( id == null ) {
+ this.id = null;
+ return;
+ }
final String idErrorMsg = PortalUtils.testId(id);
if ( idErrorMsg != null ) {
throw new IllegalArgumentException(idErrorMsg);
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletInstanceData.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletInstanceData.java?rev=424720&r1=424719&r2=424720&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletInstanceData.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletInstanceData.java Sun Jul 23 04:37:47 2006
@@ -75,6 +75,11 @@
* @see PortalUtils#testId(String)
*/
public CopletInstanceData(String id) {
+ // FIXME - Due to a bug in castor, we have to allow null ids for now
+ if ( id == null ) {
+ this.id = null;
+ return;
+ }
final String idErrorMsg = PortalUtils.testId(id);
if ( idErrorMsg != null ) {
throw new IllegalArgumentException(idErrorMsg);
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/Layout.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/Layout.java?rev=424720&r1=424719&r2=424720&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/Layout.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/Layout.java Sun Jul 23 04:37:47 2006
@@ -73,9 +73,12 @@
* @see PortalUtils#testId(String)
*/
public Layout(String id, String name) {
- final String idErrorMsg = PortalUtils.testId(id);
- if ( idErrorMsg != null ) {
- throw new IllegalArgumentException(idErrorMsg);
+ // check id, null for id is allowed!
+ if ( id != null ) {
+ final String idErrorMsg = PortalUtils.testId(id);
+ if ( idErrorMsg != null ) {
+ throw new IllegalArgumentException(idErrorMsg);
+ }
}
this.id = id;
this.name = name;
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/persistence/castor/CastorSourceConverter.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/persistence/castor/CastorSourceConverter.java?rev=424720&r1=424719&r2=424720&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/persistence/castor/CastorSourceConverter.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/persistence/castor/CastorSourceConverter.java Sun Jul 23 04:37:47 2006
@@ -82,6 +82,7 @@
Map references,
Map parameters)
throws ConverterException {
+ System.out.println("Reading objects for mapping: " + mappingName);
try {
this.idResolver.setObjectMap(references);
Unmarshaller unmarshaller = (Unmarshaller)((Object[])this.mappings.get(mappingName))[1];
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/xconf/cocoon-portal-sample.xconf
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/xconf/cocoon-portal-sample.xconf?rev=424720&r1=424719&r2=424720&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/xconf/cocoon-portal-sample.xconf (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/xconf/cocoon-portal-sample.xconf Sun Jul 23 04:37:47 2006
@@ -114,8 +114,9 @@
<!-- Uncomment the following when using PageLabels
<aspect type="page-label"/>
-->
- <!-- Comment the following out if you don't need WSRP: -->
+ <!-- Comment the following out if you don't need WSRP:
<aspect type="wsrp"/>
+ -->
<aspect type="request-parameter"/>
</event-aspects>
<!-- add a new instance of each class as a receiver: -->
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/copletdata/portal.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/copletdata/portal.xml?rev=424720&r1=424719&r2=424720&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/copletdata/portal.xml (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/copletdata/portal.xml Sun Jul 23 04:37:47 2006
@@ -47,7 +47,7 @@
</attribute>
</coplet-data>
- <coplet-data id="CNET News">
+ <coplet-data id="CNETNews">
<title>CNET News</title>
<coplet-base-data>URICoplet</coplet-base-data>
<attribute>
@@ -56,7 +56,7 @@
</attribute>
</coplet-data>
- <coplet-data id="CNET Business">
+ <coplet-data id="CNETBusiness">
<title>CNET Business News</title>
<coplet-base-data>URICoplet</coplet-base-data>
<attribute>
@@ -83,15 +83,6 @@
</attribute>
</coplet-data>
- <coplet-data id="ML Weblog">
- <title>ML's Weblog</title>
- <coplet-base-data>URICoplet</coplet-base-data>
- <attribute>
- <name>uri</name>
- <value xsi:type="java:java.lang.String">cocoon:/coplets/news/ml_weblog.weblog-rss</value>
- </attribute>
- </coplet-data>
-
<coplet-data id="Weblog">
<title>Another Weblog</title>
<coplet-base-data>URICoplet</coplet-base-data>
@@ -106,7 +97,7 @@
+ Try to read content from the internet.
+ If the net is not available, use static file (for offline presentation)
-->
- <coplet-data id="CZ Weblog">
+ <coplet-data id="CZWeblog">
<title>CZ's Weblog</title>
<coplet-base-data>URICoplet</coplet-base-data>
<attribute>
@@ -126,7 +117,7 @@
<!--
+ The portal introduction coplet
-->
- <coplet-data id="Portal-Intro">
+ <coplet-data id="PortalIntro">
<title>Introduction</title>
<coplet-base-data>URICoplet</coplet-base-data>
<attribute>
@@ -138,7 +129,7 @@
<value xsi:type="java:java.lang.Boolean">true</value>
</attribute>
</coplet-data>
- <coplet-data id="Portal-Demo">
+ <coplet-data id="PortalDemo">
<title>Introduction</title>
<coplet-base-data>URICoplet</coplet-base-data>
<attribute>
@@ -154,7 +145,7 @@
<value xsi:type="java:java.lang.Boolean">true</value>
</attribute>
</coplet-data>
- <coplet-data id="Portal-Right">
+ <coplet-data id="PortalRight">
<title>Right</title>
<coplet-base-data>URICoplet</coplet-base-data>
<attribute>
@@ -166,7 +157,7 @@
<value xsi:type="java:java.lang.Boolean">true</value>
</attribute>
</coplet-data>
- <coplet-data id="Portal-Left">
+ <coplet-data id="PortalLeft">
<title>Left</title>
<coplet-base-data>URICoplet</coplet-base-data>
<attribute>
@@ -178,7 +169,7 @@
<value xsi:type="java:java.lang.Boolean">true</value>
</attribute>
</coplet-data>
- <coplet-data id="Portal-Bottom">
+ <coplet-data id="PortalBottom">
<title>Bottom</title>
<coplet-base-data>URICoplet</coplet-base-data>
<attribute>
@@ -190,7 +181,7 @@
<value xsi:type="java:java.lang.Boolean">true</value>
</attribute>
</coplet-data>
- <coplet-data id="static-sample">
+ <coplet-data id="static_sample">
<title>Static Information</title>
<coplet-base-data>URICoplet</coplet-base-data>
<attribute>
@@ -299,7 +290,7 @@
<value xsi:type="java:java.lang.String">cocoon://samples/blocks/portal-sample/coplets/basket/basket</value>
</attribute>
</coplet-data>
- <coplet-data id="Basket.admin">
+ <coplet-data id="Basket_admin">
<title>Basket</title>
<coplet-base-data>URICoplet</coplet-base-data>
<attribute>
@@ -477,7 +468,7 @@
+ - the flow based calculator
+ - and a forms sample
-->
- <coplet-data id="app-test-one">
+ <coplet-data id="app_test_one">
<title>Application Test</title>
<coplet-base-data>URICoplet</coplet-base-data>
<attribute>
@@ -497,7 +488,7 @@
<value xsi:type="java:java.lang.String">cocoon://samples/blocks/portal-sample/coplets/samples/form</value>
</attribute>
</coplet-data>
- <coplet-data id="app-test-two">
+ <coplet-data id="app_test_two">
<title>Application Test</title>
<coplet-base-data>URICoplet</coplet-base-data>
<attribute>
@@ -533,7 +524,7 @@
</coplet-data>
<!-- Example for the wsrp portlet -->
- <coplet-data id="wsrp-calc-portlet">
+ <coplet-data id="wsrp_calc_portlet">
<title>WSRP-Calc-Portlet</title>
<coplet-base-data>WSRP</coplet-base-data>
<attribute>
@@ -546,7 +537,7 @@
</attribute>
</coplet-data>
- <coplet-data id="wsrp-test-portlet">
+ <coplet-data id="wsrp_test_portlet">
<title>WSRP-Test-Portlet</title>
<coplet-base-data>WSRP</coplet-base-data>
<attribute>
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/copletinstancedata/portal-user-anonymous.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/copletinstancedata/portal-user-anonymous.xml?rev=424720&r1=424719&r2=424720&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/copletinstancedata/portal-user-anonymous.xml (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/copletinstancedata/portal-user-anonymous.xml Sun Jul 23 04:37:47 2006
@@ -16,19 +16,19 @@
-->
<!-- SVN $Id$ -->
<coplets>
- <coplet-instance-data id="Portal-Intro-1">
- <coplet-data>Portal-Intro</coplet-data>
+ <coplet-instance-data id="PortalIntro_1">
+ <coplet-data>PortalIntro</coplet-data>
</coplet-instance-data>
- <coplet-instance-data id="Portal-Right-1">
- <coplet-data>Portal-Right</coplet-data>
+ <coplet-instance-data id="PortalRight_1">
+ <coplet-data>PortalRight</coplet-data>
</coplet-instance-data>
- <coplet-instance-data id="Portal-Left-1">
- <coplet-data>Portal-Left</coplet-data>
+ <coplet-instance-data id="PortalLeft_1">
+ <coplet-data>PortalLeft</coplet-data>
</coplet-instance-data>
- <coplet-instance-data id="Portal-Bottom-1">
- <coplet-data>Portal-Bottom</coplet-data>
+ <coplet-instance-data id="PortalBottom_1">
+ <coplet-data>PortalBottom</coplet-data>
</coplet-instance-data>
- <coplet-instance-data id="Login-1">
+ <coplet-instance-data id="Login_1">
<coplet-data>Login</coplet-data>
</coplet-instance-data>
</coplets>
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/copletinstancedata/portal-user-cocoon.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/copletinstancedata/portal-user-cocoon.xml?rev=424720&r1=424719&r2=424720&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/copletinstancedata/portal-user-cocoon.xml (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/copletinstancedata/portal-user-cocoon.xml Sun Jul 23 04:37:47 2006
@@ -16,70 +16,70 @@
-->
<!-- SVN $Id$ -->
<coplets xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <coplet-instance-data id="Portal-Intro-1">
- <coplet-data>Portal-Intro</coplet-data>
+ <coplet-instance-data id="PortalIntro_1">
+ <coplet-data>PortalIntro</coplet-data>
</coplet-instance-data>
- <coplet-instance-data id="Portal-Right-1">
- <coplet-data>Portal-Right</coplet-data>
+ <coplet-instance-data id="PortalRight_1">
+ <coplet-data>PortalRight</coplet-data>
</coplet-instance-data>
- <coplet-instance-data id="Portal-Left-1">
- <coplet-data>Portal-Left</coplet-data>
+ <coplet-instance-data id="PortalLeft_1">
+ <coplet-data>PortalLeft</coplet-data>
</coplet-instance-data>
- <coplet-instance-data id="Portal-Bottom-1">
- <coplet-data>Portal-Bottom</coplet-data>
+ <coplet-instance-data id="PortalBottom_1">
+ <coplet-data>PortalBottom</coplet-data>
</coplet-instance-data>
- <coplet-instance-data id="Portal-Demo-1">
- <coplet-data>Portal-Demo</coplet-data>
+ <coplet-instance-data id="PortalDemo_1">
+ <coplet-data>PortalDemo</coplet-data>
</coplet-instance-data>
- <coplet-instance-data id="Gallery-Petstore">
+ <coplet-instance-data id="GalleryPetstore">
<coplet-data>Gallery</coplet-data>
</coplet-instance-data>
- <coplet-instance-data id="GalleryViewer-1">
+ <coplet-instance-data id="GalleryViewer_1">
<coplet-data>GalleryViewer</coplet-data>
</coplet-instance-data>
- <coplet-instance-data id="Portlet-1">
- <coplet-data>testsuite.TestPortlet1</coplet-data>
+ <coplet-instance-data id="Portlet_1">
+ <coplet-data>testsuite_TestPortlet1</coplet-data>
</coplet-instance-data>
<coplet-instance-data id="Portlet-2">
- <coplet-data>testsuite.TestPortlet2</coplet-data>
+ <coplet-data>testsuite_TestPortlet2</coplet-data>
</coplet-instance-data>
- <coplet-instance-data id="TestPortlet-1">
+ <coplet-instance-data id="TestPortlet_1">
<coplet-data>TestPortlet1</coplet-data>
</coplet-instance-data>
<coplet-instance-data id="CocoonPortlet">
<coplet-data>CocoonPortlet</coplet-data>
</coplet-instance-data>
- <coplet-instance-data id="Petstore-1">
- <coplet-data>jpetstore.JPetstorePortlet</coplet-data>
+ <coplet-instance-data id="Petstore_1">
+ <coplet-data>jpetstore_JPetstorePortlet</coplet-data>
</coplet-instance-data>
- <coplet-instance-data id="app-test-1">
- <coplet-data>app-test-one</coplet-data>
+ <coplet-instance-data id="app_test_1">
+ <coplet-data>app_test_one</coplet-data>
</coplet-instance-data>
- <coplet-instance-data id="app-test-2">
- <coplet-data>app-test-one</coplet-data>
+ <coplet-instance-data id="app_test-2">
+ <coplet-data>app_test_one</coplet-data>
</coplet-instance-data>
- <coplet-instance-data id="app-test-3">
- <coplet-data>app-test-two</coplet-data>
+ <coplet-instance-data id="app_test_3">
+ <coplet-data>app_test_two</coplet-data>
</coplet-instance-data>
- <coplet-instance-data id="app-test-4">
- <coplet-data>app-test-two</coplet-data>
+ <coplet-instance-data id="app_test_4">
+ <coplet-data>app_test_two</coplet-data>
</coplet-instance-data>
- <coplet-instance-data id="Google-1">
+ <coplet-instance-data id="Google_1">
<coplet-data>Google</coplet-data>
</coplet-instance-data>
<!-- wsrp example -->
- <coplet-instance-data id="WSRP-Calc-1">
- <coplet-data>wsrp-calc-portlet</coplet-data>
+ <coplet-instance-data id="WSRP_Calc_1">
+ <coplet-data>wsrp_calc_portlet</coplet-data>
</coplet-instance-data>
- <coplet-instance-data id="WSRP-Test-1">
- <coplet-data>wsrp-test-portlet</coplet-data>
+ <coplet-instance-data id="WSRP_Test_1">
+ <coplet-data>wsrp_test_portlet</coplet-data>
</coplet-instance-data>
</coplets>
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/copletinstancedata/portal-user-test.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/copletinstancedata/portal-user-test.xml?rev=424720&r1=424719&r2=424720&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/copletinstancedata/portal-user-test.xml (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/copletinstancedata/portal-user-test.xml Sun Jul 23 04:37:47 2006
@@ -17,70 +17,70 @@
<!-- SVN $Id$ -->
<coplets xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<!-- This portlet is on every page. -->
- <coplet-instance-data id="static-sample-1">
- <coplet-data>static-sample</coplet-data>
+ <coplet-instance-data id="static_sample_1">
+ <coplet-data>static_sample</coplet-data>
</coplet-instance-data>
- <coplet-instance-data id="Portal-Intro-1">
- <coplet-data>Portal-Intro</coplet-data>
+ <coplet-instance-data id="PortalIntro_1">
+ <coplet-data>PortalIntro</coplet-data>
</coplet-instance-data>
- <coplet-instance-data id="Portal-Right-1">
- <coplet-data>Portal-Right</coplet-data>
+ <coplet-instance-data id="PortalRight_1">
+ <coplet-data>PortalRight</coplet-data>
</coplet-instance-data>
- <coplet-instance-data id="Portal-Left-1">
- <coplet-data>Portal-Left</coplet-data>
+ <coplet-instance-data id="PortalLeft_1">
+ <coplet-data>PortalLeft</coplet-data>
</coplet-instance-data>
- <coplet-instance-data id="Portal-Bottom-1">
- <coplet-data>Portal-Bottom</coplet-data>
+ <coplet-instance-data id="PortalBottom_1">
+ <coplet-data>PortalBottom</coplet-data>
</coplet-instance-data>
- <coplet-instance-data id="Portal-Demo-1">
- <coplet-data>Portal-Demo</coplet-data>
+ <coplet-instance-data id="PortalDemo_1">
+ <coplet-data>PortalDemo</coplet-data>
</coplet-instance-data>
- <coplet-instance-data id="Gallery-Petstore">
+ <coplet-instance-data id="Gallery_Petstore">
<coplet-data>Gallery</coplet-data>
</coplet-instance-data>
- <coplet-instance-data id="GalleryViewer-1">
+ <coplet-instance-data id="GalleryViewer_1">
<coplet-data>GalleryViewer</coplet-data>
</coplet-instance-data>
- <coplet-instance-data id="Portlet-1">
+ <coplet-instance-data id="Portlet_1">
<coplet-data>Portlet1</coplet-data>
</coplet-instance-data>
- <coplet-instance-data id="Portlet-2">
+ <coplet-instance-data id="Portlet_2">
<coplet-data>Portlet2</coplet-data>
</coplet-instance-data>
- <coplet-instance-data id="TestPortlet-1">
+ <coplet-instance-data id="TestPortlet_1">
<coplet-data>TestPortlet1</coplet-data>
</coplet-instance-data>
<coplet-instance-data id="CocoonPortlet">
<coplet-data>CocoonPortlet</coplet-data>
</coplet-instance-data>
- <coplet-instance-data id="app-test-1">
- <coplet-data>app-test-one</coplet-data>
+ <coplet-instance-data id="app_test_1">
+ <coplet-data>app_test_one</coplet-data>
</coplet-instance-data>
- <coplet-instance-data id="app-test-2">
- <coplet-data>app-test-one</coplet-data>
+ <coplet-instance-data id="app_test_2">
+ <coplet-data>app_test_one</coplet-data>
</coplet-instance-data>
- <coplet-instance-data id="app-test-3">
- <coplet-data>app-test-two</coplet-data>
+ <coplet-instance-data id="app_test_3">
+ <coplet-data>app_test_two</coplet-data>
</coplet-instance-data>
- <coplet-instance-data id="app-test-4">
- <coplet-data>app-test-two</coplet-data>
+ <coplet-instance-data id="app_test_4">
+ <coplet-data>app_test_two</coplet-data>
</coplet-instance-data>
- <coplet-instance-data id="Google-1">
+ <coplet-instance-data id="Google_1">
<coplet-data>Google</coplet-data>
</coplet-instance-data>
<!-- wsrp example -->
- <coplet-instance-data id="WSRP-Calc-1">
- <coplet-data>wsrp-calc-portlet</coplet-data>
+ <coplet-instance-data id="WSRP_Calc_1">
+ <coplet-data>wsrp_calc_portlet</coplet-data>
</coplet-instance-data>
- <coplet-instance-data id="WSRP-Test-1">
- <coplet-data>wsrp-test-portlet</coplet-data>
+ <coplet-instance-data id="WSRP_Test_1">
+ <coplet-data>wsrp_test_portlet</coplet-data>
</coplet-instance-data>
</coplets>
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/copletinstancedata/portal.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/copletinstancedata/portal.xml?rev=424720&r1=424719&r2=424720&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/copletinstancedata/portal.xml (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/copletinstancedata/portal.xml Sun Jul 23 04:37:47 2006
@@ -16,60 +16,56 @@
-->
<!-- SVN $Id$ -->
<coplets xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <coplet-instance-data id="Newsweek-1">
+ <coplet-instance-data id="Newsweek_1">
<coplet-data>Newsweek</coplet-data>
</coplet-instance-data>
- <coplet-instance-data id="NYTBusiness-1">
+ <coplet-instance-data id="NYTBusiness_1">
<coplet-data>NYTBusiness</coplet-data>
</coplet-instance-data>
- <coplet-instance-data id="BBCNews-1">
+ <coplet-instance-data id="BBCNews_1">
<coplet-data>BBCNews</coplet-data>
</coplet-instance-data>
- <coplet-instance-data id="CNET News-1">
- <coplet-data>CNET News</coplet-data>
+ <coplet-instance-data id="CNETNews_1">
+ <coplet-data>CNETNews</coplet-data>
</coplet-instance-data>
- <coplet-instance-data id="CNET Business-1">
- <coplet-data>CNET Business</coplet-data>
+ <coplet-instance-data id="CNETBusiness_1">
+ <coplet-data>CNETBusiness</coplet-data>
</coplet-instance-data>
- <coplet-instance-data id="CSTNews-1">
+ <coplet-instance-data id="CSTNews_1">
<coplet-data>CSTNews</coplet-data>
</coplet-instance-data>
- <coplet-instance-data id="CNNEurope-1">
+ <coplet-instance-data id="CNNEurope_1">
<coplet-data>CNNEurope</coplet-data>
</coplet-instance-data>
- <coplet-instance-data id="ML Weblog-1">
- <coplet-data>ML Weblog</coplet-data>
+ <coplet-instance-data id="CZWeblog_1">
+ <coplet-data>CZWeblog</coplet-data>
</coplet-instance-data>
- <coplet-instance-data id="CZ Weblog-1">
- <coplet-data>CZ Weblog</coplet-data>
- </coplet-instance-data>
-
- <coplet-instance-data id="Weblog-1">
+ <coplet-instance-data id="Weblog_1">
<coplet-data>Weblog</coplet-data>
</coplet-instance-data>
- <coplet-instance-data id="Portal-Intro-1">
- <coplet-data>Portal-Intro</coplet-data>
+ <coplet-instance-data id="PortalIntro_1">
+ <coplet-data>PortalIntro</coplet-data>
</coplet-instance-data>
- <coplet-instance-data id="Portal-Right-1">
- <coplet-data>Portal-Right</coplet-data>
+ <coplet-instance-data id="PortalRight_1">
+ <coplet-data>PortalRight</coplet-data>
</coplet-instance-data>
- <coplet-instance-data id="Portal-Left-1">
- <coplet-data>Portal-Left</coplet-data>
+ <coplet-instance-data id="PortalLeft_1">
+ <coplet-data>PortalLeft</coplet-data>
</coplet-instance-data>
- <coplet-instance-data id="Portal-Bottom-1">
- <coplet-data>Portal-Bottom</coplet-data>
+ <coplet-instance-data id="PortalBottom_1">
+ <coplet-data>PortalBottom</coplet-data>
</coplet-instance-data>
- <coplet-instance-data id="Portal-Demo-1">
- <coplet-data>Portal-Demo</coplet-data>
+ <coplet-instance-data id="PortalDemo_1">
+ <coplet-data>PortalDemo</coplet-data>
</coplet-instance-data>
<!-- This is the basket sample
@@ -82,35 +78,35 @@
</attribute>
</coplet-instance-data>
- <coplet-instance-data id="basket-document">
+ <coplet-instance-data id="basket_document">
<coplet-data>Basket</coplet-data>
<attribute>
<name>type</name>
<value xsi:type="java:java.lang.String">document</value>
</attribute>
</coplet-instance-data>
- <coplet-instance-data id="basket-request">
+ <coplet-instance-data id="basket_request">
<coplet-data>Basket</coplet-data>
<attribute>
<name>type</name>
<value xsi:type="java:java.lang.String">request</value>
</attribute>
</coplet-instance-data>
- <coplet-instance-data id="basket-result">
+ <coplet-instance-data id="basket_result">
<coplet-data>Basket</coplet-data>
<attribute>
<name>type</name>
<value xsi:type="java:java.lang.String">result</value>
</attribute>
</coplet-instance-data>
- <coplet-instance-data id="basket-notepad">
+ <coplet-instance-data id="basket_notepad">
<coplet-data>Basket</coplet-data>
<attribute>
<name>type</name>
<value xsi:type="java:java.lang.String">notepad</value>
</attribute>
</coplet-instance-data>
- <coplet-instance-data id="basket-folder">
+ <coplet-instance-data id="basket_folder">
<coplet-data>Basket</coplet-data>
<attribute>
<name>type</name>
@@ -118,37 +114,37 @@
</attribute>
</coplet-instance-data>
- <coplet-instance-data id="Basket.admin">
- <coplet-data>Basket.admin</coplet-data>
+ <coplet-instance-data id="Basket_admin">
+ <coplet-data>Basket_admin</coplet-data>
</coplet-instance-data>
- <coplet-instance-data id="basket-content">
+ <coplet-instance-data id="basket_content">
<coplet-data>BasketContent</coplet-data>
</coplet-instance-data>
<coplet-instance-data id="BasketAdmin">
<coplet-data>BasketAdmin</coplet-data>
</coplet-instance-data>
- <coplet-instance-data id="basket-sample-1">
+ <coplet-instance-data id="basket_sample_1">
<coplet-data>BasketSampleStaticCoplet</coplet-data>
</coplet-instance-data>
- <coplet-instance-data id="basket-sample-2">
+ <coplet-instance-data id="basket_sample_2">
<coplet-data>BasketSampleCopletWithAttribute</coplet-data>
</coplet-instance-data>
- <coplet-instance-data id="basket-sample-3">
+ <coplet-instance-data id="basket_sample_3">
<coplet-data>BasketSampleCopletWithInlineProcess</coplet-data>
</coplet-instance-data>
- <coplet-instance-data id="basket-sample-4">
+ <coplet-instance-data id="basket_sample_4">
<coplet-data>BasketSampleCopletWithInputProcess</coplet-data>
</coplet-instance-data>
- <coplet-instance-data id="basket-sample-5">
+ <coplet-instance-data id="basket_sample_5">
<coplet-data>BasketSampleCopletWithApp</coplet-data>
</coplet-instance-data>
- <coplet-instance-data id="basket-sample-6">
+ <coplet-instance-data id="basket_sample_6">
<coplet-data>BasketSampleCopletWithUpload</coplet-data>
</coplet-instance-data>
- <coplet-instance-data id="basket-sample-7">
+ <coplet-instance-data id="basket_sample_7">
<coplet-data>BasketSampleCopletWithInputProcessShow</coplet-data>
</coplet-instance-data>
- <coplet-instance-data id="basket-sample-8">
+ <coplet-instance-data id="basket_sample_8">
<coplet-data>BasketSampleCopletList</coplet-data>
</coplet-instance-data>
</coplets>
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/layout/portal-user-anonymous.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/layout/portal-user-anonymous.xml?rev=424720&r1=424719&r2=424720&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/layout/portal-user-anonymous.xml (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/layout/portal-user-anonymous.xml Sun Jul 23 04:37:47 2006
@@ -21,13 +21,13 @@
<item>
<parameter name="width" value="60%"/>
<coplet-layout name="coplet" layout-renderer-name="borderless-window">
- <coplet-instance-data>Portal-Intro-1</coplet-instance-data>
+ <coplet-instance-data>PortalIntro_1</coplet-instance-data>
</coplet-layout>
</item>
<item>
<parameter name="width" value="40%"/>
<coplet-layout name="coplet" layout-renderer-name="nowindow">
- <coplet-instance-data>Login-1</coplet-instance-data>
+ <coplet-instance-data>Login_1</coplet-instance-data>
</coplet-layout>
</item>
</composite-layout>
@@ -38,13 +38,13 @@
<item>
<parameter name="width" value="25%"/>
<coplet-layout name="coplet" layout-renderer-name="borderless-window">
- <coplet-instance-data>Portal-Left-1</coplet-instance-data>
+ <coplet-instance-data>PortalLeft_1</coplet-instance-data>
</coplet-layout>
</item>
<item>
<parameter name="width" value="75%"/>
<coplet-layout name="coplet" layout-renderer-name="borderless-window">
- <coplet-instance-data>Portal-Right-1</coplet-instance-data>
+ <coplet-instance-data>PortalRight_1</coplet-instance-data>
</coplet-layout>
</item>
</composite-layout>
@@ -52,7 +52,7 @@
<item>
<parameter name="height" value="500"/>
<coplet-layout name="coplet" layout-renderer-name="borderless-window">
- <coplet-instance-data>Portal-Bottom-1</coplet-instance-data>
+ <coplet-instance-data>PortalBottom_1</coplet-instance-data>
</coplet-layout>
</item>
</composite-layout>
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/layout/portal-user-cocoon.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/layout/portal-user-cocoon.xml?rev=424720&r1=424719&r2=424720&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/layout/portal-user-cocoon.xml (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/layout/portal-user-cocoon.xml Sun Jul 23 04:37:47 2006
@@ -19,7 +19,7 @@
<named-item name="Main">
<coplet-layout name="coplet">
- <coplet-instance-data>Portal-Demo-1</coplet-instance-data>
+ <coplet-instance-data>PortalDemo_1</coplet-instance-data>
</coplet-layout>
</named-item>
@@ -27,12 +27,12 @@
<composite-layout name="column">
<item>
<coplet-layout name="coplet">
- <coplet-instance-data>Gallery-Petstore</coplet-instance-data>
+ <coplet-instance-data>GalleryPetstore</coplet-instance-data>
</coplet-layout>
</item>
<item>
<coplet-layout name="coplet">
- <coplet-instance-data>GalleryViewer-1</coplet-instance-data>
+ <coplet-instance-data>GalleryViewer_1</coplet-instance-data>
</coplet-layout>
</item>
</composite-layout>
@@ -42,7 +42,7 @@
<composite-layout name="row">
<item>
<coplet-layout name="coplet" layout-renderer-name="portlet-window">
- <coplet-instance-data>TestPortlet-1</coplet-instance-data>
+ <coplet-instance-data>TestPortlet_1</coplet-instance-data>
</coplet-layout>
</item>
<item>
@@ -54,12 +54,12 @@
<composite-layout name="column">
<item>
<coplet-layout name="coplet" layout-renderer-name="portlet-window">
- <coplet-instance-data>Portlet-1</coplet-instance-data>
+ <coplet-instance-data>Portlet_1</coplet-instance-data>
</coplet-layout>
</item>
<item>
<coplet-layout name="coplet" layout-renderer-name="portlet-window">
- <coplet-instance-data>Portlet-2</coplet-instance-data>
+ <coplet-instance-data>Portlet_2</coplet-instance-data>
</coplet-layout>
</item>
</composite-layout>
@@ -69,7 +69,7 @@
<named-item name="Portals Bridges">
<coplet-layout name="coplet" layout-renderer-name="portlet-window">
- <coplet-instance-data>Petstore-1</coplet-instance-data>
+ <coplet-instance-data>Petstore_1</coplet-instance-data>
</coplet-layout>
</named-item>
@@ -77,12 +77,12 @@
<composite-layout name="column">
<item>
<coplet-layout name="coplet" layout-renderer-name="wsrp-window">
- <coplet-instance-data>WSRP-Calc-1</coplet-instance-data>
+ <coplet-instance-data>WSRP_Calc_1</coplet-instance-data>
</coplet-layout>
</item>
<item>
<coplet-layout name="coplet" layout-renderer-name="wsrp-window">
- <coplet-instance-data>WSRP-Test-1</coplet-instance-data>
+ <coplet-instance-data>WSRP_Test_1</coplet-instance-data>
</coplet-layout>
</item>
</composite-layout>
@@ -95,13 +95,13 @@
<item>
<parameter name="width" value="50%" />
<coplet-layout name="coplet" >
- <coplet-instance-data>app-test-1</coplet-instance-data>
+ <coplet-instance-data>app_test_1</coplet-instance-data>
</coplet-layout>
</item>
<item>
<parameter name="width" value="50%" />
<coplet-layout name="coplet" >
- <coplet-instance-data>app-test-2</coplet-instance-data>
+ <coplet-instance-data>app_test_2</coplet-instance-data>
</coplet-layout>
</item>
</composite-layout>
@@ -111,13 +111,13 @@
<item>
<parameter name="width" value="50%" />
<coplet-layout name="coplet" >
- <coplet-instance-data>app-test-3</coplet-instance-data>
+ <coplet-instance-data>app_test_3</coplet-instance-data>
</coplet-layout>
</item>
<item>
<parameter name="width" value="50%" />
<coplet-layout name="coplet" >
- <coplet-instance-data>app-test-4</coplet-instance-data>
+ <coplet-instance-data>app_test_4</coplet-instance-data>
</coplet-layout>
</item>
</composite-layout>
@@ -127,7 +127,7 @@
<named-item name="AppCoplet">
<coplet-layout name="coplet">
- <coplet-instance-data>Google-1</coplet-instance-data>
+ <coplet-instance-data>Google_1</coplet-instance-data>
</coplet-layout>
</named-item>
</composite-layout>
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/layout/portal-user-test.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/layout/portal-user-test.xml?rev=424720&r1=424719&r2=424720&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/layout/portal-user-test.xml (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/layout/portal-user-test.xml Sun Jul 23 04:37:47 2006
@@ -21,19 +21,19 @@
<composite-layout name="column" static="true">
<item>
<coplet-layout name="coplet" static="true">
- <coplet-instance-data>static-sample-1</coplet-instance-data>
+ <coplet-instance-data>static_sample_1</coplet-instance-data>
</coplet-layout>
</item>
<item>
<composite-layout name="row">
<item>
<coplet-layout name="coplet">
- <coplet-instance-data>Gallery-Petstore</coplet-instance-data>
+ <coplet-instance-data>GalleryPetstore</coplet-instance-data>
</coplet-layout>
</item>
<item>
<coplet-layout name="coplet">
- <coplet-instance-data>GalleryViewer-1</coplet-instance-data>
+ <coplet-instance-data>GalleryViewer_1</coplet-instance-data>
</coplet-layout>
</item>
</composite-layout>
@@ -42,7 +42,7 @@
<composite-layout name="row">
<item>
<coplet-layout name="coplet" layout-renderer-name="portlet-window">
- <coplet-instance-data>TestPortlet-1</coplet-instance-data>
+ <coplet-instance-data>TestPortlet_1</coplet-instance-data>
</coplet-layout>
</item>
<item>
@@ -59,17 +59,17 @@
<composite-layout name="column" static="true">
<item>
<coplet-layout name="coplet" static="true">
- <coplet-instance-data>static-sample-1</coplet-instance-data>
+ <coplet-instance-data>static_sample_1</coplet-instance-data>
</coplet-layout>
</item>
<item>
<coplet-layout name="coplet" >
- <coplet-instance-data>app-test-1</coplet-instance-data>
+ <coplet-instance-data>app_test_1</coplet-instance-data>
</coplet-layout>
</item>
<item>
<coplet-layout name="coplet" >
- <coplet-instance-data>app-test-2</coplet-instance-data>
+ <coplet-instance-data>app_test_2</coplet-instance-data>
</coplet-layout>
</item>
</composite-layout>
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/layout/portal.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/layout/portal.xml?rev=424720&r1=424719&r2=424720&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/layout/portal.xml (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/layout/portal.xml Sun Jul 23 04:37:47 2006
@@ -19,7 +19,7 @@
<named-item name="Main">
<coplet-layout name="coplet">
- <coplet-instance-data>Portal-Demo-1</coplet-instance-data>
+ <coplet-instance-data>PortalDemo_1</coplet-instance-data>
</coplet-layout>
</named-item>
@@ -36,14 +36,14 @@
<coplet-layout name="coplet">
<parameter name="border" value="0" />
<parameter name="border-color" value="#AA0000" />
- <coplet-instance-data>Newsweek-1</coplet-instance-data>
+ <coplet-instance-data>Newsweek_1</coplet-instance-data>
</coplet-layout>
</item>
<item>
<coplet-layout name="coplet">
<parameter name="border" value="0"/>
<parameter name="border-color" value="#AA0000" />
- <coplet-instance-data>NYTBusiness-1</coplet-instance-data>
+ <coplet-instance-data>NYTBusiness_1</coplet-instance-data>
</coplet-layout>
</item>
</composite-layout>
@@ -57,7 +57,7 @@
<coplet-layout name="coplet">
<parameter name="border" value="0" />
<parameter name="border-color" value="#AA0000" />
- <coplet-instance-data>BBCNews-1</coplet-instance-data>
+ <coplet-instance-data>BBCNews_1</coplet-instance-data>
</coplet-layout>
</item>
<item>
@@ -71,7 +71,7 @@
<coplet-layout name="coplet">
<parameter name="border" value="0" />
<parameter name="border-color" value="#AA0000" />
- <coplet-instance-data>CNET News-1</coplet-instance-data>
+ <coplet-instance-data>CNETNews_1</coplet-instance-data>
</coplet-layout>
</item>
</composite-layout>
@@ -88,14 +88,14 @@
<coplet-layout name="coplet">
<parameter name="border" value="0" />
<parameter name="border-color" value="#AA0000" />
- <coplet-instance-data>CSTNews-1</coplet-instance-data>
+ <coplet-instance-data>CSTNews_1</coplet-instance-data>
</coplet-layout>
</item>
<item>
<coplet-layout name="coplet">
<parameter name="border" value="0" />
<parameter name="border-color" value="#AA0000" />
- <coplet-instance-data>CNNEurope-1</coplet-instance-data>
+ <coplet-instance-data>CNNEurope_1</coplet-instance-data>
</coplet-layout>
</item>
</composite-layout>
@@ -110,13 +110,7 @@
<item>
<parameter name="width" value="20%" />
<coplet-layout name="coplet">
- <coplet-instance-data>CZ Weblog-1</coplet-instance-data>
- </coplet-layout>
- </item>
- <item>
- <parameter name="width" value="80%" />
- <coplet-layout name="coplet">
- <coplet-instance-data>ML Weblog-1</coplet-instance-data>
+ <coplet-instance-data>CZWeblog_1</coplet-instance-data>
</coplet-layout>
</item>
</composite-layout>
@@ -125,7 +119,7 @@
<composite-layout name="row">
<item>
<coplet-layout name="coplet">
- <coplet-instance-data>Weblog-1</coplet-instance-data>
+ <coplet-instance-data>Weblog_1</coplet-instance-data>
</coplet-layout>
</item>
</composite-layout>
@@ -137,17 +131,12 @@
<composite-layout name="tab">
<named-item name="One">
<coplet-layout name="coplet">
- <coplet-instance-data>CZ Weblog-1</coplet-instance-data>
+ <coplet-instance-data>CZWeblog_1</coplet-instance-data>
</coplet-layout>
</named-item>
<named-item name="Two">
<coplet-layout name="coplet">
- <coplet-instance-data>ML Weblog-1</coplet-instance-data>
- </coplet-layout>
- </named-item>
- <named-item name="Three">
- <coplet-layout name="coplet">
- <coplet-instance-data>Weblog-1</coplet-instance-data>
+ <coplet-instance-data>Weblog_1</coplet-instance-data>
</coplet-layout>
</named-item>
</composite-layout>
@@ -157,17 +146,12 @@
<composite-layout name="linktab">
<named-item name="One">
<coplet-layout name="coplet">
- <coplet-instance-data>CZ Weblog-1</coplet-instance-data>
+ <coplet-instance-data>CZWeblog_1</coplet-instance-data>
</coplet-layout>
</named-item>
<named-item name="Two">
<coplet-layout name="coplet">
- <coplet-instance-data>ML Weblog-1</coplet-instance-data>
- </coplet-layout>
- </named-item>
- <named-item name="Three">
- <coplet-layout name="coplet">
- <coplet-instance-data>Weblog-1</coplet-instance-data>
+ <coplet-instance-data>Weblog_1</coplet-instance-data>
</coplet-layout>
</named-item>
</composite-layout>
@@ -177,31 +161,26 @@
<composite-layout name="linktab">
<named-item name="One">
<coplet-layout name="coplet">
- <coplet-instance-data>CZ Weblog-1</coplet-instance-data>
+ <coplet-instance-data>CZWeblog_1</coplet-instance-data>
</coplet-layout>
</named-item>
<named-item name="Two">
- <coplet-layout name="coplet">
- <coplet-instance-data>ML Weblog-1</coplet-instance-data>
- </coplet-layout>
- </named-item>
- <named-item name="Three">
<composite-layout name="tab">
<named-item name="Weblog">
<coplet-layout name="coplet">
- <coplet-instance-data>Weblog-1</coplet-instance-data>
+ <coplet-instance-data>Weblog_1</coplet-instance-data>
</coplet-layout>
</named-item>
<named-item name="Gallery">
<composite-layout name="column">
<item>
<coplet-layout name="coplet">
- <coplet-instance-data>Gallery-Petstore</coplet-instance-data>
+ <coplet-instance-data>GalleryPetstore</coplet-instance-data>
</coplet-layout>
</item>
<item>
<coplet-layout name="coplet">
- <coplet-instance-data>GalleryViewer-1</coplet-instance-data>
+ <coplet-instance-data>GalleryViewer_1</coplet-instance-data>
</coplet-layout>
</item>
</composite-layout>
@@ -222,7 +201,7 @@
<composite-layout name="column">
<item>
<coplet-layout name="coplet">
- <coplet-instance-data>basket-sample-8</coplet-instance-data>
+ <coplet-instance-data>basket_sample_8</coplet-instance-data>
</coplet-layout>
</item>
</composite-layout>
@@ -235,12 +214,12 @@
<composite-layout name="column">
<item>
<coplet-layout name="coplet">
- <coplet-instance-data>basket-sample-1</coplet-instance-data>
+ <coplet-instance-data>basket_sample_1</coplet-instance-data>
</coplet-layout>
</item>
<item>
<coplet-layout name="coplet" >
- <coplet-instance-data>basket-sample-2</coplet-instance-data>
+ <coplet-instance-data>basket_sample_2</coplet-instance-data>
</coplet-layout>
</item>
</composite-layout>
@@ -249,12 +228,12 @@
<composite-layout name="column">
<item>
<coplet-layout name="coplet">
- <coplet-instance-data>basket-sample-3</coplet-instance-data>
+ <coplet-instance-data>basket_sample_3</coplet-instance-data>
</coplet-layout>
</item>
<item>
<coplet-layout name="coplet" >
- <coplet-instance-data>basket-sample-4</coplet-instance-data>
+ <coplet-instance-data>basket_sample_4</coplet-instance-data>
</coplet-layout>
</item>
</composite-layout>
@@ -263,12 +242,12 @@
<composite-layout name="column">
<item>
<coplet-layout name="coplet">
- <coplet-instance-data>basket-sample-5</coplet-instance-data>
+ <coplet-instance-data>basket_sample_5</coplet-instance-data>
</coplet-layout>
</item>
<item>
<coplet-layout name="coplet">
- <coplet-instance-data>basket-sample-6</coplet-instance-data>
+ <coplet-instance-data>basket_sample_6</coplet-instance-data>
</coplet-layout>
</item>
</composite-layout>
@@ -286,27 +265,27 @@
</named-item>
<named-item name="Document">
<coplet-layout name="coplet">
- <coplet-instance-data>basket-document</coplet-instance-data>
+ <coplet-instance-data>basket_document</coplet-instance-data>
</coplet-layout>
</named-item>
<named-item name="Request">
<coplet-layout name="coplet">
- <coplet-instance-data>basket-request</coplet-instance-data>
+ <coplet-instance-data>basket_request</coplet-instance-data>
</coplet-layout>
</named-item>
<named-item name="Result">
<coplet-layout name="coplet">
- <coplet-instance-data>basket-result</coplet-instance-data>
+ <coplet-instance-data>basket_result</coplet-instance-data>
</coplet-layout>
</named-item>
<named-item name="Notepad">
<coplet-layout name="coplet">
- <coplet-instance-data>basket-notepad</coplet-instance-data>
+ <coplet-instance-data>basket_notepad</coplet-instance-data>
</coplet-layout>
</named-item>
<named-item name="Folder">
<coplet-layout name="coplet">
- <coplet-instance-data>basket-folder</coplet-instance-data>
+ <coplet-instance-data>basket_folder</coplet-instance-data>
</coplet-layout>
</named-item>
</composite-layout>
@@ -315,12 +294,12 @@
<composite-layout name="column">
<item>
<coplet-layout name="coplet" id="basket-content">
- <coplet-instance-data>basket-content</coplet-instance-data>
+ <coplet-instance-data>basketcontent</coplet-instance-data>
</coplet-layout>
</item>
<item>
<coplet-layout name="coplet">
- <coplet-instance-data>basket-sample-7</coplet-instance-data>
+ <coplet-instance-data>basket_sample_7</coplet-instance-data>
</coplet-layout>
</item>
</composite-layout>
@@ -336,12 +315,12 @@
</item>
<item>
<coplet-layout name="coplet">
- <coplet-instance-data>Basket.admin</coplet-instance-data>
+ <coplet-instance-data>Basket_admin</coplet-instance-data>
</coplet-layout>
</item>
<item>
<coplet-layout name="coplet" id="basket-content-admin">
- <coplet-instance-data>basket-content</coplet-instance-data>
+ <coplet-instance-data>basket_content</coplet-instance-data>
</coplet-layout>
</item>
</composite-layout>