Menu
▾
▴
tmapi-commit — TMAPI commit messages
You can subscribe to this list here.
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(29) |
Sep
(4) |
Oct
|
Nov
(12) |
Dec
(1) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
(1) |
Feb
(4) |
Mar
(4) |
Apr
|
May
(2) |
Jun
(4) |
Jul
(9) |
Aug
(2) |
Sep
|
Oct
(10) |
Nov
|
Dec
|
| 2010 |
Jan
(12) |
Feb
(20) |
Mar
(17) |
Apr
|
May
|
Jun
|
Jul
(3) |
Aug
(1) |
Sep
(7) |
Oct
|
Nov
|
Dec
|
|
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-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-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-02-28 10:56:49
|
Revision: 163
http://tmapi.svn.sourceforge.net/tmapi/?rev=163&view=rev
Author: lheuer
Date: 2010-02-28 10:56:43 +0000 (Sun, 28 Feb 2010)
Log Message:
-----------
Refer to the 2.0 home
Modified Paths:
--------------
trunk/README.txt
Modified: trunk/README.txt
===================================================================
--- trunk/README.txt 2010-02-28 10:10:07 UTC (rev 162)
+++ trunk/README.txt 2010-02-28 10:56:43 UTC (rev 163)
@@ -32,7 +32,7 @@
the conformance tests. To run an application that uses TMAPI you will need a
conformant Topic Maps processor implementation. There are several TMAPI
implementations available. Up-to-date details can be found on the TMAPI website
-at http://www.tmapi.org/
+at http://www.tmapi.org/2.0/
3. Reporting Bugs
-----------------
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:10:13
|
Revision: 162
http://tmapi.svn.sourceforge.net/tmapi/?rev=162&view=rev
Author: lheuer
Date: 2010-02-28 10:10:07 +0000 (Sun, 28 Feb 2010)
Log Message:
-----------
More illegal variant scope tests
Modified Paths:
--------------
trunk/src/test/java/org/tmapi/core/TestName.java
Modified: trunk/src/test/java/org/tmapi/core/TestName.java
===================================================================
--- trunk/src/test/java/org/tmapi/core/TestName.java 2010-02-28 10:06:38 UTC (rev 161)
+++ trunk/src/test/java/org/tmapi/core/TestName.java 2010-02-28 10:10:07 UTC (rev 162)
@@ -185,6 +185,39 @@
}
}
+ public void testVariantCreationWithLocatorIllegalEmptyScope() {
+ final Name name = createName();
+ try {
+ name.createVariant(createLocator("http://tmapi.org"), Collections.<Topic>emptySet());
+ fail("Creation of a variant with an empty scope is not allowed");
+ }
+ catch (ModelConstraintException ex) {
+ // noop.
+ }
+ }
+
+ public void testVariantCreationWithLocatorIllegalNullScope() {
+ final Name name = createName();
+ try {
+ name.createVariant(createLocator("http://tmapi.org"), (Topic[])null);
+ fail("Creation of a variant with a null scope is not allowed");
+ }
+ catch (ModelConstraintException ex) {
+ // noop.
+ }
+ }
+
+ public void testVariantCreationWithLocatorIllegalEmptyArrayScope() {
+ final Name name = createName();
+ try {
+ name.createVariant(createLocator("http://tmapi.org"));
+ fail("Creation of a variant with an empty scope is not allowed");
+ }
+ catch (ModelConstraintException ex) {
+ // noop.
+ }
+ }
+
public void testVariantCreationWithDataTypeIllegalEmptyScope() {
final Name name = createName();
try {
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-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 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-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-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:47:24
|
Revision: 156
http://tmapi.svn.sourceforge.net/tmapi/?rev=156&view=rev
Author: lheuer
Date: 2010-02-27 18:47:18 +0000 (Sat, 27 Feb 2010)
Log Message:
-----------
Fixed typo
Modified Paths:
--------------
trunk/CHANGES.txt
Modified: trunk/CHANGES.txt
===================================================================
--- trunk/CHANGES.txt 2010-02-27 18:46:28 UTC (rev 155)
+++ trunk/CHANGES.txt 2010-02-27 18:47:18 UTC (rev 156)
@@ -4,7 +4,7 @@
TMAPI 2.0.1 - 2010-mm-dd
------------------------
-* Added more illegal Variant scope test.
+* Added more illegal Variant scope tests.
* Added support for OSGi
TMAPI 2.0 - 2010-02-06
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:46:34
|
Revision: 155
http://tmapi.svn.sourceforge.net/tmapi/?rev=155&view=rev
Author: lheuer
Date: 2010-02-27 18:46:28 +0000 (Sat, 27 Feb 2010)
Log Message:
-----------
Forgot to commit the OSGi-aware TopicMapSystemFactory. Done
Modified Paths:
--------------
trunk/src/main/java/org/tmapi/core/TopicMapSystemFactory.java
Modified: trunk/src/main/java/org/tmapi/core/TopicMapSystemFactory.java
===================================================================
--- trunk/src/main/java/org/tmapi/core/TopicMapSystemFactory.java 2010-02-27 18:45:15 UTC (rev 154)
+++ trunk/src/main/java/org/tmapi/core/TopicMapSystemFactory.java 2010-02-27 18:46:28 UTC (rev 155)
@@ -195,6 +195,16 @@
@SuppressWarnings("unchecked")
private static Class<? extends TopicMapSystemFactory> getImplementationClass()
throws FactoryConfigurationException {
+ try {
+ // Try use OSGi. Will fail silently within non-OSGi environments
+ Class spiClass = org.tmapi.core.internal.OsgiLocator.locate(FACTORY_PROPERTY);
+ if (spiClass != null) {
+ return (Class<TopicMapSystemFactory>) spiClass;
+ }
+ }
+ catch (Throwable e) {
+ // noop.
+ }
String implClassName = getClassNameFromProperties();
if (implClassName == null) {
implClassName = getClassNameFromResource();
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:45:22
|
Revision: 154
http://tmapi.svn.sourceforge.net/tmapi/?rev=154&view=rev
Author: lheuer
Date: 2010-02-27 18:45:15 +0000 (Sat, 27 Feb 2010)
Log Message:
-----------
Added OSGi support
Added package info
Modified Paths:
--------------
trunk/CHANGES.txt
trunk/build.xml
Added Paths:
-----------
trunk/NOTICE.txt
trunk/lib/LICENSE.osgi.txt
trunk/lib/osgi.core.jar
trunk/src/main/java/org/tmapi/core/internal/
trunk/src/main/java/org/tmapi/core/internal/Activator.java
trunk/src/main/java/org/tmapi/core/internal/OsgiLocator.java
trunk/src/main/java/org/tmapi/core/internal/package-info.java
trunk/src/main/java/org/tmapi/core/package-info.java
trunk/src/main/java/org/tmapi/index/package-info.java
Modified: trunk/CHANGES.txt
===================================================================
--- trunk/CHANGES.txt 2010-02-27 14:34:53 UTC (rev 153)
+++ trunk/CHANGES.txt 2010-02-27 18:45:15 UTC (rev 154)
@@ -5,6 +5,7 @@
TMAPI 2.0.1 - 2010-mm-dd
------------------------
* Added more illegal Variant scope test.
+* Added support for OSGi
TMAPI 2.0 - 2010-02-06
----------------------
Added: trunk/NOTICE.txt
===================================================================
--- trunk/NOTICE.txt (rev 0)
+++ trunk/NOTICE.txt 2010-02-27 18:45:15 UTC (rev 154)
@@ -0,0 +1,9 @@
+The classes
+
+* org.tmapi.core.internal.OSGILocator
+* org.tmapi.core.internal.Activator
+
+were copied (and modified) from the Apache ServiceMix 4.0
+<http://servicemix.apache.org> project and therefor are
+licensed under the Apache License 2.0
+<http://www.apache.org/licenses/LICENSE-2.0>.
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2010-02-27 14:34:53 UTC (rev 153)
+++ trunk/build.xml 2010-02-27 18:45:15 UTC (rev 154)
@@ -24,6 +24,7 @@
<property name="dir.lib" value="${basedir}/lib"/>
<property name="lib.junit" value="${dir.lib}/junit-4.8.1.jar"/>
+ <property name="lib.osgi" value="${dir.lib}/osgi.core.jar"/>
<target name="help">
<echo message="--------------------"/>
@@ -85,6 +86,7 @@
<classpath>
<pathelement location="${dir.build.classes}"/>
<pathelement location="${lib.junit}"/>
+ <pathelement location="${lib.osgi}"/>
</classpath>
<src path="${dir.test}"/>
</javac>
@@ -98,19 +100,26 @@
TopicMapSystemFactory
-->
<!-- =================================================================== -->
- <target name="internal.tests" depends="test">
+ <target name="internal.tests" depends="test, jar">
<mkdir dir="tmp/META-INF/services"/>
<copy todir="tmp/META-INF/services">
<fileset dir="${dir.test}/org/tmapi/core">
<include name="org.tmapi.core.TopicMapSystemFactory"/>
</fileset>
</copy>
- <jar jarfile="tmapi-test.jar" basedir="tmp"/>
+ <jar jarfile="tmapi-test.jar" basedir="tmp">
+ <manifest>
+ <attribute name="Import-Package" value="org.tmapi.core,org.tmapi.index"/>
+ <attribute name="Bundle-Name" value="tmapitest"/>
+ <attribute name="Bundle-SymbolicName" value="org.tmapi.test"/>
+ </manifest>
+ </jar>
<junit
printsummary="true" showoutput="false"
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}"/>
@@ -129,6 +138,9 @@
debug="${debug}"
target="1.5">
<src path="${dir.src}"/>
+ <classpath>
+ <pathelement location="${lib.osgi}"/>
+ </classpath>
</javac>
</target>
@@ -147,14 +159,14 @@
failonerror="true"
additionalparam="-author -version"
windowtitle="TMAPI v${dist.version}"
- doctitle="TMAPI v${dist.version}">
+ doctitle="TMAPI v${dist.version}"
+ sourcepath="${dir.src}"
+ excludepackagenames="org.tmapi.core.internal.*">
<!--
<doclet name="net.gleamynode.apiviz.APIviz"
path="${dir.lib}/apiviz-1.1.3.jar">
</doclet>
-->
- <fileset dir="${dir.src}">
- </fileset>
</javadoc>
</target>
@@ -173,10 +185,12 @@
<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="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}"/>
</manifest>
</jar>
@@ -236,6 +250,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>
Added: trunk/lib/LICENSE.osgi.txt
===================================================================
--- trunk/lib/LICENSE.osgi.txt (rev 0)
+++ trunk/lib/LICENSE.osgi.txt 2010-02-27 18:45:15 UTC (rev 154)
@@ -0,0 +1,42 @@
+OSGi Specification License, Version 1.0.
+
+The OSGi Alliance ("OSGi Alliance") hereby grants you a fully-paid, non-
+exclusive, non-transferable, worldwide, limited license (without the right to
+sublicense), under the OSGi Alliance's applicable intellectual property rights
+to view, download, and reproduce the OSGi Specification ("Specification") which
+follows this License Agreement ("Agreement"). You are not authorized to create
+any derivative work of the Specification. The OSGi Alliance also grants you a
+perpetual, non-exclusive, worldwide, fully paid-up, royalty free, limited
+license (without the right to sublicense) under any applicable copyrights, to
+create and/or distribute an implementation of the Specification that: (i) fully
+implements the Specification including all its required interfaces and
+functionality; (ii) does not modify, subset, superset or otherwise extend the
+OSGi Name Space, or include any public or protected packages, classes, Java
+interfaces, fields or methods within the OSGi Name Space other than those
+required and authorized by the Specification. An implementation that does not
+satisfy limitations (i)-(ii) is not considered an implementation of the
+Specification, does not receive the benefits of this license, and must not be
+described as an implementation of the Specification. An implementation of the
+Specification must not claim to be a compliant implementation of the
+Specification unless it passes the OSGi Alliance Compliance Tests for the
+Specification in accordance with OSGi Alliance processes. "OSGi Name Space"
+shall mean the public class or interface declarations whose names begin with
+"org.osgi" or any recognized successors or replacements thereof.
+
+THE SPECIFICATION IS PROVIDED "AS IS," AND THE OSGi ALLIANCE, ITS MEMBERS AND
+ANY OTHER AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED,
+INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE, NON-INFRINGEMENT, OR TITLE; THAT THE CONTENTS OF THE
+SPECIFICATION ARE SUITABLE FOR ANY PURPOSE; NOR THAT THE IMPLEMENTATION OF SUCH
+CONTENTS WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR
+OTHER RIGHTS. THE OSGi ALLIANCE, ITS MEMBERS AND ANY OTHER AUTHORS WILL NOT BE
+LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF ANY USE OF THE SPECIFICATION OR THE PERFORMANCE OR IMPLEMENTATION
+OF THE CONTENTS THEREOF.
+
+The name and trademarks of the OSGi Alliance or any other Authors may NOT be
+used in any manner, including advertising or publicity pertaining to the
+Specification or its contents without specific, written prior permission. Title
+to copyright in the Specification will at all times remain with the Authors.
+
+No other rights are granted by implication, estoppel or otherwise.
Added: trunk/lib/osgi.core.jar
===================================================================
(Binary files differ)
Property changes on: trunk/lib/osgi.core.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/src/main/java/org/tmapi/core/internal/Activator.java
===================================================================
--- trunk/src/main/java/org/tmapi/core/internal/Activator.java (rev 0)
+++ trunk/src/main/java/org/tmapi/core/internal/Activator.java 2010-02-27 18:45:15 UTC (rev 154)
@@ -0,0 +1,147 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.tmapi.core.internal;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleEvent;
+import org.osgi.framework.SynchronousBundleListener;
+
+@SuppressWarnings("unchecked")
+public class Activator implements BundleActivator, SynchronousBundleListener {
+
+ private ConcurrentMap<Long, Map<String, Callable<Class>>> factories = new ConcurrentHashMap<Long, Map<String, Callable<Class>>>();
+
+ private BundleContext _bundleContext;
+
+ public synchronized void start(BundleContext bundleContext) throws Exception {
+ _bundleContext = bundleContext;
+ bundleContext.addBundleListener(this);
+ for (Bundle bundle : bundleContext.getBundles()) {
+ if (bundle.getState() == Bundle.RESOLVED || bundle.getState() == Bundle.STARTING ||
+ bundle.getState() == Bundle.ACTIVE || bundle.getState() == Bundle.STOPPING) {
+ register(bundle);
+ }
+ }
+ }
+
+ @SuppressWarnings("boxing")
+ public synchronized void stop(BundleContext bundleContext) throws Exception {
+ bundleContext.removeBundleListener(this);
+ while (!factories.isEmpty()) {
+ unregister(factories.keySet().iterator().next());
+ }
+ _bundleContext = null;
+ }
+
+ public void bundleChanged(BundleEvent event) {
+ if (event.getType() == BundleEvent.RESOLVED) {
+ register(event.getBundle());
+ } else if (event.getType() == BundleEvent.UNRESOLVED || event.getType() == BundleEvent.UNINSTALLED) {
+ unregister(event.getBundle().getBundleId());
+ }
+ }
+
+ protected void register(final Bundle bundle) {
+ Map<String, Callable<Class>> map = factories.get(bundle.getBundleId());
+ Enumeration e = bundle.findEntries("META-INF/services/", "*", false);
+ if (e != null) {
+ while (e.hasMoreElements()) {
+ final URL u = (URL) e.nextElement();
+ final String url = u.toString();
+ if (url.endsWith("/")) {
+ continue;
+ }
+ final String factoryId = url.substring(url.lastIndexOf("/") + 1);
+ if (map == null) {
+ map = new HashMap<String, Callable<Class>>();
+ factories.put(bundle.getBundleId(), map);
+ }
+ map.put(factoryId, new BundleFactoryLoader(factoryId, u, bundle));
+ }
+ }
+ if (map != null) {
+ for (Map.Entry<String, Callable<Class>> entry : map.entrySet()) {
+ OsgiLocator.register(entry.getKey(), entry.getValue());
+ }
+ }
+ }
+
+ protected void unregister(long bundleId) {
+ Map<String, Callable<Class>> map = factories.remove(bundleId);
+ if (map != null) {
+ for (Map.Entry<String, Callable<Class>> entry : map.entrySet()) {
+ OsgiLocator.unregister(entry.getKey(), entry.getValue());
+ }
+ }
+ }
+
+ private class BundleFactoryLoader implements Callable<Class> {
+ //private final String factoryId;
+ private final URL u;
+ private final Bundle bundle;
+
+ public BundleFactoryLoader(String factoryId, URL u, Bundle bundle) {
+ //this.factoryId = factoryId;
+ this.u = u;
+ this.bundle = bundle;
+ }
+
+ public Class call() throws Exception {
+ try {
+ BufferedReader br = new BufferedReader(new InputStreamReader(u.openStream(), "UTF-8"));
+ String factoryClassName = br.readLine();
+ br.close();
+ return bundle.loadClass(factoryClassName);
+ } catch (Exception e) {
+ throw e;
+ } catch (Error e) {
+ throw e;
+ }
+ }
+
+ @Override
+ public String toString() {
+ return u.toString();
+ }
+
+ @Override
+ public int hashCode() {
+ return u.hashCode();
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (obj instanceof BundleFactoryLoader) {
+ return u.equals(((BundleFactoryLoader) obj).u);
+ } else {
+ return false;
+ }
+ }
+ }
+}
Added: trunk/src/main/java/org/tmapi/core/internal/OsgiLocator.java
===================================================================
--- trunk/src/main/java/org/tmapi/core/internal/OsgiLocator.java (rev 0)
+++ trunk/src/main/java/org/tmapi/core/internal/OsgiLocator.java 2010-02-27 18:45:15 UTC (rev 154)
@@ -0,0 +1,68 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.tmapi.core.internal;
+
+import java.util.concurrent.Callable;
+import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.ArrayList;
+
+public class OsgiLocator {
+
+ private static Map<String, List<Callable<Class>>> _factories;
+
+ private OsgiLocator() {
+ }
+
+ public static synchronized void unregister(String id, Callable<Class> factory) {
+ if (_factories != null) {
+ List<Callable<Class>> l = _factories.get(id);
+ if (l != null) {
+ l.remove(factory);
+ }
+ }
+ }
+
+ public static synchronized void register(String id, Callable<Class> factory) {
+ if (_factories == null) {
+ _factories = new HashMap<String, List<Callable<Class>>>();
+ }
+ List<Callable<Class>> l = _factories.get(id);
+ if (l == null) {
+ l = new ArrayList<Callable<Class>>();
+ _factories.put(id, l);
+ }
+ l.add(factory);
+ }
+
+ public static synchronized Class locate(String factoryId) {
+ if (_factories != null) {
+ List<Callable<Class>> l = _factories.get(factoryId);
+ if (l != null && !l.isEmpty()) {
+ Callable<Class> c = l.get(l.size() - 1);
+ try {
+ return c.call();
+ }
+ catch (Exception e) {
+ }
+ }
+ }
+ return null;
+ }
+
+}
Added: trunk/src/main/java/org/tmapi/core/internal/package-info.java
===================================================================
--- trunk/src/main/java/org/tmapi/core/internal/package-info.java (rev 0)
+++ trunk/src/main/java/org/tmapi/core/internal/package-info.java 2010-02-27 18:45:15 UTC (rev 154)
@@ -0,0 +1,18 @@
+/*
+ * The Topic Maps API (TMAPI) was created collectively by
+ * the membership of the tmapi-discuss mailing list
+ * <http://lists.sourceforge.net/mailman/listinfo/tmapi-discuss>,
+ * is hereby released into the public domain; and comes with
+ * NO WARRANTY.
+ *
+ * No one owns TMAPI: you may use it freely in both commercial and
+ * non-commercial applications, bundle it with your software
+ * distribution, include it on a CD-ROM, list the source code in a
+ * book, mirror the documentation at your own web site, or use it in
+ * any other way you see fit.
+ */
+
+/**
+ * Internal OSGi-specific package. This is not meant to be used by client code.
+ */
+package org.tmapi.core.internal;
Added: trunk/src/main/java/org/tmapi/core/package-info.java
===================================================================
--- trunk/src/main/java/org/tmapi/core/package-info.java (rev 0)
+++ trunk/src/main/java/org/tmapi/core/package-info.java 2010-02-27 18:45:15 UTC (rev 154)
@@ -0,0 +1,19 @@
+/*
+ * The Topic Maps API (TMAPI) was created collectively by
+ * the membership of the tmapi-discuss mailing list
+ * <http://lists.sourceforge.net/mailman/listinfo/tmapi-discuss>,
+ * is hereby released into the public domain; and comes with
+ * NO WARRANTY.
+ *
+ * No one owns TMAPI: you may use it freely in both commercial and
+ * non-commercial applications, bundle it with your software
+ * distribution, include it on a CD-ROM, list the source code in a
+ * book, mirror the documentation at your own web site, or use it in
+ * any other way you see fit.
+ */
+
+/**
+ * Core interfaces which provide the functionality of the
+ * <a href="http://www.isotopicmaps.org/sam/sam-model">Topic Maps - Data Model</a>.
+ */
+package org.tmapi.core;
Added: trunk/src/main/java/org/tmapi/index/package-info.java
===================================================================
--- trunk/src/main/java/org/tmapi/index/package-info.java (rev 0)
+++ trunk/src/main/java/org/tmapi/index/package-info.java 2010-02-27 18:45:15 UTC (rev 154)
@@ -0,0 +1,19 @@
+/*
+ * The Topic Maps API (TMAPI) was created collectively by
+ * the membership of the tmapi-discuss mailing list
+ * <http://lists.sourceforge.net/mailman/listinfo/tmapi-discuss>,
+ * is hereby released into the public domain; and comes with
+ * NO WARRANTY.
+ *
+ * No one owns TMAPI: you may use it freely in both commercial and
+ * non-commercial applications, bundle it with your software
+ * distribution, include it on a CD-ROM, list the source code in a
+ * book, mirror the documentation at your own web site, or use it in
+ * any other way you see fit.
+ */
+
+/**
+ * Index interfaces which provide lookup of Topic Maps
+ * {@link org.tmapi.core.Construct}s.
+ */
+package org.tmapi.index;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2010-02-27 14:34:59
|
Revision: 153
http://tmapi.svn.sourceforge.net/tmapi/?rev=153&view=rev
Author: lheuer
Date: 2010-02-27 14:34:53 +0000 (Sat, 27 Feb 2010)
Log Message:
-----------
Updated JUnit
Modified Paths:
--------------
trunk/build.xml
Added Paths:
-----------
trunk/lib/junit-4.8.1.jar
Removed Paths:
-------------
trunk/lib/junit-4.5.jar
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2010-02-26 23:20:22 UTC (rev 152)
+++ trunk/build.xml 2010-02-27 14:34:53 UTC (rev 153)
@@ -23,7 +23,7 @@
<property name="dir.test" value="${basedir}/src/test/java"/>
<property name="dir.lib" value="${basedir}/lib"/>
- <property name="lib.junit" value="${dir.lib}/junit-4.5.jar"/>
+ <property name="lib.junit" value="${dir.lib}/junit-4.8.1.jar"/>
<target name="help">
<echo message="--------------------"/>
Deleted: trunk/lib/junit-4.5.jar
===================================================================
(Binary files differ)
Added: trunk/lib/junit-4.8.1.jar
===================================================================
(Binary files differ)
Property changes on: trunk/lib/junit-4.8.1.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-02-26 23:20:28
|
Revision: 152
http://tmapi.svn.sourceforge.net/tmapi/?rev=152&view=rev
Author: lheuer
Date: 2010-02-26 23:20:22 +0000 (Fri, 26 Feb 2010)
Log Message:
-----------
Sorry, my Eclipse fucked up the SVN
Removed Paths:
-------------
trunk/tmapi2/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2010-02-26 23:14:23
|
Revision: 151
http://tmapi.svn.sourceforge.net/tmapi/?rev=151&view=rev
Author: lheuer
Date: 2010-02-26 23:14:13 +0000 (Fri, 26 Feb 2010)
Log Message:
-----------
Share project "tmapi2" into "https://tmapi.svn.sourceforge.net/svnroot/tmapi/trunk"
Added Paths:
-----------
trunk/tmapi2/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2010-02-26 19:19:56
|
Revision: 150
http://tmapi.svn.sourceforge.net/tmapi/?rev=150&view=rev
Author: lheuer
Date: 2010-02-26 19:19:42 +0000 (Fri, 26 Feb 2010)
Log Message:
-----------
Removed warnings about autoboxing
Modified Paths:
--------------
trunk/src/test/java/org/tmapi/core/AbstractTestDatatypeAware.java
Modified: trunk/src/test/java/org/tmapi/core/AbstractTestDatatypeAware.java
===================================================================
--- trunk/src/test/java/org/tmapi/core/AbstractTestDatatypeAware.java 2010-02-26 19:10:12 UTC (rev 149)
+++ trunk/src/test/java/org/tmapi/core/AbstractTestDatatypeAware.java 2010-02-26 19:19:42 UTC (rev 150)
@@ -124,6 +124,7 @@
assertFailDecimal(dt);
}
+ @SuppressWarnings("boxing")
public void testInteger() {
final BigInteger value = BigInteger.TEN;
final DatatypeAware dt = getDatatypeAware();
@@ -137,6 +138,7 @@
assertEquals(10.0F, dt.floatValue());
}
+ @SuppressWarnings("boxing")
public void testIntegerExplicit() {
final BigInteger value = BigInteger.TEN;
final DatatypeAware dt = getDatatypeAware();
@@ -150,6 +152,7 @@
assertEquals(10.0F, dt.floatValue());
}
+ @SuppressWarnings("boxing")
public void testDecimal() {
final BigDecimal value = BigDecimal.TEN;
final DatatypeAware dt = getDatatypeAware();
@@ -165,6 +168,7 @@
assertEquals(10.0F, dt.floatValue());
}
+ @SuppressWarnings("boxing")
public void testDecimalExplicit() {
final BigDecimal value = BigDecimal.TEN;
final DatatypeAware dt = getDatatypeAware();
@@ -183,6 +187,7 @@
assertEquals(10.0F, dt.floatValue());
}
+ @SuppressWarnings("boxing")
public void testInt() {
final int value = 1976;
final String strValue = "1976";
@@ -197,6 +202,7 @@
assertEquals(1976.0F, dt.floatValue());
}
+ @SuppressWarnings("boxing")
public void testLong() {
final long value = 1976L;
final String strValue = "1976";
@@ -211,6 +217,7 @@
assertEquals(1976.0F, dt.floatValue());
}
+ @SuppressWarnings("boxing")
public void testFloat() {
final float value = 1976.0F;
final String strValue = "1976.0";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2010-02-26 19:10:20
|
Revision: 149
http://tmapi.svn.sourceforge.net/tmapi/?rev=149&view=rev
Author: lheuer
Date: 2010-02-26 19:10:12 +0000 (Fri, 26 Feb 2010)
Log Message:
-----------
Removed unused import
Modified Paths:
--------------
trunk/src/test/java/org/tmapi/core/TestItemIdentifierConstraint.java
Modified: trunk/src/test/java/org/tmapi/core/TestItemIdentifierConstraint.java
===================================================================
--- trunk/src/test/java/org/tmapi/core/TestItemIdentifierConstraint.java 2010-02-24 13:12:59 UTC (rev 148)
+++ trunk/src/test/java/org/tmapi/core/TestItemIdentifierConstraint.java 2010-02-26 19:10:12 UTC (rev 149)
@@ -17,7 +17,6 @@
import org.tmapi.core.Construct;
import org.tmapi.core.IdentityConstraintException;
import org.tmapi.core.Locator;
-import org.tmapi.core.Topic;
import org.tmapi.core.TopicMap;
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2010-02-24 13:13:05
|
Revision: 148
http://tmapi.svn.sourceforge.net/tmapi/?rev=148&view=rev
Author: lheuer
Date: 2010-02-24 13:12:59 +0000 (Wed, 24 Feb 2010)
Log Message:
-----------
First part of OSGification
Modified Paths:
--------------
trunk/build.properties
trunk/build.xml
Modified: trunk/build.properties
===================================================================
--- trunk/build.properties 2010-02-19 14:31:25 UTC (rev 147)
+++ trunk/build.properties 2010-02-24 13:12:59 UTC (rev 148)
@@ -1,5 +1,6 @@
version=2.0.1
-version_suffix=snapshot
+# If the suffix is provided, it MUST start with "."
+version_suffix=.snapshot
debug=off
optimize=on
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2010-02-19 14:31:25 UTC (rev 147)
+++ trunk/build.xml 2010-02-24 13:12:59 UTC (rev 148)
@@ -171,6 +171,13 @@
<attribute name="Implementation-Title" value="TMAPI"/>
<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="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-Version" value="${dist.version}"/>
</manifest>
</jar>
</target>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2010-02-19 14:31:32
|
Revision: 147
http://tmapi.svn.sourceforge.net/tmapi/?rev=147&view=rev
Author: lheuer
Date: 2010-02-19 14:31:25 +0000 (Fri, 19 Feb 2010)
Log Message:
-----------
Applied patch contributed by Benjamin Bock (illegal variant scope tests)
Modified Paths:
--------------
trunk/CHANGES.txt
trunk/src/test/java/org/tmapi/core/TestName.java
Modified: trunk/CHANGES.txt
===================================================================
--- trunk/CHANGES.txt 2010-02-19 12:53:09 UTC (rev 146)
+++ trunk/CHANGES.txt 2010-02-19 14:31:25 UTC (rev 147)
@@ -4,7 +4,7 @@
TMAPI 2.0.1 - 2010-mm-dd
------------------------
-* Added one more illegal Variant scope test.
+* Added more illegal Variant scope test.
TMAPI 2.0 - 2010-02-06
----------------------
Modified: trunk/src/test/java/org/tmapi/core/TestName.java
===================================================================
--- trunk/src/test/java/org/tmapi/core/TestName.java 2010-02-19 12:53:09 UTC (rev 146)
+++ trunk/src/test/java/org/tmapi/core/TestName.java 2010-02-19 14:31:25 UTC (rev 147)
@@ -184,4 +184,40 @@
// noop.
}
}
+
+ public void testVariantCreationWithDataTypeIllegalEmptyScope() {
+ final Name name = createName();
+ try {
+ final Locator dt = createLocator("http://www.example.org/datatype");
+ name.createVariant("Variant", dt, Collections.<Topic>emptySet());
+ fail("Creation of a variant with an empty scope is not allowed");
+ }
+ catch (ModelConstraintException ex) {
+ // noop.
+ }
+ }
+
+ public void testVariantCreationWithDataTypeIllegalNullScope() {
+ final Name name = createName();
+ try {
+ final Locator dt = createLocator("http://www.example.org/datatype");
+ name.createVariant("Variant", dt, (Topic[])null);
+ fail("Creation of a variant with a null scope is not allowed");
+ }
+ catch (ModelConstraintException ex) {
+ // noop.
+ }
+ }
+
+ public void testVariantCreationWithDataTypeIllegalEmptyArrayScope() {
+ final Name name = createName();
+ try {
+ final Locator dt = createLocator("http://www.example.org/datatype");
+ name.createVariant("Variant", dt);
+ fail("Creation of a variant with an empty scope is not allowed");
+ }
+ catch (ModelConstraintException ex) {
+ // noop.
+ }
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2010-02-19 12:53:16
|
Revision: 146
http://tmapi.svn.sourceforge.net/tmapi/?rev=146&view=rev
Author: lheuer
Date: 2010-02-19 12:53:09 +0000 (Fri, 19 Feb 2010)
Log Message:
-----------
Added one more illegal Variant test case which may be related to http://code.google.com/p/ontopia/issues/detail?id=209 or not.
Modified Paths:
--------------
trunk/CHANGES.txt
trunk/src/test/java/org/tmapi/core/TestName.java
Modified: trunk/CHANGES.txt
===================================================================
--- trunk/CHANGES.txt 2010-02-06 13:47:12 UTC (rev 145)
+++ trunk/CHANGES.txt 2010-02-19 12:53:09 UTC (rev 146)
@@ -2,6 +2,10 @@
TMAPI Changes
=============
+TMAPI 2.0.1 - 2010-mm-dd
+------------------------
+* Added one more illegal Variant scope test.
+
TMAPI 2.0 - 2010-02-06
----------------------
* Simplified TestItemIdentifierConstraint test case to avoid
Modified: trunk/src/test/java/org/tmapi/core/TestName.java
===================================================================
--- trunk/src/test/java/org/tmapi/core/TestName.java 2010-02-06 13:47:12 UTC (rev 145)
+++ trunk/src/test/java/org/tmapi/core/TestName.java 2010-02-19 12:53:09 UTC (rev 146)
@@ -173,4 +173,15 @@
// noop.
}
}
+
+ public void testVariantCreationIllegalEmptyArrayScope() {
+ final Name name = createName();
+ try {
+ name.createVariant("Variant");
+ fail("Creation of a variant with an empty scope is not allowed");
+ }
+ catch (ModelConstraintException ex) {
+ // noop.
+ }
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2010-02-06 13:47:18
|
Revision: 145
http://tmapi.svn.sourceforge.net/tmapi/?rev=145&view=rev
Author: lheuer
Date: 2010-02-06 13:47:12 +0000 (Sat, 06 Feb 2010)
Log Message:
-----------
Preparing release
Modified Paths:
--------------
tags/release-2_0/CHANGES.txt
tags/release-2_0/build.properties
trunk/CHANGES.txt
trunk/build.properties
Modified: tags/release-2_0/CHANGES.txt
===================================================================
--- tags/release-2_0/CHANGES.txt 2010-02-06 13:35:56 UTC (rev 144)
+++ tags/release-2_0/CHANGES.txt 2010-02-06 13:47:12 UTC (rev 145)
@@ -2,7 +2,7 @@
TMAPI Changes
=============
-TMAPI 2.0 - 2010-02-01
+TMAPI 2.0 - 2010-02-06
----------------------
* Simplified TestItemIdentifierConstraint test case to avoid
problems with Topic Maps engines which support the ``automerge``
Modified: tags/release-2_0/build.properties
===================================================================
--- tags/release-2_0/build.properties 2010-02-06 13:35:56 UTC (rev 144)
+++ tags/release-2_0/build.properties 2010-02-06 13:47:12 UTC (rev 145)
@@ -1,5 +1,5 @@
version=2.0
-version_suffix=final-snapshot
+version_suffix=
debug=off
optimize=on
Modified: trunk/CHANGES.txt
===================================================================
--- trunk/CHANGES.txt 2010-02-06 13:35:56 UTC (rev 144)
+++ trunk/CHANGES.txt 2010-02-06 13:47:12 UTC (rev 145)
@@ -2,7 +2,7 @@
TMAPI Changes
=============
-TMAPI 2.0 - 2010-02-01
+TMAPI 2.0 - 2010-02-06
----------------------
* Simplified TestItemIdentifierConstraint test case to avoid
problems with Topic Maps engines which support the ``automerge``
Modified: trunk/build.properties
===================================================================
--- trunk/build.properties 2010-02-06 13:35:56 UTC (rev 144)
+++ trunk/build.properties 2010-02-06 13:47:12 UTC (rev 145)
@@ -1,5 +1,5 @@
-version=2.0
-version_suffix=final-snapshot
+version=2.0.1
+version_suffix=snapshot
debug=off
optimize=on
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2010-02-06 13:36:08
|
Revision: 144
http://tmapi.svn.sourceforge.net/tmapi/?rev=144&view=rev
Author: lheuer
Date: 2010-02-06 13:35:56 +0000 (Sat, 06 Feb 2010)
Log Message:
-----------
made a copy
Added Paths:
-----------
tags/release-2_0/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2010-01-18 17:03:48
|
Revision: 143
http://tmapi.svn.sourceforge.net/tmapi/?rev=143&view=rev
Author: lheuer
Date: 2010-01-18 17:03:11 +0000 (Mon, 18 Jan 2010)
Log Message:
-----------
Updated CHANGES.txt
Modified Paths:
--------------
trunk/CHANGES.txt
Modified: trunk/CHANGES.txt
===================================================================
--- trunk/CHANGES.txt 2010-01-18 16:56:45 UTC (rev 142)
+++ trunk/CHANGES.txt 2010-01-18 17:03:11 UTC (rev 143)
@@ -2,6 +2,13 @@
TMAPI Changes
=============
+TMAPI 2.0 - 2010-02-01
+----------------------
+* Simplified TestItemIdentifierConstraint test case to avoid
+ problems with Topic Maps engines which support the ``automerge``
+ feature.
+
+
TMAPI 2.0 RC2 - 2010-01-15
--------------------------
* Fixed TestLocator test case (engines are not required to support
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2010-01-18 16:56:52
|
Revision: 142
http://tmapi.svn.sourceforge.net/tmapi/?rev=142&view=rev
Author: lheuer
Date: 2010-01-18 16:56:45 +0000 (Mon, 18 Jan 2010)
Log Message:
-----------
Simplified testTopic test case (avoid merging of topics), reported by Johannes Payr
Modified Paths:
--------------
trunk/src/test/java/org/tmapi/core/TestItemIdentifierConstraint.java
Modified: trunk/src/test/java/org/tmapi/core/TestItemIdentifierConstraint.java
===================================================================
--- trunk/src/test/java/org/tmapi/core/TestItemIdentifierConstraint.java 2010-01-17 21:22:27 UTC (rev 141)
+++ trunk/src/test/java/org/tmapi/core/TestItemIdentifierConstraint.java 2010-01-18 16:56:45 UTC (rev 142)
@@ -77,33 +77,10 @@
}
/**
- * Tests againts a topic.
+ * Tests against a topic.
*/
public void testTopic() {
- Topic topic = createTopic();
- Locator iid = createLocator("http://sf.net/projects/tinytim");
- topic.addItemIdentifier(iid);
- assertTrue(topic.getItemIdentifiers().contains(iid));
- Topic topic2 = createTopic();
- try {
- topic2.addItemIdentifier(iid);
- }
- catch (IdentityConstraintException ex) {
- assertEquals(topic2, ex.getReporter());
- assertEquals(topic, ex.getExisting());
- assertEquals(iid, ex.getLocator());
- }
- topic.removeItemIdentifier(iid);
- assertFalse(topic.getItemIdentifiers().contains(iid));
- topic2.addItemIdentifier(iid);
- assertTrue(topic2.getItemIdentifiers().contains(iid));
- topic2.removeItemIdentifier(iid);
- topic.addItemIdentifier(iid);
- assertTrue(topic.getItemIdentifiers().contains(iid));
- assertFalse(topic2.getItemIdentifiers().contains(iid));
- topic.remove();
- topic2.addItemIdentifier(iid);
- assertTrue(topic2.getItemIdentifiers().contains(iid));
+ _testConstraint(_tm.createTopicBySubjectIdentifier(createLocator("http://psi.example.org/test-this-topic-please")));
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
