Author: gmazza
Date: Wed Apr 24 20:14:18 2013
New Revision: 1471631
URL: http://svn.apache.org/r1471631
Log:
Mavenized location of Java source files.
Added:
incubator/jspwiki/trunk/src/main/
incubator/jspwiki/trunk/src/main/java/
incubator/jspwiki/trunk/src/main/java/org/
- copied from r1471606, incubator/jspwiki/trunk/src/org/
incubator/jspwiki/trunk/src/test/
incubator/jspwiki/trunk/src/test/java/
incubator/jspwiki/trunk/src/test/java/SamplePlugin2.java
- copied unchanged from r1471606,
incubator/jspwiki/trunk/tests/SamplePlugin2.java
incubator/jspwiki/trunk/src/test/java/org/
- copied from r1471606, incubator/jspwiki/trunk/tests/org/
Removed:
incubator/jspwiki/trunk/src/org/
incubator/jspwiki/trunk/tests/SamplePlugin2.java
incubator/jspwiki/trunk/tests/org/
Modified:
incubator/jspwiki/trunk/.classpath
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/build.xml
incubator/jspwiki/trunk/pom.xml
incubator/jspwiki/trunk/src/main/java/org/apache/wiki/Release.java
incubator/jspwiki/trunk/src/test/java/org/apache/wiki/parser/CreoleToJSPWikiTranslatorTest.java
Modified: incubator/jspwiki/trunk/.classpath
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/.classpath?rev=1471631&r1=1471630&r2=1471631&view=diff
==============================================================================
--- incubator/jspwiki/trunk/.classpath (original)
+++ incubator/jspwiki/trunk/.classpath Wed Apr 24 20:14:18 2013
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry excluding="**/package.html|images/|webdocs/|wikipages/"
kind="src" output="build" path="src"/>
+ <classpathentry
excluding="**/package.html|images/|main/|webdocs/|wikipages/" kind="src"
output="build" path="src"/>
+ <classpathentry kind="src" output="build" path="src/main/java"/>
<classpathentry including="ini/classmappings.xml" kind="src"
path="etc"/>
<classpathentry excluding="build/|etc/|lib/|libs-opt/|reports/"
kind="src" output="tests/build" path="tests"/>
<classpathentry kind="lib" path="lib/commons-lang-2.6.jar"/>
Modified: incubator/jspwiki/trunk/ChangeLog
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=1471631&r1=1471630&r2=1471631&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Wed Apr 24 20:14:18 2013
@@ -1,3 +1,11 @@
+2013-04-24 Glen Mazza (glenmazza AT apache DOT org)
+
+ * 2.9.1-incubating-3
+
+ * Moved JSPWiki source and test source to Mavenized locations
+
+ * Updated build.xml and pom.xml for new JSPWiki source locations
+
2013-04-23 Dirk Frederickx (brushed AT apache DOT org)
* 2.9.1-incubating-2
Modified: incubator/jspwiki/trunk/build.xml
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/build.xml?rev=1471631&r1=1471630&r2=1471631&view=diff
==============================================================================
--- incubator/jspwiki/trunk/build.xml (original)
+++ incubator/jspwiki/trunk/build.xml Wed Apr 24 20:14:18 2013
@@ -71,8 +71,11 @@
<property name="deprecation" value="false" />
<property name="optimize" value="false" />
- <!-- This denotes the directory where the source code lies. -->
- <property name="code.src" value="src" />
+ <!-- This denotes the directory where the Java source code lies. -->
+ <property name="code.src" value="src/main/java" />
+
+ <!-- This denotes the directory where the source code resources lie. -->
+ <property name="code.resources" value="src" />
<!-- The class files are actually put in this directory. It is
a good habit to keep .class -files separate from the .java -files. -->
@@ -100,7 +103,8 @@
test sources, the location of the test .class files and the
directory where the test results are written in. -->
- <property name="tests.src" value="tests" />
+ <property name="tests.src" value="src/test/java" />
+ <property name="tests.resources" value="tests" />
<property name="tests.build" value="tests/build" />
<property name="tests.reports" value="tests/reports" />
<property name="doc.rat" value="doc/rat" />
@@ -165,7 +169,7 @@
<fileset dir="${libs.tests}">
<include name="*.jar" />
</fileset>
- <pathelement path="${tests.src}/etc" />
+ <pathelement path="${tests.resources}/etc" />
</path>
<!-- Path holding (L)GPL jars and their dependencies -->
@@ -422,7 +426,7 @@
<jar jarfile="${jarfile}">
<fileset dir="${code.build}" includes="**/*.class" />
<fileset dir="${code.src}" includes="org/**/*.properties" />
- <fileset dir="${code.src}" includes="templates/**/*.properties" />
+ <fileset dir="${code.resources}" includes="templates/**/*.properties"
/>
<fileset dir="${code.i18n}" />
<fileset dir="etc" includes="ini/*.xml ini/*.properties" />
</jar>
@@ -520,7 +524,7 @@
<lib dir="${libs.main}" includes="*.jar" excludes="servlet-api-*.jar
jsp-api-*.jar"/>
<lib file="${jarfile}" />
<!--lib file="${libs.tests}/stripes*.jar"/-->
- <fileset dir="${code.src}/webdocs" includes="**" excludes="**/FCK/jsp"
/>
+ <fileset dir="${code.resources}/webdocs" includes="**"
excludes="**/FCK/jsp" />
<webinf dir="etc">
<include name="dtd/**" />
<include name="jsp/**" />
@@ -553,7 +557,7 @@
<java jar="tests/lib/yuicompressor-2.4.7.jar"
output="${tmpdir}/compress/@{src}"
fork="true">
- <arg line="'${code.src}/@{src}' @{args}" />
+ <arg line="'${code.resources}/@{src}' @{args}" />
</java>
</sequential>
</macrodef>
@@ -885,11 +889,11 @@
</batchtest>
</junit>
- <junitreport todir="${tests.src}">
+ <junitreport todir="${tests.resources}">
<fileset dir="${tests.reports}">
<include name="**/TEST-*.xml" />
</fileset>
- <report format="noframes" todir="${tests.src}" />
+ <report format="noframes" todir="${tests.resources}" />
</junitreport>
</target>
@@ -1052,7 +1056,7 @@ If all of the tests ran successfully, th
<!-- Copy the JSPs -->
<copy toDir="@{context.dir}/webapp">
- <fileset dir="${code.src}/webdocs" includes="**" />
+ <fileset dir="${code.resources}/webdocs" includes="**" />
</copy>
</sequential>
@@ -1282,7 +1286,7 @@ To automate the JAR signing processs, yo
<check-file file="${jdbc.driver.jar}" prop="jdbc.jar.present" />
<!-- Bulk-copy the table setup/teardown scripts -->
- <property name="tests.db.scripts"
value="${tests.src}/etc/db/${jdbc.driver.id}" />
+ <property name="tests.db.scripts"
value="${tests.resources}/etc/db/${jdbc.driver.id}" />
<mkdir dir="${tests.db.scripts}" />
<copy toDir="${tests.db.scripts}" overwrite="true">
<fileset dir="${db.scripts}" />
@@ -1305,7 +1309,7 @@ To automate the JAR signing processs, yo
<property name="db.props.exist" value="true" />
<!-- Copying the testing jdbc.properties file -->
- <copy file="${tests.src}/etc/jdbc.properties.tmpl"
toFile="${tests.src}/etc/db/jdbc.properties" overwrite="true"/>
+ <copy file="${tests.resources}/etc/jdbc.properties.tmpl"
toFile="${tests.resources}/etc/db/jdbc.properties" overwrite="true"/>
</target>
<!-- Some convenience macrodefs -->
@@ -1455,7 +1459,7 @@ To automate the JAR signing processs, yo
<!-- list of optional Sonar properties -->
<property name="sonar.binaries" value="${code.build}" />
- <property name="sonar.tests" value="${tests.src}" />
+ <property name="sonar.tests" value="${tests.resources}" />
<!-- list of advanced properties -->
<property name="sonar.core.codeCoveragePlugin" value="cobertura"/>
@@ -1524,7 +1528,7 @@ To automate the JAR signing processs, yo
<fileset dir="."
excludes=".*, .*/**,
doc/LICENSE.*,
- ${code.src}/wikipages/**,
+ ${code.resources}/wikipages/**,
${code.build}/**,
${tests.build}/**,
${tests.reports}/**,
Modified: incubator/jspwiki/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/pom.xml?rev=1471631&r1=1471630&r2=1471631&view=diff
==============================================================================
--- incubator/jspwiki/trunk/pom.xml (original)
+++ incubator/jspwiki/trunk/pom.xml Wed Apr 24 20:14:18 2013
@@ -207,8 +207,6 @@
<build>
<finalName>JSPWiki</finalName>
- <sourceDirectory>${basedir}/src</sourceDirectory>
- <testSourceDirectory>${basedir}/tests</testSourceDirectory>
<resources>
<resource>
<directory>etc</directory>
Modified: incubator/jspwiki/trunk/src/main/java/org/apache/wiki/Release.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/main/java/org/apache/wiki/Release.java?rev=1471631&r1=1471606&r2=1471631&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/main/java/org/apache/wiki/Release.java
(original)
+++ incubator/jspwiki/trunk/src/main/java/org/apache/wiki/Release.java Wed Apr
24 20:14:18 2013
@@ -75,7 +75,7 @@ public final class Release
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "2";
+ public static final String BUILD = "3";
/**
* This is the generic version string you should use
Modified:
incubator/jspwiki/trunk/src/test/java/org/apache/wiki/parser/CreoleToJSPWikiTranslatorTest.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/test/java/org/apache/wiki/parser/CreoleToJSPWikiTranslatorTest.java?rev=1471631&r1=1471606&r2=1471631&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/test/java/org/apache/wiki/parser/CreoleToJSPWikiTranslatorTest.java
(original)
+++
incubator/jspwiki/trunk/src/test/java/org/apache/wiki/parser/CreoleToJSPWikiTranslatorTest.java
Wed Apr 24 20:14:18 2013
@@ -30,7 +30,7 @@ import junit.framework.TestSuite;
public class CreoleToJSPWikiTranslatorTest extends TestCase
{
- public static final String TEST_PROPERTIES =
"tests/org/apache/wiki/parser/creole.properties";
+ public static final String TEST_PROPERTIES =
"src/test/java/org/apache/wiki/parser/creole.properties";
public static void main(String[] args)
{
