From: <lh...@us...> - 2010-03-01 22:55:09
|
Revision: 375 http://tinytim.svn.sourceforge.net/tinytim/?rev=375&view=rev Author: lheuer Date: 2010-03-01 22:55:01 +0000 (Mon, 01 Mar 2010) Log Message: ----------- Got rid of the timestamp for the time being Modified Paths: -------------- tinytim/trunk/build.properties tinytim/trunk/build.xml Modified: tinytim/trunk/build.properties =================================================================== --- tinytim/trunk/build.properties 2010-03-01 22:41:11 UTC (rev 374) +++ tinytim/trunk/build.properties 2010-03-01 22:55:01 UTC (rev 375) @@ -1,6 +1,5 @@ version=2.0.0 # If a suffix given, it MUST start with '.' -version_suffix=.a6 -#release_type= +version_suffix=.a6-snapshot debug=off optimize=on Modified: tinytim/trunk/build.xml =================================================================== --- tinytim/trunk/build.xml 2010-03-01 22:41:11 UTC (rev 374) +++ tinytim/trunk/build.xml 2010-03-01 22:55:01 UTC (rev 375) @@ -1,8 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <project name="tinyTiM" default="jar" basedir="."> <property file="build.properties"/> - <tstamp/> - <property name="release_type" value="-snapshot-${DSTAMP}${TSTAMP}"/> <property name="dir.src" value="${basedir}/src/main/java"/> <property name="dir.test" value="${basedir}/src/test/java"/> @@ -44,7 +42,7 @@ </target> <target name="init"> - <property name="dist.version" value="${version}${version_suffix}${release_type}"/> + <property name="dist.version" value="${version}${version_suffix}"/> <property name="dist.name" value="tinytim-${dist.version}"/> <property name="tinytim.jar" value="${dist.name}.jar"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lh...@us...> - 2010-03-09 12:42:02
|
Revision: 377 http://tinytim.svn.sourceforge.net/tinytim/?rev=377&view=rev Author: lheuer Date: 2010-03-09 12:41:51 +0000 (Tue, 09 Mar 2010) Log Message: ----------- Updated build Modified Paths: -------------- tinytim/trunk/CHANGES.txt tinytim/trunk/build.xml Added Paths: ----------- tinytim/trunk/lib/tmapi-2.0.1.jar tinytim/trunk/lib/tmapi-tests-2.0.1.jar Removed Paths: ------------- tinytim/trunk/lib/tmapi-2.0.1.snapshot.jar tinytim/trunk/lib/tmapi-tests-2.0.1.snapshot.jar Modified: tinytim/trunk/CHANGES.txt =================================================================== --- tinytim/trunk/CHANGES.txt 2010-03-01 23:06:55 UTC (rev 376) +++ tinytim/trunk/CHANGES.txt 2010-03-09 12:41:51 UTC (rev 377) @@ -2,11 +2,12 @@ Changes Log =========== -2.0.0 a6 (2010-03-xx) ---------------------- +2.0.0 (2010-03-dd) +------------------ +* Updated TMAPI to 2.0.1 * Fixed LocatorImpl (the impl. of "equals" was different from the TMAPI 2.0 specs) reported by Uta Schulze -* Added OSGi headers to the MANIFEST +* tinyTiM is usable as an OSGi bundle * Added support to convert XTM 1.0 class-instance relationships to TMDM type-instance relationships * Added support to convert XTM 1.0 PSIs to TMDM PSIs @@ -20,6 +21,7 @@ reported by Sven Krosse + 2.0.0 a5 (23.07.2009) --------------------- Modified: tinytim/trunk/build.xml =================================================================== --- tinytim/trunk/build.xml 2010-03-01 23:06:55 UTC (rev 376) +++ tinytim/trunk/build.xml 2010-03-09 12:41:51 UTC (rev 377) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<project name="tinyTiM" default="jar" basedir="."> +<project name="tinyTiM" default="jar" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant"> <property file="build.properties"/> <property name="dir.src" value="${basedir}/src/main/java"/> @@ -10,8 +10,8 @@ <property name="lib.junit" value="${dir.lib}/junit-4.8.1.jar"/> <property name="lib.mio" value="${dir.lib}/semagia-mio-0.9.5.jar"/> - <property name="lib.tmapi" value="${dir.lib}/tmapi-2.0.1.snapshot.jar"/> - <property name="lib.tmapi.tests" value="${dir.lib}/tmapi-tests-2.0.1.snapshot.jar"/> + <property name="lib.tmapi" value="${dir.lib}/tmapi-2.0.1.jar"/> + <property name="lib.tmapi.tests" value="${dir.lib}/tmapi-tests-2.0.1.jar"/> <property name="lib.emma" value="${dir.lib}/emma.jar"/> <property name="lib.emma.task" value="${dir.lib}/emma_ant.jar"/> Added: tinytim/trunk/lib/tmapi-2.0.1.jar =================================================================== (Binary files differ) Property changes on: tinytim/trunk/lib/tmapi-2.0.1.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: tinytim/trunk/lib/tmapi-2.0.1.snapshot.jar =================================================================== (Binary files differ) Added: tinytim/trunk/lib/tmapi-tests-2.0.1.jar =================================================================== (Binary files differ) Property changes on: tinytim/trunk/lib/tmapi-tests-2.0.1.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: tinytim/trunk/lib/tmapi-tests-2.0.1.snapshot.jar =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lh...@us...> - 2010-03-09 23:37:37
|
Revision: 378 http://tinytim.svn.sourceforge.net/tinytim/?rev=378&view=rev Author: lheuer Date: 2010-03-09 23:37:30 +0000 (Tue, 09 Mar 2010) Log Message: ----------- Minor (build) tweaks Modified Paths: -------------- tinytim/trunk/README.txt tinytim/trunk/build.properties tinytim/trunk/build.xml Modified: tinytim/trunk/README.txt =================================================================== --- tinytim/trunk/README.txt 2010-03-09 12:41:51 UTC (rev 377) +++ tinytim/trunk/README.txt 2010-03-09 23:37:30 UTC (rev 378) @@ -11,7 +11,7 @@ Installation ------------ -No real installation needed, simply put the ``tinytim-2.0.0a6.jar`` and +No real installation needed, simply put the ``tinytim-2.0.0.jar`` and ``tmapi-2*.jar`` into your classpath. That's all. :) Modified: tinytim/trunk/build.properties =================================================================== --- tinytim/trunk/build.properties 2010-03-09 12:41:51 UTC (rev 377) +++ tinytim/trunk/build.properties 2010-03-09 23:37:30 UTC (rev 378) @@ -1,5 +1,4 @@ version=2.0.0 -# If a suffix given, it MUST start with '.' -version_suffix=.a6-snapshot +version_suffix=-SNAPSHOT debug=off optimize=on Modified: tinytim/trunk/build.xml =================================================================== --- tinytim/trunk/build.xml 2010-03-09 12:41:51 UTC (rev 377) +++ tinytim/trunk/build.xml 2010-03-09 23:37:30 UTC (rev 378) @@ -176,6 +176,7 @@ use="true" splitindex="true" noindex="false" + link="http://www.tmapi.org/2.0/api/" windowtitle="tinyTiM API v${dist.version}" doctitle="tinyTiM API v${dist.version}"> <fileset dir="${dir.src}"> @@ -189,7 +190,6 @@ path="${dir.lib}/apiviz-1.2.4.GA.jar"> </doclet> --> - <link href="http://www.tmapi.org/2.0/api/"/> </javadoc> </target> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lh...@us...> - 2010-03-11 09:23:29
|
Revision: 380 http://tinytim.svn.sourceforge.net/tinytim/?rev=380&view=rev Author: lheuer Date: 2010-03-11 09:23:23 +0000 (Thu, 11 Mar 2010) Log Message: ----------- Updated libs Modified Paths: -------------- tinytim/trunk/CHANGES.txt tinytim/trunk/build.xml Added Paths: ----------- tinytim/trunk/lib/tmapi-2.0.2-SNAPSHOT.jar tinytim/trunk/lib/tmapi-tests-2.0.2-SNAPSHOT.jar Removed Paths: ------------- tinytim/trunk/lib/tmapi-2.0.1.jar tinytim/trunk/lib/tmapi-tests-2.0.1.jar Modified: tinytim/trunk/CHANGES.txt =================================================================== --- tinytim/trunk/CHANGES.txt 2010-03-10 10:26:36 UTC (rev 379) +++ tinytim/trunk/CHANGES.txt 2010-03-11 09:23:23 UTC (rev 380) @@ -4,7 +4,7 @@ 2.0.0 (2010-03-dd) ------------------ -* Updated TMAPI to 2.0.1 +* Updated TMAPI to 2.0.1 and is compatible to TMAPI 2.0.2 * Fixed LocatorImpl (the impl. of "equals" was different from the TMAPI 2.0 specs) reported by Uta Schulze * tinyTiM is usable as an OSGi bundle Modified: tinytim/trunk/build.xml =================================================================== --- tinytim/trunk/build.xml 2010-03-10 10:26:36 UTC (rev 379) +++ tinytim/trunk/build.xml 2010-03-11 09:23:23 UTC (rev 380) @@ -10,8 +10,8 @@ <property name="lib.junit" value="${dir.lib}/junit-4.8.1.jar"/> <property name="lib.mio" value="${dir.lib}/semagia-mio-0.9.5.jar"/> - <property name="lib.tmapi" value="${dir.lib}/tmapi-2.0.1.jar"/> - <property name="lib.tmapi.tests" value="${dir.lib}/tmapi-tests-2.0.1.jar"/> + <property name="lib.tmapi" value="${dir.lib}/tmapi-2.0.2-SNAPSHOT.jar"/> + <property name="lib.tmapi.tests" value="${dir.lib}/tmapi-tests-2.0.2-SNAPSHOT.jar"/> <property name="lib.emma" value="${dir.lib}/emma.jar"/> <property name="lib.emma.task" value="${dir.lib}/emma_ant.jar"/> Deleted: tinytim/trunk/lib/tmapi-2.0.1.jar =================================================================== (Binary files differ) Added: tinytim/trunk/lib/tmapi-2.0.2-SNAPSHOT.jar =================================================================== (Binary files differ) Property changes on: tinytim/trunk/lib/tmapi-2.0.2-SNAPSHOT.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: tinytim/trunk/lib/tmapi-tests-2.0.1.jar =================================================================== (Binary files differ) Added: tinytim/trunk/lib/tmapi-tests-2.0.2-SNAPSHOT.jar =================================================================== (Binary files differ) Property changes on: tinytim/trunk/lib/tmapi-tests-2.0.2-SNAPSHOT.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lh...@us...> - 2010-03-19 14:28:41
|
Revision: 381 http://tinytim.svn.sourceforge.net/tinytim/?rev=381&view=rev Author: lheuer Date: 2010-03-19 14:28:31 +0000 (Fri, 19 Mar 2010) Log Message: ----------- Update to TMAPI 2.0.2 Modified Paths: -------------- tinytim/trunk/build.xml Added Paths: ----------- tinytim/trunk/lib/tmapi-2.0.2.jar tinytim/trunk/lib/tmapi-tests-2.0.2.jar Removed Paths: ------------- tinytim/trunk/lib/tmapi-2.0.2-SNAPSHOT.jar tinytim/trunk/lib/tmapi-tests-2.0.2-SNAPSHOT.jar Modified: tinytim/trunk/build.xml =================================================================== --- tinytim/trunk/build.xml 2010-03-11 09:23:23 UTC (rev 380) +++ tinytim/trunk/build.xml 2010-03-19 14:28:31 UTC (rev 381) @@ -10,8 +10,8 @@ <property name="lib.junit" value="${dir.lib}/junit-4.8.1.jar"/> <property name="lib.mio" value="${dir.lib}/semagia-mio-0.9.5.jar"/> - <property name="lib.tmapi" value="${dir.lib}/tmapi-2.0.2-SNAPSHOT.jar"/> - <property name="lib.tmapi.tests" value="${dir.lib}/tmapi-tests-2.0.2-SNAPSHOT.jar"/> + <property name="lib.tmapi" value="${dir.lib}/tmapi-2.0.2.jar"/> + <property name="lib.tmapi.tests" value="${dir.lib}/tmapi-tests-2.0.2.jar"/> <property name="lib.emma" value="${dir.lib}/emma.jar"/> <property name="lib.emma.task" value="${dir.lib}/emma_ant.jar"/> Deleted: tinytim/trunk/lib/tmapi-2.0.2-SNAPSHOT.jar =================================================================== (Binary files differ) Added: tinytim/trunk/lib/tmapi-2.0.2.jar =================================================================== (Binary files differ) Property changes on: tinytim/trunk/lib/tmapi-2.0.2.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: tinytim/trunk/lib/tmapi-tests-2.0.2-SNAPSHOT.jar =================================================================== (Binary files differ) Added: tinytim/trunk/lib/tmapi-tests-2.0.2.jar =================================================================== (Binary files differ) Property changes on: tinytim/trunk/lib/tmapi-tests-2.0.2.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lh...@us...> - 2010-08-03 19:34:40
|
Revision: 404 http://tinytim.svn.sourceforge.net/tinytim/?rev=404&view=rev Author: lheuer Date: 2010-08-03 19:34:33 +0000 (Tue, 03 Aug 2010) Log Message: ----------- Updated build.gradle, removed Ant build Modified Paths: -------------- tinytim/trunk/build.gradle Removed Paths: ------------- tinytim/trunk/build.properties tinytim/trunk/build.xml tinytim/trunk/lib/ Modified: tinytim/trunk/build.gradle =================================================================== --- tinytim/trunk/build.gradle 2010-08-03 17:55:38 UTC (rev 403) +++ tinytim/trunk/build.gradle 2010-08-03 19:34:33 UTC (rev 404) @@ -25,16 +25,31 @@ mavenCentral() mavenRepo urls: 'http://www.tmapi.org/maven-repository/' mavenRepo urls: 'http://www.tmapi.org/maven-repository/snapshots/' + mavenRepo urls: 'http://repository.semagia.com/snapshots/' } +configurations { + compiledep +} + dependencies { compile group: 'org.tmapi', name: 'tmapi', version: '2.0.2' - compile files('lib/semagia-mio-0.9.5.jar') - testCompile group: 'junit', name: 'junit', version: '4.+' + compiledep 'com.semagia.mio:mio-core:0.9.6-SNAPSHOT' + + testCompile group: 'junit', name: 'junit', version: '4.8.1' testCompile group: 'org.tmapi', name: 'tmapi-tests', version: '2.0.3-SNAPSHOT' + + // Make Eclipse happy + testCompile 'com.semagia.mio:mio-core:0.9.6-SNAPSHOT' } +sourceSets { + main { + compileClasspath = sourceSets.main.compileClasspath + configurations.compiledep + } +} + jar { manifest { attributes 'Implementation-Title': 'tinyTiM', 'Implementation-Version': version Deleted: tinytim/trunk/build.properties =================================================================== --- tinytim/trunk/build.properties 2010-08-03 17:55:38 UTC (rev 403) +++ tinytim/trunk/build.properties 2010-08-03 19:34:33 UTC (rev 404) @@ -1,4 +0,0 @@ -version=2.0.1 -version_suffix=-SNAPSHOT -debug=off -optimize=on Deleted: tinytim/trunk/build.xml =================================================================== --- tinytim/trunk/build.xml 2010-08-03 17:55:38 UTC (rev 403) +++ tinytim/trunk/build.xml 2010-08-03 19:34:33 UTC (rev 404) @@ -1,303 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<project name="tinyTiM" default="jar" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant"> - <property file="build.properties"/> - - <property name="dir.src" value="${basedir}/src/main/java"/> - <property name="dir.test" value="${basedir}/src/test/java"/> - <property name="dir.lib" value="${basedir}/lib"/> - <property name="dir.res" value="${basedir}/src/main/resources"/> - <property name="dir.coverage" value="${basedir}/coverage"/> - - <property name="lib.junit" value="${dir.lib}/junit-4.8.1.jar"/> - <property name="lib.mio" value="${dir.lib}/semagia-mio-0.9.5.jar"/> - <property name="lib.tmapi" value="${dir.lib}/tmapi-2.0.2.jar"/> - <property name="lib.tmapi.tests" value="${dir.lib}/tmapi-tests-2.0.2.jar"/> - <property name="lib.emma" value="${dir.lib}/emma.jar"/> - <property name="lib.emma.task" value="${dir.lib}/emma_ant.jar"/> - - <!-- directory that contains emma.jar and emma_ant.jar: --> - <property name="dir.emma" value="${dir.lib}" /> - - <!-- path element used by EMMA taskdef below: --> - <path id="emma.lib" > - <pathelement location="${dir.emma}/emma.jar" /> - <pathelement location="${dir.emma}/emma_ant.jar" /> - </path> - - <!-- this loads <emma> and <emmajava> custom tasks: --> - <taskdef resource="emma_ant.properties" classpathref="emma.lib" /> - - <target name="help"> - <echo message="--------------------"/> - <echo message="tinyTiM - Build file"/> - <echo message="--------------------"/> - <echo message=""/> - <echo message="Available targets:"/> - <echo message=""/> - <echo message=" jar Creates the jar"/> - <echo message=" testjar Creates the jar with the tests"/> - <echo message=" doc Creates the API documentation"/> - <echo message=" coverage Creates a coverage report"/> - <echo message=" release Creates the jar and a distributable file"/> - </target> - - <target name="init"> - <property name="dist.version" value="${version}${version_suffix}"/> - <property name="dist.name" value="tinytim-${dist.version}"/> - - <property name="tinytim.jar" value="${dist.name}.jar"/> - <property name="tinytim-test.jar" value="tinytim-tests-${dist.version}.jar"/> - <property name="tinytim.tar" value="${dist.name}.tar"/> - <property name="tinytim.tar.gz" value="${tinytim.tar}.gz"/> - <property name="tinytim.zip" value="${dist.name}.zip"/> - <property name="tinytim.pom" value="${dist.name}.pom"/> - <property name="tinytim-test.pom" value="tinytim-tests-${dist.version}.pom"/> - - <property name="dir.build" value="${basedir}/build"/> - <property name="dir.dist.root" value="${dir.build}/dist"/> - <property name="dir.dist" value="${dir.dist.root}/${dist.name}"/> - <property name="dir.build.classes" value="${dir.build}/classes"/> - <property name="dir.build.tests" value="${dir.build}/tests"/> - <property name="dir.javadocs" value="${dir.dist}/docs/api"/> - - <path id="run.classpath" > - <pathelement location="${dir.build.classes}" /> - <pathelement location="${dir.build.tests}" /> - <pathelement location="${lib.junit}"/> - <pathelement location="${lib.mio}"/> - <pathelement location="${lib.tmapi}"/> - <pathelement location="${lib.tmapi.tests}"/> - </path> - </target> - - <!-- =================================================================== --> - <!-- Clean targets --> - <!-- =================================================================== --> - <target name="clean" depends="init"> - <delete dir="${dir.build}"/> - <delete dir="${dir.javadocs}"/> - </target> - - <!-- =================================================================== --> - <!-- Prepares the build directory --> - <!-- =================================================================== --> - <target name="prepare" depends="init"> - <mkdir dir="${dir.build}"/> - <mkdir dir="${dir.build.classes}"/> - </target> - - <!-- =================================================================== --> - <!-- Coverage Tests --> - <!-- =================================================================== --> - <target name="coverage" depends="compile"> - <mkdir dir="${dir.build.tests}"/> - <javac destdir="${dir.build.tests}" - debug="${debug}" - optimize="${optimize}" - target="1.5" - includeantruntime="false"> - <classpath> - <pathelement location="${dir.build.classes}"/> - <pathelement location="${lib.junit}"/> - <pathelement location="${lib.mio}"/> - <pathelement location="${lib.tmapi}"/> - <pathelement location="${lib.tmapi.tests}"/> - </classpath> - <src path="${dir.test}"/> - </javac> - <mkdir dir="${dir.coverage}"/> - <emmajava libclasspathref="emma.lib" - sourcepath="${dir.src}" - fullmetadata="yes" - classname="org.tinytim.core.AllTests" - classpathref="run.classpath" - > - <filter includes="org.tinytim.*" excludes="org.tinytim.*Test*, org.tinytim.*$*" /> - <html outfile="${dir.coverage}/index.html" /> - </emmajava> - </target> - - <!-- =================================================================== --> - <!-- Tests --> - <!-- =================================================================== --> - <target name="test" depends="compile"> - <mkdir dir="${dir.build.tests}"/> - <javac destdir="${dir.build.tests}" - debug="${debug}" - optimize="${optimize}" - target="1.5" - includeantruntime="false"> - <classpath> - <pathelement location="${dir.build.classes}"/> - <pathelement location="${lib.junit}"/> - <pathelement location="${lib.mio}"/> - <pathelement location="${lib.tmapi}"/> - <pathelement location="${lib.tmapi.tests}"/> - </classpath> - <src path="${dir.test}"/> - </javac> - <junit printsummary="true" showoutput="false" - errorProperty="test.failed" failureProperty="test.failed" - fork="true"> - <classpath refid="run.classpath"/> - <formatter type="brief" usefile="false"/> - <test name="org.tinytim.core.AllTests"/> - </junit> - <fail message="Tests failed. Check test output." if="test.failed"/> - </target> - - <!-- =================================================================== --> - <!-- Compile source files --> - <!-- =================================================================== --> - <target name="compile" depends="clean, prepare"> - <replace file="${dir.src}/org/tinytim/Version.java" token="@RELEASE@" value="${dist.version}"/> - <javac destdir="${dir.build.classes}" - debug="${debug}" - target="1.5" - includeantruntime="false"> - <classpath> - <pathelement location="${lib.tmapi}"/> - <pathelement location="${lib.mio}"/> - </classpath> - <src path="${dir.src}"/> - </javac> - <replace file="${dir.src}/org/tinytim/Version.java" token="${dist.version}" value="@RELEASE@"/> - </target> - - <!-- =================================================================== --> - <!-- Creates the Java Docs --> - <!-- =================================================================== --> - <target name="doc" depends="init"> - <mkdir dir="${dir.javadocs}"/> - <javadoc destdir="${dir.javadocs}" - packagenames="org.tinytim.*" - author="true" - version="true" - use="true" - splitindex="true" - noindex="false" - link="http://www.tmapi.org/2.0/api/" - windowtitle="tinyTiM API v${dist.version}" - doctitle="tinyTiM API v${dist.version}"> - <fileset dir="${dir.src}"> - <exclude name="org/tinytim/core/**"/> - <exclude name="org/tinytim/index/**"/> - <exclude name="org/tinytim/internal/**"/> - <exclude name="org/tinytim/utils/Property.*"/> - </fileset> -<!-- - <doclet name="net.gleamynode.apiviz.APIviz" - path="${dir.lib}/apiviz-1.2.4.GA.jar"> - </doclet> ---> - </javadoc> - </target> - - <!-- =================================================================== --> - <!-- Creates the jar --> - <!-- =================================================================== --> - <target name="jar" depends="compile"> - <jar destfile="${dir.build}/${tinytim.jar}"> - <fileset dir="${dir.build.classes}"> - <include name="**/*.*"/> - </fileset> - <fileset dir="${dir.res}"> - <include name="**/*.*"/> - </fileset> - <manifest> - <attribute name="Implementation-Title" value="tinyTiM"/> - <attribute name="Implementation-Version" value="${dist.version}"/> - <attribute name="Implementation-URL" value="http://tinytim.sourceforge.net/"/> - <attribute name="Import-Package" value="org.tmapi.core,org.tmapi.index"/> - <attribute name="Export-Package" value="org.tinytim.mio,org.tinytim.voc"/> - <attribute name="Bundle-Name" value="tinyTiM"/> - <attribute name="Bundle-SymbolicName" value="org.tinytim;version=${dist.version}"/> - <attribute name="Bundle-Vendor" value="tinyTiM project"/> - <attribute name="Bundle-Version" value="${dist.version}"/> - </manifest> - </jar> - <checksum file="${dir.build}/${tinytim.jar}" algorithm="sha1"/> - <antcall target="pom"> - <param name="pom-file" value="${tinytim.pom}"/> - <param name="artifact" value="tinytim"/> - </antcall> - <checksum file="${dir.build}/${tinytim.pom}" algorithm="sha1"/> - </target> - - <!-- =================================================================== --> - <!-- Creates the test jar --> - <!-- =================================================================== --> - <target name="testjar" depends="compile, test"> - <jar destfile="${dir.build}/${tinytim-test.jar}"> - <fileset dir="${dir.build.tests}"> - <include name="**/*.*"/> - </fileset> - <manifest> - <attribute name="Implementation-Title" value="tinyTiM Tests"/> - <attribute name="Implementation-Version" value="${dist.version}"/> - <attribute name="Implementation-URL" value="http://tinytim.sourceforge.net/"/> - </manifest> - </jar> - <checksum file="${dir.build}/${tinytim-test.jar}" algorithm="sha1"/> - <antcall target="pom"> - <param name="pom-file" value="${tinytim-test.pom}"/> - <param name="artifact" value="tinytim-test"/> - </antcall> - <checksum file="${dir.build}/${tinytim-test.pom}" algorithm="sha1"/> - </target> - - <target name="pom"> - <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>${artifact}</artifactId> - <version>${dist.version}</version> - </project> - </echoxml> - </target> - - <!-- =================================================================== --> - <!-- Prepares a distribution --> - <!-- =================================================================== --> - <target name="dist" depends="jar, testjar, doc"> - <mkdir dir="${dir.dist}"/> - - <copy todir="${dir.dist}" file="${dir.build}/${tinytim.jar}"/> - <copy todir="${dir.dist}" file="${dir.build}/${tinytim-test.jar}"/> - - <copy todir="${dir.dist}/src"> - <fileset dir="${dir.src}"/> - </copy> - <replace file="${dir.dist}/src/org/tinytim/Version.java" token="@RELEASE@" value="${dist.version}"/> - <copy todir="${dir.dist}/test"> - <fileset dir="${dir.test}"/> - </copy> - <copy todir="${dir.dist}/lib"> - <fileset dir="${dir.lib}"> - <include name="tmapi*"/> - <include name="junit*"/> - <include name="LICENSE.tmapi*"/> - <include name="LICENSE.junit*"/> - </fileset> - </copy> - - <copy todir="${dir.dist}" file="CHANGES.txt"/> - <copy todir="${dir.dist}" file="LICENSE.txt"/> - <copy todir="${dir.dist}" file="README.txt"/> - </target> - - <!-- =================================================================== --> - <!-- Creates the distribution files (.zip and .tar.gz) --> - <!-- --> - <!-- Won't create the distribution files if a test fails --> - <!-- =================================================================== --> - <target name="release" depends="jar, test, dist"> - <tar destfile="${dir.dist.root}/${tinytim.tar}" - basedir="${dir.dist.root}"/> - <gzip src="${dir.dist.root}/${tinytim.tar}" - destfile="${dir.build}/${tinytim.tar.gz}" /> - <delete file="${dir.dist.root}/${tinytim.tar}" /> - <zip destfile="${dir.build}/${tinytim.zip}" basedir="${dir.dist.root}"/> - </target> -</project> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lh...@us...> - 2010-08-31 17:01:36
|
Revision: 406 http://tinytim.svn.sourceforge.net/tinytim/?rev=406&view=rev Author: lheuer Date: 2010-08-31 17:01:29 +0000 (Tue, 31 Aug 2010) Log Message: ----------- Added test Modified Paths: -------------- tinytim/trunk/build.gradle Added Paths: ----------- tinytim/trunk/src/test/java/org/tinytim/mio/TestTinyTimMapInputHandler.java Modified: tinytim/trunk/build.gradle =================================================================== --- tinytim/trunk/build.gradle 2010-08-31 16:37:49 UTC (rev 405) +++ tinytim/trunk/build.gradle 2010-08-31 17:01:29 UTC (rev 406) @@ -44,7 +44,9 @@ compiledep 'com.semagia.mio:mio-core:0.9.6-SNAPSHOT' testCompile 'junit:junit:4.8.1', - 'org.tmapi:tmapi-tests:2.0.3-SNAPSHOT' + 'org.tmapi:tmapi-tests:2.0.3-SNAPSHOT', + 'com.semagia.mio:mio-core-tests:0.9.6-SNAPSHOT', + 'com.semagia.mio:mio-core:0.9.6-SNAPSHOT' } eclipseClasspath.downloadSources = false Added: tinytim/trunk/src/test/java/org/tinytim/mio/TestTinyTimMapInputHandler.java =================================================================== --- tinytim/trunk/src/test/java/org/tinytim/mio/TestTinyTimMapInputHandler.java (rev 0) +++ tinytim/trunk/src/test/java/org/tinytim/mio/TestTinyTimMapInputHandler.java 2010-08-31 17:01:29 UTC (rev 406) @@ -0,0 +1,124 @@ +/* + * Copyright 2008 - 2010 Lars Heuer (heuer[at]semagia.com) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.tinytim.mio; + +import org.tmapi.core.Construct; +import org.tmapi.core.DatatypeAware; +import org.tmapi.core.Locator; +import org.tmapi.core.Name; +import org.tmapi.core.Reifiable; +import org.tmapi.core.Topic; +import org.tmapi.core.TopicMap; +import org.tmapi.core.TopicMapSystem; +import org.tmapi.core.TopicMapSystemFactory; +import org.tmapi.core.Typed; + +import com.semagia.mio.AbstractMapHandlerTest; +import com.semagia.mio.IMapHandler; + +/** + * Tests against the {@link org.tinytim.mio.TinyTimMapInputHandler}. + * + * @author Lars Heuer (heuer[at]semagia.com) <a href="http://www.semagia.com/">Semagia</a> + * @version $Rev$ - $Date$ + */ +public class TestTinyTimMapInputHandler extends AbstractMapHandlerTest { + + protected static final String _IRI = "http://www.semagia.com/tinyTiM/testTopicMap/"; + private TopicMapSystemFactory _sysFactory; + private TopicMapSystem _sys; + private TopicMap _tm; + private Locator _base; + + @Override + protected void setUp() throws Exception { + super.setUp(); + _sysFactory = TopicMapSystemFactory.newInstance(); + _sys = _sysFactory.newTopicMapSystem(); + _base = _sys.createLocator(_IRI); + _tm = _sys.createTopicMap(_base); + } + + @Override + protected IMapHandler makeMapHandler() { + return new TinyTimMapInputHandler(_tm); + } + + + @Override + protected Object getType(Object obj) { + return ((Typed) obj).getType(); + } + + @Override + protected int getAssociationSize() { + return _tm.getAssociations().size(); + } + + @Override + protected Object getConstructByItemIdentifier(String iid) { + return _tm.getConstructByItemIdentifier(_tm.createLocator(iid)); + } + + @Override + protected String getDatatypeAsString(Object obj) { + return ((DatatypeAware) obj).getDatatype().getReference(); + } + + @Override + protected Object getParent(Object obj) { + return ((Construct) obj).getParent(); + } + + @Override + protected Object getReified(Object obj) { + return ((Topic) obj).getReified(); + } + + @Override + protected Object getReifier(Object obj) { + return ((Reifiable) obj).getReifier(); + } + + @Override + protected Object getTopicBySubjectIdentifier(String sid) { + return _tm.getTopicBySubjectIdentifier(_tm.createLocator(sid)); + } + + @Override + protected Object getTopicBySubjectLocator(String slo) { + return _tm.getTopicBySubjectLocator(_tm.createLocator(slo)); + } + + @Override + protected Object getTopicMapReifier() { + return _tm.getReifier(); + } + + @Override + protected int getTopicSize() { + return _tm.getTopics().size(); + } + + @Override + protected String getValue(Object obj) { + if (obj instanceof DatatypeAware) { + return ((DatatypeAware) obj).getValue(); + } + return ((Name) obj).getValue(); + } + +} Property changes on: tinytim/trunk/src/test/java/org/tinytim/mio/TestTinyTimMapInputHandler.java ___________________________________________________________________ Added: svn:keywords + Date Rev This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lh...@us...> - 2010-09-01 18:15:25
|
Revision: 409 http://tinytim.svn.sourceforge.net/tinytim/?rev=409&view=rev Author: lheuer Date: 2010-09-01 18:15:18 +0000 (Wed, 01 Sep 2010) Log Message: ----------- Updated build, CHANGES.txt Modified Paths: -------------- tinytim/trunk/CHANGES.txt tinytim/trunk/build.gradle Modified: tinytim/trunk/CHANGES.txt =================================================================== --- tinytim/trunk/CHANGES.txt 2010-08-31 17:59:20 UTC (rev 408) +++ tinytim/trunk/CHANGES.txt 2010-09-01 18:15:18 UTC (rev 409) @@ -4,6 +4,7 @@ 2.0.1 (2010-mm-dd) ------------------ +* tinyTiM is forward-compatible to TMAPI 2.0.3 * OSGi bundle exports the .voc package (contributed by Hannes Niederhausen) * Removed String-Interning for object ids Modified: tinytim/trunk/build.gradle =================================================================== --- tinytim/trunk/build.gradle 2010-08-31 17:59:20 UTC (rev 408) +++ tinytim/trunk/build.gradle 2010-09-01 18:15:18 UTC (rev 409) @@ -39,7 +39,7 @@ } dependencies { - compile 'org.tmapi:tmapi:2.0.2' + compile 'org.tmapi:tmapi:(2.0.2,)' compiledep 'com.semagia.mio:mio-core:0.9.6-SNAPSHOT' This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lh...@us...> - 2010-09-03 16:01:24
|
Revision: 413 http://tinytim.svn.sourceforge.net/tinytim/?rev=413&view=rev Author: lheuer Date: 2010-09-03 16:01:18 +0000 (Fri, 03 Sep 2010) Log Message: ----------- Resolving references with whitespaces did not work. Fixed. Modified Paths: -------------- tinytim/trunk/CHANGES.txt tinytim/trunk/src/main/java/org/tinytim/core/value/LocatorImpl.java tinytim/trunk/src/test/java/org/tinytim/core/value/TestLocatorImpl.java Modified: tinytim/trunk/CHANGES.txt =================================================================== --- tinytim/trunk/CHANGES.txt 2010-09-02 10:33:10 UTC (rev 412) +++ tinytim/trunk/CHANGES.txt 2010-09-03 16:01:18 UTC (rev 413) @@ -9,9 +9,11 @@ (contributed by Hannes Niederhausen) * Removed String-Interning for object ids (caused heap memory problems and fixes a bug reported by Uta Schulze) - +* Locator: Resolving a reference with white spaces caused problems. Fixed. + (reported by Uta Schulze) + 2.0.0 (2010-03-19) ------------------ * Updated TMAPI to 2.0.2 (kept compatibility to 2.0 and 2.0.1) Modified: tinytim/trunk/src/main/java/org/tinytim/core/value/LocatorImpl.java =================================================================== --- tinytim/trunk/src/main/java/org/tinytim/core/value/LocatorImpl.java 2010-09-02 10:33:10 UTC (rev 412) +++ tinytim/trunk/src/main/java/org/tinytim/core/value/LocatorImpl.java 2010-09-03 16:01:18 UTC (rev 413) @@ -148,7 +148,7 @@ if (_EMPTY.equals(reference)) { return this; } - return create(_uri.resolve(reference)); + return create(_uri.resolve(reference.replace(" ", "%20"))); } /* (non-Javadoc) Modified: tinytim/trunk/src/test/java/org/tinytim/core/value/TestLocatorImpl.java =================================================================== --- tinytim/trunk/src/test/java/org/tinytim/core/value/TestLocatorImpl.java 2010-09-02 10:33:10 UTC (rev 412) +++ tinytim/trunk/src/test/java/org/tinytim/core/value/TestLocatorImpl.java 2010-09-03 16:01:18 UTC (rev 413) @@ -38,6 +38,11 @@ assertEquals("http://www.example.org/test%20me/", loc3.toExternalForm()); } + public void testResolve() { + Locator loc = _tm.createLocator("http://www.example.org/"); + assertEquals("http://www.example.org/#uta%20schulze", loc.resolve("#uta schulze").toExternalForm()); + } + // public void testLowerCaseScheme() { // Locator loc = _tm.createLocator("HTTP://www.example.org/test+me/"); // assertEquals("http://www.example.org/test me/", loc.getReference()); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lh...@us...> - 2011-01-10 08:11:51
|
Revision: 417 http://tinytim.svn.sourceforge.net/tinytim/?rev=417&view=rev Author: lheuer Date: 2011-01-10 08:11:45 +0000 (Mon, 10 Jan 2011) Log Message: ----------- Fixed normaization of xsd:decimals Modified Paths: -------------- tinytim/trunk/CHANGES.txt tinytim/trunk/src/main/java/org/tinytim/core/value/LiteralNormalizer.java tinytim/trunk/src/test/java/org/tinytim/core/value/TestLiteralNormalizer.java Modified: tinytim/trunk/CHANGES.txt =================================================================== --- tinytim/trunk/CHANGES.txt 2010-11-06 10:07:21 UTC (rev 416) +++ tinytim/trunk/CHANGES.txt 2011-01-10 08:11:45 UTC (rev 417) @@ -2,7 +2,7 @@ Changes Log =========== -2.0.1 (2010-mm-dd) +2.0.1 (2011-mm-dd) ------------------ * tinyTiM is forward-compatible to TMAPI 2.0.3 * OSGi bundle exports the .voc package @@ -11,6 +11,8 @@ (caused heap memory problems and fixes a bug reported by Uta Schulze) * Locator: Resolving a reference with white spaces caused problems. Fixed. (reported by Uta Schulze) +* The lexical representation of decimals like "-.3" was interpreted as "+0.3". + Fixed. Modified: tinytim/trunk/src/main/java/org/tinytim/core/value/LiteralNormalizer.java =================================================================== --- tinytim/trunk/src/main/java/org/tinytim/core/value/LiteralNormalizer.java 2010-11-06 10:07:21 UTC (rev 416) +++ tinytim/trunk/src/main/java/org/tinytim/core/value/LiteralNormalizer.java 2011-01-10 08:11:45 UTC (rev 417) @@ -144,6 +144,9 @@ } if (len <= idx) { normalized.append('0'); + if (normalized.charAt(0) == '0') { + return "0.0"; + } } else { // idx points to the '.', increment it @@ -157,7 +160,7 @@ idx++; } } - return negative && normalized.charAt(0) != '0' ? '-' + normalized.toString() : normalized.toString(); + return negative ? '-' + normalized.toString() : normalized.toString(); } } Modified: tinytim/trunk/src/test/java/org/tinytim/core/value/TestLiteralNormalizer.java =================================================================== --- tinytim/trunk/src/test/java/org/tinytim/core/value/TestLiteralNormalizer.java 2010-11-06 10:07:21 UTC (rev 416) +++ tinytim/trunk/src/test/java/org/tinytim/core/value/TestLiteralNormalizer.java 2011-01-10 08:11:45 UTC (rev 417) @@ -62,6 +62,9 @@ assertEquals("0.0", LiteralNormalizer.normalizeDecimal("-0")); assertEquals("0.0", LiteralNormalizer.normalizeDecimal("-0.0")); assertEquals("0.0", LiteralNormalizer.normalizeDecimal("+0.0")); + assertEquals("-0.3", LiteralNormalizer.normalizeDecimal("-.3")); + assertEquals("0.3", LiteralNormalizer.normalizeDecimal("+.3")); + assertEquals("-0.03", LiteralNormalizer.normalizeDecimal("-.03")); assertEquals("0.0", LiteralNormalizer.normalizeDecimal("+00000.0000000")); assertEquals("0.0", LiteralNormalizer.normalizeDecimal("-00000.0000000")); assertEquals("10.0", LiteralNormalizer.normalizeDecimal("10")); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |