headers
cziegeler | 1 Jan 2007 17:40
Picon
Favicon

svn commit: r491595 - in /cocoon/trunk/core: cocoon-core/src/main/resources/META-INF/cocoon/avalon/ cocoon-core/src/test/java/org/apache/cocoon/generation/ cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/

Author: cziegeler
Date: Mon Jan  1 08:40:06 2007
New Revision: 491595

URL: http://svn.apache.org/viewvc?view=rev&rev=491595
Log:
Restore avalon based components

Added:

cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/generation/FileGeneratorBeanTestCase.java
  (with props)

cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/generation/PauseGeneratorBean.java
  (with props)

cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/CSVGeneratorBean.java
  (with props)

cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/FileGeneratorBean.java
  (with props)
Modified:
    cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/cocoon/avalon/cocoon-core-sitemapcomponents.xconf
    cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/generation/FileGeneratorTestCase.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/CSVGenerator.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/FileGenerator.java

Modified: cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/cocoon/avalon/cocoon-core-sitemapcomponents.xconf
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/cocoon/avalon/cocoon-core-sitemapcomponents.xconf?view=diff&rev=491595&r1=491594&r2=491595
==============================================================================
(Continue reading)

Permalink | Reply | 0 comments |
headers
cziegeler | 1 Jan 2007 17:42
Picon
Favicon

svn commit: r491596 - /cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/resources/META-INF/cocoon/spring/cocoon-core-generators.xml

Author: cziegeler
Date: Mon Jan  1 08:42:48 2007
New Revision: 491596

URL: http://svn.apache.org/viewvc?view=rev&rev=491596
Log:
Restore avalon based components

Modified:
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/resources/META-INF/cocoon/spring/cocoon-core-generators.xml

Modified: cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/resources/META-INF/cocoon/spring/cocoon-core-generators.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/resources/META-INF/cocoon/spring/cocoon-core-generators.xml?view=diff&rev=491596&r1=491595&r2=491596
==============================================================================
---
cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/resources/META-INF/cocoon/spring/cocoon-core-generators.xml (original)
+++
cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/resources/META-INF/cocoon/spring/cocoon-core-generators.xml
Mon Jan  1 08:42:48 2007
 <at>  <at>  -20,8 +20,8  <at>  <at> 

 <!--  <at> version $Id$ -->
 <beans>
-  <bean name="org.apache.cocoon.generation.Generator/file"
-        class="org.apache.cocoon.generation.FileGenerator"
+  <bean name="org.apache.cocoon.generation.Generator/filebean"
+        class="org.apache.cocoon.generation.FileGeneratorBean"
         scope="prototype">
     <property name="parser" ref="org.apache.cocoon.core.xml.SAXParser"/>
   </bean>
(Continue reading)

Permalink | Reply | 0 comments |
headers
danielf | 1 Jan 2007 18:04
Picon
Favicon

svn commit: r491598 - in /cocoon/trunk/core: cocoon-core/src/main/resources/META-INF/cocoon/avalon/ cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/reading/ cocoon-pipeline/cocoon-pipeline-components/src/main/resources/META-I...

Author: danielf
Date: Mon Jan  1 09:04:31 2007
New Revision: 491598

URL: http://svn.apache.org/viewvc?view=rev&rev=491598
Log:
* Made the ResourceReader and ImageReader Spring configurable and created Spring configurations for them.
* Kept all the Avalon support for keeping back compatibility.
* I had to some kludgy hack for the logging and moved the CLLoggerWrapper to a the util module to support this.
* It would probably neater to factor out the POJO part from the ResourceReader to a ResourceReaderBean, but
that can wait until later.

Added:

cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/resources/META-INF/cocoon/spring/cocoon-core-readers.xml
  (with props)
    cocoon/trunk/core/cocoon-util/src/main/java/org/apache/cocoon/util/avalon/
    cocoon/trunk/core/cocoon-util/src/main/java/org/apache/cocoon/util/avalon/CLLoggerWrapper.java
      - copied, changed from r491420, cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/core/container/spring/avalon/CLLoggerWrapper.java
Removed:
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/core/container/spring/avalon/CLLoggerWrapper.java
Modified:
    cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/cocoon/avalon/cocoon-core-sitemapcomponents.xconf
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/reading/ResourceReader.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonLoggerFactoryBean.java

