You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by gk...@apache.org on 2007/09/18 00:43:29 UTC
svn commit: r576616 - in /cocoon/trunk/blocks/cocoon-databases: cocoon-databases-bridge/ cocoon-databases-bridge/src/main/java/org/ cocoon-databases-bridge/src/main/java/org/apache/ cocoon-databases-bridge/src/main/java/org/apache/cocoon/ cocoon-databa...

Author: gkossakowski
Date: Mon Sep 17 15:43:27 2007
New Revision: 576616

URL: http://svn.apache.org/viewvc?rev=576616&view=rev
Log:
COCOON-2083: Moving existing bridge functionality to the new cocoon-databases-bridge module.

Added:
    cocoon/trunk/blocks/cocoon-databases/cocoon-databases-bridge/src/main/java/org/
    cocoon/trunk/blocks/cocoon-databases/cocoon-databases-bridge/src/main/java/org/apache/
    cocoon/trunk/blocks/cocoon-databases/cocoon-databases-bridge/src/main/java/org/apache/cocoon/
    cocoon/trunk/blocks/cocoon-databases/cocoon-databases-bridge/src/main/java/org/apache/cocoon/databases/
    cocoon/trunk/blocks/cocoon-databases/cocoon-databases-bridge/src/main/java/org/apache/cocoon/databases/bridge/
    cocoon/trunk/blocks/cocoon-databases/cocoon-databases-bridge/src/main/java/org/apache/cocoon/databases/bridge/spring/
    cocoon/trunk/blocks/cocoon-databases/cocoon-databases-bridge/src/main/java/org/apache/cocoon/databases/bridge/spring/avalon/
    cocoon/trunk/blocks/cocoon-databases/cocoon-databases-bridge/src/main/java/org/apache/cocoon/databases/bridge/spring/avalon/SpringToAvalonDataSourceBridge.java   (contents, props changed)
      - copied, changed from r575483, cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/src/main/java/org/apache/cocoon/core/container/spring/avalon/SpringToAvalonDataSourceBridge.java
    cocoon/trunk/blocks/cocoon-databases/cocoon-databases-bridge/src/main/resources/META-INF/cocoon/spring/SpringToAvalonDataSourceBridge.xml   (contents, props changed)
      - copied, changed from r575483, cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/src/main/resources/META-INF/cocoon/spring/SpringToAvalonDataSourceBridge.xml
Removed:
    cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/src/main/java/org/apache/cocoon/core/container/spring/avalon/SpringToAvalonDataSourceBridge.java
    cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/src/main/resources/META-INF/cocoon/spring/SpringToAvalonDataSourceBridge.xml
Modified:
    cocoon/trunk/blocks/cocoon-databases/cocoon-databases-bridge/pom.xml
    cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/pom.xml

Modified: cocoon/trunk/blocks/cocoon-databases/cocoon-databases-bridge/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-databases/cocoon-databases-bridge/pom.xml?rev=576616&r1=576615&r2=576616&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-databases/cocoon-databases-bridge/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-databases/cocoon-databases-bridge/pom.xml Mon Sep 17 15:43:27 2007
@@ -49,6 +49,19 @@
   </distributionManagement>
   
   <dependencies>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-spring-configurator</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.excalibur.components</groupId>
+      <artifactId>excalibur-datasource</artifactId>    
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-jdbc</artifactId>
+      <version>2.0.6</version>
+    </dependency>
   </dependencies>
   
   <profiles>

Copied: cocoon/trunk/blocks/cocoon-databases/cocoon-databases-bridge/src/main/java/org/apache/cocoon/databases/bridge/spring/avalon/SpringToAvalonDataSourceBridge.java (from r575483, cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/src/main/java/org/apache/cocoon/core/container/spring/avalon/SpringToAvalonDataSourceBridge.java)
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-databases/cocoon-databases-bridge/src/main/java/org/apache/cocoon/databases/bridge/spring/avalon/SpringToAvalonDataSourceBridge.java?p2=cocoon/trunk/blocks/cocoon-databases/cocoon-databases-bridge/src/main/java/org/apache/cocoon/databases/bridge/spring/avalon/SpringToAvalonDataSourceBridge.java&p1=cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/src/main/java/org/apache/cocoon/core/container/spring/avalon/SpringToAvalonDataSourceBridge.java&r1=575483&r2=576616&rev=576616&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/src/main/java/org/apache/cocoon/core/container/spring/avalon/SpringToAvalonDataSourceBridge.java (original)
+++ cocoon/trunk/blocks/cocoon-databases/cocoon-databases-bridge/src/main/java/org/apache/cocoon/databases/bridge/spring/avalon/SpringToAvalonDataSourceBridge.java Mon Sep 17 15:43:27 2007
@@ -1,4 +1,4 @@
-package org.apache.cocoon.core.container.spring.avalon;
+package org.apache.cocoon.databases.bridge.spring.avalon;
 
 import java.sql.Connection;
 import java.sql.SQLException;

Propchange: cocoon/trunk/blocks/cocoon-databases/cocoon-databases-bridge/src/main/java/org/apache/cocoon/databases/bridge/spring/avalon/SpringToAvalonDataSourceBridge.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/blocks/cocoon-databases/cocoon-databases-bridge/src/main/java/org/apache/cocoon/databases/bridge/spring/avalon/SpringToAvalonDataSourceBridge.java
------------------------------------------------------------------------------
    svn:keywords = Id

Copied: cocoon/trunk/blocks/cocoon-databases/cocoon-databases-bridge/src/main/resources/META-INF/cocoon/spring/SpringToAvalonDataSourceBridge.xml (from r575483, cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/src/main/resources/META-INF/cocoon/spring/SpringToAvalonDataSourceBridge.xml)
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-databases/cocoon-databases-bridge/src/main/resources/META-INF/cocoon/spring/SpringToAvalonDataSourceBridge.xml?p2=cocoon/trunk/blocks/cocoon-databases/cocoon-databases-bridge/src/main/resources/META-INF/cocoon/spring/SpringToAvalonDataSourceBridge.xml&p1=cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/src/main/resources/META-INF/cocoon/spring/SpringToAvalonDataSourceBridge.xml&r1=575483&r2=576616&rev=576616&view=diff
==============================================================================
    (empty)

Propchange: cocoon/trunk/blocks/cocoon-databases/cocoon-databases-bridge/src/main/resources/META-INF/cocoon/spring/SpringToAvalonDataSourceBridge.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/blocks/cocoon-databases/cocoon-databases-bridge/src/main/resources/META-INF/cocoon/spring/SpringToAvalonDataSourceBridge.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/pom.xml?rev=576616&r1=576615&r2=576616&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/pom.xml Mon Sep 17 15:43:27 2007
@@ -62,11 +62,6 @@
       <groupId>org.apache.excalibur.components</groupId>
       <artifactId>excalibur-datasource</artifactId>    
     </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-jdbc</artifactId>
-      <version>2.0.6</version>
-    </dependency>
     <!-- Specify transitive dependencies to avoid MNG-2782 with JDK1.4.2. -->
     <dependency>
       <groupId>org.springframework</groupId>