Menu
▾
▴
[Gridarta-commit] SF.net SVN: gridarta:[9238] trunk
|
From: <aki...@us...> - 2013-05-28 20:09:26
|
Revision: 9238
http://sourceforge.net/p/gridarta/code/9238
Author: akirschbaum
Date: 2013-05-28 20:09:22 +0000 (Tue, 28 May 2013)
Log Message:
-----------
Move java sources into common src directory.
Modified Paths:
--------------
trunk/build.xml
trunk/gridarta.ipr
Added Paths:
-----------
trunk/src/
trunk/src/atrinik/
trunk/src/crossfire/
trunk/src/daimonin/
trunk/src/gridarta/
trunk/src/model/
trunk/src/plugin/
trunk/src/preferences/
trunk/src/textedit/
trunk/src/utils/
Removed Paths:
-------------
trunk/atrinik/
trunk/crossfire/
trunk/daimonin/
trunk/gridarta/
trunk/model/
trunk/plugin/
trunk/preferences/
trunk/textedit/
trunk/utils/
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2013-05-28 20:00:26 UTC (rev 9237)
+++ trunk/build.xml 2013-05-28 20:09:22 UTC (rev 9238)
@@ -17,7 +17,7 @@
~ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-->
-<!DOCTYPE project [<!ENTITY catalogForAnt SYSTEM "gridarta/src/doc/dtd/catalogForAnt.xml">]>
+<!DOCTYPE project [<!ENTITY catalogForAnt SYSTEM "src/gridarta/src/doc/dtd/catalogForAnt.xml">]>
<project default="jar">
<description>
@@ -60,7 +60,7 @@
<path id="path.class.atrinik.app">
<pathelement location="${build.dir}/atrinik/app"/>
- <pathelement location="atrinik/resource"/>
+ <pathelement location="src/atrinik/resource"/>
</path>
<path id="path.class.atrinik.test">
<path refid="path.class.atrinik.app"/>
@@ -69,7 +69,7 @@
<path id="path.class.crossfire.app">
<pathelement location="${build.dir}/crossfire/app"/>
- <pathelement location="crossfire/resource"/>
+ <pathelement location="src/crossfire/resource"/>
</path>
<path id="path.class.crossfire.test">
<path refid="path.class.crossfire.app"/>
@@ -78,7 +78,7 @@
<path id="path.class.daimonin.app">
<pathelement location="${build.dir}/daimonin/app"/>
- <pathelement location="daimonin/resource"/>
+ <pathelement location="src/daimonin/resource"/>
</path>
<path id="path.class.daimonin.test">
<path refid="path.class.daimonin.app"/>
@@ -179,8 +179,8 @@
<target name="clean" description="Removes all generated files.">
<delete dir="${build.dir}"/>
<delete dir="${dist.dir}"/>
- <delete file="gridarta/src/doc/dev/SafeCopy.java.xhtml"/>
- <delete file="gridarta/src/doc/dev/changelog.xml"/>
+ <delete file="src/gridarta/src/doc/dev/SafeCopy.java.xhtml"/>
+ <delete file="src/gridarta/src/doc/dev/changelog.xml"/>
<delete dir="${docs.dir}"/>
<delete file="AtrinikEditor.jar"/>
<delete file="CrossfireEditor.jar"/>
@@ -200,7 +200,7 @@
<fileset dir="${build.dir}/utils/app"/>
<fileset dir="${build.dir}" includes="build.properties"/>
<fileset file="COPYING"/>
- <fileset dir="atrinik/lib">
+ <fileset dir="src/atrinik/lib">
<include name="*-LICENSE"/>
</fileset>
<fileset dir="lib">
@@ -211,8 +211,8 @@
<include name="log4j-1.2.13.jar-LICENSE"/>
<include name="rsyntaxtextarea-1.5.1.jar-LICENSE"/>
</fileset>
- <fileset dir="gridarta/resource"/>
- <fileset dir="atrinik/resource"/>
+ <fileset dir="src/gridarta/resource"/>
+ <fileset dir="src/atrinik/resource"/>
<zipfileset src="lib/bsh-classgen-2.0b4.jar" excludes="META-INF/**"/>
<zipfileset src="lib/bsh-commands-2.0b4.jar" excludes="META-INF/**"/>
<zipfileset src="lib/bsh-core-2.0b4.jar" excludes="META-INF/**"/>
@@ -240,7 +240,7 @@
<fileset dir="${build.dir}/utils/app"/>
<fileset dir="${build.dir}" includes="build.properties"/>
<fileset file="COPYING"/>
- <fileset dir="crossfire/lib">
+ <fileset dir="src/crossfire/lib">
<include name="*-LICENSE"/>
</fileset>
<fileset dir="lib">
@@ -251,8 +251,8 @@
<include name="log4j-1.2.13.jar-LICENSE"/>
<include name="rsyntaxtextarea-1.5.1.jar-LICENSE"/>
</fileset>
- <fileset dir="gridarta/resource"/>
- <fileset dir="crossfire/resource"/>
+ <fileset dir="src/gridarta/resource"/>
+ <fileset dir="src/crossfire/resource"/>
<zipfileset src="lib/bsh-classgen-2.0b4.jar" excludes="META-INF/**"/>
<zipfileset src="lib/bsh-commands-2.0b4.jar" excludes="META-INF/**"/>
<zipfileset src="lib/bsh-core-2.0b4.jar" excludes="META-INF/**"/>
@@ -280,7 +280,7 @@
<fileset dir="${build.dir}/utils/app"/>
<fileset dir="${build.dir}" includes="build.properties"/>
<fileset file="COPYING"/>
- <fileset dir="daimonin/lib">
+ <fileset dir="src/daimonin/lib">
<include name="*-LICENSE"/>
</fileset>
<fileset dir="lib">
@@ -291,8 +291,8 @@
<include name="log4j-1.2.13.jar-LICENSE"/>
<include name="rsyntaxtextarea-1.5.1.jar-LICENSE"/>
</fileset>
- <fileset dir="gridarta/resource"/>
- <fileset dir="daimonin/resource"/>
+ <fileset dir="src/gridarta/resource"/>
+ <fileset dir="src/daimonin/resource"/>
<zipfileset src="lib/bsh-classgen-2.0b4.jar" excludes="META-INF/**"/>
<zipfileset src="lib/bsh-commands-2.0b4.jar" excludes="META-INF/**"/>
<zipfileset src="lib/bsh-core-2.0b4.jar" excludes="META-INF/**"/>
@@ -327,7 +327,7 @@
<target name="compile-atrinik" description="Compiles the atrinik module." depends="compile-gridarta,compile-model,compile-preferences,compile-plugin,compile-utils">
<mkdir dir="${build.dir}/atrinik/app"/>
- <javac srcdir="atrinik/src/main/java" destdir="${build.dir}/atrinik/app" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="${debug}">
+ <javac srcdir="src/atrinik/src/main/java" destdir="${build.dir}/atrinik/app" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="${debug}">
<classpath>
<path refid="path.class.gridarta.app"/>
<path refid="path.class.model.app"/>
@@ -342,10 +342,10 @@
<compilerarg line="${javac.args}"/>
</javac>
<copy todir="${build.dir}/atrinik/app">
- <fileset dir="atrinik/src/main/resources" includes="**/*.properties"/>
+ <fileset dir="src/atrinik/src/main/resources" includes="**/*.properties"/>
</copy>
<mkdir dir="${build.dir}/atrinik/test"/>
- <javac srcdir="atrinik/src/test/java" destdir="${build.dir}/atrinik/test" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="yes">
+ <javac srcdir="src/atrinik/src/test/java" destdir="${build.dir}/atrinik/test" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="yes">
<classpath>
<path refid="path.class.atrinik.app"/>
<path refid="path.class.gridarta.test"/>
@@ -358,13 +358,13 @@
<compilerarg line="${javac.args}"/>
</javac>
<copy todir="${build.dir}/atrinik/test">
- <fileset dir="atrinik/src/test/resources" includes="**/*.properties"/>
+ <fileset dir="src/atrinik/src/test/resources" includes="**/*.properties"/>
</copy>
</target>
<target name="compile-crossfire" description="Compiles the crossfire module." depends="compile-gridarta,compile-model,compile-preferences,compile-plugin,compile-utils">
<mkdir dir="${build.dir}/crossfire/app"/>
- <javac srcdir="crossfire/src/main/java" destdir="${build.dir}/crossfire/app" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="${debug}">
+ <javac srcdir="src/crossfire/src/main/java" destdir="${build.dir}/crossfire/app" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="${debug}">
<classpath>
<path refid="path.class.gridarta.app"/>
<path refid="path.class.model.app"/>
@@ -379,10 +379,10 @@
<compilerarg line="${javac.args}"/>
</javac>
<copy todir="${build.dir}/crossfire/app">
- <fileset dir="crossfire/src/main/resources" includes="**/*.properties"/>
+ <fileset dir="src/crossfire/src/main/resources" includes="**/*.properties"/>
</copy>
<mkdir dir="${build.dir}/crossfire/test"/>
- <javac srcdir="crossfire/src/test/java" destdir="${build.dir}/crossfire/test" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="yes">
+ <javac srcdir="src/crossfire/src/test/java" destdir="${build.dir}/crossfire/test" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="yes">
<classpath>
<path refid="path.class.crossfire.app"/>
<path refid="path.class.gridarta.test"/>
@@ -395,13 +395,13 @@
<compilerarg line="${javac.args}"/>
</javac>
<copy todir="${build.dir}/crossfire/test">
- <fileset dir="crossfire/src/test/resources" includes="**/*.properties"/>
+ <fileset dir="src/crossfire/src/test/resources" includes="**/*.properties"/>
</copy>
</target>
<target name="compile-daimonin" description="Compiles the daimonin module." depends="compile-gridarta,compile-model,compile-plugin,compile-utils">
<mkdir dir="${build.dir}/daimonin/app"/>
- <javac srcdir="daimonin/src/main/java" destdir="${build.dir}/daimonin/app" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="${debug}">
+ <javac srcdir="src/daimonin/src/main/java" destdir="${build.dir}/daimonin/app" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="${debug}">
<classpath>
<path refid="path.class.gridarta.app"/>
<path refid="path.class.model.app"/>
@@ -416,10 +416,10 @@
<compilerarg line="${javac.args}"/>
</javac>
<copy todir="${build.dir}/daimonin/test">
- <fileset dir="daimonin/src/test/resources" includes="**/*.properties"/>
+ <fileset dir="src/daimonin/src/test/resources" includes="**/*.properties"/>
</copy>
<mkdir dir="${build.dir}/daimonin/test"/>
- <javac srcdir="daimonin/src/test/java" destdir="${build.dir}/daimonin/test" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="yes">
+ <javac srcdir="src/daimonin/src/test/java" destdir="${build.dir}/daimonin/test" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="yes">
<classpath>
<path refid="path.class.daimonin.app"/>
<path refid="path.class.gridarta.test"/>
@@ -430,13 +430,13 @@
<compilerarg line="${javac.args}"/>
</javac>
<copy todir="${build.dir}/daimonin/app">
- <fileset dir="daimonin/src/main/resources" includes="**/*.properties"/>
+ <fileset dir="src/daimonin/src/main/resources" includes="**/*.properties"/>
</copy>
</target>
<target name="compile-gridarta" description="Compiles the gridarta module." depends="compile-model,compile-preferences,compile-plugin,compile-textedit,compile-utils">
<mkdir dir="${build.dir}/gridarta/app"/>
- <javac srcdir="gridarta/src/main/java" destdir="${build.dir}/gridarta/app" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="${debug}">
+ <javac srcdir="src/gridarta/src/main/java" destdir="${build.dir}/gridarta/app" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="${debug}">
<classpath>
<path refid="path.class.model.app"/>
<path refid="path.class.preferences.app"/>
@@ -460,10 +460,10 @@
<compilerarg line="${javac.args}"/>
</javac>
<copy todir="${build.dir}/gridarta/test">
- <fileset dir="gridarta/src/test/resources" includes="**/*.properties,cfpython_menu.def"/>
+ <fileset dir="src/gridarta/src/test/resources" includes="**/*.properties,cfpython_menu.def"/>
</copy>
<mkdir dir="${build.dir}/gridarta/test"/>
- <javac srcdir="gridarta/src/test/java" destdir="${build.dir}/gridarta/test" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="yes">
+ <javac srcdir="src/gridarta/src/test/java" destdir="${build.dir}/gridarta/test" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="yes">
<classpath>
<path refid="path.class.gridarta.app"/>
<path refid="path.class.model.test"/>
@@ -477,13 +477,13 @@
<compilerarg line="${javac.args}"/>
</javac>
<copy todir="${build.dir}/gridarta/app">
- <fileset dir="gridarta/src/main/resources" includes="**/*.properties,cfpython_menu.def"/>
+ <fileset dir="src/gridarta/src/main/resources" includes="**/*.properties,cfpython_menu.def"/>
</copy>
</target>
<target name="compile-model" description="Compiles the model module." depends="compile-utils">
<mkdir dir="${build.dir}/model/app"/>
- <javac srcdir="model/src/main/java" destdir="${build.dir}/model/app" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="${debug}">
+ <javac srcdir="src/model/src/main/java" destdir="${build.dir}/model/app" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="${debug}">
<classpath>
<path refid="path.class.utils.app"/>
<path refid="path.lib.annotations"/>
@@ -497,10 +497,10 @@
<compilerarg line="${javac.args}"/>
</javac>
<copy todir="${build.dir}/model/test">
- <fileset dir="model/src/test/resources" includes="**/*.properties"/>
+ <fileset dir="src/model/src/test/resources" includes="**/*.properties"/>
</copy>
<mkdir dir="${build.dir}/model/test"/>
- <javac srcdir="model/src/test/java" destdir="${build.dir}/model/test" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="yes">
+ <javac srcdir="src/model/src/test/java" destdir="${build.dir}/model/test" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="yes">
<classpath>
<path refid="path.class.model.app"/>
<path refid="path.class.utils.test"/>
@@ -514,13 +514,13 @@
<compilerarg line="${javac.args}"/>
</javac>
<copy todir="${build.dir}/model/app">
- <fileset dir="model/src/main/resources" includes="**/*.properties"/>
+ <fileset dir="src/model/src/main/resources" includes="**/*.properties"/>
</copy>
</target>
<target name="compile-preferences" description="Compiles the preferences module.">
<mkdir dir="${build.dir}/preferences/app"/>
- <javac srcdir="preferences/src/main/java" destdir="${build.dir}/preferences/app" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="${debug}">
+ <javac srcdir="src/preferences/src/main/java" destdir="${build.dir}/preferences/app" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="${debug}">
<classpath>
<path refid="path.lib.annotations"/>
<path refid="path.lib.japi-swing-action"/>
@@ -529,23 +529,23 @@
<compilerarg line="${javac.args}"/>
</javac>
<copy todir="${build.dir}/preferences/test">
- <fileset dir="preferences/src/test/resources" includes="**/*.properties"/>
+ <fileset dir="src/preferences/src/test/resources" includes="**/*.properties"/>
</copy>
<mkdir dir="${build.dir}/preferences/test"/>
- <javac srcdir="preferences/src/test/java" destdir="${build.dir}/preferences/test" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="yes">
+ <javac srcdir="src/preferences/src/test/java" destdir="${build.dir}/preferences/test" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="yes">
<classpath>
<path refid="path.class.preferences.app"/>
</classpath>
<compilerarg line="${javac.args}"/>
</javac>
<copy todir="${build.dir}/preferences/app">
- <fileset dir="preferences/src/main/resources" includes="**/*.properties"/>
+ <fileset dir="src/preferences/src/main/resources" includes="**/*.properties"/>
</copy>
</target>
<target name="compile-plugin" description="Compiles the plugin module." depends="compile-model,compile-utils">
<mkdir dir="${build.dir}/plugin/app"/>
- <javac srcdir="plugin/src/main/java" destdir="${build.dir}/plugin/app" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="${debug}">
+ <javac srcdir="src/plugin/src/main/java" destdir="${build.dir}/plugin/app" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="${debug}">
<classpath>
<path refid="path.class.model.app"/>
<path refid="path.class.utils.app"/>
@@ -558,23 +558,23 @@
<compilerarg line="${javac.args}"/>
</javac>
<copy todir="${build.dir}/plugin/test">
- <fileset dir="plugin/src/test/resources" includes="**/*.properties"/>
+ <fileset dir="src/plugin/src/test/resources" includes="**/*.properties"/>
</copy>
<mkdir dir="${build.dir}/plugin/test"/>
- <javac srcdir="plugin/src/test/java" destdir="${build.dir}/plugin/test" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="yes">
+ <javac srcdir="src/plugin/src/test/java" destdir="${build.dir}/plugin/test" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="yes">
<classpath>
<path refid="path.class.plugin.app"/>
</classpath>
<compilerarg line="${javac.args}"/>
</javac>
<copy todir="${build.dir}/plugin/app">
- <fileset dir="plugin/src/main/resources" includes="**/*.properties"/>
+ <fileset dir="src/plugin/src/main/resources" includes="**/*.properties"/>
</copy>
</target>
<target name="compile-textedit" description="Compiles the textedit module." depends="compile-utils">
<mkdir dir="${build.dir}/textedit/app"/>
- <javac srcdir="textedit/src/main/java" destdir="${build.dir}/textedit/app" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="${debug}">
+ <javac srcdir="src/textedit/src/main/java" destdir="${build.dir}/textedit/app" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="${debug}">
<classpath>
<path refid="path.class.utils.app"/>
<path refid="path.lib.annotations"/>
@@ -584,10 +584,10 @@
<compilerarg line="${javac.args}"/>
</javac>
<copy todir="${build.dir}/textedit/test">
- <fileset dir="textedit/src/test/resources" includes="**/*.properties"/>
+ <fileset dir="src/textedit/src/test/resources" includes="**/*.properties"/>
</copy>
<mkdir dir="${build.dir}/textedit/test"/>
- <javac srcdir="textedit/src/test/java" destdir="${build.dir}/textedit/test" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="yes">
+ <javac srcdir="src/textedit/src/test/java" destdir="${build.dir}/textedit/test" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="yes">
<classpath>
<path refid="path.class.textedit.app"/>
<path refid="path.class.utils.test"/>
@@ -595,13 +595,13 @@
<compilerarg line="${javac.args}"/>
</javac>
<copy todir="${build.dir}/textedit/app">
- <fileset dir="textedit/src/main/resources" includes="**/*.properties"/>
+ <fileset dir="src/textedit/src/main/resources" includes="**/*.properties"/>
</copy>
</target>
<target name="compile-utils" description="Compiles the utils module.">
<mkdir dir="${build.dir}/utils/app"/>
- <javac srcdir="utils/src/main/java" destdir="${build.dir}/utils/app" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="${debug}">
+ <javac srcdir="src/utils/src/main/java" destdir="${build.dir}/utils/app" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="${debug}">
<classpath>
<path refid="path.lib.annotations"/>
<path refid="path.lib.japi-swing-action"/>
@@ -612,10 +612,10 @@
<compilerarg line="${javac.args}"/>
</javac>
<copy todir="${build.dir}/utils/test">
- <fileset dir="utils/src/test/resources" includes="**/*.properties"/>
+ <fileset dir="src/utils/src/test/resources" includes="**/*.properties"/>
</copy>
<mkdir dir="${build.dir}/utils/test"/>
- <javac srcdir="utils/src/test/java" destdir="${build.dir}/utils/test" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="yes">
+ <javac srcdir="src/utils/src/test/java" destdir="${build.dir}/utils/test" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="yes">
<classpath>
<path refid="path.class.utils.app"/>
<path refid="path.lib.annotations"/>
@@ -627,7 +627,7 @@
<compilerarg line="${javac.args}"/>
</javac>
<copy todir="${build.dir}/utils/app">
- <fileset dir="utils/src/main/resources" includes="**/*.properties"/>
+ <fileset dir="src/utils/src/main/resources" includes="**/*.properties"/>
</copy>
</target>
@@ -635,27 +635,27 @@
<target name="java2html" description="Converts documentation java sources to XHTML.">
<taskdef name="java2html" classpath="lib/java2html.jar" classname="de.java2html.anttasks.Java2HtmlTask"/>
- <java2html srcdir="gridarta/src/doc" destdir="gridarta/src/doc" includes="**/*.java" outputformat="xhtml11" tabs="4" style="eclipse" addlineanchors="true" includedocumentfooter="true" includedocumentheader="true" lineanchorprefix="line" showdefaulttitle="true" showfilename="true" showlinenumbers="true" showtableborder="true"/>
+ <java2html srcdir="src/gridarta/src/doc" destdir="src/gridarta/src/doc" includes="**/*.java" outputformat="xhtml11" tabs="4" style="eclipse" addlineanchors="true" includedocumentfooter="true" includedocumentheader="true" lineanchorprefix="line" showdefaulttitle="true" showfilename="true" showlinenumbers="true" showtableborder="true"/>
</target>
<target name="editorialDoc" description="Creates the editorial part of the project documentation." depends="java2html">
<mkdir dir="${build.dir}/doc"/>
- <megaxslt srcdir="gridarta/src/doc" destdir="${build.dir}/doc" includes="**/*.xhtml" validatesource="true" validatedest="true" ending="xhtml" transformerFactoryImplementationClassName="net.sf.saxon.TransformerFactoryImpl">
+ <megaxslt srcdir="src/gridarta/src/doc" destdir="${build.dir}/doc" includes="**/*.xhtml" validatesource="true" validatedest="true" ending="xhtml" transformerFactoryImplementationClassName="net.sf.saxon.TransformerFactoryImpl">
<xmlcatalog refid="commonDTDs"/>
- <transformation stylesheet="gridarta/src/doc/transform.xslt"/>
- <transformation stylesheet="gridarta/src/doc/cleanupXhtml11.xslt"/>
+ <transformation stylesheet="src/gridarta/src/doc/transform.xslt"/>
+ <transformation stylesheet="src/gridarta/src/doc/cleanupXhtml11.xslt"/>
</megaxslt>
<megaxslt srcdir="${build.dir}/doc" destdir="${build.dir}/doc" includes="**/*.xhtml" validatesource="true" validatedest="false" ending="html" converttocanonical="true" transformerFactoryImplementationClassName="net.sf.saxon.TransformerFactoryImpl">
<xmlcatalog refid="commonDTDs"/>
- <transformation stylesheet="gridarta/src/doc/xhtml2html.xslt"/>
+ <transformation stylesheet="src/gridarta/src/doc/xhtml2html.xslt"/>
</megaxslt>
- <megaxslt srcdir="gridarta/src/doc" destdir="." includes="faq.xhtml" validatesource="true" validatedest="false" ending="" transformerFactoryImplementationClassName="net.sf.saxon.TransformerFactoryImpl">
+ <megaxslt srcdir="src/gridarta/src/doc" destdir="." includes="faq.xhtml" validatesource="true" validatedest="false" ending="" transformerFactoryImplementationClassName="net.sf.saxon.TransformerFactoryImpl">
<xmlcatalog refid="commonDTDs"/>
- <transformation stylesheet="gridarta/src/doc/faq2txt.xslt"/>
+ <transformation stylesheet="src/gridarta/src/doc/faq2txt.xslt"/>
</megaxslt>
<copy file="faq" tofile="FAQ"/>
<copy todir="${build.dir}/doc">
- <fileset dir="gridarta/src/doc">
+ <fileset dir="src/gridarta/src/doc">
<include name="**/.htaccess"/>
<include name="**/*.html"/>
<include name="dtd/**/*.mod"/>
@@ -672,13 +672,13 @@
<target name="apiDoc" description="Creates public javadoc documentation.">
<mkdir dir="${build.dir}/doc/api/${project.version}"/>
- <copy todir="${build.dir}/doc/api/${project.version}" file="gridarta/src/doc/copyright.xhtml"/>
- <copy todir="${build.dir}/doc/api/${project.version}" file="gridarta/src/doc/dev/api/.htaccess"/>
- <javadoc destdir="${build.dir}/doc/api/${project.version}" access="protected" author="yes" version="yes" locale="en_US" use="yes" splitindex="yes" windowtitle="Gridarta API documentation" doctitle="Gridarta<br />Yet another Java API<br />API Documentation" header="Gridarta ${project.version}<br />Yet another Java API<br />API Documentation" footer="Gridarta<br />Yet another Java API<br />API Documentation" bottom="<div style="text-align:center;">© 2005-2006 The Gridarta Developers. All rights reserved. See <a href="{@docRoot}/copyright.xhtml">copyright</a></div>" serialwarn="yes" charset="${build.source.encoding}" docencoding="${build.source.encoding}" source="${build.source.version}" encoding="${build.source.encoding}" linksource="yes" overview="gridarta/src/main/java/overview.html" link="${user.javadoc.link}">
+ <copy todir="${build.dir}/doc/api/${project.version}" file="src/gridarta/src/doc/copyright.xhtml"/>
+ <copy todir="${build.dir}/doc/api/${project.version}" file="src/gridarta/src/doc/dev/api/.htaccess"/>
+ <javadoc destdir="${build.dir}/doc/api/${project.version}" access="protected" author="yes" version="yes" locale="en_US" use="yes" splitindex="yes" windowtitle="Gridarta API documentation" doctitle="Gridarta<br />Yet another Java API<br />API Documentation" header="Gridarta ${project.version}<br />Yet another Java API<br />API Documentation" footer="Gridarta<br />Yet another Java API<br />API Documentation" bottom="<div style="text-align:center;">© 2005-2006 The Gridarta Developers. All rights reserved. See <a href="{@docRoot}/copyright.xhtml">copyright</a></div>" serialwarn="yes" charset="${build.source.encoding}" docencoding="${build.source.encoding}" source="${build.source.version}" encoding="${build.source.encoding}" linksource="yes" overview="src/gridarta/src/main/java/overview.html" link="${user.javadoc.link}">
<classpath>
- <fileset dir="atrinik/lib" includes="*.jar" excludes="*.jar-LICENSE"/>
- <fileset dir="daimonin/lib" includes="*.jar" excludes="*.jar-LICENSE"/>
- <fileset dir="crossfire/lib" includes="*.jar" excludes="*.jar-LICENSE"/>
+ <fileset dir="src/atrinik/lib" includes="*.jar" excludes="*.jar-LICENSE"/>
+ <fileset dir="src/daimonin/lib" includes="*.jar" excludes="*.jar-LICENSE"/>
+ <fileset dir="src/crossfire/lib" includes="*.jar" excludes="*.jar-LICENSE"/>
<fileset dir="lib" includes="*.jar" excludes="*.jar-LICENSE"/>
</classpath>
<sourcepath>
@@ -693,24 +693,24 @@
<path refid="path.class.textedit.test"/>
<path refid="path.class.utils.test"/>
</sourcepath>
- <packageset dir="gridarta/src/main/java" defaultexcludes="yes"/>
- <packageset dir="gridarta/src/test/java" defaultexcludes="yes"/>
- <packageset dir="atrinik/src/main/java" defaultexcludes="yes"/>
- <packageset dir="atrinik/src/test/java" defaultexcludes="yes"/>
- <packageset dir="crossfire/src/main/java" defaultexcludes="yes"/>
- <packageset dir="crossfire/src/test/java" defaultexcludes="yes"/>
- <packageset dir="daimonin/src/main/java" defaultexcludes="yes"/>
- <packageset dir="daimonin/src/test/java" defaultexcludes="yes"/>
- <packageset dir="model/src/main/java" defaultexcludes="yes"/>
- <packageset dir="model/src/test/java" defaultexcludes="yes"/>
- <packageset dir="preferences/src/main/java" defaultexcludes="yes"/>
- <packageset dir="preferences/src/test/java" defaultexcludes="yes"/>
- <packageset dir="plugin/src/main/java" defaultexcludes="yes"/>
- <packageset dir="plugin/src/test/java" defaultexcludes="yes"/>
- <packageset dir="textedit/src/main/java" defaultexcludes="yes"/>
- <packageset dir="textedit/src/test/java" defaultexcludes="yes"/>
- <packageset dir="utils/src/main/java" defaultexcludes="yes"/>
- <packageset dir="utils/src/test/java" defaultexcludes="yes"/>
+ <packageset dir="src/gridarta/src/main/java" defaultexcludes="yes"/>
+ <packageset dir="src/gridarta/src/test/java" defaultexcludes="yes"/>
+ <packageset dir="src/atrinik/src/main/java" defaultexcludes="yes"/>
+ <packageset dir="src/atrinik/src/test/java" defaultexcludes="yes"/>
+ <packageset dir="src/crossfire/src/main/java" defaultexcludes="yes"/>
+ <packageset dir="src/crossfire/src/test/java" defaultexcludes="yes"/>
+ <packageset dir="src/daimonin/src/main/java" defaultexcludes="yes"/>
+ <packageset dir="src/daimonin/src/test/java" defaultexcludes="yes"/>
+ <packageset dir="src/model/src/main/java" defaultexcludes="yes"/>
+ <packageset dir="src/model/src/test/java" defaultexcludes="yes"/>
+ <packageset dir="src/preferences/src/main/java" defaultexcludes="yes"/>
+ <packageset dir="src/preferences/src/test/java" defaultexcludes="yes"/>
+ <packageset dir="src/plugin/src/main/java" defaultexcludes="yes"/>
+ <packageset dir="src/plugin/src/test/java" defaultexcludes="yes"/>
+ <packageset dir="src/textedit/src/main/java" defaultexcludes="yes"/>
+ <packageset dir="src/textedit/src/test/java" defaultexcludes="yes"/>
+ <packageset dir="src/utils/src/main/java" defaultexcludes="yes"/>
+ <packageset dir="src/utils/src/test/java" defaultexcludes="yes"/>
<tag name="todo" description="Todo:"/>
<tag name="used" description="Manually marked as used." enabled="false"/>
<tag name="fixme" description="Fixme:"/>
@@ -734,19 +734,19 @@
<parallel>
<tar tarfile="${distSrc}.tar">
<tarfileset dir="." prefix="gridarta-${project.version}">
- <include name="gridarta/src/**"/>
+ <include name="src/gridarta/src/**"/>
<include name="build.xml"/>
</tarfileset>
</tar>
<zip destfile="${distSrc}.zip">
<zipfileset dir="." prefix="gridarta-${project.version}">
- <include name="gridarta/src/**"/>
+ <include name="src/gridarta/src/**"/>
<include name="build.xml"/>
</zipfileset>
</zip>
<jar destfile="${distSrc}.jar">
<zipfileset dir="." prefix="gridarta-${project.version}">
- <include name="gridarta/src/**"/>
+ <include name="src/gridarta/src/**"/>
<include name="build.xml"/>
</zipfileset>
</jar>
@@ -809,14 +809,14 @@
</target>
<target name="releaseDist" description="Uploads distribution archives to sourceforge." if="developer.email" depends="checkDevMail, dist">
- <touch file="gridarta/src/doc/api/start.xhtml" millis="0"/>
- <megaxslt srcdir="gridarta/src/doc/api" destdir="gridarta/src/doc/api" includes="start.xhtml" validatesource="true" validatedest="true" ending="xhtml" converttocanonical="true" checktimestamps="true">
+ <touch file="src/gridarta/src/doc/api/start.xhtml" millis="0"/>
+ <megaxslt srcdir="src/gridarta/src/doc/api" destdir="src/gridarta/src/doc/api" includes="start.xhtml" validatesource="true" validatedest="true" ending="xhtml" converttocanonical="true" checktimestamps="true">
<xmlcatalog refid="commonDTDs"/>
<parameter name="project.version" value="${project.version}"/>
- <transformation stylesheet="gridarta/src/doc/api/release.xslt"/>
+ <transformation stylesheet="src/gridarta/src/doc/api/release.xslt"/>
</megaxslt>
<svn javahl="${user.svn.javahl}">
- <commit file="gridarta/src/doc/api/start.xhtml" message="Updating API link to include ${project.version}."/>
+ <commit file="src/gridarta/src/doc/api/start.xhtml" message="Updating API link to include ${project.version}."/>
</svn>
<exec executable="rsync" failonerror="true">
<arg line="-auzv -e ssh ${build.dir}/doc/api/ ${user.rsync.username}@${user.rsync.host}:${user.rsync.dir}/htdocs/api/"/>
@@ -877,27 +877,27 @@
<target name="checkstyle" description="Runs checkstyle to style-check the source code">
<taskdef resource="checkstyletask.properties" classpath="lib/checkstyle-all-5.0.jar"/>
<mkdir dir="${build.dir}/doc"/>
- <checkstyle config="gridarta/src/checkstyle.xml" failOnViolation="true">
+ <checkstyle config="src/gridarta/src/checkstyle.xml" failOnViolation="true">
<formatter type="plain" tofile="${build.dir}/doc/checkstyle_report.txt"/>
<formatter type="plain"/>
- <fileset dir="gridarta/src/main/java" includes="**/*.java"/>
- <fileset dir="gridarta/src/test/java" includes="**/*.java"/>
- <fileset dir="atrinik/src/main/java" includes="**/*.java"/>
- <fileset dir="atrinik/src/test/java" includes="**/*.java"/>
- <fileset dir="crossfire/src/main/java" includes="**/*.java"/>
- <fileset dir="crossfire/src/test/java" includes="**/*.java"/>
- <fileset dir="daimonin/src/main/java" includes="**/*.java"/>
- <fileset dir="daimonin/src/test/java" includes="**/*.java"/>
- <fileset dir="model/src/main/java" includes="**/*.java"/>
- <fileset dir="model/src/test/java" includes="**/*.java"/>
- <fileset dir="preferences/src/main/java" includes="**/*.java"/>
- <fileset dir="preferences/src/test/java" includes="**/*.java"/>
- <fileset dir="plugin/src/main/java" includes="**/*.java"/>
- <fileset dir="plugin/src/test/java" includes="**/*.java"/>
- <fileset dir="textedit/src/main/java" includes="**/*.java"/>
- <fileset dir="textedit/src/test/java" includes="**/*.java"/>
- <fileset dir="utils/src/main/java" includes="**/*.java"/>
- <fileset dir="utils/src/test/java" includes="**/*.java"/>
+ <fileset dir="src/gridarta/src/main/java" includes="**/*.java"/>
+ <fileset dir="src/gridarta/src/test/java" includes="**/*.java"/>
+ <fileset dir="src/atrinik/src/main/java" includes="**/*.java"/>
+ <fileset dir="src/atrinik/src/test/java" includes="**/*.java"/>
+ <fileset dir="src/crossfire/src/main/java" includes="**/*.java"/>
+ <fileset dir="src/crossfire/src/test/java" includes="**/*.java"/>
+ <fileset dir="src/daimonin/src/main/java" includes="**/*.java"/>
+ <fileset dir="src/daimonin/src/test/java" includes="**/*.java"/>
+ <fileset dir="src/model/src/main/java" includes="**/*.java"/>
+ <fileset dir="src/model/src/test/java" includes="**/*.java"/>
+ <fileset dir="src/preferences/src/main/java" includes="**/*.java"/>
+ <fileset dir="src/preferences/src/test/java" includes="**/*.java"/>
+ <fileset dir="src/plugin/src/main/java" includes="**/*.java"/>
+ <fileset dir="src/plugin/src/test/java" includes="**/*.java"/>
+ <fileset dir="src/textedit/src/main/java" includes="**/*.java"/>
+ <fileset dir="src/textedit/src/test/java" includes="**/*.java"/>
+ <fileset dir="src/utils/src/main/java" includes="**/*.java"/>
+ <fileset dir="src/utils/src/test/java" includes="**/*.java"/>
</checkstyle>
</target>
@@ -906,22 +906,22 @@
</target>
<target name="changelog" description="Updates the changelog">
- <exec executable="svn" output="gridarta/src/doc/dev/changelog.xml">
+ <exec executable="svn" output="src/gridarta/src/doc/dev/changelog.xml">
<arg line="log -v --xml"/>
</exec>
- <megaxslt srcdir="gridarta/src/doc/dev" destdir="gridarta/src/doc/dev" includes="changelog.xml" validatesource="false" validatedest="false" ending="xhtml" converttocanonical="true" transformerFactoryImplementationClassName="net.sf.saxon.TransformerFactoryImpl">
+ <megaxslt srcdir="src/gridarta/src/doc/dev" destdir="src/gridarta/src/doc/dev" includes="changelog.xml" validatesource="false" validatedest="false" ending="xhtml" converttocanonical="true" transformerFactoryImplementationClassName="net.sf.saxon.TransformerFactoryImpl">
<xmlcatalog refid="commonDTDs"/>
- <transformation stylesheet="gridarta/src/doc/dev/changelog.xslt"/>
+ <transformation stylesheet="src/gridarta/src/doc/dev/changelog.xslt"/>
</megaxslt>
</target>
<target name="javadoc" depends="init-properties" description="Creates the JavaDoc documentation for the complete editor source.">
<mkdir dir="${build.dir}/doc/dev/api"/>
- <javadoc destdir="${build.dir}/doc/dev/api" locale="en_US" version="yes" author="yes" use="yes" splitindex="yes" windowtitle="Gridarta — API Documentation" doctitle="Gridarta ${build.number}<br />API Documentation" header="Gridarta ${build.number}<br />API Documentation" footer="Gridarta ${build.number}<br />API Documentation" serialwarn="no" charset="utf-8" docencoding="utf-8" source="${build.source.version}" encoding="${build.source.encoding}" linksource="yes" private="yes" overview="gridarta/src/main/java/overview.html" link="${user.javadoc.link}">
+ <javadoc destdir="${build.dir}/doc/dev/api" locale="en_US" version="yes" author="yes" use="yes" splitindex="yes" windowtitle="Gridarta — API Documentation" doctitle="Gridarta ${build.number}<br />API Documentation" header="Gridarta ${build.number}<br />API Documentation" footer="Gridarta ${build.number}<br />API Documentation" serialwarn="no" charset="utf-8" docencoding="utf-8" source="${build.source.version}" encoding="${build.source.encoding}" linksource="yes" private="yes" overview="src/gridarta/src/main/java/overview.html" link="${user.javadoc.link}">
<classpath>
- <fileset dir="atrinik/lib" includes="*.jar" excludes="*.jar-LICENSE"/>
- <fileset dir="daimonin/lib" includes="*.jar" excludes="*.jar-LICENSE"/>
- <fileset dir="crossfire/lib" includes="*.jar" excludes="*.jar-LICENSE"/>
+ <fileset dir="src/atrinik/lib" includes="*.jar" excludes="*.jar-LICENSE"/>
+ <fileset dir="src/daimonin/lib" includes="*.jar" excludes="*.jar-LICENSE"/>
+ <fileset dir="src/crossfire/lib" includes="*.jar" excludes="*.jar-LICENSE"/>
<fileset dir="lib" includes="*.jar" excludes="*.jar-LICENSE"/>
</classpath>
<sourcepath>
@@ -936,24 +936,24 @@
<path refid="path.class.textedit.test"/>
<path refid="path.class.utils.test"/>
</sourcepath>
- <packageset dir="gridarta/src/main/java" defaultexcludes="yes"/>
- <packageset dir="gridarta/src/test/java" defaultexcludes="yes"/>
- <packageset dir="atrinik/src/main/java" defaultexcludes="yes"/>
- <packageset dir="atrinik/src/test/java" defaultexcludes="yes"/>
- <packageset dir="crossfire/src/main/java" defaultexcludes="yes"/>
- <packageset dir="crossfire/src/test/java" defaultexcludes="yes"/>
- <packageset dir="daimonin/src/main/java" defaultexcludes="yes"/>
- <packageset dir="daimonin/src/test/java" defaultexcludes="yes"/>
- <packageset dir="model/src/main/java" defaultexcludes="yes"/>
- <packageset dir="model/src/test/java" defaultexcludes="yes"/>
- <packageset dir="preferences/src/main/java" defaultexcludes="yes"/>
- <packageset dir="preferences/src/test/java" defaultexcludes="yes"/>
- <packageset dir="plugin/src/main/java" defaultexcludes="yes"/>
- <packageset dir="plugin/src/test/java" defaultexcludes="yes"/>
- <packageset dir="textedit/src/main/java" defaultexcludes="yes"/>
- <packageset dir="textedit/src/test/java" defaultexcludes="yes"/>
- <packageset dir="utils/src/main/java" defaultexcludes="yes"/>
- <packageset dir="utils/src/test/java" defaultexcludes="yes"/>
+ <packageset dir="src/gridarta/src/main/java" defaultexcludes="yes"/>
+ <packageset dir="src/gridarta/src/test/java" defaultexcludes="yes"/>
+ <packageset dir="src/atrinik/src/main/java" defaultexcludes="yes"/>
+ <packageset dir="src/atrinik/src/test/java" defaultexcludes="yes"/>
+ <packageset dir="src/crossfire/src/main/java" defaultexcludes="yes"/>
+ <packageset dir="src/crossfire/src/test/java" defaultexcludes="yes"/>
+ <packageset dir="src/daimonin/src/main/java" defaultexcludes="yes"/>
+ <packageset dir="src/daimonin/src/test/java" defaultexcludes="yes"/>
+ <packageset dir="src/model/src/main/java" defaultexcludes="yes"/>
+ <packageset dir="src/model/src/test/java" defaultexcludes="yes"/>
+ <packageset dir="src/preferences/src/main/java" defaultexcludes="yes"/>
+ <packageset dir="src/preferences/src/test/java" defaultexcludes="yes"/>
+ <packageset dir="src/plugin/src/main/java" defaultexcludes="yes"/>
+ <packageset dir="src/plugin/src/test/java" defaultexcludes="yes"/>
+ <packageset dir="src/textedit/src/main/java" defaultexcludes="yes"/>
+ <packageset dir="src/textedit/src/test/java" defaultexcludes="yes"/>
+ <packageset dir="src/utils/src/main/java" defaultexcludes="yes"/>
+ <packageset dir="src/utils/src/test/java" defaultexcludes="yes"/>
<bottom>
<