tinytim-commits Mailing List for tinyTiM - The tiny Topic Maps engine (Page 7)

Brought to you by: lheuer, lischke2

tinytim-commits — tinyTiM commit messages

You can subscribe to this list here.

2008	_Jan	_Feb	_Mar	_Apr (48)	_May (21)	_Jun (3)	_Jul (10)	_Aug (66)	_Sep (11)	_Oct (7)	_Nov (73)	_Dec (12)
2009	_Jan (3)	_Feb (17)	_Mar (19)	_Apr (1)	_May (4)	_Jun	_Jul (43)	_Aug (18)	_Sep (1)	_Oct (1)	_Nov (2)	_Dec
2010	_Jan (3)	_Feb (7)	_Mar (21)	_Apr (2)	_May (1)	_Jun (1)	_Jul (6)	_Aug (6)	_Sep (7)	_Oct	_Nov (1)	_Dec
2011	_Jan (1)	_Feb	_Mar	_Apr	_May	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec

Flat | Threaded

<< < 1 .. 5 6 7 8 9 .. 17 > >> (Page 7 of 17)

[tinyTiM-commits] SF.net SVN: tinytim:[269] tinytim-mio/trunk/lib

From: <lh...@us...> - 2009-02-25 13:54:35

Revision: 269
          http://tinytim.svn.sourceforge.net/tinytim/?rev=269&view=rev
Author:   lheuer
Date:     2009-02-25 13:54:30 +0000 (Wed, 25 Feb 2009)

Log Message:
-----------
- Removed openrdf-sesame, semagia-mio-rdf contains now everything needed to parse RDF
- Replaced semagia-mio-jtm-0.9.3.jar with an own implementation (does not contain Jackson anymore)

Modified Paths:
--------------
    tinytim-mio/trunk/lib/semagia-mio-jtm-0.9.3.jar
    tinytim-mio/trunk/lib/semagia-mio-rdf-0.9.3.jar

Removed Paths:
-------------
    tinytim-mio/trunk/lib/openrdf-sesame-2.2.4-onejar.jar

Deleted: tinytim-mio/trunk/lib/openrdf-sesame-2.2.4-onejar.jar
===================================================================
(Binary files differ)

Modified: tinytim-mio/trunk/lib/semagia-mio-jtm-0.9.3.jar
===================================================================
(Binary files differ)

Modified: tinytim-mio/trunk/lib/semagia-mio-rdf-0.9.3.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:[268] tinytim-mio/trunk/CHANGES.txt

From: <lh...@us...> - 2009-02-24 15:28:36

Revision: 268
          http://tinytim.svn.sourceforge.net/tinytim/?rev=268&view=rev
Author:   lheuer
Date:     2009-02-24 15:28:32 +0000 (Tue, 24 Feb 2009)

Log Message:
-----------
Updated changes 

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

Modified: tinytim-mio/trunk/CHANGES.txt
===================================================================
--- tinytim-mio/trunk/CHANGES.txt	2009-02-24 13:56:47 UTC (rev 267)
+++ tinytim-mio/trunk/CHANGES.txt	2009-02-24 15:28:32 UTC (rev 268)
@@ -4,6 +4,8 @@
 
 2.0.0 a4 SP1 (xx.02.2008)
 -------------------------
