cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dani...@apache.org
Subject svn commit: r489488 - in /cocoon/trunk/core: cocoon-core/ cocoon-core/src/main/java/org/apache/cocoon/components/store/ cocoon-core/src/main/java/org/apache/cocoon/components/thread/ cocoon-core/src/main/java/org/apache/cocoon/util/ cocoon-core/src/tes...
Date Thu, 21 Dec 2006 22:38:19 GMT
Author: danielf
Date: Thu Dec 21 14:38:17 2006
New Revision: 489488

URL: http://svn.apache.org/viewvc?view=rev&rev=489488
Log:
Moved thread and store components to the thread and store modules. Removed the cocoon-store-api
as it isn't needed, the the module implements the Excalibur store api. Moved some util classes
that are needed in the store implementation to the util module.

Added:
    cocoon/trunk/core/cocoon-store/cocoon-store-impl/src/main/java/org/apache/cocoon/components/store/
    cocoon/trunk/core/cocoon-store/cocoon-store-impl/src/main/java/org/apache/cocoon/components/store/impl/
      - copied from r489440, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/store/impl/
    cocoon/trunk/core/cocoon-thread/cocoon-thread-api/src/main/java/org/apache/cocoon/components/thread/
    cocoon/trunk/core/cocoon-thread/cocoon-thread-api/src/main/java/org/apache/cocoon/components/thread/Queue.java
      - copied unchanged from r489440, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/thread/Queue.java
    cocoon/trunk/core/cocoon-thread/cocoon-thread-api/src/main/java/org/apache/cocoon/components/thread/RunnableManager.java
      - copied unchanged from r489440, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/thread/RunnableManager.java
    cocoon/trunk/core/cocoon-thread/cocoon-thread-api/src/main/java/org/apache/cocoon/components/thread/ThreadFactory.java
      - copied unchanged from r489440, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/thread/ThreadFactory.java
    cocoon/trunk/core/cocoon-thread/cocoon-thread-api/src/main/java/org/apache/cocoon/components/thread/ThreadPool.java
      - copied unchanged from r489440, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/thread/ThreadPool.java
    cocoon/trunk/core/cocoon-thread/cocoon-thread-impl/src/main/java/org/apache/cocoon/components/thread/
      - copied from r489440, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/thread/
    cocoon/trunk/core/cocoon-thread/cocoon-thread-impl/src/test/
    cocoon/trunk/core/cocoon-thread/cocoon-thread-impl/src/test/java/
    cocoon/trunk/core/cocoon-thread/cocoon-thread-impl/src/test/java/org/
    cocoon/trunk/core/cocoon-thread/cocoon-thread-impl/src/test/java/org/apache/
    cocoon/trunk/core/cocoon-thread/cocoon-thread-impl/src/test/java/org/apache/cocoon/
    cocoon/trunk/core/cocoon-thread/cocoon-thread-impl/src/test/java/org/apache/cocoon/components/
    cocoon/trunk/core/cocoon-thread/cocoon-thread-impl/src/test/java/org/apache/cocoon/components/thread/
      - copied from r489440, cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/components/thread/
    cocoon/trunk/core/cocoon-util/src/main/java/org/apache/cocoon/util/IOUtils.java
      - copied unchanged from r489440, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/IOUtils.java
    cocoon/trunk/core/cocoon-util/src/main/java/org/apache/cocoon/util/StringUtils.java
      - copied unchanged from r489440, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/StringUtils.java
Removed:
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/store/
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/thread/
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/IOUtils.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/StringUtils.java
    cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/components/thread/
    cocoon/trunk/core/cocoon-store/cocoon-store-api/
    cocoon/trunk/core/cocoon-thread/cocoon-thread-impl/src/main/java/org/apache/cocoon/components/thread/Queue.java
    cocoon/trunk/core/cocoon-thread/cocoon-thread-impl/src/main/java/org/apache/cocoon/components/thread/RunnableManager.java
    cocoon/trunk/core/cocoon-thread/cocoon-thread-impl/src/main/java/org/apache/cocoon/components/thread/ThreadFactory.java
    cocoon/trunk/core/cocoon-thread/cocoon-thread-impl/src/main/java/org/apache/cocoon/components/thread/ThreadPool.java
Modified:
    cocoon/trunk/core/cocoon-core/pom.xml
    cocoon/trunk/core/cocoon-store/cocoon-store-impl/pom.xml
    cocoon/trunk/core/cocoon-store/pom.xml
    cocoon/trunk/core/cocoon-thread/cocoon-thread-api/pom.xml
    cocoon/trunk/core/cocoon-thread/cocoon-thread-impl/pom.xml

Modified: cocoon/trunk/core/cocoon-core/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/pom.xml?view=diff&rev=489488&r1=489487&r2=489488
==============================================================================
--- cocoon/trunk/core/cocoon-core/pom.xml (original)
+++ cocoon/trunk/core/cocoon-core/pom.xml Thu Dec 21 14:38:17 2006
@@ -120,6 +120,11 @@
       <artifactId>cocoon-pipeline-api</artifactId>
       <version>1.0.0-SNAPSHOT</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-thread-api</artifactId>
+      <version>1.0.0-SNAPSHOT</version>
+    </dependency>
     <!--  excalibur -->
     <dependency>
       <groupId>org.apache.excalibur.components.pool</groupId>
@@ -153,11 +158,6 @@
       <version>2.1</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.excalibur.containerkit.instrument</groupId>
-      <artifactId>excalibur-instrument-api</artifactId>
-      <version>2.1</version>
-    </dependency>
-    <dependency>
       <groupId>org.apache.avalon.framework</groupId>
       <artifactId>avalon-framework-impl</artifactId>
       <version>4.3</version>
