Menu
▾
▴
tmapi-commit
|
From: <lh...@us...> - 2008-08-22 13:04:49
|
Revision: 72
http://tmapi.svn.sourceforge.net/tmapi/?rev=72&view=rev
Author: lheuer
Date: 2008-08-22 13:04:58 +0000 (Fri, 22 Aug 2008)
Log Message:
-----------
Fixed build.xml
Modified Paths:
--------------
trunk/build.xml
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2008-08-21 12:17:40 UTC (rev 71)
+++ trunk/build.xml 2008-08-22 13:04:58 UTC (rev 72)
@@ -95,12 +95,12 @@
<target name="internal.tests" depends="test">
<mkdir dir="tmp/META-INF/services"/>
<copy todir="tmp/META-INF/services">
- <fileset dir="${dir.test}">
+ <fileset dir="${dir.test}/org/tmapi/core">
<include name="org.tmapi.core.TopicMapSystemFactory"/>
</fileset>
</copy>
<jar jarfile="tmapi-test.jar" basedir="tmp"/>
- <junit
+ <junit
printsummary="true" showoutput="false"
errorProperty="test.failed" failureProperty="test.failed">
<classpath>
@@ -141,11 +141,11 @@
additionalparam="-author -version"
windowtitle="TMAPI v${dist.version}"
doctitle="TMAPI v${dist.version}">
- <!--
+<!--
<doclet name="net.gleamynode.apiviz.APIviz"
path="${dir.lib}/apiviz-1.1.3.jar">
</doclet>
- -->
+-->
<fileset dir="${dir.src}">
</fileset>
</javadoc>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <la...@us...> - 2009-07-07 18:05:10
|
Revision: 112
http://tmapi.svn.sourceforge.net/tmapi/?rev=112&view=rev
Author: larsga
Date: 2009-07-07 18:04:58 +0000 (Tue, 07 Jul 2009)
Log Message:
-----------
Added the runtests target for running the tests.
Modified Paths:
--------------
trunk/build.xml
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2009-07-04 17:52:31 UTC (rev 111)
+++ trunk/build.xml 2009-07-07 18:04:58 UTC (rev 112)
@@ -36,6 +36,7 @@
<echo message=" test.jar Creates the test suite jar (.index and .core)"/>
<echo message=" doc Creates the API documentation"/>
<echo message=" release Creates the jar and a distributable file"/>
+ <echo message=" runtests Runs all the JUnit test cases"/>
</target>
<target name="init">
@@ -185,6 +186,35 @@
</target>
<!-- =================================================================== -->
+ <!-- Runs all the tests -->
+ <!-- =================================================================== -->
+ <target name="runtests" depends="init">
+ <junit printsummary="true" showoutput="false"
+ errorProperty="test.failed" failureProperty="test.failed"
+ fork="true">
+ <classpath>
+ <pathelement location="${dir.build.classes}"/>
+ <pathelement location="${dir.build.tests}"/>
+ </classpath>
+ <formatter type="brief" usefile="false"/>
+ <test name="org.tmapi.core.AllCoreTests"/>
+ </junit>
+ <fail message="Tests failed. Check test output." if="test.failed"/>
+
+ <junit printsummary="true" showoutput="false"
+ errorProperty="test.failed" failureProperty="test.failed"
+ fork="true">
+ <classpath>
+ <pathelement location="${dir.build.classes}"/>
+ <pathelement location="${dir.build.tests}"/>
+ </classpath>
+ <formatter type="brief" usefile="false"/>
+ <test name="org.tmapi.index.AllIndexTests"/>
+ </junit>
+ <fail message="Tests failed. Check test output." if="test.failed"/>
+ </target>
+
+ <!-- =================================================================== -->
<!-- Prepares a distribution -->
<!-- =================================================================== -->
<target name="dist" depends="jar, test.jar, doc">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2009-07-08 11:41:10
|
Revision: 114
http://tmapi.svn.sourceforge.net/tmapi/?rev=114&view=rev
Author: lheuer
Date: 2009-07-08 11:40:58 +0000 (Wed, 08 Jul 2009)
Log Message:
-----------
Better error reporting for the tests (includes line no)
Modified Paths:
--------------
trunk/build.xml
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2009-07-07 18:17:54 UTC (rev 113)
+++ trunk/build.xml 2009-07-08 11:40:58 UTC (rev 114)
@@ -79,8 +79,8 @@
<target name="test" depends="compile">
<mkdir dir="${dir.build.tests}"/>
<javac destdir="${dir.build.tests}"
- debug="${debug}"
- optimize="${optimize}"
+ debug="on"
+ optimize="off"
target="1.5">
<classpath>
<pathelement location="${dir.build.classes}"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <la...@us...> - 2009-07-08 11:52:01
|
Revision: 115
http://tmapi.svn.sourceforge.net/tmapi/?rev=115&view=rev
Author: larsga
Date: 2009-07-08 11:52:00 +0000 (Wed, 08 Jul 2009)
Log Message:
-----------
Simplified test running by using org.tmapi.AllTests.
Modified Paths:
--------------
trunk/build.xml
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2009-07-08 11:40:58 UTC (rev 114)
+++ trunk/build.xml 2009-07-08 11:52:00 UTC (rev 115)
@@ -198,21 +198,9 @@
<pathelement location="${dir.build.tests}"/>
</classpath>
<formatter type="brief" usefile="false"/>
- <test name="org.tmapi.core.AllCoreTests"/>
+ <test name="org.tmapi.AllTests"/>
</junit>
<fail message="Tests failed. Check test output." if="test.failed"/>
-
- <junit printsummary="true" showoutput="false"
- errorProperty="test.failed" failureProperty="test.failed"
- fork="true">
- <classpath>
- <pathelement location="${dir.build.classes}"/>
- <pathelement location="${dir.build.tests}"/>
- </classpath>
- <formatter type="brief" usefile="false"/>
- <test name="org.tmapi.index.AllIndexTests"/>
- </junit>
- <fail message="Tests failed. Check test output." if="test.failed"/>
</target>
<!-- =================================================================== -->
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2009-10-09 22:51:45
|
Revision: 127
http://tmapi.svn.sourceforge.net/tmapi/?rev=127&view=rev
Author: lheuer
Date: 2009-10-09 22:51:17 +0000 (Fri, 09 Oct 2009)
Log Message:
-----------
Added JUnit to the classpath, patch provided by Minto van der Sluis
Modified Paths:
--------------
trunk/build.xml
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2009-10-02 15:56:12 UTC (rev 126)
+++ trunk/build.xml 2009-10-09 22:51:17 UTC (rev 127)
@@ -105,6 +105,7 @@
printsummary="true" showoutput="false"
errorProperty="test.failed" failureProperty="test.failed">
<classpath>
+ <pathelement location="${lib.junit}"/>
<pathelement location="tmapi-test.jar"/>
<pathelement location="${dir.build.classes}"/>
<pathelement location="${dir.build.tests}"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2009-10-10 14:45:07
|
Revision: 128
http://tmapi.svn.sourceforge.net/tmapi/?rev=128&view=rev
Author: lheuer
Date: 2009-10-10 14:44:57 +0000 (Sat, 10 Oct 2009)
Log Message:
-----------
Added comment to the build.xml
Modified Paths:
--------------
trunk/build.xml
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2009-10-09 22:51:17 UTC (rev 127)
+++ trunk/build.xml 2009-10-10 14:44:57 UTC (rev 128)
@@ -91,7 +91,12 @@
</target>
<!-- =================================================================== -->
- <!-- Internal Tests -->
+ <!-- Internal Tests
+
+ TestTopicMapSystemFactory is the only test which is executable
+ without a Topic Maps engine and tests the discovery process of a
+ TopicMapSystemFactory
+ -->
<!-- =================================================================== -->
<target name="internal.tests" depends="test">
<mkdir dir="tmp/META-INF/services"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2010-02-27 18:50:33
|
Revision: 157
http://tmapi.svn.sourceforge.net/tmapi/?rev=157&view=rev
Author: lheuer
Date: 2010-02-27 18:50:26 +0000 (Sat, 27 Feb 2010)
Log Message:
-----------
Removed osgi lib from test path
Modified Paths:
--------------
trunk/build.xml
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2010-02-27 18:47:18 UTC (rev 156)
+++ trunk/build.xml 2010-02-27 18:50:26 UTC (rev 157)
@@ -119,7 +119,6 @@
errorProperty="test.failed" failureProperty="test.failed">
<classpath>
<pathelement location="${lib.junit}"/>
- <pathelement location="${lib.osgi}"/>
<pathelement location="tmapi-test.jar"/>
<pathelement location="${dir.build.classes}"/>
<pathelement location="${dir.build.tests}"/>
@@ -250,7 +249,6 @@
<copy todir="${dir.dist}" file="CHANGES.txt"/>
<copy todir="${dir.dist}" file="LICENSE.txt"/>
- <copy todir="${dir.dist}" file="NOTICE.txt"/>
<copy todir="${dir.dist}" file="README.txt"/>
<copy todir="${dir.dist}" file="TMAPI-1.0_MIGRATION.txt"/>
</target>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2010-02-27 18:52:42
|
Revision: 158
http://tmapi.svn.sourceforge.net/tmapi/?rev=158&view=rev
Author: lheuer
Date: 2010-02-27 18:52:32 +0000 (Sat, 27 Feb 2010)
Log Message:
-----------
Re-added NOTICE to the dist %)
Modified Paths:
--------------
trunk/build.xml
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2010-02-27 18:50:26 UTC (rev 157)
+++ trunk/build.xml 2010-02-27 18:52:32 UTC (rev 158)
@@ -249,6 +249,7 @@
<copy todir="${dir.dist}" file="CHANGES.txt"/>
<copy todir="${dir.dist}" file="LICENSE.txt"/>
+ <copy todir="${dir.dist}" file="NOTICE.txt"/>
<copy todir="${dir.dist}" file="README.txt"/>
<copy todir="${dir.dist}" file="TMAPI-1.0_MIGRATION.txt"/>
</target>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2010-02-28 09:42:16
|
Revision: 159
http://tmapi.svn.sourceforge.net/tmapi/?rev=159&view=rev
Author: lheuer
Date: 2010-02-28 09:42:10 +0000 (Sun, 28 Feb 2010)
Log Message:
-----------
Make Ant 1.8 happy (suggested by Markus Ueberall)
Modified Paths:
--------------
trunk/build.xml
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2010-02-27 18:52:32 UTC (rev 158)
+++ trunk/build.xml 2010-02-28 09:42:10 UTC (rev 159)
@@ -135,7 +135,8 @@
<target name="compile" depends="clean, prepare">
<javac destdir="${dir.build.classes}"
debug="${debug}"
- target="1.5">
+ target="1.5"
+ includeruntime="false">
<src path="${dir.src}"/>
<classpath>
<pathelement location="${lib.osgi}"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2010-02-28 09:52:21
|
Revision: 160
http://tmapi.svn.sourceforge.net/tmapi/?rev=160&view=rev
Author: lheuer
Date: 2010-02-28 09:52:15 +0000 (Sun, 28 Feb 2010)
Log Message:
-----------
One more modification for Ant 1.8
Modified Paths:
--------------
trunk/build.xml
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2010-02-28 09:42:10 UTC (rev 159)
+++ trunk/build.xml 2010-02-28 09:52:15 UTC (rev 160)
@@ -82,7 +82,8 @@
<javac destdir="${dir.build.tests}"
debug="on"
optimize="off"
- target="1.5">
+ target="1.5"
+ includeruntime="false">
<classpath>
<pathelement location="${dir.build.classes}"/>
<pathelement location="${lib.junit}"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2010-02-28 10:06:45
|
Revision: 161
http://tmapi.svn.sourceforge.net/tmapi/?rev=161&view=rev
Author: lheuer
Date: 2010-02-28 10:06:38 +0000 (Sun, 28 Feb 2010)
Log Message:
-----------
Fixed typo
Modified Paths:
--------------
trunk/build.xml
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2010-02-28 09:52:15 UTC (rev 160)
+++ trunk/build.xml 2010-02-28 10:06:38 UTC (rev 161)
@@ -83,7 +83,7 @@
debug="on"
optimize="off"
target="1.5"
- includeruntime="false">
+ includeantruntime="false">
<classpath>
<pathelement location="${dir.build.classes}"/>
<pathelement location="${lib.junit}"/>
@@ -137,7 +137,7 @@
<javac destdir="${dir.build.classes}"
debug="${debug}"
target="1.5"
- includeruntime="false">
+ includeantruntime="false">
<src path="${dir.src}"/>
<classpath>
<pathelement location="${lib.osgi}"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2010-03-01 11:41:26
|
Revision: 164
http://tmapi.svn.sourceforge.net/tmapi/?rev=164&view=rev
Author: lheuer
Date: 2010-03-01 11:41:20 +0000 (Mon, 01 Mar 2010)
Log Message:
-----------
Added experimental support for Maven pom generation
Modified Paths:
--------------
trunk/build.xml
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2010-02-28 10:56:43 UTC (rev 163)
+++ trunk/build.xml 2010-03-01 11:41:20 UTC (rev 164)
@@ -49,6 +49,7 @@
<property name="tmapi.tar" value="${dist.name}.tar"/>
<property name="tmapi.tar.gz" value="${tmapi.tar}.gz"/>
<property name="tmapi.zip" value="${dist.name}.zip"/>
+ <property name="tmapi.pom" value="${dist.name}.pom"/>
<property name="dir.build" value="${basedir}/build"/>
<property name="dir.dist.root" value="${dir.build}/dist"/>
@@ -195,6 +196,9 @@
<attribute name="Bundle-Version" value="${dist.version}"/>
</manifest>
</jar>
+ <checksum file="${dir.build}/${tmapi.jar}" algorithm="sha1"/>
+ <antcall target="pom"/>
+ <checksum file="${dir.build}/${tmapi.pom}" algorithm="sha1"/>
</target>
<!-- =================================================================== -->
@@ -214,6 +218,17 @@
</jar>
</target>
+ <target name="pom">
+ <echoxml file="${dir.build}/${tmapi.pom}" namespacePolicy="elementsOnly">
+ <project xmlns="http://maven.apache.org/POM/4.0.0">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.tmapi</groupId>
+ <artifactId>tmapi</artifactId>
+ <version>${dist.version}</version>
+ </project>
+ </echoxml>
+ </target>
+
<!-- =================================================================== -->
<!-- Runs all the tests -->
<!-- =================================================================== -->
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2010-03-01 20:03:16
|
Revision: 165
http://tmapi.svn.sourceforge.net/tmapi/?rev=165&view=rev
Author: lheuer
Date: 2010-03-01 20:03:10 +0000 (Mon, 01 Mar 2010)
Log Message:
-----------
Updated build to create a tmapi-tests.pom etc
Modified Paths:
--------------
trunk/build.xml
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2010-03-01 11:41:20 UTC (rev 164)
+++ trunk/build.xml 2010-03-01 20:03:10 UTC (rev 165)
@@ -45,11 +45,12 @@
<property name="dist.name" value="tmapi-${dist.version}"/>
<property name="tmapi.jar" value="${dist.name}.jar"/>
- <property name="tmapi-tests.jar" value="${dist.name}-tests.jar"/>
+ <property name="tmapi-tests.jar" value="tmapi-tests-${dist.version}.jar"/>
<property name="tmapi.tar" value="${dist.name}.tar"/>
<property name="tmapi.tar.gz" value="${tmapi.tar}.gz"/>
<property name="tmapi.zip" value="${dist.name}.zip"/>
<property name="tmapi.pom" value="${dist.name}.pom"/>
+ <property name="tmapi-tests.pom" value="tmapi-tests-${dist.version}.pom"/>
<property name="dir.build" value="${basedir}/build"/>
<property name="dir.dist.root" value="${dir.build}/dist"/>
@@ -197,7 +198,10 @@
</manifest>
</jar>
<checksum file="${dir.build}/${tmapi.jar}" algorithm="sha1"/>
- <antcall target="pom"/>
+ <antcall target="pom">
+ <param name="pom-file" value="${tmapi.pom}"/>
+ <param name="artifact" value="tmapi"/>
+ </antcall>
<checksum file="${dir.build}/${tmapi.pom}" algorithm="sha1"/>
</target>
@@ -216,14 +220,20 @@
<attribute name="Main-Class" value="org.tmapi.AllTests"/>
</manifest>
</jar>
+ <checksum file="${dir.build}/${tmapi-tests.jar}" algorithm="sha1"/>
+ <antcall target="pom">
+ <param name="pom-file" value="${tmapi-tests.pom}"/>
+ <param name="artifact" value="tests"/>
+ </antcall>
+ <checksum file="${dir.build}/${tmapi-tests.pom}" algorithm="sha1"/>
</target>
<target name="pom">
- <echoxml file="${dir.build}/${tmapi.pom}" namespacePolicy="elementsOnly">
+ <echoxml file="${dir.build}/${pom-file}" namespacePolicy="elementsOnly">
<project xmlns="http://maven.apache.org/POM/4.0.0">
<modelVersion>4.0.0</modelVersion>
<groupId>org.tmapi</groupId>
- <artifactId>tmapi</artifactId>
+ <artifactId>${artifact}</artifactId>
<version>${dist.version}</version>
</project>
</echoxml>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2010-03-02 23:56:38
|
Revision: 166
http://tmapi.svn.sourceforge.net/tmapi/?rev=166&view=rev
Author: lheuer
Date: 2010-03-02 23:56:30 +0000 (Tue, 02 Mar 2010)
Log Message:
-----------
Forgot to commit the fixed build.xml. Done
Modified Paths:
--------------
trunk/build.xml
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2010-03-01 20:03:10 UTC (rev 165)
+++ trunk/build.xml 2010-03-02 23:56:30 UTC (rev 166)
@@ -223,7 +223,7 @@
<checksum file="${dir.build}/${tmapi-tests.jar}" algorithm="sha1"/>
<antcall target="pom">
<param name="pom-file" value="${tmapi-tests.pom}"/>
- <param name="artifact" value="tests"/>
+ <param name="artifact" value="tmapi-tests"/>
</antcall>
<checksum file="${dir.build}/${tmapi-tests.pom}" algorithm="sha1"/>
</target>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2010-09-22 12:02:18
|
Revision: 191
http://tmapi.svn.sourceforge.net/tmapi/?rev=191&view=rev
Author: lheuer
Date: 2010-09-22 12:02:12 +0000 (Wed, 22 Sep 2010)
Log Message:
-----------
Fixes issue #424686 (reported by Hannes)
Modified Paths:
--------------
trunk/build.xml
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2010-09-14 14:41:34 UTC (rev 190)
+++ trunk/build.xml 2010-09-22 12:02:12 UTC (rev 191)
@@ -42,6 +42,7 @@
<target name="init">
<property name="dist.version" value="${version}${version_suffix}"/>
+ <property name="dist.version_bundle" value="${version}"/>
<property name="dist.name" value="tmapi-${dist.version}"/>
<property name="tmapi.jar" value="${dist.name}.jar"/>
@@ -187,14 +188,14 @@
<attribute name="Implementation-Version" value="${dist.version}"/>
<attribute name="Implementation-URL" value="http://www.tmapi.org/"/>
<!-- OSGi-specific -->
- <attribute name="Export-Package" value="org.tmapi.core;version=${dist.version},org.tmapi.index;version=${dist.version}"/>
+ <attribute name="Export-Package" value="org.tmapi.core;version=${dist.version_bundle},org.tmapi.index;version=${dist.version_bundle}"/>
<attribute name="Import-Package" value="org.osgi.framework"/>
<attribute name="Bundle-Name" value="TMAPI"/>
<attribute name="Bundle-SymbolicName" value="org.tmapi"/>
<attribute name="Bundle-Vendor" value="TMAPI.org"/>
<attribute name="Bundle-Description" value="Common Topic Maps API"/>
<attribute name="Bundle-Activator" value="org.tmapi.core.internal.Activator"/>
- <attribute name="Bundle-Version" value="${dist.version}"/>
+ <attribute name="Bundle-Version" value="${dist.version_bundle}"/>
</manifest>
</jar>
<checksum file="${dir.build}/${tmapi.jar}" algorithm="sha1"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X