cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bdelacre...@apache.org
Subject svn commit: r417570 - in /cocoon/whiteboard/example-apps/bricks-archetype: ./ src/main/webapp/ src/main/webapp/WEB-INF/spring/ src/main/webapp/admin/ src/main/webapp/admin/document-editor/ src/main/webapp/admin/document-editor/flow/ src/main/webapp/adm...
Date Tue, 27 Jun 2006 19:44:31 GMT
Author: bdelacretaz
Date: Tue Jun 27 12:44:29 2006
New Revision: 417570

URL: http://svn.apache.org/viewvc?rev=417570&view=rev
Log:
this thing is not called 'cms' anymore

Removed:
    cocoon/whiteboard/example-apps/bricks-archetype/src/main/webapp/common/component-manager.js
Modified:
    cocoon/whiteboard/example-apps/bricks-archetype/STATUS.txt
    cocoon/whiteboard/example-apps/bricks-archetype/src/main/webapp/WEB-INF/spring/test-components.xml
    cocoon/whiteboard/example-apps/bricks-archetype/src/main/webapp/admin/document-editor/document-editor-homepage.xml
    cocoon/whiteboard/example-apps/bricks-archetype/src/main/webapp/admin/document-editor/flow/document-editor.js
    cocoon/whiteboard/example-apps/bricks-archetype/src/main/webapp/admin/document-editor/flow/search.js
    cocoon/whiteboard/example-apps/bricks-archetype/src/main/webapp/admin/document-editor/sitemap.xmap
    cocoon/whiteboard/example-apps/bricks-archetype/src/main/webapp/admin/sitemap.xmap
    cocoon/whiteboard/example-apps/bricks-archetype/src/main/webapp/admin/static-content/pages/admin-homepage.xml
    cocoon/whiteboard/example-apps/bricks-archetype/src/main/webapp/admin/static-content/resources/css/bricks-cms.css
    cocoon/whiteboard/example-apps/bricks-archetype/src/main/webapp/admin/xslt/page-to-html.xsl
    cocoon/whiteboard/example-apps/bricks-archetype/src/main/webapp/i18n-messages/bricks-messages.xml
    cocoon/whiteboard/example-apps/bricks-archetype/src/main/webapp/sitemap.xmap
    cocoon/whiteboard/example-apps/bricks-archetype/src/main/webapp/test/sitemap.xmap
    cocoon/whiteboard/example-apps/bricks-archetype/src/main/webapp/test/test-homepage.xml
    cocoon/whiteboard/example-apps/bricks-archetype/src/main/webapp/test/user-message.jx.xml

Modified: cocoon/whiteboard/example-apps/bricks-archetype/STATUS.txt
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/example-apps/bricks-archetype/STATUS.txt?rev=417570&r1=417569&r2=417570&view=diff
==============================================================================
--- cocoon/whiteboard/example-apps/bricks-archetype/STATUS.txt (original)
+++ cocoon/whiteboard/example-apps/bricks-archetype/STATUS.txt Tue Jun 27 12:44:29 2006
@@ -1,33 +1,5 @@
 The application starts, webpages that do not need to access
 java components work.
 
-The next step is to get the http://localhost:8888/test/flowscript-test/ping
-to work, by adding a bean definition like this one in ./src/main/webapp/WEB-INF/spring/applicationContext.xml:
-
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright 2006 The Apache Software Foundation
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
-	<bean id="pingBean" class="org.apache.cocoon.apps.bricks.util.ComponentManagerPing" singleton="true"/>
-</beans>
-
-But if I do this I get the following error at startup:
-
-254 [main] INFO / - org.springframework.beans.factory.BeanDefinitionStoreException: Unexpected
exception parsing XML document from resource loaded from byte array; nested exception is org.springframework.beans.factory.BeanDefinitionStoreException:
Line 18 in XML document from URL [file:/Users/bert/workspace/apache/cocoon/whiteboard/example-apps/bricks-archetype/target/cocoon-webapp/WEB-INF/spring/applicationContext.xml]
is invalid; nested exception is org.xml.sax.SAXParseException: cvc-elt.1: Cannot find the
declaration of element 'beans'.
-Caused by: org.springframework.beans.factory.BeanDefinitionStoreException: Line 18 in XML
document from URL [file:/Users/bert/workspace/apache/cocoon/whiteboard/example-apps/bricks-archetype/target/cocoon-webapp/WEB-INF/spring/applicationContext.xml]
is invalid; nested exception is org.xml.sax.SAXParseException: cvc-elt.1: Cannot find the
declaration of element 'beans'.
-
-Although the above XML file is valid against the DTD.
+http://localhost:8888/test/flowscript-test/ping works, 
+demonstrates access to Spring-managed components from flowscript.
\ No newline at end of file

Modified: cocoon/whiteboard/example-apps/bricks-archetype/src/main/webapp/WEB-INF/spring/test-components.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/example-apps/bricks-archetype/src/main/webapp/WEB-INF/spring/test-components.xml?rev=417570&r1=417569&r2=417570&view=diff
==============================================================================
--- cocoon/whiteboard/example-apps/bricks-archetype/src/main/webapp/WEB-INF/spring/test-components.xml
(original)
+++ cocoon/whiteboard/example-apps/bricks-archetype/src/main/webapp/WEB-INF/spring/test-components.xml
Tue Jun 27 12:44:29 2006
@@ -1,5 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+
+<!--
+  Copyright 2006 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<!-- 
+  Java components used for tests
+ -->
 <beans>
 <bean id="pingBean"
   class="org.apache.cocoon.apps.bricks.util.ComponentManagerPing"

Modified: cocoon/whiteboard/example-apps/bricks-archetype/src/main/webapp/admin/document-editor/document-editor-homepage.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/example-apps/bricks-archetype/src/main/webapp/admin/document-editor/document-editor-homepage.xml?rev=417570&r1=417569&r2=417570&view=diff
==============================================================================
--- cocoon/whiteboard/example-apps/bricks-archetype/src/main/webapp/admin/document-editor/document-editor-homepage.xml
(original)
+++ cocoon/whiteboard/example-apps/bricks-archetype/src/main/webapp/admin/document-editor/document-editor-homepage.xml
Tue Jun 27 12:44:29 2006
@@ -23,7 +23,7 @@
 
 <page>
   <metadata>
-    <title>bricks-cms document-editor homepage</title>
+    <title>bricks document-editor homepage</title>
   </metadata>
 
   <content>

Modified: cocoon/whiteboard/example-apps/bricks-archetype/src/main/webapp/admin/document-editor/flow/document-editor.js
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/example-apps/bricks-archetype/src/main/webapp/admin/document-editor/flow/document-editor.js?rev=417570&r1=417569&r2=417570&view=diff
==============================================================================
--- cocoon/whiteboard/example-apps/bricks-archetype/src/main/webapp/admin/document-editor/flow/document-editor.js
(original)
+++ cocoon/whiteboard/example-apps/bricks-archetype/src/main/webapp/admin/document-editor/flow/document-editor.js
Tue Jun 27 12:44:29 2006
@@ -16,7 +16,6 @@
 
 // document editor flowscript
 
-cocoon.load("context://bricks-cms/common/component-manager.js");
 cocoon.load("resource://org/apache/cocoon/forms/flow/javascript/Form.js");
 cocoon.load("context://bricks-cms/admin/document-editor/flow/example-text.js");
 

Modified: cocoon/whiteboard/example-apps/bricks-archetype/src/main/webapp/admin/document-editor/flow/search.js
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/example-apps/bricks-archetype/src/main/webapp/admin/document-editor/flow/search.js?rev=417570&r1=417569&r2=417570&view=diff
==============================================================================
--- cocoon/whiteboard/example-apps/bricks-archetype/src/main/webapp/admin/document-editor/flow/search.js
(original)
+++ cocoon/whiteboard/example-apps/bricks-archetype/src/main/webapp/admin/document-editor/flow/search.js
Tue Jun 27 12:44:29 2006
@@ -16,8 +16,6 @@
 
 // document search flowscript
 
