You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@clerezza.apache.org by ha...@apache.org on 2019/07/29 16:27:20 UTC
[clerezza] branch reunited updated: CLEREZZA-1043: Rename package
org.apache.clerezza.api to org.apache.clerezza
This is an automated email from the ASF dual-hosted git repository.
hasan pushed a commit to branch reunited
in repository https://gitbox.apache.org/repos/asf/clerezza.git
The following commit(s) were added to refs/heads/reunited by this push:
new d2c6c5c CLEREZZA-1043: Rename package org.apache.clerezza.api to org.apache.clerezza
d2c6c5c is described below
commit d2c6c5cce147aebe7f41e98a5b0f20f09ae83cd6
Author: Hasan <ha...@apache.org>
AuthorDate: Mon Jul 29 18:19:33 2019 +0200
CLEREZZA-1043: Rename package org.apache.clerezza.api to org.apache.clerezza
---
.../apache/clerezza/{api => }/impl/TripleImpl.java | 10 +-
.../{api => }/impl/debug/ReadLockDebug.java | 2 +-
.../impl/debug/ReentrantReadWriteLockTracker.java | 2 +-
.../{api => }/impl/debug/WriteLockDebug.java | 2 +-
.../{api => }/impl/graph/AbstractGraph.java | 6 +-
.../impl/graph/AbstractImmutableGraph.java | 12 +-
.../{api => }/impl/graph/DelayedNotificator.java | 6 +-
.../{api => }/impl/graph/LockingIterator.java | 4 +-
.../impl/graph/PrivilegedGraphWrapper.java | 4 +-
.../graph/PrivilegedImmuatbleGraphWrapper.java | 4 +-
.../{api => }/impl/graph/ReadOnlyException.java | 2 +-
.../clerezza/{api => }/impl/graph/SimpleGraph.java | 4 +-
.../{api => }/impl/graph/SimpleImmutableGraph.java | 4 +-
.../{api => }/impl/graph/SimpleMGraph.java | 6 +-
.../impl/graph/WatchableGraphWrapper.java | 6 +-
.../{api => }/impl/graph/WriteBlockedGraph.java | 4 +-
.../{api => }/impl/graphmatching/GraphMatcher.java | 8 +-
.../graphmatching/GraphNotIsomorphicException.java | 2 +-
.../impl/graphmatching/GroupMappingIterator.java | 2 +-
.../{api => }/impl/graphmatching/HashMatching.java | 10 +-
.../impl/graphmatching/MappingIterator.java | 2 +-
.../impl/graphmatching/PermutationIterator.java | 2 +-
.../{api => }/impl/graphmatching/Utils.java | 6 +-
.../impl/graphmatching/collections/IntHashMap.java | 2 +-
.../impl/graphmatching/collections/IntHashSet.java | 2 +-
.../graphmatching/collections/IntIterator.java | 2 +-
.../impl/graphmatching/collections/IntSet.java | 2 +-
.../{api => }/impl/literal/AbstractLiteral.java | 4 +-
.../impl/literal/InvalidLiteralTypeException.java | 4 +-
.../{api => }/impl/literal/LiteralFactory.java | 4 +-
.../{api => }/impl/literal/LiteralImpl.java | 6 +-
.../impl/literal/NoConvertorException.java | 2 +-
.../{api => }/impl/literal/PlainLiteralImpl.java | 8 +-
.../impl/literal/SimpleLiteralFactory.java | 10 +-
.../{api => }/impl/literal/TypedLiteralImpl.java | 6 +-
.../clerezza/{api => }/impl/package-info.java | 2 +-
.../clerezza/{api => }/impl/util/Base64.java | 2 +-
.../{api => }/impl/util/W3CDateFormat.java | 2 +-
.../clerezza/{api => }/impl/LanguageTest.java | 4 +-
.../apache/clerezza/{api => }/impl/UriRefTest.java | 4 +-
.../clerezza/{api => }/impl/graph/GraphTest.java | 10 +-
.../{api => }/impl/graph/SimpleGraphTest.java | 8 +-
.../impl/graphmatching/GraphMatcherTest.java | 16 +-
.../impl/graphmatching/HashMatchingTest.java | 8 +-
.../graphmatching/PermutationIteratorTest.java | 2 +-
.../impl/graphmatching/Utils4Testing.java | 14 +-
.../{api => }/impl/literal/LiteralFactoryTest.java | 6 +-
.../impl/literal/PlainLiteralImplTest.java | 6 +-
.../{api => }/impl/literal/TripleImplTest.java | 13 +-
.../impl/literal/TypedLiteralImplTest.java | 7 +-
api.utils/pom.xml.backup | 169 +++++++++++++++++
.../apache/clerezza/{api => }/utils/GraphNode.java | 10 +-
.../clerezza/{api => }/utils/GraphUtils.java | 6 +-
.../apache/clerezza/{api => }/utils/IRIUtil.java | 2 +-
.../apache/clerezza/{api => }/utils/RdfList.java | 6 +-
.../clerezza/{api => }/utils/SeeAlsoExpander.java | 8 +-
.../apache/clerezza/{api => }/utils/Smusher.java | 8 +-
.../clerezza/{api => }/utils/UnionGraph.java | 6 +-
.../{api => }/utils/UnionWatchableGraph.java | 10 +-
.../clerezza/{api => }/utils/UriMutatingGraph.java | 8 +-
.../utils/graphnodeprovider/GraphNodeProvider.java | 6 +-
.../{api => }/utils/smushing/BaseSmusher.java | 8 +-
.../{api => }/utils/smushing/IfpSmusher.java | 4 +-
.../{api => }/utils/smushing/SameAsSmusher.java | 10 +-
.../{api => }/scala/utils/CollectedIter.scala | 2 +-
.../clerezza/{api => }/scala/utils/EzLiteral.scala | 7 +-
.../clerezza/{api => }/scala/utils/EzMGraph.scala | 12 +-
.../clerezza/{api => }/scala/utils/NameSpace.scala | 4 +-
.../clerezza/{api => }/scala/utils/Preamble.scala | 14 +-
.../{api => }/scala/utils/RichGraphNode.scala | 14 +-
.../clerezza/{api => }/utils/GraphUtilsTest.java | 23 ++-
.../clerezza/{api => }/utils/IfpSmushTest.java | 14 +-
.../clerezza/{api => }/utils/RdfListTest.java | 14 +-
.../clerezza/{api => }/utils/SameAsSmushTest.java | 16 +-
.../clerezza/{api => }/utils/TestGraphNode.java | 10 +-
.../clerezza/{api => }/utils/UnionGraphTest.java | 14 +-
.../{api => }/utils/smushing/SameAsSmushTest.java | 16 +-
.../{api => }/scala/utils/EzMGraphTest.scala | 17 +-
.../{api => }/scala/utils/RichGraphNodeTest.scala | 21 ++-
.../{api => }/scala/utils/TypeConversionTest.scala | 11 +-
api/pom.xml | 2 +-
.../org/apache/clerezza/{api => }/BlankNode.java | 2 +-
.../apache/clerezza/{api => }/BlankNodeOrIRI.java | 2 +-
.../java/org/apache/clerezza/{api => }/Graph.java | 2 +-
.../java/org/apache/clerezza/{api => }/IRI.java | 2 +-
.../apache/clerezza/{api => }/ImmutableGraph.java | 2 +-
.../org/apache/clerezza/{api => }/Language.java | 2 +-
.../org/apache/clerezza/{api => }/Literal.java | 2 +-
.../org/apache/clerezza/{api => }/RDFTerm.java | 2 +-
.../java/org/apache/clerezza/{api => }/Triple.java | 2 +-
.../apache/clerezza/{api => }/WatchableGraph.java | 6 +-
.../apache/clerezza/{api => }/event/AddEvent.java | 6 +-
.../clerezza/{api => }/event/FilterTriple.java | 10 +-
.../clerezza/{api => }/event/GraphEvent.java | 6 +-
.../clerezza/{api => }/event/GraphListener.java | 2 +-
.../clerezza/{api => }/event/RemoveEvent.java | 6 +-
.../apache/clerezza/{api => }/package-info.java | 2 +-
api/target.old/.plxarc | 1 +
api/target.old/api-8-SNAPSHOT-sources.jar | Bin 0 -> 22274 bytes
api/target.old/api-8-SNAPSHOT.jar | Bin 0 -> 15325 bytes
api/target.old/classes/META-INF/DEPENDENCIES | 11 ++
api/target.old/classes/META-INF/LICENSE | 202 +++++++++++++++++++++
api/target.old/classes/META-INF/MANIFEST.MF | 18 ++
api/target.old/classes/META-INF/NOTICE | 8 +
.../org/apache/clerezza/api/BlankNode.class | Bin 0 -> 346 bytes
.../org/apache/clerezza/api/BlankNodeOrIRI.class | Bin 0 -> 172 bytes
.../classes/org/apache/clerezza/api/Graph.class | Bin 0 -> 732 bytes
.../classes/org/apache/clerezza/api/IRI.class | Bin 0 -> 1224 bytes
.../org/apache/clerezza/api/ImmutableGraph.class | Bin 0 -> 236 bytes
.../classes/org/apache/clerezza/api/Language.class | Bin 0 -> 992 bytes
.../classes/org/apache/clerezza/api/Literal.class | Bin 0 -> 389 bytes
.../classes/org/apache/clerezza/api/RDFTerm.class | Bin 0 -> 119 bytes
.../classes/org/apache/clerezza/api/Triple.class | Bin 0 -> 364 bytes
.../org/apache/clerezza/api/WatchableGraph.class | Bin 0 -> 477 bytes
.../org/apache/clerezza/api/event/AddEvent.class | Bin 0 -> 508 bytes
.../apache/clerezza/api/event/FilterTriple.class | Bin 0 -> 1767 bytes
.../org/apache/clerezza/api/event/GraphEvent.class | Bin 0 -> 766 bytes
.../apache/clerezza/api/event/GraphListener.class | Bin 0 -> 268 bytes
.../apache/clerezza/api/event/RemoveEvent.class | Bin 0 -> 517 bytes
.../META-INF/DEPENDENCIES | 11 ++
.../META-INF/LICENSE | 202 +++++++++++++++++++++
.../maven-shared-archive-resources/META-INF/NOTICE | 8 +
.../compile/default-compile/createdFiles.lst | 15 ++
.../compile/default-compile/inputFiles.lst | 16 ++
api/target.old/test-classes/META-INF/DEPENDENCIES | 11 ++
api/target.old/test-classes/META-INF/LICENSE | 202 +++++++++++++++++++++
api/target.old/test-classes/META-INF/NOTICE | 8 +
.../dataset/EntityAlreadyExistsException.java | 2 +-
.../dataset/EntityUndeletableException.java | 2 +-
.../dataset/ImmutableGraphServiceFactory.java | 4 +-
.../clerezza/dataset/MGraphServiceFactory.java | 2 +-
.../clerezza/dataset/NoSuchEntityException.java | 2 +-
.../clerezza/dataset/QueryableTcProvider.java | 2 +-
.../org/apache/clerezza/dataset/SecuredGraph.java | 6 +-
.../org/apache/clerezza/dataset/TcManager.java | 10 +-
.../org/apache/clerezza/dataset/TcProvider.java | 6 +-
.../clerezza/dataset/TcProviderMultiplexer.java | 6 +-
.../dataset/security/TcAccessController.java | 6 +-
.../clerezza/simple/storage/SimpleTcProvider.java | 10 +-
.../org/apache/clerezza/dataset/SecurityTest.java | 12 +-
.../org/apache/clerezza/dataset/TcManagerTest.java | 12 +-
.../clerezza/dataset/providers/WeightedA.java | 10 +-
.../clerezza/dataset/providers/WeightedA1.java | 10 +-
.../clerezza/dataset/providers/WeightedAHeavy.java | 10 +-
.../clerezza/dataset/providers/WeightedBlight.java | 10 +-
.../clerezza/dataset/providers/WeightedDummy.java | 10 +-
.../dataset/test/utils/TcProviderTest.java | 8 +-
.../simple/storage/AccessViaTcManager.java | 6 +-
.../simple/storage/SimpleGraphGenericTest.java | 4 +-
.../jaxrs/rdf/providers/GraphNodeWriter.java | 12 +-
.../clerezza/jaxrs/rdf/providers/GraphReader.java | 4 +-
.../clerezza/jaxrs/rdf/providers/GraphWriter.java | 2 +-
.../jaxrs/rdf/providers/ImmutableGraphReader.java | 2 +-
.../providers/ResultSetCsvMessageBodyWriter.java | 40 ++--
.../providers/ResultSetJsonMessageBodyWriter.java | 34 ++--
.../providers/ResultSetTsvMessageBodyWriter.java | 40 ++--
.../providers/ResultSetXmlMessageBodyWriter.java | 40 ++--
.../org/apache/clerezza/ontologies/DCTERMS.java | 2 +-
.../java/org/apache/clerezza/ontologies/FOAF.java | 2 +-
.../java/org/apache/clerezza/ontologies/OWL.java | 2 +-
.../org/apache/clerezza/ontologies/PLATFORM.java | 2 +-
.../java/org/apache/clerezza/ontologies/RDF.java | 2 +-
.../java/org/apache/clerezza/ontologies/RDFS.java | 2 +-
.../org/apache/clerezza/ontologies/SKOS04.java | 2 +-
.../org/apache/clerezza/ontologies/SKOS08.java | 2 +-
.../java/org/apache/clerezza/ontologies/XSD.java | 2 +-
pom.xml | 1 -
.../org/apache/clerezza/representation/Parser.java | 8 +-
.../clerezza/representation/ParsingProvider.java | 4 +-
.../apache/clerezza/representation/Serializer.java | 2 +-
.../representation/SerializingProvider.java | 2 +-
.../apache/clerezza/representation/ParserTest.java | 4 +-
.../clerezza/representation/SerializerTest.java | 2 +-
.../representation/TestServiceManagedProvider.java | 4 +-
.../org/apache/clerezza/sparql/GraphStore.java | 2 +-
.../org/apache/clerezza/sparql/QueryEngine.java | 3 +-
.../apache/clerezza/sparql/SolutionMapping.java | 2 +-
.../apache/clerezza/sparql/SparqlPreParser.java | 2 +-
.../org/apache/clerezza/sparql/query/DataSet.java | 2 +-
.../apache/clerezza/sparql/query/FunctionCall.java | 2 +-
.../clerezza/sparql/query/GroupGraphPattern.java | 2 +-
.../apache/clerezza/sparql/query/InlineData.java | 2 +-
.../clerezza/sparql/query/LiteralExpression.java | 2 +-
.../clerezza/sparql/query/PredicatePath.java | 2 +-
.../clerezza/sparql/query/ResourceOrVariable.java | 2 +-
.../clerezza/sparql/query/UriRefExpression.java | 2 +-
.../clerezza/sparql/query/UriRefOrVariable.java | 2 +-
.../clerezza/sparql/query/impl/SimpleDataSet.java | 2 +-
.../sparql/query/impl/SimpleGroupGraphPattern.java | 2 +-
.../sparql/query/impl/SimpleInlineData.java | 2 +-
.../query/impl/SimplePropertyPathPattern.java | 4 +-
.../clerezza/sparql/query/impl/SimpleQuery.java | 2 +-
.../query/impl/SimpleStringQuerySerializer.java | 6 +-
.../sparql/query/impl/SimpleTriplePattern.java | 6 +-
.../org/apache/clerezza/sparql/update/Update.java | 2 +-
.../clerezza/sparql/update/UpdateOperation.java | 2 +-
.../sparql/update/impl/BaseUpdateOperation.java | 2 +-
.../sparql/update/impl/ClearOrDropOperation.java | 2 +-
.../sparql/update/impl/CreateOperation.java | 2 +-
.../clerezza/sparql/update/impl/LoadOperation.java | 2 +-
.../sparql/update/impl/ModifyOperation.java | 2 +-
.../clerezza/sparql/update/impl/SimpleUpdate.java | 2 +-
.../sparql/update/impl/SimpleUpdateOperation.java | 2 +-
.../update/impl/UpdateOperationWithQuads.java | 2 +-
.../clerezza/sparql/JavaCCGeneratedQueryParser.jj | 16 +-
.../sparql/JavaCCGeneratedSparqlPreParser.jj | 16 +-
.../apache/clerezza/sparql/QueryParserTest.java | 6 +-
.../clerezza/sparql/QuerySerializerTest.java | 4 +-
.../clerezza/sparql/SparqlPreParserTest.java | 2 +-
.../org/apache/clerezza/test/utils/GraphTest.java | 8 +-
.../apache/clerezza/test/utils/GraphWrapper.java | 2 +-
.../utils/LockableMGraphWrapperForTesting.java | 2 +-
.../test/utils/LockingIteratorForTesting.java | 2 +-
.../apache/clerezza/test/utils/RandomGraph.java | 6 +-
214 files changed, 1454 insertions(+), 557 deletions(-)
diff --git a/api.impl/src/main/java/org/apache/clerezza/api/impl/TripleImpl.java b/api.impl/src/main/java/org/apache/clerezza/impl/TripleImpl.java
similarity index 93%
rename from api.impl/src/main/java/org/apache/clerezza/api/impl/TripleImpl.java
rename to api.impl/src/main/java/org/apache/clerezza/impl/TripleImpl.java
index 2848028..87b8e0f 100644
--- a/api.impl/src/main/java/org/apache/clerezza/api/impl/TripleImpl.java
+++ b/api.impl/src/main/java/org/apache/clerezza/impl/TripleImpl.java
@@ -15,12 +15,12 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.impl;
+package org.apache.clerezza.impl;
-import org.apache.clerezza.api.BlankNodeOrIRI;
-import org.apache.clerezza.api.IRI;
-import org.apache.clerezza.api.RDFTerm;
-import org.apache.clerezza.api.Triple;
+import org.apache.clerezza.BlankNodeOrIRI;
+import org.apache.clerezza.IRI;
+import org.apache.clerezza.RDFTerm;
+import org.apache.clerezza.Triple;
/**
* @author reto
diff --git a/api.impl/src/main/java/org/apache/clerezza/api/impl/debug/ReadLockDebug.java b/api.impl/src/main/java/org/apache/clerezza/impl/debug/ReadLockDebug.java
similarity index 98%
rename from api.impl/src/main/java/org/apache/clerezza/api/impl/debug/ReadLockDebug.java
rename to api.impl/src/main/java/org/apache/clerezza/impl/debug/ReadLockDebug.java
index 1f63319..8eb2f4c 100644
--- a/api.impl/src/main/java/org/apache/clerezza/api/impl/debug/ReadLockDebug.java
+++ b/api.impl/src/main/java/org/apache/clerezza/impl/debug/ReadLockDebug.java
@@ -16,7 +16,7 @@
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.impl.debug;
+package org.apache.clerezza.impl.debug;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.Condition;
diff --git a/api.impl/src/main/java/org/apache/clerezza/api/impl/debug/ReentrantReadWriteLockTracker.java b/api.impl/src/main/java/org/apache/clerezza/impl/debug/ReentrantReadWriteLockTracker.java
similarity index 98%
rename from api.impl/src/main/java/org/apache/clerezza/api/impl/debug/ReentrantReadWriteLockTracker.java
rename to api.impl/src/main/java/org/apache/clerezza/impl/debug/ReentrantReadWriteLockTracker.java
index 70073cb..830c300 100644
--- a/api.impl/src/main/java/org/apache/clerezza/api/impl/debug/ReentrantReadWriteLockTracker.java
+++ b/api.impl/src/main/java/org/apache/clerezza/impl/debug/ReentrantReadWriteLockTracker.java
@@ -15,7 +15,7 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.impl.debug;
+package org.apache.clerezza.impl.debug;
import java.util.Collection;
import java.util.Collections;
diff --git a/api.impl/src/main/java/org/apache/clerezza/api/impl/debug/WriteLockDebug.java b/api.impl/src/main/java/org/apache/clerezza/impl/debug/WriteLockDebug.java
similarity index 98%
rename from api.impl/src/main/java/org/apache/clerezza/api/impl/debug/WriteLockDebug.java
rename to api.impl/src/main/java/org/apache/clerezza/impl/debug/WriteLockDebug.java
index f0d567e..5255e83 100644
--- a/api.impl/src/main/java/org/apache/clerezza/api/impl/debug/WriteLockDebug.java
+++ b/api.impl/src/main/java/org/apache/clerezza/impl/debug/WriteLockDebug.java
@@ -16,7 +16,7 @@
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.impl.debug;
+package org.apache.clerezza.impl.debug;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.Condition;
diff --git a/api.impl/src/main/java/org/apache/clerezza/api/impl/graph/AbstractGraph.java b/api.impl/src/main/java/org/apache/clerezza/impl/graph/AbstractGraph.java
similarity index 97%
rename from api.impl/src/main/java/org/apache/clerezza/api/impl/graph/AbstractGraph.java
rename to api.impl/src/main/java/org/apache/clerezza/impl/graph/AbstractGraph.java
index f03626f..7af173c 100644
--- a/api.impl/src/main/java/org/apache/clerezza/api/impl/graph/AbstractGraph.java
+++ b/api.impl/src/main/java/org/apache/clerezza/impl/graph/AbstractGraph.java
@@ -15,10 +15,10 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.impl.graph;
+package org.apache.clerezza.impl.graph;
-import org.apache.clerezza.api.*;
-import org.apache.clerezza.api.impl.debug.ReentrantReadWriteLockTracker;
+import org.apache.clerezza.*;
+import org.apache.clerezza.impl.debug.ReentrantReadWriteLockTracker;
import java.util.AbstractCollection;
import java.util.Collection;
diff --git a/api.impl/src/main/java/org/apache/clerezza/api/impl/graph/AbstractImmutableGraph.java b/api.impl/src/main/java/org/apache/clerezza/impl/graph/AbstractImmutableGraph.java
similarity index 91%
rename from api.impl/src/main/java/org/apache/clerezza/api/impl/graph/AbstractImmutableGraph.java
rename to api.impl/src/main/java/org/apache/clerezza/impl/graph/AbstractImmutableGraph.java
index d8fab05..a8cb7ec 100644
--- a/api.impl/src/main/java/org/apache/clerezza/api/impl/graph/AbstractImmutableGraph.java
+++ b/api.impl/src/main/java/org/apache/clerezza/impl/graph/AbstractImmutableGraph.java
@@ -15,13 +15,13 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.impl.graph;
+package org.apache.clerezza.impl.graph;
-import org.apache.clerezza.api.BlankNode;
-import org.apache.clerezza.api.ImmutableGraph;
-import org.apache.clerezza.api.RDFTerm;
-import org.apache.clerezza.api.Triple;
-import org.apache.clerezza.api.impl.graphmatching.GraphMatcher;
+import org.apache.clerezza.RDFTerm;
+import org.apache.clerezza.BlankNode;
+import org.apache.clerezza.ImmutableGraph;
+import org.apache.clerezza.Triple;
+import org.apache.clerezza.impl.graphmatching.GraphMatcher;
import java.util.Collection;
import java.util.Iterator;
diff --git a/api.impl/src/main/java/org/apache/clerezza/api/impl/graph/DelayedNotificator.java b/api.impl/src/main/java/org/apache/clerezza/impl/graph/DelayedNotificator.java
similarity index 96%
rename from api.impl/src/main/java/org/apache/clerezza/api/impl/graph/DelayedNotificator.java
rename to api.impl/src/main/java/org/apache/clerezza/impl/graph/DelayedNotificator.java
index 1eee4ea..204a75c 100644
--- a/api.impl/src/main/java/org/apache/clerezza/api/impl/graph/DelayedNotificator.java
+++ b/api.impl/src/main/java/org/apache/clerezza/impl/graph/DelayedNotificator.java
@@ -15,10 +15,10 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.impl.graph;
+package org.apache.clerezza.impl.graph;
-import org.apache.clerezza.api.event.GraphEvent;
-import org.apache.clerezza.api.event.GraphListener;
+import org.apache.clerezza.event.GraphEvent;
+import org.apache.clerezza.event.GraphListener;
import java.lang.ref.WeakReference;
import java.util.*;
diff --git a/api.impl/src/main/java/org/apache/clerezza/api/impl/graph/LockingIterator.java b/api.impl/src/main/java/org/apache/clerezza/impl/graph/LockingIterator.java
similarity index 95%
rename from api.impl/src/main/java/org/apache/clerezza/api/impl/graph/LockingIterator.java
rename to api.impl/src/main/java/org/apache/clerezza/impl/graph/LockingIterator.java
index 150b491..cb7bbd8 100644
--- a/api.impl/src/main/java/org/apache/clerezza/api/impl/graph/LockingIterator.java
+++ b/api.impl/src/main/java/org/apache/clerezza/impl/graph/LockingIterator.java
@@ -15,9 +15,9 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.impl.graph;
+package org.apache.clerezza.impl.graph;
-import org.apache.clerezza.api.Triple;
+import org.apache.clerezza.Triple;
import java.util.Iterator;
import java.util.concurrent.locks.Lock;
diff --git a/api.impl/src/main/java/org/apache/clerezza/api/impl/graph/PrivilegedGraphWrapper.java b/api.impl/src/main/java/org/apache/clerezza/impl/graph/PrivilegedGraphWrapper.java
similarity index 98%
rename from api.impl/src/main/java/org/apache/clerezza/api/impl/graph/PrivilegedGraphWrapper.java
rename to api.impl/src/main/java/org/apache/clerezza/impl/graph/PrivilegedGraphWrapper.java
index 8a911a5..af3b59f 100644
--- a/api.impl/src/main/java/org/apache/clerezza/api/impl/graph/PrivilegedGraphWrapper.java
+++ b/api.impl/src/main/java/org/apache/clerezza/impl/graph/PrivilegedGraphWrapper.java
@@ -15,9 +15,9 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.impl.graph;
+package org.apache.clerezza.impl.graph;
-import org.apache.clerezza.api.*;
+import org.apache.clerezza.*;
import java.security.AccessController;
import java.security.PrivilegedAction;
diff --git a/api.impl/src/main/java/org/apache/clerezza/api/impl/graph/PrivilegedImmuatbleGraphWrapper.java b/api.impl/src/main/java/org/apache/clerezza/impl/graph/PrivilegedImmuatbleGraphWrapper.java
similarity index 93%
rename from api.impl/src/main/java/org/apache/clerezza/api/impl/graph/PrivilegedImmuatbleGraphWrapper.java
rename to api.impl/src/main/java/org/apache/clerezza/impl/graph/PrivilegedImmuatbleGraphWrapper.java
index 1a73b8c..74cee71 100644
--- a/api.impl/src/main/java/org/apache/clerezza/api/impl/graph/PrivilegedImmuatbleGraphWrapper.java
+++ b/api.impl/src/main/java/org/apache/clerezza/impl/graph/PrivilegedImmuatbleGraphWrapper.java
@@ -15,9 +15,9 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.impl.graph;
+package org.apache.clerezza.impl.graph;
-import org.apache.clerezza.api.ImmutableGraph;
+import org.apache.clerezza.ImmutableGraph;
/**
* Calls the methods of the wrapped <code>ImmutableGraph</code> as privileged
diff --git a/api.impl/src/main/java/org/apache/clerezza/api/impl/graph/ReadOnlyException.java b/api.impl/src/main/java/org/apache/clerezza/impl/graph/ReadOnlyException.java
similarity index 97%
rename from api.impl/src/main/java/org/apache/clerezza/api/impl/graph/ReadOnlyException.java
rename to api.impl/src/main/java/org/apache/clerezza/impl/graph/ReadOnlyException.java
index 2b7a933..8a0bae0 100644
--- a/api.impl/src/main/java/org/apache/clerezza/api/impl/graph/ReadOnlyException.java
+++ b/api.impl/src/main/java/org/apache/clerezza/impl/graph/ReadOnlyException.java
@@ -15,7 +15,7 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.impl.graph;
+package org.apache.clerezza.impl.graph;
import java.security.AccessControlException;
diff --git a/api.impl/src/main/java/org/apache/clerezza/api/impl/graph/SimpleGraph.java b/api.impl/src/main/java/org/apache/clerezza/impl/graph/SimpleGraph.java
similarity index 98%
rename from api.impl/src/main/java/org/apache/clerezza/api/impl/graph/SimpleGraph.java
rename to api.impl/src/main/java/org/apache/clerezza/impl/graph/SimpleGraph.java
index 922c81d..82ff3e0 100644
--- a/api.impl/src/main/java/org/apache/clerezza/api/impl/graph/SimpleGraph.java
+++ b/api.impl/src/main/java/org/apache/clerezza/impl/graph/SimpleGraph.java
@@ -15,9 +15,9 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.impl.graph;
+package org.apache.clerezza.impl.graph;
-import org.apache.clerezza.api.*;
+import org.apache.clerezza.*;
import java.lang.ref.SoftReference;
import java.util.*;
diff --git a/api.impl/src/main/java/org/apache/clerezza/api/impl/graph/SimpleImmutableGraph.java b/api.impl/src/main/java/org/apache/clerezza/impl/graph/SimpleImmutableGraph.java
similarity index 96%
rename from api.impl/src/main/java/org/apache/clerezza/api/impl/graph/SimpleImmutableGraph.java
rename to api.impl/src/main/java/org/apache/clerezza/impl/graph/SimpleImmutableGraph.java
index a0840f5..c0106b3 100644
--- a/api.impl/src/main/java/org/apache/clerezza/api/impl/graph/SimpleImmutableGraph.java
+++ b/api.impl/src/main/java/org/apache/clerezza/impl/graph/SimpleImmutableGraph.java
@@ -15,9 +15,9 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.impl.graph;
+package org.apache.clerezza.impl.graph;
-import org.apache.clerezza.api.*;
+import org.apache.clerezza.*;
import java.util.Iterator;
diff --git a/api.impl/src/main/java/org/apache/clerezza/api/impl/graph/SimpleMGraph.java b/api.impl/src/main/java/org/apache/clerezza/impl/graph/SimpleMGraph.java
similarity index 92%
rename from api.impl/src/main/java/org/apache/clerezza/api/impl/graph/SimpleMGraph.java
rename to api.impl/src/main/java/org/apache/clerezza/impl/graph/SimpleMGraph.java
index cc5cd74..c8ce95e 100644
--- a/api.impl/src/main/java/org/apache/clerezza/api/impl/graph/SimpleMGraph.java
+++ b/api.impl/src/main/java/org/apache/clerezza/impl/graph/SimpleMGraph.java
@@ -15,10 +15,10 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.impl.graph;
+package org.apache.clerezza.impl.graph;
-import org.apache.clerezza.api.Graph;
-import org.apache.clerezza.api.Triple;
+import org.apache.clerezza.Graph;
+import org.apache.clerezza.Triple;
import java.util.Collection;
import java.util.Iterator;
diff --git a/api.impl/src/main/java/org/apache/clerezza/api/impl/graph/WatchableGraphWrapper.java b/api.impl/src/main/java/org/apache/clerezza/impl/graph/WatchableGraphWrapper.java
similarity index 98%
rename from api.impl/src/main/java/org/apache/clerezza/api/impl/graph/WatchableGraphWrapper.java
rename to api.impl/src/main/java/org/apache/clerezza/impl/graph/WatchableGraphWrapper.java
index f82a48a..46c8074 100644
--- a/api.impl/src/main/java/org/apache/clerezza/api/impl/graph/WatchableGraphWrapper.java
+++ b/api.impl/src/main/java/org/apache/clerezza/impl/graph/WatchableGraphWrapper.java
@@ -17,10 +17,10 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.impl.graph;
+package org.apache.clerezza.impl.graph;
-import org.apache.clerezza.api.*;
-import org.apache.clerezza.api.event.*;
+import org.apache.clerezza.*;
+import org.apache.clerezza.event.*;
import java.lang.ref.WeakReference;
import java.util.*;
diff --git a/api.impl/src/main/java/org/apache/clerezza/api/impl/graph/WriteBlockedGraph.java b/api.impl/src/main/java/org/apache/clerezza/impl/graph/WriteBlockedGraph.java
similarity index 97%
rename from api.impl/src/main/java/org/apache/clerezza/api/impl/graph/WriteBlockedGraph.java
rename to api.impl/src/main/java/org/apache/clerezza/impl/graph/WriteBlockedGraph.java
index cb80c3d..28c88ec 100644
--- a/api.impl/src/main/java/org/apache/clerezza/api/impl/graph/WriteBlockedGraph.java
+++ b/api.impl/src/main/java/org/apache/clerezza/impl/graph/WriteBlockedGraph.java
@@ -15,9 +15,9 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.impl.graph;
+package org.apache.clerezza.impl.graph;
-import org.apache.clerezza.api.*;
+import org.apache.clerezza.*;
import java.util.Collection;
import java.util.Iterator;
diff --git a/api.impl/src/main/java/org/apache/clerezza/api/impl/graphmatching/GraphMatcher.java b/api.impl/src/main/java/org/apache/clerezza/impl/graphmatching/GraphMatcher.java
similarity index 96%
rename from api.impl/src/main/java/org/apache/clerezza/api/impl/graphmatching/GraphMatcher.java
rename to api.impl/src/main/java/org/apache/clerezza/impl/graphmatching/GraphMatcher.java
index 3061279..b92e4a4 100644
--- a/api.impl/src/main/java/org/apache/clerezza/api/impl/graphmatching/GraphMatcher.java
+++ b/api.impl/src/main/java/org/apache/clerezza/impl/graphmatching/GraphMatcher.java
@@ -16,11 +16,11 @@
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.impl.graphmatching;
+package org.apache.clerezza.impl.graphmatching;
-import org.apache.clerezza.api.*;
-import org.apache.clerezza.api.impl.TripleImpl;
-import org.apache.clerezza.api.impl.graph.SimpleMGraph;
+import org.apache.clerezza.*;
+import org.apache.clerezza.impl.TripleImpl;
+import org.apache.clerezza.impl.graph.SimpleMGraph;
import java.util.Iterator;
import java.util.Map;
diff --git a/api.impl/src/main/java/org/apache/clerezza/api/impl/graphmatching/GraphNotIsomorphicException.java b/api.impl/src/main/java/org/apache/clerezza/impl/graphmatching/GraphNotIsomorphicException.java
similarity index 94%
rename from api.impl/src/main/java/org/apache/clerezza/api/impl/graphmatching/GraphNotIsomorphicException.java
rename to api.impl/src/main/java/org/apache/clerezza/impl/graphmatching/GraphNotIsomorphicException.java
index b40d608..0b0e4a2 100644
--- a/api.impl/src/main/java/org/apache/clerezza/api/impl/graphmatching/GraphNotIsomorphicException.java
+++ b/api.impl/src/main/java/org/apache/clerezza/impl/graphmatching/GraphNotIsomorphicException.java
@@ -15,7 +15,7 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.impl.graphmatching;
+package org.apache.clerezza.impl.graphmatching;
/**
* @author reto
diff --git a/api.impl/src/main/java/org/apache/clerezza/api/impl/graphmatching/GroupMappingIterator.java b/api.impl/src/main/java/org/apache/clerezza/impl/graphmatching/GroupMappingIterator.java
similarity index 98%
rename from api.impl/src/main/java/org/apache/clerezza/api/impl/graphmatching/GroupMappingIterator.java
rename to api.impl/src/main/java/org/apache/clerezza/impl/graphmatching/GroupMappingIterator.java
index 2e58fd3..6dfafa2 100644
--- a/api.impl/src/main/java/org/apache/clerezza/api/impl/graphmatching/GroupMappingIterator.java
+++ b/api.impl/src/main/java/org/apache/clerezza/impl/graphmatching/GroupMappingIterator.java
@@ -15,7 +15,7 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.impl.graphmatching;
+package org.apache.clerezza.impl.graphmatching;
import java.util.*;
diff --git a/api.impl/src/main/java/org/apache/clerezza/api/impl/graphmatching/HashMatching.java b/api.impl/src/main/java/org/apache/clerezza/impl/graphmatching/HashMatching.java
similarity index 97%
rename from api.impl/src/main/java/org/apache/clerezza/api/impl/graphmatching/HashMatching.java
rename to api.impl/src/main/java/org/apache/clerezza/impl/graphmatching/HashMatching.java
index 95ba4e8..e83d2f1 100644
--- a/api.impl/src/main/java/org/apache/clerezza/api/impl/graphmatching/HashMatching.java
+++ b/api.impl/src/main/java/org/apache/clerezza/impl/graphmatching/HashMatching.java
@@ -16,12 +16,12 @@
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.impl.graphmatching;
+package org.apache.clerezza.impl.graphmatching;
-import org.apache.clerezza.api.*;
-import org.apache.clerezza.api.impl.TripleImpl;
-import org.apache.clerezza.api.impl.graphmatching.collections.IntHashMap;
-import org.apache.clerezza.api.impl.graphmatching.collections.IntIterator;
+import org.apache.clerezza.*;
+import org.apache.clerezza.impl.TripleImpl;
+import org.apache.clerezza.impl.graphmatching.collections.IntHashMap;
+import org.apache.clerezza.impl.graphmatching.collections.IntIterator;
import java.util.*;
diff --git a/api.impl/src/main/java/org/apache/clerezza/api/impl/graphmatching/MappingIterator.java b/api.impl/src/main/java/org/apache/clerezza/impl/graphmatching/MappingIterator.java
similarity index 97%
rename from api.impl/src/main/java/org/apache/clerezza/api/impl/graphmatching/MappingIterator.java
rename to api.impl/src/main/java/org/apache/clerezza/impl/graphmatching/MappingIterator.java
index 22dd267..b32b288 100644
--- a/api.impl/src/main/java/org/apache/clerezza/api/impl/graphmatching/MappingIterator.java
+++ b/api.impl/src/main/java/org/apache/clerezza/impl/graphmatching/MappingIterator.java
@@ -15,7 +15,7 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.impl.graphmatching;
+package org.apache.clerezza.impl.graphmatching;
import java.util.*;
diff --git a/api.impl/src/main/java/org/apache/clerezza/api/impl/graphmatching/PermutationIterator.java b/api.impl/src/main/java/org/apache/clerezza/impl/graphmatching/PermutationIterator.java
similarity index 98%
rename from api.impl/src/main/java/org/apache/clerezza/api/impl/graphmatching/PermutationIterator.java
rename to api.impl/src/main/java/org/apache/clerezza/impl/graphmatching/PermutationIterator.java
index 70a0554..9e72aa2 100644
--- a/api.impl/src/main/java/org/apache/clerezza/api/impl/graphmatching/PermutationIterator.java
+++ b/api.impl/src/main/java/org/apache/clerezza/impl/graphmatching/PermutationIterator.java
@@ -15,7 +15,7 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.impl.graphmatching;
+package org.apache.clerezza.impl.graphmatching;
import java.util.*;
diff --git a/api.impl/src/main/java/org/apache/clerezza/api/impl/graphmatching/Utils.java b/api.impl/src/main/java/org/apache/clerezza/impl/graphmatching/Utils.java
similarity index 94%
rename from api.impl/src/main/java/org/apache/clerezza/api/impl/graphmatching/Utils.java
rename to api.impl/src/main/java/org/apache/clerezza/impl/graphmatching/Utils.java
index fb89099..8091a4c 100644
--- a/api.impl/src/main/java/org/apache/clerezza/api/impl/graphmatching/Utils.java
+++ b/api.impl/src/main/java/org/apache/clerezza/impl/graphmatching/Utils.java
@@ -15,10 +15,10 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.impl.graphmatching;
+package org.apache.clerezza.impl.graphmatching;
-import org.apache.clerezza.api.BlankNode;
-import org.apache.clerezza.api.Triple;
+import org.apache.clerezza.BlankNode;
+import org.apache.clerezza.Triple;
import java.util.Collection;
import java.util.HashSet;
diff --git a/api.impl/src/main/java/org/apache/clerezza/api/impl/graphmatching/collections/IntHashMap.java b/api.impl/src/main/java/org/apache/clerezza/impl/graphmatching/collections/IntHashMap.java
similarity index 99%
rename from api.impl/src/main/java/org/apache/clerezza/api/impl/graphmatching/collections/IntHashMap.java
rename to api.impl/src/main/java/org/apache/clerezza/impl/graphmatching/collections/IntHashMap.java
index f4ca392..eb17bac 100644
--- a/api.impl/src/main/java/org/apache/clerezza/api/impl/graphmatching/collections/IntHashMap.java
+++ b/api.impl/src/main/java/org/apache/clerezza/impl/graphmatching/collections/IntHashMap.java
@@ -23,7 +23,7 @@
* but rereleased by the original author under the ASF license (above).
*/
-package org.apache.clerezza.api.impl.graphmatching.collections;
+package org.apache.clerezza.impl.graphmatching.collections;
/**
* <p>A hash map that uses primitive ints for the key rather than objects.</p>
diff --git a/api.impl/src/main/java/org/apache/clerezza/api/impl/graphmatching/collections/IntHashSet.java b/api.impl/src/main/java/org/apache/clerezza/impl/graphmatching/collections/IntHashSet.java
similarity index 96%
rename from api.impl/src/main/java/org/apache/clerezza/api/impl/graphmatching/collections/IntHashSet.java
rename to api.impl/src/main/java/org/apache/clerezza/impl/graphmatching/collections/IntHashSet.java
index e85518e..816f3c4 100644
--- a/api.impl/src/main/java/org/apache/clerezza/api/impl/graphmatching/collections/IntHashSet.java
+++ b/api.impl/src/main/java/org/apache/clerezza/impl/graphmatching/collections/IntHashSet.java
@@ -18,7 +18,7 @@
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.impl.graphmatching.collections;
+package org.apache.clerezza.impl.graphmatching.collections;
import java.util.HashSet;
import java.util.Iterator;
diff --git a/api.impl/src/main/java/org/apache/clerezza/api/impl/graphmatching/collections/IntIterator.java b/api.impl/src/main/java/org/apache/clerezza/impl/graphmatching/collections/IntIterator.java
similarity index 94%
rename from api.impl/src/main/java/org/apache/clerezza/api/impl/graphmatching/collections/IntIterator.java
rename to api.impl/src/main/java/org/apache/clerezza/impl/graphmatching/collections/IntIterator.java
index 9f0309d..36e7f62 100644
--- a/api.impl/src/main/java/org/apache/clerezza/api/impl/graphmatching/collections/IntIterator.java
+++ b/api.impl/src/main/java/org/apache/clerezza/impl/graphmatching/collections/IntIterator.java
@@ -18,7 +18,7 @@
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.impl.graphmatching.collections;
+package org.apache.clerezza.impl.graphmatching.collections;
import java.util.Iterator;
diff --git a/api.impl/src/main/java/org/apache/clerezza/api/impl/graphmatching/collections/IntSet.java b/api.impl/src/main/java/org/apache/clerezza/impl/graphmatching/collections/IntSet.java
similarity index 95%
rename from api.impl/src/main/java/org/apache/clerezza/api/impl/graphmatching/collections/IntSet.java
rename to api.impl/src/main/java/org/apache/clerezza/impl/graphmatching/collections/IntSet.java
index d6042e6..55dc375 100644
--- a/api.impl/src/main/java/org/apache/clerezza/api/impl/graphmatching/collections/IntSet.java
+++ b/api.impl/src/main/java/org/apache/clerezza/impl/graphmatching/collections/IntSet.java
@@ -18,7 +18,7 @@
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.impl.graphmatching.collections;
+package org.apache.clerezza.impl.graphmatching.collections;
import java.util.Set;
diff --git a/api.impl/src/main/java/org/apache/clerezza/api/impl/literal/AbstractLiteral.java b/api.impl/src/main/java/org/apache/clerezza/impl/literal/AbstractLiteral.java
similarity index 95%
rename from api.impl/src/main/java/org/apache/clerezza/api/impl/literal/AbstractLiteral.java
rename to api.impl/src/main/java/org/apache/clerezza/impl/literal/AbstractLiteral.java
index 4c0c385..e4babaa 100644
--- a/api.impl/src/main/java/org/apache/clerezza/api/impl/literal/AbstractLiteral.java
+++ b/api.impl/src/main/java/org/apache/clerezza/impl/literal/AbstractLiteral.java
@@ -17,9 +17,9 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.impl.literal;
+package org.apache.clerezza.impl.literal;
-import org.apache.clerezza.api.Literal;
+import org.apache.clerezza.Literal;
/**
* @author developer
diff --git a/api.impl/src/main/java/org/apache/clerezza/api/impl/literal/InvalidLiteralTypeException.java b/api.impl/src/main/java/org/apache/clerezza/impl/literal/InvalidLiteralTypeException.java
similarity index 94%
rename from api.impl/src/main/java/org/apache/clerezza/api/impl/literal/InvalidLiteralTypeException.java
rename to api.impl/src/main/java/org/apache/clerezza/impl/literal/InvalidLiteralTypeException.java
index e4a1482..201eb36 100644
--- a/api.impl/src/main/java/org/apache/clerezza/api/impl/literal/InvalidLiteralTypeException.java
+++ b/api.impl/src/main/java/org/apache/clerezza/impl/literal/InvalidLiteralTypeException.java
@@ -15,9 +15,9 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.impl.literal;
+package org.apache.clerezza.impl.literal;
-import org.apache.clerezza.api.IRI;
+import org.apache.clerezza.IRI;
/**
* Thrown when a literal is of the wrong type for conversion to a java-type
diff --git a/api.impl/src/main/java/org/apache/clerezza/api/impl/literal/LiteralFactory.java b/api.impl/src/main/java/org/apache/clerezza/impl/literal/LiteralFactory.java
similarity index 97%
rename from api.impl/src/main/java/org/apache/clerezza/api/impl/literal/LiteralFactory.java
rename to api.impl/src/main/java/org/apache/clerezza/impl/literal/LiteralFactory.java
index 9bbbe76..c6939f2 100644
--- a/api.impl/src/main/java/org/apache/clerezza/api/impl/literal/LiteralFactory.java
+++ b/api.impl/src/main/java/org/apache/clerezza/impl/literal/LiteralFactory.java
@@ -15,9 +15,9 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.impl.literal;
+package org.apache.clerezza.impl.literal;
-import org.apache.clerezza.api.Literal;
+import org.apache.clerezza.Literal;
/**
* This class provides methods to convert java objects to typed literals and
diff --git a/api.impl/src/main/java/org/apache/clerezza/api/impl/literal/LiteralImpl.java b/api.impl/src/main/java/org/apache/clerezza/impl/literal/LiteralImpl.java
similarity index 94%
rename from api.impl/src/main/java/org/apache/clerezza/api/impl/literal/LiteralImpl.java
rename to api.impl/src/main/java/org/apache/clerezza/impl/literal/LiteralImpl.java
index 5c383ff..083af73 100644
--- a/api.impl/src/main/java/org/apache/clerezza/api/impl/literal/LiteralImpl.java
+++ b/api.impl/src/main/java/org/apache/clerezza/impl/literal/LiteralImpl.java
@@ -15,10 +15,10 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.impl.literal;
+package org.apache.clerezza.impl.literal;
-import org.apache.clerezza.api.IRI;
-import org.apache.clerezza.api.Language;
+import org.apache.clerezza.IRI;
+import org.apache.clerezza.Language;
import java.io.Serializable;
diff --git a/api.impl/src/main/java/org/apache/clerezza/api/impl/literal/NoConvertorException.java b/api.impl/src/main/java/org/apache/clerezza/impl/literal/NoConvertorException.java
similarity index 96%
rename from api.impl/src/main/java/org/apache/clerezza/api/impl/literal/NoConvertorException.java
rename to api.impl/src/main/java/org/apache/clerezza/impl/literal/NoConvertorException.java
index 7eeb4d5..8c5e59f 100644
--- a/api.impl/src/main/java/org/apache/clerezza/api/impl/literal/NoConvertorException.java
+++ b/api.impl/src/main/java/org/apache/clerezza/impl/literal/NoConvertorException.java
@@ -15,7 +15,7 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.impl.literal;
+package org.apache.clerezza.impl.literal;
import java.lang.reflect.Type;
diff --git a/api.impl/src/main/java/org/apache/clerezza/api/impl/literal/PlainLiteralImpl.java b/api.impl/src/main/java/org/apache/clerezza/impl/literal/PlainLiteralImpl.java
similarity index 93%
rename from api.impl/src/main/java/org/apache/clerezza/api/impl/literal/PlainLiteralImpl.java
rename to api.impl/src/main/java/org/apache/clerezza/impl/literal/PlainLiteralImpl.java
index 0eec686..8b57607 100644
--- a/api.impl/src/main/java/org/apache/clerezza/api/impl/literal/PlainLiteralImpl.java
+++ b/api.impl/src/main/java/org/apache/clerezza/impl/literal/PlainLiteralImpl.java
@@ -15,11 +15,11 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.impl.literal;
+package org.apache.clerezza.impl.literal;
-import org.apache.clerezza.api.IRI;
-import org.apache.clerezza.api.Language;
-import org.apache.clerezza.api.Literal;
+import org.apache.clerezza.IRI;
+import org.apache.clerezza.Language;
+import org.apache.clerezza.Literal;
import java.io.Serializable;
diff --git a/api.impl/src/main/java/org/apache/clerezza/api/impl/literal/SimpleLiteralFactory.java b/api.impl/src/main/java/org/apache/clerezza/impl/literal/SimpleLiteralFactory.java
similarity index 97%
rename from api.impl/src/main/java/org/apache/clerezza/api/impl/literal/SimpleLiteralFactory.java
rename to api.impl/src/main/java/org/apache/clerezza/impl/literal/SimpleLiteralFactory.java
index 7b01843..8706a4d 100644
--- a/api.impl/src/main/java/org/apache/clerezza/api/impl/literal/SimpleLiteralFactory.java
+++ b/api.impl/src/main/java/org/apache/clerezza/impl/literal/SimpleLiteralFactory.java
@@ -15,12 +15,12 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.impl.literal;
+package org.apache.clerezza.impl.literal;
-import org.apache.clerezza.api.IRI;
-import org.apache.clerezza.api.Literal;
-import org.apache.clerezza.api.impl.util.Base64;
-import org.apache.clerezza.api.impl.util.W3CDateFormat;
+import org.apache.clerezza.IRI;
+import org.apache.clerezza.Literal;
+import org.apache.clerezza.impl.util.Base64;
+import org.apache.clerezza.impl.util.W3CDateFormat;
import java.math.BigInteger;
import java.text.DateFormat;
diff --git a/api.impl/src/main/java/org/apache/clerezza/api/impl/literal/TypedLiteralImpl.java b/api.impl/src/main/java/org/apache/clerezza/impl/literal/TypedLiteralImpl.java
similarity index 94%
rename from api.impl/src/main/java/org/apache/clerezza/api/impl/literal/TypedLiteralImpl.java
rename to api.impl/src/main/java/org/apache/clerezza/impl/literal/TypedLiteralImpl.java
index 0f7e3dd..75c7536 100644
--- a/api.impl/src/main/java/org/apache/clerezza/api/impl/literal/TypedLiteralImpl.java
+++ b/api.impl/src/main/java/org/apache/clerezza/impl/literal/TypedLiteralImpl.java
@@ -15,10 +15,10 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.impl.literal;
+package org.apache.clerezza.impl.literal;
-import org.apache.clerezza.api.IRI;
-import org.apache.clerezza.api.Language;
+import org.apache.clerezza.IRI;
+import org.apache.clerezza.Language;
import java.io.Serializable;
diff --git a/api.impl/src/main/java/org/apache/clerezza/api/impl/package-info.java b/api.impl/src/main/java/org/apache/clerezza/impl/package-info.java
similarity index 95%
rename from api.impl/src/main/java/org/apache/clerezza/api/impl/package-info.java
rename to api.impl/src/main/java/org/apache/clerezza/impl/package-info.java
index a2c5f76..c378f13 100644
--- a/api.impl/src/main/java/org/apache/clerezza/api/impl/package-info.java
+++ b/api.impl/src/main/java/org/apache/clerezza/impl/package-info.java
@@ -15,4 +15,4 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.impl;
\ No newline at end of file
+package org.apache.clerezza.impl;
\ No newline at end of file
diff --git a/api.impl/src/main/java/org/apache/clerezza/api/impl/util/Base64.java b/api.impl/src/main/java/org/apache/clerezza/impl/util/Base64.java
similarity index 98%
rename from api.impl/src/main/java/org/apache/clerezza/api/impl/util/Base64.java
rename to api.impl/src/main/java/org/apache/clerezza/impl/util/Base64.java
index f5b6dc3..ec453e1 100644
--- a/api.impl/src/main/java/org/apache/clerezza/api/impl/util/Base64.java
+++ b/api.impl/src/main/java/org/apache/clerezza/impl/util/Base64.java
@@ -20,7 +20,7 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.impl.util;
+package org.apache.clerezza.impl.util;
public class Base64 {
diff --git a/api.impl/src/main/java/org/apache/clerezza/api/impl/util/W3CDateFormat.java b/api.impl/src/main/java/org/apache/clerezza/impl/util/W3CDateFormat.java
similarity index 99%
rename from api.impl/src/main/java/org/apache/clerezza/api/impl/util/W3CDateFormat.java
rename to api.impl/src/main/java/org/apache/clerezza/impl/util/W3CDateFormat.java
index 4921968..0d8c024 100644
--- a/api.impl/src/main/java/org/apache/clerezza/api/impl/util/W3CDateFormat.java
+++ b/api.impl/src/main/java/org/apache/clerezza/impl/util/W3CDateFormat.java
@@ -23,7 +23,7 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.impl.util;
+package org.apache.clerezza.impl.util;
import java.text.DateFormat;
import java.text.FieldPosition;
diff --git a/api.impl/src/test/java/org/apache/clerezza/api/impl/LanguageTest.java b/api.impl/src/test/java/org/apache/clerezza/impl/LanguageTest.java
similarity index 94%
rename from api.impl/src/test/java/org/apache/clerezza/api/impl/LanguageTest.java
rename to api.impl/src/test/java/org/apache/clerezza/impl/LanguageTest.java
index 77c419a..aa2e42e 100644
--- a/api.impl/src/test/java/org/apache/clerezza/api/impl/LanguageTest.java
+++ b/api.impl/src/test/java/org/apache/clerezza/impl/LanguageTest.java
@@ -15,9 +15,9 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.impl;
+package org.apache.clerezza.impl;
-import org.apache.clerezza.api.Language;
+import org.apache.clerezza.Language;
import org.junit.Assert;
import org.junit.Test;
diff --git a/api.impl/src/test/java/org/apache/clerezza/api/impl/UriRefTest.java b/api.impl/src/test/java/org/apache/clerezza/impl/UriRefTest.java
similarity index 95%
rename from api.impl/src/test/java/org/apache/clerezza/api/impl/UriRefTest.java
rename to api.impl/src/test/java/org/apache/clerezza/impl/UriRefTest.java
index 8aefff6..3390c1d 100644
--- a/api.impl/src/test/java/org/apache/clerezza/api/impl/UriRefTest.java
+++ b/api.impl/src/test/java/org/apache/clerezza/impl/UriRefTest.java
@@ -15,9 +15,9 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.impl;
+package org.apache.clerezza.impl;
-import org.apache.clerezza.api.IRI;
+import org.apache.clerezza.IRI;
import org.junit.Assert;
import org.junit.Test;
diff --git a/api.impl/src/test/java/org/apache/clerezza/api/impl/graph/GraphTest.java b/api.impl/src/test/java/org/apache/clerezza/impl/graph/GraphTest.java
similarity index 98%
rename from api.impl/src/test/java/org/apache/clerezza/api/impl/graph/GraphTest.java
rename to api.impl/src/test/java/org/apache/clerezza/impl/graph/GraphTest.java
index 66a3b3c..257e41a 100644
--- a/api.impl/src/test/java/org/apache/clerezza/api/impl/graph/GraphTest.java
+++ b/api.impl/src/test/java/org/apache/clerezza/impl/graph/GraphTest.java
@@ -15,12 +15,12 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.impl.graph;
+package org.apache.clerezza.impl.graph;
-import org.apache.clerezza.api.*;
-import org.apache.clerezza.api.impl.TripleImpl;
-import org.apache.clerezza.api.impl.literal.PlainLiteralImpl;
-import org.apache.clerezza.api.impl.literal.TypedLiteralImpl;
+import org.apache.clerezza.*;
+import org.apache.clerezza.impl.TripleImpl;
+import org.apache.clerezza.impl.literal.PlainLiteralImpl;
+import org.apache.clerezza.impl.literal.TypedLiteralImpl;
import org.junit.Assert;
import org.junit.Test;
diff --git a/api.impl/src/test/java/org/apache/clerezza/api/impl/graph/SimpleGraphTest.java b/api.impl/src/test/java/org/apache/clerezza/impl/graph/SimpleGraphTest.java
similarity index 95%
rename from api.impl/src/test/java/org/apache/clerezza/api/impl/graph/SimpleGraphTest.java
rename to api.impl/src/test/java/org/apache/clerezza/impl/graph/SimpleGraphTest.java
index bc48622..b5cbb64 100644
--- a/api.impl/src/test/java/org/apache/clerezza/api/impl/graph/SimpleGraphTest.java
+++ b/api.impl/src/test/java/org/apache/clerezza/impl/graph/SimpleGraphTest.java
@@ -15,11 +15,11 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.impl.graph;
+package org.apache.clerezza.impl.graph;
-import org.apache.clerezza.api.IRI;
-import org.apache.clerezza.api.Triple;
-import org.apache.clerezza.api.impl.TripleImpl;
+import org.apache.clerezza.IRI;
+import org.apache.clerezza.Triple;
+import org.apache.clerezza.impl.TripleImpl;
import org.junit.Assert;
import org.junit.Test;
diff --git a/api.impl/src/test/java/org/apache/clerezza/api/impl/graphmatching/GraphMatcherTest.java b/api.impl/src/test/java/org/apache/clerezza/impl/graphmatching/GraphMatcherTest.java
similarity index 95%
rename from api.impl/src/test/java/org/apache/clerezza/api/impl/graphmatching/GraphMatcherTest.java
rename to api.impl/src/test/java/org/apache/clerezza/impl/graphmatching/GraphMatcherTest.java
index 57208d9..b426651 100644
--- a/api.impl/src/test/java/org/apache/clerezza/api/impl/graphmatching/GraphMatcherTest.java
+++ b/api.impl/src/test/java/org/apache/clerezza/impl/graphmatching/GraphMatcherTest.java
@@ -15,14 +15,14 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.impl.graphmatching;
-
-import org.apache.clerezza.api.BlankNode;
-import org.apache.clerezza.api.BlankNodeOrIRI;
-import org.apache.clerezza.api.Graph;
-import org.apache.clerezza.api.IRI;
-import org.apache.clerezza.api.impl.TripleImpl;
-import org.apache.clerezza.api.impl.graph.SimpleMGraph;
+package org.apache.clerezza.impl.graphmatching;
+
+import org.apache.clerezza.BlankNodeOrIRI;
+import org.apache.clerezza.BlankNode;
+import org.apache.clerezza.Graph;
+import org.apache.clerezza.IRI;
+import org.apache.clerezza.impl.TripleImpl;
+import org.apache.clerezza.impl.graph.SimpleMGraph;
import org.junit.Assert;
import org.junit.Test;
diff --git a/api.impl/src/test/java/org/apache/clerezza/api/impl/graphmatching/HashMatchingTest.java b/api.impl/src/test/java/org/apache/clerezza/impl/graphmatching/HashMatchingTest.java
similarity index 90%
rename from api.impl/src/test/java/org/apache/clerezza/api/impl/graphmatching/HashMatchingTest.java
rename to api.impl/src/test/java/org/apache/clerezza/impl/graphmatching/HashMatchingTest.java
index 1d96575..b0bf75a 100644
--- a/api.impl/src/test/java/org/apache/clerezza/api/impl/graphmatching/HashMatchingTest.java
+++ b/api.impl/src/test/java/org/apache/clerezza/impl/graphmatching/HashMatchingTest.java
@@ -16,11 +16,11 @@
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.impl.graphmatching;
+package org.apache.clerezza.impl.graphmatching;
-import org.apache.clerezza.api.BlankNode;
-import org.apache.clerezza.api.BlankNodeOrIRI;
-import org.apache.clerezza.api.Graph;
+import org.apache.clerezza.BlankNodeOrIRI;
+import org.apache.clerezza.BlankNode;
+import org.apache.clerezza.Graph;
import org.junit.Assert;
import org.junit.Test;
diff --git a/api.impl/src/test/java/org/apache/clerezza/api/impl/graphmatching/PermutationIteratorTest.java b/api.impl/src/test/java/org/apache/clerezza/impl/graphmatching/PermutationIteratorTest.java
similarity index 97%
rename from api.impl/src/test/java/org/apache/clerezza/api/impl/graphmatching/PermutationIteratorTest.java
rename to api.impl/src/test/java/org/apache/clerezza/impl/graphmatching/PermutationIteratorTest.java
index e1ad191..baf1ebe 100644
--- a/api.impl/src/test/java/org/apache/clerezza/api/impl/graphmatching/PermutationIteratorTest.java
+++ b/api.impl/src/test/java/org/apache/clerezza/impl/graphmatching/PermutationIteratorTest.java
@@ -16,7 +16,7 @@
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.impl.graphmatching;
+package org.apache.clerezza.impl.graphmatching;
import org.junit.Assert;
import org.junit.Test;
diff --git a/api.impl/src/test/java/org/apache/clerezza/api/impl/graphmatching/Utils4Testing.java b/api.impl/src/test/java/org/apache/clerezza/impl/graphmatching/Utils4Testing.java
similarity index 81%
rename from api.impl/src/test/java/org/apache/clerezza/api/impl/graphmatching/Utils4Testing.java
rename to api.impl/src/test/java/org/apache/clerezza/impl/graphmatching/Utils4Testing.java
index 44c386d..dc3c428 100644
--- a/api.impl/src/test/java/org/apache/clerezza/api/impl/graphmatching/Utils4Testing.java
+++ b/api.impl/src/test/java/org/apache/clerezza/impl/graphmatching/Utils4Testing.java
@@ -16,14 +16,14 @@
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.impl.graphmatching;
+package org.apache.clerezza.impl.graphmatching;
-import org.apache.clerezza.api.BlankNode;
-import org.apache.clerezza.api.BlankNodeOrIRI;
-import org.apache.clerezza.api.Graph;
-import org.apache.clerezza.api.IRI;
-import org.apache.clerezza.api.impl.TripleImpl;
-import org.apache.clerezza.api.impl.graph.SimpleMGraph;
+import org.apache.clerezza.BlankNode;
+import org.apache.clerezza.BlankNodeOrIRI;
+import org.apache.clerezza.Graph;
+import org.apache.clerezza.IRI;
+import org.apache.clerezza.impl.TripleImpl;
+import org.apache.clerezza.impl.graph.SimpleMGraph;
/**
* @author reto
diff --git a/api.impl/src/test/java/org/apache/clerezza/api/impl/literal/LiteralFactoryTest.java b/api.impl/src/test/java/org/apache/clerezza/impl/literal/LiteralFactoryTest.java
similarity index 97%
rename from api.impl/src/test/java/org/apache/clerezza/api/impl/literal/LiteralFactoryTest.java
rename to api.impl/src/test/java/org/apache/clerezza/impl/literal/LiteralFactoryTest.java
index 629fa6b..435b4ed 100644
--- a/api.impl/src/test/java/org/apache/clerezza/api/impl/literal/LiteralFactoryTest.java
+++ b/api.impl/src/test/java/org/apache/clerezza/impl/literal/LiteralFactoryTest.java
@@ -15,10 +15,10 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.impl.literal;
+package org.apache.clerezza.impl.literal;
-import org.apache.clerezza.api.IRI;
-import org.apache.clerezza.api.Literal;
+import org.apache.clerezza.IRI;
+import org.apache.clerezza.Literal;
import org.junit.Assert;
import org.junit.Test;
diff --git a/api.impl/src/test/java/org/apache/clerezza/api/impl/literal/PlainLiteralImplTest.java b/api.impl/src/test/java/org/apache/clerezza/impl/literal/PlainLiteralImplTest.java
similarity index 95%
rename from api.impl/src/test/java/org/apache/clerezza/api/impl/literal/PlainLiteralImplTest.java
rename to api.impl/src/test/java/org/apache/clerezza/impl/literal/PlainLiteralImplTest.java
index 10aad34..2bd20b9 100644
--- a/api.impl/src/test/java/org/apache/clerezza/api/impl/literal/PlainLiteralImplTest.java
+++ b/api.impl/src/test/java/org/apache/clerezza/impl/literal/PlainLiteralImplTest.java
@@ -15,10 +15,10 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.impl.literal;
+package org.apache.clerezza.impl.literal;
-import org.apache.clerezza.api.Language;
-import org.apache.clerezza.api.Literal;
+import org.apache.clerezza.Language;
+import org.apache.clerezza.Literal;
import org.junit.Assert;
import org.junit.Test;
diff --git a/api.impl/src/test/java/org/apache/clerezza/api/impl/literal/TripleImplTest.java b/api.impl/src/test/java/org/apache/clerezza/impl/literal/TripleImplTest.java
similarity index 82%
rename from api.impl/src/test/java/org/apache/clerezza/api/impl/literal/TripleImplTest.java
rename to api.impl/src/test/java/org/apache/clerezza/impl/literal/TripleImplTest.java
index 85e9729..1abde41 100644
--- a/api.impl/src/test/java/org/apache/clerezza/api/impl/literal/TripleImplTest.java
+++ b/api.impl/src/test/java/org/apache/clerezza/impl/literal/TripleImplTest.java
@@ -15,15 +15,14 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.impl.simple;
+package org.apache.clerezza.impl.literal;
import junit.framework.Assert;
-import org.apache.clerezza.api.BlankNodeOrIRI;
-import org.apache.clerezza.api.IRI;
-import org.apache.clerezza.api.RDFTerm;
-import org.apache.clerezza.api.Triple;
-import org.apache.clerezza.api.impl.TripleImpl;
-import org.apache.clerezza.api.impl.literal.PlainLiteralImpl;
+import org.apache.clerezza.BlankNodeOrIRI;
+import org.apache.clerezza.IRI;
+import org.apache.clerezza.RDFTerm;
+import org.apache.clerezza.Triple;
+import org.apache.clerezza.impl.TripleImpl;
import org.junit.Test;
/**
diff --git a/api.impl/src/test/java/org/apache/clerezza/api/impl/literal/TypedLiteralImplTest.java b/api.impl/src/test/java/org/apache/clerezza/impl/literal/TypedLiteralImplTest.java
similarity index 92%
rename from api.impl/src/test/java/org/apache/clerezza/api/impl/literal/TypedLiteralImplTest.java
rename to api.impl/src/test/java/org/apache/clerezza/impl/literal/TypedLiteralImplTest.java
index 50f1ca7..50e5450 100644
--- a/api.impl/src/test/java/org/apache/clerezza/api/impl/literal/TypedLiteralImplTest.java
+++ b/api.impl/src/test/java/org/apache/clerezza/impl/literal/TypedLiteralImplTest.java
@@ -15,12 +15,11 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.impl.simple;
+package org.apache.clerezza.impl.literal;
import junit.framework.Assert;
-import org.apache.clerezza.api.IRI;
-import org.apache.clerezza.api.Literal;
-import org.apache.clerezza.api.impl.literal.TypedLiteralImpl;
+import org.apache.clerezza.Literal;
+import org.apache.clerezza.IRI;
import org.junit.Test;
/**
diff --git a/api.utils/pom.xml.backup b/api.utils/pom.xml.backup
new file mode 100644
index 0000000..e403c65
--- /dev/null
+++ b/api.utils/pom.xml.backup
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed
+ with this work for additional information regarding copyright
+ ownership. The ASF licenses this file to you under the Apache
+ License, Version 2.0 (the "License"); you may not use this file
+ except in compliance with the License. You may obtain a copy of
+ the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ either express or implied. See the License for the specific
+ language governing permissions and limitations under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <artifactId>clerezza</artifactId>
+ <groupId>org.apache.clerezza</groupId>
+ <version>8-SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>api.utils</artifactId>
+ <packaging>bundle</packaging>
+ <version>8-SNAPSHOT</version>
+ <name>Clerezza - API Utilities</name>
+ <description>Utility classes to work with Clerezza API</description>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>api</artifactId>
+ <version>8-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>api.impl</artifactId>
+ <version>8-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>representation</artifactId>
+ <version>8-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>dataset</artifactId>
+ <version>8-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>ontologies</artifactId>
+ <version>8-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>test.utils</artifactId>
+ <version>8-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-library</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ <encoding>utf-8</encoding>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.scala-tools</groupId>
+ <artifactId>maven-scala-plugin</artifactId>
+ <version>2.15.2</version>
+ <executions>
+ <execution>
+ <id>compile</id>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ <phase>compile</phase>
+ </execution>
+ <execution>
+ <id>test-compile</id>
+ <goals>
+ <goal>testCompile</goal>
+ </goals>
+ <phase>test-compile</phase>
+ </execution>
+ <execution>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ </execution>
+ <!--
+ <execution>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>compile</goal>
+ <goal>testCompile</goal>
+ </goals>
+ </execution>
+ -->
+ </executions>
+ <configuration>
+ <scalaVersion>${scala.version}</scalaVersion>
+ <args>
+ <arg>-target:jvm-1.7</arg>
+ <arg>-deprecation</arg>
+ </args>
+ <charset>UTF-8</charset>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Export-Package>${project.groupId}.${project.artifactId}.*</Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.scala-tools</groupId>
+ <artifactId>maven-scala-plugin</artifactId>
+ <configuration>
+ <scalaVersion>${scala.version}</scalaVersion>
+ </configuration>
+ <version>2.14.1</version>
+ </plugin>
+ </plugins>
+ </reporting>
+</project>
\ No newline at end of file
diff --git a/api.utils/src/main/java/org/apache/clerezza/api/utils/GraphNode.java b/api.utils/src/main/java/org/apache/clerezza/utils/GraphNode.java
similarity index 98%
rename from api.utils/src/main/java/org/apache/clerezza/api/utils/GraphNode.java
rename to api.utils/src/main/java/org/apache/clerezza/utils/GraphNode.java
index 2a80559..a3151b4 100644
--- a/api.utils/src/main/java/org/apache/clerezza/api/utils/GraphNode.java
+++ b/api.utils/src/main/java/org/apache/clerezza/utils/GraphNode.java
@@ -15,12 +15,12 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.utils;
+package org.apache.clerezza.utils;
-import org.apache.clerezza.api.*;
-import org.apache.clerezza.api.impl.TripleImpl;
-import org.apache.clerezza.api.impl.graph.SimpleGraph;
-import org.apache.clerezza.api.impl.literal.LiteralFactory;
+import org.apache.clerezza.*;
+import org.apache.clerezza.impl.TripleImpl;
+import org.apache.clerezza.impl.graph.SimpleGraph;
+import org.apache.clerezza.impl.literal.LiteralFactory;
import java.util.*;
import java.util.concurrent.locks.Lock;
diff --git a/api.utils/src/main/java/org/apache/clerezza/api/utils/GraphUtils.java b/api.utils/src/main/java/org/apache/clerezza/utils/GraphUtils.java
similarity index 97%
rename from api.utils/src/main/java/org/apache/clerezza/api/utils/GraphUtils.java
rename to api.utils/src/main/java/org/apache/clerezza/utils/GraphUtils.java
index a8b3a3f..070b362 100644
--- a/api.utils/src/main/java/org/apache/clerezza/api/utils/GraphUtils.java
+++ b/api.utils/src/main/java/org/apache/clerezza/utils/GraphUtils.java
@@ -15,10 +15,10 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.utils;
+package org.apache.clerezza.utils;
-import org.apache.clerezza.api.*;
-import org.apache.clerezza.api.impl.graph.SimpleGraph;
+import org.apache.clerezza.*;
+import org.apache.clerezza.impl.graph.SimpleGraph;
import java.util.HashSet;
import java.util.Iterator;
diff --git a/api.utils/src/main/java/org/apache/clerezza/api/utils/IRIUtil.java b/api.utils/src/main/java/org/apache/clerezza/utils/IRIUtil.java
similarity index 97%
rename from api.utils/src/main/java/org/apache/clerezza/api/utils/IRIUtil.java
rename to api.utils/src/main/java/org/apache/clerezza/utils/IRIUtil.java
index 64b45dd..c32434d 100644
--- a/api.utils/src/main/java/org/apache/clerezza/api/utils/IRIUtil.java
+++ b/api.utils/src/main/java/org/apache/clerezza/utils/IRIUtil.java
@@ -15,7 +15,7 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.utils;
+package org.apache.clerezza.utils;
/**
* A utility class for IRI and String manipulations.
diff --git a/api.utils/src/main/java/org/apache/clerezza/api/utils/RdfList.java b/api.utils/src/main/java/org/apache/clerezza/utils/RdfList.java
similarity index 99%
rename from api.utils/src/main/java/org/apache/clerezza/api/utils/RdfList.java
rename to api.utils/src/main/java/org/apache/clerezza/utils/RdfList.java
index 01b3d48..cdb6f29 100644
--- a/api.utils/src/main/java/org/apache/clerezza/api/utils/RdfList.java
+++ b/api.utils/src/main/java/org/apache/clerezza/utils/RdfList.java
@@ -15,10 +15,10 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.utils;
+package org.apache.clerezza.utils;
-import org.apache.clerezza.api.*;
-import org.apache.clerezza.api.impl.TripleImpl;
+import org.apache.clerezza.*;
+import org.apache.clerezza.impl.TripleImpl;
import org.apache.clerezza.ontologies.OWL;
import org.apache.clerezza.ontologies.RDF;
import org.apache.clerezza.representation.Serializer;
diff --git a/api.utils/src/main/java/org/apache/clerezza/api/utils/SeeAlsoExpander.java b/api.utils/src/main/java/org/apache/clerezza/utils/SeeAlsoExpander.java
similarity index 96%
rename from api.utils/src/main/java/org/apache/clerezza/api/utils/SeeAlsoExpander.java
rename to api.utils/src/main/java/org/apache/clerezza/utils/SeeAlsoExpander.java
index 0bc9026..58b2e7f 100644
--- a/api.utils/src/main/java/org/apache/clerezza/api/utils/SeeAlsoExpander.java
+++ b/api.utils/src/main/java/org/apache/clerezza/utils/SeeAlsoExpander.java
@@ -15,11 +15,11 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.utils;
+package org.apache.clerezza.utils;
-import org.apache.clerezza.api.Graph;
-import org.apache.clerezza.api.IRI;
-import org.apache.clerezza.api.RDFTerm;
+import org.apache.clerezza.IRI;
+import org.apache.clerezza.RDFTerm;
+import org.apache.clerezza.Graph;
import org.apache.clerezza.dataset.NoSuchEntityException;
import org.apache.clerezza.dataset.TcManager;
import org.apache.clerezza.ontologies.RDFS;
diff --git a/api.utils/src/main/java/org/apache/clerezza/api/utils/Smusher.java b/api.utils/src/main/java/org/apache/clerezza/utils/Smusher.java
similarity index 90%
rename from api.utils/src/main/java/org/apache/clerezza/api/utils/Smusher.java
rename to api.utils/src/main/java/org/apache/clerezza/utils/Smusher.java
index 64700ab..c352fe0 100644
--- a/api.utils/src/main/java/org/apache/clerezza/api/utils/Smusher.java
+++ b/api.utils/src/main/java/org/apache/clerezza/utils/Smusher.java
@@ -15,11 +15,11 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.utils;
+package org.apache.clerezza.utils;
-import org.apache.clerezza.api.Graph;
-import org.apache.clerezza.api.utils.smushing.IfpSmusher;
-import org.apache.clerezza.api.utils.smushing.SameAsSmusher;
+import org.apache.clerezza.Graph;
+import org.apache.clerezza.utils.smushing.IfpSmusher;
+import org.apache.clerezza.utils.smushing.SameAsSmusher;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/api.utils/src/main/java/org/apache/clerezza/api/utils/UnionGraph.java b/api.utils/src/main/java/org/apache/clerezza/utils/UnionGraph.java
similarity index 98%
rename from api.utils/src/main/java/org/apache/clerezza/api/utils/UnionGraph.java
rename to api.utils/src/main/java/org/apache/clerezza/utils/UnionGraph.java
index c632765..30703d6 100644
--- a/api.utils/src/main/java/org/apache/clerezza/api/utils/UnionGraph.java
+++ b/api.utils/src/main/java/org/apache/clerezza/utils/UnionGraph.java
@@ -15,10 +15,10 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.utils;
+package org.apache.clerezza.utils;
-import org.apache.clerezza.api.*;
-import org.apache.clerezza.api.impl.graph.AbstractGraph;
+import org.apache.clerezza.*;
+import org.apache.clerezza.impl.graph.AbstractGraph;
import java.util.*;
import java.util.concurrent.TimeUnit;
diff --git a/api.utils/src/main/java/org/apache/clerezza/api/utils/UnionWatchableGraph.java b/api.utils/src/main/java/org/apache/clerezza/utils/UnionWatchableGraph.java
similarity index 88%
rename from api.utils/src/main/java/org/apache/clerezza/api/utils/UnionWatchableGraph.java
rename to api.utils/src/main/java/org/apache/clerezza/utils/UnionWatchableGraph.java
index 12e660a..b45d7d5 100644
--- a/api.utils/src/main/java/org/apache/clerezza/api/utils/UnionWatchableGraph.java
+++ b/api.utils/src/main/java/org/apache/clerezza/utils/UnionWatchableGraph.java
@@ -15,12 +15,12 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.utils;
+package org.apache.clerezza.utils;
-import org.apache.clerezza.api.Graph;
-import org.apache.clerezza.api.WatchableGraph;
-import org.apache.clerezza.api.event.FilterTriple;
-import org.apache.clerezza.api.event.GraphListener;
+import org.apache.clerezza.Graph;
+import org.apache.clerezza.WatchableGraph;
+import org.apache.clerezza.event.FilterTriple;
+import org.apache.clerezza.event.GraphListener;
/**
* @author developer
diff --git a/api.utils/src/main/java/org/apache/clerezza/api/utils/UriMutatingGraph.java b/api.utils/src/main/java/org/apache/clerezza/utils/UriMutatingGraph.java
similarity index 97%
rename from api.utils/src/main/java/org/apache/clerezza/api/utils/UriMutatingGraph.java
rename to api.utils/src/main/java/org/apache/clerezza/utils/UriMutatingGraph.java
index 4233ea7..da698a5 100644
--- a/api.utils/src/main/java/org/apache/clerezza/api/utils/UriMutatingGraph.java
+++ b/api.utils/src/main/java/org/apache/clerezza/utils/UriMutatingGraph.java
@@ -15,11 +15,11 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.utils;
+package org.apache.clerezza.utils;
-import org.apache.clerezza.api.*;
-import org.apache.clerezza.api.impl.TripleImpl;
-import org.apache.clerezza.api.impl.graph.SimpleImmutableGraph;
+import org.apache.clerezza.*;
+import org.apache.clerezza.impl.TripleImpl;
+import org.apache.clerezza.impl.graph.SimpleImmutableGraph;
import java.util.Collection;
import java.util.Iterator;
diff --git a/api.utils/src/main/java/org/apache/clerezza/api/utils/graphnodeprovider/GraphNodeProvider.java b/api.utils/src/main/java/org/apache/clerezza/utils/graphnodeprovider/GraphNodeProvider.java
similarity index 92%
rename from api.utils/src/main/java/org/apache/clerezza/api/utils/graphnodeprovider/GraphNodeProvider.java
rename to api.utils/src/main/java/org/apache/clerezza/utils/graphnodeprovider/GraphNodeProvider.java
index 3bd8f54..72e02a5 100644
--- a/api.utils/src/main/java/org/apache/clerezza/api/utils/graphnodeprovider/GraphNodeProvider.java
+++ b/api.utils/src/main/java/org/apache/clerezza/utils/graphnodeprovider/GraphNodeProvider.java
@@ -16,10 +16,10 @@
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.utils.graphnodeprovider;
+package org.apache.clerezza.utils.graphnodeprovider;
-import org.apache.clerezza.api.IRI;
-import org.apache.clerezza.api.utils.GraphNode;
+import org.apache.clerezza.IRI;
+import org.apache.clerezza.utils.GraphNode;
/**
* A service that returns a GraphNode for a specified named resource, the
diff --git a/api.utils/src/main/java/org/apache/clerezza/api/utils/smushing/BaseSmusher.java b/api.utils/src/main/java/org/apache/clerezza/utils/smushing/BaseSmusher.java
similarity index 96%
rename from api.utils/src/main/java/org/apache/clerezza/api/utils/smushing/BaseSmusher.java
rename to api.utils/src/main/java/org/apache/clerezza/utils/smushing/BaseSmusher.java
index 6785ae1..fe9f65b 100644
--- a/api.utils/src/main/java/org/apache/clerezza/api/utils/smushing/BaseSmusher.java
+++ b/api.utils/src/main/java/org/apache/clerezza/utils/smushing/BaseSmusher.java
@@ -15,11 +15,11 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.utils.smushing;
+package org.apache.clerezza.utils.smushing;
-import org.apache.clerezza.api.*;
-import org.apache.clerezza.api.impl.TripleImpl;
-import org.apache.clerezza.api.impl.graph.SimpleGraph;
+import org.apache.clerezza.*;
+import org.apache.clerezza.impl.TripleImpl;
+import org.apache.clerezza.impl.graph.SimpleGraph;
import org.apache.clerezza.ontologies.OWL;
import java.util.*;
diff --git a/api.utils/src/main/java/org/apache/clerezza/api/utils/smushing/IfpSmusher.java b/api.utils/src/main/java/org/apache/clerezza/utils/smushing/IfpSmusher.java
similarity index 98%
rename from api.utils/src/main/java/org/apache/clerezza/api/utils/smushing/IfpSmusher.java
rename to api.utils/src/main/java/org/apache/clerezza/utils/smushing/IfpSmusher.java
index a1464bd..9b15632 100644
--- a/api.utils/src/main/java/org/apache/clerezza/api/utils/smushing/IfpSmusher.java
+++ b/api.utils/src/main/java/org/apache/clerezza/utils/smushing/IfpSmusher.java
@@ -15,9 +15,9 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.utils.smushing;
+package org.apache.clerezza.utils.smushing;
-import org.apache.clerezza.api.*;
+import org.apache.clerezza.*;
import org.apache.clerezza.ontologies.OWL;
import org.apache.clerezza.ontologies.RDF;
import org.slf4j.Logger;
diff --git a/api.utils/src/main/java/org/apache/clerezza/api/utils/smushing/SameAsSmusher.java b/api.utils/src/main/java/org/apache/clerezza/utils/smushing/SameAsSmusher.java
similarity index 95%
rename from api.utils/src/main/java/org/apache/clerezza/api/utils/smushing/SameAsSmusher.java
rename to api.utils/src/main/java/org/apache/clerezza/utils/smushing/SameAsSmusher.java
index b9f4de2..074a5cb 100644
--- a/api.utils/src/main/java/org/apache/clerezza/api/utils/smushing/SameAsSmusher.java
+++ b/api.utils/src/main/java/org/apache/clerezza/utils/smushing/SameAsSmusher.java
@@ -15,12 +15,12 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.utils.smushing;
+package org.apache.clerezza.utils.smushing;
-import org.apache.clerezza.api.BlankNodeOrIRI;
-import org.apache.clerezza.api.Graph;
-import org.apache.clerezza.api.IRI;
-import org.apache.clerezza.api.Triple;
+import org.apache.clerezza.BlankNodeOrIRI;
+import org.apache.clerezza.Graph;
+import org.apache.clerezza.IRI;
+import org.apache.clerezza.Triple;
import org.apache.clerezza.ontologies.OWL;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/api.utils/src/main/scala/org/apache/clerezza/api/scala/utils/CollectedIter.scala b/api.utils/src/main/scala/org/apache/clerezza/scala/utils/CollectedIter.scala
similarity index 99%
rename from api.utils/src/main/scala/org/apache/clerezza/api/scala/utils/CollectedIter.scala
rename to api.utils/src/main/scala/org/apache/clerezza/scala/utils/CollectedIter.scala
index 6ad12fe..01c5c36 100644
--- a/api.utils/src/main/scala/org/apache/clerezza/api/scala/utils/CollectedIter.scala
+++ b/api.utils/src/main/scala/org/apache/clerezza/scala/utils/CollectedIter.scala
@@ -15,7 +15,7 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.scala.utils
+package org.apache.clerezza.scala.utils
import java.util.concurrent.locks.Lock
import java.util.{ConcurrentModificationException, Iterator}
diff --git a/api.utils/src/main/scala/org/apache/clerezza/api/scala/utils/EzLiteral.scala b/api.utils/src/main/scala/org/apache/clerezza/scala/utils/EzLiteral.scala
similarity index 91%
rename from api.utils/src/main/scala/org/apache/clerezza/api/scala/utils/EzLiteral.scala
rename to api.utils/src/main/scala/org/apache/clerezza/scala/utils/EzLiteral.scala
index de303e1..3abef97 100644
--- a/api.utils/src/main/scala/org/apache/clerezza/api/scala/utils/EzLiteral.scala
+++ b/api.utils/src/main/scala/org/apache/clerezza/scala/utils/EzLiteral.scala
@@ -15,10 +15,11 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.scala.utils
+package org.apache.clerezza.scala.utils
-import org.apache.clerezza.api._
-import org.apache.clerezza.api.impl.literal._
+import org.apache.clerezza.{IRI, Language, Literal}
+import org.apache.clerezza.impl.literal._
+import org.apache.clerezza.impl.literal.{PlainLiteralImpl, TypedLiteralImpl}
import org.apache.clerezza.ontologies.XSD
object EzLiteral extends EzLiteralImplicits
diff --git a/api.utils/src/main/scala/org/apache/clerezza/api/scala/utils/EzMGraph.scala b/api.utils/src/main/scala/org/apache/clerezza/scala/utils/EzMGraph.scala
similarity index 84%
rename from api.utils/src/main/scala/org/apache/clerezza/api/scala/utils/EzMGraph.scala
rename to api.utils/src/main/scala/org/apache/clerezza/scala/utils/EzMGraph.scala
index c5ab112..27bbf8c 100644
--- a/api.utils/src/main/scala/org/apache/clerezza/api/scala/utils/EzMGraph.scala
+++ b/api.utils/src/main/scala/org/apache/clerezza/scala/utils/EzMGraph.scala
@@ -15,10 +15,12 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.scala.utils
+package org.apache.clerezza.scala.utils
-import org.apache.clerezza.api._
-import org.apache.clerezza.api.impl.graph._
+import org.apache.clerezza
+import org.apache.clerezza._
+import org.apache.clerezza.impl.graph._
+import org.apache.clerezza.impl.graph.{AbstractGraph, SimpleGraph}
import _root_.scala.collection.mutable.HashMap
@@ -36,11 +38,11 @@ class EzGraph(val baseTc: Graph) extends AbstractGraph with TcDependentConversio
def this() = this(new SimpleGraph())
def performFilter(subject: BlankNodeOrIRI, predicate: IRI,
- obj: RDFTerm): java.util.Iterator[Triple] = baseTc.filter(subject, predicate, obj)
+ obj: RDFTerm): java.util.Iterator[clerezza.Triple] = baseTc.filter(subject, predicate, obj)
override def performSize = baseTc.size
- override def add(t: Triple) = baseTc.add(t)
+ override def add(t: clerezza.Triple) = baseTc.add(t)
/**
* Add all triples into the other graph to this one
diff --git a/api.utils/src/main/scala/org/apache/clerezza/api/scala/utils/NameSpace.scala b/api.utils/src/main/scala/org/apache/clerezza/scala/utils/NameSpace.scala
similarity index 93%
rename from api.utils/src/main/scala/org/apache/clerezza/api/scala/utils/NameSpace.scala
rename to api.utils/src/main/scala/org/apache/clerezza/scala/utils/NameSpace.scala
index 1231fcc..8920fbd 100644
--- a/api.utils/src/main/scala/org/apache/clerezza/api/scala/utils/NameSpace.scala
+++ b/api.utils/src/main/scala/org/apache/clerezza/scala/utils/NameSpace.scala
@@ -15,9 +15,9 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.scala.utils
+package org.apache.clerezza.scala.utils
-import org.apache.clerezza.api.IRI
+import org.apache.clerezza.IRI
/**
* A IRI-namespace prefix
diff --git a/api.utils/src/main/scala/org/apache/clerezza/api/scala/utils/Preamble.scala b/api.utils/src/main/scala/org/apache/clerezza/scala/utils/Preamble.scala
similarity index 88%
rename from api.utils/src/main/scala/org/apache/clerezza/api/scala/utils/Preamble.scala
rename to api.utils/src/main/scala/org/apache/clerezza/scala/utils/Preamble.scala
index 635f2f3..ad2b551 100644
--- a/api.utils/src/main/scala/org/apache/clerezza/api/scala/utils/Preamble.scala
+++ b/api.utils/src/main/scala/org/apache/clerezza/scala/utils/Preamble.scala
@@ -15,16 +15,20 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.scala.utils
+package org.apache.clerezza.scala.utils
import java.math.BigInteger
import java.net.{URI, URL}
import java.util.Date
-import org.apache.clerezza.api._
-import org.apache.clerezza.api.impl.graph._
-import org.apache.clerezza.api.impl.literal._
-import org.apache.clerezza.api.utils.GraphNode
+import org.apache.clerezza.{Graph, IRI, Literal, RDFTerm}
+import org.apache.clerezza._
+import org.apache.clerezza.impl.graph._
+import org.apache.clerezza.impl.literal._
+import org.apache.clerezza.utils.GraphNode
+import org.apache.clerezza.impl.graph.{SimpleGraph, SimpleImmutableGraph}
+import org.apache.clerezza.impl.literal.{LiteralFactory, PlainLiteralImpl}
+import org.apache.clerezza.utils.GraphNode
/**
* This object provides the implicit conversions. Typically this is used by
diff --git a/api.utils/src/main/scala/org/apache/clerezza/api/scala/utils/RichGraphNode.scala b/api.utils/src/main/scala/org/apache/clerezza/scala/utils/RichGraphNode.scala
similarity index 94%
rename from api.utils/src/main/scala/org/apache/clerezza/api/scala/utils/RichGraphNode.scala
rename to api.utils/src/main/scala/org/apache/clerezza/scala/utils/RichGraphNode.scala
index e4327a2..72e1252 100644
--- a/api.utils/src/main/scala/org/apache/clerezza/api/scala/utils/RichGraphNode.scala
+++ b/api.utils/src/main/scala/org/apache/clerezza/scala/utils/RichGraphNode.scala
@@ -15,15 +15,19 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.scala.utils
+package org.apache.clerezza.scala.utils
import java.util.Iterator
-import org.apache.clerezza.api._
-import org.apache.clerezza.api.impl.graph.SimpleGraph
-import org.apache.clerezza.api.impl.literal.LiteralFactory
-import org.apache.clerezza.api.utils.{GraphNode, UnionGraph}
+import org.apache.clerezza.{Graph, IRI, Literal, RDFTerm}
+import org.apache.clerezza._
+import org.apache.clerezza.impl.graph.SimpleGraph
+import org.apache.clerezza.impl.literal.LiteralFactory
+import org.apache.clerezza.utils.{GraphNode, UnionGraph}
+import org.apache.clerezza.impl.graph.SimpleGraph
+import org.apache.clerezza.impl.literal.LiteralFactory
import org.apache.clerezza.ontologies.RDF
+import org.apache.clerezza.utils.{GraphNode, UnionGraph}
import _root_.scala.collection.JavaConversions._
import _root_.scala.reflect.Manifest
diff --git a/api.utils/src/test/java/org/apache/clerezza/api/utils/GraphUtilsTest.java b/api.utils/src/test/java/org/apache/clerezza/utils/GraphUtilsTest.java
similarity index 83%
rename from api.utils/src/test/java/org/apache/clerezza/api/utils/GraphUtilsTest.java
rename to api.utils/src/test/java/org/apache/clerezza/utils/GraphUtilsTest.java
index a4e5c1e..931c148 100644
--- a/api.utils/src/test/java/org/apache/clerezza/api/utils/GraphUtilsTest.java
+++ b/api.utils/src/test/java/org/apache/clerezza/utils/GraphUtilsTest.java
@@ -15,14 +15,13 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.utils;
+package org.apache.clerezza.utils;
-import org.apache.clerezza.api.BlankNode;
-import org.apache.clerezza.api.Graph;
-import org.apache.clerezza.api.IRI;
-import org.apache.clerezza.api.impl.TripleImpl;
-import org.apache.clerezza.api.impl.graph.SimpleGraph;
-import org.apache.clerezza.api.utils.GraphUtils.NoSuchSubGraphException;
+import org.apache.clerezza.BlankNode;
+import org.apache.clerezza.Graph;
+import org.apache.clerezza.IRI;
+import org.apache.clerezza.impl.TripleImpl;
+import org.apache.clerezza.impl.graph.SimpleGraph;
import org.junit.Assert;
import org.junit.Test;
@@ -36,7 +35,7 @@ public class GraphUtilsTest {
final IRI u3 = new IRI("http://ex.org/3");
@Test
- public void removeSubGraph() throws NoSuchSubGraphException {
+ public void removeSubGraph() throws GraphUtils.NoSuchSubGraphException {
Graph baseGraph = createBaseGraph();
Graph subGraph = new SimpleGraph();
@@ -69,8 +68,8 @@ public class GraphUtilsTest {
*
* @throws org.apache.clerezza.utils.GraphUtils.NoSuchSubGraphException
*/
- @Test(expected = NoSuchSubGraphException.class)
- public void removeIncompleteSubGraph() throws NoSuchSubGraphException {
+ @Test(expected = GraphUtils.NoSuchSubGraphException.class)
+ public void removeIncompleteSubGraph() throws GraphUtils.NoSuchSubGraphException {
Graph baseGraph = createBaseGraph();
Graph subGraph = new SimpleGraph();
@@ -83,8 +82,8 @@ public class GraphUtilsTest {
GraphUtils.removeSubGraph(baseGraph, subGraph);
}
- @Test(expected = NoSuchSubGraphException.class)
- public void removeInvalidSubGraph() throws NoSuchSubGraphException {
+ @Test(expected = GraphUtils.NoSuchSubGraphException.class)
+ public void removeInvalidSubGraph() throws GraphUtils.NoSuchSubGraphException {
Graph baseGraph = createBaseGraph();
Graph subGraph = new SimpleGraph();
diff --git a/api.utils/src/test/java/org/apache/clerezza/api/utils/IfpSmushTest.java b/api.utils/src/test/java/org/apache/clerezza/utils/IfpSmushTest.java
similarity index 93%
rename from api.utils/src/test/java/org/apache/clerezza/api/utils/IfpSmushTest.java
rename to api.utils/src/test/java/org/apache/clerezza/utils/IfpSmushTest.java
index dd19217..bcc4250 100644
--- a/api.utils/src/test/java/org/apache/clerezza/api/utils/IfpSmushTest.java
+++ b/api.utils/src/test/java/org/apache/clerezza/utils/IfpSmushTest.java
@@ -15,14 +15,14 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.utils;
+package org.apache.clerezza.utils;
-import org.apache.clerezza.api.BlankNode;
-import org.apache.clerezza.api.Graph;
-import org.apache.clerezza.api.IRI;
-import org.apache.clerezza.api.impl.TripleImpl;
-import org.apache.clerezza.api.impl.graph.SimpleGraph;
-import org.apache.clerezza.api.impl.literal.PlainLiteralImpl;
+import org.apache.clerezza.BlankNode;
+import org.apache.clerezza.Graph;
+import org.apache.clerezza.IRI;
+import org.apache.clerezza.impl.TripleImpl;
+import org.apache.clerezza.impl.graph.SimpleGraph;
+import org.apache.clerezza.impl.literal.PlainLiteralImpl;
import org.apache.clerezza.ontologies.FOAF;
import org.apache.clerezza.ontologies.OWL;
import org.apache.clerezza.ontologies.RDF;
diff --git a/api.utils/src/test/java/org/apache/clerezza/api/utils/RdfListTest.java b/api.utils/src/test/java/org/apache/clerezza/utils/RdfListTest.java
similarity index 95%
rename from api.utils/src/test/java/org/apache/clerezza/api/utils/RdfListTest.java
rename to api.utils/src/test/java/org/apache/clerezza/utils/RdfListTest.java
index 0ef67c7..9b65b45 100644
--- a/api.utils/src/test/java/org/apache/clerezza/api/utils/RdfListTest.java
+++ b/api.utils/src/test/java/org/apache/clerezza/utils/RdfListTest.java
@@ -15,15 +15,15 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.utils;
+package org.apache.clerezza.utils;
import junit.framework.Assert;
-import org.apache.clerezza.api.BlankNode;
-import org.apache.clerezza.api.Graph;
-import org.apache.clerezza.api.IRI;
-import org.apache.clerezza.api.RDFTerm;
-import org.apache.clerezza.api.impl.graph.SimpleGraph;
-import org.apache.clerezza.api.impl.literal.PlainLiteralImpl;
+import org.apache.clerezza.RDFTerm;
+import org.apache.clerezza.BlankNode;
+import org.apache.clerezza.Graph;
+import org.apache.clerezza.IRI;
+import org.apache.clerezza.impl.graph.SimpleGraph;
+import org.apache.clerezza.impl.literal.PlainLiteralImpl;
import org.junit.Test;
import java.util.List;
diff --git a/api.utils/src/test/java/org/apache/clerezza/api/utils/SameAsSmushTest.java b/api.utils/src/test/java/org/apache/clerezza/utils/SameAsSmushTest.java
similarity index 88%
rename from api.utils/src/test/java/org/apache/clerezza/api/utils/SameAsSmushTest.java
rename to api.utils/src/test/java/org/apache/clerezza/utils/SameAsSmushTest.java
index 5622711..9bc99f4 100644
--- a/api.utils/src/test/java/org/apache/clerezza/api/utils/SameAsSmushTest.java
+++ b/api.utils/src/test/java/org/apache/clerezza/utils/SameAsSmushTest.java
@@ -15,15 +15,15 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.utils;
+package org.apache.clerezza.utils;
-import org.apache.clerezza.api.Graph;
-import org.apache.clerezza.api.IRI;
-import org.apache.clerezza.api.Literal;
-import org.apache.clerezza.api.Triple;
-import org.apache.clerezza.api.impl.TripleImpl;
-import org.apache.clerezza.api.impl.graph.SimpleGraph;
-import org.apache.clerezza.api.impl.literal.PlainLiteralImpl;
+import org.apache.clerezza.Graph;
+import org.apache.clerezza.IRI;
+import org.apache.clerezza.Literal;
+import org.apache.clerezza.Triple;
+import org.apache.clerezza.impl.TripleImpl;
+import org.apache.clerezza.impl.graph.SimpleGraph;
+import org.apache.clerezza.impl.literal.PlainLiteralImpl;
import org.apache.clerezza.ontologies.FOAF;
import org.apache.clerezza.ontologies.OWL;
import org.apache.clerezza.ontologies.RDFS;
diff --git a/api.utils/src/test/java/org/apache/clerezza/api/utils/TestGraphNode.java b/api.utils/src/test/java/org/apache/clerezza/utils/TestGraphNode.java
similarity index 97%
rename from api.utils/src/test/java/org/apache/clerezza/api/utils/TestGraphNode.java
rename to api.utils/src/test/java/org/apache/clerezza/utils/TestGraphNode.java
index 2a39556..1a628c9 100644
--- a/api.utils/src/test/java/org/apache/clerezza/api/utils/TestGraphNode.java
+++ b/api.utils/src/test/java/org/apache/clerezza/utils/TestGraphNode.java
@@ -15,13 +15,13 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.utils;
+package org.apache.clerezza.utils;
import junit.framework.Assert;
-import org.apache.clerezza.api.*;
-import org.apache.clerezza.api.impl.TripleImpl;
-import org.apache.clerezza.api.impl.graph.SimpleGraph;
-import org.apache.clerezza.api.impl.literal.PlainLiteralImpl;
+import org.apache.clerezza.*;
+import org.apache.clerezza.impl.TripleImpl;
+import org.apache.clerezza.impl.graph.SimpleGraph;
+import org.apache.clerezza.impl.literal.PlainLiteralImpl;
import org.apache.clerezza.test.utils.RandomGraph;
import org.junit.Test;
diff --git a/api.utils/src/test/java/org/apache/clerezza/api/utils/UnionGraphTest.java b/api.utils/src/test/java/org/apache/clerezza/utils/UnionGraphTest.java
similarity index 89%
rename from api.utils/src/test/java/org/apache/clerezza/api/utils/UnionGraphTest.java
rename to api.utils/src/test/java/org/apache/clerezza/utils/UnionGraphTest.java
index d45f945..7c47bfc 100644
--- a/api.utils/src/test/java/org/apache/clerezza/api/utils/UnionGraphTest.java
+++ b/api.utils/src/test/java/org/apache/clerezza/utils/UnionGraphTest.java
@@ -15,14 +15,14 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.utils;
+package org.apache.clerezza.utils;
-import org.apache.clerezza.api.BlankNode;
-import org.apache.clerezza.api.Graph;
-import org.apache.clerezza.api.IRI;
-import org.apache.clerezza.api.Triple;
-import org.apache.clerezza.api.impl.TripleImpl;
-import org.apache.clerezza.api.impl.graph.SimpleGraph;
+import org.apache.clerezza.BlankNode;
+import org.apache.clerezza.Graph;
+import org.apache.clerezza.IRI;
+import org.apache.clerezza.Triple;
+import org.apache.clerezza.impl.TripleImpl;
+import org.apache.clerezza.impl.graph.SimpleGraph;
import org.junit.Assert;
import org.junit.Test;
diff --git a/api.utils/src/test/java/org/apache/clerezza/api/utils/smushing/SameAsSmushTest.java b/api.utils/src/test/java/org/apache/clerezza/utils/smushing/SameAsSmushTest.java
similarity index 89%
rename from api.utils/src/test/java/org/apache/clerezza/api/utils/smushing/SameAsSmushTest.java
rename to api.utils/src/test/java/org/apache/clerezza/utils/smushing/SameAsSmushTest.java
index 0116014..2a3b350 100644
--- a/api.utils/src/test/java/org/apache/clerezza/api/utils/smushing/SameAsSmushTest.java
+++ b/api.utils/src/test/java/org/apache/clerezza/utils/smushing/SameAsSmushTest.java
@@ -15,15 +15,15 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.utils.smushing;
+package org.apache.clerezza.utils.smushing;
-import org.apache.clerezza.api.Graph;
-import org.apache.clerezza.api.IRI;
-import org.apache.clerezza.api.Literal;
-import org.apache.clerezza.api.Triple;
-import org.apache.clerezza.api.impl.TripleImpl;
-import org.apache.clerezza.api.impl.graph.SimpleGraph;
-import org.apache.clerezza.api.impl.literal.PlainLiteralImpl;
+import org.apache.clerezza.Graph;
+import org.apache.clerezza.IRI;
+import org.apache.clerezza.Literal;
+import org.apache.clerezza.Triple;
+import org.apache.clerezza.impl.TripleImpl;
+import org.apache.clerezza.impl.graph.SimpleGraph;
+import org.apache.clerezza.impl.literal.PlainLiteralImpl;
import org.apache.clerezza.ontologies.FOAF;
import org.apache.clerezza.ontologies.OWL;
import org.apache.clerezza.ontologies.RDFS;
diff --git a/api.utils/src/test/scala/org/apache/clerezza/api/scala/utils/EzMGraphTest.scala b/api.utils/src/test/scala/org/apache/clerezza/scala/utils/EzMGraphTest.scala
similarity index 94%
rename from api.utils/src/test/scala/org/apache/clerezza/api/scala/utils/EzMGraphTest.scala
rename to api.utils/src/test/scala/org/apache/clerezza/scala/utils/EzMGraphTest.scala
index 3b51dfc..7d170c4 100644
--- a/api.utils/src/test/scala/org/apache/clerezza/api/scala/utils/EzMGraphTest.scala
+++ b/api.utils/src/test/scala/org/apache/clerezza/scala/utils/EzMGraphTest.scala
@@ -15,13 +15,16 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.scala.utils
-
-import org.apache.clerezza.api._
-import org.apache.clerezza.api.impl._
-import org.apache.clerezza.api.impl.graph.SimpleGraph
-import org.apache.clerezza.api.impl.literal._
-import org.apache.clerezza.api.scala.utils.Preamble._
+package org.apache.clerezza.scala.utils
+
+import org.apache.clerezza._
+import org.apache.clerezza.impl._
+import org.apache.clerezza.impl.literal._
+import Preamble._
+import org.apache.clerezza.{BlankNode, IRI, ImmutableGraph, Language}
+import org.apache.clerezza.impl.TripleImpl
+import org.apache.clerezza.impl.graph.SimpleGraph
+import org.apache.clerezza.impl.literal.{LiteralFactory, PlainLiteralImpl, TypedLiteralImpl}
import org.apache.clerezza.ontologies._
import org.junit._
diff --git a/api.utils/src/test/scala/org/apache/clerezza/api/scala/utils/RichGraphNodeTest.scala b/api.utils/src/test/scala/org/apache/clerezza/scala/utils/RichGraphNodeTest.scala
similarity index 93%
rename from api.utils/src/test/scala/org/apache/clerezza/api/scala/utils/RichGraphNodeTest.scala
rename to api.utils/src/test/scala/org/apache/clerezza/scala/utils/RichGraphNodeTest.scala
index ab723b1..a244278 100644
--- a/api.utils/src/test/scala/org/apache/clerezza/api/scala/utils/RichGraphNodeTest.scala
+++ b/api.utils/src/test/scala/org/apache/clerezza/scala/utils/RichGraphNodeTest.scala
@@ -15,15 +15,20 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.scala.utils
-
-import org.apache.clerezza.api._
-import org.apache.clerezza.api.impl._
-import org.apache.clerezza.api.impl.graph._
-import org.apache.clerezza.api.impl.literal._
-import org.apache.clerezza.api.scala.utils.Preamble._
-import org.apache.clerezza.api.utils._
+package org.apache.clerezza.scala.utils
+
+import org.apache.clerezza._
+import org.apache.clerezza.impl._
+import org.apache.clerezza.impl.graph._
+import org.apache.clerezza.impl.literal._
+import Preamble._
+import org.apache.clerezza._
+import org.apache.clerezza.utils._
+import org.apache.clerezza.impl.TripleImpl
+import org.apache.clerezza.impl.graph.SimpleGraph
+import org.apache.clerezza.impl.literal.{PlainLiteralImpl, TypedLiteralImpl}
import org.apache.clerezza.ontologies._
+import org.apache.clerezza.utils.{GraphNode, RdfList}
import org.junit._
class RichGraphNodeTest {
diff --git a/api.utils/src/test/scala/org/apache/clerezza/api/scala/utils/TypeConversionTest.scala b/api.utils/src/test/scala/org/apache/clerezza/scala/utils/TypeConversionTest.scala
similarity index 88%
rename from api.utils/src/test/scala/org/apache/clerezza/api/scala/utils/TypeConversionTest.scala
rename to api.utils/src/test/scala/org/apache/clerezza/scala/utils/TypeConversionTest.scala
index 2770926..e6258fb 100644
--- a/api.utils/src/test/scala/org/apache/clerezza/api/scala/utils/TypeConversionTest.scala
+++ b/api.utils/src/test/scala/org/apache/clerezza/scala/utils/TypeConversionTest.scala
@@ -15,11 +15,14 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.scala.utils
+package org.apache.clerezza.scala.utils
-import org.apache.clerezza.api._
-import org.apache.clerezza.api.impl._
-import org.apache.clerezza.api.impl.literal._
+import org.apache.clerezza.{IRI, Language}
+import org.apache.clerezza._
+import org.apache.clerezza.impl._
+import org.apache.clerezza.impl.literal._
+import org.apache.clerezza.impl.TripleImpl
+import org.apache.clerezza.impl.literal.{LiteralFactory, PlainLiteralImpl, TypedLiteralImpl}
import org.junit._
class TypeConversionTest {
diff --git a/api/pom.xml b/api/pom.xml
index 95d1f40..0de48ff 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -52,7 +52,7 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Export-Package>${project.groupId}.${project.artifactId}.*</Export-Package>
+ <Export-Package>${project.groupId}.*</Export-Package>
</instructions>
</configuration>
</plugin>
diff --git a/api/src/main/java/org/apache/clerezza/api/BlankNode.java b/api/src/main/java/org/apache/clerezza/BlankNode.java
similarity index 98%
rename from api/src/main/java/org/apache/clerezza/api/BlankNode.java
rename to api/src/main/java/org/apache/clerezza/BlankNode.java
index 9c4e2b3..fb087db 100644
--- a/api/src/main/java/org/apache/clerezza/api/BlankNode.java
+++ b/api/src/main/java/org/apache/clerezza/BlankNode.java
@@ -15,7 +15,7 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api;
+package org.apache.clerezza;
/**
* A Blank Node represents a resource,
diff --git a/api/src/main/java/org/apache/clerezza/api/BlankNodeOrIRI.java b/api/src/main/java/org/apache/clerezza/BlankNodeOrIRI.java
similarity index 97%
rename from api/src/main/java/org/apache/clerezza/api/BlankNodeOrIRI.java
rename to api/src/main/java/org/apache/clerezza/BlankNodeOrIRI.java
index 9d62c8e..9dfea05 100644
--- a/api/src/main/java/org/apache/clerezza/api/BlankNodeOrIRI.java
+++ b/api/src/main/java/org/apache/clerezza/BlankNodeOrIRI.java
@@ -15,7 +15,7 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api;
+package org.apache.clerezza;
/**
* Represents a <code>Resource</code> that is not a <code>Literal</code>.
diff --git a/api/src/main/java/org/apache/clerezza/api/Graph.java b/api/src/main/java/org/apache/clerezza/Graph.java
similarity index 99%
rename from api/src/main/java/org/apache/clerezza/api/Graph.java
rename to api/src/main/java/org/apache/clerezza/Graph.java
index a4d620e..ed48f30 100644
--- a/api/src/main/java/org/apache/clerezza/api/Graph.java
+++ b/api/src/main/java/org/apache/clerezza/Graph.java
@@ -15,7 +15,7 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api;
+package org.apache.clerezza;
import java.util.Collection;
import java.util.Iterator;
diff --git a/api/src/main/java/org/apache/clerezza/api/IRI.java b/api/src/main/java/org/apache/clerezza/IRI.java
similarity index 98%
rename from api/src/main/java/org/apache/clerezza/api/IRI.java
rename to api/src/main/java/org/apache/clerezza/IRI.java
index 89d0f3e..a8dfd2f 100644
--- a/api/src/main/java/org/apache/clerezza/api/IRI.java
+++ b/api/src/main/java/org/apache/clerezza/IRI.java
@@ -15,7 +15,7 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api;
+package org.apache.clerezza;
import java.io.Serializable;
diff --git a/api/src/main/java/org/apache/clerezza/api/ImmutableGraph.java b/api/src/main/java/org/apache/clerezza/ImmutableGraph.java
similarity index 98%
rename from api/src/main/java/org/apache/clerezza/api/ImmutableGraph.java
rename to api/src/main/java/org/apache/clerezza/ImmutableGraph.java
index f204480..6a18d2e 100644
--- a/api/src/main/java/org/apache/clerezza/api/ImmutableGraph.java
+++ b/api/src/main/java/org/apache/clerezza/ImmutableGraph.java
@@ -15,7 +15,7 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api;
+package org.apache.clerezza;
/**
* A graph, modeled as a set of triples.
diff --git a/api/src/main/java/org/apache/clerezza/api/Language.java b/api/src/main/java/org/apache/clerezza/Language.java
similarity index 98%
rename from api/src/main/java/org/apache/clerezza/api/Language.java
rename to api/src/main/java/org/apache/clerezza/Language.java
index d81b8d6..1273d51 100644
--- a/api/src/main/java/org/apache/clerezza/api/Language.java
+++ b/api/src/main/java/org/apache/clerezza/Language.java
@@ -15,7 +15,7 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api;
+package org.apache.clerezza;
/**
* Represents a language as expressed by the RDF 4646 language tag
diff --git a/api/src/main/java/org/apache/clerezza/api/Literal.java b/api/src/main/java/org/apache/clerezza/Literal.java
similarity index 99%
rename from api/src/main/java/org/apache/clerezza/api/Literal.java
rename to api/src/main/java/org/apache/clerezza/Literal.java
index 8e6c38a..abb903a 100644
--- a/api/src/main/java/org/apache/clerezza/api/Literal.java
+++ b/api/src/main/java/org/apache/clerezza/Literal.java
@@ -15,7 +15,7 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api;
+package org.apache.clerezza;
/**
* Represents a literal value that can be a node in an RDF Graph.
diff --git a/api/src/main/java/org/apache/clerezza/api/RDFTerm.java b/api/src/main/java/org/apache/clerezza/RDFTerm.java
similarity index 97%
rename from api/src/main/java/org/apache/clerezza/api/RDFTerm.java
rename to api/src/main/java/org/apache/clerezza/RDFTerm.java
index 39aa7fe..986186a 100644
--- a/api/src/main/java/org/apache/clerezza/api/RDFTerm.java
+++ b/api/src/main/java/org/apache/clerezza/RDFTerm.java
@@ -15,7 +15,7 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api;
+package org.apache.clerezza;
/**
* An <a href= "http://www.w3.org/TR/rdf11-concepts/#dfn-rdf-term" >RDF-1.1
diff --git a/api/src/main/java/org/apache/clerezza/api/Triple.java b/api/src/main/java/org/apache/clerezza/Triple.java
similarity index 98%
rename from api/src/main/java/org/apache/clerezza/api/Triple.java
rename to api/src/main/java/org/apache/clerezza/Triple.java
index ff9d6f2..961fa7c 100644
--- a/api/src/main/java/org/apache/clerezza/api/Triple.java
+++ b/api/src/main/java/org/apache/clerezza/Triple.java
@@ -15,7 +15,7 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api;
+package org.apache.clerezza;
/**
* A structure containing a subject, a predicate, and an object.
diff --git a/api/src/main/java/org/apache/clerezza/api/WatchableGraph.java b/api/src/main/java/org/apache/clerezza/WatchableGraph.java
similarity index 96%
rename from api/src/main/java/org/apache/clerezza/api/WatchableGraph.java
rename to api/src/main/java/org/apache/clerezza/WatchableGraph.java
index fb5890c..976f080 100644
--- a/api/src/main/java/org/apache/clerezza/api/WatchableGraph.java
+++ b/api/src/main/java/org/apache/clerezza/WatchableGraph.java
@@ -15,10 +15,10 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api;
+package org.apache.clerezza;
-import org.apache.clerezza.api.event.FilterTriple;
-import org.apache.clerezza.api.event.GraphListener;
+import org.apache.clerezza.event.FilterTriple;
+import org.apache.clerezza.event.GraphListener;
/**
* An extension to the Graph interface that allows to add throws events
diff --git a/api/src/main/java/org/apache/clerezza/api/event/AddEvent.java b/api/src/main/java/org/apache/clerezza/event/AddEvent.java
similarity index 90%
rename from api/src/main/java/org/apache/clerezza/api/event/AddEvent.java
rename to api/src/main/java/org/apache/clerezza/event/AddEvent.java
index ca055b8..72f574b 100644
--- a/api/src/main/java/org/apache/clerezza/api/event/AddEvent.java
+++ b/api/src/main/java/org/apache/clerezza/event/AddEvent.java
@@ -15,10 +15,10 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.event;
+package org.apache.clerezza.event;
-import org.apache.clerezza.api.Graph;
-import org.apache.clerezza.api.Triple;
+import org.apache.clerezza.Graph;
+import org.apache.clerezza.Triple;
/**
* This class represent an addition event that occurred on a
diff --git a/api/src/main/java/org/apache/clerezza/api/event/FilterTriple.java b/api/src/main/java/org/apache/clerezza/event/FilterTriple.java
similarity index 93%
rename from api/src/main/java/org/apache/clerezza/api/event/FilterTriple.java
rename to api/src/main/java/org/apache/clerezza/event/FilterTriple.java
index d646613..5eff42a 100644
--- a/api/src/main/java/org/apache/clerezza/api/event/FilterTriple.java
+++ b/api/src/main/java/org/apache/clerezza/event/FilterTriple.java
@@ -15,12 +15,12 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.event;
+package org.apache.clerezza.event;
-import org.apache.clerezza.api.BlankNodeOrIRI;
-import org.apache.clerezza.api.IRI;
-import org.apache.clerezza.api.RDFTerm;
-import org.apache.clerezza.api.Triple;
+import org.apache.clerezza.BlankNodeOrIRI;
+import org.apache.clerezza.RDFTerm;
+import org.apache.clerezza.IRI;
+import org.apache.clerezza.Triple;
/**
* The <code>FilterTriple</code> class provides a match()-method that tests
diff --git a/api/src/main/java/org/apache/clerezza/api/event/GraphEvent.java b/api/src/main/java/org/apache/clerezza/event/GraphEvent.java
similarity index 93%
rename from api/src/main/java/org/apache/clerezza/api/event/GraphEvent.java
rename to api/src/main/java/org/apache/clerezza/event/GraphEvent.java
index 708fc57..2c55b12 100644
--- a/api/src/main/java/org/apache/clerezza/api/event/GraphEvent.java
+++ b/api/src/main/java/org/apache/clerezza/event/GraphEvent.java
@@ -15,10 +15,10 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.event;
+package org.apache.clerezza.event;
-import org.apache.clerezza.api.Graph;
-import org.apache.clerezza.api.Triple;
+import org.apache.clerezza.Graph;
+import org.apache.clerezza.Triple;
/**
* This class represent a modification event that occured on a
diff --git a/api/src/main/java/org/apache/clerezza/api/event/GraphListener.java b/api/src/main/java/org/apache/clerezza/event/GraphListener.java
similarity index 97%
rename from api/src/main/java/org/apache/clerezza/api/event/GraphListener.java
rename to api/src/main/java/org/apache/clerezza/event/GraphListener.java
index 6bb583f..7d4dbd6 100644
--- a/api/src/main/java/org/apache/clerezza/api/event/GraphListener.java
+++ b/api/src/main/java/org/apache/clerezza/event/GraphListener.java
@@ -15,7 +15,7 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.event;
+package org.apache.clerezza.event;
import java.util.List;
diff --git a/api/src/main/java/org/apache/clerezza/api/event/RemoveEvent.java b/api/src/main/java/org/apache/clerezza/event/RemoveEvent.java
similarity index 90%
rename from api/src/main/java/org/apache/clerezza/api/event/RemoveEvent.java
rename to api/src/main/java/org/apache/clerezza/event/RemoveEvent.java
index 2f08908..311cb1f 100644
--- a/api/src/main/java/org/apache/clerezza/api/event/RemoveEvent.java
+++ b/api/src/main/java/org/apache/clerezza/event/RemoveEvent.java
@@ -15,10 +15,10 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.api.event;
+package org.apache.clerezza.event;
-import org.apache.clerezza.api.Graph;
-import org.apache.clerezza.api.Triple;
+import org.apache.clerezza.Graph;
+import org.apache.clerezza.Triple;
/**
* This class represent a removal event that occured on a
diff --git a/api/src/main/java/org/apache/clerezza/api/package-info.java b/api/src/main/java/org/apache/clerezza/package-info.java
similarity index 96%
rename from api/src/main/java/org/apache/clerezza/api/package-info.java
rename to api/src/main/java/org/apache/clerezza/package-info.java
index 3adc92a..0c5c6d5 100644
--- a/api/src/main/java/org/apache/clerezza/api/package-info.java
+++ b/api/src/main/java/org/apache/clerezza/package-info.java
@@ -18,4 +18,4 @@
/**
* Apache Clerezza RDF API
*/
-package org.apache.clerezza.api;
\ No newline at end of file
+package org.apache.clerezza;
\ No newline at end of file
diff --git a/api/target.old/.plxarc b/api/target.old/.plxarc
new file mode 100644
index 0000000..67ea6ee
--- /dev/null
+++ b/api/target.old/.plxarc
@@ -0,0 +1 @@
+maven-shared-archive-resources
\ No newline at end of file
diff --git a/api/target.old/api-8-SNAPSHOT-sources.jar b/api/target.old/api-8-SNAPSHOT-sources.jar
new file mode 100644
index 0000000..859e213
Binary files /dev/null and b/api/target.old/api-8-SNAPSHOT-sources.jar differ
diff --git a/api/target.old/api-8-SNAPSHOT.jar b/api/target.old/api-8-SNAPSHOT.jar
new file mode 100644
index 0000000..3f6ec67
Binary files /dev/null and b/api/target.old/api-8-SNAPSHOT.jar differ
diff --git a/api/target.old/classes/META-INF/DEPENDENCIES b/api/target.old/classes/META-INF/DEPENDENCIES
new file mode 100644
index 0000000..8196c97
--- /dev/null
+++ b/api/target.old/classes/META-INF/DEPENDENCIES
@@ -0,0 +1,11 @@
+// ------------------------------------------------------------------
+// Transitive dependencies of this project determined from the
+// maven pom organized by organization.
+// ------------------------------------------------------------------
+
+Clerezza - API
+
+
+
+
+
diff --git a/api/target.old/classes/META-INF/LICENSE b/api/target.old/classes/META-INF/LICENSE
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/api/target.old/classes/META-INF/LICENSE
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ 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.
diff --git a/api/target.old/classes/META-INF/MANIFEST.MF b/api/target.old/classes/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..522d0a1
--- /dev/null
+++ b/api/target.old/classes/META-INF/MANIFEST.MF
@@ -0,0 +1,18 @@
+Manifest-Version: 1.0
+Bnd-LastModified: 1550079297381
+Build-Jdk: 1.8.0_191
+Built-By: hhn
+Bundle-Description: Apache Clerezza API implements the RDF data model as
+ defined by http://www.w3.org/TR/rdf11-concepts/
+Bundle-DocURL: http://www.apache.org/
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-ManifestVersion: 2
+Bundle-Name: Clerezza - API
+Bundle-SymbolicName: org.apache.clerezza.api
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 8.0.0.SNAPSHOT
+Created-By: Apache Maven Bundle Plugin
+Export-Package: org.apache.clerezza.api;uses:="org.apache.clerezza.api.e
+ vent",org.apache.clerezza.api.event;uses:="org.apache.clerezza.api"
+Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.8))"
+Tool: Bnd-2.3.0.201405100607
diff --git a/api/target.old/classes/META-INF/NOTICE b/api/target.old/classes/META-INF/NOTICE
new file mode 100644
index 0000000..ec03ded
--- /dev/null
+++ b/api/target.old/classes/META-INF/NOTICE
@@ -0,0 +1,8 @@
+
+Clerezza - API
+Copyright 2015-2019 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+
diff --git a/api/target.old/classes/org/apache/clerezza/api/BlankNode.class b/api/target.old/classes/org/apache/clerezza/api/BlankNode.class
new file mode 100644
index 0000000..3c73c90
Binary files /dev/null and b/api/target.old/classes/org/apache/clerezza/api/BlankNode.class differ
diff --git a/api/target.old/classes/org/apache/clerezza/api/BlankNodeOrIRI.class b/api/target.old/classes/org/apache/clerezza/api/BlankNodeOrIRI.class
new file mode 100644
index 0000000..610e475
Binary files /dev/null and b/api/target.old/classes/org/apache/clerezza/api/BlankNodeOrIRI.class differ
diff --git a/api/target.old/classes/org/apache/clerezza/api/Graph.class b/api/target.old/classes/org/apache/clerezza/api/Graph.class
new file mode 100644
index 0000000..da1801c
Binary files /dev/null and b/api/target.old/classes/org/apache/clerezza/api/Graph.class differ
diff --git a/api/target.old/classes/org/apache/clerezza/api/IRI.class b/api/target.old/classes/org/apache/clerezza/api/IRI.class
new file mode 100644
index 0000000..e1b6b3e
Binary files /dev/null and b/api/target.old/classes/org/apache/clerezza/api/IRI.class differ
diff --git a/api/target.old/classes/org/apache/clerezza/api/ImmutableGraph.class b/api/target.old/classes/org/apache/clerezza/api/ImmutableGraph.class
new file mode 100644
index 0000000..8fb0c5e
Binary files /dev/null and b/api/target.old/classes/org/apache/clerezza/api/ImmutableGraph.class differ
diff --git a/api/target.old/classes/org/apache/clerezza/api/Language.class b/api/target.old/classes/org/apache/clerezza/api/Language.class
new file mode 100644
index 0000000..5fb8cb8
Binary files /dev/null and b/api/target.old/classes/org/apache/clerezza/api/Language.class differ
diff --git a/api/target.old/classes/org/apache/clerezza/api/Literal.class b/api/target.old/classes/org/apache/clerezza/api/Literal.class
new file mode 100644
index 0000000..4881713
Binary files /dev/null and b/api/target.old/classes/org/apache/clerezza/api/Literal.class differ
diff --git a/api/target.old/classes/org/apache/clerezza/api/RDFTerm.class b/api/target.old/classes/org/apache/clerezza/api/RDFTerm.class
new file mode 100644
index 0000000..8ab6943
Binary files /dev/null and b/api/target.old/classes/org/apache/clerezza/api/RDFTerm.class differ
diff --git a/api/target.old/classes/org/apache/clerezza/api/Triple.class b/api/target.old/classes/org/apache/clerezza/api/Triple.class
new file mode 100644
index 0000000..1032d07
Binary files /dev/null and b/api/target.old/classes/org/apache/clerezza/api/Triple.class differ
diff --git a/api/target.old/classes/org/apache/clerezza/api/WatchableGraph.class b/api/target.old/classes/org/apache/clerezza/api/WatchableGraph.class
new file mode 100644
index 0000000..648b9e9
Binary files /dev/null and b/api/target.old/classes/org/apache/clerezza/api/WatchableGraph.class differ
diff --git a/api/target.old/classes/org/apache/clerezza/api/event/AddEvent.class b/api/target.old/classes/org/apache/clerezza/api/event/AddEvent.class
new file mode 100644
index 0000000..0fe766e
Binary files /dev/null and b/api/target.old/classes/org/apache/clerezza/api/event/AddEvent.class differ
diff --git a/api/target.old/classes/org/apache/clerezza/api/event/FilterTriple.class b/api/target.old/classes/org/apache/clerezza/api/event/FilterTriple.class
new file mode 100644
index 0000000..832691a
Binary files /dev/null and b/api/target.old/classes/org/apache/clerezza/api/event/FilterTriple.class differ
diff --git a/api/target.old/classes/org/apache/clerezza/api/event/GraphEvent.class b/api/target.old/classes/org/apache/clerezza/api/event/GraphEvent.class
new file mode 100644
index 0000000..cd9217f
Binary files /dev/null and b/api/target.old/classes/org/apache/clerezza/api/event/GraphEvent.class differ
diff --git a/api/target.old/classes/org/apache/clerezza/api/event/GraphListener.class b/api/target.old/classes/org/apache/clerezza/api/event/GraphListener.class
new file mode 100644
index 0000000..d4c1ba5
Binary files /dev/null and b/api/target.old/classes/org/apache/clerezza/api/event/GraphListener.class differ
diff --git a/api/target.old/classes/org/apache/clerezza/api/event/RemoveEvent.class b/api/target.old/classes/org/apache/clerezza/api/event/RemoveEvent.class
new file mode 100644
index 0000000..a8afa3f
Binary files /dev/null and b/api/target.old/classes/org/apache/clerezza/api/event/RemoveEvent.class differ
diff --git a/api/target.old/maven-shared-archive-resources/META-INF/DEPENDENCIES b/api/target.old/maven-shared-archive-resources/META-INF/DEPENDENCIES
new file mode 100644
index 0000000..8196c97
--- /dev/null
+++ b/api/target.old/maven-shared-archive-resources/META-INF/DEPENDENCIES
@@ -0,0 +1,11 @@
+// ------------------------------------------------------------------
+// Transitive dependencies of this project determined from the
+// maven pom organized by organization.
+// ------------------------------------------------------------------
+
+Clerezza - API
+
+
+
+
+
diff --git a/api/target.old/maven-shared-archive-resources/META-INF/LICENSE b/api/target.old/maven-shared-archive-resources/META-INF/LICENSE
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/api/target.old/maven-shared-archive-resources/META-INF/LICENSE
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ 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.
diff --git a/api/target.old/maven-shared-archive-resources/META-INF/NOTICE b/api/target.old/maven-shared-archive-resources/META-INF/NOTICE
new file mode 100644
index 0000000..ec03ded
--- /dev/null
+++ b/api/target.old/maven-shared-archive-resources/META-INF/NOTICE
@@ -0,0 +1,8 @@
+
+Clerezza - API
+Copyright 2015-2019 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+
diff --git a/api/target.old/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/api/target.old/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
new file mode 100644
index 0000000..c67f20b
--- /dev/null
+++ b/api/target.old/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@@ -0,0 +1,15 @@
+org/apache/clerezza/api/Language.class
+org/apache/clerezza/api/event/RemoveEvent.class
+org/apache/clerezza/api/event/GraphEvent.class
+org/apache/clerezza/api/event/FilterTriple.class
+org/apache/clerezza/api/WatchableGraph.class
+org/apache/clerezza/api/IRI.class
+org/apache/clerezza/api/Graph.class
+org/apache/clerezza/api/event/GraphListener.class
+org/apache/clerezza/api/BlankNode.class
+org/apache/clerezza/api/event/AddEvent.class
+org/apache/clerezza/api/RDFTerm.class
+org/apache/clerezza/api/Literal.class
+org/apache/clerezza/api/Triple.class
+org/apache/clerezza/api/BlankNodeOrIRI.class
+org/apache/clerezza/api/ImmutableGraph.class
diff --git a/api/target.old/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/api/target.old/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
new file mode 100644
index 0000000..700ca9c
--- /dev/null
+++ b/api/target.old/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
@@ -0,0 +1,16 @@
+/home/hhn/repos/apache/zz/clerezza/api/src/main/java/org/apache/clerezza/api/Triple.java
+/home/hhn/repos/apache/zz/clerezza/api/src/main/java/org/apache/clerezza/api/WatchableGraph.java
+/home/hhn/repos/apache/zz/clerezza/api/src/main/java/org/apache/clerezza/api/BlankNodeOrIRI.java
+/home/hhn/repos/apache/zz/clerezza/api/src/main/java/org/apache/clerezza/api/Language.java
+/home/hhn/repos/apache/zz/clerezza/api/src/main/java/org/apache/clerezza/api/event/GraphEvent.java
+/home/hhn/repos/apache/zz/clerezza/api/src/main/java/org/apache/clerezza/api/IRI.java
+/home/hhn/repos/apache/zz/clerezza/api/src/main/java/org/apache/clerezza/api/ImmutableGraph.java
+/home/hhn/repos/apache/zz/clerezza/api/src/main/java/org/apache/clerezza/api/event/RemoveEvent.java
+/home/hhn/repos/apache/zz/clerezza/api/src/main/java/org/apache/clerezza/api/event/GraphListener.java
+/home/hhn/repos/apache/zz/clerezza/api/src/main/java/org/apache/clerezza/api/package-info.java
+/home/hhn/repos/apache/zz/clerezza/api/src/main/java/org/apache/clerezza/api/event/AddEvent.java
+/home/hhn/repos/apache/zz/clerezza/api/src/main/java/org/apache/clerezza/api/event/FilterTriple.java
+/home/hhn/repos/apache/zz/clerezza/api/src/main/java/org/apache/clerezza/api/BlankNode.java
+/home/hhn/repos/apache/zz/clerezza/api/src/main/java/org/apache/clerezza/api/RDFTerm.java
+/home/hhn/repos/apache/zz/clerezza/api/src/main/java/org/apache/clerezza/api/Graph.java
+/home/hhn/repos/apache/zz/clerezza/api/src/main/java/org/apache/clerezza/api/Literal.java
diff --git a/api/target.old/test-classes/META-INF/DEPENDENCIES b/api/target.old/test-classes/META-INF/DEPENDENCIES
new file mode 100644
index 0000000..8196c97
--- /dev/null
+++ b/api/target.old/test-classes/META-INF/DEPENDENCIES
@@ -0,0 +1,11 @@
+// ------------------------------------------------------------------
+// Transitive dependencies of this project determined from the
+// maven pom organized by organization.
+// ------------------------------------------------------------------
+
+Clerezza - API
+
+
+
+
+
diff --git a/api/target.old/test-classes/META-INF/LICENSE b/api/target.old/test-classes/META-INF/LICENSE
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/api/target.old/test-classes/META-INF/LICENSE
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ 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.
diff --git a/api/target.old/test-classes/META-INF/NOTICE b/api/target.old/test-classes/META-INF/NOTICE
new file mode 100644
index 0000000..ec03ded
--- /dev/null
+++ b/api/target.old/test-classes/META-INF/NOTICE
@@ -0,0 +1,8 @@
+
+Clerezza - API
+Copyright 2015-2019 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+
diff --git a/dataset/src/main/java/org/apache/clerezza/dataset/EntityAlreadyExistsException.java b/dataset/src/main/java/org/apache/clerezza/dataset/EntityAlreadyExistsException.java
index 15dcb56..3e08bb9 100644
--- a/dataset/src/main/java/org/apache/clerezza/dataset/EntityAlreadyExistsException.java
+++ b/dataset/src/main/java/org/apache/clerezza/dataset/EntityAlreadyExistsException.java
@@ -18,7 +18,7 @@
*/
package org.apache.clerezza.dataset;
-import org.apache.clerezza.api.IRI;
+import org.apache.clerezza.IRI;
/**
* is thrown on an attempt to create an entity with a name which already exists
diff --git a/dataset/src/main/java/org/apache/clerezza/dataset/EntityUndeletableException.java b/dataset/src/main/java/org/apache/clerezza/dataset/EntityUndeletableException.java
index 32c5088..7d9fe0c 100644
--- a/dataset/src/main/java/org/apache/clerezza/dataset/EntityUndeletableException.java
+++ b/dataset/src/main/java/org/apache/clerezza/dataset/EntityUndeletableException.java
@@ -18,7 +18,7 @@
*/
package org.apache.clerezza.dataset;
-import org.apache.clerezza.api.IRI;
+import org.apache.clerezza.IRI;
/**
* is thrown on an attempt to delete an entity with a provider that
diff --git a/dataset/src/main/java/org/apache/clerezza/dataset/ImmutableGraphServiceFactory.java b/dataset/src/main/java/org/apache/clerezza/dataset/ImmutableGraphServiceFactory.java
index b775d82..be1e325 100644
--- a/dataset/src/main/java/org/apache/clerezza/dataset/ImmutableGraphServiceFactory.java
+++ b/dataset/src/main/java/org/apache/clerezza/dataset/ImmutableGraphServiceFactory.java
@@ -18,8 +18,8 @@
*/
package org.apache.clerezza.dataset;
-import org.apache.clerezza.api.Graph;
-import org.apache.clerezza.api.IRI;
+import org.apache.clerezza.Graph;
+import org.apache.clerezza.IRI;
import org.apache.clerezza.dataset.security.TcAccessController;
import org.osgi.framework.Bundle;
import org.osgi.framework.ServiceFactory;
diff --git a/dataset/src/main/java/org/apache/clerezza/dataset/MGraphServiceFactory.java b/dataset/src/main/java/org/apache/clerezza/dataset/MGraphServiceFactory.java
index cf3435c..e287f4a 100644
--- a/dataset/src/main/java/org/apache/clerezza/dataset/MGraphServiceFactory.java
+++ b/dataset/src/main/java/org/apache/clerezza/dataset/MGraphServiceFactory.java
@@ -18,7 +18,7 @@
*/
package org.apache.clerezza.dataset;
-import org.apache.clerezza.api.IRI;
+import org.apache.clerezza.IRI;
import org.apache.clerezza.dataset.security.TcAccessController;
import org.osgi.framework.Bundle;
import org.osgi.framework.ServiceFactory;
diff --git a/dataset/src/main/java/org/apache/clerezza/dataset/NoSuchEntityException.java b/dataset/src/main/java/org/apache/clerezza/dataset/NoSuchEntityException.java
index 789dc6b..c8e61c1 100644
--- a/dataset/src/main/java/org/apache/clerezza/dataset/NoSuchEntityException.java
+++ b/dataset/src/main/java/org/apache/clerezza/dataset/NoSuchEntityException.java
@@ -18,7 +18,7 @@
*/
package org.apache.clerezza.dataset;
-import org.apache.clerezza.api.IRI;
+import org.apache.clerezza.IRI;
/**
* is thrown on an attempt to perform an operation on an entity (i.e. a
diff --git a/dataset/src/main/java/org/apache/clerezza/dataset/QueryableTcProvider.java b/dataset/src/main/java/org/apache/clerezza/dataset/QueryableTcProvider.java
index 0490a4c..6abc615 100644
--- a/dataset/src/main/java/org/apache/clerezza/dataset/QueryableTcProvider.java
+++ b/dataset/src/main/java/org/apache/clerezza/dataset/QueryableTcProvider.java
@@ -18,7 +18,7 @@
*/
package org.apache.clerezza.dataset;
-import org.apache.clerezza.api.IRI;
+import org.apache.clerezza.IRI;
/**
* Extends the TcProvider interface for providers that support sparql queries.
diff --git a/dataset/src/main/java/org/apache/clerezza/dataset/SecuredGraph.java b/dataset/src/main/java/org/apache/clerezza/dataset/SecuredGraph.java
index afc2102..595b3fc 100644
--- a/dataset/src/main/java/org/apache/clerezza/dataset/SecuredGraph.java
+++ b/dataset/src/main/java/org/apache/clerezza/dataset/SecuredGraph.java
@@ -18,9 +18,9 @@
*/
package org.apache.clerezza.dataset;
-import org.apache.clerezza.api.*;
-import org.apache.clerezza.api.impl.graph.SimpleImmutableGraph;
-import org.apache.clerezza.api.impl.graph.WriteBlockedGraph;
+import org.apache.clerezza.*;
+import org.apache.clerezza.impl.graph.SimpleImmutableGraph;
+import org.apache.clerezza.impl.graph.WriteBlockedGraph;
import org.apache.clerezza.dataset.security.TcAccessController;
import java.security.AccessControlException;
diff --git a/dataset/src/main/java/org/apache/clerezza/dataset/TcManager.java b/dataset/src/main/java/org/apache/clerezza/dataset/TcManager.java
index 8981ad3..760b705 100644
--- a/dataset/src/main/java/org/apache/clerezza/dataset/TcManager.java
+++ b/dataset/src/main/java/org/apache/clerezza/dataset/TcManager.java
@@ -18,11 +18,11 @@
*/
package org.apache.clerezza.dataset;
-import org.apache.clerezza.api.Graph;
-import org.apache.clerezza.api.IRI;
-import org.apache.clerezza.api.ImmutableGraph;
-import org.apache.clerezza.api.impl.graph.SimpleGraph;
-import org.apache.clerezza.api.impl.graph.WriteBlockedGraph;
+import org.apache.clerezza.Graph;
+import org.apache.clerezza.IRI;
+import org.apache.clerezza.ImmutableGraph;
+import org.apache.clerezza.impl.graph.SimpleGraph;
+import org.apache.clerezza.impl.graph.WriteBlockedGraph;
import org.apache.clerezza.dataset.security.TcAccessController;
import org.apache.clerezza.sparql.*;
import org.apache.clerezza.sparql.query.*;
diff --git a/dataset/src/main/java/org/apache/clerezza/dataset/TcProvider.java b/dataset/src/main/java/org/apache/clerezza/dataset/TcProvider.java
index 6135790..8e33ebb 100644
--- a/dataset/src/main/java/org/apache/clerezza/dataset/TcProvider.java
+++ b/dataset/src/main/java/org/apache/clerezza/dataset/TcProvider.java
@@ -18,9 +18,9 @@
*/
package org.apache.clerezza.dataset;
-import org.apache.clerezza.api.Graph;
-import org.apache.clerezza.api.IRI;
-import org.apache.clerezza.api.ImmutableGraph;
+import org.apache.clerezza.Graph;
+import org.apache.clerezza.IRI;
+import org.apache.clerezza.ImmutableGraph;
import java.util.Set;
diff --git a/dataset/src/main/java/org/apache/clerezza/dataset/TcProviderMultiplexer.java b/dataset/src/main/java/org/apache/clerezza/dataset/TcProviderMultiplexer.java
index ceaddc3..8a1d444 100644
--- a/dataset/src/main/java/org/apache/clerezza/dataset/TcProviderMultiplexer.java
+++ b/dataset/src/main/java/org/apache/clerezza/dataset/TcProviderMultiplexer.java
@@ -18,9 +18,9 @@
*/
package org.apache.clerezza.dataset;
-import org.apache.clerezza.api.Graph;
-import org.apache.clerezza.api.IRI;
-import org.apache.clerezza.api.ImmutableGraph;
+import org.apache.clerezza.Graph;
+import org.apache.clerezza.IRI;
+import org.apache.clerezza.ImmutableGraph;
import java.lang.ref.WeakReference;
import java.util.*;
diff --git a/dataset/src/main/java/org/apache/clerezza/dataset/security/TcAccessController.java b/dataset/src/main/java/org/apache/clerezza/dataset/security/TcAccessController.java
index cba447e..1080340 100644
--- a/dataset/src/main/java/org/apache/clerezza/dataset/security/TcAccessController.java
+++ b/dataset/src/main/java/org/apache/clerezza/dataset/security/TcAccessController.java
@@ -17,9 +17,9 @@
*/
package org.apache.clerezza.dataset.security;
-import org.apache.clerezza.api.*;
-import org.apache.clerezza.api.impl.TripleImpl;
-import org.apache.clerezza.api.impl.literal.LiteralFactory;
+import org.apache.clerezza.*;
+import org.apache.clerezza.impl.TripleImpl;
+import org.apache.clerezza.impl.literal.LiteralFactory;
import org.apache.clerezza.dataset.NoSuchEntityException;
import org.apache.clerezza.dataset.TcManager;
diff --git a/dataset/src/main/java/org/apache/clerezza/simple/storage/SimpleTcProvider.java b/dataset/src/main/java/org/apache/clerezza/simple/storage/SimpleTcProvider.java
index f602ee4..985ae60 100644
--- a/dataset/src/main/java/org/apache/clerezza/simple/storage/SimpleTcProvider.java
+++ b/dataset/src/main/java/org/apache/clerezza/simple/storage/SimpleTcProvider.java
@@ -18,11 +18,11 @@
package org.apache.clerezza.simple.storage;
-import org.apache.clerezza.api.Graph;
-import org.apache.clerezza.api.IRI;
-import org.apache.clerezza.api.ImmutableGraph;
-import org.apache.clerezza.api.impl.graph.SimpleGraph;
-import org.apache.clerezza.api.impl.graph.SimpleImmutableGraph;
+import org.apache.clerezza.Graph;
+import org.apache.clerezza.IRI;
+import org.apache.clerezza.ImmutableGraph;
+import org.apache.clerezza.impl.graph.SimpleGraph;
+import org.apache.clerezza.impl.graph.SimpleImmutableGraph;
import org.apache.clerezza.dataset.*;
import org.osgi.service.component.annotations.Component;
diff --git a/dataset/src/test/java/org/apache/clerezza/dataset/SecurityTest.java b/dataset/src/test/java/org/apache/clerezza/dataset/SecurityTest.java
index ffea930..a6288b0 100644
--- a/dataset/src/test/java/org/apache/clerezza/dataset/SecurityTest.java
+++ b/dataset/src/test/java/org/apache/clerezza/dataset/SecurityTest.java
@@ -18,12 +18,12 @@
*/
package org.apache.clerezza.dataset;
-import org.apache.clerezza.api.Graph;
-import org.apache.clerezza.api.IRI;
-import org.apache.clerezza.api.Triple;
-import org.apache.clerezza.api.impl.graph.ReadOnlyException;
-import org.apache.clerezza.api.impl.literal.PlainLiteralImpl;
-import org.apache.clerezza.api.impl.TripleImpl;
+import org.apache.clerezza.Graph;
+import org.apache.clerezza.IRI;
+import org.apache.clerezza.Triple;
+import org.apache.clerezza.impl.graph.ReadOnlyException;
+import org.apache.clerezza.impl.literal.PlainLiteralImpl;
+import org.apache.clerezza.impl.TripleImpl;
import org.apache.clerezza.dataset.providers.WeightedA;
import org.apache.clerezza.dataset.providers.WeightedDummy;
import org.apache.clerezza.dataset.security.TcPermission;
diff --git a/dataset/src/test/java/org/apache/clerezza/dataset/TcManagerTest.java b/dataset/src/test/java/org/apache/clerezza/dataset/TcManagerTest.java
index 619e86a..44d12b6 100644
--- a/dataset/src/test/java/org/apache/clerezza/dataset/TcManagerTest.java
+++ b/dataset/src/test/java/org/apache/clerezza/dataset/TcManagerTest.java
@@ -18,12 +18,12 @@
*/
package org.apache.clerezza.dataset;
-import org.apache.clerezza.api.Graph;
-import org.apache.clerezza.api.IRI;
-import org.apache.clerezza.api.ImmutableGraph;
-import org.apache.clerezza.api.Triple;
-import org.apache.clerezza.api.impl.TripleImpl;
-import org.apache.clerezza.api.impl.graph.SimpleMGraph;
+import org.apache.clerezza.Graph;
+import org.apache.clerezza.IRI;
+import org.apache.clerezza.ImmutableGraph;
+import org.apache.clerezza.Triple;
+import org.apache.clerezza.impl.TripleImpl;
+import org.apache.clerezza.impl.graph.SimpleMGraph;
import org.apache.clerezza.dataset.providers.WeightedA;
import org.apache.clerezza.dataset.providers.WeightedA1;
import org.apache.clerezza.dataset.providers.WeightedAHeavy;
diff --git a/dataset/src/test/java/org/apache/clerezza/dataset/providers/WeightedA.java b/dataset/src/test/java/org/apache/clerezza/dataset/providers/WeightedA.java
index 76b6f36..69f1281 100644
--- a/dataset/src/test/java/org/apache/clerezza/dataset/providers/WeightedA.java
+++ b/dataset/src/test/java/org/apache/clerezza/dataset/providers/WeightedA.java
@@ -18,11 +18,11 @@
*/
package org.apache.clerezza.dataset.providers;
-import org.apache.clerezza.api.Graph;
-import org.apache.clerezza.api.IRI;
-import org.apache.clerezza.api.ImmutableGraph;
-import org.apache.clerezza.api.impl.TripleImpl;
-import org.apache.clerezza.api.impl.graph.SimpleMGraph;
+import org.apache.clerezza.Graph;
+import org.apache.clerezza.IRI;
+import org.apache.clerezza.ImmutableGraph;
+import org.apache.clerezza.impl.TripleImpl;
+import org.apache.clerezza.impl.graph.SimpleMGraph;
import org.apache.clerezza.dataset.EntityUndeletableException;
import org.apache.clerezza.dataset.NoSuchEntityException;
import org.apache.clerezza.dataset.TcManagerTest;
diff --git a/dataset/src/test/java/org/apache/clerezza/dataset/providers/WeightedA1.java b/dataset/src/test/java/org/apache/clerezza/dataset/providers/WeightedA1.java
index effd599..45475f0 100644
--- a/dataset/src/test/java/org/apache/clerezza/dataset/providers/WeightedA1.java
+++ b/dataset/src/test/java/org/apache/clerezza/dataset/providers/WeightedA1.java
@@ -18,11 +18,11 @@
*/
package org.apache.clerezza.dataset.providers;
-import org.apache.clerezza.api.Graph;
-import org.apache.clerezza.api.IRI;
-import org.apache.clerezza.api.ImmutableGraph;
-import org.apache.clerezza.api.impl.TripleImpl;
-import org.apache.clerezza.api.impl.graph.SimpleMGraph;
+import org.apache.clerezza.Graph;
+import org.apache.clerezza.IRI;
+import org.apache.clerezza.ImmutableGraph;
+import org.apache.clerezza.impl.TripleImpl;
+import org.apache.clerezza.impl.graph.SimpleMGraph;
import org.apache.clerezza.dataset.EntityUndeletableException;
import org.apache.clerezza.dataset.NoSuchEntityException;
import org.apache.clerezza.dataset.TcManagerTest;
diff --git a/dataset/src/test/java/org/apache/clerezza/dataset/providers/WeightedAHeavy.java b/dataset/src/test/java/org/apache/clerezza/dataset/providers/WeightedAHeavy.java
index 3cc1421..c20abe9 100644
--- a/dataset/src/test/java/org/apache/clerezza/dataset/providers/WeightedAHeavy.java
+++ b/dataset/src/test/java/org/apache/clerezza/dataset/providers/WeightedAHeavy.java
@@ -18,11 +18,11 @@
*/
package org.apache.clerezza.dataset.providers;
-import org.apache.clerezza.api.Graph;
-import org.apache.clerezza.api.IRI;
-import org.apache.clerezza.api.ImmutableGraph;
-import org.apache.clerezza.api.impl.TripleImpl;
-import org.apache.clerezza.api.impl.graph.SimpleGraph;
+import org.apache.clerezza.Graph;
+import org.apache.clerezza.IRI;
+import org.apache.clerezza.ImmutableGraph;
+import org.apache.clerezza.impl.TripleImpl;
+import org.apache.clerezza.impl.graph.SimpleGraph;
import org.apache.clerezza.dataset.EntityUndeletableException;
import org.apache.clerezza.dataset.NoSuchEntityException;
import org.apache.clerezza.dataset.TcManagerTest;
diff --git a/dataset/src/test/java/org/apache/clerezza/dataset/providers/WeightedBlight.java b/dataset/src/test/java/org/apache/clerezza/dataset/providers/WeightedBlight.java
index 161599b..582ad30 100644
--- a/dataset/src/test/java/org/apache/clerezza/dataset/providers/WeightedBlight.java
+++ b/dataset/src/test/java/org/apache/clerezza/dataset/providers/WeightedBlight.java
@@ -18,11 +18,11 @@
*/
package org.apache.clerezza.dataset.providers;
-import org.apache.clerezza.api.Graph;
-import org.apache.clerezza.api.IRI;
-import org.apache.clerezza.api.ImmutableGraph;
-import org.apache.clerezza.api.impl.TripleImpl;
-import org.apache.clerezza.api.impl.graph.SimpleMGraph;
+import org.apache.clerezza.Graph;
+import org.apache.clerezza.IRI;
+import org.apache.clerezza.ImmutableGraph;
+import org.apache.clerezza.impl.TripleImpl;
+import org.apache.clerezza.impl.graph.SimpleMGraph;
import org.apache.clerezza.dataset.EntityUndeletableException;
import org.apache.clerezza.dataset.NoSuchEntityException;
import org.apache.clerezza.dataset.TcManagerTest;
diff --git a/dataset/src/test/java/org/apache/clerezza/dataset/providers/WeightedDummy.java b/dataset/src/test/java/org/apache/clerezza/dataset/providers/WeightedDummy.java
index 44ace0e..d5226c3 100644
--- a/dataset/src/test/java/org/apache/clerezza/dataset/providers/WeightedDummy.java
+++ b/dataset/src/test/java/org/apache/clerezza/dataset/providers/WeightedDummy.java
@@ -18,11 +18,11 @@
*/
package org.apache.clerezza.dataset.providers;
-import org.apache.clerezza.api.Graph;
-import org.apache.clerezza.api.IRI;
-import org.apache.clerezza.api.ImmutableGraph;
-import org.apache.clerezza.api.impl.graph.SimpleImmutableGraph;
-import org.apache.clerezza.api.impl.graph.SimpleMGraph;
+import org.apache.clerezza.Graph;
+import org.apache.clerezza.IRI;
+import org.apache.clerezza.ImmutableGraph;
+import org.apache.clerezza.impl.graph.SimpleImmutableGraph;
+import org.apache.clerezza.impl.graph.SimpleMGraph;
import org.apache.clerezza.dataset.EntityAlreadyExistsException;
import org.apache.clerezza.dataset.EntityUndeletableException;
import org.apache.clerezza.dataset.NoSuchEntityException;
diff --git a/dataset/src/test/java/org/apache/clerezza/dataset/test/utils/TcProviderTest.java b/dataset/src/test/java/org/apache/clerezza/dataset/test/utils/TcProviderTest.java
index d319e5d..4bd91f3 100644
--- a/dataset/src/test/java/org/apache/clerezza/dataset/test/utils/TcProviderTest.java
+++ b/dataset/src/test/java/org/apache/clerezza/dataset/test/utils/TcProviderTest.java
@@ -18,9 +18,9 @@
package org.apache.clerezza.dataset.test.utils;
-import org.apache.clerezza.api.*;
-import org.apache.clerezza.api.impl.TripleImpl;
-import org.apache.clerezza.api.impl.graph.SimpleGraph;
+import org.apache.clerezza.*;
+import org.apache.clerezza.impl.TripleImpl;
+import org.apache.clerezza.impl.graph.SimpleGraph;
import org.apache.clerezza.dataset.EntityAlreadyExistsException;
import org.apache.clerezza.dataset.NoSuchEntityException;
import org.apache.clerezza.dataset.TcProvider;
@@ -31,8 +31,6 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
-import static org.junit.Assert.*;
-
/**
*
* @author mir,rbn
diff --git a/dataset/src/test/java/org/apache/clerezza/simple/storage/AccessViaTcManager.java b/dataset/src/test/java/org/apache/clerezza/simple/storage/AccessViaTcManager.java
index 3afbd63..3773070 100644
--- a/dataset/src/test/java/org/apache/clerezza/simple/storage/AccessViaTcManager.java
+++ b/dataset/src/test/java/org/apache/clerezza/simple/storage/AccessViaTcManager.java
@@ -18,9 +18,9 @@
package org.apache.clerezza.simple.storage;
-import org.apache.clerezza.api.Graph;
-import org.apache.clerezza.api.IRI;
-import org.apache.clerezza.api.impl.graph.SimpleGraph;
+import org.apache.clerezza.Graph;
+import org.apache.clerezza.IRI;
+import org.apache.clerezza.impl.graph.SimpleGraph;
import org.apache.clerezza.dataset.TcManager;
import org.junit.Assert;
import org.junit.Test;
diff --git a/dataset/src/test/java/org/apache/clerezza/simple/storage/SimpleGraphGenericTest.java b/dataset/src/test/java/org/apache/clerezza/simple/storage/SimpleGraphGenericTest.java
index 0445e97..a789ad1 100644
--- a/dataset/src/test/java/org/apache/clerezza/simple/storage/SimpleGraphGenericTest.java
+++ b/dataset/src/test/java/org/apache/clerezza/simple/storage/SimpleGraphGenericTest.java
@@ -18,8 +18,8 @@
package org.apache.clerezza.simple.storage;
-import org.apache.clerezza.api.Graph;
-import org.apache.clerezza.api.impl.graph.SimpleGraph;
+import org.apache.clerezza.Graph;
+import org.apache.clerezza.impl.graph.SimpleGraph;
import org.apache.clerezza.test.utils.GraphTest;
/**
diff --git a/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/rdf/providers/GraphNodeWriter.java b/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/rdf/providers/GraphNodeWriter.java
index 61f82fa..cb4f83b 100644
--- a/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/rdf/providers/GraphNodeWriter.java
+++ b/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/rdf/providers/GraphNodeWriter.java
@@ -17,12 +17,12 @@
*/
package org.apache.clerezza.jaxrs.rdf.providers;
-import org.apache.clerezza.api.Graph;
-import org.apache.clerezza.api.IRI;
-import org.apache.clerezza.api.RDFTerm;
-import org.apache.clerezza.api.Triple;
-import org.apache.clerezza.api.impl.graph.SimpleGraph;
-import org.apache.clerezza.api.utils.GraphNode;
+import org.apache.clerezza.Graph;
+import org.apache.clerezza.IRI;
+import org.apache.clerezza.RDFTerm;
+import org.apache.clerezza.Triple;
+import org.apache.clerezza.impl.graph.SimpleGraph;
+import org.apache.clerezza.utils.GraphNode;
import org.apache.clerezza.representation.Serializer;
import org.apache.clerezza.representation.SupportedFormat;
import org.osgi.service.component.annotations.Component;
diff --git a/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/rdf/providers/GraphReader.java b/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/rdf/providers/GraphReader.java
index fb00f6e..6c55a24 100644
--- a/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/rdf/providers/GraphReader.java
+++ b/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/rdf/providers/GraphReader.java
@@ -17,8 +17,8 @@
*/
package org.apache.clerezza.jaxrs.rdf.providers;
-import org.apache.clerezza.api.Graph;
-import org.apache.clerezza.api.impl.graph.SimpleGraph;
+import org.apache.clerezza.Graph;
+import org.apache.clerezza.impl.graph.SimpleGraph;
import org.apache.clerezza.representation.Parser;
import org.apache.clerezza.representation.SupportedFormat;
import org.osgi.service.component.annotations.Component;
diff --git a/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/rdf/providers/GraphWriter.java b/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/rdf/providers/GraphWriter.java
index 76add08..baf5efa 100644
--- a/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/rdf/providers/GraphWriter.java
+++ b/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/rdf/providers/GraphWriter.java
@@ -17,7 +17,7 @@
*/
package org.apache.clerezza.jaxrs.rdf.providers;
-import org.apache.clerezza.api.Graph;
+import org.apache.clerezza.Graph;
import org.apache.clerezza.representation.Serializer;
import org.apache.clerezza.representation.SupportedFormat;
import org.osgi.service.component.annotations.Component;
diff --git a/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/rdf/providers/ImmutableGraphReader.java b/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/rdf/providers/ImmutableGraphReader.java
index 45c28e0..4c01503 100644
--- a/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/rdf/providers/ImmutableGraphReader.java
+++ b/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/rdf/providers/ImmutableGraphReader.java
@@ -17,7 +17,7 @@
*/
package org.apache.clerezza.jaxrs.rdf.providers;
-import org.apache.clerezza.api.ImmutableGraph;
+import org.apache.clerezza.ImmutableGraph;
import org.apache.clerezza.representation.Parser;
import org.apache.clerezza.representation.SupportedFormat;
import org.osgi.service.component.annotations.Component;
diff --git a/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetCsvMessageBodyWriter.java b/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetCsvMessageBodyWriter.java
index c215020..1ba3215 100644
--- a/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetCsvMessageBodyWriter.java
+++ b/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetCsvMessageBodyWriter.java
@@ -1,26 +1,26 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
- */
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the License.
+ */
package org.apache.clerezza.jaxrs.sparql.providers;
-import org.apache.clerezza.api.BlankNode;
-import org.apache.clerezza.api.IRI;
-import org.apache.clerezza.api.Literal;
-import org.apache.clerezza.api.RDFTerm;
+import org.apache.clerezza.BlankNode;
+import org.apache.clerezza.IRI;
+import org.apache.clerezza.Literal;
+import org.apache.clerezza.RDFTerm;
import org.apache.clerezza.sparql.ResultSet;
import org.apache.clerezza.sparql.SolutionMapping;
import org.osgi.service.component.annotations.Component;
diff --git a/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetJsonMessageBodyWriter.java b/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetJsonMessageBodyWriter.java
index 0b71d2d..288d1f6 100644
--- a/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetJsonMessageBodyWriter.java
+++ b/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetJsonMessageBodyWriter.java
@@ -1,23 +1,23 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
- */
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the License.
+ */
package org.apache.clerezza.jaxrs.sparql.providers;
-import org.apache.clerezza.api.*;
+import org.apache.clerezza.*;
import org.apache.clerezza.sparql.ResultSet;
import org.apache.clerezza.sparql.SolutionMapping;
import org.apache.clerezza.sparql.query.Variable;
diff --git a/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetTsvMessageBodyWriter.java b/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetTsvMessageBodyWriter.java
index d4b4db0..b42a312 100644
--- a/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetTsvMessageBodyWriter.java
+++ b/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetTsvMessageBodyWriter.java
@@ -1,26 +1,26 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
- */
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the License.
+ */
package org.apache.clerezza.jaxrs.sparql.providers;
-import org.apache.clerezza.api.BlankNode;
-import org.apache.clerezza.api.IRI;
-import org.apache.clerezza.api.Literal;
-import org.apache.clerezza.api.RDFTerm;
+import org.apache.clerezza.BlankNode;
+import org.apache.clerezza.IRI;
+import org.apache.clerezza.Literal;
+import org.apache.clerezza.RDFTerm;
import org.apache.clerezza.sparql.ResultSet;
import org.apache.clerezza.sparql.SolutionMapping;
import org.osgi.service.component.annotations.Component;
diff --git a/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetXmlMessageBodyWriter.java b/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetXmlMessageBodyWriter.java
index 1b50088..607daa6 100644
--- a/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetXmlMessageBodyWriter.java
+++ b/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetXmlMessageBodyWriter.java
@@ -1,26 +1,26 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
- */
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the License.
+ */
package org.apache.clerezza.jaxrs.sparql.providers;
-import org.apache.clerezza.api.IRI;
-import org.apache.clerezza.api.Language;
-import org.apache.clerezza.api.Literal;
-import org.apache.clerezza.api.RDFTerm;
+import org.apache.clerezza.IRI;
+import org.apache.clerezza.Language;
+import org.apache.clerezza.Literal;
+import org.apache.clerezza.RDFTerm;
import org.apache.clerezza.sparql.ResultSet;
import org.apache.clerezza.sparql.SolutionMapping;
import org.apache.clerezza.sparql.query.Variable;
diff --git a/ontologies/src/main/java/org/apache/clerezza/ontologies/DCTERMS.java b/ontologies/src/main/java/org/apache/clerezza/ontologies/DCTERMS.java
index f4b4655..a483980 100644
--- a/ontologies/src/main/java/org/apache/clerezza/ontologies/DCTERMS.java
+++ b/ontologies/src/main/java/org/apache/clerezza/ontologies/DCTERMS.java
@@ -1,6 +1,6 @@
package org.apache.clerezza.ontologies;
-import org.apache.clerezza.api.IRI;
+import org.apache.clerezza.IRI;
public class DCTERMS {
// Classes
diff --git a/ontologies/src/main/java/org/apache/clerezza/ontologies/FOAF.java b/ontologies/src/main/java/org/apache/clerezza/ontologies/FOAF.java
index bd2e44b..7e29224 100644
--- a/ontologies/src/main/java/org/apache/clerezza/ontologies/FOAF.java
+++ b/ontologies/src/main/java/org/apache/clerezza/ontologies/FOAF.java
@@ -1,6 +1,6 @@
package org.apache.clerezza.ontologies;
-import org.apache.clerezza.api.IRI;
+import org.apache.clerezza.IRI;
public class FOAF {
// Classes
diff --git a/ontologies/src/main/java/org/apache/clerezza/ontologies/OWL.java b/ontologies/src/main/java/org/apache/clerezza/ontologies/OWL.java
index fe54461..b7d6729 100644
--- a/ontologies/src/main/java/org/apache/clerezza/ontologies/OWL.java
+++ b/ontologies/src/main/java/org/apache/clerezza/ontologies/OWL.java
@@ -1,6 +1,6 @@
package org.apache.clerezza.ontologies;
-import org.apache.clerezza.api.IRI;
+import org.apache.clerezza.IRI;
public class OWL {
// Classes
diff --git a/ontologies/src/main/java/org/apache/clerezza/ontologies/PLATFORM.java b/ontologies/src/main/java/org/apache/clerezza/ontologies/PLATFORM.java
index 86537a2..46ad238 100644
--- a/ontologies/src/main/java/org/apache/clerezza/ontologies/PLATFORM.java
+++ b/ontologies/src/main/java/org/apache/clerezza/ontologies/PLATFORM.java
@@ -1,6 +1,6 @@
package org.apache.clerezza.ontologies;
-import org.apache.clerezza.api.IRI;
+import org.apache.clerezza.IRI;
public class PLATFORM {
// Classes
diff --git a/ontologies/src/main/java/org/apache/clerezza/ontologies/RDF.java b/ontologies/src/main/java/org/apache/clerezza/ontologies/RDF.java
index 0060f3f..9cb6e19 100644
--- a/ontologies/src/main/java/org/apache/clerezza/ontologies/RDF.java
+++ b/ontologies/src/main/java/org/apache/clerezza/ontologies/RDF.java
@@ -1,6 +1,6 @@
package org.apache.clerezza.ontologies;
-import org.apache.clerezza.api.IRI;
+import org.apache.clerezza.IRI;
public class RDF {
// Classes
diff --git a/ontologies/src/main/java/org/apache/clerezza/ontologies/RDFS.java b/ontologies/src/main/java/org/apache/clerezza/ontologies/RDFS.java
index 9c5a863..7b63a07 100644
--- a/ontologies/src/main/java/org/apache/clerezza/ontologies/RDFS.java
+++ b/ontologies/src/main/java/org/apache/clerezza/ontologies/RDFS.java
@@ -1,6 +1,6 @@
package org.apache.clerezza.ontologies;
-import org.apache.clerezza.api.IRI;
+import org.apache.clerezza.IRI;
public class RDFS {
// Classes
diff --git a/ontologies/src/main/java/org/apache/clerezza/ontologies/SKOS04.java b/ontologies/src/main/java/org/apache/clerezza/ontologies/SKOS04.java
index 1f858b1..882e4ed 100644
--- a/ontologies/src/main/java/org/apache/clerezza/ontologies/SKOS04.java
+++ b/ontologies/src/main/java/org/apache/clerezza/ontologies/SKOS04.java
@@ -1,6 +1,6 @@
package org.apache.clerezza.ontologies;
-import org.apache.clerezza.api.IRI;
+import org.apache.clerezza.IRI;
public class SKOS04 {
// Classes
diff --git a/ontologies/src/main/java/org/apache/clerezza/ontologies/SKOS08.java b/ontologies/src/main/java/org/apache/clerezza/ontologies/SKOS08.java
index 985bbcd..f65e0cd 100644
--- a/ontologies/src/main/java/org/apache/clerezza/ontologies/SKOS08.java
+++ b/ontologies/src/main/java/org/apache/clerezza/ontologies/SKOS08.java
@@ -1,6 +1,6 @@
package org.apache.clerezza.ontologies;
-import org.apache.clerezza.api.IRI;
+import org.apache.clerezza.IRI;
public class SKOS08 {
// Classes
diff --git a/ontologies/src/main/java/org/apache/clerezza/ontologies/XSD.java b/ontologies/src/main/java/org/apache/clerezza/ontologies/XSD.java
index b00cb04..9daa081 100644
--- a/ontologies/src/main/java/org/apache/clerezza/ontologies/XSD.java
+++ b/ontologies/src/main/java/org/apache/clerezza/ontologies/XSD.java
@@ -1,6 +1,6 @@
package org.apache.clerezza.ontologies;
-import org.apache.clerezza.api.IRI;
+import org.apache.clerezza.IRI;
public class XSD {
// Classes
diff --git a/pom.xml b/pom.xml
index 4ba15b9..7ba4432 100644
--- a/pom.xml
+++ b/pom.xml
@@ -114,7 +114,6 @@
</execution>
</executions>
</plugin>
-
</plugins>
</build>
</profile>
diff --git a/representation/src/main/java/org/apache/clerezza/representation/Parser.java b/representation/src/main/java/org/apache/clerezza/representation/Parser.java
index 7612478..8582344 100644
--- a/representation/src/main/java/org/apache/clerezza/representation/Parser.java
+++ b/representation/src/main/java/org/apache/clerezza/representation/Parser.java
@@ -18,10 +18,10 @@
package org.apache.clerezza.representation;
-import org.apache.clerezza.api.Graph;
-import org.apache.clerezza.api.IRI;
-import org.apache.clerezza.api.ImmutableGraph;
-import org.apache.clerezza.api.impl.graph.SimpleMGraph;
+import org.apache.clerezza.Graph;
+import org.apache.clerezza.IRI;
+import org.apache.clerezza.ImmutableGraph;
+import org.apache.clerezza.impl.graph.SimpleMGraph;
import org.osgi.service.cm.ConfigurationAdmin;
import org.osgi.service.component.ComponentContext;
import org.osgi.service.component.annotations.*;
diff --git a/representation/src/main/java/org/apache/clerezza/representation/ParsingProvider.java b/representation/src/main/java/org/apache/clerezza/representation/ParsingProvider.java
index f315edc..998f54c 100644
--- a/representation/src/main/java/org/apache/clerezza/representation/ParsingProvider.java
+++ b/representation/src/main/java/org/apache/clerezza/representation/ParsingProvider.java
@@ -18,8 +18,8 @@
package org.apache.clerezza.representation;
-import org.apache.clerezza.api.Graph;
-import org.apache.clerezza.api.IRI;
+import org.apache.clerezza.Graph;
+import org.apache.clerezza.IRI;
import java.io.InputStream;
diff --git a/representation/src/main/java/org/apache/clerezza/representation/Serializer.java b/representation/src/main/java/org/apache/clerezza/representation/Serializer.java
index 0eafb08..7523506 100644
--- a/representation/src/main/java/org/apache/clerezza/representation/Serializer.java
+++ b/representation/src/main/java/org/apache/clerezza/representation/Serializer.java
@@ -18,7 +18,7 @@
package org.apache.clerezza.representation;
-import org.apache.clerezza.api.Graph;
+import org.apache.clerezza.Graph;
import org.osgi.service.cm.ConfigurationAdmin;
import org.osgi.service.component.ComponentContext;
import org.osgi.service.component.annotations.*;
diff --git a/representation/src/main/java/org/apache/clerezza/representation/SerializingProvider.java b/representation/src/main/java/org/apache/clerezza/representation/SerializingProvider.java
index 45ed62c..09b28e0 100644
--- a/representation/src/main/java/org/apache/clerezza/representation/SerializingProvider.java
+++ b/representation/src/main/java/org/apache/clerezza/representation/SerializingProvider.java
@@ -18,7 +18,7 @@
package org.apache.clerezza.representation;
-import org.apache.clerezza.api.Graph;
+import org.apache.clerezza.Graph;
import java.io.OutputStream;
diff --git a/representation/src/test/java/org/apache/clerezza/representation/ParserTest.java b/representation/src/test/java/org/apache/clerezza/representation/ParserTest.java
index 12f1768..0e58256 100644
--- a/representation/src/test/java/org/apache/clerezza/representation/ParserTest.java
+++ b/representation/src/test/java/org/apache/clerezza/representation/ParserTest.java
@@ -19,8 +19,8 @@
package org.apache.clerezza.representation;
import junit.framework.Assert;
-import org.apache.clerezza.api.Graph;
-import org.apache.clerezza.api.IRI;
+import org.apache.clerezza.Graph;
+import org.apache.clerezza.IRI;
import org.junit.Test;
import java.io.InputStream;
diff --git a/representation/src/test/java/org/apache/clerezza/representation/SerializerTest.java b/representation/src/test/java/org/apache/clerezza/representation/SerializerTest.java
index d908556..a5e6569 100644
--- a/representation/src/test/java/org/apache/clerezza/representation/SerializerTest.java
+++ b/representation/src/test/java/org/apache/clerezza/representation/SerializerTest.java
@@ -19,7 +19,7 @@
package org.apache.clerezza.representation;
import junit.framework.Assert;
-import org.apache.clerezza.api.Graph;
+import org.apache.clerezza.Graph;
import org.junit.Test;
import java.io.OutputStream;
diff --git a/representation/src/test/java/org/apache/clerezza/representation/TestServiceManagedProvider.java b/representation/src/test/java/org/apache/clerezza/representation/TestServiceManagedProvider.java
index e9b8dbc..6789407 100644
--- a/representation/src/test/java/org/apache/clerezza/representation/TestServiceManagedProvider.java
+++ b/representation/src/test/java/org/apache/clerezza/representation/TestServiceManagedProvider.java
@@ -18,8 +18,8 @@
package org.apache.clerezza.representation;
-import org.apache.clerezza.api.Graph;
-import org.apache.clerezza.api.IRI;
+import org.apache.clerezza.Graph;
+import org.apache.clerezza.IRI;
import org.junit.Assert;
import org.junit.Test;
diff --git a/sparql/src/main/java/org/apache/clerezza/sparql/GraphStore.java b/sparql/src/main/java/org/apache/clerezza/sparql/GraphStore.java
index 34113b9..f07b30c 100644
--- a/sparql/src/main/java/org/apache/clerezza/sparql/GraphStore.java
+++ b/sparql/src/main/java/org/apache/clerezza/sparql/GraphStore.java
@@ -1,6 +1,6 @@
package org.apache.clerezza.sparql;
-import org.apache.clerezza.api.IRI;
+import org.apache.clerezza.IRI;
import java.util.Set;
diff --git a/sparql/src/main/java/org/apache/clerezza/sparql/QueryEngine.java b/sparql/src/main/java/org/apache/clerezza/sparql/QueryEngine.java
index 1592fa7..c5925e2 100644
--- a/sparql/src/main/java/org/apache/clerezza/sparql/QueryEngine.java
+++ b/sparql/src/main/java/org/apache/clerezza/sparql/QueryEngine.java
@@ -18,8 +18,7 @@
*/
package org.apache.clerezza.sparql;
-import org.apache.clerezza.api.Graph;
-import org.apache.clerezza.sparql.query.Query;
+import org.apache.clerezza.Graph;
/**
* A QueryEngine can process SPARQL queries against an arbitrary set of graphs.
diff --git a/sparql/src/main/java/org/apache/clerezza/sparql/SolutionMapping.java b/sparql/src/main/java/org/apache/clerezza/sparql/SolutionMapping.java
index 0831d0b..156eec4 100644
--- a/sparql/src/main/java/org/apache/clerezza/sparql/SolutionMapping.java
+++ b/sparql/src/main/java/org/apache/clerezza/sparql/SolutionMapping.java
@@ -18,7 +18,7 @@
*/
package org.apache.clerezza.sparql;
-import org.apache.clerezza.api.RDFTerm;
+import org.apache.clerezza.RDFTerm;
import org.apache.clerezza.sparql.query.Variable;
import java.util.Map;
diff --git a/sparql/src/main/java/org/apache/clerezza/sparql/SparqlPreParser.java b/sparql/src/main/java/org/apache/clerezza/sparql/SparqlPreParser.java
index eb34511..35a86c8 100644
--- a/sparql/src/main/java/org/apache/clerezza/sparql/SparqlPreParser.java
+++ b/sparql/src/main/java/org/apache/clerezza/sparql/SparqlPreParser.java
@@ -18,7 +18,7 @@
*/
package org.apache.clerezza.sparql;
-import org.apache.clerezza.api.IRI;
+import org.apache.clerezza.IRI;
import org.apache.clerezza.sparql.query.*;
import org.apache.clerezza.sparql.update.Update;
diff --git a/sparql/src/main/java/org/apache/clerezza/sparql/query/DataSet.java b/sparql/src/main/java/org/apache/clerezza/sparql/query/DataSet.java
index c1c9ae3..13dd19b 100644
--- a/sparql/src/main/java/org/apache/clerezza/sparql/query/DataSet.java
+++ b/sparql/src/main/java/org/apache/clerezza/sparql/query/DataSet.java
@@ -18,7 +18,7 @@
*/
package org.apache.clerezza.sparql.query;
-import org.apache.clerezza.api.IRI;
+import org.apache.clerezza.IRI;
import java.util.Set;
diff --git a/sparql/src/main/java/org/apache/clerezza/sparql/query/FunctionCall.java b/sparql/src/main/java/org/apache/clerezza/sparql/query/FunctionCall.java
index 8190dec..5b44ec5 100644
--- a/sparql/src/main/java/org/apache/clerezza/sparql/query/FunctionCall.java
+++ b/sparql/src/main/java/org/apache/clerezza/sparql/query/FunctionCall.java
@@ -18,7 +18,7 @@
*/
package org.apache.clerezza.sparql.query;
-import org.apache.clerezza.api.IRI;
+import org.apache.clerezza.IRI;
import java.util.List;
diff --git a/sparql/src/main/java/org/apache/clerezza/sparql/query/GroupGraphPattern.java b/sparql/src/main/java/org/apache/clerezza/sparql/query/GroupGraphPattern.java
index 4025e03..130c8f9 100644
--- a/sparql/src/main/java/org/apache/clerezza/sparql/query/GroupGraphPattern.java
+++ b/sparql/src/main/java/org/apache/clerezza/sparql/query/GroupGraphPattern.java
@@ -18,7 +18,7 @@
*/
package org.apache.clerezza.sparql.query;
-import org.apache.clerezza.api.IRI;
+import org.apache.clerezza.IRI;
import java.util.List;
import java.util.Set;
diff --git a/sparql/src/main/java/org/apache/clerezza/sparql/query/InlineData.java b/sparql/src/main/java/org/apache/clerezza/sparql/query/InlineData.java
index 6bd4377..a7daaf1 100644
--- a/sparql/src/main/java/org/apache/clerezza/sparql/query/InlineData.java
+++ b/sparql/src/main/java/org/apache/clerezza/sparql/query/InlineData.java
@@ -18,7 +18,7 @@
*/
package org.apache.clerezza.sparql.query;
-import org.apache.clerezza.api.RDFTerm;
+import org.apache.clerezza.RDFTerm;
import java.util.List;
diff --git a/sparql/src/main/java/org/apache/clerezza/sparql/query/LiteralExpression.java b/sparql/src/main/java/org/apache/clerezza/sparql/query/LiteralExpression.java
index 9532908..37f88b9 100644
--- a/sparql/src/main/java/org/apache/clerezza/sparql/query/LiteralExpression.java
+++ b/sparql/src/main/java/org/apache/clerezza/sparql/query/LiteralExpression.java
@@ -18,7 +18,7 @@
*/
package org.apache.clerezza.sparql.query;
-import org.apache.clerezza.api.Literal;
+import org.apache.clerezza.Literal;
/**
* Wraps a {@link Literal} in an {@link Expression}.
diff --git a/sparql/src/main/java/org/apache/clerezza/sparql/query/PredicatePath.java b/sparql/src/main/java/org/apache/clerezza/sparql/query/PredicatePath.java
index a63e227..1af04d8 100644
--- a/sparql/src/main/java/org/apache/clerezza/sparql/query/PredicatePath.java
+++ b/sparql/src/main/java/org/apache/clerezza/sparql/query/PredicatePath.java
@@ -18,7 +18,7 @@
*/
package org.apache.clerezza.sparql.query;
-import org.apache.clerezza.api.IRI;
+import org.apache.clerezza.IRI;
/**
*
diff --git a/sparql/src/main/java/org/apache/clerezza/sparql/query/ResourceOrVariable.java b/sparql/src/main/java/org/apache/clerezza/sparql/query/ResourceOrVariable.java
index 6e8b258..6bb0e7d 100644
--- a/sparql/src/main/java/org/apache/clerezza/sparql/query/ResourceOrVariable.java
+++ b/sparql/src/main/java/org/apache/clerezza/sparql/query/ResourceOrVariable.java
@@ -18,7 +18,7 @@
*/
package org.apache.clerezza.sparql.query;
-import org.apache.clerezza.api.RDFTerm;
+import org.apache.clerezza.RDFTerm;
/**
* Wraps either a {@link RDFTerm} or a {@link Variable}
diff --git a/sparql/src/main/java/org/apache/clerezza/sparql/query/UriRefExpression.java b/sparql/src/main/java/org/apache/clerezza/sparql/query/UriRefExpression.java
index 98a1aba..392124f 100644
--- a/sparql/src/main/java/org/apache/clerezza/sparql/query/UriRefExpression.java
+++ b/sparql/src/main/java/org/apache/clerezza/sparql/query/UriRefExpression.java
@@ -18,7 +18,7 @@
*/
package org.apache.clerezza.sparql.query;
-import org.apache.clerezza.api.IRI;
+import org.apache.clerezza.IRI;
/**
* Wraps a {@link IRI} in an {@link Expression}.
diff --git a/sparql/src/main/java/org/apache/clerezza/sparql/query/UriRefOrVariable.java b/sparql/src/main/java/org/apache/clerezza/sparql/query/UriRefOrVariable.java
index 22c1a1f..a6810e9 100644
--- a/sparql/src/main/java/org/apache/clerezza/sparql/query/UriRefOrVariable.java
+++ b/sparql/src/main/java/org/apache/clerezza/sparql/query/UriRefOrVariable.java
@@ -18,7 +18,7 @@
*/
package org.apache.clerezza.sparql.query;
-import org.apache.clerezza.api.IRI;
+import org.apache.clerezza.IRI;
/**
* Wraps either a {@link IRI} or a {@link Variable}.
diff --git a/sparql/src/main/java/org/apache/clerezza/sparql/query/impl/SimpleDataSet.java b/sparql/src/main/java/org/apache/clerezza/sparql/query/impl/SimpleDataSet.java
index 2e64bff..7aaadf3 100644
--- a/sparql/src/main/java/org/apache/clerezza/sparql/query/impl/SimpleDataSet.java
+++ b/sparql/src/main/java/org/apache/clerezza/sparql/query/impl/SimpleDataSet.java
@@ -18,7 +18,7 @@
*/
package org.apache.clerezza.sparql.query.impl;
-import org.apache.clerezza.api.IRI;
+import org.apache.clerezza.IRI;
import org.apache.clerezza.sparql.query.DataSet;
import java.util.HashSet;
diff --git a/sparql/src/main/java/org/apache/clerezza/sparql/query/impl/SimpleGroupGraphPattern.java b/sparql/src/main/java/org/apache/clerezza/sparql/query/impl/SimpleGroupGraphPattern.java
index 89beff9..8ef68f6 100644
--- a/sparql/src/main/java/org/apache/clerezza/sparql/query/impl/SimpleGroupGraphPattern.java
+++ b/sparql/src/main/java/org/apache/clerezza/sparql/query/impl/SimpleGroupGraphPattern.java
@@ -18,7 +18,7 @@
*/
package org.apache.clerezza.sparql.query.impl;
-import org.apache.clerezza.api.IRI;
+import org.apache.clerezza.IRI;
import org.apache.clerezza.sparql.query.*;
import java.util.*;
diff --git a/sparql/src/main/java/org/apache/clerezza/sparql/query/impl/SimpleInlineData.java b/sparql/src/main/java/org/apache/clerezza/sparql/query/impl/SimpleInlineData.java
index e5ecbc7..3950b29 100644
--- a/sparql/src/main/java/org/apache/clerezza/sparql/query/impl/SimpleInlineData.java
+++ b/sparql/src/main/java/org/apache/clerezza/sparql/query/impl/SimpleInlineData.java
@@ -18,7 +18,7 @@
*/
package org.apache.clerezza.sparql.query.impl;
-import org.apache.clerezza.api.RDFTerm;
+import org.apache.clerezza.RDFTerm;
import org.apache.clerezza.sparql.query.InlineData;
import org.apache.clerezza.sparql.query.Variable;
diff --git a/sparql/src/main/java/org/apache/clerezza/sparql/query/impl/SimplePropertyPathPattern.java b/sparql/src/main/java/org/apache/clerezza/sparql/query/impl/SimplePropertyPathPattern.java
index cb79bfb..be1e2c8 100644
--- a/sparql/src/main/java/org/apache/clerezza/sparql/query/impl/SimplePropertyPathPattern.java
+++ b/sparql/src/main/java/org/apache/clerezza/sparql/query/impl/SimplePropertyPathPattern.java
@@ -18,8 +18,8 @@
*/
package org.apache.clerezza.sparql.query.impl;
-import org.apache.clerezza.api.BlankNodeOrIRI;
-import org.apache.clerezza.api.RDFTerm;
+import org.apache.clerezza.BlankNodeOrIRI;
+import org.apache.clerezza.RDFTerm;
import org.apache.clerezza.sparql.query.*;
/**
diff --git a/sparql/src/main/java/org/apache/clerezza/sparql/query/impl/SimpleQuery.java b/sparql/src/main/java/org/apache/clerezza/sparql/query/impl/SimpleQuery.java
index 3c1ba0b..526fe8e 100644
--- a/sparql/src/main/java/org/apache/clerezza/sparql/query/impl/SimpleQuery.java
+++ b/sparql/src/main/java/org/apache/clerezza/sparql/query/impl/SimpleQuery.java
@@ -18,7 +18,7 @@
*/
package org.apache.clerezza.sparql.query.impl;
-import org.apache.clerezza.api.IRI;
+import org.apache.clerezza.IRI;
import org.apache.clerezza.sparql.query.DataSet;
import org.apache.clerezza.sparql.query.GroupGraphPattern;
import org.apache.clerezza.sparql.query.InlineData;
diff --git a/sparql/src/main/java/org/apache/clerezza/sparql/query/impl/SimpleStringQuerySerializer.java b/sparql/src/main/java/org/apache/clerezza/sparql/query/impl/SimpleStringQuerySerializer.java
index d268dbc..905135b 100644
--- a/sparql/src/main/java/org/apache/clerezza/sparql/query/impl/SimpleStringQuerySerializer.java
+++ b/sparql/src/main/java/org/apache/clerezza/sparql/query/impl/SimpleStringQuerySerializer.java
@@ -18,9 +18,9 @@
*/
package org.apache.clerezza.sparql.query.impl;
-import org.apache.clerezza.api.BlankNode;
-import org.apache.clerezza.api.IRI;
-import org.apache.clerezza.api.RDFTerm;
+import org.apache.clerezza.BlankNode;
+import org.apache.clerezza.IRI;
+import org.apache.clerezza.RDFTerm;
import org.apache.clerezza.sparql.StringQuerySerializer;
import org.apache.clerezza.sparql.query.*;
import org.slf4j.Logger;
diff --git a/sparql/src/main/java/org/apache/clerezza/sparql/query/impl/SimpleTriplePattern.java b/sparql/src/main/java/org/apache/clerezza/sparql/query/impl/SimpleTriplePattern.java
index ca91b57..7f2f0f2 100644
--- a/sparql/src/main/java/org/apache/clerezza/sparql/query/impl/SimpleTriplePattern.java
+++ b/sparql/src/main/java/org/apache/clerezza/sparql/query/impl/SimpleTriplePattern.java
@@ -18,9 +18,9 @@
*/
package org.apache.clerezza.sparql.query.impl;
-import org.apache.clerezza.api.BlankNodeOrIRI;
-import org.apache.clerezza.api.IRI;
-import org.apache.clerezza.api.RDFTerm;
+import org.apache.clerezza.BlankNodeOrIRI;
+import org.apache.clerezza.IRI;
+import org.apache.clerezza.RDFTerm;
import org.apache.clerezza.sparql.query.ResourceOrVariable;
import org.apache.clerezza.sparql.query.TriplePattern;
import org.apache.clerezza.sparql.query.UriRefOrVariable;
diff --git a/sparql/src/main/java/org/apache/clerezza/sparql/update/Update.java b/sparql/src/main/java/org/apache/clerezza/sparql/update/Update.java
index 73616a8..eaf84da 100644
--- a/sparql/src/main/java/org/apache/clerezza/sparql/update/Update.java
+++ b/sparql/src/main/java/org/apache/clerezza/sparql/update/Update.java
@@ -18,7 +18,7 @@
*/
package org.apache.clerezza.sparql.update;
-import org.apache.clerezza.api.IRI;
+import org.apache.clerezza.IRI;
import org.apache.clerezza.sparql.GraphStore;
import java.util.Set;
diff --git a/sparql/src/main/java/org/apache/clerezza/sparql/update/UpdateOperation.java b/sparql/src/main/java/org/apache/clerezza/sparql/update/UpdateOperation.java
index 990967e..88163e9 100644
--- a/sparql/src/main/java/org/apache/clerezza/sparql/update/UpdateOperation.java
+++ b/sparql/src/main/java/org/apache/clerezza/sparql/update/UpdateOperation.java
@@ -18,7 +18,7 @@
*/
package org.apache.clerezza.sparql.update;
-import org.apache.clerezza.api.IRI;
+import org.apache.clerezza.IRI;
import org.apache.clerezza.sparql.GraphStore;
import java.util.Set;
diff --git a/sparql/src/main/java/org/apache/clerezza/sparql/update/impl/BaseUpdateOperation.java b/sparql/src/main/java/org/apache/clerezza/sparql/update/impl/BaseUpdateOperation.java
index e782458..0ecdbb7 100644
--- a/sparql/src/main/java/org/apache/clerezza/sparql/update/impl/BaseUpdateOperation.java
+++ b/sparql/src/main/java/org/apache/clerezza/sparql/update/impl/BaseUpdateOperation.java
@@ -18,7 +18,7 @@
*/
package org.apache.clerezza.sparql.update.impl;
-import org.apache.clerezza.api.IRI;
+import org.apache.clerezza.IRI;
import org.apache.clerezza.sparql.GraphStore;
import org.apache.clerezza.sparql.update.UpdateOperation;
diff --git a/sparql/src/main/java/org/apache/clerezza/sparql/update/impl/ClearOrDropOperation.java b/sparql/src/main/java/org/apache/clerezza/sparql/update/impl/ClearOrDropOperation.java
index ae4a1c8..fd9b145 100644
--- a/sparql/src/main/java/org/apache/clerezza/sparql/update/impl/ClearOrDropOperation.java
+++ b/sparql/src/main/java/org/apache/clerezza/sparql/update/impl/ClearOrDropOperation.java
@@ -18,7 +18,7 @@
*/
package org.apache.clerezza.sparql.update.impl;
-import org.apache.clerezza.api.IRI;
+import org.apache.clerezza.IRI;
import org.apache.clerezza.sparql.GraphStore;
import org.apache.clerezza.sparql.update.UpdateOperation;
diff --git a/sparql/src/main/java/org/apache/clerezza/sparql/update/impl/CreateOperation.java b/sparql/src/main/java/org/apache/clerezza/sparql/update/impl/CreateOperation.java
index 7b2a46c..693c33a 100644
--- a/sparql/src/main/java/org/apache/clerezza/sparql/update/impl/CreateOperation.java
+++ b/sparql/src/main/java/org/apache/clerezza/sparql/update/impl/CreateOperation.java
@@ -18,7 +18,7 @@
*/
package org.apache.clerezza.sparql.update.impl;
-import org.apache.clerezza.api.IRI;
+import org.apache.clerezza.IRI;
/**
*
diff --git a/sparql/src/main/java/org/apache/clerezza/sparql/update/impl/LoadOperation.java b/sparql/src/main/java/org/apache/clerezza/sparql/update/impl/LoadOperation.java
index 1020d77..7082101 100644
--- a/sparql/src/main/java/org/apache/clerezza/sparql/update/impl/LoadOperation.java
+++ b/sparql/src/main/java/org/apache/clerezza/sparql/update/impl/LoadOperation.java
@@ -18,7 +18,7 @@
*/
package org.apache.clerezza.sparql.update.impl;
-import org.apache.clerezza.api.IRI;
+import org.apache.clerezza.IRI;
/**
* The LOAD operation reads an RDF document from a IRI and inserts its triples into the specified ImmutableGraph in the ImmutableGraph Store.
diff --git a/sparql/src/main/java/org/apache/clerezza/sparql/update/impl/ModifyOperation.java b/sparql/src/main/java/org/apache/clerezza/sparql/update/impl/ModifyOperation.java
index f4f5134..cc72d5e 100644
--- a/sparql/src/main/java/org/apache/clerezza/sparql/update/impl/ModifyOperation.java
+++ b/sparql/src/main/java/org/apache/clerezza/sparql/update/impl/ModifyOperation.java
@@ -18,7 +18,7 @@
*/
package org.apache.clerezza.sparql.update.impl;
-import org.apache.clerezza.api.IRI;
+import org.apache.clerezza.IRI;
import org.apache.clerezza.sparql.GraphStore;
import org.apache.clerezza.sparql.query.GroupGraphPattern;
import org.apache.clerezza.sparql.query.impl.SimpleDataSet;
diff --git a/sparql/src/main/java/org/apache/clerezza/sparql/update/impl/SimpleUpdate.java b/sparql/src/main/java/org/apache/clerezza/sparql/update/impl/SimpleUpdate.java
index ce27266..a52ae62 100644
--- a/sparql/src/main/java/org/apache/clerezza/sparql/update/impl/SimpleUpdate.java
+++ b/sparql/src/main/java/org/apache/clerezza/sparql/update/impl/SimpleUpdate.java
@@ -18,7 +18,7 @@
*/
package org.apache.clerezza.sparql.update.impl;
-import org.apache.clerezza.api.IRI;
+import org.apache.clerezza.IRI;
import org.apache.clerezza.sparql.GraphStore;
import org.apache.clerezza.sparql.update.Update;
import org.apache.clerezza.sparql.update.UpdateOperation;
diff --git a/sparql/src/main/java/org/apache/clerezza/sparql/update/impl/SimpleUpdateOperation.java b/sparql/src/main/java/org/apache/clerezza/sparql/update/impl/SimpleUpdateOperation.java
index b613088..0b89818 100644
--- a/sparql/src/main/java/org/apache/clerezza/sparql/update/impl/SimpleUpdateOperation.java
+++ b/sparql/src/main/java/org/apache/clerezza/sparql/update/impl/SimpleUpdateOperation.java
@@ -18,7 +18,7 @@
*/
package org.apache.clerezza.sparql.update.impl;
-import org.apache.clerezza.api.IRI;
+import org.apache.clerezza.IRI;
import org.apache.clerezza.sparql.update.UpdateOperation;
import java.util.Set;
diff --git a/sparql/src/main/java/org/apache/clerezza/sparql/update/impl/UpdateOperationWithQuads.java b/sparql/src/main/java/org/apache/clerezza/sparql/update/impl/UpdateOperationWithQuads.java
index e24fbb7..bf53a52 100644
--- a/sparql/src/main/java/org/apache/clerezza/sparql/update/impl/UpdateOperationWithQuads.java
+++ b/sparql/src/main/java/org/apache/clerezza/sparql/update/impl/UpdateOperationWithQuads.java
@@ -18,7 +18,7 @@
*/
package org.apache.clerezza.sparql.update.impl;
-import org.apache.clerezza.api.IRI;
+import org.apache.clerezza.IRI;
import org.apache.clerezza.sparql.GraphStore;
import org.apache.clerezza.sparql.query.TriplePattern;
import org.apache.clerezza.sparql.query.UriRefOrVariable;
diff --git a/sparql/src/main/javacc/org/apache/clerezza/sparql/JavaCCGeneratedQueryParser.jj b/sparql/src/main/javacc/org/apache/clerezza/sparql/JavaCCGeneratedQueryParser.jj
index 7771c07..6b9a545 100644
--- a/sparql/src/main/javacc/org/apache/clerezza/sparql/JavaCCGeneratedQueryParser.jj
+++ b/sparql/src/main/javacc/org/apache/clerezza/sparql/JavaCCGeneratedQueryParser.jj
@@ -31,14 +31,14 @@ PARSER_BEGIN(JavaCCGeneratedQueryParser)
package org.apache.clerezza.sparql;
-import org.apache.clerezza.api.BlankNode;
-import org.apache.clerezza.api.Language;
-import org.apache.clerezza.api.Literal;
-import org.apache.clerezza.api.RDFTerm;
-import org.apache.clerezza.api.IRI;
-import org.apache.clerezza.api.impl.literal.LiteralFactory;
-import org.apache.clerezza.api.impl.literal.PlainLiteralImpl;
-import org.apache.clerezza.api.impl.literal.TypedLiteralImpl;
+import org.apache.clerezza.BlankNode;
+import org.apache.clerezza.Language;
+import org.apache.clerezza.Literal;
+import org.apache.clerezza.RDFTerm;
+import org.apache.clerezza.IRI;
+import org.apache.clerezza.impl.literal.LiteralFactory;
+import org.apache.clerezza.impl.literal.PlainLiteralImpl;
+import org.apache.clerezza.impl.literal.TypedLiteralImpl;
import org.apache.clerezza.sparql.query.GroupGraphPattern;
import org.apache.clerezza.sparql.query.BinaryOperation;
import org.apache.clerezza.sparql.query.Variable;
diff --git a/sparql/src/main/javacc/org/apache/clerezza/sparql/JavaCCGeneratedSparqlPreParser.jj b/sparql/src/main/javacc/org/apache/clerezza/sparql/JavaCCGeneratedSparqlPreParser.jj
index 8c145ed..3a5618e 100644
--- a/sparql/src/main/javacc/org/apache/clerezza/sparql/JavaCCGeneratedSparqlPreParser.jj
+++ b/sparql/src/main/javacc/org/apache/clerezza/sparql/JavaCCGeneratedSparqlPreParser.jj
@@ -30,14 +30,14 @@ PARSER_BEGIN(JavaCCGeneratedSparqlPreParser)
package org.apache.clerezza.sparql;
-import org.apache.clerezza.api.BlankNode;
-import org.apache.clerezza.api.impl.literal.LiteralFactory;
-import org.apache.clerezza.api.impl.literal.PlainLiteralImpl;
-import org.apache.clerezza.api.impl.literal.TypedLiteralImpl;
-import org.apache.clerezza.api.IRI;
-import org.apache.clerezza.api.Language;
-import org.apache.clerezza.api.Literal;
-import org.apache.clerezza.api.RDFTerm;
+import org.apache.clerezza.BlankNode;
+import org.apache.clerezza.impl.literal.LiteralFactory;
+import org.apache.clerezza.impl.literal.PlainLiteralImpl;
+import org.apache.clerezza.impl.literal.TypedLiteralImpl;
+import org.apache.clerezza.IRI;
+import org.apache.clerezza.Language;
+import org.apache.clerezza.Literal;
+import org.apache.clerezza.RDFTerm;
import org.apache.clerezza.sparql.query.AlternativeGraphPattern;
import org.apache.clerezza.sparql.query.BinaryOperation;
import org.apache.clerezza.sparql.query.BinaryPropertyPathOperation;
diff --git a/sparql/src/test/java/org/apache/clerezza/sparql/QueryParserTest.java b/sparql/src/test/java/org/apache/clerezza/sparql/QueryParserTest.java
index fe1ce88..2e9269d 100644
--- a/sparql/src/test/java/org/apache/clerezza/sparql/QueryParserTest.java
+++ b/sparql/src/test/java/org/apache/clerezza/sparql/QueryParserTest.java
@@ -18,9 +18,9 @@
*/
package org.apache.clerezza.sparql;
-import org.apache.clerezza.api.IRI;
-import org.apache.clerezza.api.Language;
-import org.apache.clerezza.api.impl.literal.PlainLiteralImpl;
+import org.apache.clerezza.IRI;
+import org.apache.clerezza.Language;
+import org.apache.clerezza.impl.literal.PlainLiteralImpl;
import org.apache.clerezza.sparql.query.*;
import org.apache.clerezza.sparql.query.impl.SimpleTriplePattern;
import org.junit.Assert;
diff --git a/sparql/src/test/java/org/apache/clerezza/sparql/QuerySerializerTest.java b/sparql/src/test/java/org/apache/clerezza/sparql/QuerySerializerTest.java
index deb84f5..f244252 100644
--- a/sparql/src/test/java/org/apache/clerezza/sparql/QuerySerializerTest.java
+++ b/sparql/src/test/java/org/apache/clerezza/sparql/QuerySerializerTest.java
@@ -18,8 +18,8 @@
*/
package org.apache.clerezza.sparql;
-import org.apache.clerezza.api.IRI;
-import org.apache.clerezza.api.impl.literal.LiteralFactory;
+import org.apache.clerezza.IRI;
+import org.apache.clerezza.impl.literal.LiteralFactory;
import org.apache.clerezza.sparql.query.*;
import org.apache.clerezza.sparql.query.impl.*;
import org.junit.Assert;
diff --git a/sparql/src/test/java/org/apache/clerezza/sparql/SparqlPreParserTest.java b/sparql/src/test/java/org/apache/clerezza/sparql/SparqlPreParserTest.java
index b08e078..d94101b 100644
--- a/sparql/src/test/java/org/apache/clerezza/sparql/SparqlPreParserTest.java
+++ b/sparql/src/test/java/org/apache/clerezza/sparql/SparqlPreParserTest.java
@@ -18,7 +18,7 @@
*/
package org.apache.clerezza.sparql;
-import org.apache.clerezza.api.IRI;
+import org.apache.clerezza.IRI;
import org.junit.Assert;
import org.junit.Test;
diff --git a/test.utils/src/main/java/org/apache/clerezza/test/utils/GraphTest.java b/test.utils/src/main/java/org/apache/clerezza/test/utils/GraphTest.java
index 03e8043..dde348c 100644
--- a/test.utils/src/main/java/org/apache/clerezza/test/utils/GraphTest.java
+++ b/test.utils/src/main/java/org/apache/clerezza/test/utils/GraphTest.java
@@ -18,10 +18,10 @@
package org.apache.clerezza.test.utils;
-import org.apache.clerezza.api.*;
-import org.apache.clerezza.api.impl.TripleImpl;
-import org.apache.clerezza.api.impl.literal.PlainLiteralImpl;
-import org.apache.clerezza.api.impl.literal.TypedLiteralImpl;
+import org.apache.clerezza.*;
+import org.apache.clerezza.impl.TripleImpl;
+import org.apache.clerezza.impl.literal.PlainLiteralImpl;
+import org.apache.clerezza.impl.literal.TypedLiteralImpl;
import org.junit.Assert;
import org.junit.Test;
diff --git a/test.utils/src/main/java/org/apache/clerezza/test/utils/GraphWrapper.java b/test.utils/src/main/java/org/apache/clerezza/test/utils/GraphWrapper.java
index e4d52e5..ebd47a6 100644
--- a/test.utils/src/main/java/org/apache/clerezza/test/utils/GraphWrapper.java
+++ b/test.utils/src/main/java/org/apache/clerezza/test/utils/GraphWrapper.java
@@ -18,7 +18,7 @@
package org.apache.clerezza.test.utils;
-import org.apache.clerezza.api.*;
+import org.apache.clerezza.*;
import java.util.Collection;
import java.util.Iterator;
diff --git a/test.utils/src/main/java/org/apache/clerezza/test/utils/LockableMGraphWrapperForTesting.java b/test.utils/src/main/java/org/apache/clerezza/test/utils/LockableMGraphWrapperForTesting.java
index 55bdb58..c0d2fd9 100644
--- a/test.utils/src/main/java/org/apache/clerezza/test/utils/LockableMGraphWrapperForTesting.java
+++ b/test.utils/src/main/java/org/apache/clerezza/test/utils/LockableMGraphWrapperForTesting.java
@@ -18,7 +18,7 @@
package org.apache.clerezza.test.utils;
-import org.apache.clerezza.api.*;
+import org.apache.clerezza.*;
import java.util.Iterator;
import java.util.concurrent.locks.Lock;
diff --git a/test.utils/src/main/java/org/apache/clerezza/test/utils/LockingIteratorForTesting.java b/test.utils/src/main/java/org/apache/clerezza/test/utils/LockingIteratorForTesting.java
index 3e7b225..44f1cc6 100644
--- a/test.utils/src/main/java/org/apache/clerezza/test/utils/LockingIteratorForTesting.java
+++ b/test.utils/src/main/java/org/apache/clerezza/test/utils/LockingIteratorForTesting.java
@@ -18,7 +18,7 @@
package org.apache.clerezza.test.utils;
-import org.apache.clerezza.api.Triple;
+import org.apache.clerezza.Triple;
import java.util.Iterator;
import java.util.concurrent.locks.Lock;
diff --git a/test.utils/src/main/java/org/apache/clerezza/test/utils/RandomGraph.java b/test.utils/src/main/java/org/apache/clerezza/test/utils/RandomGraph.java
index a34a8b9..40b81ba 100644
--- a/test.utils/src/main/java/org/apache/clerezza/test/utils/RandomGraph.java
+++ b/test.utils/src/main/java/org/apache/clerezza/test/utils/RandomGraph.java
@@ -18,9 +18,9 @@
package org.apache.clerezza.test.utils;
-import org.apache.clerezza.api.*;
-import org.apache.clerezza.api.impl.TripleImpl;
-import org.apache.clerezza.api.impl.literal.PlainLiteralImpl;
+import org.apache.clerezza.*;
+import org.apache.clerezza.impl.TripleImpl;
+import org.apache.clerezza.impl.literal.PlainLiteralImpl;
import org.apache.commons.lang.RandomStringUtils;
import java.util.Iterator;