DPML Notify

[mcconnell at BerliOS <mcconnell AT mail.berlios.de>]

Author: mcconnell
Date: 2006-04-10 22:35:29 +0200 (Mon, 10 Apr 2006)
New Revision: 1353

Added:
   
trunk/main/depot/library/src/test/net/dpml/library/info/InfoDirectiveTestCase.java
   trunk/main/depot/library/src/test/net/dpml/library/info/ScopeTestCase.java
   trunk/main/depot/tools/builder/etc/prefs/xmls/processors.xml
Modified:
   trunk/main/depot/library/src/main/net/dpml/library/info/InfoDirective.java
   trunk/main/planet/http/module.xml
Log:
update to Jetty 6.0.0-B14

Modified: 
trunk/main/depot/library/src/main/net/dpml/library/info/InfoDirective.java
===================================================================
--- 
trunk/main/depot/library/src/main/net/dpml/library/info/InfoDirective.java  
2006-04-10 17:56:36 UTC (rev 1352)
+++ 
trunk/main/depot/library/src/main/net/dpml/library/info/InfoDirective.java  
2006-04-10 20:35:29 UTC (rev 1353)
@@ -36,8 +36,9 @@
     private final String m_description;
     
    /**
-    * Creation of a new anonymous resource directive.
-    * @param token the filter token
+    * Creation of a new info directive.
+    * @param title the title
+    * @param description the description
     */
     public InfoDirective( final String title, final String description )
     {

Added: 
trunk/main/depot/library/src/test/net/dpml/library/info/InfoDirectiveTestCase.java
===================================================================
--- 
trunk/main/depot/library/src/test/net/dpml/library/info/InfoDirectiveTestCase.java
  2006-04-10 17:56:36 UTC (rev 1352)
+++ 
trunk/main/depot/library/src/test/net/dpml/library/info/InfoDirectiveTestCase.java
  2006-04-10 20:35:29 UTC (rev 1353)
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2005 Stephen J. McConnell
+ *
+ * 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.
+ */
+
+package net.dpml.library.info;
+
+/**
+ * The ImportDirective class describes a the inclusion of a typed value.
+ *
+ * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
+ * @version @PROJECT-VERSION@
+ */
+public final class InfoDirectiveTestCase extends AbstractTestCase
+{
+    static final InfoDirective INFO = new InfoDirective( "test", "about 
test" );
+
+   /**
+    * Test construction of an info directive with null title and description.
+    */
+    public void testNullArgs()
+    {
+        InfoDirective info = new InfoDirective( null, null );
+        assertNull( "title", info.getTitle() );
+        assertNull( "description", info.getDescription() );
+        assertTrue( "is-null", info.isNull() );
+    }
+    
+   /**
+    * Test construction of an info directive with a title and null 
description.
+    */
+    public void testNullDescription()
+    {
+        InfoDirective info = new InfoDirective( "title", null );
+        assertEquals( "title", "title", info.getTitle() );
+        assertNull( "description", info.getDescription() );
+        assertFalse( "is-null", info.isNull() );
+    }
+    
+   /**
+    * Test construction of an info directive with a null title and non-null 
description.
+    */
+    public void testNullTitle()
+    {
+        InfoDirective info = new InfoDirective( null, "something" );
+        assertNull( "title", info.getTitle() );
+        assertEquals( "description", "something", info.getDescription() );
+        assertFalse( "is-null", info.isNull() );
+    }
+    
+   /**
+    * Test construction of an info directive with a title and description.
+    */
+    public void testFullyPopulatedInfo()
+    {
+        InfoDirective info = new InfoDirective( "title", "something" );
+        assertEquals( "title", "title", info.getTitle() );
+        assertEquals( "description", "something", info.getDescription() );
+        assertFalse( "is-null", info.isNull() );
+    }
+    
+   /**
+    * Test directive serialization.
+    * @exception Exception if an error occurs
+    */
+    public void testSerialization() throws Exception
+    {
+        InfoDirective info = 
+          new InfoDirective( "test", "something" );
+        doSerializationTest( info );
+    }
+
+}

Added: 
trunk/main/depot/library/src/test/net/dpml/library/info/ScopeTestCase.java
===================================================================
--- 
trunk/main/depot/library/src/test/net/dpml/library/info/ScopeTestCase.java  
2006-04-10 17:56:36 UTC (rev 1352)
+++ 
trunk/main/depot/library/src/test/net/dpml/library/info/ScopeTestCase.java  
2006-04-10 20:35:29 UTC (rev 1353)
@@ -0,0 +1,93 @@
+/*
+ * Copyright 2005 Stephen J. McConnell
+ *
+ * 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.
+ */
+
+package net.dpml.library.info;
+
+/**
+ * Test the scope enumeration.
+ *
+ * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
+ * @version @PROJECT-VERSION@
+ */
+public final class ScopeTestCase extends AbstractTestCase
+{
+    static final InfoDirective INFO = new InfoDirective( "test", "about 
test" );
+
+   /**
+    * Test build scope.
+    */
+    public void testBuildScope()
+    {
+        Scope scope = Scope.parse( "build" );
+        assertEquals( "scope", scope, Scope.BUILD );
+    }
+    
+   /**
+    * Test runtime scope.
+    */
+    public void testRuntimeScope()
+    {
+        Scope scope = Scope.parse( "runtime" );
+        assertEquals( "scope", scope, Scope.RUNTIME );
+    }
+    
+   /**
+    * Test test scope.
+    */
+    public void testTestScope()
+    {
+        Scope scope = Scope.parse( "test" );
+        assertEquals( "scope", scope, Scope.TEST );
+    }
+    
+   /**
+    * Test illegal scope.
+    */
+    public void testIllegalScope()
+    {
+        try
+        {
+            Scope scope = Scope.parse( "abc" );
+            fail( "Did not throw IllegalArgumentException" );
+        }
+        catch( IllegalArgumentException e )
+        {
+            // success
+        }
+    }
+    
+   /**
+    * Test illegal scope.
+    */
+    public void testEnumerationCount()
+    {
+        Scope[] scopes = Scope.values();
+        assertEquals( "scope count", 3, scopes.length );
+    }
+    
+   /**
+    * Test directive serialization.
+    * @exception Exception if an error occurs
+    */
+    public void testSerialization() throws Exception
+    {
+        Scope scope = Scope.parse( "test" );
+        doSerializationTest( scope );
+    }
+
+}

Added: trunk/main/depot/tools/builder/etc/prefs/xmls/processors.xml
===================================================================
--- trunk/main/depot/tools/builder/etc/prefs/xmls/processors.xml        
2006-04-10 17:56:36 UTC (rev 1352)
+++ trunk/main/depot/tools/builder/etc/prefs/xmls/processors.xml        
2006-04-10 20:35:29 UTC (rev 1353)
@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!--
+Default configuration for Depot-on-Ant.
+Status: work-in-progress
+-->
+
+<configuration>
+
+  <phases>
+   
+    <phase name="init">
+    
+      <process name="setup">
+        <produces>
+          <dir path="${basedir}/etc" name="etc"/>
+          <dir path="${basedir}/src" name="src"/>
+          <dir path="${basedir}/target" name="target"/>
+          <dir path="${etc}/main" name="etc.main"/>
+          <dir path="${etc}/test" name="etc.test"/>
+          <dir path="${etc}/prefs" name="etc.prefs"/>
+          <dir path="${etc}/bin" name="etc.bin"/>
+          <dir path="${etc}/deliverables" name="etc.deliverables"/>
+          <dir path="${etc}/docs" name="etc.docs"/>
+          <dir path="${src}/main" name="src.main"/>
+          <dir path="${src}/docs" name="src.docs"/>
+          <dir path="${src}/test" name="src.test"/>
+        </produces>
+      </process>
+
+    </phase>
+    
+    <phase name="prepare" depends="init">
+    
+      <process name="prepare-prefs">
+        <consumes>
+          <ref id="etc.prefs"/>
+        </consumes>
+        <produces>
+          <dir path="${target}/prefs" name="target.prefs"/>
+        </produces>
+      </process>
+
+      <process name="prepare-deliverables">
+        <consumes>
+          <ref id="etc.deliverables"/>
+        </consumes>
+        <produces>
+          <dir path="${target}/deliverables" name="target.deliverables"/>
+        </produces>
+      </process>
+  
+      <process name="prepare-main">
+        <consumes>
+          <ref id="target"/>
+          <ref id="etc.main" optional="true"/>
+          <ref id="src.main" optional="true"/>
+        </consumes>
+        <produces>
+          <dir path="${target}/build/main" name="target.build.main"/>
+        </produces>
+      </process>
+
+      <process name="prepare-test">
+        <consumes>
+          <ref id="etc.test" optional="true"/>
+          <ref id="src.test" optional="true"/>
+        </consumes>
+        <produces>
+          <dir path="${target}/build/test" name="target.build.test"/>
+        </produces>
+      </process>
+      
+      <process name="prepare-docs">
+        <consumes>
+          <ref id="etc.docs" optional="true"/>
+          <ref id="src.docs" optional="true"/>
+        </consumes>
+        <produces>
+          <dir path="${target}/build/docs" name="target.build.docs"/>
+        </produces>
+      </process>
+      
+    </phase>
+    
+    <phase name="build" depends="prepare">
+      
+      <process name="build-main">
+        <consumes>
+          <ref id="target.build.main" optional="true"/>
+        </consumes>
+        <produces>
+          <dir path="${target}/classes/main" name="target.classes.main"/>
+        </produces>
+      </process>
+      
+      <process name="build-test">
+        <consumes>
+          <ref id="target.build.test" optional="true"/>
+        </consumes>
+        <produces>
+          <dir path="${target}/classes/test" name="target.classes.test"/>
+        </produces>
+      </process>
+      
+    </phase>
+    
+    <phase name="package" depends="build">
+    
+      <process name="jar">
+        <consumes>
+          <ref id="target.deliverables"/>
+          <ref id="target.classes.main" optional="true"/>
+        </consumes>
+        <produces>
+          <resource base="{target.deliverables}" 
name="target.deliverables.jar"/>
+        </produces>
+      </process>
+
+      <process name="part" id="part">
+        <consumes>
+          <ref id="target.deliverables.jar" optional="true"/>
+        </consumes>
+        <produces>
+          <resource base="{target.deliverables}" 
name="target.deliverables.part"/>
+        </produces>
+      </process>
+
+    </phase>
+    
+    <phase name="test" depends="package">
+
+      <process name="unit-test">
+        <consumes>
+          <ref id="target.classes.test" optional="true"/>
+          <ref id="target.deliverables.jar" optional="true"/>
+        </consumes>
+        <produces>
+          <dir path="${target}/reports/test" name="target.reports.test"/>
+        </produces>
+      </process>
+
+    </phase>
+    
+    <phase name="install" depends="test">
+
+      <process name="prefs">
+        <consumes>
+          <ref id="target.prefs"/>
+        </consumes>
+        <produces>
+          <collection layout="classic" base="${dpml.prefs}" name="prefs"/>
+        </produces>
+      </process>
+
+      <process name="deliverables">
+        <consumes>
+          <ref id="target.deliverables"/>
+        </consumes>
+        <produces>
+          <collection layout="classic" base="${dpml.cache}"  name="cache"/>
+        </produces>
+      </process>
+
+    </phase>
+    
+    <phase name="clean" depends="init">
+
+      <process name="purge">
+        <consumes>
+          <ref id="target"/>
+        </consumes>
+      </process>
+    
+    </phase>
+    
+  </phases>
+    
+</configuration>
+

Modified: trunk/main/planet/http/module.xml
===================================================================
--- trunk/main/planet/http/module.xml   2006-04-10 17:56:36 UTC (rev 1352)
+++ trunk/main/planet/http/module.xml   2006-04-10 20:35:29 UTC (rev 1353)
@@ -14,11 +14,12 @@
       <runtime>
         <include ref="dpml/metro/dpml-metro-model"/>
         <include ref="dpml/util/dpml-logging-api"/>
-        <include urn="artifact:jar:org/mortbay/servlet-api-2.5#20060213" 
tag="PUBLIC"/>
+        <include urn="artifact:jar:org/mortbay/servlet-api-2.5#6.0.0-B14" 
tag="PUBLIC"/>
         <include urn="artifact:jar:tomcat/jasper-runtime#5.5.12"/>
         <include urn="artifact:jar:tomcat/jasper-compiler#5.5.12"/>
         <include urn="artifact:jar:tomcat/jasper-compiler-jdt#5.5.12"/>
-        <include urn="artifact:jar:org/mortbay/jetty#20060213"/>
+        <include urn="artifact:jar:org/mortbay/jetty#6.0.0-B14"/>
+        <include urn="artifact:jar:org/mortbay/jetty-util#6.0.0-B14"/>
         <include urn="artifact:jar:org/slf4j/jcl104-over-slf4j#1.0-rc5"/>
         <include urn="artifact:jar:org/slf4j/slf4j-jdk14#1.0-rc5"/>
         <include urn="artifact:jar:commons-el/commons-el#1.0"/>
@@ -34,7 +35,7 @@
     </types>
     <dependencies>
       <runtime>
-        <include urn="artifact:jar:org/mortbay/servlet-api-2.5#20060213" 
tag="PUBLIC"/>
+        <include urn="artifact:jar:org/mortbay/servlet-api-2.5#6.0.0-B14" 
tag="PUBLIC"/>
       </runtime>
     </dependencies>
   </project>