forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nicola...@apache.org
Subject svn commit: rev 56262 - in forrest/trunk/forrestcore: . bin context context/WEB-INF context/resources context/skins fresh-site fresh-site/src src/core src/core/bin src/core/context src/core/fresh-site src/core/targets src/core/tasks src/core/var targets tasks tasks/org var
Date Mon, 01 Nov 2004 18:11:06 GMT
Author: nicolaken
Date: Mon Nov  1 10:11:04 2004
New Revision: 56262

Added:
   forrest/trunk/forrestcore/bin/
      - copied from rev 56253, forrest/trunk/forrestcore/src/core/bin/
   forrest/trunk/forrestcore/bin/appendcp.bat
      - copied unchanged from rev 56261, forrest/trunk/forrestcore/src/core/bin/appendcp.bat
   forrest/trunk/forrestcore/bin/forrest
      - copied, changed from rev 56261, forrest/trunk/forrestcore/src/core/bin/forrest
   forrest/trunk/forrestcore/bin/forrest.bat
      - copied, changed from rev 56261, forrest/trunk/forrestcore/src/core/bin/forrest.bat
   forrest/trunk/forrestcore/bin/setpwdvar.bat
      - copied unchanged from rev 56261, forrest/trunk/forrestcore/src/core/bin/setpwdvar.bat
   forrest/trunk/forrestcore/bin/setpwdvar98.bat
      - copied unchanged from rev 56261, forrest/trunk/forrestcore/src/core/bin/setpwdvar98.bat
   forrest/trunk/forrestcore/context/
      - copied from rev 56253, forrest/trunk/forrestcore/src/core/context/
   forrest/trunk/forrestcore/context/WEB-INF/
      - copied from rev 56261, forrest/trunk/forrestcore/src/core/context/WEB-INF/
   forrest/trunk/forrestcore/context/aggregate.xmap
      - copied unchanged from rev 56261, forrest/trunk/forrestcore/src/core/context/aggregate.xmap
   forrest/trunk/forrestcore/context/default-forrest.properties
      - copied unchanged from rev 56261, forrest/trunk/forrestcore/src/core/context/default-forrest.properties
   forrest/trunk/forrestcore/context/dtd.xmap
      - copied unchanged from rev 56261, forrest/trunk/forrestcore/src/core/context/dtd.xmap
   forrest/trunk/forrestcore/context/faq.xmap
      - copied unchanged from rev 56261, forrest/trunk/forrestcore/src/core/context/faq.xmap
   forrest/trunk/forrestcore/context/forrest.xmap
      - copied unchanged from rev 56261, forrest/trunk/forrestcore/src/core/context/forrest.xmap
   forrest/trunk/forrestcore/context/i18n.xmap
      - copied unchanged from rev 56261, forrest/trunk/forrestcore/src/core/context/i18n.xmap
   forrest/trunk/forrestcore/context/issues.xmap
      - copied unchanged from rev 56261, forrest/trunk/forrestcore/src/core/context/issues.xmap
   forrest/trunk/forrestcore/context/jettyconf.xml
      - copied unchanged from rev 56261, forrest/trunk/forrestcore/src/core/context/jettyconf.xml
   forrest/trunk/forrestcore/context/linkmap.xmap
      - copied unchanged from rev 56261, forrest/trunk/forrestcore/src/core/context/linkmap.xmap
   forrest/trunk/forrestcore/context/menu.xmap
      - copied unchanged from rev 56261, forrest/trunk/forrestcore/src/core/context/menu.xmap
   forrest/trunk/forrestcore/context/profiler.xmap
      - copied unchanged from rev 56261, forrest/trunk/forrestcore/src/core/context/profiler.xmap
   forrest/trunk/forrestcore/context/raw.xmap
      - copied unchanged from rev 56261, forrest/trunk/forrestcore/src/core/context/raw.xmap
   forrest/trunk/forrestcore/context/resources/
      - copied from rev 56261, forrest/trunk/forrestcore/src/core/context/resources/
   forrest/trunk/forrestcore/context/resources.xmap
      - copied unchanged from rev 56261, forrest/trunk/forrestcore/src/core/context/resources.xmap
   forrest/trunk/forrestcore/context/revisions.xmap
      - copied unchanged from rev 56261, forrest/trunk/forrestcore/src/core/context/revisions.xmap
   forrest/trunk/forrestcore/context/search.xmap
      - copied unchanged from rev 56261, forrest/trunk/forrestcore/src/core/context/search.xmap
   forrest/trunk/forrestcore/context/sitemap.xmap
      - copied unchanged from rev 56261, forrest/trunk/forrestcore/src/core/context/sitemap.xmap
   forrest/trunk/forrestcore/context/skins/
      - copied from rev 56261, forrest/trunk/forrestcore/src/core/context/skins/
   forrest/trunk/forrestcore/context/status.xmap
      - copied unchanged from rev 56261, forrest/trunk/forrestcore/src/core/context/status.xmap
   forrest/trunk/forrestcore/context/tabs.xmap
      - copied unchanged from rev 56261, forrest/trunk/forrestcore/src/core/context/tabs.xmap
   forrest/trunk/forrestcore/forrest.antproxy.xml
      - copied unchanged from rev 56253, forrest/trunk/forrestcore/src/core/forrest.antproxy.xml
   forrest/trunk/forrestcore/forrest.build.xml
      - copied, changed from rev 56253, forrest/trunk/forrestcore/src/core/forrest.build.xml
   forrest/trunk/forrestcore/fresh-site/
      - copied from rev 56253, forrest/trunk/forrestcore/src/core/fresh-site/
   forrest/trunk/forrestcore/fresh-site/forrest.properties
      - copied unchanged from rev 56261, forrest/trunk/forrestcore/src/core/fresh-site/forrest.properties
   forrest/trunk/forrestcore/fresh-site/src/
      - copied from rev 56261, forrest/trunk/forrestcore/src/core/fresh-site/src/
   forrest/trunk/forrestcore/fresh-site/status.xml
      - copied unchanged from rev 56261, forrest/trunk/forrestcore/src/core/fresh-site/status.xml
   forrest/trunk/forrestcore/targets/
      - copied from rev 56253, forrest/trunk/forrestcore/src/core/targets/
   forrest/trunk/forrestcore/targets/context.xml
      - copied unchanged from rev 56261, forrest/trunk/forrestcore/src/core/targets/context.xml
   forrest/trunk/forrestcore/targets/plugins.xml
      - copied unchanged from rev 56261, forrest/trunk/forrestcore/src/core/targets/plugins.xml
   forrest/trunk/forrestcore/targets/site.xml
      - copied unchanged from rev 56261, forrest/trunk/forrestcore/src/core/targets/site.xml
   forrest/trunk/forrestcore/targets/skins.xml
      - copied unchanged from rev 56261, forrest/trunk/forrestcore/src/core/targets/skins.xml
   forrest/trunk/forrestcore/targets/validate.xml
      - copied unchanged from rev 56261, forrest/trunk/forrestcore/src/core/targets/validate.xml
   forrest/trunk/forrestcore/targets/webapp.xml
      - copied unchanged from rev 56261, forrest/trunk/forrestcore/src/core/targets/webapp.xml
   forrest/trunk/forrestcore/tasks/
      - copied from rev 56253, forrest/trunk/forrestcore/src/core/tasks/
   forrest/trunk/forrestcore/tasks/org/
      - copied from rev 56261, forrest/trunk/forrestcore/src/core/tasks/org/
   forrest/trunk/forrestcore/var/
      - copied from rev 56253, forrest/trunk/forrestcore/src/core/var/
   forrest/trunk/forrestcore/var/echo-settings-message.txt
      - copied unchanged from rev 56261, forrest/trunk/forrestcore/src/core/var/echo-settings-message.txt
   forrest/trunk/forrestcore/var/full.cvsignore
      - copied unchanged from rev 56261, forrest/trunk/forrestcore/src/core/var/full.cvsignore
   forrest/trunk/forrestcore/var/initial_plugins_sitemap.xmap
      - copied unchanged from rev 56261, forrest/trunk/forrestcore/src/core/var/initial_plugins_sitemap.xmap
   forrest/trunk/forrestcore/var/pluginMountSnippet.xsl
      - copied unchanged from rev 56261, forrest/trunk/forrestcore/src/core/var/pluginMountSnippet.xsl
   forrest/trunk/forrestcore/var/pluginlist2echo.xsl
      - copied unchanged from rev 56261, forrest/trunk/forrestcore/src/core/var/pluginlist2echo.xsl
   forrest/trunk/forrestcore/var/pluginlist2fetch.xsl
      - copied unchanged from rev 56261, forrest/trunk/forrestcore/src/core/var/pluginlist2fetch.xsl
   forrest/trunk/forrestcore/var/skin-not-found-message.txt
      - copied unchanged from rev 56261, forrest/trunk/forrestcore/src/core/var/skin-not-found-message.txt
   forrest/trunk/forrestcore/var/skinlist2echo.xsl
      - copied unchanged from rev 56261, forrest/trunk/forrestcore/src/core/var/skinlist2echo.xsl
   forrest/trunk/forrestcore/var/skinlist2fetch.xsl
      - copied unchanged from rev 56261, forrest/trunk/forrestcore/src/core/var/skinlist2fetch.xsl
   forrest/trunk/forrestcore/var/template-project-created-message.txt
      - copied unchanged from rev 56261, forrest/trunk/forrestcore/src/core/var/template-project-created-message.txt
   forrest/trunk/forrestcore/var/webapp-generated-message.txt
      - copied unchanged from rev 56261, forrest/trunk/forrestcore/src/core/var/webapp-generated-message.txt
   forrest/trunk/forrestcore/var/webapp-local-generated-message.txt
      - copied unchanged from rev 56261, forrest/trunk/forrestcore/src/core/var/webapp-local-generated-message.txt
Removed:
   forrest/trunk/forrestcore/src/core/bin/
   forrest/trunk/forrestcore/src/core/context/
   forrest/trunk/forrestcore/src/core/forrest.antproxy.xml
   forrest/trunk/forrestcore/src/core/forrest.build.xml
   forrest/trunk/forrestcore/src/core/fresh-site/
   forrest/trunk/forrestcore/src/core/targets/
   forrest/trunk/forrestcore/src/core/tasks/
   forrest/trunk/forrestcore/src/core/var/
Log:
Moving core up two levels - flatten hierarchy.

Copied: forrest/trunk/forrestcore/bin/forrest (from rev 56261, forrest/trunk/forrestcore/src/core/bin/forrest)
==============================================================================
--- forrest/trunk/forrestcore/src/core/bin/forrest	(original)
+++ forrest/trunk/forrestcore/bin/forrest	Mon Nov  1 10:11:04 2004
@@ -59,7 +59,7 @@
 # Save old ANT_HOME
 OLD_ANT_HOME="$ANT_HOME"
 unset ANT_HOME
-ANT_HOME="$FORREST_HOME/../../../tools/ant"
+ANT_HOME="$FORREST_HOME/../tools/ant"
 
 # ----- Set Up The Runtime Classpath ------------------------------------------
 
@@ -78,7 +78,7 @@
 export CP
 unset CLASSPATH
 
-for i in $FORREST_HOME/../../lib/endorsed/*.jar; do
+for i in $FORREST_HOME/../lib/endorsed/*.jar; do
   if [ "$cygwin" = "true" ] ; then
     LIB=`cygpath -w $i`
   else

Copied: forrest/trunk/forrestcore/bin/forrest.bat (from rev 56261, forrest/trunk/forrestcore/src/core/bin/forrest.bat)
==============================================================================
--- forrest/trunk/forrestcore/src/core/bin/forrest.bat	(original)
+++ forrest/trunk/forrestcore/bin/forrest.bat	Mon Nov  1 10:11:04 2004
@@ -33,13 +33,13 @@
 
 rem ----- Save old ANT_HOME --------------------------------------------
 set OLD_ANT_HOME=%ANT_HOME%
-set ANT_HOME=%FORREST_HOME%\..\..\..\tools\ant
+set ANT_HOME=%FORREST_HOME%\..\tools\ant
 
 rem ----- Save and set CLASSPATH --------------------------------------------
 set OLD_CLASSPATH=%CLASSPATH%
 set CLASSPATH=
-cd /d "%FORREST_HOME%\..\..\lib\endorsed\"
-for %%i in ("*.jar") do call %FORREST_HOME%\bin\appendcp.bat "%FORREST_HOME%\..\..\lib\endorsed\%%i"
+cd /d "%FORREST_HOME%\..\lib\endorsed\"
+for %%i in ("*.jar") do call %FORREST_HOME%\bin\appendcp.bat "%FORREST_HOME%\..\lib\endorsed\%%i"
 cd /d %PWD%
 
 echo.

Copied: forrest/trunk/forrestcore/forrest.build.xml (from rev 56253, forrest/trunk/forrestcore/src/core/forrest.build.xml)
==============================================================================
--- forrest/trunk/forrestcore/src/core/forrest.build.xml	(original)
+++ forrest/trunk/forrestcore/forrest.build.xml	Mon Nov  1 10:11:04 2004
@@ -28,17 +28,17 @@
 
   <property name="forrest.version" value="0.7-dev"/>
   <property name="forrest.home"        		  location="${basedir}" />
-  <property name="forrest.root-dir"           location="${forrest.home}/../.."/>  
  
+  <property name="forrest.root-dir"           location="${forrest.home}/.."/>     
   
-  <property name="forrest.lib-dir"            location="${forrest.root-dir}/../lib"/>
  
+  <property name="forrest.lib-dir"            location="${forrest.root-dir}/lib"/>
  
   <property name="forrest.core.lib-dir"       location="${forrest.lib-dir}/core"/>
  
   <property name="forrest.endorsed.lib-dir"   location="${forrest.lib-dir}/endorsed"/>
  
   <property name="forrest.optional.lib-dir"   location="${forrest.lib-dir}/optional"/>
  
 
-  <property name="forrest.ant.lib-dir"        location="${forrest.root-dir}/../tools/ant/lib"/>
 
-  <property name="forrest.jetty.lib-dir"      location="${forrest.root-dir}/../tools/jetty"/>
    
+  <property name="forrest.ant.lib-dir"        location="${forrest.root-dir}/tools/ant/lib"/>
 
+  <property name="forrest.jetty.lib-dir"      location="${forrest.root-dir}/tools/jetty"/>
    
     
-  <property name="forrest.build.lib-dir"      location="${forrest.root-dir}/../build"/>
    
+  <property name="forrest.build.lib-dir"      location="${forrest.root-dir}/build"/>
    
       
   <import file="targets/validate.xml"/>
   <import file="targets/webapp.xml"/>
@@ -98,7 +98,7 @@
 
     <!-- people should use forrest.properties to override following defaults  -->
     <property name="forrest.skins-dir"   location="${forrest.home}/context/skins"/>
 
-    <property name="forrest.plugins-dir"   location="${forrest.home}/../../../build/plugins"/>
  
+    <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"
/>
     <property name="project.webapp"      location="${project.build-dir}/webapp" />

Mime
View raw message