Permalink
Browse files

initial restructuring of packages

  • Loading branch information...
1 parent 711cc62 commit 23abf97a9fb0829dbcf9033fee3a6d0e07c1d811 @tristan committed May 7, 2013
Showing with 129 additions and 96 deletions.
  1. +1 −0 .gitignore
  2. +2 −2 core/pom.xml
  3. +5 −4 core/src/main/java/{de/dfki/km/json/jsonld → com/github/jsonldjava/core}/JSONLD.java
  4. +1 −1 core/src/main/java/{de/dfki/km/json/jsonld → com/github/jsonldjava/core}/JSONLDConsts.java
  5. +1 −1 core/src/main/java/{de/dfki/km/json/jsonld → com/github/jsonldjava/core}/JSONLDProcessingError.java
  6. +5 −4 core/src/main/java/{de/dfki/km/json/jsonld → com/github/jsonldjava/core}/JSONLDProcessor.java
  7. +3 −2 core/src/main/java/{de/dfki/km/json/jsonld → com/github/jsonldjava/core}/JSONLDSerializer.java
  8. +1 −1 core/src/main/java/{de/dfki/km/json/jsonld → com/github/jsonldjava/core}/JSONLDTripleCallback.java
  9. +3 −2 core/src/main/java/{de/dfki/km/json/jsonld → com/github/jsonldjava/core}/JSONLDUtils.java
  10. +4 −3 core/src/main/java/{de/dfki/km/json/jsonld → com/github/jsonldjava}/impl/NQuadJSONLDSerializer.java
  11. +3 −2 core/src/main/java/{de/dfki/km/json/jsonld → com/github/jsonldjava}/impl/NQuadTripleCallback.java
  12. +1 −1 core/src/main/java/{de/dfki/km/json → com/github/jsonldjava/utils}/JSONUtils.java
  13. +1 −1 core/src/main/java/{de/dfki/km/json/jsonld → com/github/jsonldjava}/utils/Obj.java
  14. +7 −4 core/src/test/java/{de/dfki/km/json/jsonld → com/github/jsonldjava/core}/IgnoreKeysTest.java
  15. +10 −5 core/src/test/java/{de/dfki/km/json/jsonld → com/github/jsonldjava/core}/JSONLDProcessorTest.java
  16. +4 −1 core/src/test/java/{de/dfki/km/json → com/github/jsonldjava/utils}/JSONUtilsTest.java
  17. +2 −2 integration/clerezza/pom.xml
  18. +3 −2 ...a/src/main/java/{de/dfki/km/json/jsonld → com/github/jsonldjava}/impl/ClerezzaTripleCallback.java
  19. +6 −3 ...c/test/java/{de/dfki/km/json/jsonld → com/github/jsonldjava/impl}/ClerezzaTripleCallbackTest.java
  20. +2 −2 integration/jena/pom.xml
  21. +3 −3 ...ena/src/main/java/{de/dfki/km/json/jsonld → com/github/jsonldjava}/impl/JenaJSONLDSerializer.java
  22. +2 −2 .../jena/src/main/java/{de/dfki/km/json/jsonld → com/github/jsonldjava}/impl/JenaTripleCallback.java
  23. +5 −4 ...a/src/test/java/{de/dfki/km/json/jsonld → com/github/jsonldjava/impl}/JenaTripleCallbackTest.java
  24. +2 −2 integration/pom.xml
  25. +2 −2 integration/sesame/pom.xml
  26. +5 −4 ...esame/src/main/java/{de/dfki/km/json/jsonld → com/github/jsonldjava}/impl/SesameJSONLDParser.java
  27. +1 −1 ...rc/main/java/{de/dfki/km/json/jsonld → com/github/jsonldjava}/impl/SesameJSONLDParserFactory.java
  28. +4 −3 ...e/src/main/java/{de/dfki/km/json/jsonld → com/github/jsonldjava}/impl/SesameJSONLDSerializer.java
  29. +6 −5 ...esame/src/main/java/{de/dfki/km/json/jsonld → com/github/jsonldjava}/impl/SesameJSONLDWriter.java
  30. +1 −1 ...rc/main/java/{de/dfki/km/json/jsonld → com/github/jsonldjava}/impl/SesameJSONLDWriterFactory.java
  31. +3 −2 ...ame/src/main/java/{de/dfki/km/json/jsonld → com/github/jsonldjava}/impl/SesameTripleCallback.java
  32. +4 −3 ...est/java/{de/dfki/km/json/jsonld → com/github/jsonldjava/impl}/SesameJSONLDParserHandlerTest.java
  33. +4 −3 ...e/src/test/java/{de/dfki/km/json/jsonld → com/github/jsonldjava/impl}/SesameJSONLDWriterTest.java
  34. +6 −3 ...src/test/java/{de/dfki/km/json/jsonld → com/github/jsonldjava/impl}/SesameTripleCallbackTest.java
  35. +2 −2 pom.xml
  36. +2 −2 tools/pom.xml
  37. +6 −5 tools/src/main/java/{de/dfki/km/json/jsonld/tools → com/github/jsonldjava/impl}/Playground.java
  38. +6 −6 tools/src/main/java/{de/dfki/km/json/jsonld/tools → com/github/jsonldjava/impl}/RDF2JSONLD.java
