tinytim-commits — tinyTiM commit messages

[tinyTiM-commits] SF.net SVN: tinytim:[392] tinytim/trunk/settings.gradle

[<lh...@us...>]

Revision: 392
          http://tinytim.svn.sourceforge.net/tinytim/?rev=392&view=rev
Author:   lheuer
Date:     2010-03-30 08:51:27 +0000 (Tue, 30 Mar 2010)

Log Message:
-----------
Setting the correct project name

Added Paths:
-----------
    tinytim/trunk/settings.gradle

Added: tinytim/trunk/settings.gradle
===================================================================
--- tinytim/trunk/settings.gradle	                        (rev 0)
+++ tinytim/trunk/settings.gradle	2010-03-30 08:51:27 UTC (rev 392)
@@ -0,0 +1 @@
+rootProject.name = 'tinytim'


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[tinyTiM-commits] SF.net SVN: tinytim:[391] tinytim/trunk/CHANGES.txt

[<lh...@us...>]

Revision: 391
          http://tinytim.svn.sourceforge.net/tinytim/?rev=391&view=rev
Author:   lheuer
Date:     2010-03-29 20:51:01 +0000 (Mon, 29 Mar 2010)

Log Message:
-----------
Added Hannes' changes 

Modified Paths:
--------------
    tinytim/trunk/CHANGES.txt

Modified: tinytim/trunk/CHANGES.txt
===================================================================
--- tinytim/trunk/CHANGES.txt	2010-03-29 20:08:51 UTC (rev 390)
+++ tinytim/trunk/CHANGES.txt	2010-03-29 20:51:01 UTC (rev 391)
@@ -2,6 +2,12 @@
 Changes Log
 ===========
 
+2.0.1 (2010-mm-dd)
+------------------
+* OSGi bundle exports the .voc package 
+  (contributed by Hannes Niederhausen)
+
+
 2.0.0 (2010-03-19)
 ------------------
 * Updated TMAPI to 2.0.2 (kept compatibility to 2.0 and 2.0.1)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[tinyTiM-commits] SF.net SVN: tinytim:[390] tinytim/trunk/build.gradle

[<lh...@us...>]

Revision: 390
          http://tinytim.svn.sourceforge.net/tinytim/?rev=390&view=rev
Author:   lheuer
Date:     2010-03-29 20:08:51 +0000 (Mon, 29 Mar 2010)

Log Message:
-----------
build simplification

Modified Paths:
--------------
    tinytim/trunk/build.gradle

Modified: tinytim/trunk/build.gradle
===================================================================
--- tinytim/trunk/build.gradle	2010-03-29 20:03:18 UTC (rev 389)
+++ tinytim/trunk/build.gradle	2010-03-29 20:08:51 UTC (rev 390)
@@ -9,11 +9,6 @@
 apply plugin: 'java'
 apply plugin: 'osgi'
 
-manifest.mainAttributes(
-    'Implementation-Title': 'tinyTiM',
-    'Implementation-Version': version
-)
-
 gradle.taskGraph.whenReady {taskGraph ->
    if (!taskGraph.hasTask(':release')) {
        version += '-SNAPSHOT'
@@ -36,6 +31,7 @@
 
 jar {
     manifest {
+      attributes 'Implementation-Title': 'tinyTiM', 'Implementation-Version': version
       instruction 'Bundle-Description', 'tinyTiM - A tiny Topic Maps engine'
       instruction 'Import-Package', 'org.tmapi.core, org.tmapi.index'
       instruction 'Export-Package', 'org.tinytim.mio, org.tinytim.voc'


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[tinyTiM-commits] SF.net SVN: tinytim:[389] tinytim/trunk/build.gradle

[<lh...@us...>]

Revision: 389
          http://tinytim.svn.sourceforge.net/tinytim/?rev=389&view=rev
Author:   lheuer
Date:     2010-03-29 20:03:18 +0000 (Mon, 29 Mar 2010)

Log Message:
-----------
Updated to Gradle 0.9-preview-1. Still unusable (the build file, not Gradle)

Modified Paths:
--------------
    tinytim/trunk/build.gradle

Modified: tinytim/trunk/build.gradle
===================================================================
--- tinytim/trunk/build.gradle	2010-03-24 09:48:56 UTC (rev 388)
+++ tinytim/trunk/build.gradle	2010-03-29 20:03:18 UTC (rev 389)
@@ -1,4 +1,4 @@
-// *Experimental* build file for Gradle
+// *Experimental* build file for Gradle *0.9* (preview)
 // DO NOT use it. Don't even think about it!
 
 group = 'org.tinytim'
@@ -6,8 +6,8 @@
 version = '2.0.1'
 bundleVersion = version
 
-usePlugin 'java'
-usePlugin 'osgi'
+apply plugin: 'java'
+apply plugin: 'osgi'
 
 manifest.mainAttributes(
     'Implementation-Title': 'tinyTiM',
@@ -34,10 +34,12 @@
     testCompile group: 'org.tmapi', name: 'tmapi-tests', version: '2.0.3-SNAPSHOT'
 }
 
-configure(jar.osgi) {
-    instruction 'Bundle-Description', 'tinyTiM - A tiny Topic Maps engine'
-    instruction 'Import-Package', 'org.tmapi.core, org.tmapi.index'
-    instruction 'Export-Package', 'org.tinytim.mio, org.tinytim.voc'
+jar {
+    manifest {
+      instruction 'Bundle-Description', 'tinyTiM - A tiny Topic Maps engine'
+      instruction 'Import-Package', 'org.tmapi.core, org.tmapi.index'
+      instruction 'Export-Package', 'org.tinytim.mio, org.tinytim.voc'
+    }
 }
 
 test {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[tinyTiM-commits] SF.net SVN: tinytim:[388] tinytim/trunk/build.gradle

[<lh...@us...>]

Revision: 388
          http://tinytim.svn.sourceforge.net/tinytim/?rev=388&view=rev
Author:   lheuer
Date:     2010-03-24 09:48:56 +0000 (Wed, 24 Mar 2010)

Log Message:
-----------
Added *experimental* Gradle build 

Added Paths:
-----------
    tinytim/trunk/build.gradle

Added: tinytim/trunk/build.gradle
===================================================================
--- tinytim/trunk/build.gradle	                        (rev 0)
+++ tinytim/trunk/build.gradle	2010-03-24 09:48:56 UTC (rev 388)
@@ -0,0 +1,45 @@
+// *Experimental* build file for Gradle
+// DO NOT use it. Don't even think about it!
+
+group = 'org.tinytim'
+archivesBaseName = 'tinytim'
+version = '2.0.1'
+bundleVersion = version
+
+usePlugin 'java'
+usePlugin 'osgi'
+
+manifest.mainAttributes(
+    'Implementation-Title': 'tinyTiM',
+    'Implementation-Version': version
+)
+
+gradle.taskGraph.whenReady {taskGraph ->
+   if (!taskGraph.hasTask(':release')) {
+       version += '-SNAPSHOT'
+   }
+}
+
+repositories {
+    mavenCentral()
+    mavenRepo urls: 'http://www.tmapi.org/maven-repository/'
+    mavenRepo urls: 'http://www.tmapi.org/maven-repository/snapshots/'
+}
+
+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.+'
+    testCompile group: 'org.tmapi', name: 'tmapi-tests', version: '2.0.3-SNAPSHOT'
+}
+
+configure(jar.osgi) {
+    instruction 'Bundle-Description', 'tinyTiM - A tiny Topic Maps engine'
+    instruction 'Import-Package', 'org.tmapi.core, org.tmapi.index'
+    instruction 'Export-Package', 'org.tinytim.mio, org.tinytim.voc'
+}
+
+test {
+    include '**/AllTests.class'
+}
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[tinyTiM-commits] SF.net SVN: tinytim:[387] tinytim/trunk/src/test/java/org/tinytim/core

[<lh...@us...>]

Revision: 387
          http://tinytim.svn.sourceforge.net/tinytim/?rev=387&view=rev
Author:   lheuer
Date:     2010-03-23 21:23:20 +0000 (Tue, 23 Mar 2010)

Log Message:
-----------
Maybe it would have been wise to add the AbstractTinyTimTestCase :)

Added Paths:
-----------
    tinytim/trunk/src/test/java/org/tinytim/core/AbstractTinyTimTestCase.java

Removed Paths:
-------------
    tinytim/trunk/src/test/java/org/tinytim/core/TinyTimTestCase.java

Added: tinytim/trunk/src/test/java/org/tinytim/core/AbstractTinyTimTestCase.java
===================================================================
--- tinytim/trunk/src/test/java/org/tinytim/core/AbstractTinyTimTestCase.java	                        (rev 0)
+++ tinytim/trunk/src/test/java/org/tinytim/core/AbstractTinyTimTestCase.java	2010-03-23 21:23:20 UTC (rev 387)
@@ -0,0 +1,180 @@
+/*
+ * Copyright 2008 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.core;
+
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.Properties;
+
+import org.tinytim.internal.api.ITopicMap;
+import org.tmapi.core.Association;
+import org.tmapi.core.Locator;
+import org.tmapi.core.Name;
+import org.tmapi.core.Occurrence;
+import org.tmapi.core.Role;
+import org.tmapi.core.Topic;
+import org.tmapi.core.TopicMapSystem;
+import org.tmapi.core.TopicMapSystemFactory;
+import org.tmapi.core.Variant;
+
+import junit.framework.TestCase;
+
+/**
+ * Base class of all tinyTiM-specific test cases.
+ * 
+ * This class sets up a default {@link org.tinytim.TopicMapSystemFactoryImpl},
+ * a {@link org.tinytim.MemoryTopicMapSystem}, and a 
+ * {@link org.tinytim.MemoryTopicMap}.
+ * 
+ * @author Lars Heuer (heuer[at]semagia.com) <a href="http://www.semagia.com/">Semagia</a>
+ * @version $Rev: 385 $ - $Date: 2010-03-23 10:54:45 +0100 (Di, 23 Mrz 2010) $
+ */
+public abstract class AbstractTinyTimTestCase extends TestCase {
+
+    protected static final String _IRI = "http://www.semagia.com/tinyTiM/testTopicMap/";
+    protected Locator _base;
+    protected ITopicMap _tm;
+    protected TopicMapSystem _sys;
+    protected TopicMapSystemFactory _sysFactory;
+
+    public AbstractTinyTimTestCase() {
+        super();
+    }
+
+    public AbstractTinyTimTestCase(String name) {
+        super(name);
+    }
+
+    /**
+     * Returns additional / non-default properties which should be set
+     * to configure the {@link org.tmapi.core.TopicMapSystemFactory}.
+     *
+     * @return Properties instance or <code>null</code> if no properties != 
+     *          default properties should be set.
+     */
+    protected Properties getAdditionalProperties() {
+        Properties props = new Properties();
+        for (Enumeration<?> e = System.getProperties().propertyNames(); e.hasMoreElements();) {
+            String name = null;
+            try {
+                name = (String) e.nextElement();
+            }
+            catch (ClassCastException ex) {
+                continue;
+            }
+            if (name.startsWith("org.tmapi") || name.startsWith("http://tinytim")) {
+                props.setProperty(name, System.getProperty(name));
+            }
+        }
+        return props;
+    }
+
+    /**
+     * Creates a topic with a random item identifier.
+     *
+     * @return The topic.
+     */
+    protected Topic createTopic() {
+        return _tm.createTopic();
+    }
+
+    /**
+     * Creates an association with a random type and no roles.
+     *
+     * @return The association.
+     */
+    protected Association createAssociation() {
+        return _tm.createAssociation(createTopic());
+    }
+
+    /**
+     * Creates a role which is part of a random association with a random
+     * player and type.
+     *
+     * @return The role.
+     */
+    protected Role createRole() {
+        return createAssociation().createRole(createTopic(), createTopic());
+    }
+
+    /**
+     * Creates an occurrence which is part of a random topic with a random type.
+     *
+     * @return The occurrence.
+     */
+    protected Occurrence createOccurrence() {
+        return createTopic().createOccurrence(createTopic(), "Occurrence");
+    }
+
+    /**
+     * Creates a name which is part of a newly created topic using the default
+     * type name.
+     *
+     * @return The name.
+     */
+    protected Name createName() {
+        return createTopic().createName("Name");
+    }
+
+    /**
+     * Creates a variant which is part of a newly created name.
+     *
+     * @return The variant.
+     */
+    protected Variant createVariant() {
+        return createName().createVariant("Variant", createTopic());
+    }
+
+    protected Locator createLocator(final String reference) {
+        return _sys.createLocator(reference);
+    }
+
+    /* (non-Javadoc)
+     * @see junit.framework.TestCase#setUp()
+     */
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        _sysFactory = new TopicMapSystemFactoryImpl();
+        Properties properties = getAdditionalProperties();
+        if (properties != null) {
+            for (Enumeration<?> e = properties.propertyNames(); e.hasMoreElements();) {
+                String name = (String) e.nextElement();
+                _sysFactory.setProperty(name, properties.getProperty(name));
+            }
+        }
+        _sys =  _sysFactory.newTopicMapSystem();
+        _base = _sys.createLocator(_IRI);
+        _tm = (ITopicMap) _sys.createTopicMap(_base);
+    }
+
+    /* (non-Javadoc)
+     * @see junit.framework.TestCase#tearDown()
+     */
+    @Override
+    protected void tearDown() throws Exception {
+        super.tearDown();
+        for (Locator loc: new ArrayList<Locator>(_sys.getLocators())) {
+            _sys.getTopicMap(loc).remove();
+        }
+        _sys.close();
+        _sysFactory = null;
+        _sys = null;
+        _tm = null;
+        _base = null;
+    }
+
+}

Deleted: tinytim/trunk/src/test/java/org/tinytim/core/TinyTimTestCase.java
===================================================================
--- tinytim/trunk/src/test/java/org/tinytim/core/TinyTimTestCase.java	2010-03-23 21:09:34 UTC (rev 386)
+++ tinytim/trunk/src/test/java/org/tinytim/core/TinyTimTestCase.java	2010-03-23 21:23:20 UTC (rev 387)
@@ -1,183 +0,0 @@
-/*
- * Copyright 2008 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.core;
-
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.Properties;
-
-import org.tinytim.internal.api.ITopicMap;
-import org.tmapi.core.Association;
-import org.tmapi.core.Locator;
-import org.tmapi.core.Name;
-import org.tmapi.core.Occurrence;
-import org.tmapi.core.Role;
-import org.tmapi.core.Topic;
-import org.tmapi.core.TopicMapSystem;
-import org.tmapi.core.TopicMapSystemFactory;
-import org.tmapi.core.Variant;
-
-import junit.framework.TestCase;
-
-/**
- * Base class of all tinyTiM-specific test cases.
- * 
- * This class sets up a default {@link org.tinytim.TopicMapSystemFactoryImpl},
- * a {@link org.tinytim.MemoryTopicMapSystem}, and a 
- * {@link org.tinytim.MemoryTopicMap}.
- * 
- * @author Lars Heuer (heuer[at]semagia.com) <a href="http://www.semagia.com/">Semagia</a>
- * @version $Rev$ - $Date$
- */
-public class TinyTimTestCase extends TestCase {
-
-    protected static final String _IRI = "http://www.semagia.com/tinyTiM/testTopicMap/";
-    protected Locator _base;
-    protected ITopicMap _tm;
-    protected TopicMapSystem _sys;
-    protected TopicMapSystemFactory _sysFactory;
-
-    public TinyTimTestCase() {
-        super();
-    }
-
-    public TinyTimTestCase(String name) {
-        super(name);
-    }
-
-    // Avoid warning that this class does not contain tests
-    public void testNothing() {}
-
-    /**
-     * Returns additional / non-default properties which should be set
-     * to configure the {@link org.tmapi.core.TopicMapSystemFactory}.
-     *
-     * @return Properties instance or <code>null</code> if no properties != 
-     *          default properties should be set.
-     */
-    protected Properties getAdditionalProperties() {
-        Properties props = new Properties();
-        for (Enumeration<?> e = System.getProperties().propertyNames(); e.hasMoreElements();) {
-            String name = null;
-            try {
-                name = (String) e.nextElement();
-            }
-            catch (ClassCastException ex) {
-                continue;
-            }
-            if (name.startsWith("org.tmapi") || name.startsWith("http://tinytim")) {
-                props.setProperty(name, System.getProperty(name));
-            }
-        }
-        return props;
-    }
-
-    /**
-     * Creates a topic with a random item identifier.
-     *
-     * @return The topic.
-     */
-    protected Topic createTopic() {
-        return _tm.createTopic();
-    }
-
-    /**
-     * Creates an association with a random type and no roles.
-     *
-     * @return The association.
-     */
-    protected Association createAssociation() {
-        return _tm.createAssociation(createTopic());
-    }
-
-    /**
-     * Creates a role which is part of a random association with a random
-     * player and type.
-     *
-     * @return The role.
-     */
-    protected Role createRole() {
-        return createAssociation().createRole(createTopic(), createTopic());
-    }
-
-    /**
-     * Creates an occurrence which is part of a random topic with a random type.
-     *
-     * @return The occurrence.
-     */
-    protected Occurrence createOccurrence() {
-        return createTopic().createOccurrence(createTopic(), "Occurrence");
-    }
-
-    /**
-     * Creates a name which is part of a newly created topic using the default
-     * type name.
-     *
-     * @return The name.
-     */
-    protected Name createName() {
-        return createTopic().createName("Name");
-    }
-
-    /**
-     * Creates a variant which is part of a newly created name.
-     *
-     * @return The variant.
-     */
-    protected Variant createVariant() {
-        return createName().createVariant("Variant", createTopic());
-    }
-
-    protected Locator createLocator(final String reference) {
-        return _sys.createLocator(reference);
-    }
-
-    /* (non-Javadoc)
-     * @see junit.framework.TestCase#setUp()
-     */
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        _sysFactory = new TopicMapSystemFactoryImpl();
-        Properties properties = getAdditionalProperties();
-        if (properties != null) {
-            for (Enumeration<?> e = properties.propertyNames(); e.hasMoreElements();) {
-                String name = (String) e.nextElement();
-                _sysFactory.setProperty(name, properties.getProperty(name));
-            }
-        }
-        _sys =  _sysFactory.newTopicMapSystem();
-        _base = _sys.createLocator(_IRI);
-        _tm = (ITopicMap) _sys.createTopicMap(_base);
-    }
-
-    /* (non-Javadoc)
-     * @see junit.framework.TestCase#tearDown()
-     */
-    @Override
-    protected void tearDown() throws Exception {
-        super.tearDown();
-        for (Locator loc: new ArrayList<Locator>(_sys.getLocators())) {
-            _sys.getTopicMap(loc).remove();
-        }
-        _sys.close();
-        _sysFactory = null;
-        _sys = null;
-        _tm = null;
-        _base = null;
-    }
-
-}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[tinyTiM-commits] SF.net SVN: tinytim:[386] tinytim/trunk/src/test/java/org/tinytim

[<lh...@us...>]

Revision: 386
          http://tinytim.svn.sourceforge.net/tinytim/?rev=386&view=rev
Author:   lheuer
Date:     2010-03-23 21:09:34 +0000 (Tue, 23 Mar 2010)

Log Message:
-----------
Made TinyTimTestCase abstract and renamed TinyTimTestCase

Modified Paths:
--------------
    tinytim/trunk/src/test/java/org/tinytim/core/TestIConstruct.java
    tinytim/trunk/src/test/java/org/tinytim/core/TestScope.java
    tinytim/trunk/src/test/java/org/tinytim/core/TestTopicMapSystemFactoryImpl.java
    tinytim/trunk/src/test/java/org/tinytim/core/value/TestLiteral.java
    tinytim/trunk/src/test/java/org/tinytim/core/value/TestLiteralNormalizer.java
    tinytim/trunk/src/test/java/org/tinytim/core/value/TestLocatorImpl.java
    tinytim/trunk/src/test/java/org/tinytim/internal/utils/TestSignatureGenerator.java
    tinytim/trunk/src/test/java/org/tinytim/utils/TestDuplicateRemovalUtils.java
    tinytim/trunk/src/test/java/org/tinytim/utils/TestTopicUtils.java
    tinytim/trunk/src/test/java/org/tinytim/utils/TestTypeInstanceConverter.java
    tinytim/trunk/src/test/java/org/tinytim/utils/TestTypeInstanceUtils.java
    tinytim/trunk/src/test/java/org/tinytim/utils/TestXTM10Utils.java

Modified: tinytim/trunk/src/test/java/org/tinytim/core/TestIConstruct.java
===================================================================
--- tinytim/trunk/src/test/java/org/tinytim/core/TestIConstruct.java	2010-03-23 09:54:45 UTC (rev 385)
+++ tinytim/trunk/src/test/java/org/tinytim/core/TestIConstruct.java	2010-03-23 21:09:34 UTC (rev 386)
@@ -31,7 +31,7 @@
  * @author Lars Heuer (heuer[at]semagia.com) <a href="http://www.semagia.com/">Semagia</a>
  * @version $Rev$ - $Date$
  */
-public class TestIConstruct extends TinyTimTestCase {
+public class TestIConstruct extends AbstractTinyTimTestCase {
 
 
     private void _testConstruct(Construct construct) {

Modified: tinytim/trunk/src/test/java/org/tinytim/core/TestScope.java
===================================================================
--- tinytim/trunk/src/test/java/org/tinytim/core/TestScope.java	2010-03-23 09:54:45 UTC (rev 385)
+++ tinytim/trunk/src/test/java/org/tinytim/core/TestScope.java	2010-03-23 21:09:34 UTC (rev 386)
@@ -27,7 +27,7 @@
  * @author Lars Heuer (heuer[at]semagia.com) <a href="http://www.semagia.com/">Semagia</a>
  * @version $Rev$ - $Date$
  */
-public class TestScope extends TinyTimTestCase {
+public class TestScope extends AbstractTinyTimTestCase {
 
     public void testUnconstrained() {
         assertTrue(Scope.UCS.isUnconstrained());

Modified: tinytim/trunk/src/test/java/org/tinytim/core/TestTopicMapSystemFactoryImpl.java
===================================================================
--- tinytim/trunk/src/test/java/org/tinytim/core/TestTopicMapSystemFactoryImpl.java	2010-03-23 09:54:45 UTC (rev 385)
+++ tinytim/trunk/src/test/java/org/tinytim/core/TestTopicMapSystemFactoryImpl.java	2010-03-23 21:09:34 UTC (rev 386)
@@ -25,7 +25,7 @@
  * @author Lars Heuer (heuer[at]semagia.com) <a href="http://www.semagia.com/">Semagia</a>
  * @version $Rev$ - $Date$
  */
-public class TestTopicMapSystemFactoryImpl extends TinyTimTestCase {
+public class TestTopicMapSystemFactoryImpl extends AbstractTinyTimTestCase {
 
     /**
      * Tests the default feature values.

Modified: tinytim/trunk/src/test/java/org/tinytim/core/value/TestLiteral.java
===================================================================
--- tinytim/trunk/src/test/java/org/tinytim/core/value/TestLiteral.java	2010-03-23 09:54:45 UTC (rev 385)
+++ tinytim/trunk/src/test/java/org/tinytim/core/value/TestLiteral.java	2010-03-23 21:09:34 UTC (rev 386)
@@ -15,7 +15,7 @@
  */
 package org.tinytim.core.value;
 
-import org.tinytim.core.TinyTimTestCase;
+import org.tinytim.core.AbstractTinyTimTestCase;
 import org.tinytim.internal.api.ILiteral;
 import org.tinytim.voc.XSD;
 import org.tmapi.core.Locator;
@@ -26,7 +26,7 @@
  * @author Lars Heuer (heuer[at]semagia.com) <a href="http://www.semagia.com/">Semagia</a>
  * @version $Rev$ - $Date$
  */
-public class TestLiteral extends TinyTimTestCase {
+public class TestLiteral extends AbstractTinyTimTestCase {
 
     public void testLocatorResolve() {
         Locator base = Literal.createIRI("http://www.semagia.com/");

Modified: tinytim/trunk/src/test/java/org/tinytim/core/value/TestLiteralNormalizer.java
===================================================================
--- tinytim/trunk/src/test/java/org/tinytim/core/value/TestLiteralNormalizer.java	2010-03-23 09:54:45 UTC (rev 385)
+++ tinytim/trunk/src/test/java/org/tinytim/core/value/TestLiteralNormalizer.java	2010-03-23 21:09:34 UTC (rev 386)
@@ -15,7 +15,7 @@
  */
 package org.tinytim.core.value;
 
-import org.tinytim.core.TinyTimTestCase;
+import org.tinytim.core.AbstractTinyTimTestCase;
 
 /**
  * Tests against the {@link LiteralNormalizer}.
@@ -23,7 +23,7 @@
  * @author Lars Heuer (heuer[at]semagia.com) <a href="http://www.semagia.com/">Semagia</a>
  * @version $Rev$ - $Date$
  */
-public class TestLiteralNormalizer extends TinyTimTestCase {
+public class TestLiteralNormalizer extends AbstractTinyTimTestCase {
 
     public void testNormalizeBoolean() {
         assertEquals("true", LiteralNormalizer.normalizeBoolean("1"));

Modified: tinytim/trunk/src/test/java/org/tinytim/core/value/TestLocatorImpl.java
===================================================================
--- tinytim/trunk/src/test/java/org/tinytim/core/value/TestLocatorImpl.java	2010-03-23 09:54:45 UTC (rev 385)
+++ tinytim/trunk/src/test/java/org/tinytim/core/value/TestLocatorImpl.java	2010-03-23 21:09:34 UTC (rev 386)
@@ -15,7 +15,7 @@
  */
 package org.tinytim.core.value;
 
-import org.tinytim.core.TinyTimTestCase;
+import org.tinytim.core.AbstractTinyTimTestCase;
 import org.tmapi.core.Locator;
 
 /**
@@ -24,7 +24,7 @@
  * @author Lars Heuer (heuer[at]semagia.com) <a href="http://www.semagia.com/">Semagia</a>
  * @version $Rev$ - $Date$
  */
-public class TestLocatorImpl extends TinyTimTestCase {
+public class TestLocatorImpl extends AbstractTinyTimTestCase {
 
     public void testNormalization() {
         Locator loc = _tm.createLocator("http://www.example.org/test+me/");

Modified: tinytim/trunk/src/test/java/org/tinytim/internal/utils/TestSignatureGenerator.java
===================================================================
--- tinytim/trunk/src/test/java/org/tinytim/internal/utils/TestSignatureGenerator.java	2010-03-23 09:54:45 UTC (rev 385)
+++ tinytim/trunk/src/test/java/org/tinytim/internal/utils/TestSignatureGenerator.java	2010-03-23 21:09:34 UTC (rev 386)
@@ -15,7 +15,7 @@
  */
 package org.tinytim.internal.utils;
 
-import org.tinytim.core.TinyTimTestCase;
+import org.tinytim.core.AbstractTinyTimTestCase;
 
 import org.tmapi.core.Association;
 import org.tmapi.core.Name;
@@ -30,7 +30,7 @@
  * @author Lars Heuer (heuer[at]semagia.com) <a href="http://www.semagia.com/">Semagia</a>
  * @version $Rev$ - $Date$
  */
-public class TestSignatureGenerator extends TinyTimTestCase {
+public class TestSignatureGenerator extends AbstractTinyTimTestCase {
 
     /**
      * Tests if an association with no initialized properties returns the same 

Modified: tinytim/trunk/src/test/java/org/tinytim/utils/TestDuplicateRemovalUtils.java
===================================================================
--- tinytim/trunk/src/test/java/org/tinytim/utils/TestDuplicateRemovalUtils.java	2010-03-23 09:54:45 UTC (rev 385)
+++ tinytim/trunk/src/test/java/org/tinytim/utils/TestDuplicateRemovalUtils.java	2010-03-23 21:09:34 UTC (rev 386)
@@ -15,7 +15,7 @@
  */
 package org.tinytim.utils;
 
-import org.tinytim.core.TinyTimTestCase;
+import org.tinytim.core.AbstractTinyTimTestCase;
 import org.tmapi.core.Association;
 import org.tmapi.core.Locator;
 import org.tmapi.core.Name;
@@ -27,7 +27,7 @@
  * @author Lars Heuer (heuer[at]semagia.com) <a href="http://www.semagia.com/">Semagia</a>
  * @version $Rev$ - $Date$
  */
-public class TestDuplicateRemovalUtils extends TinyTimTestCase {
+public class TestDuplicateRemovalUtils extends AbstractTinyTimTestCase {
 
     public void testTopicRemoveNames() {
         Topic topic = createTopic();

Modified: tinytim/trunk/src/test/java/org/tinytim/utils/TestTopicUtils.java
===================================================================
--- tinytim/trunk/src/test/java/org/tinytim/utils/TestTopicUtils.java	2010-03-23 09:54:45 UTC (rev 385)
+++ tinytim/trunk/src/test/java/org/tinytim/utils/TestTopicUtils.java	2010-03-23 21:09:34 UTC (rev 386)
@@ -15,7 +15,7 @@
  */
 package org.tinytim.utils;
 
-import org.tinytim.core.TinyTimTestCase;
+import org.tinytim.core.AbstractTinyTimTestCase;
 import org.tmapi.core.Association;
 import org.tmapi.core.Role;
 import org.tmapi.core.Topic;
@@ -26,7 +26,7 @@
  * @author Lars Heuer (heuer[at]semagia.com) <a href="http://www.semagia.com/">Semagia</a>
  * @version $Rev$ - $Date$
  */
-public class TestTopicUtils extends TinyTimTestCase {
+public class TestTopicUtils extends AbstractTinyTimTestCase {
 
     /**
      * Tests if a topic is considered as 'removable'.

Modified: tinytim/trunk/src/test/java/org/tinytim/utils/TestTypeInstanceConverter.java
===================================================================
--- tinytim/trunk/src/test/java/org/tinytim/utils/TestTypeInstanceConverter.java	2010-03-23 09:54:45 UTC (rev 385)
+++ tinytim/trunk/src/test/java/org/tinytim/utils/TestTypeInstanceConverter.java	2010-03-23 21:09:34 UTC (rev 386)
@@ -15,7 +15,7 @@
  */
 package org.tinytim.utils;
 
-import org.tinytim.core.TinyTimTestCase;
+import org.tinytim.core.AbstractTinyTimTestCase;
 import org.tinytim.voc.TMDM;
 import org.tinytim.voc.XTM10;
 import org.tmapi.core.Association;
@@ -28,7 +28,7 @@
  * @author Lars Heuer (heuer[at]semagia.com) <a href="http://www.semagia.com/">Semagia</a>
  * @version $Rev$ - $Date$
  */
-public class TestTypeInstanceConverter extends TinyTimTestCase {
+public class TestTypeInstanceConverter extends AbstractTinyTimTestCase {
 
 
     public void testTMDMTypeInstanceAssociation() {

Modified: tinytim/trunk/src/test/java/org/tinytim/utils/TestTypeInstanceUtils.java
===================================================================
--- tinytim/trunk/src/test/java/org/tinytim/utils/TestTypeInstanceUtils.java	2010-03-23 09:54:45 UTC (rev 385)
+++ tinytim/trunk/src/test/java/org/tinytim/utils/TestTypeInstanceUtils.java	2010-03-23 21:09:34 UTC (rev 386)
@@ -17,7 +17,7 @@
 
 import java.util.Collection;
 
-import org.tinytim.core.TinyTimTestCase;
+import org.tinytim.core.AbstractTinyTimTestCase;
 import org.tinytim.voc.TMDM;
 
 import org.tmapi.core.Association;
@@ -28,9 +28,9 @@
  * Tests against the {@link TypeInstanceUtils}.
  * 
  * @author Lars Heuer (heuer[at]semagia.com) <a href="http://www.semagia.com/">Semagia</a>
- * @version $Rev:$ - $Date:$
+ * @version $Rev$ - $Date$
  */
-public class TestTypeInstanceUtils extends TinyTimTestCase {
+public class TestTypeInstanceUtils extends AbstractTinyTimTestCase {
 
     private void _testTypedInstanceOf(final Typed typed) {
         assertNotNull(typed.getType());

Modified: tinytim/trunk/src/test/java/org/tinytim/utils/TestXTM10Utils.java
===================================================================
--- tinytim/trunk/src/test/java/org/tinytim/utils/TestXTM10Utils.java	2010-03-23 09:54:45 UTC (rev 385)
+++ tinytim/trunk/src/test/java/org/tinytim/utils/TestXTM10Utils.java	2010-03-23 21:09:34 UTC (rev 386)
@@ -15,7 +15,7 @@
  */
 package org.tinytim.utils;
 
-import org.tinytim.core.TinyTimTestCase;
+import org.tinytim.core.AbstractTinyTimTestCase;
 import org.tmapi.core.Locator;
 import org.tmapi.core.Name;
 import org.tmapi.core.Reifiable;
@@ -25,9 +25,9 @@
  * Tests against the {@link XTM10Utils}.
  * 
  * @author Lars Heuer (heuer[at]semagia.com) <a href="http://www.semagia.com/">Semagia</a>
- * @version $Rev:$ - $Date:$
+ * @version $Rev$ - $Date$
  */
-public class TestXTM10Utils extends TinyTimTestCase {
+public class TestXTM10Utils extends AbstractTinyTimTestCase {
 
     private void _testConvertReification(Reifiable reifiable) {
         final Locator loc = _tm.createLocator("http://www.semagia.com/test");


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[tinyTiM-commits] SF.net SVN: tinytim:[385] tinytim/trunk/src/test/java/org/tinytim/core/ TinyTimTestCase.java

[<lh...@us...>]

Revision: 385
          http://tinytim.svn.sourceforge.net/tinytim/?rev=385&view=rev
Author:   lheuer
Date:     2010-03-23 09:54:45 +0000 (Tue, 23 Mar 2010)

Log Message:
-----------
Added dummy test method to avoid warnings

Modified Paths:
--------------
    tinytim/trunk/src/test/java/org/tinytim/core/TinyTimTestCase.java

Modified: tinytim/trunk/src/test/java/org/tinytim/core/TinyTimTestCase.java
===================================================================
--- tinytim/trunk/src/test/java/org/tinytim/core/TinyTimTestCase.java	2010-03-22 14:55:40 UTC (rev 384)
+++ tinytim/trunk/src/test/java/org/tinytim/core/TinyTimTestCase.java	2010-03-23 09:54:45 UTC (rev 385)
@@ -58,6 +58,9 @@
         super(name);
     }
 
+    // Avoid warning that this class does not contain tests
+    public void testNothing() {}
+
     /**
      * Returns additional / non-default properties which should be set
      * to configure the {@link org.tmapi.core.TopicMapSystemFactory}.


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[tinyTiM-commits] SF.net SVN: tinytim:[384] tinytim/trunk/build.xml

[<bo...@us...>]

Revision: 384
          http://tinytim.svn.sourceforge.net/tinytim/?rev=384&view=rev
Author:   bosso
Date:     2010-03-22 14:55:40 +0000 (Mon, 22 Mar 2010)

Log Message:
-----------
added voc export to Manifest.MF

Modified Paths:
--------------
    tinytim/trunk/build.xml

Modified: tinytim/trunk/build.xml
===================================================================
--- tinytim/trunk/build.xml	2010-03-19 14:47:47 UTC (rev 383)
+++ tinytim/trunk/build.xml	2010-03-22 14:55:40 UTC (rev 384)
@@ -209,7 +209,7 @@
                 <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"/>
+                <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"/>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[tinyTiM-commits] SF.net SVN: tinytim:[383] tinytim

[<lh...@us...>]

Revision: 383
          http://tinytim.svn.sourceforge.net/tinytim/?rev=383&view=rev
Author:   lheuer
Date:     2010-03-19 14:47:47 +0000 (Fri, 19 Mar 2010)

Log Message:
-----------
Updated properties, forgot to update CHANGES %)

Modified Paths:
--------------
    tinytim/tags/release-2.0.0/CHANGES.txt
    tinytim/tags/release-2.0.0/build.properties
    tinytim/trunk/CHANGES.txt
    tinytim/trunk/build.properties

Modified: tinytim/tags/release-2.0.0/CHANGES.txt
===================================================================
--- tinytim/tags/release-2.0.0/CHANGES.txt	2010-03-19 14:38:57 UTC (rev 382)
+++ tinytim/tags/release-2.0.0/CHANGES.txt	2010-03-19 14:47:47 UTC (rev 383)
@@ -2,9 +2,9 @@
 Changes Log
 ===========
 
-2.0.0 (2010-03-dd)
+2.0.0 (2010-03-19)
 ------------------
-* Updated TMAPI to 2.0.1 and is compatible to TMAPI 2.0.2
+* Updated TMAPI to 2.0.2 (kept compatibility to 2.0 and 2.0.1)
 * 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/tags/release-2.0.0/build.properties
===================================================================
--- tinytim/tags/release-2.0.0/build.properties	2010-03-19 14:38:57 UTC (rev 382)
+++ tinytim/tags/release-2.0.0/build.properties	2010-03-19 14:47:47 UTC (rev 383)
@@ -1,4 +1,4 @@
 version=2.0.0
-version_suffix=-SNAPSHOT
+version_suffix=
 debug=off
 optimize=on

Modified: tinytim/trunk/CHANGES.txt
===================================================================
--- tinytim/trunk/CHANGES.txt	2010-03-19 14:38:57 UTC (rev 382)
+++ tinytim/trunk/CHANGES.txt	2010-03-19 14:47:47 UTC (rev 383)
@@ -2,9 +2,9 @@
 Changes Log
 ===========
 
-2.0.0 (2010-03-dd)
+2.0.0 (2010-03-19)
 ------------------
-* Updated TMAPI to 2.0.1 and is compatible to TMAPI 2.0.2
+* Updated TMAPI to 2.0.2 (kept compatibility to 2.0 and 2.0.1)
 * 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.properties
===================================================================
--- tinytim/trunk/build.properties	2010-03-19 14:38:57 UTC (rev 382)
+++ tinytim/trunk/build.properties	2010-03-19 14:47:47 UTC (rev 383)
@@ -1,4 +1,4 @@
-version=2.0.0
+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.

[tinyTiM-commits] SF.net SVN: tinytim:[382] tinytim/tags/release-2.0.0/

[<lh...@us...>]

Revision: 382
          http://tinytim.svn.sourceforge.net/tinytim/?rev=382&view=rev
Author:   lheuer
Date:     2010-03-19 14:38:57 +0000 (Fri, 19 Mar 2010)

Log Message:
-----------
Tagged release

Added Paths:
-----------
    tinytim/tags/release-2.0.0/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[tinyTiM-commits] SF.net SVN: tinytim:[381] tinytim/trunk

[<lh...@us...>]

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.

[tinyTiM-commits] SF.net SVN: tinytim:[380] tinytim/trunk

[<lh...@us...>]

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.

[tinyTiM-commits] SF.net SVN: tinytim:[379] tinytim/trunk/src/main/java/org/tinytim/core/ MemoryTopicMap.java

[<lh...@us...>]

Revision: 379
          http://tinytim.svn.sourceforge.net/tinytim/?rev=379&view=rev
Author:   lheuer
Date:     2010-03-10 10:26:36 +0000 (Wed, 10 Mar 2010)

Log Message:
-----------
Made TM.getLocator() public (forward compatible)

Modified Paths:
--------------
    tinytim/trunk/src/main/java/org/tinytim/core/MemoryTopicMap.java

Modified: tinytim/trunk/src/main/java/org/tinytim/core/MemoryTopicMap.java
===================================================================
--- tinytim/trunk/src/main/java/org/tinytim/core/MemoryTopicMap.java	2010-03-09 23:37:30 UTC (rev 378)
+++ tinytim/trunk/src/main/java/org/tinytim/core/MemoryTopicMap.java	2010-03-10 10:26:36 UTC (rev 379)
@@ -80,7 +80,11 @@
         _eventMultiplier = new EventMultiplier(this);
     }
 
-    Locator getLocator() {
+    /**
+     * Returns the storage address of this topic map.
+     */
+    //TODO: @Override
+    public Locator getLocator() {
         return _locator;
     }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[tinyTiM-commits] SF.net SVN: tinytim:[378] tinytim/trunk

[<lh...@us...>]

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.

[tinyTiM-commits] SF.net SVN: tinytim:[377] tinytim/trunk

[<lh...@us...>]

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.

[tinyTiM-commits] SF.net SVN: tinytim:[376] tinytim/trunk/build.xml

[<lh...@us...>]

Revision: 376
          http://tinytim.svn.sourceforge.net/tinytim/?rev=376&view=rev
Author:   lheuer
Date:     2010-03-01 23:06:55 +0000 (Mon, 01 Mar 2010)

Log Message:
-----------
Export (OSGi) at least .mio

Modified Paths:
--------------
    tinytim/trunk/build.xml

Modified: tinytim/trunk/build.xml
===================================================================
--- tinytim/trunk/build.xml	2010-03-01 22:55:01 UTC (rev 375)
+++ tinytim/trunk/build.xml	2010-03-01 23:06:55 UTC (rev 376)
@@ -209,6 +209,7 @@
                 <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"/>
                 <attribute name="Bundle-Name" value="tinyTiM"/>
                 <attribute name="Bundle-SymbolicName" value="org.tinytim;version=${dist.version}"/>
                 <attribute name="Bundle-Vendor" value="tinyTiM project"/>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[tinyTiM-commits] SF.net SVN: tinytim:[375] tinytim/trunk

[<lh...@us...>]

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.

[tinyTiM-commits] SF.net SVN: tinytim:[374] tinytim/trunk

[<lh...@us...>]

Revision: 374
          http://tinytim.svn.sourceforge.net/tinytim/?rev=374&view=rev
Author:   lheuer
Date:     2010-03-01 22:41:11 +0000 (Mon, 01 Mar 2010)

Log Message:
-----------
- Updated TMAPI 
- First attempt to create Maven-friendly tinyTiM builds

Modified Paths:
--------------
    tinytim/trunk/build.xml

Added Paths:
-----------
    tinytim/trunk/lib/tmapi-2.0.1.snapshot.jar
    tinytim/trunk/lib/tmapi-tests-2.0.1.snapshot.jar

Removed Paths:
-------------
    tinytim/trunk/lib/tmapi-2.0-tests.jar
    tinytim/trunk/lib/tmapi-2.0.jar

Modified: tinytim/trunk/build.xml
===================================================================
--- tinytim/trunk/build.xml	2010-03-01 19:39:00 UTC (rev 373)
+++ tinytim/trunk/build.xml	2010-03-01 22:41:11 UTC (rev 374)
@@ -12,8 +12,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.jar"/>
-    <property name="lib.tmapi.tests" value="${dir.lib}/tmapi-2.0-tests.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.emma" value="${dir.lib}/emma.jar"/>
     <property name="lib.emma.task" value="${dir.lib}/emma_ant.jar"/>
 
@@ -48,10 +48,12 @@
         <property name="dist.name" value="tinytim-${dist.version}"/>
 
         <property name="tinytim.jar" value="${dist.name}.jar"/>
-        <property name="tinytim-test.jar" value="${dist.name}-tests.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"/>
@@ -215,6 +217,12 @@
                 <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>
 
     <!-- =================================================================== -->
@@ -231,8 +239,25 @@
                 <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                                             -->
     <!-- =================================================================== -->

Deleted: tinytim/trunk/lib/tmapi-2.0-tests.jar
===================================================================
(Binary files differ)

Added: tinytim/trunk/lib/tmapi-2.0.1.snapshot.jar
===================================================================
(Binary files differ)


Property changes on: tinytim/trunk/lib/tmapi-2.0.1.snapshot.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Deleted: tinytim/trunk/lib/tmapi-2.0.jar
===================================================================
(Binary files differ)

Added: tinytim/trunk/lib/tmapi-tests-2.0.1.snapshot.jar
===================================================================
(Binary files differ)


Property changes on: tinytim/trunk/lib/tmapi-tests-2.0.1.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.

[tinyTiM-commits] SF.net SVN: tinytim:[373] tinytim/trunk/src/main/java/org/tinytim/internal/ utils

[<lh...@us...>]

Revision: 373
          http://tinytim.svn.sourceforge.net/tinytim/?rev=373&view=rev
Author:   lheuer
Date:     2010-03-01 19:39:00 +0000 (Mon, 01 Mar 2010)

Log Message:
-----------
Suppress unchecked warnings.... Would be nicer if I'd convert the classes to Java's generics, though

Modified Paths:
--------------
    tinytim/trunk/src/main/java/org/tinytim/internal/utils/CompactHashSet.java
    tinytim/trunk/src/main/java/org/tinytim/internal/utils/CompactIdentityHashSet.java

Modified: tinytim/trunk/src/main/java/org/tinytim/internal/utils/CompactHashSet.java
===================================================================
--- tinytim/trunk/src/main/java/org/tinytim/internal/utils/CompactHashSet.java	2010-03-01 14:33:04 UTC (rev 372)
+++ tinytim/trunk/src/main/java/org/tinytim/internal/utils/CompactHashSet.java	2010-03-01 19:39:00 UTC (rev 373)
@@ -16,6 +16,7 @@
  * INTERNAL: Implements the Set interface more compactly than
  * java.util.HashSet by using a closed hashtable. 
  */
+@SuppressWarnings("unchecked")
 class CompactHashSet<E> extends java.util.AbstractSet<E> {
   
   protected final static int INITIAL_SIZE = 3;

Modified: tinytim/trunk/src/main/java/org/tinytim/internal/utils/CompactIdentityHashSet.java
===================================================================
--- tinytim/trunk/src/main/java/org/tinytim/internal/utils/CompactIdentityHashSet.java	2010-03-01 14:33:04 UTC (rev 372)
+++ tinytim/trunk/src/main/java/org/tinytim/internal/utils/CompactIdentityHashSet.java	2010-03-01 19:39:00 UTC (rev 373)
@@ -15,6 +15,7 @@
  * INTERNAL: This class is a specialization of the CompactHashSet
  * class, and uses the == operator to compare objects.
  */
+@SuppressWarnings("unchecked")
 class CompactIdentityHashSet<E> extends CompactHashSet<E> {
 
   public CompactIdentityHashSet() {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[tinyTiM-commits] SF.net SVN: tinytim:[372] tinytim/trunk

[<lh...@us...>]

Revision: 372
          http://tinytim.svn.sourceforge.net/tinytim/?rev=372&view=rev
Author:   lheuer
Date:     2010-03-01 14:33:04 +0000 (Mon, 01 Mar 2010)

Log Message:
-----------
Fixed LocatorImpl.equals() reported by Uta Schulze

Modified Paths:
--------------
    tinytim/trunk/CHANGES.txt
    tinytim/trunk/src/main/java/org/tinytim/core/value/LocatorImpl.java

Modified: tinytim/trunk/CHANGES.txt
===================================================================
--- tinytim/trunk/CHANGES.txt	2010-02-28 10:07:46 UTC (rev 371)
+++ tinytim/trunk/CHANGES.txt	2010-03-01 14:33:04 UTC (rev 372)
@@ -2,8 +2,10 @@
 Changes Log
 ===========
 
-2.0.0 a6 (2010-02-xx)
+2.0.0 a6 (2010-03-xx)
 ---------------------
+* Fixed LocatorImpl (the impl. of "equals" was different 
+  from the TMAPI 2.0 specs) reported by Uta Schulze
 * Added OSGi headers to the MANIFEST
 * Added support to convert XTM 1.0 class-instance relationships
   to TMDM type-instance relationships

Modified: tinytim/trunk/src/main/java/org/tinytim/core/value/LocatorImpl.java
===================================================================
--- tinytim/trunk/src/main/java/org/tinytim/core/value/LocatorImpl.java	2010-02-28 10:07:46 UTC (rev 371)
+++ tinytim/trunk/src/main/java/org/tinytim/core/value/LocatorImpl.java	2010-03-01 14:33:04 UTC (rev 372)
@@ -151,7 +151,7 @@
      */
     @Override
     public boolean equals(Object obj) {
-        return this == obj || (obj instanceof LocatorImpl && _reference.equals(((LocatorImpl) obj)._reference));
+        return this == obj || (obj instanceof Locator && _reference.equals(((Locator) obj).getReference()));
     }
 
     /* (non-Javadoc)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[tinyTiM-commits] SF.net SVN: tinytim:[371] tinytim/trunk/build.xml

[<lh...@us...>]

Revision: 371
          http://tinytim.svn.sourceforge.net/tinytim/?rev=371&view=rev
Author:   lheuer
Date:     2010-02-28 10:07:46 +0000 (Sun, 28 Feb 2010)

Log Message:
-----------
Fixed typo

Modified Paths:
--------------
    tinytim/trunk/build.xml

Modified: tinytim/trunk/build.xml
===================================================================
--- tinytim/trunk/build.xml	2010-02-28 09:48:14 UTC (rev 370)
+++ tinytim/trunk/build.xml	2010-02-28 10:07:46 UTC (rev 371)
@@ -95,7 +95,7 @@
             debug="${debug}"
             optimize="${optimize}"
             target="1.5"
-            includeruntime="false">
+            includeantruntime="false">
             <classpath>
                 <pathelement location="${dir.build.classes}"/>
                 <pathelement location="${lib.junit}"/>
@@ -126,7 +126,7 @@
             debug="${debug}"
             optimize="${optimize}"
             target="1.5"
-            includeruntime="false">
+            includeantruntime="false">
             <classpath>
                 <pathelement location="${dir.build.classes}"/>
                 <pathelement location="${lib.junit}"/>
@@ -154,7 +154,7 @@
         <javac destdir="${dir.build.classes}"
             debug="${debug}"
             target="1.5"
-            includeruntime="false">
+            includeantruntime="false">
             <classpath>
                 <pathelement location="${lib.tmapi}"/>
                 <pathelement location="${lib.mio}"/>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[tinyTiM-commits] SF.net SVN: tinytim:[370] tinytim/trunk/build.xml

[<lh...@us...>]

Revision: 370
          http://tinytim.svn.sourceforge.net/tinytim/?rev=370&view=rev
Author:   lheuer
Date:     2010-02-28 09:48:14 +0000 (Sun, 28 Feb 2010)

Log Message:
-----------
Updates for Ant 1.8

Modified Paths:
--------------
    tinytim/trunk/build.xml

Modified: tinytim/trunk/build.xml
===================================================================
--- tinytim/trunk/build.xml	2010-02-27 14:31:03 UTC (rev 369)
+++ tinytim/trunk/build.xml	2010-02-28 09:48:14 UTC (rev 370)
@@ -94,7 +94,8 @@
         <javac destdir="${dir.build.tests}" 
             debug="${debug}"
             optimize="${optimize}"
-            target="1.5">
+            target="1.5"
+            includeruntime="false">
             <classpath>
                 <pathelement location="${dir.build.classes}"/>
                 <pathelement location="${lib.junit}"/>
@@ -124,7 +125,8 @@
         <javac destdir="${dir.build.tests}" 
             debug="${debug}"
             optimize="${optimize}"
-            target="1.5">
+            target="1.5"
+            includeruntime="false">
             <classpath>
                 <pathelement location="${dir.build.classes}"/>
                 <pathelement location="${lib.junit}"/>
@@ -151,7 +153,8 @@
         <replace file="${dir.src}/org/tinytim/Version.java" token="@RELEASE@" value="${dist.version}"/>
         <javac destdir="${dir.build.classes}"
             debug="${debug}"
-            target="1.5">
+            target="1.5"
+            includeruntime="false">
             <classpath>
                 <pathelement location="${lib.tmapi}"/>
                 <pathelement location="${lib.mio}"/>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[tinyTiM-commits] SF.net SVN: tinytim:[369] tinytim/trunk/build.xml

[<lh...@us...>]

Revision: 369
          http://tinytim.svn.sourceforge.net/tinytim/?rev=369&view=rev
Author:   lheuer
Date:     2010-02-27 14:31:03 +0000 (Sat, 27 Feb 2010)

Log Message:
-----------
Unix line endings

Modified Paths:
--------------
    tinytim/trunk/build.xml

Modified: tinytim/trunk/build.xml
===================================================================
--- tinytim/trunk/build.xml	2010-02-27 14:22:08 UTC (rev 368)
+++ tinytim/trunk/build.xml	2010-02-27 14:31:03 UTC (rev 369)
@@ -1,276 +1,276 @@
-<?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"/>
-    <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.jar"/>
-    <property name="lib.tmapi.tests" value="${dir.lib}/tmapi-2.0-tests.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}${release_type}"/>
-        <property name="dist.name" value="tinytim-${dist.version}"/>
-
-        <property name="tinytim.jar" value="${dist.name}.jar"/>
-        <property name="tinytim-test.jar" value="${dist.name}-tests.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="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">
-            <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">
-            <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">
-            <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"
-            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>
--->
-            <link href="http://www.tmapi.org/2.0/api/"/>
-        </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="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>
-    </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>
-    </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>
+<?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"/>
+    <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.jar"/>
+    <property name="lib.tmapi.tests" value="${dir.lib}/tmapi-2.0-tests.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}${release_type}"/>
+        <property name="dist.name" value="tinytim-${dist.version}"/>
+
+        <property name="tinytim.jar" value="${dist.name}.jar"/>
+        <property name="tinytim-test.jar" value="${dist.name}-tests.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="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">
+            <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">
+            <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">
+            <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"
+            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>
+-->
+            <link href="http://www.tmapi.org/2.0/api/"/>
+        </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="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>
+    </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>
+    </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.

[tinyTiM-commits] SF.net SVN: tinytim:[368] tinytim/trunk

[<lh...@us...>]

Revision: 368
          http://tinytim.svn.sourceforge.net/tinytim/?rev=368&view=rev
Author:   lheuer
Date:     2010-02-27 14:22:08 +0000 (Sat, 27 Feb 2010)

Log Message:
-----------
- Updated OSGi headers
- Updated JUnit 

Modified Paths:
--------------
    tinytim/trunk/CHANGES.txt
    tinytim/trunk/build.xml

Added Paths:
-----------
    tinytim/trunk/lib/junit-4.8.1.jar

Removed Paths:
-------------
    tinytim/trunk/lib/junit-4.5.jar

Modified: tinytim/trunk/CHANGES.txt
===================================================================
--- tinytim/trunk/CHANGES.txt	2010-02-25 12:15:58 UTC (rev 367)
+++ tinytim/trunk/CHANGES.txt	2010-02-27 14:22:08 UTC (rev 368)
@@ -2,8 +2,9 @@
 Changes Log
 ===========
 
-2.0.0 a6 (2010-01-xx)
+2.0.0 a6 (2010-02-xx)
 ---------------------
+* Added OSGi headers to the MANIFEST
 * 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

Modified: tinytim/trunk/build.xml
===================================================================
--- tinytim/trunk/build.xml	2010-02-25 12:15:58 UTC (rev 367)
+++ tinytim/trunk/build.xml	2010-02-27 14:22:08 UTC (rev 368)
@@ -1,284 +1,276 @@
-<?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"/>
-    <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.5.jar"/>
-    <property name="lib.trove" value="${dir.lib}/trove-2.1.0.jar"/>
-    <property name="lib.mio" value="${dir.lib}/semagia-mio-0.9.5.jar"/>
-    <property name="lib.tmapi" value="${dir.lib}/tmapi-2.0.jar"/>
-    <property name="lib.tmapi.tests" value="${dir.lib}/tmapi-2.0b1-tests.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}${release_type}"/>
-        <property name="dist.name" value="tinytim-${dist.version}"/>
-
-        <property name="tinytim.jar" value="${dist.name}.jar"/>
-        <property name="tinytim-test.jar" value="${dist.name}-tests.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="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}"/>
-            <pathelement location="${lib.trove}"/>
-        </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">
-            <classpath>
-                <pathelement location="${dir.build.classes}"/>
-                <pathelement location="${lib.junit}"/>
-                <pathelement location="${lib.mio}"/>
-                <pathelement location="${lib.tmapi}"/>
-                <pathelement location="${lib.tmapi.tests}"/>
-                <pathelement location="${lib.trove}"/>
-            </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">
-            <classpath>
-                <pathelement location="${dir.build.classes}"/>
-                <pathelement location="${lib.junit}"/>
-                <pathelement location="${lib.mio}"/>
-                <pathelement location="${lib.tmapi}"/>
-                <pathelement location="${lib.tmapi.tests}"/>
-                <pathelement location="${lib.trove}"/>
-            </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">
-            <classpath>
-                <pathelement location="${lib.tmapi}"/>
-                <pathelement location="${lib.trove}"/>
-                <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"
-            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>
--->
-            <link href="http://www.tmapi.org/2.0/api/"/>
-        </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.osgi.framework,org.tmapi.core,org.tmapi.index,com.semagia.mio"/>
-                <attribute name="Export-Package" value="org.tinytim.core"/>
-                <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>
-    </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>
-    </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="trove*"/>
-                <include name="LICENSE.tmapi*"/>
-                <include name="LICENSE.junit*"/>
-                <include name="LICENSE.trove*"/>
-            </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>
+<?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"/>
+    <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.jar"/>
+    <property name="lib.tmapi.tests" value="${dir.lib}/tmapi-2.0-tests.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}${release_type}"/>
+        <property name="dist.name" value="tinytim-${dist.version}"/>
+
+        <property name="tinytim.jar" value="${dist.name}.jar"/>
+        <property name="tinytim-test.jar" value="${dist.name}-tests.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="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">
+            <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">
+            <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">
+            <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"
+            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>
+-->
+            <link href="http://www.tmapi.org/2.0/api/"/>
+        </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="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>
+    </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>
+    </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>

Deleted: tinytim/trunk/lib/junit-4.5.jar
===================================================================
(Binary files differ)

Added: tinytim/trunk/lib/junit-4.8.1.jar
===================================================================
(Binary files differ)


Property changes on: tinytim/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.