svn commit: r930731 - in /ofbiz/trunk: LICENSE framework/base/lib/javacc/javacc.jar lib/ lib/build/ lib/build/javacc/ lib/build/javacc/javacc.jar macros.xml

[doogie-3]

Author: doogie
Date: Sun Apr  4 18:47:22 2010
New Revision: 930731

URL: http://svn.apache.org/viewvc?rev=930731&view=rev
Log:
Remove javacc from the runtime library path.

Added:
    ofbiz/trunk/lib/
    ofbiz/trunk/lib/build/
    ofbiz/trunk/lib/build/javacc/
    ofbiz/trunk/lib/build/javacc/javacc.jar
      - copied, changed from r930707, ofbiz/trunk/framework/base/lib/javacc/javacc.jar
Removed:
    ofbiz/trunk/framework/base/lib/javacc/javacc.jar
Modified:
    ofbiz/trunk/LICENSE
    ofbiz/trunk/macros.xml

Modified: ofbiz/trunk/LICENSE
URL: http://svn.apache.org/viewvc/ofbiz/trunk/LICENSE?rev=930731&r1=930730&r2=930731&view=diff
==============================================================================
--- ofbiz/trunk/LICENSE (original)
+++ ofbiz/trunk/LICENSE Sun Apr  4 18:47:22 2010
@@ -482,7 +482,7 @@ ofbiz/trunk/framework/base/lib/freemarke
 ofbiz/trunk/framework/base/lib/hamcrest-all-1.2.jar
 ofbiz/trunk/framework/base/lib/httpunit.jar
 ofbiz/trunk/framework/base/lib/ical4j-1.0-rc2.jar
-ofbiz/trunk/framework/base/lib/javacc/javacc-4.1.jar
+ofbiz/trunk/lib/build/javacc/javacc-4.1.jar
 ofbiz/trunk/framework/base/lib/javolution-5.4.3.jar
 ofbiz/trunk/framework/base/lib/junitperf.jar
 ofbiz/trunk/framework/base/lib/xpp3_min-1.1.4c.jar

Copied: ofbiz/trunk/lib/build/javacc/javacc.jar (from r930707, ofbiz/trunk/framework/base/lib/javacc/javacc.jar)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/lib/build/javacc/javacc.jar?p2=ofbiz/trunk/lib/build/javacc/javacc.jar&p1=ofbiz/trunk/framework/base/lib/javacc/javacc.jar&r1=930707&r2=930731&rev=930731&view=diff
==============================================================================
Binary files - no diff available.

Modified: ofbiz/trunk/macros.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/macros.xml?rev=930731&r1=930730&r2=930731&view=diff
==============================================================================
--- ofbiz/trunk/macros.xml (original)
+++ ofbiz/trunk/macros.xml Sun Apr  4 18:47:22 2010
@@ -94,7 +94,7 @@ under the License.
      <delete dir="@{prefix}build/gen-src/javacc/@{dir}"/>
      <mkdir dir="@{prefix}build/gen-src/javacc/@{dir}"/>
      <javacc target="@{prefix}src/@{dir}/@{file}.jj"
-      javacchome="${ofbiz.home.dir}/framework/base/lib/javacc"
+      javacchome="${ofbiz.home.dir}/lib/build/javacc"
       outputdirectory="@{prefix}build/gen-src/javacc/@{dir}"/>
      <delete dir="@{prefix}build/classes/@{dir}"/>
     </commands>
@@ -117,7 +117,7 @@ under the License.
      <delete dir="@{prefix}build/gen-src/jjtree/@{dir}"/>
      <mkdir dir="@{prefix}build/gen-src/jjtree/@{dir}"/>
      <jjtree target="@{prefix}src/@{dir}/@{file}.jjt"
-      javacchome="${ofbiz.home.dir}/framework/base/lib/javacc"
+      javacchome="${ofbiz.home.dir}/lib/build/javacc"
       outputdirectory="@{prefix}build/gen-src/jjtree/@{dir}"/>
     </commands>
    </if>
@@ -131,7 +131,7 @@ under the License.
      <delete dir="@{prefix}build/gen-src/javacc/@{dir}"/>
      <mkdir dir="@{prefix}build/gen-src/javacc/@{dir}"/>
      <javacc target="@{prefix}build/gen-src/jjtree/@{dir}/@{file}.jj"
-      javacchome="${ofbiz.home.dir}/framework/base/lib/javacc"
+      javacchome="${ofbiz.home.dir}/lib/build/javacc"
       outputdirectory="@{prefix}build/gen-src/javacc/@{dir}"/>
      <delete dir="@{prefix}build/classes/@{dir}"/>
     </commands>