+* JTMTopicMapReader / JTMTopicMapWriter implement the new JSON Topic Maps
+  specification (<http://www.cerny-online.com/jtm/1.0/>
 
 Bugfixes:
 ---------


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

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

From: <lh...@us...> - 2009-02-24 13:56:56

Revision: 267
          http://tinytim.svn.sourceforge.net/tinytim/?rev=267&view=rev
Author:   lheuer
Date:     2009-02-24 13:56:47 +0000 (Tue, 24 Feb 2009)

Log Message:
-----------
- Added Override annotation (Java 6)
- Switched to semagia-mio-jtm for the JTMTopicMapReader (json_simple.jar is not required anymore)
- Adapted JTM 1.0 for JTMTopicMapWriter

Modified Paths:
--------------
    tinytim-mio/trunk/src/main/java/org/tinytim/mio/AbstractRDFTopicMapReader.java
    tinytim-mio/trunk/src/main/java/org/tinytim/mio/AbstractTopicMapReader.java
    tinytim-mio/trunk/src/main/java/org/tinytim/mio/AbstractXTMTopicMapReader.java
    tinytim-mio/trunk/src/main/java/org/tinytim/mio/AbstractXTMTopicMapWriter.java
    tinytim-mio/trunk/src/main/java/org/tinytim/mio/JTMTopicMapReader.java
    tinytim-mio/trunk/src/main/java/org/tinytim/mio/JTMTopicMapWriter.java
    tinytim-mio/trunk/src/main/java/org/tinytim/mio/RDFTopicMapReader.java
    tinytim-mio/trunk/src/main/java/org/tinytim/mio/TMXMLTopicMapReader.java
    tinytim-mio/trunk/src/main/java/org/tinytim/mio/TinyTimMapInputHandler.java
    tinytim-mio/trunk/src/main/java/org/tinytim/mio/XMLWriter.java
    tinytim-mio/trunk/src/main/java/org/tinytim/mio/XTM10TopicMapWriter.java

Added Paths:
-----------
    tinytim-mio/trunk/lib/semagia-mio-jtm-0.9.3.jar

Removed Paths:
-------------
    tinytim-mio/trunk/lib/json_simple.jar

Deleted: tinytim-mio/trunk/lib/json_simple.jar
===================================================================
(Binary files differ)

Added: tinytim-mio/trunk/lib/semagia-mio-jtm-0.9.3.jar
===================================================================
(Binary files differ)


Property changes on: tinytim-mio/trunk/lib/semagia-mio-jtm-0.9.3.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: tinytim-mio/trunk/src/main/java/org/tinytim/mio/AbstractRDFTopicMapReader.java
===================================================================
--- tinytim-mio/trunk/src/main/java/org/tinytim/mio/AbstractRDFTopicMapReader.java	2009-02-20 13:05:54 UTC (rev 266)
+++ tinytim-mio/trunk/src/main/java/org/tinytim/mio/AbstractRDFTopicMapReader.java	2009-02-24 13:56:47 UTC (rev 267)
@@ -32,7 +32,7 @@
  * Common superclass for {@link RDFTopicMapReader}s.
  * 
  * @author Lars Heuer (heuer[at]semagia.com) <a href="http://www.semagia.com/">Semagia</a>
- * @version $Rev:$ - $Date:$
+ * @version $Rev$ - $Date$
  */
 abstract class AbstractRDFTopicMapReader extends AbstractTopicMapReader
         implements RDFTopicMapReader {
@@ -65,6 +65,7 @@
     /* (non-Javadoc)
      * @see org.tinytim.mio.RDFTopicMapReader#setMappingSource(java.io.File)
      */
+    @Override
     public void setMappingSource(File file) {
         try {
             setMappingSource(file.toURI().toURL());
@@ -77,6 +78,7 @@
     /* (non-Javadoc)
      * @see org.tinytim.mio.RDFTopicMapReader#setMappingSource(java.net.URL)
      */
+    @Override
     public void setMappingSource(URL url) {
         setMappingSource(url.toExternalForm());
     }
@@ -84,6 +86,7 @@
     /* (non-Javadoc)
      * @see org.tinytim.mio.RDFTopicMapReader#setMappingSource(java.lang.String)
      */
+    @Override
     public void setMappingSource(String iri) {
         _deserializer.setProperty(Property.RDF2TM_MAPPING_IRI, iri);
     }
@@ -91,6 +94,7 @@
     /* (non-Javadoc)
      * @see org.tinytim.mio.RDFTopicMapReader#getMappingSource()
      */
+    @Override
     public String getMappingSource() {
         return (String) _deserializer.getProperty(Property.RDF2TM_MAPPING_IRI);
     }
@@ -98,6 +102,7 @@
     /* (non-Javadoc)
      * @see org.tinytim.mio.RDFTopicMapReader#getMappingSourceSyntax()
      */
+    @Override
     public MappingSyntax getMappingSourceSyntax() {
         Syntax syntax = (Syntax) _deserializer.getProperty(Property.RDF2TM_MAPPING_SYNTAX);
         return _toMappingSyntax(syntax); 
@@ -106,10 +111,17 @@
     /* (non-Javadoc)
      * @see org.tinytim.mio.RDFTopicMapReader#setMappingSourceSyntax(org.tinytim.mio.RDFTopicMapReader.MappingSyntax)
      */
+    @Override
     public void setMappingSourceSyntax(MappingSyntax syntax) {
         _deserializer.setProperty(Property.RDF2TM_MAPPING_SYNTAX, _fromMappingSyntax(syntax));
     }
 
+    /**
+     * Returns the {@link MappingSyntax} equivalent for the provided mio.Syntax.
+     *
+     * @param syntax The syntax to convert.
+     * @return The MappingSyntax instance.
+     */
     private static MappingSyntax _toMappingSyntax(Syntax syntax) {
         if (syntax == null) {
             return null;
@@ -136,6 +148,12 @@
     }
 
 
+    /**
+     * Returns the mio.Syntax equivalent for the provided {@link MappingSyntax}.
+     *
+     * @param syntax The syntax to translate.
+     * @return The translated syntax.
+     */
     private static Syntax _fromMappingSyntax(MappingSyntax syntax) {
         if (syntax == null) {
             return null;

Modified: tinytim-mio/trunk/src/main/java/org/tinytim/mio/AbstractTopicMapReader.java
===================================================================
--- tinytim-mio/trunk/src/main/java/org/tinytim/mio/AbstractTopicMapReader.java	2009-02-20 13:05:54 UTC (rev 266)
+++ tinytim-mio/trunk/src/main/java/org/tinytim/mio/AbstractTopicMapReader.java	2009-02-24 13:56:47 UTC (rev 267)
@@ -125,6 +125,7 @@
     /* (non-Javadoc)
      * @see org.tinytim.mio.ITopicMapReader#read()
      */
+    @Override
     public void read() throws IOException {
         try {
             _deserializer.parse(_source);

Modified: tinytim-mio/trunk/src/main/java/org/tinytim/mio/AbstractXTMTopicMapReader.java
===================================================================
--- tinytim-mio/trunk/src/main/java/org/tinytim/mio/AbstractXTMTopicMapReader.java	2009-02-20 13:05:54 UTC (rev 266)
+++ tinytim-mio/trunk/src/main/java/org/tinytim/mio/AbstractXTMTopicMapReader.java	2009-02-24 13:56:47 UTC (rev 267)
@@ -70,7 +70,7 @@
      * @param ignore <tt>true</tt> to ignore mergeMap elements, otherwise <tt>false</tt>.
      */
     public void setIgnoreMergeMap(boolean ignore) {
-        _deserializer.setProperty(Property.IGNORE_MERGEMAP, ignore);
+        _deserializer.setProperty(Property.IGNORE_MERGEMAP, Boolean.valueOf(ignore));
     }
 
     /**
@@ -94,7 +94,7 @@
      *                  disable validation.
      */
     public void setValidation(boolean validate) {
-        _deserializer.setProperty(Property.VALIDATE, validate);
+        _deserializer.setProperty(Property.VALIDATE, Boolean.valueOf(validate));
     }
 
     /**

Modified: tinytim-mio/trunk/src/main/java/org/tinytim/mio/AbstractXTMTopicMapWriter.java
===================================================================
--- tinytim-mio/trunk/src/main/java/org/tinytim/mio/AbstractXTMTopicMapWriter.java	2009-02-20 13:05:54 UTC (rev 266)
+++ tinytim-mio/trunk/src/main/java/org/tinytim/mio/AbstractXTMTopicMapWriter.java	2009-02-24 13:56:47 UTC (rev 267)
@@ -66,7 +66,7 @@
             throw new IOException("The encoding must not be null");
         }
         _out = new XMLWriter(out, encoding);
-        _out.setPrettify(true);
+        _out.setPrettify(false);
         _attrs = new AttributesImpl();
     }
 

Modified: tinytim-mio/trunk/src/main/java/org/tinytim/mio/JTMTopicMapReader.java
===================================================================
--- tinytim-mio/trunk/src/main/java/org/tinytim/mio/JTMTopicMapReader.java	2009-02-20 13:05:54 UTC (rev 266)
+++ tinytim-mio/trunk/src/main/java/org/tinytim/mio/JTMTopicMapReader.java	2009-02-24 13:56:47 UTC (rev 267)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Lars Heuer (heuer[at]semagia.com)
+ * Copyright 2008 - 2009 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.
@@ -15,282 +15,83 @@
  */
 package org.tinytim.mio;
 
+import java.io.File;
 import java.io.IOException;
-import java.io.Reader;
-import java.util.List;
+import java.io.InputStream;
 
-import org.json.simple.JSONObject;
-import org.json.simple.JSONValue;
-import org.tmapi.core.TMAPIRuntimeException;
 import org.tmapi.core.TopicMap;
 
-import com.semagia.mio.MIOException;
-import com.semagia.mio.helpers.Ref;
-import com.semagia.mio.helpers.SimpleMapHandler;
+import com.semagia.mio.Source;
+import com.semagia.mio.Syntax;
 
 /**
  * {@link TopicMapReader} implementation that deserializes 
  * <a href="http://www.cerny-online.com/jtm/">JSON Topic Maps (JTM)</a>.
  * <p>
- * The reader does not accept fragments, i.e. only a topic in a JSON document;
- * each JTM instance must start with a topic map container, i.e. 
- * <tt>{"topics":[...]"}</tt>. The TMDM constructs must provide all
- * properties, i.e. it is not allowed to omit the type of an association. The 
- * only exception are topic names: If the "type" property is not provided, the
- * default topic name type is automatically assigned.
+ * This reader rejects JTM instances which contain just a single role or 
+ * variant even if they are valid according to the JTM specification. 
  * </p>
+ * <p>
+ * Further the reader expects that at least one identity of a topic 
+ * (item identifier, subject identifier, subject locator) occurs before any
+ * occurrence / name. Fragments must start with a "version" property followed
+ * by the "item_type" property before any further properties are specified.
+ * </p>
  * 
  * @author Lars Heuer (heuer[at]semagia.com) <a href="http://www.semagia.com/">Semagia</a>
  * @version $Rev:$ - $Date:$
  */
-@SuppressWarnings("unchecked")
-public class JTMTopicMapReader implements TopicMapReader {
+public final class JTMTopicMapReader extends AbstractTopicMapReader {
 
-    private TopicMap _tm;
-    private Reader _reader;
-
     /**
      * Constructs a new instance.
      *
      * @param topicMap The topic map to which the content is added to.
-     * @param reader The reader to read the JSON encoded topic map from.
-     * @throws IOException If an error occurs.
+     * @param source The source to read the topic map from.
+     * @param docIRI The document IRI which is used to resolve IRIs against.
+     * @throws IOException If an error occurs. 
      */
-    public JTMTopicMapReader(TopicMap topicMap, Reader reader) throws IOException {
-        _tm = topicMap;
-        _reader = reader;
+    public JTMTopicMapReader(final TopicMap topicMap, final File source,
+            final String docIRI) throws IOException {
+        super(topicMap, Syntax.JTM, source, docIRI);
     }
 
-    /* (non-Javadoc)
-     * @see org.tinytim.mio.TopicMapReader#read()
+    /**
+     * Constructs a new instance.
+     * <p>
+     * The <tt>source</tt> is converted into an absolute IRI which will be
+     * utilised as document IRI
+     * </p>
+     *
+     * @param topicMap The topic map to which the content is added to.
+     * @param source The source to read the topic map from.
+     * @throws IOException If an error occurs. 
      */
-    public void read() throws IOException {
-        Object obj = JSONValue.parse(_reader);
-        if (!(obj instanceof JSONObject)) {
-            // Nothing to do.
-            return;
-        }
-        JSONObject map = (JSONObject) obj;
-        SimpleMapHandler mapHandler = SimpleMapHandler.create(new TinyTimMapInputHandler(_tm));
-        try {
-            mapHandler.startTopicMap();
-            _handleReifier(mapHandler, map);
-            _handleItemIdentifiers(mapHandler, map);
-            _handleTopics(mapHandler, (List<JSONObject>) map.get("topics"));
-            _handleAssociations(mapHandler, (List<JSONObject>) map.get("associations"));
-            mapHandler.endTopicMap();
-        }
-        catch (MIOException ex) {
-            throw new TMAPIRuntimeException(ex);
-        }
+    public JTMTopicMapReader(final TopicMap topicMap, final File source)
+            throws IOException {
+        super(topicMap, Syntax.JTM, source);
     }
 
-    private void _handleTopics(SimpleMapHandler mapHandler,
-            List<JSONObject> jsonArray) throws MIOException {
-        if (jsonArray == null) {
-            return;
-        }
-        int length = jsonArray.size();
-        for (int i=0; i<length; i++) {
-            _handleTopic(mapHandler, jsonArray.get(i));
-        }
+    /**
+     * Constructs a new instance.
+     *
+     * @param topicMap The topic map to which the content is added to.
+     * @param source The source to read the topic map from.
+     * @param docIRI The document IRI which is used to resolve IRIs against.
+     */
+    public JTMTopicMapReader(final TopicMap topicMap, final InputStream source,
+            final String docIRI) {
+        super(topicMap, Syntax.JTM, source, docIRI);
     }
 
-    private void _handleTopic(SimpleMapHandler mapHandler,
-            JSONObject jsonObject) throws MIOException {
-        boolean seenIdentity = false;
-        List<String> array = (List<String>) jsonObject.get("item_identifiers");
-        if (array != null) {
-            seenIdentity = true;
-            mapHandler.startTopic(Ref.createItemIdentifier(array.get(0)));
-            int length = array.size();
-            for (int i=1; i<length; i++) {
-                mapHandler.itemIdentifier(array.get(i));
-            }
-        }
-        array = (List<String>) jsonObject.get("subject_identifiers");
-        if (array != null) {
-            int start = 0;
-            if (!seenIdentity) {
-                seenIdentity = true;
-                start = 1;
-                mapHandler.startTopic(Ref.createSubjectIdentifier(array.get(0)));
-            }
-            int length = array.size();
-            for (int i=start; i<length; i++) {
-                mapHandler.subjectIdentifier(array.get(i));
-            }
-        }
-        array = (List<String>) jsonObject.get("subject_locators");
-        if (array != null) {
-            int start = 0;
-            if (!seenIdentity) {
-                seenIdentity = true;
-                start = 1;
-                mapHandler.startTopic(Ref.createSubjectLocator(array.get(0)));
-            }
-            int length = array.size();
-            for (int i=start; i<length; i++) {
-                mapHandler.subjectLocator(array.get(i));
-            }
-        }
-        if (!seenIdentity) {
-            throw new MIOException("Topic without any identity: " + jsonObject);
-        }
-        List<JSONObject> objects = (List<JSONObject>) jsonObject.get("occurrences");
-        if (objects != null) {
-            int length = objects.size();
-            for (int i=0; i<length; i++) {
-                _handleOccurrence(mapHandler, objects.get(i));
-            }
-        }
-        objects = (List<JSONObject>) jsonObject.get("names");
-        if (objects != null) {
-            int length = objects.size();
-            for (int i=0; i<length; i++) {
-                _handleName(mapHandler, objects.get(i));
-            }
-        }
-        mapHandler.endTopic();
+    /**
+     * Constructs a new instance.
+     *
+     * @param topicMap The topic map to which the content is added to.
+     * @param source The source to read the serialized topic map from.
+     */
+    public JTMTopicMapReader(final TopicMap topicMap, final Source source) {
+        super(topicMap, Syntax.JTM, source);
     }
 
-    private void _handleOccurrence(SimpleMapHandler mapHandler,
-            JSONObject jsonObject) throws MIOException {
-        mapHandler.startOccurrence();
-        _handleType(mapHandler, jsonObject, true);
-        _handleScope(mapHandler, jsonObject);
-        _handleReifier(mapHandler, jsonObject);
-        _handleItemIdentifiers(mapHandler, jsonObject);
-        _handleValueDatatype(mapHandler, jsonObject);
-        mapHandler.endOccurrence();
-    }
-
-    private void _handleValueDatatype(SimpleMapHandler mapHandler,
-            JSONObject jsonObject) throws MIOException {
-        String value = (String) jsonObject.get("value");
-        if (value == null) {
-            throw new MIOException("The value must not be null: " + jsonObject);
-        }
-        String datatype = (String) jsonObject.get("datatype");
-        if (datatype == null) {
-            throw new MIOException("The datatype must not be null: " + jsonObject);
-        }
-        mapHandler.value(value, datatype);
-    }
-
-    private void _handleName(SimpleMapHandler mapHandler,
-            JSONObject jsonObject) throws MIOException {
-        mapHandler.startName();
-        _handleType(mapHandler, jsonObject, false);
-        _handleScope(mapHandler, jsonObject);
-        _handleReifier(mapHandler, jsonObject);
-        _handleItemIdentifiers(mapHandler, jsonObject);
-        String value = (String) jsonObject.get("value");
-        if (value == null) {
-            throw new MIOException("The value of a name must not be null: " + jsonObject);
-        }
-        mapHandler.value(value);
-        List<JSONObject> variants = (List<JSONObject>) jsonObject.get("variants");
-        if (variants != null) {
-            int length = variants.size();
-            for (int i=0; i<length; i++) {
-                _handleVariant(mapHandler, variants.get(i));
-            }
-        }
-        mapHandler.endName();
-    }
-
-    private void _handleVariant(SimpleMapHandler mapHandler,
-            JSONObject jsonObject) throws MIOException {
-        mapHandler.startVariant();
-        _handleScope(mapHandler, jsonObject);
-        _handleReifier(mapHandler, jsonObject);
-        _handleItemIdentifiers(mapHandler, jsonObject);
-        _handleValueDatatype(mapHandler, jsonObject);
-        mapHandler.endVariant();
-    }
-
-    private void _handleAssociations(SimpleMapHandler mapHandler,
-            List<JSONObject> jsonArray) throws MIOException {
-        if (jsonArray == null) {
-            return;
-        }
-        int length = jsonArray.size();
-        for (int i=0; i<length; i++) {
-            _handleAssociation(mapHandler, jsonArray.get(i));
-        }
-    }
-
-    private void _handleAssociation(SimpleMapHandler mapHandler,
-            JSONObject jsonObject) throws MIOException {
-        List<JSONObject> roles = (List<JSONObject>) jsonObject.get("roles");
-        if (roles == null) {
-            throw new MIOException("No roles specified: " + jsonObject);
-        }
-        mapHandler.startAssociation();
-        _handleType(mapHandler, jsonObject, true);
-        _handleScope(mapHandler, jsonObject);
-        _handleReifier(mapHandler, jsonObject);
-        _handleItemIdentifiers(mapHandler, jsonObject);
-        int length = roles.size();
-        for (int i=0; i<length; i++) {
-            _handleRole(mapHandler, roles.get(i));
-        }
-        mapHandler.endAssociation();
-    }
-
-    private void _handleRole(SimpleMapHandler mapHandler,
-            JSONObject jsonObject) throws MIOException {
-        mapHandler.startRole();
-        _handleType(mapHandler, jsonObject, true);
-        _handleReifier(mapHandler, jsonObject);
-        _handleItemIdentifiers(mapHandler, jsonObject);
-        String playerIRI = (String) jsonObject.get("player");
-        if (playerIRI == null) {
-            throw new MIOException("No player defined: " + jsonObject);
-        }
-        mapHandler.player(Ref.createItemIdentifier(playerIRI));
-        mapHandler.endRole();
-    }
-
-    private void _handleScope(SimpleMapHandler mapHandler, JSONObject jsonObject) throws MIOException {
-        List<String> array = (List<String>) jsonObject.get("scope");
-        if (array == null) {
-            return;
-        }
-        int length = array.size();
-        mapHandler.startScope();
-        for (int i=0; i<length; i++) {
-            mapHandler.theme(Ref.createItemIdentifier(array.get(i)));
-        }
-        mapHandler.endScope();
-    }
-
-    private void _handleType(SimpleMapHandler mapHandler, JSONObject jsonObj, boolean notNull) throws MIOException {
-        String typeIRI = (String) jsonObj.get("type");
-        if (typeIRI != null) {
-            mapHandler.type(Ref.createItemIdentifier(typeIRI));
-        }
-        else if (notNull) {
-            throw new MIOException("The type must not be null: " + jsonObj);
-        }
-    }
-
-    private void _handleReifier(SimpleMapHandler mapHandler, JSONObject jsonObj) throws MIOException {
-        String reifierIRI = (String) jsonObj.get("reifier");
-        if (reifierIRI != null) {
-            mapHandler.reifier(Ref.createItemIdentifier(reifierIRI));
-        }
-    }
-
-    private void _handleItemIdentifiers(SimpleMapHandler mapHandler, JSONObject jsonObj) throws MIOException {
-        List<String> iids = (List<String>)jsonObj.get("item_identifiers");
-        if (iids != null) {
-            int length = iids.size();
-            for (int i=0; i<length; i++) {
-                mapHandler.itemIdentifier(iids.get(i));
-            }
-        }
-    }
-
 }

Modified: tinytim-mio/trunk/src/main/java/org/tinytim/mio/JTMTopicMapWriter.java
===================================================================
--- tinytim-mio/trunk/src/main/java/org/tinytim/mio/JTMTopicMapWriter.java	2009-02-20 13:05:54 UTC (rev 266)
+++ tinytim-mio/trunk/src/main/java/org/tinytim/mio/JTMTopicMapWriter.java	2009-02-24 13:56:47 UTC (rev 267)
@@ -56,7 +56,6 @@
 
     private JSONWriter _out;
     private String _baseIRI;
-    private Topic _defaultNameType;
 
     /**
      * Creates a JTM writer, using "utf-8" encoding.
@@ -108,8 +107,8 @@
     /* (non-Javadoc)
      * @see org.tinytim.mio.TopicMapWriter#write(org.tmapi.core.TopicMap)
      */
+    @Override
     public void write(TopicMap topicMap) throws IOException {
-        _defaultNameType = topicMap.getTopicBySubjectIdentifier(TMDM.TOPIC_NAME);
         _out.startDocument();
         _out.startObject();
         _writeReifier(topicMap);
@@ -152,19 +151,6 @@
      * @throws IOException If an error occurs.
      */
     private void _writeTopic(Topic topic) throws IOException {
-        // Ignore the topic if it is the default name type and it has no further
-        // characteristics
-        if (_isDefaultNameType(topic)
-                && topic.getReified() == null
-                && topic.getSubjectIdentifiers().size() == 1
-                && topic.getSubjectLocators().isEmpty()
-                && topic.getItemIdentifiers().isEmpty()
-                && topic.getRolesPlayed().isEmpty()
-                && topic.getTypes().isEmpty()
-                && topic.getNames().isEmpty()
-                && topic.getOccurrences().isEmpty()) {
-            return;
-        }
         _out.startObject();
         _writeItemIdentifiers(topic);
         _writeLocators("subject_identifiers", topic.getSubjectIdentifiers());
@@ -200,9 +186,7 @@
         _out.startObject();
         _writeReifier(name);
         _writeItemIdentifiers(name);
-        if (!_isDefaultNameType(name.getType())) {
-            _writeType(name);
-        }
+        _writeType(name);
         _writeScope(name);
         _writeKeyValue("value", name.getValue());
         Set<Variant> variants = name.getVariants();
@@ -425,23 +409,17 @@
     private String _topicRef(Topic topic) {
         Set<Locator> locs = topic.getItemIdentifiers();
         if (!locs.isEmpty()) {
-            return locs.iterator().next().toExternalForm();
+            return "ii:" + locs.iterator().next().toExternalForm();
         }
         locs = topic.getSubjectIdentifiers();
         if (!locs.isEmpty()) {
-            return locs.iterator().next().toExternalForm();
+            return "si:" + locs.iterator().next().toExternalForm();
         }
-        return _baseIRI + "#" + topic.getId();
+        locs = topic.getSubjectLocators();
+        if (!locs.isEmpty()) {
+            return "sl:" + locs.iterator().next().toExternalForm();
+        }
+        return "ii:" + _baseIRI + "#" + topic.getId();
     }
 
-    /**
-     * Checks if the specified <tt>topic</tt> is the default TMDM name type.
-     *
-     * @param topic The topic to check, not <tt>null</tt>.
-     * @return <tt>true</tt> if the topic is the default name type, otherwise <tt>false</tt>.
-     */
-    private boolean _isDefaultNameType(final Topic topic) {
-        return topic.equals(_defaultNameType);
-    }
-
 }

Modified: tinytim-mio/trunk/src/main/java/org/tinytim/mio/RDFTopicMapReader.java
===================================================================
--- tinytim-mio/trunk/src/main/java/org/tinytim/mio/RDFTopicMapReader.java	2009-02-20 13:05:54 UTC (rev 266)
+++ tinytim-mio/trunk/src/main/java/org/tinytim/mio/RDFTopicMapReader.java	2009-02-24 13:56:47 UTC (rev 267)
@@ -23,7 +23,7 @@
  * define an external RDF to Topic Maps (RTM) mapping source.
  * 
  * @author Lars Heuer (heuer[at]semagia.com) <a href="http://www.semagia.com/">Semagia</a>
- * @version $Rev:$ - $Date:$
+ * @version $Rev$ - $Date$
  */
 public interface RDFTopicMapReader extends TopicMapReader {
 

Modified: tinytim-mio/trunk/src/main/java/org/tinytim/mio/TMXMLTopicMapReader.java
===================================================================
--- tinytim-mio/trunk/src/main/java/org/tinytim/mio/TMXMLTopicMapReader.java	2009-02-20 13:05:54 UTC (rev 266)
+++ tinytim-mio/trunk/src/main/java/org/tinytim/mio/TMXMLTopicMapReader.java	2009-02-24 13:56:47 UTC (rev 267)
@@ -96,7 +96,7 @@
      *                  disable validation.
      */
     public void setValidation(boolean validate) {
-        _deserializer.setProperty(Property.VALIDATE, validate);
+        _deserializer.setProperty(Property.VALIDATE, Boolean.valueOf(validate));
     }
 
     /**

Modified: tinytim-mio/trunk/src/main/java/org/tinytim/mio/TinyTimMapInputHandler.java
===================================================================
--- tinytim-mio/trunk/src/main/java/org/tinytim/mio/TinyTimMapInputHandler.java	2009-02-20 13:05:54 UTC (rev 266)
+++ tinytim-mio/trunk/src/main/java/org/tinytim/mio/TinyTimMapInputHandler.java	2009-02-24 13:56:47 UTC (rev 267)
@@ -216,7 +216,7 @@
         IVariant variant = (IVariant) _leaveStatePopConstruct(VARIANT);
         IName name = (IName) _peekConstruct();
         IScope scope = variant.getScopeObject();
-        if (scope.isUnconstrained() || name.getScopeObject() == scope) {
+        if (scope.isUnconstrained() || name.getScopeObject().equals(scope)) {
             _reportError("The variant has no scope");
         }
     }
@@ -277,7 +277,7 @@
         Locator sid = _tm.createLocator(subjectIdentifier);
         ITopic topic = _peekTopic();
         Topic existing = _tm.getTopicBySubjectIdentifier(sid);
-        if (existing != null && !(existing == topic)) {
+        if (existing != null && !(existing.equals(topic))) {
             _merge(existing, topic);
         }
         else {
@@ -296,7 +296,7 @@
         Locator slo = _tm.createLocator(subjectLocator);
         ITopic topic = _peekTopic();
         Topic existing = _tm.getTopicBySubjectLocator(slo);
-        if (existing != null && !(existing == topic)) {
+        if (existing != null && !(existing.equals(topic))) {
             _merge(existing, topic);
         }
         topic.addSubjectLocator(slo);

Modified: tinytim-mio/trunk/src/main/java/org/tinytim/mio/XMLWriter.java
===================================================================
--- tinytim-mio/trunk/src/main/java/org/tinytim/mio/XMLWriter.java	2009-02-20 13:05:54 UTC (rev 266)
+++ tinytim-mio/trunk/src/main/java/org/tinytim/mio/XMLWriter.java	2009-02-24 13:56:47 UTC (rev 267)
@@ -39,6 +39,7 @@
     private final String _encoding;
 
     private int _depth;
+
     private boolean _prettify;
 
     public XMLWriter(OutputStream out) throws IOException {

Modified: tinytim-mio/trunk/src/main/java/org/tinytim/mio/XTM10TopicMapWriter.java
===================================================================
--- tinytim-mio/trunk/src/main/java/org/tinytim/mio/XTM10TopicMapWriter.java	2009-02-20 13:05:54 UTC (rev 266)
+++ tinytim-mio/trunk/src/main/java/org/tinytim/mio/XTM10TopicMapWriter.java	2009-02-24 13:56:47 UTC (rev 267)
@@ -80,25 +80,11 @@
         super(out, baseIRI, encoding);
     }
 
-    private String _getId(Reifiable reifiable) {
-        assert reifiable.getReifier() != null;
-        return "reifier-id-" + reifiable.getReifier().getId();
-    }
-
-    private void _addId(AttributesImpl attrs, final Reifiable reifiable) {
-        if (reifiable.getReifier() == null) {
-            return;
-        }
-        attrs.addAttribute("", "id", "", "CDATA", _getId(reifiable));
-    }
-
-    private void _addLocator(AttributesImpl attrs, Locator loc) {
-        attrs.addAttribute("", "xlink:href", "", "CDATA", loc.toExternalForm());
-    }
-
+    
     /* (non-Javadoc)
      * @see org.tinytim.mio.ITopicMapWriter#write(org.tmapi.core.TopicMap)
      */
+    @Override
     public void write(final TopicMap topicMap) throws IOException {
         _out.startDocument();
         _attrs.clear();
@@ -116,6 +102,22 @@
         _out.endDocument();
     }
 
+    private String _getId(Reifiable reifiable) {
+        assert reifiable.getReifier() != null;
+        return "reifier-id-" + reifiable.getReifier().getId();
+    }
+
+    private void _addId(AttributesImpl attrs, final Reifiable reifiable) {
+        if (reifiable.getReifier() == null) {
+            return;
+        }
+        attrs.addAttribute("", "id", "", "CDATA", _getId(reifiable));
+    }
+
+    private void _addLocator(AttributesImpl attrs, Locator loc) {
+        attrs.addAttribute("", "xlink:href", "", "CDATA", loc.toExternalForm());
+    }
+
     protected void _writeTopic(final Topic topic) throws IOException {
         _attrs.clear();
         _attrs.addAttribute("", "id", "", "CDATA",  _getId(topic));


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

[tinyTiM-commits] SF.net SVN: tinytim:[265] tinytim-mio/trunk/lib

From: <lh...@us...> - 2009-02-20 13:28:06

Revision: 265
          http://tinytim.svn.sourceforge.net/tinytim/?rev=265&view=rev
Author:   lheuer
Date:     2009-02-20 12:45:12 +0000 (Fri, 20 Feb 2009)

Log Message:
-----------
Added bug-fixed MIO XTM lib (validation did not work in all cases in the previous version)

Added Paths:
-----------
    tinytim-mio/trunk/lib/semagia-mio-xtm-0.9.3-sp1.jar

Removed Paths:
-------------
    tinytim-mio/trunk/lib/semagia-mio-xtm-0.9.3.jar

Added: tinytim-mio/trunk/lib/semagia-mio-xtm-0.9.3-sp1.jar
===================================================================
(Binary files differ)


Property changes on: tinytim-mio/trunk/lib/semagia-mio-xtm-0.9.3-sp1.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Deleted: tinytim-mio/trunk/lib/semagia-mio-xtm-0.9.3.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:[266] tinytim-mio/trunk/CHANGES.txt

From: <lh...@us...> - 2009-02-20 13:26:07

Revision: 266
          http://tinytim.svn.sourceforge.net/tinytim/?rev=266&view=rev
Author:   lheuer
Date:     2009-02-20 13:05:54 +0000 (Fri, 20 Feb 2009)

Log Message:
-----------
Updated changes for 2.0.0a4 SP1 release

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

Modified: tinytim-mio/trunk/CHANGES.txt
===================================================================
--- tinytim-mio/trunk/CHANGES.txt	2009-02-20 12:45:12 UTC (rev 265)
+++ tinytim-mio/trunk/CHANGES.txt	2009-02-20 13:05:54 UTC (rev 266)
@@ -2,19 +2,21 @@
 Changes Log
 ===========
 
-2.0.0 a5 (xx.02.2008)
----------------------
+2.0.0 a4 SP1 (xx.02.2008)
+-------------------------
 
 Bugfixes:
 ---------
+* Validation of XTM 1.0 and 2.0 sources against a RELAX-NG schema 
+  did not work in all cases, fixed in "semagia-mio-xtm-0.9.3-sp1.jar"
 * Bug #2560821 -- XTM 1.0 serializer uses wrong element for type
   reported by Jens Rummler
 * Bug #2540490 -- Using QName in isa/ako throws syntax error
   (CTM libs) reported by Stefan Kesberg
 
 
-2.0.0 a4 / 1.5.0b2 (06.12.2008)
--------------------------------
+2.0.0 a4 / 1.5.0 b2 (06.12.2008)
+--------------------------------
 * Note: The JTMWriter is not available in 1.5.0b2!
 * Initial .mio release for tinyTiM 2.x
 * Changed license to Apache License 2.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:[264] tinytim-mio/trunk/lib/ semagia-mio-ctm-working-draft-2008-11-19-0.9.3.jar

From: <lh...@us...> - 2009-02-19 15:16:24

Revision: 264
          http://tinytim.svn.sourceforge.net/tinytim/?rev=264&view=rev
Author:   lheuer
Date:     2009-02-19 15:16:08 +0000 (Thu, 19 Feb 2009)

Log Message:
-----------
Removed CTM lib which expects semicolons everywhere. That CTM syntax has never been published

Removed Paths:
-------------
    tinytim-mio/trunk/lib/semagia-mio-ctm-working-draft-2008-11-19-0.9.3.jar

Deleted: tinytim-mio/trunk/lib/semagia-mio-ctm-working-draft-2008-11-19-0.9.3.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:[263] tinytim-mio/trunk/lib/semagia-mio-snello-0.9.3. jar

From: <lh...@us...> - 2009-02-19 14:43:10

Revision: 263
          http://tinytim.svn.sourceforge.net/tinytim/?rev=263&view=rev
Author:   lheuer
Date:     2009-02-19 14:43:03 +0000 (Thu, 19 Feb 2009)

Log Message:
-----------
Fixed a ClassCastException in the Snello runtime

Modified Paths:
--------------
    tinytim-mio/trunk/lib/semagia-mio-snello-0.9.3.jar

Modified: tinytim-mio/trunk/lib/semagia-mio-snello-0.9.3.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:[262] tinytim-mio/trunk/lib

From: <lh...@us...> - 2009-02-17 13:39:52

Revision: 262
          http://tinytim.svn.sourceforge.net/tinytim/?rev=262&view=rev
Author:   lheuer
Date:     2009-02-17 13:39:41 +0000 (Tue, 17 Feb 2009)

Log Message:
-----------
- Fixed the Unicode escape \U-bug (6 hexdigits)
- Added a CTM lib which parses a syntax where the semicolons occur inside of topic-blocks but not outside of them

Modified Paths:
--------------
    tinytim-mio/trunk/lib/semagia-mio-ctm-0.9.3-working-draft-2009-02-12.jar

Added Paths:
-----------
    tinytim-mio/trunk/lib/semagia-mio-ctm-0.9.3-working-draft-2009-02-18.jar

Modified: tinytim-mio/trunk/lib/semagia-mio-ctm-0.9.3-working-draft-2009-02-12.jar
===================================================================
(Binary files differ)

Added: tinytim-mio/trunk/lib/semagia-mio-ctm-0.9.3-working-draft-2009-02-18.jar
===================================================================
(Binary files differ)


Property changes on: tinytim-mio/trunk/lib/semagia-mio-ctm-0.9.3-working-draft-2009-02-18.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:[261] tinytim-mio/trunk/lib/semagia-mio-ctm-0.9. 3-working-draft-2009-02-12.jar

From: <lh...@us...> - 2009-02-13 13:04:10

Revision: 261
          http://tinytim.svn.sourceforge.net/tinytim/?rev=261&view=rev
Author:   lheuer
Date:     2009-02-13 13:04:05 +0000 (Fri, 13 Feb 2009)

Log Message:
-----------
Updated CTM lib to the current CXTM tests

Added Paths:
-----------
    tinytim-mio/trunk/lib/semagia-mio-ctm-0.9.3-working-draft-2009-02-12.jar

Added: tinytim-mio/trunk/lib/semagia-mio-ctm-0.9.3-working-draft-2009-02-12.jar
===================================================================
(Binary files differ)


Property changes on: tinytim-mio/trunk/lib/semagia-mio-ctm-0.9.3-working-draft-2009-02-12.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:[260] tinytim-mio/trunk/lib/semagia-mio-0.9.3.jar

From: <lh...@us...> - 2009-02-11 14:59:20

Revision: 260
          http://tinytim.svn.sourceforge.net/tinytim/?rev=260&view=rev
Author:   lheuer
Date:     2009-02-11 14:59:11 +0000 (Wed, 11 Feb 2009)

Log Message:
-----------
The service lookup process uses now class loader of the DeserializerRegistry

Modified Paths:
--------------
    tinytim-mio/trunk/lib/semagia-mio-0.9.3.jar

Modified: tinytim-mio/trunk/lib/semagia-mio-0.9.3.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:[259] tinytim-mio/trunk/CHANGES.txt

From: <lh...@us...> - 2009-02-03 13:42:45

Revision: 259
          http://tinytim.svn.sourceforge.net/tinytim/?rev=259&view=rev
Author:   lheuer
Date:     2009-02-03 13:42:16 +0000 (Tue, 03 Feb 2009)

Log Message:
-----------
Updated CHANGES.txt

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

Modified: tinytim-mio/trunk/CHANGES.txt
===================================================================
--- tinytim-mio/trunk/CHANGES.txt	2009-02-03 13:39:34 UTC (rev 258)
+++ tinytim-mio/trunk/CHANGES.txt	2009-02-03 13:42:16 UTC (rev 259)
@@ -7,6 +7,8 @@
 
 Bugfixes:
 ---------
+* Bug #2560821 -- XTM 1.0 serializer uses wrong element for type
+  reported by Jens Rummler
 * Bug #2540490 -- Using QName in isa/ako throws syntax error
   (CTM libs) reported by Stefan Kesberg
 


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

[tinyTiM-commits] SF.net SVN: tinytim:[258] tinytim-mio/trunk/src/main/java/org/tinytim/mio

From: <lh...@us...> - 2009-02-03 13:39:42

Revision: 258
          http://tinytim.svn.sourceforge.net/tinytim/?rev=258&view=rev
Author:   lheuer
Date:     2009-02-03 13:39:34 +0000 (Tue, 03 Feb 2009)

Log Message:
-----------
Fixed XTM 1.0 writer bug #2560821  -- "XTM 1.0 serializer uses wrong element for type"

Modified Paths:
--------------
    tinytim-mio/trunk/src/main/java/org/tinytim/mio/XTM10TopicMapWriter.java
    tinytim-mio/trunk/src/main/java/org/tinytim/mio15/XTM10TopicMapWriter.java

Modified: tinytim-mio/trunk/src/main/java/org/tinytim/mio/XTM10TopicMapWriter.java
===================================================================
--- tinytim-mio/trunk/src/main/java/org/tinytim/mio/XTM10TopicMapWriter.java	2009-01-28 15:28:36 UTC (rev 257)
+++ tinytim-mio/trunk/src/main/java/org/tinytim/mio/XTM10TopicMapWriter.java	2009-02-03 13:39:34 UTC (rev 258)
@@ -215,9 +215,9 @@
     }
 
     private void _writeType(final Typed typed) throws IOException {
-        _out.startElement("type");
+        _out.startElement("instanceOf");
         _writeTopicRef(typed.getType());
-        _out.endElement("type");
+        _out.endElement("instanceOf");
     }
 
     private void _writeScope(final Scoped scoped) throws IOException {

Modified: tinytim-mio/trunk/src/main/java/org/tinytim/mio15/XTM10TopicMapWriter.java
===================================================================
--- tinytim-mio/trunk/src/main/java/org/tinytim/mio15/XTM10TopicMapWriter.java	2009-01-28 15:28:36 UTC (rev 257)
+++ tinytim-mio/trunk/src/main/java/org/tinytim/mio15/XTM10TopicMapWriter.java	2009-02-03 13:39:34 UTC (rev 258)
@@ -234,9 +234,9 @@
     }
 
     private void _writeType(final ITyped typed) throws IOException {
-        _out.startElement("type");
+        _out.startElement("instanceOf");
         _writeTopicRef(typed.getType());
-        _out.endElement("type");
+        _out.endElement("instanceOf");
     }
 
     private void _writeScope(final ScopedObject scoped) throws IOException {


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

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

From: <lh...@us...> - 2009-01-28 15:28:38

Revision: 257
          http://tinytim.svn.sourceforge.net/tinytim/?rev=257&view=rev
Author:   lheuer
Date:     2009-01-28 15:28:36 +0000 (Wed, 28 Jan 2009)

Log Message:
-----------
Updated CHANGES.txt

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

Modified: tinytim-mio/trunk/CHANGES.txt
===================================================================
--- tinytim-mio/trunk/CHANGES.txt	2009-01-28 13:39:14 UTC (rev 256)
+++ tinytim-mio/trunk/CHANGES.txt	2009-01-28 15:28:36 UTC (rev 257)
@@ -2,6 +2,15 @@
 Changes Log
 ===========
 
+2.0.0 a5 (xx.02.2008)
+---------------------
+
+Bugfixes:
+---------
+* Bug #2540490 -- Using QName in isa/ako throws syntax error
+  (CTM libs) reported by Stefan Kesberg
+
+
 2.0.0 a4 / 1.5.0b2 (06.12.2008)
 -------------------------------
 * Note: The JTMWriter is not available in 1.5.0b2!


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

[tinyTiM-commits] SF.net SVN: tinytim:[256] tinytim-mio/trunk/lib/ semagia-mio-ctm-draft-2008-05-15-0.9.3.jar

From: <lh...@us...> - 2009-01-28 13:39:21

Revision: 256
          http://tinytim.svn.sourceforge.net/tinytim/?rev=256&view=rev
Author:   lheuer
Date:     2009-01-28 13:39:14 +0000 (Wed, 28 Jan 2009)

Log Message:
-----------
Fixed bug #2540490 "Using QName in association throws syntax error"

Modified Paths:
--------------
    tinytim-mio/trunk/lib/semagia-mio-ctm-draft-2008-05-15-0.9.3.jar

Modified: tinytim-mio/trunk/lib/semagia-mio-ctm-draft-2008-05-15-0.9.3.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:[255] tinytim-mio/trunk/lib

From: <lh...@us...> - 2009-01-26 14:19:39

Revision: 255
          http://tinytim.svn.sourceforge.net/tinytim/?rev=255&view=rev
Author:   lheuer
Date:     2009-01-26 14:19:31 +0000 (Mon, 26 Jan 2009)

Log Message:
-----------
Updated OpenRDF

Added Paths:
-----------
    tinytim-mio/trunk/lib/openrdf-sesame-2.2.4-onejar.jar

Removed Paths:
-------------
    tinytim-mio/trunk/lib/openrdf-sesame-2.2.1-onejar.jar

Deleted: tinytim-mio/trunk/lib/openrdf-sesame-2.2.1-onejar.jar
===================================================================
(Binary files differ)

Added: tinytim-mio/trunk/lib/openrdf-sesame-2.2.4-onejar.jar
===================================================================
(Binary files differ)


Property changes on: tinytim-mio/trunk/lib/openrdf-sesame-2.2.4-onejar.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:[254] tinytim-mio/trunk/src/main/java/org/tinytim/mio/ TinyTimMapInputHandler.java

From: <lh...@us...> - 2008-12-14 15:42:02

Revision: 254
          http://tinytim.svn.sourceforge.net/tinytim/?rev=254&view=rev
Author:   lheuer
Date:     2008-12-14 15:41:41 +0000 (Sun, 14 Dec 2008)

Log Message:
-----------
Changed constructor visibility to "public"

Modified Paths:
--------------
    tinytim-mio/trunk/src/main/java/org/tinytim/mio/TinyTimMapInputHandler.java

Modified: tinytim-mio/trunk/src/main/java/org/tinytim/mio/TinyTimMapInputHandler.java
===================================================================
--- tinytim-mio/trunk/src/main/java/org/tinytim/mio/TinyTimMapInputHandler.java	2008-12-06 19:47:47 UTC (rev 253)
+++ tinytim-mio/trunk/src/main/java/org/tinytim/mio/TinyTimMapInputHandler.java	2008-12-14 15:41:41 UTC (rev 254)
@@ -81,7 +81,7 @@
     private IConstruct[] _constructStack;
     private int _constructSize;
 
-    protected TinyTimMapInputHandler(TopicMap topicMap) {
+    public TinyTimMapInputHandler(TopicMap topicMap) {
         if (topicMap == null) {
             throw new IllegalArgumentException("The topic map must not be 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:[253] tinytim-mio/trunk/src/main/java/org/tinytim/mio/ TrixTopicMapReader.java

From: <lh...@us...> - 2008-12-06 19:47:52

Revision: 253
          http://tinytim.svn.sourceforge.net/tinytim/?rev=253&view=rev
Author:   lheuer
Date:     2008-12-06 19:47:47 +0000 (Sat, 06 Dec 2008)

Log Message:
-----------
Corrected link to TriX 

Modified Paths:
--------------
    tinytim-mio/trunk/src/main/java/org/tinytim/mio/TrixTopicMapReader.java

Modified: tinytim-mio/trunk/src/main/java/org/tinytim/mio/TrixTopicMapReader.java
===================================================================
--- tinytim-mio/trunk/src/main/java/org/tinytim/mio/TrixTopicMapReader.java	2008-12-06 17:23:27 UTC (rev 252)
+++ tinytim-mio/trunk/src/main/java/org/tinytim/mio/TrixTopicMapReader.java	2008-12-06 19:47:47 UTC (rev 253)
@@ -26,7 +26,7 @@
 
 /**
  * {@link RDFTopicMapReader} implementation that is able to deserialize RDF 
- * <a href="http://swdev.nokia.com/trix/TriX.html">TriX</a>.
+ * <a href="http://www.hpl.hp.com/techreports/2004/HPL-2004-56.html">TriX</a>.
  * 
  * @author Lars Heuer (heuer[at]semagia.com) <a href="http://www.semagia.com/">Semagia</a>
  * @version $Rev$ - $Date$


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

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

From: <lh...@us...> - 2008-12-06 17:23:33

Revision: 252
          http://tinytim.svn.sourceforge.net/tinytim/?rev=252&view=rev
Author:   lheuer
Date:     2008-12-06 17:23:27 +0000 (Sat, 06 Dec 2008)

Log Message:
-----------
Snapshot a5

Modified Paths:
--------------
    tinytim-mio/trunk/build-15.properties
    tinytim-mio/trunk/build.properties

Modified: tinytim-mio/trunk/build-15.properties
===================================================================
--- tinytim-mio/trunk/build-15.properties	2008-12-06 17:22:07 UTC (rev 251)
+++ tinytim-mio/trunk/build-15.properties	2008-12-06 17:23:27 UTC (rev 252)
@@ -1,5 +1,5 @@
 version=1.5.0
 version_suffix=b2
-release_type=
+#release_type=
 debug=off
 optimize=on

Modified: tinytim-mio/trunk/build.properties
===================================================================
--- tinytim-mio/trunk/build.properties	2008-12-06 17:22:07 UTC (rev 251)
+++ tinytim-mio/trunk/build.properties	2008-12-06 17:23:27 UTC (rev 252)
@@ -1,5 +1,5 @@
 version=2.0.0
-version_suffix=a4
-release_type=
+version_suffix=a5
+#release_type=
 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:[251] tinytim-mio/tags/release-2_0_0a4/

From: <lh...@us...> - 2008-12-06 17:22:10

Revision: 251
          http://tinytim.svn.sourceforge.net/tinytim/?rev=251&view=rev
Author:   lheuer
Date:     2008-12-06 17:22:07 +0000 (Sat, 06 Dec 2008)

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

Added Paths:
-----------
    tinytim-mio/tags/release-2_0_0a4/


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

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

From: <lh...@us...> - 2008-12-06 17:20:52

Revision: 250
          http://tinytim.svn.sourceforge.net/tinytim/?rev=250&view=rev
Author:   lheuer
Date:     2008-12-06 17:20:48 +0000 (Sat, 06 Dec 2008)

Log Message:
-----------
- Updated build scripts
- 1.5 release does not include the source code maybe this will be fixed for the next release
  (I love the TMAPI 1.0 legacy)
- Updated CHANGES.txt (unified for 1.5 / 2.0)
- Updated README (unified for 1.5 / 2.0)

Modified Paths:
--------------
    tinytim-mio/trunk/CHANGES.txt
    tinytim-mio/trunk/README.txt
    tinytim-mio/trunk/build-15.properties
    tinytim-mio/trunk/build-15.xml
    tinytim-mio/trunk/build.properties
    tinytim-mio/trunk/build.xml

Modified: tinytim-mio/trunk/CHANGES.txt
===================================================================
--- tinytim-mio/trunk/CHANGES.txt	2008-12-06 16:55:00 UTC (rev 249)
+++ tinytim-mio/trunk/CHANGES.txt	2008-12-06 17:20:48 UTC (rev 250)
@@ -2,8 +2,9 @@
 Changes Log
 ===========
 
-2.0.0 a4 (06.12.2008)
----------------------
+2.0.0 a4 / 1.5.0b2 (06.12.2008)
+-------------------------------
+* Note: The JTMWriter is not available in 1.5.0b2!
 * Initial .mio release for tinyTiM 2.x
 * Changed license to Apache License 2.0
 * Introduced TopicMapReader / TopicMapWriter interfaces

Modified: tinytim-mio/trunk/README.txt
===================================================================
--- tinytim-mio/trunk/README.txt	2008-12-06 16:55:00 UTC (rev 249)
+++ tinytim-mio/trunk/README.txt	2008-12-06 17:20:48 UTC (rev 250)
@@ -19,7 +19,7 @@
 Installation
 ------------
 Put the ``tinytim-mio-<VERSION>.jar`` together with the ``tinytim-<VERSION>.jar``,
-and ``tmapi-2.0.0.jar`` into the classpath.
+and ``tmapi-<VERSION>.jar`` into the classpath.
 Further, the ``semagia-mio-<VERSION>.jar`` and one or more 
 ``semagia-mio-<SYNTAX-NAME>-<VERSION>.jar`` are needed in the classpath.
 Note, that ``Semagia MIO`` needs the ``Simple Logging Facade for Java`` 

Modified: tinytim-mio/trunk/build-15.properties
===================================================================
--- tinytim-mio/trunk/build-15.properties	2008-12-06 16:55:00 UTC (rev 249)
+++ tinytim-mio/trunk/build-15.properties	2008-12-06 17:20:48 UTC (rev 250)
@@ -1,5 +1,5 @@
 version=1.5.0
 version_suffix=b2
-#release_type=
+release_type=
 debug=off
 optimize=on

Modified: tinytim-mio/trunk/build-15.xml
===================================================================
--- tinytim-mio/trunk/build-15.xml	2008-12-06 16:55:00 UTC (rev 249)
+++ tinytim-mio/trunk/build-15.xml	2008-12-06 17:20:48 UTC (rev 250)
@@ -75,6 +75,8 @@
             windowtitle="tinyTiM MIO API v${dist.version}"
             doctitle="tinyTiM API MIO v${dist.version}">
             <fileset dir="${dir.src}">
+                <exclude name="org/tinytim/mio/JTM*Writer*"/>
+<!--                <include name="org/tinytim/mio/** org/tinytim/mio/*TopicMapReader* org/tinytim/mio/*TopicMapImporter*"/> -->
             </fileset>
             <link href="http://www.tmapi.org/apiDocs/"/>
         </javadoc>
@@ -88,7 +90,9 @@
         <javac destdir="${dir.build.tests}" 
             debug="${debug}"
             optimize="${optimize}"
-            target="1.5">
+            target="1.5"
+            excludes="org/tinytim/mio/TinyTimMapInputHandler*"
+            >
             <classpath>
                 <pathelement location="${dir.build.classes}"/>
                 <pathelement location="${lib.junit}"/>
@@ -149,7 +153,7 @@
             <manifest>
                 <attribute name="Implementation-Title" value="tinyTiM MIO"/>
                 <attribute name="Implementation-Version" value="${dist.version}"/>
-                <attribute name="Implementation-URL" value="http://sourceforge.net/projects/tinytim"/>
+                <attribute name="Implementation-URL" value="http://tinytim.sourceforge.net/"/>
             </manifest>
         </jar>
     </target>
@@ -161,13 +165,14 @@
         <mkdir dir="${dir.dist}"/>
 
         <copy todir="${dir.dist}" file="${dir.build}/${tinytim-mio.jar}"/>
-
+<!--
         <copy todir="${dir.dist}/src">
             <fileset dir="${dir.src}"/>
         </copy>
         <copy todir="${dir.dist}/test">
             <fileset dir="${dir.test}"/>
         </copy>
+-->
         <copy todir="${dir.dist}/lib">
             <fileset dir="${dir.lib}">
                 <exclude name="**/tmapi*.jar"/>
@@ -185,7 +190,7 @@
     <!--                                                                     -->
     <!-- Won't create the distribution files if a test fails                 -->
     <!-- =================================================================== -->
-    <target name="release" depends="jar, test, doc, dist">
+    <target name="release" depends="jar, doc, dist">
         <tar destfile="${dir.dist.root}/${tinytim-mio.tar}"
             basedir="${dir.dist.root}"/>
         <gzip src="${dir.dist.root}/${tinytim-mio.tar}"

Modified: tinytim-mio/trunk/build.properties
===================================================================
--- tinytim-mio/trunk/build.properties	2008-12-06 16:55:00 UTC (rev 249)
+++ tinytim-mio/trunk/build.properties	2008-12-06 17:20:48 UTC (rev 250)
@@ -1,5 +1,5 @@
 version=2.0.0
 version_suffix=a4
-#release_type=
+release_type=
 debug=off
 optimize=on

Modified: tinytim-mio/trunk/build.xml
===================================================================
--- tinytim-mio/trunk/build.xml	2008-12-06 16:55:00 UTC (rev 249)
+++ tinytim-mio/trunk/build.xml	2008-12-06 17:20:48 UTC (rev 250)
@@ -174,7 +174,9 @@
         <copy todir="${dir.dist}" file="${dir.build}/${tinytim-mio.jar}"/>
 
         <copy todir="${dir.dist}/src">
-            <fileset dir="${dir.src}"/>
+            <fileset dir="${dir.src}">
+                <exclude name="**/mio15/**"/>
+            </fileset>
         </copy>
         <copy todir="${dir.dist}/test">
             <fileset dir="${dir.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:[249] tinytim-mio/trunk

From: <lh...@us...> - 2008-12-06 16:55:05

Revision: 249
          http://tinytim.svn.sourceforge.net/tinytim/?rev=249&view=rev
Author:   lheuer
Date:     2008-12-06 16:55:00 +0000 (Sat, 06 Dec 2008)

Log Message:
-----------
Fixed doc, updated build.xml for 2.0

Modified Paths:
--------------
    tinytim-mio/trunk/build.xml
    tinytim-mio/trunk/src/main/java/org/tinytim/mio/TopicMapWriter.java

Modified: tinytim-mio/trunk/build.xml
===================================================================
--- tinytim-mio/trunk/build.xml	2008-12-06 16:23:29 UTC (rev 248)
+++ tinytim-mio/trunk/build.xml	2008-12-06 16:55:00 UTC (rev 249)
@@ -10,7 +10,8 @@
 
     <property name="lib.junit" value="${dir.lib}/junit-4.5.jar"/>
     <property name="lib.tmapi" value="${dir.lib}/tmapi-2.0a1.jar"/>
-    <property name="lib.tinytim" value="${dir.lib}/tinytim-2.0.0a3.jar"/>
+    <property name="lib.tinytim" value="${dir.lib}/tinytim-2.0.0a4.jar"/>
+    <property name="lib.tinytim.tests" value="${dir.lib}/tinytim-2.0.0a4-tests.jar"/>
     <property name="lib.logging" value="${dir.lib}/slf4j-api-1.5.6.jar"/>
     <property name="lib.mio" value="${dir.lib}/semagia-mio-0.9.3.jar"/>
     <property name="lib.json" value="${dir.lib}/json_simple.jar"/>
@@ -68,15 +69,21 @@
         <javadoc destdir="${dir.javadocs}"
             packagenames="org.tinytim.*"
             author="true"
-            version="false"
+            version="true"
             use="true"
             splitindex="true"
             noindex="false"
             windowtitle="tinyTiM MIO API v${dist.version}"
             doctitle="tinyTiM API MIO v${dist.version}">
             <fileset dir="${dir.src}">
+                <exclude name="org/tinytim/mio15/**"/>
             </fileset>
-            <link href="http://www.tmapi.org/apiDocs/"/>
+<!--            
+            <doclet name="net.gleamynode.apiviz.APIviz"
+                path="${dir.lib}/apiviz-1.2.5.GA.jar">
+            </doclet>
+-->
+            <link href="http://www.tmapi.org/2.0/api/"/>
         </javadoc>
     </target>
 
@@ -88,12 +95,15 @@
         <javac destdir="${dir.build.tests}" 
             debug="${debug}"
             optimize="${optimize}"
-            target="1.5">
+            target="1.5"
+            excludes="org/tinytim/mio15/**"
+            >
             <classpath>
                 <pathelement location="${dir.build.classes}"/>
                 <pathelement location="${lib.junit}"/>
                 <pathelement location="${lib.tmapi}"/>
                 <pathelement location="${lib.tinytim}"/>
+                <pathelement location="${lib.tinytim.tests}"/>
                 <pathelement location="${lib.mio}"/>
             </classpath>
             <src path="${dir.test}"/>
@@ -106,6 +116,7 @@
                 <pathelement location="${lib.junit}"/>
                 <pathelement location="${lib.tmapi}"/>
                 <pathelement location="${lib.tinytim}"/>
+                <pathelement location="${lib.tinytim.tests}"/>
                 <pathelement location="${lib.mio}"/>
             </classpath>
             <formatter type="brief" usefile="false"/>
@@ -129,6 +140,7 @@
             <classpath>
                 <pathelement location="${lib.tmapi}"/>
                 <pathelement location="${lib.tinytim}"/>
+                <pathelement location="${lib.tinytim.tests}"/>
                 <pathelement location="${lib.mio}"/>
                 <pathelement location="${lib.logging}"/>
                 <pathelement location="${lib.json}"/>
@@ -148,7 +160,7 @@
             <manifest>
                 <attribute name="Implementation-Title" value="tinyTiM MIO"/>
                 <attribute name="Implementation-Version" value="${dist.version}"/>
-                <attribute name="Implementation-URL" value="http://sourceforge.net/projects/tinytim"/>
+                <attribute name="Implementation-URL" value="http://tinytim.sourceforge.net/"/>
             </manifest>
         </jar>
     </target>

Modified: tinytim-mio/trunk/src/main/java/org/tinytim/mio/TopicMapWriter.java
===================================================================
--- tinytim-mio/trunk/src/main/java/org/tinytim/mio/TopicMapWriter.java	2008-12-06 16:23:29 UTC (rev 248)
+++ tinytim-mio/trunk/src/main/java/org/tinytim/mio/TopicMapWriter.java	2008-12-06 16:55:00 UTC (rev 249)
@@ -23,7 +23,7 @@
  * This interface represents a writer to serialize a topic map.
  * <p>
  * The writer is not meant to be reused and should be thrown away once the 
- * {{@link #write(TopicMap)} method was invoked.
+ * {@link #write(TopicMap)} method was invoked.
  * </p>
  * 
  * @author Lars Heuer (heuer[at]semagia.com) <a href="http://www.semagia.com/">Semagia</a>


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

[tinyTiM-commits] SF.net SVN: tinytim:[248] tinytim-mio/trunk/lib

From: <lh...@us...> - 2008-12-06 16:23:39

Revision: 248
          http://tinytim.svn.sourceforge.net/tinytim/?rev=248&view=rev
Author:   lheuer
Date:     2008-12-06 16:23:29 +0000 (Sat, 06 Dec 2008)

Log Message:
-----------
Updated tinytim libs

Added Paths:
-----------
    tinytim-mio/trunk/lib/tinytim-2.0.0a4-tests.jar
    tinytim-mio/trunk/lib/tinytim-2.0.0a4.jar

Removed Paths:
-------------
    tinytim-mio/trunk/lib/tinytim-2.0.0a3-tests.jar
    tinytim-mio/trunk/lib/tinytim-2.0.0a3.jar

Deleted: tinytim-mio/trunk/lib/tinytim-2.0.0a3-tests.jar
===================================================================
(Binary files differ)

Deleted: tinytim-mio/trunk/lib/tinytim-2.0.0a3.jar
===================================================================
(Binary files differ)

Added: tinytim-mio/trunk/lib/tinytim-2.0.0a4-tests.jar
===================================================================
(Binary files differ)


Property changes on: tinytim-mio/trunk/lib/tinytim-2.0.0a4-tests.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: tinytim-mio/trunk/lib/tinytim-2.0.0a4.jar
===================================================================
(Binary files differ)


Property changes on: tinytim-mio/trunk/lib/tinytim-2.0.0a4.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:[247] tinytim/trunk/build.properties

From: <lh...@us...> - 2008-12-06 14:17:25

Revision: 247
          http://tinytim.svn.sourceforge.net/tinytim/?rev=247&view=rev
Author:   lheuer
Date:     2008-12-06 14:17:21 +0000 (Sat, 06 Dec 2008)

Log Message:
-----------
New snapshot #a5

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

Modified: tinytim/trunk/build.properties
===================================================================
--- tinytim/trunk/build.properties	2008-12-06 14:15:36 UTC (rev 246)
+++ tinytim/trunk/build.properties	2008-12-06 14:17:21 UTC (rev 247)
@@ -1,5 +1,5 @@
 version=2.0.0
-version_suffix=a4
-release_type=
+version_suffix=a5
+#release_type=
 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:[246] tinytim/tags/release-2_0_0a4/

From: <lh...@us...> - 2008-12-06 14:15:39

Revision: 246
          http://tinytim.svn.sourceforge.net/tinytim/?rev=246&view=rev
Author:   lheuer
Date:     2008-12-06 14:15:36 +0000 (Sat, 06 Dec 2008)

Log Message:
-----------
Preparing 2.0.0a4 release

Added Paths:
-----------
    tinytim/tags/release-2_0_0a4/


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

[tinyTiM-commits] SF.net SVN: tinytim:[245] tinytim/trunk/build.properties

From: <lh...@us...> - 2008-12-06 14:14:23

Revision: 245
          http://tinytim.svn.sourceforge.net/tinytim/?rev=245&view=rev
Author:   lheuer
Date:     2008-12-06 14:14:16 +0000 (Sat, 06 Dec 2008)

Log Message:
-----------
Preparing 2a4 release

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

Modified: tinytim/trunk/build.properties
===================================================================
--- tinytim/trunk/build.properties	2008-12-06 14:13:20 UTC (rev 244)
+++ tinytim/trunk/build.properties	2008-12-06 14:14:16 UTC (rev 245)
@@ -1,5 +1,5 @@
 version=2.0.0
 version_suffix=a4
-#release_type=
+release_type=
 debug=off
 optimize=on


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

Flat | Threaded

<< < 1 .. 5 6 7 8 9 .. 17 > >> (Page 7 of 17)

2008	Jan	Feb	Mar	Apr (48)	May (21)	Jun (3)	Jul (10)	Aug (66)	Sep (11)	Oct (7)	Nov (73)	Dec (12)
2009	Jan (3)	Feb (17)	Mar (19)	Apr (1)	May (4)	Jun	Jul (43)	Aug (18)	Sep (1)	Oct (1)	Nov (2)	Dec
2010	Jan (3)	Feb (7)	Mar (21)	Apr (2)	May (1)	Jun (1)	Jul (6)	Aug (6)	Sep (7)	Oct	Nov (1)	Dec
2011	Jan (1)	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec