cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r189608 - in /cocoon: blocks/xsp/trunk/WEB-INF/xconf/ blocks/xsp/trunk/conf/ blocks/xsp/trunk/java/org/apache/cocoon/components/classloader/ trunk/src/java/org/apache/cocoon/ trunk/src/java/org/apache/cocoon/components/classloader/ trunk/src/webapp/WEB-INF/xconf/
Date Wed, 08 Jun 2005 17:16:47 GMT
Author: cziegeler
Date: Wed Jun  8 10:16:44 2005
New Revision: 189608

URL: http://svn.apache.org/viewcvs?rev=189608&view=rev
Log:
Move ClassLoaderManager to XSP block.

Added:
    cocoon/blocks/xsp/trunk/java/org/apache/cocoon/components/classloader/
    cocoon/blocks/xsp/trunk/java/org/apache/cocoon/components/classloader/ClassLoaderManager.java
      - copied unchanged from r189607, cocoon/trunk/src/java/org/apache/cocoon/components/classloader/ClassLoaderManager.java
    cocoon/blocks/xsp/trunk/java/org/apache/cocoon/components/classloader/ClassLoaderManagerImpl.java
      - copied unchanged from r189607, cocoon/trunk/src/java/org/apache/cocoon/components/classloader/ClassLoaderManagerImpl.java
    cocoon/blocks/xsp/trunk/java/org/apache/cocoon/components/classloader/RepositoryClassLoader.java
      - copied unchanged from r189607, cocoon/trunk/src/java/org/apache/cocoon/components/classloader/RepositoryClassLoader.java
Removed:
    cocoon/trunk/src/java/org/apache/cocoon/components/classloader/ClassLoaderManager.java
    cocoon/trunk/src/java/org/apache/cocoon/components/classloader/ClassLoaderManagerImpl.java
    cocoon/trunk/src/java/org/apache/cocoon/components/classloader/RepositoryClassLoader.java
Modified:
    cocoon/blocks/xsp/trunk/WEB-INF/xconf/cocoon-xsp.xconf
    cocoon/blocks/xsp/trunk/conf/xsp.xroles
    cocoon/trunk/src/java/org/apache/cocoon/cocoon.roles
    cocoon/trunk/src/webapp/WEB-INF/xconf/cocoon-core.xconf

Modified: cocoon/blocks/xsp/trunk/WEB-INF/xconf/cocoon-xsp.xconf
URL: http://svn.apache.org/viewcvs/cocoon/blocks/xsp/trunk/WEB-INF/xconf/cocoon-xsp.xconf?rev=189608&r1=189607&r2=189608&view=diff
==============================================================================
--- cocoon/blocks/xsp/trunk/WEB-INF/xconf/cocoon-xsp.xconf (original)
+++ cocoon/blocks/xsp/trunk/WEB-INF/xconf/cocoon-xsp.xconf Wed Jun  8 10:16:44 2005
@@ -20,5 +20,10 @@
     | SVN $Id$
     +-->
 <components>
-  <!-- Dummy config that other blocks can import -->
+
+  <!--+
+      | The core classloader implementation
+      +-->
+  <classloader class="org.apache.cocoon.components.classloader.ClassLoaderManagerImpl"
logger="core.classloader"/>
+
 </components>

Modified: cocoon/blocks/xsp/trunk/conf/xsp.xroles
URL: http://svn.apache.org/viewcvs/cocoon/blocks/xsp/trunk/conf/xsp.xroles?rev=189608&r1=189607&r2=189608&view=diff
==============================================================================
--- cocoon/blocks/xsp/trunk/conf/xsp.xroles (original)
+++ cocoon/blocks/xsp/trunk/conf/xsp.xroles Wed Jun  8 10:16:44 2005
@@ -22,6 +22,10 @@
        shorthand="server-pages"
        default-class="org.apache.cocoon.components.language.generator.GeneratorSelector"/>
 
+  <role name="org.apache.cocoon.components.classloader.ClassLoaderManager"
+        shorthand="classloader"
+        default-class="org.apache.cocoon.components.classloader.ClassLoaderManagerImpl"/>
+
   <role name="org.apache.cocoon.components.language.markup.MarkupLanguageSelector"
         shorthand="markup-languages"
         default-class="org.apache.cocoon.core.container.DefaultServiceSelector">

Modified: cocoon/trunk/src/java/org/apache/cocoon/cocoon.roles
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/cocoon.roles?rev=189608&r1=189607&r2=189608&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/cocoon.roles (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/cocoon.roles Wed Jun  8 10:16:44 2005
@@ -182,10 +182,6 @@
         shorthand="fam"
         default-class="org.apache.cocoon.components.fam.SitemapMonitorImpl"/>
         
-  <role name="org.apache.cocoon.components.classloader.ClassLoaderManager"
-        shorthand="classloader"
-        default-class="org.apache.cocoon.components.classloader.ClassLoaderManagerImpl"/>
-
   <role name="org.apache.cocoon.components.image.ImageEncoderSelector"
         shorthand="image-encoder"/>
 

Modified: cocoon/trunk/src/webapp/WEB-INF/xconf/cocoon-core.xconf
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/webapp/WEB-INF/xconf/cocoon-core.xconf?rev=189608&r1=189607&r2=189608&view=diff
==============================================================================
--- cocoon/trunk/src/webapp/WEB-INF/xconf/cocoon-core.xconf (original)
+++ cocoon/trunk/src/webapp/WEB-INF/xconf/cocoon-core.xconf Wed Jun  8 10:16:44 2005
@@ -565,11 +565,6 @@
 <!-- ====================== System Components =========================== -->
 
   <!--+
-      | The core classloader implementation
-      +-->
-  <classloader class="org.apache.cocoon.components.classloader.ClassLoaderManagerImpl"
logger="core.classloader"/>
-
-  <!--+
       | XML compiler/decompiler
       |
       | These components are used to process SAX events and produce a binary



Mime
View raw message