[ignore] isolated cocoon code; cocoon can be removed more easy now

svn path=/trunk/eXist/; revision=10734
mjhallman · Dec 13, 2009 · 1c2f5b4 · 1c2f5b4
1 parent 32800fa
commit 1c2f5b4
Show file tree

Hide file tree

Showing 49 changed files with 107 additions and 13 deletions.
diff --git a/build.properties b/build.properties
@@ -33,7 +33,6 @@ tools.ant = ./tools/ant
 lib.core = ./lib/core
 lib.optional = ./lib/optional
 lib.endorsed = ./lib/endorsed
-lib.cocoon = ./lib/cocoon
 lib.user = ./lib/user
 lib.extensions = ./lib/extensions
 

diff --git a/build/scripts/antlr3.xml b/build/scripts/antlr3.xml
@@ -37,9 +37,7 @@
         <fileset dir="${lib.endorsed}">
             <include name="*.jar"/>
         </fileset>
-        <fileset dir="${lib.cocoon}">
-            <include name="*.jar"/>
-        </fileset>
+
         <fileset dir="${lib.user}">
             <include name="*.jar"/>
         </fileset>

diff --git a/build/scripts/build-impl.xml b/build/scripts/build-impl.xml
@@ -69,9 +69,7 @@
         <fileset dir="${lib.endorsed}">
             <include name="*.jar"/>
         </fileset>
-        <fileset dir="${lib.cocoon}">
-            <include name="*.jar"/>
-        </fileset>
+
         <fileset dir="${lib.user}">
             <include name="*.jar"/>
         </fileset>
@@ -378,7 +376,7 @@
     <!-- Build all                                                          -->
     <!-- ================================================================== -->
     <target name="all"
-        depends="jar,wrapper,extension-modules,extension-indexes,extension-versioning,extension-xqdoc,extension-fluent,extension-xprocxq,extension-debuggee,test-compile"
+        depends="jar,wrapper,extension-modules,extension-indexes,extension-versioning,extension-xqdoc,extension-cocoon,extension-fluent,extension-xprocxq,extension-debuggee,test-compile"
         description="Build all">
         <antcall target="sign"/>
     </target>
@@ -513,6 +511,7 @@
         <ant antfile="build.xml" dir="extensions/fluent" target="clean" inheritall="false"/>
         <ant antfile="build.xml" dir="extensions/versioning" target="clean" inheritall="false"/>
         <ant antfile="build.xml" dir="extensions/xqdoc" target="clean" inheritall="false"/>
+        <ant antfile="build.xml" dir="extensions/cocoon" target="clean" inheritall="false"/>
         <ant antfile="xprocxq.xml" dir="extensions" target="clean" inheritall="false"/>
         <ant antfile="build.xml" dir="extensions/debuggee" target="clean" inheritall="false"/>
         <antcall target="extensions-xslt"/>
@@ -579,6 +578,10 @@
         <ant antfile="build.xml" dir="extensions/xqdoc" inheritall="false"/>
     </target>
 
+    <target name="extension-cocoon" depends="prepare-extensions,jar">
+        <ant antfile="build.xml" dir="extensions/cocoon" inheritall="false"/>
+    </target>
+
     <target name="extension-fluent" depends="jar">
         <ant antfile="build.xml" dir="extensions/fluent" inheritall="false"/>
     </target>

diff --git a/build/scripts/dist.xml b/build/scripts/dist.xml
@@ -51,9 +51,6 @@
             <lib dir="${lib.optional}">
                 <include name="*.jar"/>
             </lib>
-            <lib dir="${lib.cocoon}">
-                <include name="*.jar"/>
-            </lib>
             <lib dir="${lib.user}">
                 <include name="*.jar"/>
             </lib>
@@ -73,6 +70,10 @@
             <lib dir="extensions/indexes/spatial/lib">
                 <include name="*.jar"/>
             </lib>
+            <!-- Include cocoon jars -->
+            <lib dir="extensions/cocoon/lib">
+                <include name="*.jar"/>
+            </lib>
 
             <!-- Add configuration files to WEB-INF -->
             <webinf dir=".">
@@ -218,9 +219,9 @@
         <copy todir="${dist.dir}/lib/optional">
             <fileset dir="${lib.optional}"/>
         </copy>
-        <copy todir="${dist.dir}/lib/cocoon">
+        <!--copy todir="${dist.dir}/lib/cocoon">
             <fileset dir="${lib.cocoon}"/>
-        </copy>
+        </copy-->
         <copy todir="${dist.dir}/lib/endorsed">
             <fileset dir="${lib.endorsed}"/>
         </copy>

diff --git a/extensions/build.properties b/extensions/build.properties
@@ -20,6 +20,9 @@ include.feature.debugger = false
 #XQDoc extension
 include.feature.xqdoc = true
 
+#Cocoon extension
+include.feature.cocoon = true
+
 # XSL FO transformations (Uses Apache FOP)
 include.module.xslfo = false
 

diff --git a/extensions/cocoon/build.xml b/extensions/cocoon/build.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- $Id$ -->
+<project basedir="." default="jar" name="cocoon">
+
+    <property name="src" value="./src"/>
+    <property name="cocoon.classes" value="./classes"/>
+    <property name="lib" value="./lib"/>
+
+
+    <property name="top.dir" value="../.."/>
+
+    <property name="build.compiler" value="modern"/>
+
+    <property file="${top.dir}/build.properties"/>
+
+    <property file="../local.build.properties"/>
+    <property file="../build.properties"/>
+
+    <condition property="include.feature.cocoon.config">
+        <istrue value="${include.feature.cocoon}"/>
+    </condition>
+
+    <path id="classpath.core">
+        <fileset dir="${top.dir}/${lib.core}">
+            <include name="*.jar"/>
+        </fileset>
+        <fileset dir="${top.dir}/${lib.optional}">
+            <include name="*.jar"/>
+        </fileset>
+        <fileset dir="${top.dir}/${lib.endorsed}">
+            <include name="*.jar"/>
+        </fileset>
+        <fileset dir="${top.dir}/${lib.user}">
+            <include name="*.jar"/>
+        </fileset>
+        <fileset dir="${top.dir}/tools/ant/lib">
+            <include name="*.jar"/>
+        </fileset>
+        <fileset dir="${top.dir}/${lib.extensions}">
+            <include name="*.jar"/>
+        </fileset>
+        <fileset dir="${lib}">
+            <include name="*.jar"/>
+        </fileset>
+        <pathelement path="${top.dir}/exist.jar"/>
+        <pathelement path="${top.dir}/exist-optional.jar"/>
+        <pathelement path="${top.dir}/start.jar"/>
+        <pathelement path="${java.class.path}"/>
+    </path>
+
+
+    <target name="prepare">
+        <mkdir dir="${cocoon.classes}"/>
+    </target>
+
+    <target name="compile" depends="prepare" if="include.feature.cocoon.config">
+        <echo message="----------------------------------"/>
+        <echo message="Compiling cocoon extensions"/>
+        <echo message="----------------------------------"/>
+
+        <echo
+            message="Compiling with Java ${ant.java.version} from ${build.compiler.source} source to ${build.compiler.target} target, debug ${build.debug}, optimize ${build.optimize}, deprecation ${build.deprecation}"/>
+
+        <javac debug="${build.debug}" deprecation="${build.deprecation}" destdir="${cocoon.classes}" encoding="UTF-8"
+            optimize="${build.optimize}" srcdir="${src}" source="${build.compiler.source}"
+            target="${build.compiler.target}">
+            <classpath>
+                <path refid="classpath.core"/>
+            </classpath>
+        </javac>
+    </target>
+
+    <target name="jar" depends="compile" if="include.feature.cocoon.config">
+        <echo message="Creating exist-cocoon.jar ..."/>
+        <jar basedir="${cocoon.classes}" jarfile="${top.dir}/${lib.extensions}/exist-cocoon.jar">
+            <manifest>
+                <attribute name="Project-Name" value="${project.name}"/>
+                <attribute name="Project-Version" value="${project.version}"/>
+                <attribute name="Project-Build" value="${DSTAMP}"/>
+                <attribute name="SVN-Revision" value="${svn.revision}"/>
+            </manifest>
+        </jar>
+    </target>
+
+    <target name="clean" if="include.feature.cocoon.config">
+        <delete dir="${cocoon.classes}"/>
+        <delete file="${top.dir}/${lib.extensions}/exist-cocoon.jar" failonerror="false"/>
+    </target>
+</project>
diff --git a/lib/cocoon/README.cocoon → extensions/cocoon/lib/README.cocoon b/lib/cocoon/README.cocoon → extensions/cocoon/lib/README.cocoon
diff --git a/lib/cocoon/avalon-framework-api-4.1.5.jar → ...cocoon/lib/avalon-framework-api-4.1.5.jar b/lib/cocoon/avalon-framework-api-4.1.5.jar → ...cocoon/lib/avalon-framework-api-4.1.5.jar
diff --git a/lib/cocoon/avalon-framework-impl-4.1.5.jar → ...ocoon/lib/avalon-framework-impl-4.1.5.jar b/lib/cocoon/avalon-framework-impl-4.1.5.jar → ...ocoon/lib/avalon-framework-impl-4.1.5.jar
diff --git a/lib/cocoon/cocoon-2.1.7-deprecated.jar → ...ns/cocoon/lib/cocoon-2.1.7-deprecated.jar b/lib/cocoon/cocoon-2.1.7-deprecated.jar → ...ns/cocoon/lib/cocoon-2.1.7-deprecated.jar
diff --git a/lib/cocoon/cocoon-2.1.7.jar → extensions/cocoon/lib/cocoon-2.1.7.jar b/lib/cocoon/cocoon-2.1.7.jar → extensions/cocoon/lib/cocoon-2.1.7.jar
diff --git a/lib/cocoon/cocoon-databases-block.jar → ...ons/cocoon/lib/cocoon-databases-block.jar b/lib/cocoon/cocoon-databases-block.jar → ...ons/cocoon/lib/cocoon-databases-block.jar
diff --git a/lib/cocoon/cocoon-xmldb-block.jar → extensions/cocoon/lib/cocoon-xmldb-block.jar b/lib/cocoon/cocoon-xmldb-block.jar → extensions/cocoon/lib/cocoon-xmldb-block.jar
diff --git a/lib/cocoon/cocoon-xsp-block.jar → extensions/cocoon/lib/cocoon-xsp-block.jar b/lib/cocoon/cocoon-xsp-block.jar → extensions/cocoon/lib/cocoon-xsp-block.jar
diff --git a/lib/cocoon/commons-jexl-1.0.jar → extensions/cocoon/lib/commons-jexl-1.0.jar b/lib/cocoon/commons-jexl-1.0.jar → extensions/cocoon/lib/commons-jexl-1.0.jar
diff --git a/lib/cocoon/commons-jxpath-1.2.jar → extensions/cocoon/lib/commons-jxpath-1.2.jar b/lib/cocoon/commons-jxpath-1.2.jar → extensions/cocoon/lib/commons-jxpath-1.2.jar
diff --git a/...cocoon/commons-lang-2.0-20041007T2305.jar → ...on/lib/commons-lang-2.0-20041007T2305.jar b/...cocoon/commons-lang-2.0-20041007T2305.jar → ...on/lib/commons-lang-2.0-20041007T2305.jar
diff --git a/lib/cocoon/ehcache-1.1.jar → extensions/cocoon/lib/ehcache-1.1.jar b/lib/cocoon/ehcache-1.1.jar → extensions/cocoon/lib/ehcache-1.1.jar
diff --git a/lib/cocoon/excalibur-component-1.2.jar → ...ns/cocoon/lib/excalibur-component-1.2.jar b/lib/cocoon/excalibur-component-1.2.jar → ...ns/cocoon/lib/excalibur-component-1.2.jar
diff --git a/lib/cocoon/excalibur-datasource-1.1.1.jar → ...cocoon/lib/excalibur-datasource-1.1.1.jar b/lib/cocoon/excalibur-datasource-1.1.1.jar → ...cocoon/lib/excalibur-datasource-1.1.1.jar
diff --git a/lib/cocoon/excalibur-i18n-1.1.jar → extensions/cocoon/lib/excalibur-i18n-1.1.jar b/lib/cocoon/excalibur-i18n-1.1.jar → extensions/cocoon/lib/excalibur-i18n-1.1.jar
diff --git a/lib/cocoon/excalibur-instrument-1.0.jar → ...s/cocoon/lib/excalibur-instrument-1.0.jar b/lib/cocoon/excalibur-instrument-1.0.jar → ...s/cocoon/lib/excalibur-instrument-1.0.jar
diff --git a/...coon/excalibur-instrument-manager-1.0.jar → .../lib/excalibur-instrument-manager-1.0.jar b/...coon/excalibur-instrument-manager-1.0.jar → .../lib/excalibur-instrument-manager-1.0.jar
diff --git a/...bur-instrument-manager-interfaces-1.0.jar → ...bur-instrument-manager-interfaces-1.0.jar b/...bur-instrument-manager-interfaces-1.0.jar → ...bur-instrument-manager-interfaces-1.0.jar
diff --git a/lib/cocoon/excalibur-io-1.1.jar → extensions/cocoon/lib/excalibur-io-1.1.jar b/lib/cocoon/excalibur-io-1.1.jar → extensions/cocoon/lib/excalibur-io-1.1.jar
diff --git a/lib/cocoon/excalibur-logger-1.1.jar → ...sions/cocoon/lib/excalibur-logger-1.1.jar b/lib/cocoon/excalibur-logger-1.1.jar → ...sions/cocoon/lib/excalibur-logger-1.1.jar
diff --git a/lib/cocoon/excalibur-naming-1.0.jar → ...sions/cocoon/lib/excalibur-naming-1.0.jar b/lib/cocoon/excalibur-naming-1.0.jar → ...sions/cocoon/lib/excalibur-naming-1.0.jar
diff --git a/lib/cocoon/excalibur-pool-1.2.jar → extensions/cocoon/lib/excalibur-pool-1.2.jar b/lib/cocoon/excalibur-pool-1.2.jar → extensions/cocoon/lib/excalibur-pool-1.2.jar
diff --git a/lib/cocoon/excalibur-sourceresolve-1.1.jar → ...ocoon/lib/excalibur-sourceresolve-1.1.jar b/lib/cocoon/excalibur-sourceresolve-1.1.jar → ...ocoon/lib/excalibur-sourceresolve-1.1.jar
diff --git a/lib/cocoon/excalibur-store-1.0.jar → ...nsions/cocoon/lib/excalibur-store-1.0.jar b/lib/cocoon/excalibur-store-1.0.jar → ...nsions/cocoon/lib/excalibur-store-1.0.jar
diff --git a/lib/cocoon/excalibur-xmlutil-1.0.jar → ...ions/cocoon/lib/excalibur-xmlutil-1.0.jar b/lib/cocoon/excalibur-xmlutil-1.0.jar → ...ions/cocoon/lib/excalibur-xmlutil-1.0.jar
diff --git a/lib/cocoon/javacApi-0.9.jar → extensions/cocoon/lib/javacApi-0.9.jar b/lib/cocoon/javacApi-0.9.jar → extensions/cocoon/lib/javacApi-0.9.jar
diff --git a/lib/cocoon/javacImpl-0.9.jar → extensions/cocoon/lib/javacImpl-0.9.jar b/lib/cocoon/javacImpl-0.9.jar → extensions/cocoon/lib/javacImpl-0.9.jar
diff --git a/lib/cocoon/logkit-1.2.2.jar → extensions/cocoon/lib/logkit-1.2.2.jar b/lib/cocoon/logkit-1.2.2.jar → extensions/cocoon/lib/logkit-1.2.2.jar
diff --git a/lib/cocoon/util.concurrent-1.3.4.jar → ...ions/cocoon/lib/util.concurrent-1.3.4.jar b/lib/cocoon/util.concurrent-1.3.4.jar → ...ions/cocoon/lib/util.concurrent-1.3.4.jar
diff --git a/...rg/exist/cocoon/CocoonRequestWrapper.java → ...rg/exist/cocoon/CocoonRequestWrapper.java b/...rg/exist/cocoon/CocoonRequestWrapper.java → ...rg/exist/cocoon/CocoonRequestWrapper.java
diff --git a/...g/exist/cocoon/CocoonResponseWrapper.java → ...g/exist/cocoon/CocoonResponseWrapper.java b/...g/exist/cocoon/CocoonResponseWrapper.java → ...g/exist/cocoon/CocoonResponseWrapper.java
diff --git a/...rg/exist/cocoon/CocoonSessionWrapper.java → ...rg/exist/cocoon/CocoonSessionWrapper.java b/...rg/exist/cocoon/CocoonSessionWrapper.java → ...rg/exist/cocoon/CocoonSessionWrapper.java
diff --git a/src/org/exist/cocoon/ShutdownAction.java → .../src/org/exist/cocoon/ShutdownAction.java b/src/org/exist/cocoon/ShutdownAction.java → .../src/org/exist/cocoon/ShutdownAction.java
diff --git a/src/org/exist/cocoon/StatusGenerator.java → ...src/org/exist/cocoon/StatusGenerator.java b/src/org/exist/cocoon/StatusGenerator.java → ...src/org/exist/cocoon/StatusGenerator.java
diff --git a/...exist/cocoon/XMLDBSessionLoginAction.java → ...exist/cocoon/XMLDBSessionLoginAction.java b/...exist/cocoon/XMLDBSessionLoginAction.java → ...exist/cocoon/XMLDBSessionLoginAction.java
diff --git a/src/org/exist/cocoon/XMLDBSource.java → ...oon/src/org/exist/cocoon/XMLDBSource.java b/src/org/exist/cocoon/XMLDBSource.java → ...oon/src/org/exist/cocoon/XMLDBSource.java
diff --git a/src/org/exist/cocoon/XMLDBSourceFactory.java → .../org/exist/cocoon/XMLDBSourceFactory.java b/src/org/exist/cocoon/XMLDBSourceFactory.java → .../org/exist/cocoon/XMLDBSourceFactory.java
diff --git a/src/org/exist/cocoon/XMLDBTransformer.java → ...rc/org/exist/cocoon/XMLDBTransformer.java b/src/org/exist/cocoon/XMLDBTransformer.java → ...rc/org/exist/cocoon/XMLDBTransformer.java
diff --git a/src/org/exist/cocoon/XMLReaderWrapper.java → ...rc/org/exist/cocoon/XMLReaderWrapper.java b/src/org/exist/cocoon/XMLReaderWrapper.java → ...rc/org/exist/cocoon/XMLReaderWrapper.java
diff --git a/src/org/exist/cocoon/XQueryGenerator.java → ...src/org/exist/cocoon/XQueryGenerator.java b/src/org/exist/cocoon/XQueryGenerator.java → ...src/org/exist/cocoon/XQueryGenerator.java
diff --git a/src/org/exist/cocoon/XSPHelper.java → ...ocoon/src/org/exist/cocoon/XSPHelper.java b/src/org/exist/cocoon/XSPHelper.java → ...ocoon/src/org/exist/cocoon/XSPHelper.java
diff --git a/src/org/exist/cocoon/package.html → .../cocoon/src/org/exist/cocoon/package.html b/src/org/exist/cocoon/package.html → .../cocoon/src/org/exist/cocoon/package.html
diff --git a/src/org/exist/start/start.config b/src/org/exist/start/start.config
@@ -65,6 +65,7 @@ extensions/indexes/spatial/lib/*                   always
 extensions/indexes/lucene/lib/*                    always
 extensions/xprocxq/main/lib/*					   always				
 extensions/xqdoc/lib/*							   always
+extensions/cocoon/lib/*							   always
 lib/cocoon/*                                       mode == other
 lib/cocoon/*                                       mode == jetty
 lib/cocoon/*                                       mode == cluster