You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by tv...@apache.org on 2007/05/05 08:58:51 UTC

svn commit: r535465 [15/49] - in /jakarta/turbine/fulcrum/trunk: ./ bsf/ bsf/src/java/org/apache/fulcrum/bsf/ bsf/src/test/ bsf/xdocs/ cache/ cache/src/java/org/apache/fulcrum/cache/ cache/src/java/org/apache/fulcrum/cache/impl/ cache/src/test/ cache/s...

Modified: jakarta/turbine/fulcrum/trunk/resourcemanager/src/test/TestRoleConfig.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/resourcemanager/src/test/TestRoleConfig.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/resourcemanager/src/test/TestRoleConfig.xml (original)
+++ jakarta/turbine/fulcrum/trunk/resourcemanager/src/test/TestRoleConfig.xml Fri May  4 23:58:06 2007
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
 
 <role-list>
    <role
@@ -8,13 +26,13 @@
      early-init="true"
      component-type="merlin"
      description="Provides Password Based Encyrption using JCA/JCE"
-   />        
+   />
   <role
     name="org.apache.fulcrum.resourcemanager.ResourceManagerService"
     default-class="org.apache.fulcrum.resourcemanager.impl.ResourceManagerServiceImpl"
-    shorthand="ResourceManagerService" 
+    shorthand="ResourceManagerService"
     early-init="true"
     component-type="merlin"
     description="Handles the management of resources"
    />
-</role-list>
\ No newline at end of file
+</role-list>

Modified: jakarta/turbine/fulcrum/trunk/resourcemanager/src/test/org/apache/fulcrum/resourcemanager/ResourceManagerServiceTest.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/resourcemanager/src/test/org/apache/fulcrum/resourcemanager/ResourceManagerServiceTest.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/resourcemanager/src/test/org/apache/fulcrum/resourcemanager/ResourceManagerServiceTest.java (original)
+++ jakarta/turbine/fulcrum/trunk/resourcemanager/src/test/org/apache/fulcrum/resourcemanager/ResourceManagerServiceTest.java Fri May  4 23:58:06 2007
@@ -1,20 +1,22 @@
 package org.apache.fulcrum.resourcemanager;
 
 /*
- * Copyright 2004 Apache Software Foundation
- * Licensed  under the  Apache License,  Version 2.0  (the "License");
- * you may not use  this file  except in  compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
  *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed  under the  License is distributed on an "AS IS" BASIS,
- * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
- * implied.
- *
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 import java.io.FileInputStream;
@@ -107,12 +109,12 @@
     public void testListDomains() throws Exception
     {
         // get a list of available domains
-        // 
+        //
         // -) crypto
         // -) scripts
         // -) test
         // -) xslt
-        //        
+        //
 
         String [] result = this.service.listDomains();
         assertTrue( result.length == 4 );
@@ -155,7 +157,7 @@
         assertTrue( this.service.exists( resourceDomain, resourceContext4, "empty.groovy" ) );
         result = new String( this.service.read( resourceDomain, resourceContext4, "empty.groovy" ) );
         assertEquals( "return true;", result );
-        
+
         // search for a non-existing resource with an existing context
         String[] resourceContext5 = { "foo", "bar" };
         assertFalse( this.service.exists( resourceDomain, resourceContext5, "bogus.groovy" ) );
@@ -168,7 +170,7 @@
         {
             // expected
         }
-        
+
         // search for a non-existing resource with a bogis context
         String[] resourceContext6 = { "bar", "foo" };
         assertFalse( this.service.exists( resourceDomain, resourceContext6, "bogus.groovy" ) );
@@ -250,7 +252,7 @@
         // use java.util.Properties
 
         resourceName = "properties.txt";
-        Properties props = new Properties(); 
+        Properties props = new Properties();
         props.setProperty("foo","bar");
         this.service.create( resourceDomain, resourceName, props );
         this.service.delete( resourceDomain, resourceName );
@@ -277,18 +279,18 @@
     public void testGetResourceURL() throws Exception
     {
         String resourceDomain = "groovy";
-        String[] resourceContext = { "foo" };        
+        String[] resourceContext = { "foo" };
         URL location = null;
-        
+
         // look for a non-existent resource
-        location = this.service.getResourceURL( resourceDomain, resourceContext, "bar.xsl" );  
+        location = this.service.getResourceURL( resourceDomain, resourceContext, "bar.xsl" );
         assertNull( location );
 
         // look for an existing resource
-        location = this.service.getResourceURL( resourceDomain, resourceContext, "foo.groovy" );   
+        location = this.service.getResourceURL( resourceDomain, resourceContext, "foo.groovy" );
         assertNotNull( location );
     }
-    
+
     /**
      * Create a resource file using the various input data types
      */
@@ -312,13 +314,13 @@
         assertFalse( this.service.exists( resourceDomain, resourceName ) );
 
         // load a plain text resource
-        
+
         resourceName = "plain.txt";
         assertTrue( this.service.exists( resourceDomain, resourceName ) );
         result = new String( this.service.read( resourceDomain, resourceName ) );
-        assertTrue( result.indexOf("http://www.apache.org/licenses/LICENSE-2.0") > 0 );        
+        assertTrue( result.indexOf("http://www.apache.org/licenses/LICENSE-2.0") > 0 );
     }
-    
+
     /**
      * Use a proper limit and run the test in a seperate VM to find
      * instabilities. Don't use this in Maven since it blows up due

Modified: jakarta/turbine/fulcrum/trunk/resourcemanager/src/test/resources/scripts/empty.groovy
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/resourcemanager/src/test/resources/scripts/empty.groovy?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/resourcemanager/src/test/resources/scripts/empty.groovy (original)
+++ jakarta/turbine/fulcrum/trunk/resourcemanager/src/test/resources/scripts/empty.groovy Fri May  4 23:58:06 2007
@@ -1 +1,19 @@
-return true;
\ No newline at end of file
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+return true;

Modified: jakarta/turbine/fulcrum/trunk/resourcemanager/src/test/resources/scripts/foo/bar/bar.groovy
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/resourcemanager/src/test/resources/scripts/foo/bar/bar.groovy?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/resourcemanager/src/test/resources/scripts/foo/bar/bar.groovy (original)
+++ jakarta/turbine/fulcrum/trunk/resourcemanager/src/test/resources/scripts/foo/bar/bar.groovy Fri May  4 23:58:06 2007
@@ -1 +1,19 @@
-return "BAR";
\ No newline at end of file
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+return "BAR";

Modified: jakarta/turbine/fulcrum/trunk/resourcemanager/src/test/resources/scripts/foo/foo.groovy
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/resourcemanager/src/test/resources/scripts/foo/foo.groovy?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/resourcemanager/src/test/resources/scripts/foo/foo.groovy (original)
+++ jakarta/turbine/fulcrum/trunk/resourcemanager/src/test/resources/scripts/foo/foo.groovy Fri May  4 23:58:06 2007
@@ -1 +1,19 @@
-return "FOO";
\ No newline at end of file
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+return "FOO";

Modified: jakarta/turbine/fulcrum/trunk/resourcemanager/src/test/resources/test/invisible.html
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/resourcemanager/src/test/resources/test/invisible.html?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/resourcemanager/src/test/resources/test/invisible.html (original)
+++ jakarta/turbine/fulcrum/trunk/resourcemanager/src/test/resources/test/invisible.html Fri May  4 23:58:06 2007
@@ -1,7 +1,25 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
 <html>
 <body>
 <p>
 This document is the API specification for the Apache Jakarta Commons Lang Library, version 2.0.
 </p>
 </body>
-</html>
\ No newline at end of file
+</html>

Modified: jakarta/turbine/fulcrum/trunk/resourcemanager/src/test/resources/xslt/foo/bar/special/test.xsl
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/resourcemanager/src/test/resources/xslt/foo/bar/special/test.xsl?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/resourcemanager/src/test/resources/xslt/foo/bar/special/test.xsl (original)
+++ jakarta/turbine/fulcrum/trunk/resourcemanager/src/test/resources/xslt/foo/bar/special/test.xsl Fri May  4 23:58:06 2007
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:java="http://xml.apache.org/xslt/java"
@@ -11,7 +29,7 @@
         <html>
             <body>
                 <h1><xsl:value-of select="$TITLE"/></h1>
-                <table border="1" bgcolor="#EEEEEE"> 
+                <table border="1" bgcolor="#EEEEEE">
                     <tr>
                         <td>Name</td>
                         <td>Description</td>
@@ -21,5 +39,5 @@
             </body>
         </html>
     </xsl:template>
-    
+
 </xsl:stylesheet>

Modified: jakarta/turbine/fulcrum/trunk/resourcemanager/src/test/resources/xslt/foo/bar/test.xsl
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/resourcemanager/src/test/resources/xslt/foo/bar/test.xsl?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/resourcemanager/src/test/resources/xslt/foo/bar/test.xsl (original)
+++ jakarta/turbine/fulcrum/trunk/resourcemanager/src/test/resources/xslt/foo/bar/test.xsl Fri May  4 23:58:06 2007
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:java="http://xml.apache.org/xslt/java"
@@ -11,7 +29,7 @@
         <html>
             <body>
                 <h1><xsl:value-of select="$TITLE"/></h1>
-                <table border="0"> 
+                <table border="0">
                     <tr>
                         <td>Name</td>
                         <td>Description</td>
@@ -21,7 +39,7 @@
             </body>
         </html>
     </xsl:template>
-    
+
     <xsl:template match="role">
         <tr>
             <td>

Modified: jakarta/turbine/fulcrum/trunk/resourcemanager/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/resourcemanager/xdocs/changes.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/resourcemanager/xdocs/changes.xml (original)
+++ jakarta/turbine/fulcrum/trunk/resourcemanager/xdocs/changes.xml Fri May  4 23:58:06 2007
@@ -1,4 +1,22 @@
 <?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
 <document>
   <properties>
     <title>Fulcrum ResourceManager Service</title>
@@ -25,7 +43,7 @@
       <action dev="sgoeschl" type="fix">
         Skipping all ".svn" directories otherwise we pick up arbitrary files
       </action>
-    </release>    
+    </release>
     <release version="1.0.0" date="in CVS">
       <action dev="sgoeschl" type="add">
         Initial version

Modified: jakarta/turbine/fulcrum/trunk/resourcemanager/xdocs/configuration.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/resourcemanager/xdocs/configuration.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/resourcemanager/xdocs/configuration.xml (original)
+++ jakarta/turbine/fulcrum/trunk/resourcemanager/xdocs/configuration.xml Fri May  4 23:58:06 2007
@@ -1,4 +1,22 @@
 <?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
 <document>
   <properties>
     <title>Fulcrum ResourceManager Service</title>
@@ -12,13 +30,13 @@
 <role
     name="org.apache.fulcrum.resourcemanager.ResourceManagerService"
     default-class="org.apache.fulcrum.resourcemanager.impl.ResourceManagerServiceImpl"
-    shorthand="ResourceManagerService" 
+    shorthand="ResourceManagerService"
     early-init="true"
     description="Handles the management of resources for multiple domains"
  />
         ]]></source>
       </subsection>
-      
+
       <subsection name="Component Configuration">
         <table>
           <tr>
@@ -83,7 +101,7 @@
     <suffix>txt</suffix>
     <location>./src/test/resources/test</location>
     <useLocator>false</useLocator>
-  </domain>    
+  </domain>
 </ResourceManagerService>
         ]]></source>
       </subsection>

Modified: jakarta/turbine/fulcrum/trunk/resourcemanager/xdocs/index.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/resourcemanager/xdocs/index.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/resourcemanager/xdocs/index.xml (original)
+++ jakarta/turbine/fulcrum/trunk/resourcemanager/xdocs/index.xml Fri May  4 23:58:06 2007
@@ -1,4 +1,22 @@
 <?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
 
 <document>
 
@@ -13,9 +31,9 @@
 
       <p>
         The Fulcrum ResourceManager service handles the management of resources found
-        in a domain whereas multiple domains can be defined. The current implementation 
-        uses only the file system to store the resources of a domain. It should be possible 
-        to come up with an implementation using a database to store the resources 
+        in a domain whereas multiple domains can be defined. The current implementation
+        uses only the file system to store the resources of a domain. It should be possible
+        to come up with an implementation using a database to store the resources
         centralized for a cluster.
       </p>
 
@@ -24,20 +42,20 @@
     <section name="What does it provide?">
 
       <p>
-        The service provides the following features:        
+        The service provides the following features:
         <ul>
           <li>automatic location of resources running up the directory tree</li>
           <li>management API for resources</li>
         </ul>
-      </p>  
-      
+      </p>
+
       <p>
         The key motiviation is reuse the automatic location of a resource since I
         implemented it a few times over the last two years. A couple services benefit
-        from that behaviour, e.g. the fulcrum-dom4jxslt-service and fulcrum-groovy-service. 
-        Using a context and traversing up the file system allows to invoke different 
-        XSL file depending on the context. And the only thing to do is just to add 
-        a XSL file in the appropriate directory and to overwrite one or more template 
+        from that behaviour, e.g. the fulcrum-dom4jxslt-service and fulcrum-groovy-service.
+        Using a context and traversing up the file system allows to invoke different
+        XSL file depending on the context. And the only thing to do is just to add
+        a XSL file in the appropriate directory and to overwrite one or more template
         matching rules to customize the behaviour.
       </p>
 
@@ -51,25 +69,25 @@
      -- magic.groovy
             ]]>
           </source>
-    
+
           <p>
             In the case of invoking 'ABC/magic.groovy' the script 'ABC/magic.groovy' would be executed.
             In the case of invoking 'XYZ/magic.groovy' the locator is looking for 'XYZ/magic.groovy'. Since
             it isn't found it steps up a directory to execute 'magic.groovy'.
-          </p>      
-          
+          </p>
+
       </subsection>
-    
+
     </section>
-    
-    <section name="What it does not provide?">      
-      <p>      
+
+    <section name="What it does not provide?">
+      <p>
         The service does not provided the following things
         <ul>
           <li>caching of the content of resources</li>
           <li>provision of virtual file systems</li>
         </ul>
-      </p>  
+      </p>
 
       <p>
         I hate to implement any ad-hoc caching since this should be done by
@@ -77,11 +95,11 @@
         done by other services, e.g. a XSLT service caches the the compiled
         XSL files and not the file content.
       </p>
-      
-      <p> 
+
+      <p>
         And the virtual file system approach is beautiful but I don't need it.
-      </p>  
-      
+      </p>
+
     </section>
 
   </body>

Modified: jakarta/turbine/fulcrum/trunk/resourcemanager/xdocs/navigation.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/resourcemanager/xdocs/navigation.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/resourcemanager/xdocs/navigation.xml (original)
+++ jakarta/turbine/fulcrum/trunk/resourcemanager/xdocs/navigation.xml Fri May  4 23:58:06 2007
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
 <project
   name="Fulcrum Groovy Service"
   href="http://jakarta.apache.org/turbine/fulcrum/yaafi/">
@@ -8,7 +26,7 @@
       <item name="Home"                href="../../../it20one-service-maven/target/docs/index.html"/>
       <item name="Fulcrum"             href="http://jakarta.apache.org/turbine/fulcrum/"/>
     </links>
-    
+
     <menu name="Overview">
       <item name="Overview"            href="/index.html"/>
       <item name="Configuration"       href="/configuration.html"/>

Modified: jakarta/turbine/fulcrum/trunk/resourcemanager/xdocs/technical.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/resourcemanager/xdocs/technical.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/resourcemanager/xdocs/technical.xml (original)
+++ jakarta/turbine/fulcrum/trunk/resourcemanager/xdocs/technical.xml Fri May  4 23:58:06 2007
@@ -1,4 +1,22 @@
 <?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
 
 <document>
 
@@ -10,34 +28,34 @@
   <body>
 
     <section name="The Implementation">
-    
+
       <p>
-        The Fulcrum ResourceManager Services manages multiple ResourceManager. Each ResourceManager 
+        The Fulcrum ResourceManager Services manages multiple ResourceManager. Each ResourceManager
         is responsible for exactly one domain. Therefore the Fulcrum ResourceManager Services just
         delegates the method invocations to the various ResourceManagers.
       </p>
 
       <subsection name="The Domain">
         <p>
-          The resources are located in a domain. A domain definition contains the location of the 
-          hierarchical resources, a suffix to filter resources based on their externsion and 
+          The resources are located in a domain. A domain definition contains the location of the
+          hierarchical resources, a suffix to filter resources based on their externsion and
           a flag for using the locator feature
         </p>
 
         <p>
-          It is not possible to define a domain more than once since each domain has a unique name. But it 
+          It is not possible to define a domain more than once since each domain has a unique name. But it
           is possible to use different domain names and share a location using a suffix filter.
         </p>
-      </subsection>     
+      </subsection>
 
       <subsection name="The Context">
         <p>
           The context consist of a String[] and is used to locate a resource. The file system
           implementation iterates over the context and creates a relative file name
         </p>
-      </subsection>     
-        
-    </section> 
+      </subsection>
+
+    </section>
 
   </body>
 </document>

Modified: jakarta/turbine/fulcrum/trunk/resourcemanager/xdocs/usage.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/resourcemanager/xdocs/usage.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/resourcemanager/xdocs/usage.xml (original)
+++ jakarta/turbine/fulcrum/trunk/resourcemanager/xdocs/usage.xml Fri May  4 23:58:06 2007
@@ -1,4 +1,22 @@
 <?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
 
 <document>
 
@@ -21,7 +39,7 @@
         ]]>
         </source>
 
-    </section> 
+    </section>
 
   </body>
 </document>

Modified: jakarta/turbine/fulcrum/trunk/sample-avalon-conf.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/sample-avalon-conf.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/sample-avalon-conf.xml (original)
+++ jakarta/turbine/fulcrum/trunk/sample-avalon-conf.xml Fri May  4 23:58:06 2007
@@ -1,53 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
 <fulcrum-services>
 
 <!--
- 
+
  B S F  S E R V I C E
 
- -->
+-->
 <bsf use-property-file="true"
      scriptsDirectory="WEB-INF/scripts" defaultExtension="py"/>
 
 <!--
- 
+
  C A C H E  S E R V I C E
 
- -->
+-->
 <cache use-property-file="true"/>
 
 <!--
- 
+
  C R Y P T O  S E R V I C E
 
- -->
+-->
 <crypto use-property-file="true"/>
    <algorithm>
        <sha>com.foo.ShaProvider</sha>
-       <base64>org.bar.Base64Provider</base64>   
+       <base64>org.bar.Base64Provider</base64>
    </algorithm>
 </crypto>
 
 <!--
- 
+
  D V S L  S E R V I C E
 
- -->
+-->
 <dvsl/>
 
 <!--
- 
+
  I N T A K E  S E R V I C E
 
- -->
+-->
 <intake use-property-file="true"
-    xml-path="WEB-INF/conf/intake.xml" 
+    xml-path="WEB-INF/conf/intake.xml"
     serialize-path="WEB-INF/appData.ser"/>
 
 <!--
- 
+
   F A C T O R Y  S E R V I C E
 
- -->
+-->
 <factory use-property-file="true">
 
     <!-- (very optional)
@@ -59,8 +78,8 @@
 
     <!-- Default factory to use when no custom factory is specified. -->
     <!-- <default>org.foo.bar.DefaultFactory</default> -->
-    
-    <!--    
+
+    <!--
     Customized factories to be used instead of the default factory.
     E.g. to instantiate XML parsers, SSL sockets, etc., which require
     specific instantiation not supported by the default factory.
@@ -68,9 +87,9 @@
     name of the production class. The value is the class name of
     the factory implementing the Factory interface. The factory
     will be instantiated by using the service itself.
-  
+
     Examples:
- 
+
     <javax.xml.parsers.DocumentBuilder>
         org.foo.xml.DomBuilderFactory
     </javax.xml.parsers.DocumentBuilder>
@@ -86,36 +105,36 @@
 </factory>
 
 <!--
- 
+
  L O C A L I Z A T I O N  S E R V I C E
 
- -->
+-->
 <localization use-property-file="true"/>
 
 <!--
- 
+
  M I M E T Y P E  S E R V I C E
 
- -->
+-->
 <mimetype use-property-file="true"/>
 
 <!--
- 
+
  N A M I N G  S E R V I C E
 
- -->
+-->
 <jndi use-property-file="true"/>
 
 <!--
- 
+
   P O O L  S E R V I C E
 
- -->
+-->
 <pool use-property-file="true">
     <capacity>
-        <!-- 
-            Default capacity of pools of the Object pooling service. 
-            Default: 128 
+        <!--
+            Default capacity of pools of the Object pooling service.
+            Default: 128
         -->
         <default>128</default>
 
@@ -128,31 +147,31 @@
 </pool>
 
 <!--
- 
+
  S E C U R I T Y  S E R V I C E
 
- -->
+-->
 <security use-property-file="true"/>
 
 <!--
- 
+
  T E M P L A T E  S E R V I C E
 
- -->
+-->
 <template use-property-file="true"/>
 
 <!--
- 
+
  V E L O C I T Y  S E R V I C E
 
- -->
+-->
 <velocity use-property-file="true"/>
 
 <!--
- 
+
  J S P  S E R V I C E
 
- -->
+-->
 <jsp use-property-file="true"/>
 
 </fulcrum-services>

Modified: jakarta/turbine/fulcrum/trunk/script/maven.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/script/maven.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/script/maven.xml (original)
+++ jakarta/turbine/fulcrum/trunk/script/maven.xml Fri May  4 23:58:06 2007
@@ -1,48 +1,67 @@
-<project default="local:build" xmlns:deploy="deploy" xmlns:ant="jelly:ant">
-
-  <!-- ################################################################## -->
-  <!-- M A V E N  G O A L S                                               -->
-  <!-- ################################################################## -->
-
-  <goal name ="local:all" description="Creates everything for this project">
-    <attainGoal name="local:build"/>
-    <attainGoal name="local:site"/>
-  </goal>
-
-  <goal name ="local:clover-build" description="Builds all project artifacts with Clover instrumentation">
-    <attainGoal name="clover:on"/>
-    <attainGoal name="local:build"/>
-  </goal>
-
-  <goal name ="local:build" description="Builds all project artifacts">
-    <attainGoal name="clean"/>
-   <attainGoal name="jar:install"/>
-  </goal>
-
-  <goal name ="local:site" description="Builds the project site">
-    <attainGoal name="clean"/>
-    <attainGoal name="site"/>
-  </goal>
-
-  <goal name ="local:copy-deps" description="Copies the dependent JARs into lib">
-      <deploy:copy-deps todir="lib"/>
-  </goal>
-
-
-  <!-- ################################################################## -->
-  <!-- M A V E N  H O O K S                                               -->
-  <!-- ################################################################## -->
-
-  <postGoal name="clean:clean">
-    <echo>Deleting Eclipse directories</echo>
-    <ant:delete dir="classes"/>
-    <ant:delete file="temp/karma.txt"/>
-  </postGoal>
-
-  <preGoal name="jar:jar">
-    <ant:delete file="target/classes/componentRoles.xml"/>
-    <ant:delete file="target/classes/componentConfiguration.xml"/>
-    <ant:delete file="target/classes/log4j.properties"/>
-  </preGoal>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<project default="local:build" xmlns:deploy="deploy" xmlns:ant="jelly:ant">
+
+  <!-- ################################################################## -->
+  <!-- M A V E N  G O A L S                                               -->
+  <!-- ################################################################## -->
+
+  <goal name ="local:all" description="Creates everything for this project">
+    <attainGoal name="local:build"/>
+    <attainGoal name="local:site"/>
+  </goal>
+
+  <goal name ="local:clover-build" description="Builds all project artifacts with Clover instrumentation">
+    <attainGoal name="clover:on"/>
+    <attainGoal name="local:build"/>
+  </goal>
+
+  <goal name ="local:build" description="Builds all project artifacts">
+    <attainGoal name="clean"/>
+   <attainGoal name="jar:install"/>
+  </goal>
+
+  <goal name ="local:site" description="Builds the project site">
+    <attainGoal name="clean"/>
+    <attainGoal name="site"/>
+  </goal>
+
+  <goal name ="local:copy-deps" description="Copies the dependent JARs into lib">
+      <deploy:copy-deps todir="lib"/>
+  </goal>
+
+
+  <!-- ################################################################## -->
+  <!-- M A V E N  H O O K S                                               -->
+  <!-- ################################################################## -->
+
+  <postGoal name="clean:clean">
+    <echo>Deleting Eclipse directories</echo>
+    <ant:delete dir="classes"/>
+    <ant:delete file="temp/karma.txt"/>
+  </postGoal>
+
+  <preGoal name="jar:jar">
+    <ant:delete file="target/classes/componentRoles.xml"/>
+    <ant:delete file="target/classes/componentConfiguration.xml"/>
+    <ant:delete file="target/classes/log4j.properties"/>
+  </preGoal>
+
+</project>

Modified: jakarta/turbine/fulcrum/trunk/script/project.properties
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/script/project.properties?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/script/project.properties (original)
+++ jakarta/turbine/fulcrum/trunk/script/project.properties Fri May  4 23:58:06 2007
@@ -1,2 +1,18 @@
-# display the date on the site
-maven.xdoc.date = left
\ No newline at end of file
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# display the date on the site
+maven.xdoc.date = left

Modified: jakarta/turbine/fulcrum/trunk/script/project.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/script/project.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/script/project.xml (original)
+++ jakarta/turbine/fulcrum/trunk/script/project.xml Fri May  4 23:58:06 2007
@@ -1,58 +1,76 @@
-<?xml version="1.0"?>
-<project>
-  <extend>${basedir}/../project.xml</extend>
-  <id>fulcrum-script</id>
-  <name>Fulcrum Script Component</name>
-  <currentVersion>1.0.1-dev</currentVersion>
-
-  <dependencies>
-  
-    <!--  test dependencies -->
-    
-    <dependency>
-      <groupId>fulcrum</groupId>
-      <artifactId>fulcrum-testcontainer</artifactId>
-      <version>1.0.5</version>
-      <url>http://jakarta.apache.org/turbine/fulcrum/</url>
-    </dependency>
-    
-    <dependency>
-      <groupId>fulcrum</groupId>
-      <artifactId>fulcrum-yaafi</artifactId>
-      <version>1.0.4</version>
-      <url>http://jakarta.apache.org/turbine/fulcrum/</url>
-    </dependency>
-
-    <dependency>
-      <groupId>groovy</groupId>
-      <artifactId>groovy-all</artifactId>
-      <version>1.0-jsr-05</version>
-      <url>http://groovy.codehaus.org</url>
-    </dependency>
-
-    <dependency>
-      <groupId>rhino</groupId>
-      <artifactId>js</artifactId>
-      <version>1.6R2</version>
-      <url>http://www.mozilla.org/rhino</url>
-    </dependency>
-
-    <!-- compile/runtime dependencies -->
-    
-    <dependency>
-      <groupId>javax.script</groupId>
-      <artifactId>script</artifactId>
-      <version>1.0</version>
-      <url>http://www.jcp.org/aboutJava/communityprocess/pr/jsr223/</url>
-    </dependency>
-
-    <dependency>
-      <groupId>fulcrum</groupId>
-      <artifactId>fulcrum-resourcemanager</artifactId>
-      <version>1.0.1-dev</version>
-      <url>http://jakarta.apache.org/turbine/fulcrum/</url>
-    </dependency>
-
-  </dependencies>
-
-</project>
+<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<project>
+  <extend>${basedir}/../project.xml</extend>
+  <id>fulcrum-script</id>
+  <name>Fulcrum Script Component</name>
+  <currentVersion>1.0.1-dev</currentVersion>
+
+  <dependencies>
+
+    <!--  test dependencies -->
+
+    <dependency>
+      <groupId>fulcrum</groupId>
+      <artifactId>fulcrum-testcontainer</artifactId>
+      <version>1.0.5</version>
+      <url>http://jakarta.apache.org/turbine/fulcrum/</url>
+    </dependency>
+
+    <dependency>
+      <groupId>fulcrum</groupId>
+      <artifactId>fulcrum-yaafi</artifactId>
+      <version>1.0.4</version>
+      <url>http://jakarta.apache.org/turbine/fulcrum/</url>
+    </dependency>
+
+    <dependency>
+      <groupId>groovy</groupId>
+      <artifactId>groovy-all</artifactId>
+      <version>1.0-jsr-05</version>
+      <url>http://groovy.codehaus.org</url>
+    </dependency>
+
+    <dependency>
+      <groupId>rhino</groupId>
+      <artifactId>js</artifactId>
+      <version>1.6R2</version>
+      <url>http://www.mozilla.org/rhino</url>
+    </dependency>
+
+    <!-- compile/runtime dependencies -->
+
+    <dependency>
+      <groupId>javax.script</groupId>
+      <artifactId>script</artifactId>
+      <version>1.0</version>
+      <url>http://www.jcp.org/aboutJava/communityprocess/pr/jsr223/</url>
+    </dependency>
+
+    <dependency>
+      <groupId>fulcrum</groupId>
+      <artifactId>fulcrum-resourcemanager</artifactId>
+      <version>1.0.1-dev</version>
+      <url>http://jakarta.apache.org/turbine/fulcrum/</url>
+    </dependency>
+
+  </dependencies>
+
+</project>

Modified: jakarta/turbine/fulcrum/trunk/script/src/java/org/apache/fulcrum/script/ScriptAvalonContext.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/script/src/java/org/apache/fulcrum/script/ScriptAvalonContext.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/script/src/java/org/apache/fulcrum/script/ScriptAvalonContext.java (original)
+++ jakarta/turbine/fulcrum/trunk/script/src/java/org/apache/fulcrum/script/ScriptAvalonContext.java Fri May  4 23:58:06 2007
@@ -1,70 +1,72 @@
-package org.apache.fulcrum.script;
-
-/*
- * Copyright 2005 Apache Software Foundation
- * Licensed  under the  Apache License,  Version 2.0  (the "License");
- * you may not use  this file  except in  compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed  under the  License is distributed on an "AS IS" BASIS,
- * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
- * implied.
- *
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import java.io.File;
-
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.context.Context;
-import org.apache.avalon.framework.context.ContextException;
-import org.apache.avalon.framework.logger.Logger;
-import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.service.ServiceManager;
-
-/**
- * Holder class for Avalon related artifacts to be passed to a script.
- *
- * @author <a href="mailto:siegfried.goeschl@it20one.at">Siegfried Goeschl</a>
- */
-public interface ScriptAvalonContext
-{
-    /**
-     * @return Returns the configuration
-     */
-    Configuration getConfiguration();
-
-    /**
-     * @return Returns the context.
-     */
-    Context getContext();
-
-    /**
-     * @return Returns the logger.
-     */
-    Logger getLogger();
-
-    /**
-     * @return Returns the serviceManager.
-     */
-    ServiceManager getServiceManager();
-
-    /**
-     * @return Returns the parameters.
-     */
-    Parameters getParameters();
-
-    /**
-     * @return Returns the Avalon application directory
-     */
-    File getApplicationDir() throws ContextException;
-
-    /**
-     * @return Returns the Avalon application directory
-     */
-    File getTempDir() throws ContextException;
-}
+package org.apache.fulcrum.script;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.io.File;
+
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.context.Context;
+import org.apache.avalon.framework.context.ContextException;
+import org.apache.avalon.framework.logger.Logger;
+import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.avalon.framework.service.ServiceManager;
+
+/**
+ * Holder class for Avalon related artifacts to be passed to a script.
+ *
+ * @author <a href="mailto:siegfried.goeschl@it20one.at">Siegfried Goeschl</a>
+ */
+public interface ScriptAvalonContext
+{
+    /**
+     * @return Returns the configuration
+     */
+    Configuration getConfiguration();
+
+    /**
+     * @return Returns the context.
+     */
+    Context getContext();
+
+    /**
+     * @return Returns the logger.
+     */
+    Logger getLogger();
+
+    /**
+     * @return Returns the serviceManager.
+     */
+    ServiceManager getServiceManager();
+
+    /**
+     * @return Returns the parameters.
+     */
+    Parameters getParameters();
+
+    /**
+     * @return Returns the Avalon application directory
+     */
+    File getApplicationDir() throws ContextException;
+
+    /**
+     * @return Returns the Avalon application directory
+     */
+    File getTempDir() throws ContextException;
+}

