Return-Path: 
 <cvs-return-23953-apmail-cocoon-cvs-archive=cocoon.apache.org@cocoon.apache.org>
Delivered-To: apmail-cocoon-cvs-archive@www.apache.org
Received: (qmail 32879 invoked from network); 18 Aug 2005 19:50:30 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 18 Aug 2005 19:50:30 -0000
Received: (qmail 96713 invoked by uid 500); 18 Aug 2005 19:50:27 -0000
Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org
Received: (qmail 96619 invoked by uid 500); 18 Aug 2005 19:50:27 -0000
Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cocoon.apache.org
list-help: <mailto:cvs-help@cocoon.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@cocoon.apache.org>
List-Post: <mailto:cvs@cocoon.apache.org>
List-Id: <cvs.cocoon.apache.org>
Delivered-To: mailing list cvs@cocoon.apache.org
Received: (qmail 96593 invoked by uid 99); 18 Aug 2005 19:50:27 -0000
X-ASF-Spam-Status: No, hits=-9.8 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Thu, 18 Aug 2005 12:50:26 -0700
Received: (qmail 32778 invoked by uid 65534); 18 Aug 2005 19:50:26 -0000
Message-ID: <20050818195026.32777.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
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 -0000
To: cvs@cocoon.apache.org
From: cziegeler@apache.org
X-Mailer: svnmailer-1.0.3
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

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 {