forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cross...@apache.org
Subject svn commit: r694101 [1/3] - in /forrest/trunk: etc/cocoon_upgrade/ lib/core/ lib/endorsed/ main/java/org/apache/forrest/locationmap/lm/ main/java/org/apache/forrest/util/ main/targets/ main/var/ main/webapp/WEB-INF/ main/webapp/WEB-INF/properties/ main...
Date Thu, 11 Sep 2008 03:45:52 GMT
Author: crossley
Date: Wed Sep 10 20:45:49 2008
New Revision: 694101

URL: http://svn.apache.org/viewvc?rev=694101&view=rev
Log:
Merged branch update_cocoon_2.1.12-dev 687269:HEAD into the trunk.
Issue: FOR-955

Added:
    forrest/trunk/lib/core/cocoon-2.1.12-dev.jar
      - copied unchanged from r694088, forrest/branches/update_cocoon_2.1.12-dev/lib/core/cocoon-2.1.12-dev.jar
    forrest/trunk/lib/core/cocoon-asciiart-block.jar
      - copied unchanged from r694088, forrest/branches/update_cocoon_2.1.12-dev/lib/core/cocoon-asciiart-block.jar
    forrest/trunk/lib/core/cocoon-auth-block.jar
      - copied unchanged from r694088, forrest/branches/update_cocoon_2.1.12-dev/lib/core/cocoon-auth-block.jar
    forrest/trunk/lib/core/cocoon-batik-block.jar
      - copied unchanged from r694088, forrest/branches/update_cocoon_2.1.12-dev/lib/core/cocoon-batik-block.jar
    forrest/trunk/lib/core/cocoon-chaperon-block.jar
      - copied unchanged from r694088, forrest/branches/update_cocoon_2.1.12-dev/lib/core/cocoon-chaperon-block.jar
    forrest/trunk/lib/core/cocoon-fop-block.jar
      - copied unchanged from r694088, forrest/branches/update_cocoon_2.1.12-dev/lib/core/cocoon-fop-block.jar
    forrest/trunk/lib/core/cocoon-html-block.jar
      - copied unchanged from r694088, forrest/branches/update_cocoon_2.1.12-dev/lib/core/cocoon-html-block.jar
    forrest/trunk/lib/core/cocoon-linkrewriter-block.jar
      - copied unchanged from r694088, forrest/branches/update_cocoon_2.1.12-dev/lib/core/cocoon-linkrewriter-block.jar
    forrest/trunk/lib/core/cocoon-lucene-block.jar
      - copied unchanged from r694088, forrest/branches/update_cocoon_2.1.12-dev/lib/core/cocoon-lucene-block.jar
    forrest/trunk/lib/core/cocoon-profiler-block.jar
      - copied unchanged from r694088, forrest/branches/update_cocoon_2.1.12-dev/lib/core/cocoon-profiler-block.jar
    forrest/trunk/lib/core/cocoon-template-block.jar
      - copied unchanged from r694088, forrest/branches/update_cocoon_2.1.12-dev/lib/core/cocoon-template-block.jar
    forrest/trunk/lib/core/cocoon-validation-block.jar
      - copied unchanged from r694088, forrest/branches/update_cocoon_2.1.12-dev/lib/core/cocoon-validation-block.jar
    forrest/trunk/lib/core/cocoon-xsp-block.jar
      - copied unchanged from r694088, forrest/branches/update_cocoon_2.1.12-dev/lib/core/cocoon-xsp-block.jar
    forrest/trunk/lib/core/commons-collections-3.2.jar
      - copied unchanged from r694088, forrest/branches/update_cocoon_2.1.12-dev/lib/core/commons-collections-3.2.jar
    forrest/trunk/lib/core/commons-collections-3.2.jar.license.txt
      - copied unchanged from r694088, forrest/branches/update_cocoon_2.1.12-dev/lib/core/commons-collections-3.2.jar.license.txt
    forrest/trunk/lib/core/commons-lang-2.4.jar
      - copied unchanged from r694088, forrest/branches/update_cocoon_2.1.12-dev/lib/core/commons-lang-2.4.jar
    forrest/trunk/lib/core/commons-lang-2.4.jar.license.txt
      - copied unchanged from r694088, forrest/branches/update_cocoon_2.1.12-dev/lib/core/commons-lang-2.4.jar.license.txt
    forrest/trunk/lib/core/ehcache-1.2.3.jar
      - copied unchanged from r694088, forrest/branches/update_cocoon_2.1.12-dev/lib/core/ehcache-1.2.3.jar
    forrest/trunk/lib/core/excalibur-component-2.1.jar
      - copied unchanged from r694088, forrest/branches/update_cocoon_2.1.12-dev/lib/core/excalibur-component-2.1.jar
    forrest/trunk/lib/core/excalibur-component-2.1.jar.license.txt
      - copied unchanged from r694088, forrest/branches/update_cocoon_2.1.12-dev/lib/core/excalibur-component-2.1.jar.license.txt
    forrest/trunk/lib/core/excalibur-sourceresolve-2.2.3.jar
      - copied unchanged from r694088, forrest/branches/update_cocoon_2.1.12-dev/lib/core/excalibur-sourceresolve-2.2.3.jar
    forrest/trunk/lib/core/excalibur-sourceresolve-2.2.3.jar.license.txt
      - copied unchanged from r694088, forrest/branches/update_cocoon_2.1.12-dev/lib/core/excalibur-sourceresolve-2.2.3.jar.license.txt
    forrest/trunk/lib/endorsed/jakarta-regexp-1.5.jar
      - copied unchanged from r694088, forrest/branches/update_cocoon_2.1.12-dev/lib/endorsed/jakarta-regexp-1.5.jar
    forrest/trunk/lib/endorsed/jakarta-regexp-1.5.jar.license.txt
      - copied unchanged from r694088, forrest/branches/update_cocoon_2.1.12-dev/lib/endorsed/jakarta-regexp-1.5.jar.license.txt
    forrest/trunk/lib/endorsed/xalan-2.7.1.jar
      - copied unchanged from r694088, forrest/branches/update_cocoon_2.1.12-dev/lib/endorsed/xalan-2.7.1.jar
    forrest/trunk/lib/endorsed/xalan-2.7.1.jar.license.txt
      - copied unchanged from r694088, forrest/branches/update_cocoon_2.1.12-dev/lib/endorsed/xalan-2.7.1.jar.license.txt
    forrest/trunk/lib/endorsed/xercesImpl-2.9.1.jar
      - copied unchanged from r694088, forrest/branches/update_cocoon_2.1.12-dev/lib/endorsed/xercesImpl-2.9.1.jar
    forrest/trunk/lib/endorsed/xercesImpl-2.9.1.jar.license.txt
      - copied unchanged from r694088, forrest/branches/update_cocoon_2.1.12-dev/lib/endorsed/xercesImpl-2.9.1.jar.license.txt
    forrest/trunk/lib/endorsed/xml-apis-1.3.04.jar
      - copied unchanged from r694088, forrest/branches/update_cocoon_2.1.12-dev/lib/endorsed/xml-apis-1.3.04.jar
    forrest/trunk/lib/endorsed/xml-apis-1.3.04.jar.license.txt
      - copied unchanged from r694088, forrest/branches/update_cocoon_2.1.12-dev/lib/endorsed/xml-apis-1.3.04.jar.license.txt
    forrest/trunk/main/var/fixWarXconf.xsl
      - copied unchanged from r694088, forrest/branches/update_cocoon_2.1.12-dev/main/var/fixWarXconf.xsl
Removed:
    forrest/trunk/etc/cocoon_upgrade/GettingCocoonSources.txt
    forrest/trunk/lib/core/cocoon-2.2.0-dev.jar
    forrest/trunk/lib/core/cocoon-asciiart-block-2.2.0-dev.jar
    forrest/trunk/lib/core/cocoon-batik-block-2.2.0-dev.jar
    forrest/trunk/lib/core/cocoon-chaperon-block-2.2.0-dev.jar
    forrest/trunk/lib/core/cocoon-fop-block-2.2.0-dev.jar
    forrest/trunk/lib/core/cocoon-html-block-2.2.0-dev.jar
    forrest/trunk/lib/core/cocoon-linkrewriter-block-2.2.0-dev.jar
    forrest/trunk/lib/core/cocoon-lucene-block-2.2.0-dev.jar
    forrest/trunk/lib/core/cocoon-profiler-block-2.2.0-dev.jar
    forrest/trunk/lib/core/cocoon-template-block-2.2.0-dev.jar
    forrest/trunk/lib/core/cocoon-validation-block-2.2.0-dev.jar
    forrest/trunk/lib/core/cocoon-xsp-block-2.2.0-dev.jar
    forrest/trunk/lib/core/commons-collections-3.1.jar
    forrest/trunk/lib/core/commons-collections-3.1.jar.license.txt
    forrest/trunk/lib/core/commons-lang-2.1.jar
    forrest/trunk/lib/core/commons-lang-2.1.jar.license.txt
    forrest/trunk/lib/core/ehcache-1.2.jar
    forrest/trunk/lib/core/excalibur-sourceresolve-2.1.jar
    forrest/trunk/lib/core/excalibur-sourceresolve-2.1.jar.license.txt
    forrest/trunk/lib/endorsed/jakarta-regexp-1.4.jar
    forrest/trunk/lib/endorsed/jakarta-regexp-1.4.jar.license.txt
    forrest/trunk/lib/endorsed/xalan-2.7.0.jar
    forrest/trunk/lib/endorsed/xalan-2.7.0.jar.license.txt
    forrest/trunk/lib/endorsed/xercesImpl-2.8.0.jar
    forrest/trunk/lib/endorsed/xercesImpl-2.8.0.jar.license.txt
    forrest/trunk/lib/endorsed/xml-apis-1.3.03.jar
    forrest/trunk/lib/endorsed/xml-apis-1.3.03.jar.license.txt
    forrest/trunk/main/webapp/WEB-INF/properties/dev/
    forrest/trunk/main/webapp/WEB-INF/properties/prod/
    forrest/trunk/main/webapp/WEB-INF/xconf/