Modified: jakarta/turbine/fulcrum/trunk/script/src/java/org/apache/fulcrum/script/ScriptRunnable.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/script/src/java/org/apache/fulcrum/script/ScriptRunnable.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/script/src/java/org/apache/fulcrum/script/ScriptRunnable.java (original)
+++ jakarta/turbine/fulcrum/trunk/script/src/java/org/apache/fulcrum/script/ScriptRunnable.java Fri May  4 23:58:06 2007
@@ -1,38 +1,40 @@
-package org.apache.fulcrum.script;
-
-/*
- * Copyright 2005 Apache Software Foundation
- * Licensed  under the  Apache License,  Version 2.0  (the "License");
- * you may not use  this file  except in  compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed  under the  License is distributed on an "AS IS" BASIS,
- * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
- * implied.
- *
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import java.util.Map;
-
-/**
- * A Runnable executing scripts
- *
- * @author <a href="mailto:siegfried.goeschl@it20one.at">Siegfried Goeschl</a>
- */
-public interface ScriptRunnable extends Runnable
-{
-    /**
-     * @param args The args to be used.
-     */
-    void setArgs(Map args);
-
-    /**
-     * @return Returns the result.
-     */
-    Object getResult() throws Exception;
-}
+package org.apache.fulcrum.script;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.util.Map;
+
+/**
+ * A Runnable executing scripts
+ *
+ * @author <a href="mailto:siegfried.goeschl@it20one.at">Siegfried Goeschl</a>
+ */
+public interface ScriptRunnable extends Runnable
+{
+    /**
+     * @param args The args to be used.
+     */
+    void setArgs(Map args);
+
+    /**
+     * @return Returns the result.
+     */
+    Object getResult() throws Exception;
+}

