cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r189609 - /cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SitemapLanguage.java /cocoon/trunk/src/java/org/apache/cocoon/transformation/AbstractSAXTransformer.java /cocoon/trunk/status.xml
Date Wed, 08 Jun 2005 17:27:07 GMT
Author: cziegeler
Date: Wed Jun  8 10:27:06 2005
New Revision: 189609

URL: http://svn.apache.org/viewcvs?rev=189609&view=rev
Log:
Remove deprecated emptyAttributes from the AbstractSAXTransformer.
Per sitemap classloader factory is configurable using the role name.

Modified:
    cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SitemapLanguage.java
    cocoon/trunk/src/java/org/apache/cocoon/transformation/AbstractSAXTransformer.java
    cocoon/trunk/status.xml

Modified: cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SitemapLanguage.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SitemapLanguage.java?rev=189609&r1=189608&r2=189609&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SitemapLanguage.java
(original)
+++ cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SitemapLanguage.java
Wed Jun  8 10:27:06 2005
@@ -89,12 +89,17 @@
         if (classpathConfig == null) {
             newClassLoader = Thread.currentThread().getContextClassLoader();
         } else {
+            String factoryRole = config.getAttribute("factory-role", ClassLoaderFactory.ROLE);
             // Create a new classloader
-            ClassLoaderFactory clFactory = (ClassLoaderFactory)this.parentProcessorManager.lookup(ClassLoaderFactory.ROLE);
-            newClassLoader = clFactory.createClassLoader(
-                    Thread.currentThread().getContextClassLoader(),
-                    classpathConfig
-            );
+            ClassLoaderFactory clFactory = (ClassLoaderFactory)this.parentProcessorManager.lookup(factoryRole);
+            try {
+                newClassLoader = clFactory.createClassLoader(
+                        Thread.currentThread().getContextClassLoader(),
+                        classpathConfig
+                );
+            } finally {
+                this.parentProcessorManager.release(clFactory);
+            }
         }
         
         this.itsClassLoader = newClassLoader;

Modified: cocoon/trunk/src/java/org/apache/cocoon/transformation/AbstractSAXTransformer.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/transformation/AbstractSAXTransformer.java?rev=189609&r1=189608&r2=189609&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/transformation/AbstractSAXTransformer.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/transformation/AbstractSAXTransformer.java Wed
Jun  8 10:27:06 2005
@@ -219,14 +219,6 @@
     private boolean isInitialized;
 
     /**
-     * Empty attributes (for performance). This can be used
-     * do create own attributes, but make sure to clean them
-     * afterwords.
-     * @deprecated Use {@link AbstractSAXTransformer#EMPTY_ATTRIBUTES}.
-     */
-    protected Attributes emptyAttributes = EMPTY_ATTRIBUTES;
-
-    /**
      * The namespaces and their prefixes
      */
     private final List namespaces = new ArrayList(5);

Modified: cocoon/trunk/status.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/status.xml?rev=189609&r1=189608&r2=189609&view=diff
==============================================================================
--- cocoon/trunk/status.xml (original)
+++ cocoon/trunk/status.xml Wed Jun  8 10:27:06 2005
@@ -197,6 +197,12 @@
 
   <changes>
   <release version="@version@" date="@date@">
+    <action dev="CZ" type="update">
+      Remove deprecated emptyAttributes from the AbstractSAXTransformer.
+    </action>
+    <action dev="CZ" type="add">
+      Per sitemap classloader factory is configurable using the role name.
+    </action>
     <action dev="BD" type="add">
       The junit.test.include.* options in build.properties can be used to run only
       a subset of JUnit tests, to shorten debugging cycles.



Mime
View raw message