You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2006/05/20 19:19:09 UTC
svn commit: r408042 - in /cocoon/trunk/core: cocoon-bootstrap/ cocoon-bootstrap/src/main/java/org/apache/cocoon/components/classloader/ cocoon-core/ cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/ cocoon-core/src/main/java/org/apache...

Author: cziegeler
Date: Sat May 20 10:19:09 2006
New Revision: 408042

URL: http://svn.apache.org/viewvc?rev=408042&view=rev
Log:
Move classes to correct places and update poms

Added:
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/util/ClassLoaderUtils.java
      - copied, changed from r408039, cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/components/classloader/ClassLoaderUtils.java
Removed:
    cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/components/classloader/ClassLoaderUtils.java
Modified:
    cocoon/trunk/core/cocoon-bootstrap/pom.xml
    cocoon/trunk/core/cocoon-core/pom.xml
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/BeanFactoryFactoryImpl.java

Modified: cocoon/trunk/core/cocoon-bootstrap/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-bootstrap/pom.xml?rev=408042&r1=408041&r2=408042&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-bootstrap/pom.xml (original)
+++ cocoon/trunk/core/cocoon-bootstrap/pom.xml Sat May 20 10:19:09 2006
@@ -32,6 +32,11 @@
   <name>Cocoon Bootstrap Implementation</name>
   <description/>
   <dependencies>
+    <dependency>
+      <groupId>commons-jci</groupId>
+      <artifactId>commons-jci</artifactId>
+      <version>r306555</version>
+    </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>

Modified: cocoon/trunk/core/cocoon-core/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/pom.xml?rev=408042&r1=408041&r2=408042&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/pom.xml (original)
+++ cocoon/trunk/core/cocoon-core/pom.xml Sat May 20 10:19:09 2006
@@ -95,6 +95,12 @@
   </build>
   <dependencies>
 
+    <!--  bootstrap -->
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-bootstrap</artifactId>
+      <version>1.0.0-SNAPSHOT</version>
+    </dependency>
     <!--  excalibur -->
     <dependency>
       <groupId>org.apache.excalibur.components.pool</groupId>
@@ -174,11 +180,6 @@
       <groupId>commons-cli</groupId>
       <artifactId>commons-cli</artifactId>
       <version>1.0</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-jci</groupId>
-      <artifactId>commons-jci</artifactId>
-      <version>r306555</version>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>

Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/BeanFactoryFactoryImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/BeanFactoryFactoryImpl.java?rev=408042&r1=408041&r2=408042&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/BeanFactoryFactoryImpl.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/BeanFactoryFactoryImpl.java Sat May 20 10:19:09 2006
@@ -22,8 +22,8 @@
 import org.apache.cocoon.components.ContextHelper;
 import org.apache.cocoon.components.classloader.ClassLoaderConfiguration;
 import org.apache.cocoon.components.classloader.ClassLoaderFactory;
-import org.apache.cocoon.components.classloader.ClassLoaderUtils;
 import org.apache.cocoon.core.Settings;
+import org.apache.cocoon.core.container.util.ClassLoaderUtils;
 import org.apache.cocoon.environment.Request;
 import org.apache.excalibur.source.SourceResolver;
 import org.springframework.beans.BeansException;

Copied: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/util/ClassLoaderUtils.java (from r408039, cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/components/classloader/ClassLoaderUtils.java)
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/util/ClassLoaderUtils.java?p2=cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/util/ClassLoaderUtils.java&p1=cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/components/classloader/ClassLoaderUtils.java&r1=408039&r2=408042&rev=408042&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/components/classloader/ClassLoaderUtils.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/util/ClassLoaderUtils.java Sat May 20 10:19:09 2006
@@ -14,10 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.components.classloader;
+package org.apache.cocoon.core.container.util;
 
 import org.apache.avalon.framework.configuration.Configuration;
 import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.cocoon.components.classloader.ClassLoaderConfiguration;
 
 /**
  * Utility class for converting Avalon based Configuration into a {@link ClassLoaderConfiguration}.