Modified: jakarta/turbine/fulcrum/trunk/script/src/java/org/apache/fulcrum/script/ScriptService.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/script/src/java/org/apache/fulcrum/script/ScriptService.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/script/src/java/org/apache/fulcrum/script/ScriptService.java (original)
+++ jakarta/turbine/fulcrum/trunk/script/src/java/org/apache/fulcrum/script/ScriptService.java Fri May  4 23:58:06 2007
@@ -1,114 +1,116 @@
-package org.apache.fulcrum.script;
-
-/*
- * Copyright 2005 Apache Software Foundation
- * Licensed  under the  Apache License,  Version 2.0  (the "License");
- * you may not use  this file  except in  compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed  under the  License is distributed on an "AS IS" BASIS,
- * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
- * implied.
- *
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import java.io.IOException;
-
-import javax.script.Namespace;
-import javax.script.ScriptContext;
-import javax.script.ScriptEngine;
-import javax.script.ScriptEngineManager;
-import javax.script.ScriptException;
-
-/**
- * An Avalon service to execute scripts based on JSR-223.
- * 
- * @author <a href="mailto:siegfried.goeschl@it20one.at">Siegfried Goeschl</a>
- */
-public interface ScriptService
-{
-    /**
-     * @return the underlying ScriptEngineManager.
-     */
-    ScriptEngineManager getScriptEngineManager();
-
-    /**
-     * @return the underlying default ScriptEngine.
-     */
-    ScriptEngine getScriptEngine();
-
-    /**
-     * Does the script exist?
-     *
-     * @param scriptName the name of the script
-     * @return true if the script exists
-     */
-    boolean exists( String scriptName );
-
-    /**
-     * Executes the specified script. The default ScriptContext 
-     * for the ScriptEngine  is used.
-     *
-     * @param scriptName the name of the script
-     * @return result from the executed script
-     * @throws IOException loading the script failed
-     * @throws ScriptException if an error occurrs during script execution.
-     */
-    Object eval( String scriptName ) throws IOException, ScriptException;
-
-    /**
-     * Executes the script using the Namespace argument 
-     * as the ENGINE_SCOPE  Namespace of the ScriptEngine 
-     * during the script execution.
-     *
-     * @param scriptName the name of the script
-     * @param namespace The Namespace of attributes
-     * @return result from the executed script
-     * @throws IOException loading the script failed
-     * @throws ScriptException if an error occurrs during script execution.
-     */
-    Object eval( String scriptName, Namespace namespace ) throws IOException, ScriptException;
-
-    /**
-     * Causes the immediate execution of the script. State left in the engine
-     * from previous executions, including variable values
-     * and compiled procedures may be visible during this 
-     * execution.
-     *
-     * @param scriptName the name of the script
-     * @param context The ScriptContext passed to the script engine.
-     * @return result from the executed script
-     * @throws IOException loading the script failed
-     * @throws ScriptException if an error occurrs during script execution.
-     */
-    Object eval( String scriptName, ScriptContext context ) throws IOException, ScriptException;
-
-    /**
-     * Calls a procedure compiled during a previous script execution, 
-     * which is retained in the state of the ScriptEngine.
-     * 
-     * @param name The name of the procedure to be called.
-     * @param args An array of arguments to pass to the procedure.
-     * @return The value returned by the procedure
-     * @throws ScriptException if an error occurrs during script execution
-     * @throws NoSuchMethodException If method with given name or matching argument types cannot be found.
-     */
-    Object call( String name, Object[] args ) throws ScriptException, NoSuchMethodException;        
-
-    /**
-     * Return an object implementing the given interface. It
-     * uses the default scripting engine defined in the role
-     * configuration. This method only works if it is supported
-     * by underlying scripting engine, e.g. Javascript but not
-     * Groovy, by implementing the interface <bold>Invocable</bold> 
-     * 
-     * @param clazz the interface to implement
-     * @return an scripted object implementing the given interface.
-     */
-    Object getInterface( Class clazz );        
-}
+package org.apache.fulcrum.script;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.io.IOException;
+
+import javax.script.Namespace;
+import javax.script.ScriptContext;
+import javax.script.ScriptEngine;
+import javax.script.ScriptEngineManager;
+import javax.script.ScriptException;
+
+/**
+ * An Avalon service to execute scripts based on JSR-223.
+ *
+ * @author <a href="mailto:siegfried.goeschl@it20one.at">Siegfried Goeschl</a>
+ */
+public interface ScriptService
+{
+    /**
+     * @return the underlying ScriptEngineManager.
+     */
+    ScriptEngineManager getScriptEngineManager();
+
+    /**
+     * @return the underlying default ScriptEngine.
+     */
+    ScriptEngine getScriptEngine();
+
+    /**
+     * Does the script exist?
+     *
+     * @param scriptName the name of the script
+     * @return true if the script exists
+     */
+    boolean exists( String scriptName );
+
+    /**
+     * Executes the specified script. The default ScriptContext
+     * for the ScriptEngine  is used.
+     *
+     * @param scriptName the name of the script
+     * @return result from the executed script
+     * @throws IOException loading the script failed
+     * @throws ScriptException if an error occurrs during script execution.
+     */
+    Object eval( String scriptName ) throws IOException, ScriptException;
+
+    /**
+     * Executes the script using the Namespace argument
+     * as the ENGINE_SCOPE  Namespace of the ScriptEngine
+     * during the script execution.
+     *
+     * @param scriptName the name of the script
+     * @param namespace The Namespace of attributes
+     * @return result from the executed script
+     * @throws IOException loading the script failed
+     * @throws ScriptException if an error occurrs during script execution.
+     */
+    Object eval( String scriptName, Namespace namespace ) throws IOException, ScriptException;
+
+    /**
+     * Causes the immediate execution of the script. State left in the engine
+     * from previous executions, including variable values
+     * and compiled procedures may be visible during this
+     * execution.
+     *
+     * @param scriptName the name of the script
+     * @param context The ScriptContext passed to the script engine.
+     * @return result from the executed script
+     * @throws IOException loading the script failed
+     * @throws ScriptException if an error occurrs during script execution.
+     */
+    Object eval( String scriptName, ScriptContext context ) throws IOException, ScriptException;
+
+    /**
+     * Calls a procedure compiled during a previous script execution,
+     * which is retained in the state of the ScriptEngine.
+     *
+     * @param name The name of the procedure to be called.
+     * @param args An array of arguments to pass to the procedure.
+     * @return The value returned by the procedure
+     * @throws ScriptException if an error occurrs during script execution
+     * @throws NoSuchMethodException If method with given name or matching argument types cannot be found.
+     */
+    Object call( String name, Object[] args ) throws ScriptException, NoSuchMethodException;
+
+    /**
+     * Return an object implementing the given interface. It
+     * uses the default scripting engine defined in the role
+     * configuration. This method only works if it is supported
+     * by underlying scripting engine, e.g. Javascript but not
+     * Groovy, by implementing the interface <bold>Invocable</bold>
+     *
+     * @param clazz the interface to implement
+     * @return an scripted object implementing the given interface.
+     */
+    Object getInterface( Class clazz );
+}

