forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nicola...@apache.org
Subject svn commit: rev 56291 - in forrest/trunk/main: . context java/org/apache/forrest/conf targets webapp
Date Mon, 01 Nov 2004 22:34:11 GMT
Author: nicolaken
Date: Mon Nov  1 14:34:11 2004
New Revision: 56291

Added:
   forrest/trunk/main/webapp/
      - copied from rev 56282, forrest/trunk/main/context/
Removed:
   forrest/trunk/main/context/
Modified:
   forrest/trunk/main/build.xml
   forrest/trunk/main/forrest.build.xml
   forrest/trunk/main/java/org/apache/forrest/conf/ForrestConfUtils.java
   forrest/trunk/main/targets/context.xml
   forrest/trunk/main/targets/site.xml
   forrest/trunk/main/targets/validate.xml
   forrest/trunk/main/targets/webapp.xml
Log:
Rename 'context' to 'webapp'.
Remember to rebuild forrest.

Modified: forrest/trunk/main/build.xml
==============================================================================
--- forrest/trunk/main/build.xml	(original)
+++ forrest/trunk/main/build.xml	Mon Nov  1 14:34:11 2004
@@ -96,7 +96,7 @@
     <delete dir="${forrestbot.dir}/sites"/>
     <delete dir="${forrestbot.dir}/webapp/target"/>
     <delete dir="${forrestbot.dir}/webapp/maven.log"/>
-    <delete dir="src/core/context/WEB-INF/logs"/>
+    <delete dir="webapp/WEB-INF/logs"/>
   </target>
 
   <target name="dist-clean" depends="init, clean"
@@ -163,7 +163,7 @@
       <xmlcatalog id="xcat">
         <catalogpath>
           <pathelement
-            location="./src/core/context/resources/schema/catalog.xcat"/>
+            location="./webapp/resources/schema/catalog.xcat"/>
         </catalogpath>
       </xmlcatalog>
       <fileset dir="./src/core"
@@ -171,14 +171,14 @@
     </xmlvalidate>
     <!-- All stylesheets **/*.xsl -->
     <echo message="validating stylesheets **/*.xsl ..."/>
-    <jing rngfile="./src/core/context/resources/schema/relaxng/xslt.rng">
+    <jing rngfile="./webapp/resources/schema/relaxng/xslt.rng">
       <fileset dir="./src/core" includes="**/*.xsl"/>
       <fileset dir="${tools.dir}" includes="**/*.xsl"/>
     </jing>
     <!-- sitemap.xmap -->
     <echo message="validating **/sitemap.xmap ..."/>
-    <jing rngfile="./src/core/context/resources/schema/relaxng/sitemap-v06.rng">
-      <fileset dir="./src/core/context/" includes="*.xmap"/>
+    <jing rngfile="./webapp/resources/schema/relaxng/sitemap-v06.rng">
+      <fileset dir="./webapp/" includes="*.xmap"/>
     </jing>
     <!-- book.xml -->
     <!-- FIXME: Need Norm Walsh catalog entity resolver or Jeff's DoctypeChanger.
@@ -327,7 +327,7 @@
 	<mkdir dir="${dtdx.dir}"/>
 	<!-- Generate an intermediate XML representation of each DTD -->
 	<dtd2xml classpathref="classpath" outputDir="${dtdx.dir}" preserveDirs="yes" extension=".dtdx">
-		<fileset dir="./src/core/context/resources/schema/dtd">
+		<fileset dir="./webapp/resources/schema/dtd">
 			<include name="changes-v12.dtd"/>
 			<include name="changes-v13.dtd"/>
 			<include name="document-v11.dtd"/>
@@ -352,7 +352,7 @@
 	<!-- Now transform the intermediate format back to the regular DTD format -->
 	<!-- Note that we could also transform to XSD or RNG -->
 	<xslt basedir="${dtdx.dir}"
-		destdir="${dist-shbat.dir}/context/resources/schema/dtd"
+		destdir="${dist-shbat.dir}/webapp/resources/schema/dtd"
 		extension="-full.dtd"
     style="tools/dtdconverters/dtdx2dtd.xsl">
     <include name="*.dtdx"/>

Modified: forrest/trunk/main/forrest.build.xml
==============================================================================
--- forrest/trunk/main/forrest.build.xml	(original)
+++ forrest/trunk/main/forrest.build.xml	Mon Nov  1 14:34:11 2004
@@ -93,11 +93,11 @@
     <property file="${project.home}/forrest.properties" />
     <echo message="Loading user specific properties from ${user.home}${/}forrest.properties"
/>
     <property file="${user.home}/forrest.properties" />
-    <echo message="Loading default properties from ${forrest.home}${/}context${/}default-forrest.properties"
/>
-    <property file="${forrest.home}/context/default-forrest.properties" />
+    <echo message="Loading default properties from ${forrest.home}${/}webapp${/}default-forrest.properties"
/>
+    <property file="${forrest.home}/webapp/default-forrest.properties" />
 
     <!-- people should use forrest.properties to override following defaults  -->
-    <property name="forrest.skins-dir"   location="${forrest.home}/context/skins"/>
 
+    <property name="forrest.skins-dir"   location="${forrest.home}/webapp/skins"/>
 
     <property name="forrest.plugins-dir"   location="${forrest.root-dir}/build/plugins"/>
  
     <property name="project.site-dir"    location="${project.build-dir}/site"    />
     <property name="project.war"         location="${project.build-dir}/${project.name}.war"
/>
@@ -106,8 +106,8 @@
     <property name="project.cocoon-work-dir"    location="${project.temp-dir}/cocoon-work"
     />
     
     <property name="project.brokenlinkfile" location="${project.temp-dir}/brokenlinks.xml"/>
-    <property name="project.configfile"     value="${forrest.home}/context/WEB-INF/cli.xconf"
/>
-    <property name="project.logkitfile"     value="${forrest.home}/context/WEB-INF/logkit.xconf"
/>
+    <property name="project.configfile"     value="${forrest.home}/webapp/WEB-INF/cli.xconf"
/>
+    <property name="project.logkitfile"     value="${forrest.home}/webapp/WEB-INF/logkit.xconf"
/>
     <property name="project.logger"         value="debug" />
 
     <property name="status"      location="${project.home}/${project.status}" />
@@ -261,7 +261,7 @@
   <target name="load-project-props" depends="validation-props, prepare-context" if="skinconf.present">
     <xslt in="${skinconf}" 
           out="${project.temp-dir}/no-doctype-project-skinconf.xml" 
-          style="${forrest.home}/context/resources/stylesheets/strip-doctype.xsl">
+          style="${forrest.home}/webapp/resources/stylesheets/strip-doctype.xsl">
         <xmlcatalog refid="fcatalog"/>
     </xslt>              
 
@@ -271,9 +271,9 @@
 
   <!-- Load properties from Forrest's default skinconf.xml, unless a user's is defined
-->
   <target name="load-forrest-props" unless="skinconf.present">
-     <xslt in="${forrest.home}/context/skinconf.xml" 
+     <xslt in="${forrest.home}/webapp/skinconf.xml" 
            out="${project.temp-dir}/no-doctype-forrest-skinconf.xml" 
-           style="${forrest.home}/context/resources/stylesheets/strip-doctype.xsl">
+           style="${forrest.home}/webapp/resources/stylesheets/strip-doctype.xsl">
         <xmlcatalog refid="fcatalog"/>
     </xslt> 
 
@@ -319,7 +319,7 @@
   <target name="-prepare-classpath">
     <path id="forrest.cp">
          <pathelement path="${env.CLASSPATH}" />
-         <pathelement location="${forrest.home}/context/WEB-INF/classes"/>
+         <pathelement location="${forrest.home}/webapp/WEB-INF/classes"/>
          <pathelement location="${forrest.build.lib-dir}/xml-forrest.jar"/>
          <pathelement location="${project.classes-dir}"/>
          <fileset dir="${forrest.jetty.lib-dir}">
@@ -426,7 +426,7 @@
    if="custom_jetty_config"
    description="Run Jetty with configuration file found in the project">
     <java classname="org.mortbay.jetty.Server"
-          dir="${forrest.home}/context"
+          dir="${forrest.home}/webapp"
           fork="yes"
           maxmemory="${forrest.maxmemory}"
           failonerror="yes">
@@ -447,7 +447,7 @@
   <target name="run_default_jetty"
    description="Run Jetty with configuration file found in Forrest">
     <java classname="org.mortbay.jetty.Server"
-          dir="${forrest.home}/context"
+          dir="${forrest.home}/webapp"
           fork="yes"
           maxmemory="${forrest.maxmemory}"
           failonerror="yes">
@@ -457,7 +457,7 @@
        <jvmarg line="${forrest.jvmargs}"/>
        <jvmarg
          value="-Djava.endorsed.dirs=${java.endorsed.dirs}${path.separator}${forrest.endorsed.lib-dir}"/>
-       <arg line="${forrest.home}/context/jettyconf.xml" />
+       <arg line="${forrest.home}/webapp/jettyconf.xml" />
        <syspropertyset>
          <propertyref prefix="forrest."/>
          <propertyref prefix="project."/>

Modified: forrest/trunk/main/java/org/apache/forrest/conf/ForrestConfUtils.java
==============================================================================
--- forrest/trunk/main/java/org/apache/forrest/conf/ForrestConfUtils.java	(original)
+++ forrest/trunk/main/java/org/apache/forrest/conf/ForrestConfUtils.java	Mon Nov  1 14:34:11
2004
@@ -84,7 +84,7 @@
         if (forrestHome.equals(defaultHome)) {
             contextHome = defaultHome;
         } else {
-            contextHome = forrestHome + SystemUtils.FILE_SEPARATOR + "/context";
+            contextHome = forrestHome + SystemUtils.FILE_SEPARATOR + "/webapp";
         }
         return contextHome;
     }

Modified: forrest/trunk/main/targets/context.xml
==============================================================================
--- forrest/trunk/main/targets/context.xml	(original)
+++ forrest/trunk/main/targets/context.xml	Mon Nov  1 14:34:11 2004
@@ -46,7 +46,7 @@
     <mkdir dir="${project.webapp}"/>
 
     <sync todir="${project.webapp}/">
-      <fileset dir="${forrest.home}/context" >
+      <fileset dir="${forrest.home}/webapp" >
         <include name="**" />
       </fileset>
     </sync>

Modified: forrest/trunk/main/targets/site.xml
==============================================================================
--- forrest/trunk/main/targets/site.xml	(original)
+++ forrest/trunk/main/targets/site.xml	Mon Nov  1 14:34:11 2004
@@ -38,7 +38,7 @@
     <parallel>
       <java classname="org.apache.cocoon.Main"
         fork="true"
-        dir="${forrest.home}/context"  
+        dir="${forrest.home}/webapp"  
         maxmemory="${forrest.maxmemory}"
         failonerror="true">
         <jvmarg line="${forrest.jvmargs}"/>

Modified: forrest/trunk/main/targets/validate.xml
==============================================================================
--- forrest/trunk/main/targets/validate.xml	(original)
+++ forrest/trunk/main/targets/validate.xml	Mon Nov  1 14:34:11 2004
@@ -127,7 +127,7 @@
       <xmlcatalog id="fcatalog" >
         <catalogpath>
           <pathelement
-            location="${forrest.home}/context/resources/schema/catalog.xcat"/>
+            location="${forrest.home}/webapp/resources/schema/catalog.xcat"/>
           <pathelement location="${catalog}"/>
         </catalogpath>
       </xmlcatalog>
@@ -164,7 +164,7 @@
 
   <target name="validate-sitemap" depends="validation-props"
     if="validate.sitemap" description="Validate the project sitemap">
-    <jing rngfile="${forrest.home}/context/resources/schema/relaxng/sitemap-v06.rng">
+    <jing rngfile="${forrest.home}/webapp/resources/schema/relaxng/sitemap-v06.rng">
       <fileset dir="${content-dir}"
         includes="${forrest.validate.sitemap.includes}"
         excludes="${forrest.validate.sitemap.excludes}">
@@ -176,7 +176,7 @@
 
   <target name="validate-stylesheets" depends="validation-props"
     if="validate.stylesheets" description="Validate XSL files">
-    <jing rngfile="${forrest.home}/context/resources/schema/relaxng/xslt.rng">
+    <jing rngfile="${forrest.home}/webapp/resources/schema/relaxng/xslt.rng">
       <fileset dir="${stylesheets-dir}"
         includes="${forrest.validate.stylesheets.includes}"
         excludes="${forrest.validate.stylesheets.excludes}" />
@@ -188,7 +188,7 @@
 
   <target name="validate-skins-stylesheets" depends="validation-props"
     if="validate.skins.stylesheets">
-    <jing rngfile="${forrest.home}/context/resources/schema/relaxng/xslt.rng">
+    <jing rngfile="${forrest.home}/webapp/resources/schema/relaxng/xslt.rng">
       <fileset dir="${skins-dir}"
         includes="${forrest.validate.skins.stylesheets.includes}"
         excludes="${forrest.validate.skins.stylesheets.excludes}"/>

Modified: forrest/trunk/main/targets/webapp.xml
==============================================================================
--- forrest/trunk/main/targets/webapp.xml	(original)
+++ forrest/trunk/main/targets/webapp.xml	Mon Nov  1 14:34:11 2004
@@ -41,7 +41,7 @@
     extra project-custom classes then will need to be warred in as well. -->
 <!--  should be already there
     <mkdir dir="${project.webapp}/WEB-INF"/>
-    <copy file="${forrest.home}/context/WEB-INF/web.xml" filtering="true" 
+    <copy file="${forrest.home}/webapp/WEB-INF/web.xml" filtering="true" 
       todir="${project.webapp}/WEB-INF"/>
 -->
     
@@ -103,7 +103,7 @@
     </copy>
                   
     <copy toDir="${project.webapp}/WEB-INF/classes">
-      <fileset dir="${forrest.home}/context/WEB-INF/classes"/>
+      <fileset dir="${forrest.home}/webapp/WEB-INF/classes"/>
     </copy>
 
     <!-- Copy XML jars if not running JDK 1.4 (where they're built-in) -->

Mime
View raw message