reinhard | 2 Mar 17:32 2007
Picon

svn commit: r513832 - /cocoon/trunk/blocks/cocoon-apples/cocoon-apples-impl/pom.xml

Author: reinhard
Date: Fri Mar  2 08:31:59 2007
New Revision: 513832

URL: http://svn.apache.org/viewvc?view=rev&rev=513832
Log:
[maven-release-plugin] prepare release cocoon-apples-impl-1.0.0-M2

Modified:
    cocoon/trunk/blocks/cocoon-apples/cocoon-apples-impl/pom.xml

Modified: cocoon/trunk/blocks/cocoon-apples/cocoon-apples-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-apples/cocoon-apples-impl/pom.xml?view=diff&rev=513832&r1=513831&r2=513832
==============================================================================
--- cocoon/trunk/blocks/cocoon-apples/cocoon-apples-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-apples/cocoon-apples-impl/pom.xml Fri Mar  2 08:31:59 2007
 <at>  <at>  -28,19 +28,25  <at>  <at> 
   <parent>
     <artifactId>cocoon-blocks-modules</artifactId>
     <groupId>org.apache.cocoon</groupId>
-    <version>4-SNAPSHOT</version>
+    <version>3</version>
     <relativePath>../../pom.xml</relativePath>    
   </parent>
   <artifactId>cocoon-apples-impl</artifactId>
-  <version>1.0.0-M2-SNAPSHOT</version>
+  <version>1.0.0-M2</version>
   <name>Cocoon Apples Block Implementation</name>

   <dependencies>
(Continue reading)

reinhard | 2 Mar 17:32 2007
Picon

svn commit: r513833 - in /cocoon/tags/cocoon-2.2/cocoon-apples-impl/cocoon-apples-impl-1.0.0-M2: ./ pom.xml

Author: reinhard
Date: Fri Mar  2 08:32:06 2007
New Revision: 513833

URL: http://svn.apache.org/viewvc?view=rev&rev=513833
Log:
[maven-scm] copy for tag cocoon-apples-impl-1.0.0-M2

Added:
    cocoon/tags/cocoon-2.2/cocoon-apples-impl/cocoon-apples-impl-1.0.0-M2/
      - copied from r510662, cocoon/trunk/blocks/cocoon-apples/cocoon-apples-impl/
    cocoon/tags/cocoon-2.2/cocoon-apples-impl/cocoon-apples-impl-1.0.0-M2/pom.xml
      - copied unchanged from r513832, cocoon/trunk/blocks/cocoon-apples/cocoon-apples-impl/pom.xml

reinhard | 2 Mar 17:32 2007
Picon

svn commit: r513834 - /cocoon/trunk/blocks/cocoon-apples/cocoon-apples-impl/pom.xml

Author: reinhard
Date: Fri Mar  2 08:32:10 2007
New Revision: 513834

URL: http://svn.apache.org/viewvc?view=rev&rev=513834
Log:
[maven-release-plugin] prepare for next development iteration

Modified:
    cocoon/trunk/blocks/cocoon-apples/cocoon-apples-impl/pom.xml

Modified: cocoon/trunk/blocks/cocoon-apples/cocoon-apples-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-apples/cocoon-apples-impl/pom.xml?view=diff&rev=513834&r1=513833&r2=513834
==============================================================================
--- cocoon/trunk/blocks/cocoon-apples/cocoon-apples-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-apples/cocoon-apples-impl/pom.xml Fri Mar  2 08:32:10 2007
 <at>  <at>  -32,7 +32,7  <at>  <at> 
     <relativePath>../../pom.xml</relativePath>    
   </parent>
   <artifactId>cocoon-apples-impl</artifactId>
-  <version>1.0.0-M2</version>
+  <version>1.0.0-M3-SNAPSHOT</version>
   <name>Cocoon Apples Block Implementation</name>

   <dependencies>
 <at>  <at>  -42,11 +42,4  <at>  <at> 
       <version>2.2.0-M3</version>
     </dependency>
   </dependencies>
-  
(Continue reading)

reinhard | 2 Mar 17:56 2007
Picon

svn commit: r513842 - in /cocoon/trunk/blocks/cocoon-apples: cocoon-apples-impl/pom.xml cocoon-apples-sample/pom.xml

Author: reinhard
Date: Fri Mar  2 08:56:58 2007
New Revision: 513842

URL: http://svn.apache.org/viewvc?view=rev&rev=513842
Log:
use snapshot versions again

Modified:
    cocoon/trunk/blocks/cocoon-apples/cocoon-apples-impl/pom.xml
    cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/pom.xml

Modified: cocoon/trunk/blocks/cocoon-apples/cocoon-apples-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-apples/cocoon-apples-impl/pom.xml?view=diff&rev=513842&r1=513841&r2=513842
==============================================================================
--- cocoon/trunk/blocks/cocoon-apples/cocoon-apples-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-apples/cocoon-apples-impl/pom.xml Fri Mar  2 08:56:58 2007
 <at>  <at>  -28,18 +28,18  <at>  <at> 
   <parent>
     <artifactId>cocoon-blocks-modules</artifactId>
     <groupId>org.apache.cocoon</groupId>
-    <version>3</version>
+    <version>4-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>    
   </parent>
   <artifactId>cocoon-apples-impl</artifactId>
-  <version>1.0.0-M3-SNAPSHOT</version>
+  <version>1.0.0-RC1-SNAPSHOT</version>
   <name>Cocoon Apples Block Implementation</name>

(Continue reading)

reinhard | 3 Mar 11:10 2007
Picon

svn commit: r514113 - /cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-webapp-wrapper/src/main/java/org/apache/cocoon/servlet/CocoonReloadingListener.java

Author: reinhard
Date: Sat Mar  3 02:10:56 2007
New Revision: 514113

URL: http://svn.apache.org/viewvc?view=rev&rev=514113
Log:
reload whenever any sitemap changes. This is necessary in order to avoid
classnotfound exceptions when a sitemap changes. Don't know why this happens
but this, although it's slowing down development a bit (~2.5 sec reload time), 
is the best solution for now

Modified:
    cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-webapp-wrapper/src/main/java/org/apache/cocoon/servlet/CocoonReloadingListener.java