Modified: jakarta/turbine/fulcrum/trunk/script/src/java/org/apache/fulcrum/script/impl/ScriptAvalonContextImpl.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/script/src/java/org/apache/fulcrum/script/impl/ScriptAvalonContextImpl.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/script/src/java/org/apache/fulcrum/script/impl/ScriptAvalonContextImpl.java (original)
+++ jakarta/turbine/fulcrum/trunk/script/src/java/org/apache/fulcrum/script/impl/ScriptAvalonContextImpl.java Fri May  4 23:58:06 2007
@@ -1,137 +1,139 @@
-package org.apache.fulcrum.script.impl;
-
-/*
- * Copyright 2005 Apache Software Foundation
- * Licensed  under the  Apache License,  Version 2.0  (the "License");
- * you may not use  this file  except in  compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed  under the  License is distributed on an "AS IS" BASIS,
- * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
- * implied.
- *
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import java.io.File;
-
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.context.Context;
-import org.apache.avalon.framework.context.ContextException;
-import org.apache.avalon.framework.logger.Logger;
-import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.fulcrum.script.ScriptAvalonContext;
-
-/**
- * Holder class for Avalon related stuff.
- *
- * @author <a href="mailto:siegfried.goeschl@it20one.at">Siegfried Goeschl</a>
- */
-public class ScriptAvalonContextImpl implements ScriptAvalonContext
-{
-    /** context key for persistent directory*/
-    private final static String URN_AVALON_HOME = "urn:avalon:home";
-
-    /** context key for temporary directory */
-    private final static String URN_AVALON_TEMP = "urn:avalon:temp";
-
-    /** the Avalon service manager instance */
-    private ServiceManager serviceManager;
-
-    /** the Avalon context */
-    private Context context;
-
-    /** the Avalon logger to use */
-    private Logger logger;
-
-    /** the Avalon configuration to be used */
-    private Configuration configuration;
-
-    /** the Avalon parameters to be used */
-    private Parameters parameters;
-
-    /**
-     * Constructor
-     * @param logger the Avalon logger
-     * @param serviceManager the Avalon ServiceManager
-     * @param context the Avalon context
-     * @param configuration the Avalon configuration
-     * @param parameters the Avalon parameters
-     */
-    public ScriptAvalonContextImpl(
-        Logger logger,
-        ServiceManager serviceManager,
-        Context context,
-        Configuration configuration,
-        Parameters parameters )
-    {
-        this.logger = logger;
-        this.serviceManager = serviceManager;
-        this.context = context;
-        this.configuration = configuration;
-        this.parameters = parameters;
-    }
-
-    /**
-     * @return Returns the context.
-     */
-    public Context getContext()
-    {
-        return context;
-    }
-
-    /**
-     * @return Returns the logger.
-     */
-    public Logger getLogger()
-    {
-        return logger;
-    }
-
-    /**
-     * @return Returns the serviceManager.
-     */
-    public ServiceManager getServiceManager()
-    {
-        return serviceManager;
-    }
-
-    /**
-     * @return Returns the Avalon application directory
-     */
-    public File getApplicationDir()
-        throws ContextException
-    {
-        return (File) this.context.get(URN_AVALON_HOME);
-    }
-
-    /**
-     * @return Returns the Avalon application directory
-     */
-    public File getTempDir()
-        throws ContextException
-    {
-        return (File) this.context.get(URN_AVALON_TEMP);
-    }
-
-    /**
-     * @return Returns the configuration.
-     */
-    public Configuration getConfiguration()
-    {
-        return configuration;
-    }
-
-    /**
-     * @return Returns the parameters.
-     */
-    public Parameters getParameters()
-    {
-        return parameters;
-    }
-}
+package org.apache.fulcrum.script.impl;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.io.File;
+
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.context.Context;
+import org.apache.avalon.framework.context.ContextException;
+import org.apache.avalon.framework.logger.Logger;
+import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.fulcrum.script.ScriptAvalonContext;
+
+/**
+ * Holder class for Avalon related stuff.
+ *
+ * @author <a href="mailto:siegfried.goeschl@it20one.at">Siegfried Goeschl</a>
+ */
+public class ScriptAvalonContextImpl implements ScriptAvalonContext
+{
+    /** context key for persistent directory*/
+    private final static String URN_AVALON_HOME = "urn:avalon:home";
+
+    /** context key for temporary directory */
+    private final static String URN_AVALON_TEMP = "urn:avalon:temp";
+
+    /** the Avalon service manager instance */
+    private ServiceManager serviceManager;
+
+    /** the Avalon context */
+    private Context context;
+
+    /** the Avalon logger to use */
+    private Logger logger;
+
+    /** the Avalon configuration to be used */
+    private Configuration configuration;
+
+    /** the Avalon parameters to be used */
+    private Parameters parameters;
+
+    /**
+     * Constructor
+     * @param logger the Avalon logger
+     * @param serviceManager the Avalon ServiceManager
+     * @param context the Avalon context
+     * @param configuration the Avalon configuration
+     * @param parameters the Avalon parameters
+     */
+    public ScriptAvalonContextImpl(
+        Logger logger,
+        ServiceManager serviceManager,
+        Context context,
+        Configuration configuration,
+        Parameters parameters )
+    {
+        this.logger = logger;
+        this.serviceManager = serviceManager;
+        this.context = context;
+        this.configuration = configuration;
+        this.parameters = parameters;
+    }
+
+    /**
+     * @return Returns the context.
+     */
+    public Context getContext()
+    {
+        return context;
+    }
+
+    /**
+     * @return Returns the logger.
+     */
+    public Logger getLogger()
+    {
+        return logger;
+    }
+
+    /**
+     * @return Returns the serviceManager.
+     */
+    public ServiceManager getServiceManager()
+    {
+        return serviceManager;
+    }
+
+    /**
+     * @return Returns the Avalon application directory
+     */
+    public File getApplicationDir()
+        throws ContextException
+    {
+        return (File) this.context.get(URN_AVALON_HOME);
+    }
+
+    /**
+     * @return Returns the Avalon application directory
+     */
+    public File getTempDir()
+        throws ContextException
+    {
+        return (File) this.context.get(URN_AVALON_TEMP);
+    }
+
+    /**
+     * @return Returns the configuration.
+     */
+    public Configuration getConfiguration()
+    {
+        return configuration;
+    }
+
+    /**
+     * @return Returns the parameters.
+     */
+    public Parameters getParameters()
+    {
+        return parameters;
+    }
+}

Modified: jakarta/turbine/fulcrum/trunk/script/src/java/org/apache/fulcrum/script/impl/ScriptBaseService.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/script/src/java/org/apache/fulcrum/script/impl/ScriptBaseService.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/script/src/java/org/apache/fulcrum/script/impl/ScriptBaseService.java (original)
+++ jakarta/turbine/fulcrum/trunk/script/src/java/org/apache/fulcrum/script/impl/ScriptBaseService.java Fri May  4 23:58:06 2007
@@ -1,185 +1,187 @@
-package org.apache.fulcrum.script.impl;
-
-/*
- * Copyright 2005 Apache Software Foundation
- * Licensed  under the  Apache License,  Version 2.0  (the "License");
- * you may not use  this file  except in  compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed  under the  License is distributed on an "AS IS" BASIS,
- * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
- * implied.
- *
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import java.io.File;
-
-import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.configuration.Configurable;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.configuration.Reconfigurable;
-import org.apache.avalon.framework.context.Context;
-import org.apache.avalon.framework.context.ContextException;
-import org.apache.avalon.framework.context.Contextualizable;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.parameters.ParameterException;
-import org.apache.avalon.framework.parameters.Parameterizable;
-import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.service.ServiceException;
-import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.avalon.framework.service.Serviceable;
-
-/**
- * Base class for a service implementation capturing the Avalon
- * configuration artifats. This is basically a "copy-and-waste" from
- * the YAAFI framework.
- *
- * @author <a href="mailto:siegfried.goeschl@it20one.at">Siegfried Goeschl</a>
- */
-
-public abstract class ScriptBaseService
-    extends AbstractLogEnabled
-    implements Contextualizable, Serviceable, Configurable, Parameterizable, Reconfigurable, Disposable
-{
-    /** context key for persistent directory */
-    private final static String URN_AVALON_HOME = "urn:avalon:home";
-
-    /** context key for temporary directory */
-    private final static String URN_AVALON_TEMP = "urn:avalon:temp";
-
-    /** The context supplied by the avalon framework */
-    private Context context;
-
-    /** The service manager supplied by the avalon framework */
-    private ServiceManager serviceManager;
-
-    /** The configuraton supplied by the avalon framework */
-    private Configuration configuration;
-
-    /** The parameters supplied by the avalon framework */
-    private Parameters parameters;
-
-    /** the Avalon application directory */
-    private File applicationDir;
-
-    /** the Avalon temp directory */
-    private File tempDir;
-
-    /**
-     * Constructor
-     */
-    public ScriptBaseService()
-    {
-        // nothing to do
-    }
-
-    /**
-     * @see org.apache.avalon.framework.context.Contextualizable#contextualize(org.apache.avalon.framework.context.Context)
-     */
-    public void contextualize(Context context) throws ContextException
-    {
-        this.context        = context;
-        this.applicationDir = (File) context.get(URN_AVALON_HOME);
-        this.tempDir        = (File) context.get(URN_AVALON_TEMP);
-    }
-
-    /**
-     * @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
-     */
-    public void service(ServiceManager serviceManager) throws ServiceException
-    {
-        this.serviceManager = serviceManager;
-    }
-
-    /**
-     * @see org.apache.avalon.framework.configuration.Configurable#configure(org.apache.avalon.framework.configuration.Configuration)
-     */
-    public void configure(Configuration configuration) throws ConfigurationException
-    {
-        this.configuration = configuration;
-    }
-
-    /**
-     * @see org.apache.avalon.framework.parameters.Parameterizable#parameterize(org.apache.avalon.framework.parameters.Parameters)
-     */
-    public void parameterize(Parameters parameters) throws ParameterException
-    {
-        this.parameters = parameters;
-    }
-
-    /**
-     * @see org.apache.avalon.framework.configuration.Reconfigurable#reconfigure(org.apache.avalon.framework.configuration.Configuration)
-     */
-    public void reconfigure(Configuration configuration)
-        throws ConfigurationException
-    {
-        this.configuration = configuration;
-    }
-
-    /**
-     * @see org.apache.avalon.framework.activity.Disposable#dispose()
-     */
-    public void dispose()
-    {
-        this.applicationDir = null;
-        this.tempDir = null;
-        this.context = null;
-        this.serviceManager = null;
-        this.parameters = null;
-        this.configuration = null;
-    }
-
-    /**
-     * @return Returns the configuration.
-     */
-    protected Configuration getConfiguration()
-    {
-        return this.configuration;
-    }
-
-    /**
-     * @return Returns the context.
-     */
-    protected Context getContext()
-    {
-        return this.context;
-    }
-
-    /**
-     * @return Returns the parameters.
-     */
-    protected Parameters getParameters()
-    {
-        return this.parameters;
-    }
-
-    /**
-     * @return Returns the serviceManager.
-     */
-    protected ServiceManager getServiceManager()
-    {
-        return this.serviceManager;
-    }
-
-    /**
-     * @return Returns the applicationDir.
-     */
-    public File getApplicationDir()
-    {
-        return applicationDir;
-    }
-
-    /**
-     * @return Returns the tempDir.
-     */
-    public File getTempDir()
-    {
-        return tempDir;
-    }
-}
+package org.apache.fulcrum.script.impl;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.io.File;
+
+import org.apache.avalon.framework.activity.Disposable;
+import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.configuration.Reconfigurable;
+import org.apache.avalon.framework.context.Context;
+import org.apache.avalon.framework.context.ContextException;
+import org.apache.avalon.framework.context.Contextualizable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.avalon.framework.parameters.ParameterException;
+import org.apache.avalon.framework.parameters.Parameterizable;
+import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.service.Serviceable;
+
+/**
+ * Base class for a service implementation capturing the Avalon
+ * configuration artifats. This is basically a "copy-and-waste" from
+ * the YAAFI framework.
+ *
+ * @author <a href="mailto:siegfried.goeschl@it20one.at">Siegfried Goeschl</a>
+ */
+
+public abstract class ScriptBaseService
+    extends AbstractLogEnabled
+    implements Contextualizable, Serviceable, Configurable, Parameterizable, Reconfigurable, Disposable
+{
+    /** context key for persistent directory */
+    private final static String URN_AVALON_HOME = "urn:avalon:home";
+
+    /** context key for temporary directory */
+    private final static String URN_AVALON_TEMP = "urn:avalon:temp";
+
+    /** The context supplied by the avalon framework */
+    private Context context;
+
+    /** The service manager supplied by the avalon framework */
+    private ServiceManager serviceManager;
+
+    /** The configuraton supplied by the avalon framework */
+    private Configuration configuration;
+
+    /** The parameters supplied by the avalon framework */
+    private Parameters parameters;
+
+    /** the Avalon application directory */
+    private File applicationDir;
+
+    /** the Avalon temp directory */
+    private File tempDir;
+
+    /**
+     * Constructor
+     */
+    public ScriptBaseService()
+    {
+        // nothing to do
+    }
+
+    /**
+     * @see org.apache.avalon.framework.context.Contextualizable#contextualize(org.apache.avalon.framework.context.Context)
+     */
+    public void contextualize(Context context) throws ContextException
+    {
+        this.context        = context;
+        this.applicationDir = (File) context.get(URN_AVALON_HOME);
+        this.tempDir        = (File) context.get(URN_AVALON_TEMP);
+    }
+
+    /**
+     * @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
+     */
+    public void service(ServiceManager serviceManager) throws ServiceException
+    {
+        this.serviceManager = serviceManager;
+    }
+
+    /**
+     * @see org.apache.avalon.framework.configuration.Configurable#configure(org.apache.avalon.framework.configuration.Configuration)
+     */
+    public void configure(Configuration configuration) throws ConfigurationException
+    {
+        this.configuration = configuration;
+    }
+
+    /**
+     * @see org.apache.avalon.framework.parameters.Parameterizable#parameterize(org.apache.avalon.framework.parameters.Parameters)
+     */
+    public void parameterize(Parameters parameters) throws ParameterException
+    {
+        this.parameters = parameters;
+    }
+
+    /**
+     * @see org.apache.avalon.framework.configuration.Reconfigurable#reconfigure(org.apache.avalon.framework.configuration.Configuration)
+     */
+    public void reconfigure(Configuration configuration)
+        throws ConfigurationException
+    {
+        this.configuration = configuration;
+    }
+
+    /**
+     * @see org.apache.avalon.framework.activity.Disposable#dispose()
+     */
+    public void dispose()
+    {
+        this.applicationDir = null;
+        this.tempDir = null;
+        this.context = null;
+        this.serviceManager = null;
+        this.parameters = null;
+        this.configuration = null;
+    }
+
+    /**
+     * @return Returns the configuration.
+     */
+    protected Configuration getConfiguration()
+    {
+        return this.configuration;
+    }
+
+    /**
+     * @return Returns the context.
+     */
+    protected Context getContext()
+    {
+        return this.context;
+    }
+
+    /**
+     * @return Returns the parameters.
+     */
+    protected Parameters getParameters()
+    {
+        return this.parameters;
+    }
+
+    /**
+     * @return Returns the serviceManager.
+     */
+    protected ServiceManager getServiceManager()
+    {
+        return this.serviceManager;
+    }
+
+    /**
+     * @return Returns the applicationDir.
+     */
+    public File getApplicationDir()
+    {
+        return applicationDir;
+    }
+
+    /**
+     * @return Returns the tempDir.
+     */
+    public File getTempDir()
+    {
+        return tempDir;
+    }
+}



---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org