View
1 .gitignore 100644 → 100755
@@ -5,3 +5,4 @@ target/
.svn/
*.iml
.idea
+*~
View
4 core/pom.xml 100644 → 100755
@@ -3,8 +3,8 @@
<parent>
<artifactId>jsonld-java-parent</artifactId>
- <groupId>dfki.km.json</groupId>
- <version>1.0.1-SNAPSHOT</version>
+ <groupId>com.github.jsonldjava</groupId>
+ <version>0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsonld-java</artifactId>
@@ -1,13 +1,14 @@
-package de.dfki.km.json.jsonld;
+package com.github.jsonldjava.core;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import de.dfki.km.json.jsonld.JSONLDProcessor.ActiveContext;
-import de.dfki.km.json.jsonld.JSONLDProcessor.Options;
-import de.dfki.km.json.jsonld.JSONLDProcessor.UniqueNamer;
+import com.github.jsonldjava.core.JSONLDProcessor.ActiveContext;
+import com.github.jsonldjava.core.JSONLDProcessor.Options;
+import com.github.jsonldjava.core.JSONLDProcessor.UniqueNamer;
+
public class JSONLD {
@@ -1,4 +1,4 @@
-package de.dfki.km.json.jsonld;
+package com.github.jsonldjava.core;
public class JSONLDConsts {
@@ -1,4 +1,4 @@
-package de.dfki.km.json.jsonld;
+package com.github.jsonldjava.core;
import java.util.HashMap;
import java.util.Map;
@@ -1,4 +1,4 @@
-package de.dfki.km.json.jsonld;
+package com.github.jsonldjava.core;
import java.net.URI;
import java.net.URISyntaxException;
@@ -21,9 +21,10 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import de.dfki.km.json.JSONUtils;
-import de.dfki.km.json.jsonld.impl.NQuadTripleCallback;
-import de.dfki.km.json.jsonld.utils.Obj;
+import com.github.jsonldjava.impl.NQuadTripleCallback;
+import com.github.jsonldjava.utils.JSONUtils;
+import com.github.jsonldjava.utils.Obj;
+
public class JSONLDProcessor {
@@ -1,11 +1,12 @@
-package de.dfki.km.json.jsonld;
+package com.github.jsonldjava.core;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import de.dfki.km.json.jsonld.utils.Obj;
+
+import com.github.jsonldjava.utils.Obj;
/**
* Base class for constructing the list of statements used by JSONLDProcessor.fromRDF to
@@ -1,4 +1,4 @@
-package de.dfki.km.json.jsonld;
+package com.github.jsonldjava.core;
public abstract class JSONLDTripleCallback {
/**
@@ -1,4 +1,4 @@
-package de.dfki.km.json.jsonld;
+package com.github.jsonldjava.core;
import java.io.IOException;
import java.net.MalformedURLException;
@@ -15,7 +15,8 @@
import java.util.regex.Pattern;
import com.fasterxml.jackson.core.JsonParseException;
-import de.dfki.km.json.JSONUtils;
+import com.github.jsonldjava.utils.JSONUtils;
+
public class JSONLDUtils {
@@ -1,10 +1,11 @@
-package de.dfki.km.json.jsonld.impl;
+package com.github.jsonldjava.impl;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import de.dfki.km.json.jsonld.JSONLDProcessingError;
-import de.dfki.km.json.jsonld.JSONLDSerializer;
+import com.github.jsonldjava.core.JSONLDProcessingError;
+import com.github.jsonldjava.core.JSONLDSerializer;
+
public class NQuadJSONLDSerializer extends JSONLDSerializer {
@@ -1,10 +1,11 @@
-package de.dfki.km.json.jsonld.impl;
+package com.github.jsonldjava.impl;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import de.dfki.km.json.jsonld.JSONLDTripleCallback;
+import com.github.jsonldjava.core.JSONLDTripleCallback;
+
public class NQuadTripleCallback extends JSONLDTripleCallback {
@@ -1,4 +1,4 @@
-package de.dfki.km.json;
+package com.github.jsonldjava.utils;
import java.io.BufferedReader;
import java.io.IOException;
@@ -1,4 +1,4 @@
-package de.dfki.km.json.jsonld.utils;
+package com.github.jsonldjava.utils;
import java.util.Map;
@@ -1,4 +1,4 @@
-package de.dfki.km.json.jsonld;
+package com.github.jsonldjava.core;
import static org.junit.Assert.assertTrue;
@@ -12,9 +12,12 @@
import org.junit.Test;
-import de.dfki.km.json.JSONUtils;
-import de.dfki.km.json.jsonld.JSONLDProcessor.Options;
-import de.dfki.km.json.jsonld.impl.NQuadTripleCallback;
+import com.github.jsonldjava.core.JSONLD;
+import com.github.jsonldjava.core.JSONLDProcessingError;
+import com.github.jsonldjava.core.JSONLDProcessor.Options;
+import com.github.jsonldjava.impl.NQuadTripleCallback;
+import com.github.jsonldjava.utils.JSONUtils;
+
/**
* Test to make sure the ignoreKeys are behaving as expected
@@ -1,4 +1,4 @@
-package de.dfki.km.json.jsonld;
+package com.github.jsonldjava.core;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
@@ -27,10 +27,15 @@
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
-import de.dfki.km.json.JSONUtils;
-import de.dfki.km.json.jsonld.JSONLDProcessor.Options;
-import de.dfki.km.json.jsonld.impl.NQuadJSONLDSerializer;
-import de.dfki.km.json.jsonld.impl.NQuadTripleCallback;
+import com.github.jsonldjava.core.JSONLD;
+import com.github.jsonldjava.core.JSONLDProcessingError;
+import com.github.jsonldjava.core.JSONLDProcessor;
+import com.github.jsonldjava.core.JSONLDUtils;
+import com.github.jsonldjava.core.JSONLDProcessor.Options;
+import com.github.jsonldjava.impl.NQuadJSONLDSerializer;
+import com.github.jsonldjava.impl.NQuadTripleCallback;
+import com.github.jsonldjava.utils.JSONUtils;
+
@RunWith(Parameterized.class)
public class JSONLDProcessorTest {
@@ -1,11 +1,14 @@
-package de.dfki.km.json;
+package com.github.jsonldjava.utils;
import static org.junit.Assert.assertTrue;
import java.util.Map;
import org.junit.Test;
+import com.github.jsonldjava.utils.JSONUtils;
+
+
public class JSONUtilsTest {
@Test
View
4 integration/clerezza/pom.xml 100644 → 100755
@@ -3,8 +3,8 @@
<parent>
<artifactId>jsonld-java-integration</artifactId>
- <groupId>dfki.km.json</groupId>
- <version>1.0.1-SNAPSHOT</version>
+ <groupId>com.github.jsonldjava</groupId>
+ <version>0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsonld-java-clerezza</artifactId>
@@ -1,16 +1,17 @@
-package de.dfki.km.json.jsonld.impl;
+package com.github.jsonldjava.impl;
import java.util.HashMap;
import java.util.Map;
-import de.dfki.km.json.jsonld.JSONLDTripleCallback;
import org.apache.clerezza.rdf.core.*;
import org.apache.clerezza.rdf.core.impl.PlainLiteralImpl;
import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
import org.apache.clerezza.rdf.core.impl.TripleImpl;
import org.apache.clerezza.rdf.core.impl.TypedLiteralImpl;
+import com.github.jsonldjava.core.JSONLDTripleCallback;
+
public class ClerezzaTripleCallback extends JSONLDTripleCallback {
private MGraph mGraph = new SimpleMGraph();
@@ -1,4 +1,4 @@
-package de.dfki.km.json.jsonld;
+package com.github.jsonldjava.impl;
import static org.junit.Assert.assertEquals;
@@ -11,8 +11,11 @@
import org.apache.clerezza.rdf.core.Triple;
import org.junit.Test;
-import de.dfki.km.json.JSONUtils;
-import de.dfki.km.json.jsonld.impl.ClerezzaTripleCallback;
+import com.github.jsonldjava.core.JSONLD;
+import com.github.jsonldjava.core.JSONLDProcessingError;
+import com.github.jsonldjava.impl.ClerezzaTripleCallback;
+import com.github.jsonldjava.utils.JSONUtils;
+
public class ClerezzaTripleCallbackTest {
View
4 integration/jena/pom.xml 100644 → 100755
@@ -3,8 +3,8 @@
<parent>
<artifactId>jsonld-java-integration</artifactId>
- <groupId>dfki.km.json</groupId>
- <version>1.0.1-SNAPSHOT</version>
+ <groupId>com.github.jsonldjava</groupId>
+ <version>0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsonld-java-jena</artifactId>
@@ -1,7 +1,8 @@
-package de.dfki.km.json.jsonld.impl;
+package com.github.jsonldjava.impl;
import java.util.Map;
+import com.github.jsonldjava.core.JSONLDProcessingError;
import com.hp.hpl.jena.rdf.model.Literal;
import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.Property;
@@ -11,9 +12,8 @@
import com.hp.hpl.jena.rdf.model.Statement;
import com.hp.hpl.jena.rdf.model.StmtIterator;
-import de.dfki.km.json.jsonld.JSONLDProcessingError;
-public class JenaJSONLDSerializer extends de.dfki.km.json.jsonld.JSONLDSerializer {
+public class JenaJSONLDSerializer extends com.github.jsonldjava.core.JSONLDSerializer {
// private static final Logger LOG = LoggerFactory.getLogger(
// JenaJSONLDSerializer.class );
@@ -1,13 +1,13 @@
-package de.dfki.km.json.jsonld.impl;
+package com.github.jsonldjava.impl;
+import com.github.jsonldjava.core.JSONLDTripleCallback;
import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.ModelFactory;
import com.hp.hpl.jena.rdf.model.Property;
import com.hp.hpl.jena.rdf.model.RDFNode;
import com.hp.hpl.jena.rdf.model.Resource;
import com.hp.hpl.jena.rdf.model.Statement;
-import de.dfki.km.json.jsonld.JSONLDTripleCallback;
public class JenaTripleCallback extends JSONLDTripleCallback {
@@ -1,15 +1,16 @@
-package de.dfki.km.json.jsonld;
+package com.github.jsonldjava.impl;
import com.fasterxml.jackson.core.JsonParseException;
import com.fasterxml.jackson.databind.JsonMappingException;
+import com.github.jsonldjava.core.JSONLDProcessor;
+import com.github.jsonldjava.impl.JenaTripleCallback;
+import com.github.jsonldjava.utils.JSONUtils;
+
import org.junit.Test;
import com.hp.hpl.jena.rdf.model.Model;
-import de.dfki.km.json.JSONUtils;
-import de.dfki.km.json.jsonld.JSONLDProcessor;
-import de.dfki.km.json.jsonld.impl.JenaTripleCallback;
public class JenaTripleCallbackTest {
View
4 integration/pom.xml 100644 → 100755
@@ -3,8 +3,8 @@
<parent>
<artifactId>jsonld-java-parent</artifactId>
- <groupId>dfki.km.json</groupId>
- <version>1.0.1-SNAPSHOT</version>
+ <groupId>com.github.jsonldjava</groupId>
+ <version>0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsonld-java-integration</artifactId>
View
4 integration/sesame/pom.xml 100644 → 100755
@@ -3,8 +3,8 @@
<parent>
<artifactId>jsonld-java-integration</artifactId>
- <groupId>dfki.km.json</groupId>
- <version>1.0.1-SNAPSHOT</version>
+ <groupId>com.github.jsonldjava</groupId>
+ <version>0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsonld-java-sesame</artifactId>
@@ -1,7 +1,7 @@
/**
*
*/
-package de.dfki.km.json.jsonld.impl;
+package com.github.jsonldjava.impl;
import java.io.IOException;
import java.io.InputStream;
@@ -15,9 +15,10 @@
import org.openrdf.rio.RDFParser;
import org.openrdf.rio.helpers.RDFParserBase;
-import de.dfki.km.json.JSONUtils;
-import de.dfki.km.json.jsonld.JSONLD;
-import de.dfki.km.json.jsonld.JSONLDProcessingError;
+import com.github.jsonldjava.core.JSONLD;
+import com.github.jsonldjava.core.JSONLDProcessingError;
+import com.github.jsonldjava.utils.JSONUtils;
+
/**
* An {@link RDFParser} that links to {@link SesameTripleCallback}.
@@ -1,7 +1,7 @@
/**
*
*/
-package de.dfki.km.json.jsonld.impl;
+package com.github.jsonldjava.impl;
import org.openrdf.rio.RDFFormat;
import org.openrdf.rio.RDFParser;
Oops, something went wrong.

0 comments on commit 23abf97

Please sign in to comment.