Modified:
    forrest/trunk/etc/cocoon_upgrade/README.txt
    forrest/trunk/etc/cocoon_upgrade/build.sh
    forrest/trunk/etc/cocoon_upgrade/build.xml
    forrest/trunk/etc/cocoon_upgrade/local.blocks.properties
    forrest/trunk/etc/cocoon_upgrade/local.build.properties
    forrest/trunk/main/java/org/apache/forrest/locationmap/lm/ActNode.java
    forrest/trunk/main/java/org/apache/forrest/locationmap/lm/LocationMap.java
    forrest/trunk/main/java/org/apache/forrest/util/IdGeneratorTransformer.java
    forrest/trunk/main/java/org/apache/forrest/util/XPathTransformer.java
    forrest/trunk/main/targets/webapp.xml
    forrest/trunk/main/webapp/WEB-INF/cocoon.xconf
    forrest/trunk/main/webapp/WEB-INF/properties/core.properties
    forrest/trunk/whiteboard/cocoon-2.2-blocks/dispatcher/src/main/java/org/apache/forrest/dispatcher/ContractBeanDOMImpl.java
    forrest/trunk/whiteboard/cocoon-2.2-blocks/dispatcher/src/main/java/org/apache/forrest/dispatcher/DispatcherHelper.java
    forrest/trunk/whiteboard/cocoon-2.2-blocks/dispatcher/src/main/java/org/apache/forrest/dispatcher/acting/RecursiveDirectoryTraversalAction.java
    forrest/trunk/whiteboard/cocoon-2.2-blocks/dispatcher/src/main/java/org/apache/forrest/dispatcher/acting/ResourceTypeAction.java
    forrest/trunk/whiteboard/cocoon-2.2-blocks/dispatcher/src/main/java/org/apache/forrest/dispatcher/transformation/DispatcherTransformer.java
    forrest/trunk/whiteboard/cocoon-2.2-blocks/dispatcher/src/main/java/org/apache/forrest/dispatcher/util/SourceUtil.java
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/internal.xmap
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/locationmap.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/ContractBeanDOMImpl.java
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/DispatcherHelper.java
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/acting/RecursiveDirectoryTraversalAction.java
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/acting/ResourceTypeAction.java
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/transformation/DispatcherTransformer.java
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/util/SourceUtil.java
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/src/java/org/apache/forrest/solr/client/SolrUpdateGenerator.java

Modified: forrest/trunk/etc/cocoon_upgrade/README.txt
URL: http://svn.apache.org/viewvc/forrest/trunk/etc/cocoon_upgrade/README.txt?rev=694101&r1=694100&r2=694101&view=diff
==============================================================================
--- forrest/trunk/etc/cocoon_upgrade/README.txt (original)
+++ forrest/trunk/etc/cocoon_upgrade/README.txt Wed Sep 10 20:45:49 2008
@@ -2,23 +2,11 @@
              --------------------------
 
 This directory contains files to help upgrade Cocoon to whatever is the latest
-stable version of Cocoon trunk.
-
-Note: We are not up-to-date with the latest Cocoon trunk.
-See http://forrest.apache.org/docs_0_80/upgrading_08.html#cocoon
-
-FIXME: Latest Cocoon uses Maven, so this instructions needs to get updated.
-http://cocoon.zones.apache.org/daisy/documentation/g2/756.html
-
-Instructions for use:
-
-try this command to install:
-mvn -Dmaven.test.skip=true install
-
+stable version of Cocoon-2.1 branch.
 
 NOTE:
 Make sure that you have set $COCOON_HOME like e.g.:
-export COCOON_HOME=/home/me/apache/cocoon-trunk/
+export COCOON_HOME=/home/me/svn/asf/cocoon-branch-2_1_X
 and do a 'build clean' there.
 
 -------------------------
@@ -26,44 +14,38 @@
 
 1. Keep our local.*.properties files sychronised with Cocoon's.
 
-Step 2 and 3 can be done with "./build.sh 0"
-2. Copy the cocoon libraries to forrest.
-   See ./build.xml where some are excluded. You might need to add/exclude others.
+2. Perhaps need to update version number for Cocoon in ./build.xml file.
+
+Step 3 and 4 can be done with "./build.sh 0"
+
+3. Copy the cocoon supporting libraries to forrest.
+
+   See ./build.xml where some are excluded. You might need to add/exclude
+   others via this build.xml file.
    Remember that things will change with Cocoon and we must keep in sync.
 
     ant copy-core-libs
     ant copy-endorsed-libs
     ant copy-optional-libs
 
-3. Verify that there are not two versions of libraries within the same directory:
+4. Verify that there are not two versions of libraries within the same directory:
 
    cd $FORREST_HOME/lib/endorsed
    svn st
    cd $FORREST_HOME/lib/core
    svn st
 
-4. cd $FORREST_HOME/etc/cocoon_upgrade
+5. cd $FORREST_HOME/etc/cocoon_upgrade
 
-Steps 5 and 6 can be done with "./build.sh 1" it will create an ant property file,
-so you do not need to edit the build.xml.
+Steps 6 and 7 can be done with "./build.sh 1"
 
-5. Edit build.xml and modify new revision
-(FIXME: we don't need svn.revision anymore, so probably don't need ./build.sh either)
-   Then build cocoon:
+6. Build Cocoon core and the blocks that we need.
 
    ant build-cocoon
 
-6. cd $FORREST_HOME/lib
-
-(FIXME: we don't need this 7a anymore.)
-7a. For each cocoon-{name}-{cocoon.version}-{cocoon.revision}.jar
-
-svn mv cocoon-{name}-{cocoon.version}-{cocoon.OLDrevision}.jar 
-cocoon-{name}-{cocoon.version}-{cocoon.NEWrevision}.jar
- 
-svn ci -m "prework for upgrade to {cocoon.NEWrevision}" 
+7. Copy the built Cocoon jars to Forrest.
 
-7b.  ant copy-cocoon
+   ant copy-cocoon
 
 8.  We need to make sure there is a license.txt file for each of the
     jars that we have in the lib/* directories.
@@ -95,6 +77,6 @@
 ------------------------------------------------------------------------
 Cleanup
 
-* There will be a new local.blocks.properties over in your cocoon-trunk
+* There will be a new local.blocks.properties over in your $COCOON_HOME.
 Remove it to continue developing with Cocoon.
 

Modified: forrest/trunk/etc/cocoon_upgrade/build.sh
URL: http://svn.apache.org/viewvc/forrest/trunk/etc/cocoon_upgrade/build.sh?rev=694101&r1=694100&r2=694101&view=diff
==============================================================================
--- forrest/trunk/etc/cocoon_upgrade/build.sh (original)
+++ forrest/trunk/etc/cocoon_upgrade/build.sh Wed Sep 10 20:45:49 2008
@@ -78,10 +78,7 @@
     ant copy-optional-libs
     svnDialog
   elif [ "$step" = "1" ]; then
-     cd $COCOON_HOME;svn info|grep Revision|awk '{print "echo svn.revision=-r"$2" > $FORREST_HOME/etc/cocoon_upgrade/revision.properties"}'|sh
-     cd $FORREST_HOME/etc/cocoon_upgrade/
      ant build-cocoon
-     ln -s $COCOON_HOME/build/cocoon/ $COCOON_HOME/build/cocoon-2.2.0-dev
      svnDialog
   else
     echo step $step not found

Modified: forrest/trunk/etc/cocoon_upgrade/build.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/etc/cocoon_upgrade/build.xml?rev=694101&r1=694100&r2=694101&view=diff
==============================================================================
--- forrest/trunk/etc/cocoon_upgrade/build.xml (original)
+++ forrest/trunk/etc/cocoon_upgrade/build.xml Wed Sep 10 20:45:49 2008
@@ -26,7 +26,7 @@
     <property file="revision.properties" />
     <property environment="env"/>
     <property name="cocoon.home" location="${env.COCOON_HOME}"/>
-    <property name="cocoon.version" value="2.2.0-dev"/>
+    <property name="cocoon.version" value="2.1.12-dev"/>
     <property name="forrest.home" location="${env.FORREST_HOME}"/>
   </target>
 
@@ -37,7 +37,7 @@
        FIXME: This needs more testing  do not use it yet
        =============================================================== -->
     <xslt force="true" style="./upgrade-cocoon-xconf.xsl"
-    in="${cocoon.home}/src/webapp/WEB-INF/xconf/cocoon-core.xconf" 
+    in="${cocoon.home}/src/webapp/WEB-INF/xconf/cocoon-core.xconf"
     out="${forrest.home}/main/webapp/WEB-INF/xconf/forrest-core.xconf" >
       <outputproperty name="indent" value="yes"/>
     </xslt>
@@ -49,33 +49,40 @@
        FIXME:  use sync task so you can ensure that removed libs from cocoon
                are removed within forrest
        =============================================================== -->
-    <copy todir="${forrest.home}/lib/core">
+    <copy todir="${forrest.home}/lib/core" preservelastmodified="true">
       <fileset dir="${cocoon.home}/lib/core" defaultexcludes="yes">
+        <!-- Exclude some that we don't need -->
+        <exclude name="commons-beanutils-core-*.jar"/>
+        <exclude name="commons-javaflow-*.jar"/>
+        <exclude name="excalibur-instrument-mgr-*.jar"/>
+        <exclude name="javac*.jar"/>
+        <exclude name="jdtcore-*.jar"/>
+        <exclude name="js-*.jar"/>
+        <exclude name="nekohtml-*.jar"/>
+        <exclude name="pizza-*.jar"/>
+        <!-- OSGI not yet needed -->
+        <exclude name="knopflerfish-*.jar"/>
         <!-- FIXME: The jxpath upgrade cannot be done.
           See issue FOR-675 (and FOR-405 and FOR-303) and dev mail list.
           commons-jxpath-1.2 causes errors with "site:" links.
           We have a workaround so use Cocoon's jar.
         <exclude name="commons-jxpath-*.jar"/>
         -->
-        <!-- Exclude some that we don't need -->
-        <exclude name="commons-javaflow-*.jar"/>
         <!-- We have newer xml-commons-resolver -->
         <exclude name="xml-commons-resolver-*.jar"/>
         <!-- servlet.jar goes under tools/jetty -->
         <exclude name="servlet-*.jar"/>
-        <!-- OSGI not yet needed -->
-        <exclude name="knopflerfish-*.jar"/>
       </fileset>
     </copy>
   </target>
-  
+
   <target name="copy-optional-libs" depends="init">
   <!-- ===============================================================
        Some optional libraries are core to forrest
-       FIXME:  jing-*.jar comes from iso-relax.sf.net so maybe we need to 
+       FIXME:  jing-*.jar comes from iso-relax.sf.net so maybe we need to
                have a copy-external-libs target
        =============================================================== -->
-    <copy todir="${forrest.home}/lib/core">
+    <copy todir="${forrest.home}/lib/core" preservelastmodified="true">
       <fileset dir="${cocoon.home}/lib/optional">
         <include name="batik-all-*.jar"/>
 <!-- FIXME: Cocoon's FOP causes trouble FOR-    ###################
@@ -94,12 +101,12 @@
   <!-- ===============================================================
        Some optional libraries are copied to plugins within forrest
        =============================================================== -->
-    <copy todir="${forrest.home}/plugins/org.apache.forrest.plugin.input.dtdx/lib">
+    <copy todir="${forrest.home}/plugins/org.apache.forrest.plugin.input.dtdx/lib" preservelastmodified="true">
       <fileset dir="${cocoon.home}/lib/optional" includes="nekodtd-*.jar"/>
     </copy>
   </target>
-  
-  <target name="copy-endorsed-libs" depends="init">  
+
+  <target name="copy-endorsed-libs" depends="init">
   <!-- ===============================================================
        Endorsed libraries need to go to the endorsed directory
        =============================================================== -->
@@ -107,7 +114,7 @@
       <fileset dir="${cocoon.home}/lib/endorsed" includes="*.jar"/>
     </copy>
   </target>
-  
+
   <target name="build-cocoon" depends="init">
   <!-- ===============================================================
        Copy local settings and build cocoon
@@ -115,10 +122,10 @@
     <copy todir="${cocoon.home}">
       <fileset dir="." includes="local.*.properties"/>
     </copy>
-  	<condition property="build.script" value="build.bat">
-  	    <os family="windows"/>
+    <condition property="build.script" value="build.bat">
+      <os family="windows"/>
     </condition>
-  	<condition property="build.script" value="build.sh">
+    <condition property="build.script" value="build.sh">
       <not>
         <os family="windows"/>
       </not>
@@ -126,15 +133,16 @@
 
     <exec dir="${cocoon.home}" executable="${cocoon.home}/${build.script}"/>
   </target>
-  
+
   <target name="copy-cocoon" depends="init">
   <!-- ===============================================================
        Copy a fresh build from cocoon
        =============================================================== -->
     <delete>
       <fileset dir="${forrest.home}/lib/core" includes="cocoon-*.jar">
-        <!-- exclude any temporary blocks until is official in Cocoon
-        <exclude name="cocoon-foo-block-2.2.0-dev.jar"/>
+        <!-- NOTE: If you have been experimenting with temporary blocks, then
+             exclude them from deletion.
+        <exclude name="cocoon-foo-block-r123456.jar"/>
         -->
       </fileset>
     </delete>
@@ -145,8 +153,7 @@
       </fileset>
     </copy>
     <copy todir="${forrest.home}/lib/core">
-      <mapper type="glob" from="*.jar" 
-       to="cocoon-*-${cocoon.version}.jar"/>
+      <mapper type="glob" from="*.jar" to="cocoon-*.jar"/>
       <fileset dir="${cocoon.home}/build/cocoon-${cocoon.version}/blocks">
         <include name="*-block.jar"/>
         <!-- servlet.jar has been added within jetty-->

Modified: forrest/trunk/etc/cocoon_upgrade/local.blocks.properties
URL: http://svn.apache.org/viewvc/forrest/trunk/etc/cocoon_upgrade/local.blocks.properties?rev=694101&r1=694100&r2=694101&view=diff
==============================================================================
--- forrest/trunk/etc/cocoon_upgrade/local.blocks.properties (original)
+++ forrest/trunk/etc/cocoon_upgrade/local.blocks.properties Wed Sep 10 20:45:49 2008
@@ -69,59 +69,72 @@
 # can depend on.
 
 #-----[dependency]: "authentication-fw" depends on "session-fw".
-#-----[dependency]: "authentication-fw" is needed by "portal", "portal-sample".
+#-----[dependency]: "authentication-fw" is needed by "portal", "portal-fw".
 #include.block.authentication-fw=false
-#-----[dependency]: "batik" is needed by "fop", "scratchpad", "tour".
+#-----[dependency]: "batik" is needed by "fop", "tour".
 include.block.batik=true
 #include.block.bsf=false
-#-----[dependency]: "chaperon" depends on "template" (for samples).
 include.block.chaperon=true
-#include.block.core-samples-additional=false
-#-----[dependency]: "core-samples-main" depends on "xsp" (for samples).
-#include.block.core-samples-main=false
-#-----[dependency]: "databases" depends on "hsqldb" (for samples).
-#-----[dependency]: "databases" is needed by "jms", "ojb", "petstore", "repository", "xmldb",
"xsp".
+#-----[dependency]: "databases" depends on "xsp".
+#-----[dependency]: "databases" is needed by "hsqldb", "jms", "ojb", "petstore", "repository",
"xmldb".
 #include.block.databases=false
-#-----[dependency]: "fop" depends on "batik".
+#-----[dependency]: "fop" depends on "batik", "xsp" (for samples).
 #-----[dependency]: "fop" is needed by "tour".
 include.block.fop=true
-#-----[dependency]: "hsqldb" is needed by "databases", "jms", "ojb", "petstore".
+#-----[dependency]: "forms" depends on "ajax", "template" (for samples).
+#-----[dependency]: "forms" is needed by "apples", "javaflow", "ojb", "petstore", "portal",
"querybean", "tour".
+#include.block.forms=false
+#-----[dependency]: "hsqldb" depends on "databases".
+#-----[dependency]: "hsqldb" is needed by "jms", "ojb", "petstore".
 #include.block.hsqldb=false
 include.block.html=true
 #-----[dependency]: "itext" depends on "xsp" (for samples).
 #include.block.itext=false
 #include.block.jfor=false
 #include.block.jsp=false
+#-----[dependency]: "linkrewriter" depends on "xsp".
 include.block.linkrewriter=true
-#-----[dependency]: "lucene" depends on "template" (for samples).
 #-----[dependency]: "lucene" is needed by "querybean".
 include.block.lucene=true
 #include.block.midi=false
 #include.block.naming=false
-#-----[dependency]: "ojb" depends on "databases" (for samples), "forms" (for samples), "hsqldb"
(for samples).
-#-----[dependency]: "ojb" is needed by "portal-sample", "querybean".
+#-----[dependency]: "ojb" depends on "databases" (for samples), "forms" (for samples), "hsqldb"
(for samples), "xsp" (for samples).
+#-----[dependency]: "ojb" is needed by "javaflow", "portal", "querybean".
 #include.block.ojb=false
 #include.block.paranoid=false
 #include.block.poi=false
-#-----[dependency]: "portal" depends on "ajax", "authentication-fw", "cron", "forms", "session-fw".
-#-----[dependency]: "portal" is needed by "faces", "portal-sample".
+#-----[dependency]: "portal" depends on "auth", "authentication-fw", "cron", "forms", "ojb",
"session-fw".
+#-----[dependency]: "portal" is needed by "faces".
 #include.block.portal=false
-#-----[dependency]: "portal-sample" depends on "authentication-fw", "cron", "forms", "ojb",
"portal", "session-fw", "template" (for samples).
-#include.block.portal-sample=false
+#-----[dependency]: "profiler" depends on "auth".
 include.block.profiler=true
 #-----[dependency]: "python" depends on "xsp".
 #include.block.python=false
-#-----[dependency]: "session-fw" is needed by "authentication-fw", "portal", "portal-sample",
"xsp".
+#-----[dependency]: "session-fw" depends on "xsp".
+#-----[dependency]: "session-fw" is needed by "authentication-fw", "portal", "portal-fw".
 #include.block.session-fw=false
-#-----[dependency]: "velocity" is needed by "petstore", "scratchpad".
+#-----[dependency]: "velocity" is needed by "petstore".
 #include.block.velocity=false
 #include.block.web3=false
 #-----[dependency]: "xmldb" depends on "databases".
 #include.block.xmldb=false
-#-----[dependency]: "xsp" depends on "databases", "session-fw".
-#-----[dependency]: "xsp" is needed by "core-samples-main", "itext", "mail", "python", "scratchpad".
+#-----[dependency]: "xsp" is needed by "axis", "databases", "fop", "itext", "linkrewriter",
"ojb", "python", "session-fw", "woody".
 include.block.xsp=true
 
+# Deprecated blocks ------------------------------------------------------------
+
+# Although some of these blocks may have been stable, they are now deprecated
+# in favour of other blocks and therefore are excluded by default from the build.
+# For including one of them you have to set the exclude property into comment in
+# blocks.properties.
+
+include.block.php=false
+#-----[dependency]: "portal-fw" depends on "authentication-fw", "session-fw".
+include.block.portal-fw=false
+include.block.swf=false
+#-----[dependency]: "woody" depends on "xsp" (for samples).
+include.block.woody=false
+
 # Unstable blocks --------------------------------------------------------------
 
 # Unstable blocks are currently under development and do not guarantee that the
@@ -132,61 +145,59 @@
 # its development as things might change over time before they are marked
 # stable.
 
-#-----[dependency]: "ajax" is needed by "forms", "portal".
+#-----[dependency]: "ajax" depends on "template" (for samples).
+#-----[dependency]: "ajax" is needed by "forms".
 #include.block.ajax=false
 #-----[dependency]: "apples" depends on "forms" (for samples).
 #include.block.apples=false
 #-----[dependency]: "asciiart" is needed by "mail".
 include.block.asciiart=true
-#-----[dependency]: "axis" is needed by "scratchpad".
+#-----[dependency]: "auth" is needed by "portal", "profiler".
+include.block.auth=true
+#-----[dependency]: "axis" depends on "xsp" (for samples).
 #include.block.axis=false
+#-----[dependency]: "captcha" depends on "template" (for samples).
 #include.block.captcha=false
-#-----[dependency]: "cron" depends on "template" (for samples).
-#-----[dependency]: "cron" is needed by "jms", "portal", "portal-sample", "scratchpad".
+#-----[dependency]: "cron" is needed by "jms", "portal".
 #include.block.cron=false
 #include.block.deli=false
 #-----[dependency]: "eventcache" depends on "jms", "template" (for samples).
-#-----[dependency]: "eventcache" is needed by "repository".
+#-----[dependency]: "eventcache" is needed by "repository", "webdav".
 #include.block.eventcache=false
 #-----[dependency]: "faces" depends on "portal", "taglib".
-#-----[dependency]: "faces" is needed by "scratchpad".
 #include.block.faces=false
-#-----[dependency]: "forms" depends on "ajax", "template".
-#-----[dependency]: "forms" is needed by "apples", "javaflow", "ojb", "petstore", "portal",
"portal-sample", "querybean", "tour".
-#include.block.forms=false
-#-----[dependency]: "javaflow" depends on "forms", "template" (for samples).
-#-----[dependency]: "javaflow" is needed by "scratchpad".
+#include.block.imageop=false
+#-----[dependency]: "javaflow" depends on "forms", "ojb".
 #include.block.javaflow=false
-#include.block.jcr=false
-#-----[dependency]: "jms" depends on "cron", "databases" (for samples), "hsqldb" (for samples).
+include.block.jcr=false
+#-----[dependency]: "jms" depends on "cron", "databases" (for samples), "hsqldb".
 #-----[dependency]: "jms" is needed by "eventcache", "slide".
 #include.block.jms=false
-#-----[dependency]: "mail" depends on "asciiart" (for samples), "xsp" (for samples).
+#include.block.linotype=false
+#-----[dependency]: "mail" depends on "asciiart" (for samples).
 #include.block.mail=false
-#-----[dependency]: "petstore" depends on "databases", "forms", "hsqldb", "template", "velocity".
+#-----[dependency]: "petstore" depends on "databases", "forms", "hsqldb", "velocity".
 #include.block.petstore=false
 #include.block.proxy=false
 #include.block.qdox=false
-#-----[dependency]: "querybean" depends on "forms" (for samples), "lucene", "ojb", "template"
(for samples).
+#-----[dependency]: "querybean" depends on "forms" (for samples), "lucene", "ojb".
 #include.block.querybean=false
-#-----[dependency]: "repository" depends on "databases" (for samples), "eventcache".
-#-----[dependency]: "repository" is needed by "scratchpad", "slide", "webdav".
+#-----[dependency]: "repository" depends on "databases", "eventcache".
+#-----[dependency]: "repository" is needed by "slide", "webdav".
 #include.block.repository=false
-#-----[dependency]: "scratchpad" depends on "axis" (for samples), "batik" (for samples),
"cron", "faces" (for samples), "javaflow", "repository", "template" (for samples), "velocity"
(for samples), "xsp".
-#include.block.scratchpad=false
 #include.block.serializers=false
-#-----[dependency]: "slide" depends on "jms", "repository", "template" (for samples).
+#-----[dependency]: "slide" depends on "jms", "repository".
 #include.block.slide=false
 #-----[dependency]: "slop" is needed by "tour".
 #include.block.slop=false
-#include.block.spring-app=false
 #include.block.stx=false
 #-----[dependency]: "taglib" is needed by "faces".
 #include.block.taglib=false
-#-----[dependency]: "template" is needed by "chaperon", "cron", "eventcache", "forms", "javaflow",
"lucene", "petstore", "portal-sample", "querybean", "scratchpad", "slide", "tour", "webdav".
+#-----[dependency]: "template" is needed by "ajax", "captcha", "eventcache", "forms".
 include.block.template=true
-#-----[dependency]: "tour" depends on "batik", "fop", "forms", "slop", "template".
+#-----[dependency]: "tour" depends on "batik", "fop", "forms", "slop".
 #include.block.tour=false
 include.block.validation=true
-#-----[dependency]: "webdav" depends on "repository", "template" (for samples).
+#-----[dependency]: "webdav" depends on "eventcache", "repository".
 #include.block.webdav=false
+#include.block.xsltal=false

Modified: forrest/trunk/etc/cocoon_upgrade/local.build.properties
URL: http://svn.apache.org/viewvc/forrest/trunk/etc/cocoon_upgrade/local.build.properties?rev=694101&r1=694100&r2=694101&view=diff
==============================================================================
--- forrest/trunk/etc/cocoon_upgrade/local.build.properties (original)
+++ forrest/trunk/etc/cocoon_upgrade/local.build.properties Wed Sep 10 20:45:49 2008
@@ -43,6 +43,7 @@
 #include.driver.odbc=true
 #config.allow-reloads=true
 #config.enable-uploads=true
+#config.enable-instrumentation=true
 
 # ---- Validation --------------------------------------------------------------
 
@@ -60,23 +61,27 @@
 # disable some long-running tests by default
 # anteater.test.bug26186InternalRequestMemoryLeak.enabled = true
 
+# ---- htmlUnit ----------------------------------------------------------------
+
+# htmlunit can be downloaded from http://htmlunit.sourceforge.net/
+# Tests currently require htmlunit 1.13, please change this 
+# comment and the default value below if moving to another version
+
+htmlunit.home = /default-from-build.properties/htmlunit-1.13
+htmlunit.test.baseurl=http://localhost:8888/
+
+# for serious leak testing increase iteration count to 10000
+htmlunit.test.Bug26186InternalRequestMemoryLeak.iterations=1
+
+# This can be changed to run only a subset of the tests
+# The mask is used in ant <fileset>/<include> elements
+htmlunit.test.include=**/*TestCase.class
+
 # ---- JUnit -------------------------------------------------------------------
 
 junit.test.debugport=8000
 #junit.testcase=org.apache.cocoon.util.test.NetUtilsTestCase
-junit.test.loglevel=1
-
-# Optionally enable remote debugging when running the JUnit tests.
-# Uncomment one of the following lines only, the property must be present even if empty.
-# Note that setting suspend=y might cause the JVM to stop several times when running the
-# tests, as the build forks a new JVM at several points.
-# This is most useful together with the junit.test.include.* properties below
-#junit.test.jvmargs=-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n
-junit.test.jvmargs=
-
-# Define which JUnit tests to run - useful to run a subset of tests
-junit.test.include.1=**/*TestCase.class
-junit.test.include.2=**/*Test.class
+junit.test.loglevel=0
 
 # ---- IDE ---------------------------------------------------------------------
 
@@ -92,6 +97,9 @@
 build.test=${build}/test
 build.test.output=${build.test}/output
 build.test.report=${build.test}/report
+build.test.htmlunit=${build.test}/htmlunit
+build.test.htmlunit.output=${build.test.htmlunit}/output
+build.test.htmlunit.report=${build.test.htmlunit}/report
 build.javadocs=${build}/javadocs
 build.context=${build}/documentation
 build.blocks=${build}/blocks
@@ -110,6 +118,8 @@
 build.webapp.test-suite=${build.webapp}/test-suite
 build.webapp.loglevel=INFO
 build.webapp.logappend=false
+# Change the sample's hsqldb server port to run multiple Cocoons on a single machine
+#build.webapp.hsqldb-server-port=9003
 build.war=${build}/${name}.war
 
 # ---- Standalone-demo Build Properties ----------------------------------------
@@ -134,7 +144,7 @@
 packages=org.apache
 
 # Project descriptor
-gump.descriptor=src/gump/module.xml
+gump.descriptor=gump.xml
 
 # Directory Layout
 src=src

Modified: forrest/trunk/main/java/org/apache/forrest/locationmap/lm/ActNode.java
URL: http://svn.apache.org/viewvc/forrest/trunk/main/java/org/apache/forrest/locationmap/lm/ActNode.java?rev=694101&r1=694100&r2=694101&view=diff
==============================================================================
--- forrest/trunk/main/java/org/apache/forrest/locationmap/lm/ActNode.java (original)
+++ forrest/trunk/main/java/org/apache/forrest/locationmap/lm/ActNode.java Wed Sep 10 20:45:49
2008
@@ -27,6 +27,7 @@
 import org.apache.avalon.framework.service.ServiceManager;
 import org.apache.avalon.framework.service.ServiceSelector;
 import org.apache.cocoon.acting.Action;
+import org.apache.cocoon.components.CocoonComponentManager;
 import org.apache.cocoon.components.treeprocessor.InvokeContext;
 import org.apache.cocoon.components.treeprocessor.variables.VariableResolver;
 import org.apache.cocoon.components.treeprocessor.variables.VariableResolverFactory;
@@ -137,7 +138,7 @@
      * @see org.apache.forrest.locationmap.lm.AbstractNode#locate(java.util.Map, org.apache.cocoon.components.treeprocessor.InvokeContext)
      */
     public String locate(Map objectModel, InvokeContext context) throws Exception {
-        this.resolver = (SourceResolver)m_manager.lookup(SourceResolver.ROLE);
+        this.resolver = (SourceResolver)CocoonComponentManager.getCurrentEnvironment();
         Parameters parameters = resolveParameters(context,objectModel);
         Redirector redirector = context.getRedirector();
         m_src = m_varResolver.resolve(context,objectModel);
@@ -159,4 +160,4 @@
         return null;
     }
     
-}
\ No newline at end of file
+}