-cocoon.load("context://bricks-cms/common/component-manager.js");
-
 // search documents
 function searchDocuments() {
     var displayURI = cocoon.parameters.displayURI;

Modified: cocoon/whiteboard/example-apps/bricks-archetype/src/main/webapp/admin/document-editor/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/example-apps/bricks-archetype/src/main/webapp/admin/document-editor/sitemap.xmap?rev=417570&r1=417569&r2=417570&view=diff
==============================================================================
--- cocoon/whiteboard/example-apps/bricks-archetype/src/main/webapp/admin/document-editor/sitemap.xmap
(original)
+++ cocoon/whiteboard/example-apps/bricks-archetype/src/main/webapp/admin/document-editor/sitemap.xmap
Tue Jun 27 12:44:29 2006
@@ -17,7 +17,7 @@
 -->
 
 <!--
-  document-editor sitemap for the bricks-cms project
+  document-editor sitemap for the bricks project
 
   $Id$
 -->

Modified: cocoon/whiteboard/example-apps/bricks-archetype/src/main/webapp/admin/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/example-apps/bricks-archetype/src/main/webapp/admin/sitemap.xmap?rev=417570&r1=417569&r2=417570&view=diff
==============================================================================
--- cocoon/whiteboard/example-apps/bricks-archetype/src/main/webapp/admin/sitemap.xmap (original)
+++ cocoon/whiteboard/example-apps/bricks-archetype/src/main/webapp/admin/sitemap.xmap Tue
Jun 27 12:44:29 2006
@@ -17,7 +17,7 @@
 -->
 
 <!--
-  admin sitemap for the bricks-cms project
+  admin sitemap for the bricks project
 
   $Id$
 -->

Modified: cocoon/whiteboard/example-apps/bricks-archetype/src/main/webapp/admin/static-content/pages/admin-homepage.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/example-apps/bricks-archetype/src/main/webapp/admin/static-content/pages/admin-homepage.xml?rev=417570&r1=417569&r2=417570&view=diff
==============================================================================
--- cocoon/whiteboard/example-apps/bricks-archetype/src/main/webapp/admin/static-content/pages/admin-homepage.xml
(original)
+++ cocoon/whiteboard/example-apps/bricks-archetype/src/main/webapp/admin/static-content/pages/admin-homepage.xml
Tue Jun 27 12:44:29 2006
@@ -17,7 +17,7 @@
 -->
 
 <!--
-  homepage of the bricks-cms admin
+  homepage of the bricks admin
   $Id$
 -->       
 <page>

Modified: cocoon/whiteboard/example-apps/bricks-archetype/src/main/webapp/admin/static-content/resources/css/bricks-cms.css
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/example-apps/bricks-archetype/src/main/webapp/admin/static-content/resources/css/bricks-cms.css?rev=417570&r1=417569&r2=417570&view=diff
==============================================================================
--- cocoon/whiteboard/example-apps/bricks-archetype/src/main/webapp/admin/static-content/resources/css/bricks-cms.css
(original)
+++ cocoon/whiteboard/example-apps/bricks-archetype/src/main/webapp/admin/static-content/resources/css/bricks-cms.css
Tue Jun 27 12:44:29 2006
@@ -14,7 +14,7 @@
   limitations under the License.
 */
 
-/** CSS stylesheet for the bricks-cms example application */
+/** CSS stylesheet for the bricks example application */
 
 body {
     font-family: Georgia, Verdana, Sans-Serif;

Modified: cocoon/whiteboard/example-apps/bricks-archetype/src/main/webapp/admin/xslt/page-to-html.xsl
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/example-apps/bricks-archetype/src/main/webapp/admin/xslt/page-to-html.xsl?rev=417570&r1=417569&r2=417570&view=diff
==============================================================================
--- cocoon/whiteboard/example-apps/bricks-archetype/src/main/webapp/admin/xslt/page-to-html.xsl
(original)
+++ cocoon/whiteboard/example-apps/bricks-archetype/src/main/webapp/admin/xslt/page-to-html.xsl
Tue Jun 27 12:44:29 2006
@@ -29,7 +29,7 @@
                 xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
   >
 
-  <xsl:param name="footerText" select="'This is bricks-cms, an example Cocoon application'"/>
+  <xsl:param name="footerText" select="'This is bricks, an example Cocoon application'"/>
   <xsl:variable name="title" select="page/metadata/title"/>
 
   <xsl:template match="/">

Modified: cocoon/whiteboard/example-apps/bricks-archetype/src/main/webapp/i18n-messages/bricks-messages.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/example-apps/bricks-archetype/src/main/webapp/i18n-messages/bricks-messages.xml?rev=417570&r1=417569&r2=417570&view=diff
==============================================================================
--- cocoon/whiteboard/example-apps/bricks-archetype/src/main/webapp/i18n-messages/bricks-messages.xml
(original)
+++ cocoon/whiteboard/example-apps/bricks-archetype/src/main/webapp/i18n-messages/bricks-messages.xml
Tue Jun 27 12:44:29 2006
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <!--
-   bricks-cms messages, default language.
+   bricks messages, default language.
 -->
 <catalogue>
   <message key="i18n-transformer-test">i18n test successful!</message>

Modified: cocoon/whiteboard/example-apps/bricks-archetype/src/main/webapp/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/example-apps/bricks-archetype/src/main/webapp/sitemap.xmap?rev=417570&r1=417569&r2=417570&view=diff
==============================================================================
--- cocoon/whiteboard/example-apps/bricks-archetype/src/main/webapp/sitemap.xmap (original)
+++ cocoon/whiteboard/example-apps/bricks-archetype/src/main/webapp/sitemap.xmap Tue Jun 27
12:44:29 2006
@@ -17,7 +17,7 @@
 -->
 
 <!--
-  Main sitemap for the bricks-cms project
+  Main sitemap for the bricks project
 
   $Id: sitemap.xmap,v 1.1.1.1 2005/09/26 07:33:32 bdelacretaz Exp $
 -->

Modified: cocoon/whiteboard/example-apps/bricks-archetype/src/main/webapp/test/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/example-apps/bricks-archetype/src/main/webapp/test/sitemap.xmap?rev=417570&r1=417569&r2=417570&view=diff
==============================================================================
--- cocoon/whiteboard/example-apps/bricks-archetype/src/main/webapp/test/sitemap.xmap (original)
+++ cocoon/whiteboard/example-apps/bricks-archetype/src/main/webapp/test/sitemap.xmap Tue
Jun 27 12:44:29 2006
@@ -17,7 +17,7 @@
 -->
 
 <!--
-  admin sitemap for the bricks-cms project
+  admin sitemap for the bricks project
 
   $Id$
 -->

Modified: cocoon/whiteboard/example-apps/bricks-archetype/src/main/webapp/test/test-homepage.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/example-apps/bricks-archetype/src/main/webapp/test/test-homepage.xml?rev=417570&r1=417569&r2=417570&view=diff
==============================================================================
--- cocoon/whiteboard/example-apps/bricks-archetype/src/main/webapp/test/test-homepage.xml
(original)
+++ cocoon/whiteboard/example-apps/bricks-archetype/src/main/webapp/test/test-homepage.xml
Tue Jun 27 12:44:29 2006
@@ -20,7 +20,7 @@
   xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
 >
   <metadata>
-    <title>bricks-cms test homepage</title>
+    <title>bricks test homepage</title>
   </metadata>
 
   <content>

Modified: cocoon/whiteboard/example-apps/bricks-archetype/src/main/webapp/test/user-message.jx.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/example-apps/bricks-archetype/src/main/webapp/test/user-message.jx.xml?rev=417570&r1=417569&r2=417570&view=diff
==============================================================================
--- cocoon/whiteboard/example-apps/bricks-archetype/src/main/webapp/test/user-message.jx.xml
(original)
+++ cocoon/whiteboard/example-apps/bricks-archetype/src/main/webapp/test/user-message.jx.xml
Tue Jun 27 12:44:29 2006
@@ -22,7 +22,7 @@
   
 <page xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
   <metadata>
-    <title>bricks-cms message: #{title}</title>
+    <title>bricks message: #{title}</title>
   </metadata>
 
   <content>



Mime
View raw message