@@ -256,11 +256,6 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>concurrent</groupId>
-      <artifactId>concurrent</artifactId>
-      <version>1.3.4</version>
-    </dependency>
-    <dependency>
       <groupId>xml-apis</groupId>
       <artifactId>xml-apis</artifactId>
       <version>1.3.02</version>
@@ -277,11 +272,6 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>net.sf.ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.2</version>
-    </dependency>
-    <dependency>
       <groupId>jakarta-regexp</groupId>
       <artifactId>jakarta-regexp</artifactId>
       <version>1.4</version>
@@ -345,6 +335,25 @@
       <artifactId>easymock</artifactId>
       <version>1.1</version>
       <scope>test</scope>
+    </dependency>
+    <!--  runtime dependencies  -->
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-pipeline-impl</artifactId>
+      <version>1.0.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-store-impl</artifactId>
+      <version>1.0.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-thread-impl</artifactId>
+      <version>1.0.0-SNAPSHOT</version>
+      <scope>runtime</scope>
     </dependency>
   </dependencies>
   <reporting>

Modified: cocoon/trunk/core/cocoon-store/cocoon-store-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-store/cocoon-store-impl/pom.xml?view=diff&rev=489488&r1=489487&r2=489488
==============================================================================
--- cocoon/trunk/core/cocoon-store/cocoon-store-impl/pom.xml (original)
+++ cocoon/trunk/core/cocoon-store/cocoon-store-impl/pom.xml Thu Dec 21 14:38:17 2006
@@ -33,10 +33,55 @@
   <packaging>jar</packaging>
   <name>Cocoon Store Implementation</name>
   <dependencies>
+    <!--  Cocoon  -->
     <dependency>
       <groupId>org.apache.cocoon</groupId>
-      <artifactId>cocoon-store-api</artifactId>
+      <artifactId>cocoon-configuration-api</artifactId>
       <version>1.0.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-thread-api</artifactId>
+      <version>1.0.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-util</artifactId>
+      <version>1.0.0-SNAPSHOT</version>
+    </dependency>
+    <!--  Excalibur -->
+    <dependency>
+      <groupId>org.apache.avalon.framework</groupId>
+      <artifactId>avalon-framework-api</artifactId>
+      <version>4.3</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.avalon.logkit</groupId>
+          <artifactId>avalon-logkit</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.excalibur.components.store</groupId>
+      <artifactId>excalibur-store</artifactId>
+      <version>2.1</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.avalon.logkit</groupId>
+          <artifactId>avalon-logkit</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.excalibur.containerkit.instrument</groupId>
+      <artifactId>excalibur-instrument-api</artifactId>
+      <version>2.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>net.sf.ehcache</groupId>
+      <artifactId>ehcache</artifactId>
+      <version>1.2</version>
     </dependency>
   </dependencies>
 </project>

Modified: cocoon/trunk/core/cocoon-store/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-store/pom.xml?view=diff&rev=489488&r1=489487&r2=489488
==============================================================================
--- cocoon/trunk/core/cocoon-store/pom.xml (original)
+++ cocoon/trunk/core/cocoon-store/pom.xml Thu Dec 21 14:38:17 2006
@@ -33,7 +33,6 @@
   <packaging>pom</packaging>
   <name>Cocoon Store [modules]</name>
   <modules>
-    <module>cocoon-store-api</module>
     <module>cocoon-store-impl</module>
   </modules>
 </project>

Modified: cocoon/trunk/core/cocoon-thread/cocoon-thread-api/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-thread/cocoon-thread-api/pom.xml?view=diff&rev=489488&r1=489487&r2=489488
==============================================================================
--- cocoon/trunk/core/cocoon-thread/cocoon-thread-api/pom.xml (original)
+++ cocoon/trunk/core/cocoon-thread/cocoon-thread-api/pom.xml Thu Dec 21 14:38:17 2006
@@ -32,4 +32,11 @@
   <version>1.0.0-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>Cocoon Thread API</name>
+  <dependencies>
+    <dependency>
+      <groupId>concurrent</groupId>
+      <artifactId>concurrent</artifactId>
+      <version>1.3.4</version>
+    </dependency>
+  </dependencies>
 </project>

Modified: cocoon/trunk/core/cocoon-thread/cocoon-thread-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-thread/cocoon-thread-impl/pom.xml?view=diff&rev=489488&r1=489487&r2=489488
==============================================================================
--- cocoon/trunk/core/cocoon-thread/cocoon-thread-impl/pom.xml (original)
+++ cocoon/trunk/core/cocoon-thread/cocoon-thread-impl/pom.xml Thu Dec 21 14:38:17 2006
@@ -33,10 +33,48 @@
   <packaging>jar</packaging>
   <name>Cocoon Thread Implementation</name>
   <dependencies>
+    <!--  Cocoon  -->
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-thread-api</artifactId>
       <version>1.0.0-SNAPSHOT</version>
+    </dependency>
+    <!--  Excalibur -->
+    <dependency>
+      <groupId>org.apache.avalon.framework</groupId>
+      <artifactId>avalon-framework-api</artifactId>
+      <version>4.3</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.avalon.logkit</groupId>
+          <artifactId>avalon-logkit</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <!--  test dependencies  -->
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>easymock</groupId>
+      <artifactId>easymock</artifactId>
+      <version>1.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.avalon.framework</groupId>
+      <artifactId>avalon-framework-impl</artifactId>
+      <version>4.3</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.avalon.logkit</groupId>
+          <artifactId>avalon-logkit</artifactId>
+        </exclusion>
+      </exclusions>
+      <scope>test</scope>
     </dependency>
   </dependencies>
 </project>



Mime
View raw message