Modified: forrest/trunk/main/java/org/apache/forrest/locationmap/lm/LocationMap.java
URL: http://svn.apache.org/viewvc/forrest/trunk/main/java/org/apache/forrest/locationmap/lm/LocationMap.java?rev=694101&r1=694100&r2=694101&view=diff
==============================================================================
--- forrest/trunk/main/java/org/apache/forrest/locationmap/lm/LocationMap.java (original)
+++ forrest/trunk/main/java/org/apache/forrest/locationmap/lm/LocationMap.java Wed Sep 10
20:45:49 2008
@@ -253,7 +253,6 @@
         final Logger contextLogger = getLogger().getChildLogger("ctx");
 
         ContainerUtil.enableLogging(context, contextLogger);
-        ContainerUtil.compose(context, new WrapperComponentManager(m_manager));
         ContainerUtil.service(context, m_manager);
 
         final Map anchorMap = new HashMap(2);

Modified: forrest/trunk/main/java/org/apache/forrest/util/IdGeneratorTransformer.java
URL: http://svn.apache.org/viewvc/forrest/trunk/main/java/org/apache/forrest/util/IdGeneratorTransformer.java?rev=694101&r1=694100&r2=694101&view=diff
==============================================================================
--- forrest/trunk/main/java/org/apache/forrest/util/IdGeneratorTransformer.java (original)
+++ forrest/trunk/main/java/org/apache/forrest/util/IdGeneratorTransformer.java Wed Sep 10
20:45:49 2008
@@ -22,12 +22,11 @@
 import java.util.Map;
 
 import org.apache.avalon.framework.activity.Disposable;
+import org.apache.avalon.framework.component.ComponentManager;
 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.parameters.Parameters;
-import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.avalon.framework.service.ServiceException;
 import org.apache.cocoon.transformation.AbstractDOMTransformer;
 import org.apache.cocoon.ProcessingException;
 import org.apache.cocoon.caching.CacheableProcessingComponent;
@@ -132,8 +131,8 @@
         */
     }
 
-    public void service(ServiceManager manager) throws ServiceException {
-        super.service(manager);
+    public void compose(ComponentManager manager) {
+        super.compose(manager);
         try {
             this.processor = (XPathProcessor)this.manager.lookup(XPathProcessor.ROLE);
         } catch (Exception e) {

Modified: forrest/trunk/main/java/org/apache/forrest/util/XPathTransformer.java
URL: http://svn.apache.org/viewvc/forrest/trunk/main/java/org/apache/forrest/util/XPathTransformer.java?rev=694101&r1=694100&r2=694101&view=diff
==============================================================================
--- forrest/trunk/main/java/org/apache/forrest/util/XPathTransformer.java (original)
+++ forrest/trunk/main/java/org/apache/forrest/util/XPathTransformer.java Wed Sep 10 20:45:49
2008
@@ -21,9 +21,8 @@
 import java.util.Map;
 import java.util.Stack;
 
+import org.apache.avalon.framework.component.ComponentManager;
 import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.avalon.framework.service.ServiceException;
 import org.apache.cocoon.ProcessingException;
 import org.apache.cocoon.transformation.AbstractDOMTransformer;
 import org.apache.cocoon.caching.CacheableProcessingComponent;
@@ -104,8 +103,8 @@
         }
 
 
-    public void service(ServiceManager manager) throws ServiceException {
-        super.service(manager);
+    public void compose(ComponentManager manager) {
+        super.compose(manager);
         try {
             this.processor = (XPathProcessor)this.manager.lookup(XPathProcessor.ROLE);
         } catch (Exception e) {

Modified: forrest/trunk/main/targets/webapp.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/targets/webapp.xml?rev=694101&r1=694100&r2=694101&view=diff
==============================================================================
--- forrest/trunk/main/targets/webapp.xml (original)
+++ forrest/trunk/main/targets/webapp.xml Wed Sep 10 20:45:49 2008
@@ -158,7 +158,14 @@
        =============================================================== -->
   <target name="war" depends="run-webapp"
    description="* Generates a dynamic servlet-based website (a packaged .war file)">
-    <move file="${project.webapp}/WEB-INF/xconf/forrest-core-webapp.xconf" tofile="${project.webapp}/WEB-INF/xconf/forrest-core.xconf"/>
+    <xslt force="true"
+      in="${project.webapp}/WEB-INF/cocoon.xconf"
+      out="${project.webapp}/WEB-INF/cocoon.xconf2"
+      style="${forrest.core}/var/fixWarXconf.xsl">
+      <outputproperty name="indent" value="yes"/>
+    </xslt>
+<!-- FIXME: The xslt task did not like writing to the same file (Mac OS X?) -->
+    <move file="${project.webapp}/WEB-INF/cocoon.xconf2" tofile="${project.webapp}/WEB-INF/cocoon.xconf"/>
     <jar destfile="${project.war}">
       <fileset dir="${project.webapp}"/>
       <fileset dir="${forrest.home}">



Mime
View raw message