Modified: cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/cocoon/avalon/cocoon-core-sitemapcomponents.xconf
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/cocoon/avalon/cocoon-core-sitemapcomponents.xconf?view=diff&rev=491598&r1=491597&r2=491598
==============================================================================
---
(Continue reading)

Permalink | Reply | 0 comments |
headers
danielf | 1 Jan 2007 22:41
Picon
Favicon

svn commit: r491639 - in /cocoon/trunk/core/cocoon-pipeline: cocoon-pipeline-components/src/main/java/org/apache/cocoon/serialization/ cocoon-pipeline-components/src/main/resources/META-INF/cocoon/spring/ cocoon-pipeline-impl/src/main/java/org/apache/c...

Author: danielf
Date: Mon Jan  1 13:41:02 2007
New Revision: 491639

URL: http://svn.apache.org/viewvc?view=rev&rev=491639
Log:
Refactoring of AbstractTextSerializer to make the extending serializers HTMLSerializer,
TextSerializer and XMLSerializer POJOs. The Avalon functionality is kept for backward compatibility.
There is also a (deactivated) Spring configuration file that not is complete yet as we still have to find a
way for handling the mime settings for sitemap components.
I have only been able to do limited testing of the new functionality as the mime type handling not work yet
while configuring the serializers as Spring beans. But they at least seem to be set up correctly.

Added:
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/resources/META-INF/cocoon/spring/cocoon-core-serializers.notyet
Modified:
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/serialization/HTMLSerializer.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/serialization/TextSerializer.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/serialization/XMLSerializer.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/serialization/AbstractTextSerializer.java

Modified: cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/serialization/HTMLSerializer.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/serialization/HTMLSerializer.java?view=diff&rev=491639&r1=491638&r2=491639
==============================================================================
---
cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/serialization/HTMLSerializer.java (original)
+++
cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/serialization/HTMLSerializer.java
Mon Jan  1 13:41:02 2007
 <at>  <at>  -44,6 +44,14  <at>  <at>
(Continue reading)

Permalink | Reply | 0 comments |
headers
danielf | 2 Jan 2007 00:26
Picon
Favicon

svn commit: r491696 - /cocoon/trunk/core/cocoon-webapp/pom.xml

Author: danielf
Date: Mon Jan  1 15:26:31 2007
New Revision: 491696

URL: http://svn.apache.org/viewvc?view=rev&rev=491696
Log:
I want working samples!

Until someone find the motivation to maintain the dist samples we should keep cocoon-webapp in such a state
that people can use it for testing Cocoon.

Modified:
    cocoon/trunk/core/cocoon-webapp/pom.xml

Modified: cocoon/trunk/core/cocoon-webapp/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/pom.xml?view=diff&rev=491696&r1=491695&r2=491696
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/pom.xml (original)
+++ cocoon/trunk/core/cocoon-webapp/pom.xml Mon Jan  1 15:26:31 2007
 <at>  <at>  -38,22 +38,6  <at>  <at> 
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.cocoon</groupId>
-        <artifactId>cocoon-deployer-plugin</artifactId>
-        <version>1.0.0-M2-SNAPSHOT</version>
-        <configuration>
-          <serverVersion>2.2</serverVersion>
-        </configuration>
-        <executions>
(Continue reading)

Permalink | Reply | 8 comments |
headers
cziegeler | 2 Jan 2007 15:37
Picon
Favicon

svn commit: r491799 - /cocoon/trunk/blocks/cocoon-databases/cocoon-databases-hsqldb-client/pom.xml

Author: cziegeler
Date: Tue Jan  2 06:37:06 2007
New Revision: 491799

URL: http://svn.apache.org/viewvc?view=rev&rev=491799
Log:
We don't need core, spring-configurator is enough

Modified:
    cocoon/trunk/blocks/cocoon-databases/cocoon-databases-hsqldb-client/pom.xml

Modified: cocoon/trunk/blocks/cocoon-databases/cocoon-databases-hsqldb-client/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-databases/cocoon-databases-hsqldb-client/pom.xml?view=diff&rev=491799&r1=491798&r2=491799
==============================================================================
--- cocoon/trunk/blocks/cocoon-databases/cocoon-databases-hsqldb-client/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-databases/cocoon-databases-hsqldb-client/pom.xml Tue Jan  2
06:37:06 2007
 <at>  <at>  -37,19 +37,13  <at>  <at> 
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
-      <artifactId>cocoon-core</artifactId>
-      <version>2.2.0-M3-SNAPSHOT</version>
+      <artifactId>cocoon-spring-configurator</artifactId>
+      <version>1.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>hsqldb</groupId>
       <artifactId>hsqldb</artifactId>
       <version>1.8.0.7</version>
(Continue reading)

Permalink | Reply | 0 comments |
headers
cziegeler | 2 Jan 2007 16:12
Picon
Favicon

svn commit: r491812 - in /cocoon/trunk/blocks/cocoon-databases: cocoon-databases-odbc-client/pom.xml cocoon-databases-oracle-client/pom.xml cocoon-databases-postgresql-client/pom.xml

Author: cziegeler
Date: Tue Jan  2 07:12:53 2007
New Revision: 491812

URL: http://svn.apache.org/viewvc?view=rev&rev=491812
Log:
We don't need core, spring-configurator is enough

Modified:
    cocoon/trunk/blocks/cocoon-databases/cocoon-databases-odbc-client/pom.xml
    cocoon/trunk/blocks/cocoon-databases/cocoon-databases-oracle-client/pom.xml
    cocoon/trunk/blocks/cocoon-databases/cocoon-databases-postgresql-client/pom.xml

Modified: cocoon/trunk/blocks/cocoon-databases/cocoon-databases-odbc-client/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-databases/cocoon-databases-odbc-client/pom.xml?view=diff&rev=491812&r1=491811&r2=491812
==============================================================================
--- cocoon/trunk/blocks/cocoon-databases/cocoon-databases-odbc-client/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-databases/cocoon-databases-odbc-client/pom.xml Tue Jan  2
07:12:53 2007
 <at>  <at>  -37,14 +37,8  <at>  <at> 
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
-      <artifactId>cocoon-core</artifactId>
-      <version>2.2.0-M3-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.4</version>
(Continue reading)

Permalink | Reply | 0 comments |
headers
cziegeler | 2 Jan 2007 16:11
Picon
Favicon

svn commit: r491810 - in /cocoon/trunk/blocks/cocoon-hsqldb/cocoon-hsqldb-impl: ./ src/main/java/org/apache/cocoon/components/hsqldb/ src/main/resources/META-INF/cocoon/avalon/ src/main/resources/META-INF/cocoon/spring/ src/main/resources/org/

Author: cziegeler
Date: Tue Jan  2 07:11:41 2007
New Revision: 491810

URL: http://svn.apache.org/viewvc?view=rev&rev=491810
Log:
Remove dependencies to avalon and cocoon core

Added:
    cocoon/trunk/blocks/cocoon-hsqldb/cocoon-hsqldb-impl/src/main/resources/META-INF/cocoon/spring/
   
cocoon/trunk/blocks/cocoon-hsqldb/cocoon-hsqldb-impl/src/main/resources/META-INF/cocoon/spring/cocoon-hsqldb-block.xml
  (with props)
Removed:
    cocoon/trunk/blocks/cocoon-hsqldb/cocoon-hsqldb-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-hsqldb.xconf
    cocoon/trunk/blocks/cocoon-hsqldb/cocoon-hsqldb-impl/src/main/resources/org/
Modified:
    cocoon/trunk/blocks/cocoon-hsqldb/cocoon-hsqldb-impl/pom.xml
    cocoon/trunk/blocks/cocoon-hsqldb/cocoon-hsqldb-impl/src/main/java/org/apache/cocoon/components/hsqldb/Server.java
    cocoon/trunk/blocks/cocoon-hsqldb/cocoon-hsqldb-impl/src/main/java/org/apache/cocoon/components/hsqldb/ServerImpl.java
    cocoon/trunk/blocks/cocoon-hsqldb/cocoon-hsqldb-impl/status.xml

Modified: cocoon/trunk/blocks/cocoon-hsqldb/cocoon-hsqldb-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-hsqldb/cocoon-hsqldb-impl/pom.xml?view=diff&rev=491810&r1=491809&r2=491810
==============================================================================
--- cocoon/trunk/blocks/cocoon-hsqldb/cocoon-hsqldb-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-hsqldb/cocoon-hsqldb-impl/pom.xml Tue Jan  2 07:11:41 2007
 <at>  <at>  -37,19 +37,18  <at>  <at> 
   <dependencies>
     <dependency>
(Continue reading)

Permalink | Reply | 0 comments |
headers
jeremy | 2 Jan 2007 21:40
Picon
Favicon

svn commit: r491928 - in /cocoon/branches/BRANCH_2_1_X/lib: jars.xml optional/dojo-rsrc-20060614.jar optional/dojo-rsrc-20061224.jar

Author: jeremy
Date: Tue Jan  2 12:40:06 2007
New Revision: 491928

URL: http://svn.apache.org/viewvc?view=rev&rev=491928
Log:
Update Dojo to 0.4.1, use namespaces for loading widgets, cleanup of client-side libraries, deprecation
and replacement of functions in forms_lib.js cocoon.js CFormsForm.js, all cforms forms now use a dojo
widget, fixes to forms and ajax samples.

Added:
    cocoon/branches/BRANCH_2_1_X/lib/optional/dojo-rsrc-20061224.jar   (with props)
Removed:
    cocoon/branches/BRANCH_2_1_X/lib/optional/dojo-rsrc-20060614.jar
Modified:
    cocoon/branches/BRANCH_2_1_X/lib/jars.xml

Modified: cocoon/branches/BRANCH_2_1_X/lib/jars.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/lib/jars.xml?view=diff&rev=491928&r1=491927&r2=491928
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/lib/jars.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/lib/jars.xml Tue Jan  2 12:40:06 2007
 <at>  <at>  -1229,7 +1229,7  <at>  <at> 
       Dojo Ajax toolkit, packaged as resources in /org/apache/cocoon/dojo/resources
     </description>
     <used-by>Ajax block</used-by>
-    <lib>optional/dojo-rsrc-20060614.jar</lib>
+    <lib>optional/dojo-rsrc-20061224.jar</lib>
     <homepage>http://dojotoolkit.org/</homepage>
   </file>
(Continue reading)

Permalink | Reply | 0 comments |
headers
jeremy | 2 Jan 2007 21:44
Picon
Favicon

svn commit: r491930 [1/2] - in /cocoon/trunk/blocks: cocoon-ajax/cocoon-ajax-impl/src/main/resources/org/apache/cocoon/ajax/resources/ cocoon-ajax/cocoon-ajax-impl/src/main/resources/org/apache/cocoon/ajax/resources/js/ cocoon-ajax/cocoon-ajax-impl/src...

Author: jeremy
Date: Tue Jan  2 12:44:30 2007
New Revision: 491930

URL: http://svn.apache.org/viewvc?view=rev&rev=491930
Log:
Update Dojo to 0.4.1, use namespaces for loading widgets, cleanup of client-side libraries, deprecation and replacement of functions in forms_lib.js cocoon.js CFormsForm.js, all cforms forms now use a dojo widget, fixes to forms and ajax samples.

Added:
    cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-impl/src/main/resources/org/apache/cocoon/ajax/resources/manifest.js   (with props)
    cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-impl/src/main/resources/org/apache/cocoon/dojo/resources/dojo-0.4.1-ajax.zip   (with props)
    cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/AjaxForm.js   (with props)
    cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/SimpleForm.js   (with props)
    cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/manifest.js   (with props)
Removed:
    cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-impl/src/main/resources/org/apache/cocoon/dojo/resources/dojo-0.3.1-widget.zip
Modified:
    cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-impl/src/main/resources/org/apache/cocoon/ajax/resources/cocoon.js
    cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-impl/src/main/resources/org/apache/cocoon/ajax/resources/js/BUHandler.js
    cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-impl/src/main/resources/org/apache/cocoon/ajax/resources/js/FormUploadProgress.js
    cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-impl/src/main/resources/org/apache/cocoon/ajax/resources/js/PartialLink.js
    cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-impl/src/main/resources/org/apache/cocoon/ajax/resources/js/common.js
    cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-sample/src/main/resources/COB-INF/linked-updater.xml
    cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/forms-advanced-field-styling.xsl
    cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/forms-calendar-styling.xsl
    cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/forms-field-styling.xsl
    cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/forms-htmlarea-styling.xsl
    cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/CFormsDragAndDropRepeater.js
    cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/CFormsForm.js
    cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/CFormsRepeater.js
(Continue reading)

Permalink | Reply | 0 comments |

Gmane