Modified: cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-webapp-wrapper/src/main/java/org/apache/cocoon/servlet/CocoonReloadingListener.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-webapp-wrapper/src/main/java/org/apache/cocoon/servlet/CocoonReloadingListener.java?view=diff&rev=514113&r1=514112&r2=514113
==============================================================================
---
cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-webapp-wrapper/src/main/java/org/apache/cocoon/servlet/CocoonReloadingListener.java (original)
+++
cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-webapp-wrapper/src/main/java/org/apache/cocoon/servlet/CocoonReloadingListener.java
Sat Mar  3 02:10:56 2007
 <at>  <at>  -34,10 +34,14  <at>  <at> 

     public void onChangeFile(File changedFile) {
         super.onChangeFile(changedFile);
-        String changedFileParent = changedFile.getParent().replace('\\', '/');
+        String changedFileParentPath = changedFile.getParent().replace('\\', '/');
+        String changedFilePath = changedFile.getAbsolutePath().replace('\\', '/');        

(Continue reading)

reinhard | 3 Mar 11:14 2007
Picon

svn commit: r514115 - /cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-webapp-wrapper/src/main/java/org/apache/cocoon/servlet/CocoonReloadingListener.java

Author: reinhard
Date: Sat Mar  3 02:14:54 2007
New Revision: 514115

URL: http://svn.apache.org/viewvc?view=rev&rev=514115
Log:
improve logging and comments

Modified:
    cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-webapp-wrapper/src/main/java/org/apache/cocoon/servlet/CocoonReloadingListener.java

Modified: cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-webapp-wrapper/src/main/java/org/apache/cocoon/servlet/CocoonReloadingListener.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-webapp-wrapper/src/main/java/org/apache/cocoon/servlet/CocoonReloadingListener.java?view=diff&rev=514115&r1=514114&r2=514115
==============================================================================
---
cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-webapp-wrapper/src/main/java/org/apache/cocoon/servlet/CocoonReloadingListener.java (original)
+++
cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-webapp-wrapper/src/main/java/org/apache/cocoon/servlet/CocoonReloadingListener.java
Sat Mar  3 02:14:54 2007
 <at>  <at>  -37,12 +37,12  <at>  <at> 
         String changedFileParentPath = changedFile.getParent().replace('\\', '/');
         String changedFilePath = changedFile.getAbsolutePath().replace('\\', '/');        

-        if(changedFileParentPath.endsWith("META-INF/cocoon/spring") ||
-                changedFileParentPath.endsWith("config/avalon") ||
-                changedFilePath.endsWith(".xmap") ||
-                changedFilePath.endsWith(".xmap.xml") ||
-                changedFileParentPath.endsWith("config/spring")) {            
-            log.info("File change detected: " + changedFile);
+        if(changedFileParentPath.endsWith("META-INF/cocoon/spring") ||        // global Spring beans configurations
(Continue reading)

reinhard | 4 Mar 17:10 2007
Picon

svn commit: r514426 - in /cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-webapp-wrapper/src/main/java/org/apache/cocoon/servlet: CocoonReloadingListener.java JarListener.java ReloadingClassloaderManager.java

Author: reinhard
Date: Sun Mar  4 08:10:54 2007
New Revision: 514426

URL: http://svn.apache.org/viewvc?view=rev&rev=514426
Log:
works now with latest API changes in commons-jci

Removed:
    cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-webapp-wrapper/src/main/java/org/apache/cocoon/servlet/JarListener.java
Modified:
    cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-webapp-wrapper/src/main/java/org/apache/cocoon/servlet/CocoonReloadingListener.java
    cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-webapp-wrapper/src/main/java/org/apache/cocoon/servlet/ReloadingClassloaderManager.java

Modified: cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-webapp-wrapper/src/main/java/org/apache/cocoon/servlet/CocoonReloadingListener.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-webapp-wrapper/src/main/java/org/apache/cocoon/servlet/CocoonReloadingListener.java?view=diff&rev=514426&r1=514425&r2=514426
==============================================================================
---
cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-webapp-wrapper/src/main/java/org/apache/cocoon/servlet/CocoonReloadingListener.java (original)
+++
cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-webapp-wrapper/src/main/java/org/apache/cocoon/servlet/CocoonReloadingListener.java
Sun Mar  4 08:10:54 2007
 <at>  <at>  -27,13 +27,27  <at>  <at> 
     private final Log log = LogFactory.getLog(CocoonReloadingListener.class);

     private static boolean reload = false;
-
-    public CocoonReloadingListener(File file) {
-        super(file);
+    
(Continue reading)

cziegeler | 5 Mar 14:53 2007
Picon

svn commit: r514667 - /cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/AbstractTestCase.java

Author: cziegeler
Date: Mon Mar  5 05:53:54 2007
New Revision: 514667

URL: http://svn.apache.org/viewvc?view=rev&rev=514667
Log:
Set work and cache directory for junit tests

Modified:
    cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/AbstractTestCase.java

Modified: cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/AbstractTestCase.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/AbstractTestCase.java?view=diff&rev=514667&r1=514666&r2=514667
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/AbstractTestCase.java (original)
+++ cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/AbstractTestCase.java Mon
Mar  5 05:53:54 2007
 <at>  <at>  -156,6 +156,8  <at>  <at> 
         def.setSingleton(true);
         def.setLazyInit(false);
         def.getConstructorArgumentValues().addIndexedArgumentValue(0, "test");
+        def.getPropertyValues().addPropertyValue("workDirectory", System.getProperty("java.io.tmpdir"));
+        def.getPropertyValues().addPropertyValue("cacheDirectory", System.getProperty("java.io.tmpdir"));
         BeanDefinitionHolder holder = new BeanDefinitionHolder(def, Settings.ROLE);
         BeanDefinitionReaderUtils.registerBeanDefinition(holder, this.beanFactory);
     }

cziegeler | 5 Mar 15:12 2007
Picon

svn commit: r514671 - /cocoon/trunk/blocks/cocoon-repository/cocoon-repository-impl/src/test/java/org/apache/cocoon/components/source/impl/CachingSourceTestCase.java

Author: cziegeler
Date: Mon Mar  5 06:12:44 2007
New Revision: 514671

URL: http://svn.apache.org/viewvc?view=rev&rev=514671
Log:
Fix test case

Modified:
    cocoon/trunk/blocks/cocoon-repository/cocoon-repository-impl/src/test/java/org/apache/cocoon/components/source/impl/CachingSourceTestCase.java

Modified: cocoon/trunk/blocks/cocoon-repository/cocoon-repository-impl/src/test/java/org/apache/cocoon/components/source/impl/CachingSourceTestCase.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-repository/cocoon-repository-impl/src/test/java/org/apache/cocoon/components/source/impl/CachingSourceTestCase.java?view=diff&rev=514671&r1=514670&r2=514671
==============================================================================
---
cocoon/trunk/blocks/cocoon-repository/cocoon-repository-impl/src/test/java/org/apache/cocoon/components/source/impl/CachingSourceTestCase.java (original)
+++
cocoon/trunk/blocks/cocoon-repository/cocoon-repository-impl/src/test/java/org/apache/cocoon/components/source/impl/CachingSourceTestCase.java
Mon Mar  5 06:12:44 2007
 <at>  <at>  -82,14 +82,18  <at>  <at> 
         CachingSource.SourceMeta meta2 = source.getResponseMeta();
         resolver.release(source);

-        assertTrue(meta1 == meta2);
+        assertTrue(meta1.getMimeType() == meta2.getMimeType());
+        assertTrue(meta1.getContentLength() == meta2.getContentLength());
+        assertTrue(meta1.getLastModified() == meta2.getLastModified());

         source = (CachingSource) resolver.resolveURI(uri);
         source.refresh();
(Continue reading)

reinhard | 5 Mar 18:35 2007
Picon

svn commit: r514745 - in /cocoon/trunk/blocks/cocoon-apples/cocoon-apples-impl: ./ src/changes/ src/main/java/org/apache/cocoon/components/flow/apples/

Author: reinhard
Date: Mon Mar  5 09:35:27 2007
New Revision: 514745

URL: http://svn.apache.org/viewvc?view=rev&rev=514745
Log:
add sendStatus() method to the AppleResponse interface

Added:
    cocoon/trunk/blocks/cocoon-apples/cocoon-apples-impl/src/changes/
    cocoon/trunk/blocks/cocoon-apples/cocoon-apples-impl/src/changes/changes.xml   (with props)
Modified:
    cocoon/trunk/blocks/cocoon-apples/cocoon-apples-impl/pom.xml
    cocoon/trunk/blocks/cocoon-apples/cocoon-apples-impl/src/main/java/org/apache/cocoon/components/flow/apples/AppleResponse.java
    cocoon/trunk/blocks/cocoon-apples/cocoon-apples-impl/src/main/java/org/apache/cocoon/components/flow/apples/ApplesProcessor.java
    cocoon/trunk/blocks/cocoon-apples/cocoon-apples-impl/src/main/java/org/apache/cocoon/components/flow/apples/DefaultAppleResponse.java

Modified: cocoon/trunk/blocks/cocoon-apples/cocoon-apples-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-apples/cocoon-apples-impl/pom.xml?view=diff&rev=514745&r1=514744&r2=514745
==============================================================================
--- cocoon/trunk/blocks/cocoon-apples/cocoon-apples-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-apples/cocoon-apples-impl/pom.xml Mon Mar  5 09:35:27 2007
 <at>  <at>  -42,4 +42,5  <at>  <at> 
       <version>2.2.0-RC1-SNAPSHOT</version>
     </dependency>
   </dependencies>
+  
 </project>

Added: cocoon/trunk/blocks/cocoon-apples/cocoon-apples-impl/src/changes/changes.xml
(Continue reading)


Gmane