[Japi-cvs] SF.net SVN: japi: [615] tools
Status: Beta
Brought to you by:
christianhujer
Menu
▾
▴
[Japi-cvs] SF.net SVN: japi: [615] tools
|
From: <chr...@us...> - 2007-09-23 21:19:09
|
Revision: 615
http://japi.svn.sourceforge.net/japi/?rev=615&view=rev
Author: christianhujer
Date: 2007-09-23 14:19:05 -0700 (Sun, 23 Sep 2007)
Log Message:
-----------
Changing src layout to make project directory layout compatible with NetBeans.
Modified Paths:
--------------
common/trunk/commonBuild.xml
japi.ipr
libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/ArgParserTest.java
Added Paths:
-----------
libs/argparser/trunk/src/prj/
libs/argparser/trunk/src/prj/net/
libs/argparser/trunk/src/tst/
libs/argparser/trunk/src/tst/test/
libs/io/trunk/src/prj/
libs/io/trunk/src/prj/net/
libs/lang/trunk/src/prj/
libs/lang/trunk/src/prj/net/
libs/lang/trunk/src/tst/
libs/lang/trunk/src/tst/test/
libs/logging/trunk/src/prj/
libs/logging/trunk/src/prj/net/
libs/net/trunk/src/prj/
libs/net/trunk/src/prj/net/
libs/registry/trunk/src/prj/
libs/registry/trunk/src/prj/net/
libs/swing-about/trunk/src/prj/
libs/swing-about/trunk/src/prj/net/
libs/swing-action/trunk/src/prj/
libs/swing-action/trunk/src/prj/net/
libs/swing-action/trunk/src/tst/
libs/swing-action/trunk/src/tst/test/
libs/swing-app/trunk/src/prj/
libs/swing-app/trunk/src/prj/net/
libs/swing-bookmarks/trunk/src/prj/
libs/swing-bookmarks/trunk/src/prj/net/
libs/swing-extlib/trunk/src/prj/
libs/swing-extlib/trunk/src/prj/net/
libs/swing-extlib/trunk/src/tst/
libs/swing-extlib/trunk/src/tst/test/
libs/swing-font/trunk/src/prj/
libs/swing-font/trunk/src/prj/net/
libs/swing-keyprefs/trunk/src/prj/
libs/swing-keyprefs/trunk/src/prj/net/
libs/swing-list/trunk/src/prj/
libs/swing-list/trunk/src/prj/net/
libs/swing-list/trunk/src/tst/
libs/swing-list/trunk/src/tst/test/
libs/swing-misc/trunk/src/prj/
libs/swing-misc/trunk/src/prj/net/
libs/swing-prefs/trunk/src/prj/
libs/swing-prefs/trunk/src/prj/net/
libs/swing-prefs/trunk/src/tst/
libs/swing-prefs/trunk/src/tst/test/
libs/swing-proxyprefs/trunk/src/prj/
libs/swing-proxyprefs/trunk/src/prj/net/
libs/swing-tod/trunk/src/prj/
libs/swing-tod/trunk/src/prj/net/
libs/swing-treetable/trunk/src/prj/
libs/swing-treetable/trunk/src/prj/net/
libs/taglets/trunk/src/prj/
libs/taglets/trunk/src/prj/net/
libs/util/trunk/src/prj/
libs/util/trunk/src/prj/net/
libs/util/trunk/src/tst/
libs/util/trunk/src/tst/test/
libs/xml/trunk/src/prj/
libs/xml/trunk/src/prj/net/
progs/jeduca/trunk/src/prj/
progs/jeduca/trunk/src/prj/net/
progs/jeduca/trunk/src/prj/overview.html
tools/cstyle/trunk/src/prj/
tools/cstyle/trunk/src/prj/net/
tools/cstyle/trunk/src/tst/
tools/cstyle/trunk/src/tst/test/
tools/findLongestPath/trunk/src/prj/
tools/findLongestPath/trunk/src/prj/net/
tools/fontbrowser/trunk/src/prj/
tools/fontbrowser/trunk/src/prj/net/
tools/jwget/trunk/src/prj/
tools/jwget/trunk/src/prj/net/
tools/keystrokes/trunk/src/prj/
tools/keystrokes/trunk/src/prj/net/
tools/prefsbrowser/trunk/src/prj/
tools/prefsbrowser/trunk/src/prj/net/
tools/string2bytes/trunk/src/prj/
tools/string2bytes/trunk/src/prj/net/
tools/string2bytes/trunk/src/tst/
tools/string2bytes/trunk/src/tst/test/
Removed Paths:
-------------
libs/argparser/trunk/src/net/
libs/argparser/trunk/src/test/
libs/io/trunk/src/net/
libs/lang/trunk/src/net/
libs/lang/trunk/src/test/
libs/logging/trunk/src/net/
libs/net/trunk/src/net/
libs/registry/trunk/src/net/
libs/swing-about/trunk/src/net/
libs/swing-action/trunk/src/net/
libs/swing-action/trunk/src/test/
libs/swing-app/trunk/src/net/
libs/swing-bookmarks/trunk/src/net/
libs/swing-extlib/trunk/src/net/
libs/swing-extlib/trunk/src/test/
libs/swing-font/trunk/src/net/
libs/swing-keyprefs/trunk/src/net/
libs/swing-list/trunk/src/net/
libs/swing-list/trunk/src/test/
libs/swing-misc/trunk/src/net/
libs/swing-prefs/trunk/src/net/
libs/swing-prefs/trunk/src/test/
libs/swing-proxyprefs/trunk/src/net/
libs/swing-tod/trunk/src/net/
libs/swing-treetable/trunk/src/net/
libs/taglets/trunk/src/net/
libs/util/trunk/src/net/
libs/util/trunk/src/test/
libs/xml/trunk/src/net/
progs/jeduca/trunk/src/net/
progs/jeduca/trunk/src/overview.html
tools/cstyle/trunk/src/net/
tools/cstyle/trunk/src/test/
tools/findLongestPath/trunk/src/net/
tools/fontbrowser/trunk/src/net/
tools/jwget/trunk/src/net/
tools/keystrokes/trunk/src/net/
tools/prefsbrowser/trunk/src/net/
tools/string2bytes/trunk/src/net/
tools/string2bytes/trunk/src/test/
Modified: common/trunk/commonBuild.xml
===================================================================
--- common/trunk/commonBuild.xml 2007-09-23 20:21:52 UTC (rev 614)
+++ common/trunk/commonBuild.xml 2007-09-23 21:19:05 UTC (rev 615)
@@ -3,6 +3,23 @@
<!--
~ Common build.xml for use in multiple projects.
~
+ ~ The source structure of a project must be like this:
+ ~ * src/prj - the production source
+ ~ supported files:
+ ~ - **/*.java (compiled)
+ ~ - **/*.properties (copied)
+ ~ - META-INF/services/** (copied)
+ ~ * src/tst - the unit test source
+ ~ supported files:
+ ~ - **/*.java (compiled)
+ ~ - **/*.properties (copied)
+ ~ * src/doc - the documentation source (not for javadoc, but for hypertext documentation, e.g. examples)
+ ~ currently ignored except in checkstyle
+ ~
+ ~ The destination structure of a project (generated files) will be:
+ ~ * dist/** - contains distribution archives
+ ~ * classes/** - contains compiled classes
+ ~
~ Note:
~ Taskdefs and targets are sorted alphabetically.
~ Properties are also sorted alphabetically unless they depend on each other.
@@ -72,7 +89,9 @@
<checkstyle
config="${commonPath}/sun_checks.xml"
>
- <fileset dir="src" includes="**/*.java,**/*.properties" />
+ <fileset dir="src/doc" includes="**/*.java,**/*.properties" />
+ <fileset dir="src/prj" includes="**/*.java,**/*.properties" />
+ <fileset dir="src/tst" includes="**/*.java,**/*.properties" />
</checkstyle>
</target>
@@ -96,15 +115,13 @@
debug="yes"
>
<classpath refid="class.path" />
- <exclude name="test/**/*.java" />
- <exclude name="doc/**/*.java" />
<exclude name="**/package-info.java" />
</javac>
<copy
todir="classes/production/${module.shortname}"
>
- <fileset dir="src" includes="net/**/*.properties" />
- <fileset dir="src" includes="META-INF/services/**" />
+ <fileset dir="src/prj" includes="net/**/*.properties" />
+ <fileset dir="src/prj" includes="META-INF/services/**" />
</copy>
</target>
@@ -229,12 +246,9 @@
<!--pathelement path="src" /--><!-- This is handled via packageset. -->
</sourcepath>
<packageset
- dir="src"
+ dir="src/prj"
defaultexcludes="yes"
- >
- <include name="net/**" />
- <exclude name="test/net/**" />
- </packageset>
+ />
<taglet name="net.sf.japi.taglets.FixmeTaglet" path="${commonPath}/antlib/japi-lib-taglets-trunk.jar" />
<taglet name="net.sf.japi.taglets.HistoryTaglet" path="${commonPath}/antlib/japi-lib-taglets-trunk.jar" />
<taglet name="net.sf.japi.taglets.InvariantTaglet" path="${commonPath}/antlib/japi-lib-taglets-trunk.jar" />
@@ -280,13 +294,10 @@
<classpath refid="class.path" />
<sourcepath>
<pathelement path="${user.javadoc.javasrc}" />
- <pathelement path="src" />
</sourcepath>
- <packageset
- dir="src"
- defaultexcludes="yes"
- >
- </packageset>
+ <packageset dir="src/doc" defaultexcludes="yes" />
+ <packageset dir="src/prj" defaultexcludes="yes" />
+ <packageset dir="src/tst" defaultexcludes="yes" />
<taglet name="net.sf.japi.taglets.FixmeTaglet" path="${commonPath}/antlib/japi-lib-taglets-trunk.jar" />
<taglet name="net.sf.japi.taglets.HistoryTaglet" path="${commonPath}/antlib/japi-lib-taglets-trunk.jar" />
<taglet name="net.sf.japi.taglets.InvariantTaglet" path="${commonPath}/antlib/japi-lib-taglets-trunk.jar" />
@@ -306,7 +317,7 @@
<mkdir dir="classes/test/${module.shortname}" />
<mkdir dir="docs/test" />
<javac
- srcdir="src"
+ srcdir="src/tst"
destdir="classes/test/${module.shortname}"
encoding="utf-8"
source="${javaversion}"
@@ -315,13 +326,12 @@
>
<classpath refid="class.path" />
<classpath location="classes/production/${module.shortname}" />
- <include name="test/**/*.java" />
<exclude name="**/package-info.java" />
</javac>
<copy
todir="classes/test/${module.shortname}"
>
- <fileset dir="src" includes="test/**/*.properties" />
+ <fileset dir="src/tst" includes="test/**/*.properties" />
</copy>
<junit printsummary="yes" haltonfailure="yes">
<classpath refid="class.path" />
@@ -330,7 +340,7 @@
<formatter type="plain" />
<formatter type="xml" />
<batchtest todir="docs/test">
- <fileset dir="src">
+ <fileset dir="src/tst">
<include name="test/**/*Test.java" />
<exclude name="test/**/Abstract*Test.java" />
</fileset>
Modified: japi.ipr
===================================================================
--- japi.ipr 2007-09-23 20:21:52 UTC (rev 614)
+++ japi.ipr 2007-09-23 21:19:05 UTC (rev 615)
@@ -60,8 +60,6 @@
<option name="JD_KEEP_EMPTY_RETURN" value="false" />
<option name="HTML_ELEMENTS_TO_INSERT_NEW_LINE_BEFORE" value="" />
<option name="HTML_DO_NOT_INDENT_CHILDREN_OF" value="" />
- <option name="METHOD_ANNOTATION_WRAP" value="1" />
- <option name="FIELD_ANNOTATION_WRAP" value="1" />
<option name="ENUM_CONSTANTS_WRAP" value="2" />
<ADDITIONAL_INDENT_OPTIONS fileType="js">
<option name="INDENT_SIZE" value="4" />
@@ -223,6 +221,7 @@
<inspection_tool class="UnnecessaryEnumModifier" level="WARNING" enabled="true" />
<inspection_tool class="UnnecessaryInterfaceModifier" level="WARNING" enabled="true" />
<inspection_tool class="UnnecessaryQualifierForThis" level="WARNING" enabled="true" />
+ <inspection_tool class="FallthruInSwitchStatement" level="WARNING" enabled="true" />
</profile>
</profiles>
<list size="4">
@@ -445,6 +444,7 @@
<module fileurl="file://$PROJECT_DIR$/libs/util/trunk/libs-util.iml" filepath="$PROJECT_DIR$/libs/util/trunk/libs-util.iml" group="libs" />
<module fileurl="file://$PROJECT_DIR$/libs/xml/trunk/libs-xml.iml" filepath="$PROJECT_DIR$/libs/xml/trunk/libs-xml.iml" group="libs" />
<module fileurl="file://$PROJECT_DIR$/tools/prefsbrowser/trunk/prefsbrowser.iml" filepath="$PROJECT_DIR$/tools/prefsbrowser/trunk/prefsbrowser.iml" group="tools" />
+ <module fileurl="file://$PROJECT_DIR$/progs/requisitor/trunk/requisitor.iml" filepath="$PROJECT_DIR$/progs/requisitor/trunk/requisitor.iml" group="progs" />
<module fileurl="file://$PROJECT_DIR$/site/trunk/site.iml" filepath="$PROJECT_DIR$/site/trunk/site.iml" />
<module fileurl="file://$PROJECT_DIR$/tools/string2bytes/trunk/string2bytes.iml" filepath="$PROJECT_DIR$/tools/string2bytes/trunk/string2bytes.iml" group="tools" />
</modules>
Copied: libs/argparser/trunk/src/prj/net (from rev 614, libs/argparser/trunk/src/net)
Copied: libs/argparser/trunk/src/tst/test (from rev 614, libs/argparser/trunk/src/test)
Modified: libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/ArgParserTest.java
===================================================================
--- libs/argparser/trunk/src/test/net/sf/japi/io/args/ArgParserTest.java 2007-09-23 20:21:52 UTC (rev 614)
+++ libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/ArgParserTest.java 2007-09-23 21:19:05 UTC (rev 615)
@@ -264,7 +264,7 @@
@Test
public void testOptionsFromFileSingleLine() throws RequiredOptionsMissingException, MissingArgumentException, TerminalException, UnknownOptionException, ArgumentFileNotFoundException {
final MockCommand command = new MockCommand();
- ArgParser.parseAndRun(command, "@src/test/net/sf/japi/io/args/ArgParserTest_OptionsFileSingleLine");
+ ArgParser.parseAndRun(command, "@src/tst/test/net/sf/japi/io/args/ArgParserTest_OptionsFileSingleLine");
final List<String> args = command.getArgs();
Assert.assertEquals("Option value must be stored.", "fooInput", command.getInput());
Assert.assertTrue("Run must be called even with zero arguments.", command.isRunCalled());
@@ -285,7 +285,7 @@
@Test
public void testOptionsFromFileMultiple() throws RequiredOptionsMissingException, MissingArgumentException, TerminalException, UnknownOptionException, ArgumentFileNotFoundException {
final MockCommand command = new MockCommand();
- ArgParser.parseAndRun(command, "@src/test/net/sf/japi/io/args/ArgParserTest_MultipleOptionsFileMaster");
+ ArgParser.parseAndRun(command, "@src/tst/test/net/sf/japi/io/args/ArgParserTest_MultipleOptionsFileMaster");
final List<String> args = command.getArgs();
Assert.assertEquals("Option value must be stored.", "fooInput", command.getInput());
Assert.assertTrue("Run must be called even with zero arguments.", command.isRunCalled());
@@ -301,7 +301,7 @@
* @throws UnknownOptionException (unexpected)
* @throws MissingArgumentException (unexpected)
* @throws ArgumentFileNotFoundException (unexpected)
- * @see <a href="http://sourceforge.net/tracker/index.php?func=detail&aid=1750198&group_id=149894&atid=776740">[ 1750198 ] Allow single dash instead of double dash</a>
+ * @see <a href="http://sourceforge.net/tracker/index.php?func=detail&aid=1750198&group_id=149894&atid=776740">[ 1750198 ] Allow single dash instead of double dash</a>
*/
@Test
public void testSingleDashOption() throws RequiredOptionsMissingException, MissingArgumentException, TerminalException, UnknownOptionException, ArgumentFileNotFoundException {
@@ -319,7 +319,7 @@
* @throws UnknownOptionException (unexpected)
* @throws MissingArgumentException (unexpected)
* @throws ArgumentFileNotFoundException (unexpected)
- * @see <a href="http://sourceforge.net/tracker/index.php?func=detail&aid=1750198&group_id=149894&atid=776740">[ 1750198 ] Allow single dash instead of double dash</a>
+ * @see <a href="http://sourceforge.net/tracker/index.php?func=detail&aid=1750198&group_id=149894&atid=776740">[ 1750198 ] Allow single dash instead of double dash</a>
*/
@Test
public void testSingleDashOptionWithEquals() throws RequiredOptionsMissingException, MissingArgumentException, TerminalException, UnknownOptionException, ArgumentFileNotFoundException {
Copied: libs/io/trunk/src/prj/net (from rev 614, libs/io/trunk/src/net)
Copied: libs/lang/trunk/src/prj/net (from rev 614, libs/lang/trunk/src/net)
Copied: libs/lang/trunk/src/tst/test (from rev 614, libs/lang/trunk/src/test)
Copied: libs/logging/trunk/src/prj/net (from rev 614, libs/logging/trunk/src/net)
Copied: libs/net/trunk/src/prj/net (from rev 614, libs/net/trunk/src/net)
Copied: libs/registry/trunk/src/prj/net (from rev 614, libs/registry/trunk/src/net)
Copied: libs/swing-about/trunk/src/prj/net (from rev 614, libs/swing-about/trunk/src/net)
Copied: libs/swing-action/trunk/src/prj/net (from rev 614, libs/swing-action/trunk/src/net)
Copied: libs/swing-action/trunk/src/tst/test (from rev 614, libs/swing-action/trunk/src/test)
Copied: libs/swing-app/trunk/src/prj/net (from rev 614, libs/swing-app/trunk/src/net)
Copied: libs/swing-bookmarks/trunk/src/prj/net (from rev 614, libs/swing-bookmarks/trunk/src/net)
Copied: libs/swing-extlib/trunk/src/prj/net (from rev 614, libs/swing-extlib/trunk/src/net)
Copied: libs/swing-extlib/trunk/src/tst/test (from rev 614, libs/swing-extlib/trunk/src/test)
Copied: libs/swing-font/trunk/src/prj/net (from rev 614, libs/swing-font/trunk/src/net)
Copied: libs/swing-keyprefs/trunk/src/prj/net (from rev 614, libs/swing-keyprefs/trunk/src/net)
Copied: libs/swing-list/trunk/src/prj/net (from rev 614, libs/swing-list/trunk/src/net)
Copied: libs/swing-list/trunk/src/tst/test (from rev 614, libs/swing-list/trunk/src/test)
Copied: libs/swing-misc/trunk/src/prj/net (from rev 614, libs/swing-misc/trunk/src/net)
Copied: libs/swing-prefs/trunk/src/prj/net (from rev 614, libs/swing-prefs/trunk/src/net)
Copied: libs/swing-prefs/trunk/src/tst/test (from rev 614, libs/swing-prefs/trunk/src/test)
Copied: libs/swing-proxyprefs/trunk/src/prj/net (from rev 614, libs/swing-proxyprefs/trunk/src/net)
Copied: libs/swing-tod/trunk/src/prj/net (from rev 614, libs/swing-tod/trunk/src/net)
Copied: libs/swing-treetable/trunk/src/prj/net (from rev 614, libs/swing-treetable/trunk/src/net)
Copied: libs/taglets/trunk/src/prj/net (from rev 614, libs/taglets/trunk/src/net)
Copied: libs/util/trunk/src/prj/net (from rev 614, libs/util/trunk/src/net)
Copied: libs/util/trunk/src/tst/test (from rev 614, libs/util/trunk/src/test)
Copied: libs/xml/trunk/src/prj/net (from rev 614, libs/xml/trunk/src/net)
Deleted: progs/jeduca/trunk/src/overview.html
===================================================================
--- progs/jeduca/trunk/src/overview.html 2007-09-23 20:21:52 UTC (rev 614)
+++ progs/jeduca/trunk/src/overview.html 2007-09-23 21:19:05 UTC (rev 615)
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="de">
- <head>
- <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=utf-8" />
- <title>API Documentation overview for JAPI JEduca</title>
- </head>
- <body>
- <p>
- API Documentation overview for JAPI JEduca.
- </p>
- <p>
- JAPI JEduca is a software for running electronic tests.
- Currently it supports multiple choice test and uses the same file format as KEduca.
- </p>
- </body>
-</html>
Copied: progs/jeduca/trunk/src/prj/net (from rev 614, progs/jeduca/trunk/src/net)
Copied: progs/jeduca/trunk/src/prj/overview.html (from rev 614, progs/jeduca/trunk/src/overview.html)
===================================================================
--- progs/jeduca/trunk/src/prj/overview.html (rev 0)
+++ progs/jeduca/trunk/src/prj/overview.html 2007-09-23 21:19:05 UTC (rev 615)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="de">
+ <head>
+ <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=utf-8" />
+ <title>API Documentation overview for JAPI JEduca</title>
+ </head>
+ <body>
+ <p>
+ API Documentation overview for JAPI JEduca.
+ </p>
+ <p>
+ JAPI JEduca is a software for running electronic tests.
+ Currently it supports multiple choice test and uses the same file format as KEduca.
+ </p>
+ </body>
+</html>
Copied: tools/cstyle/trunk/src/prj/net (from rev 614, tools/cstyle/trunk/src/net)
Copied: tools/cstyle/trunk/src/tst/test (from rev 614, tools/cstyle/trunk/src/test)
Copied: tools/findLongestPath/trunk/src/prj/net (from rev 614, tools/findLongestPath/trunk/src/net)
Copied: tools/fontbrowser/trunk/src/prj/net (from rev 614, tools/fontbrowser/trunk/src/net)
Copied: tools/jwget/trunk/src/prj/net (from rev 614, tools/jwget/trunk/src/net)
Copied: tools/keystrokes/trunk/src/prj/net (from rev 614, tools/keystrokes/trunk/src/net)
Copied: tools/prefsbrowser/trunk/src/prj/net (from rev 614, tools/prefsbrowser/trunk/src/net)
Copied: tools/string2bytes/trunk/src/prj/net (from rev 614, tools/string2bytes/trunk/src/net)
Copied: tools/string2bytes/trunk/src/tst/test (from rev 614, tools/string2bytes/trunk/src/test)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
