From: <jde...@us...> - 2008-08-03 05:43:26
|
Revision: 7312 http://pcgen.svn.sourceforge.net/pcgen/?rev=7312&view=rev Author: jdempsey Date: 2008-08-03 05:43:32 +0000 (Sun, 03 Aug 2008) Log Message: ----------- FReq: Upgrade to new JEP 2.4.1 Issue#: 1726460 Modified Paths: -------------- Trunk/pcgen/build.xml Trunk/pcgen/code/src/java/pcgen/util/PJEP.java Trunk/pcgen/project.properties Trunk/pcgen/project.xml Added Paths: ----------- Trunk/pcgen/lib/jep/ext-1.1.1.jar Trunk/pcgen/lib/jep/jep-2.4.1.jar Removed Paths: ------------- Trunk/pcgen/lib/jep/jep-2.3.1.jar Modified: Trunk/pcgen/build.xml =================================================================== --- Trunk/pcgen/build.xml 2008-08-03 03:34:00 UTC (rev 7311) +++ Trunk/pcgen/build.xml 2008-08-03 05:43:32 UTC (rev 7312) @@ -72,7 +72,7 @@ <property name="manifest.file" value="code/manifest" /> <property name="manifest.main.class" value="pcgen.core.Main" /> <property name="default.main.class" value="pcgen.gui.pcGenGUI" /> - <property name="manifest.extra.jars" value="${lib.dir}/apache/commons-lang-2.4.jar ${lib.dir}/fop/xercesImpl-2.5.0.jar ${lib.dir}/fop/avalon-framework-cvs-20020806.jar ${lib.dir}/fop/xml-apis.jar ${lib.dir}/fop/xalan-2.5.2.jar ${lib.dir}/fop/batik.jar ${lib.dir}/fop/fop.jar ${lib.dir}/lnf/kunststoff.jar ${lib.dir}/lnf/skinlf.jar ${lib.dir}/lnf/wraplf.jar ${lib.dir}/jep/jep-2.3.1.jar ${lib.dir}/jdom.jar ${lib.dir}/MRJ141Stubs.jar ${lib.dir}/jep/djep-2.24.jar ${lib.dir}/jep/RngPack-1.1a.jar ${lib.dir}/tracerapi.jar ${lib.dir}/cobra/cobra.jar ${lib.dir}/cobra/js.jar" /> + <property name="manifest.extra.jars" value="${lib.dir}/apache/commons-lang-2.4.jar ${lib.dir}/fop/xercesImpl-2.5.0.jar ${lib.dir}/fop/avalon-framework-cvs-20020806.jar ${lib.dir}/fop/xml-apis.jar ${lib.dir}/fop/xalan-2.5.2.jar ${lib.dir}/fop/batik.jar ${lib.dir}/fop/fop.jar ${lib.dir}/lnf/kunststoff.jar ${lib.dir}/lnf/skinlf.jar ${lib.dir}/lnf/wraplf.jar ${lib.dir}/jep/jep-2.4.1.jar ${lib.dir}/jep/ext-1.1.1.jar ${lib.dir}/jdom.jar ${lib.dir}/MRJ141Stubs.jar ${lib.dir}/jep/djep-2.24.jar ${lib.dir}/jep/RngPack-1.1a.jar ${lib.dir}/tracerapi.jar ${lib.dir}/cobra/cobra.jar ${lib.dir}/cobra/js.jar" /> <!-- Text files always shipped along --> <property name="project.license.file" value="LICENSE" /> Modified: Trunk/pcgen/code/src/java/pcgen/util/PJEP.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/util/PJEP.java 2008-08-03 03:34:00 UTC (rev 7311) +++ Trunk/pcgen/code/src/java/pcgen/util/PJEP.java 2008-08-03 05:43:32 UTC (rev 7312) @@ -95,14 +95,14 @@ addVariable("FALSE", 0); } - public void parseExpression(String expression_in) + public Node parseExpression(String expression_in) { if (updateVariables()) { initSymTab(); } - super.parseExpression(expression_in); + return super.parseExpression(expression_in); } /** Property changes on: Trunk/pcgen/lib/jep/ext-1.1.1.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Property changes on: Trunk/pcgen/lib/jep/jep-2.4.1.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: Trunk/pcgen/project.properties =================================================================== --- Trunk/pcgen/project.properties 2008-08-03 03:34:00 UTC (rev 7311) +++ Trunk/pcgen/project.properties 2008-08-03 05:43:32 UTC (rev 7312) @@ -2,6 +2,7 @@ # The properties for the repositories ##################################### maven.repo.remote = http://repo1.maven.org/maven, \ + http://www.pcgen-test.org/maven, \ http://pcgen.sourceforge.net/maven, \ http://maven-plugins.sourceforge.net/maven, \ http://emma.sourceforge.net/maven Modified: Trunk/pcgen/project.xml =================================================================== --- Trunk/pcgen/project.xml 2008-08-03 03:34:00 UTC (rev 7311) +++ Trunk/pcgen/project.xml 2008-08-03 05:43:32 UTC (rev 7312) @@ -232,12 +232,6 @@ <url>http://www.l2fprod.com/</url> </dependency> <dependency> - <groupId>wraplf</groupId> - <artifactId>wraplf</artifactId> - <version>0.2</version> - <url>https://wraplf.dev.java.net/</url> - </dependency> - <dependency> <groupId>fop</groupId> <artifactId>fop</artifactId> <version>0.20.5</version> @@ -246,7 +240,7 @@ <dependency> <groupId>jep</groupId> <artifactId>jep</artifactId> - <version>2.24</version> + <version>2.4.1</version> <url>http://www.singularsys.com/jep/</url> </dependency> <dependency> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |