cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r233367 - in /cocoon/trunk: core/pom.xml src/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java
Date Thu, 18 Aug 2005 19:50:26 GMT
Author: cziegeler
Date: Thu Aug 18 12:50:20 2005
New Revision: 233367

URL: http://svn.apache.org/viewcvs?rev=233367&view=rev
Log:
Use hasService

Modified:
    cocoon/trunk/core/pom.xml
    cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java

Modified: cocoon/trunk/core/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/core/pom.xml?rev=233367&r1=233366&r2=233367&view=diff
==============================================================================
--- cocoon/trunk/core/pom.xml (original)
+++ cocoon/trunk/core/pom.xml Thu Aug 18 12:50:20 2005
@@ -30,6 +30,16 @@
   <build>
     <sourceDirectory>../src/java</sourceDirectory>
     <testSourceDirectory>../src/test</testSourceDirectory>
+    <resources>
+      <resource>
+        <directory>../src/java</directory>
+        <includes>
+          <include>**/*.roles</include>
+          <include>**/*.properties</include>
+          <include>**/*.xml</include>
+        </includes>
+      </resource>
+    </resources>
     <testResources>
       <testResource>
       <directory>../src/test</directory>
@@ -61,7 +71,7 @@
           <systemProperties>
             <property>
               <name>junit.test.loglevel</name>
-              <value>4</value>
+              <value>3</value>
             </property>
           </systemProperties>
         </configuration>

Modified: cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java?rev=233367&r1=233366&r2=233367&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java Thu
Aug 18 12:50:20 2005
@@ -188,10 +188,10 @@
 
         // Create sitemap executor
         if (this.parent == null) {
-            try {
+            if ( this.manager.hasService(SitemapExecutor.ROLE) ) {
                 this.sitemapExecutor = (SitemapExecutor) this.manager.lookup(SitemapExecutor.ROLE);
                 this.releaseSitemapExecutor = true;
-            } catch (ServiceException e) {
+            } else {
                 this.sitemapExecutor = new DefaultExecutor();
             }
         } else {



Mime
View raw message