svn commit: rev 55417 - in cocoon/trunk: . tools/targets

[cz...@apache.org]

Author: cziegeler
Date: Sun Oct 24 02:47:06 2004
New Revision: 55417

Modified:
   cocoon/trunk/build.properties
   cocoon/trunk/status.xml
   cocoon/trunk/tools/targets/compile-build.xml
   cocoon/trunk/tools/targets/ide-build.xml
Log:
Fix build - add core test
Update status

Modified: cocoon/trunk/build.properties
==============================================================================
--- cocoon/trunk/build.properties	(original)
+++ cocoon/trunk/build.properties	Sun Oct 24 02:47:06 2004
@@ -134,6 +134,7 @@
 # Directory Layout
 src=src
 src.core=${src}/core/java
+src.core.test=${src}/core/test
 java=${src}/java
 mocks=${src}/mocks
 test=${src}/test

Modified: cocoon/trunk/status.xml
==============================================================================
--- cocoon/trunk/status.xml	(original)
+++ cocoon/trunk/status.xml	Sun Oct 24 02:47:06 2004
@@ -205,6 +205,14 @@
 
   <changes>
  <release version="@version@" date="@date@">
+   <action dev="CZ" type="update">
+     Component, Composable, ComponentManager, ComponentSelector and ComponentException
+     are no longer support: Serviceable, ServiceManager, ServiceSelector and ServiceException
+     have to be used.
+   </action>
+   <action dev="CZ" type="add">
+     Own implementation of Avalon based container.
+   </action>
    <action dev="TC" type="add" fixes-bug="30417">
      Added best-fit-while-keeping-aspect-ratio option to the ImageReader
    </action>

Modified: cocoon/trunk/tools/targets/compile-build.xml
==============================================================================
--- cocoon/trunk/tools/targets/compile-build.xml	(original)
+++ cocoon/trunk/tools/targets/compile-build.xml	Sun Oct 24 02:47:06 2004
@@ -72,9 +72,7 @@
            source="${source.vm}"
            nowarn="${compiler.nowarn}"
            compiler="${compiler}"
-           classpathref="classpath">
-     <src path="${java}"/>
-    </javac>       
+           classpathref="classpath"/>
 
   </target>
 
@@ -119,15 +117,17 @@
     </path>
 
     <!-- Compile tests -->
-    <javac srcdir="${test}"
-           destdir="${build.test}"
+    <javac destdir="${build.test}"
            debug="${compiler.debug}"
            optimize="${compiler.optimize}"
            deprecation="${compiler.deprecation}"
            target="${target.vm}"
            source="${source.vm}"
            compiler="${compiler}"
-           classpathref="test.classpath"/>
+           classpathref="test.classpath">
+       <src path="${src.core.test}"/>
+       <src path="${test}"/>
+    </javac>
   </target>
 
 <!-- === Package Targets ================================================= -->

Modified: cocoon/trunk/tools/targets/ide-build.xml
==============================================================================
--- cocoon/trunk/tools/targets/ide-build.xml	(original)
+++ cocoon/trunk/tools/targets/ide-build.xml	Sun Oct 24 02:47:06 2004
@@ -53,6 +53,7 @@
       <!-- deprecated source dir -->
       <pathelement path="${src}/deprecated/java"/>
       <!-- test source dir -->
+      <pathelement path="${src.core.test}"/>
       <pathelement path="${src}/test"/>
       <!-- blocks source dirs -->
       <dirset dir="${blocks}">