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
commit 9364e6d54d8a9956b16fa915279182bc30b2e02c Author: Hasan <[email protected]> AuthorDate: Wed Aug 15 08:28:35 2018 +0200 CLEREZZA-1026: Rename impl.utils to api.impl; rename packages within api and api.impl --- {impl.utils => api.impl}/pom.xml | 27 +++++++-------- .../apache/clerezza/api/impl}/AbstractGraph.java | 29 ++++++----------- .../clerezza/api/impl}/AbstractImmutableGraph.java | 12 +++---- .../apache/clerezza/api/impl}/AbstractLiteral.java | 4 +-- .../clerezza/api/impl}/DelayedNotificator.java | 6 ++-- .../org/apache/clerezza/api/impl}/LiteralImpl.java | 6 ++-- .../apache/clerezza/api/impl}/LockingIterator.java | 4 +-- .../clerezza/api/impl}/PlainLiteralImpl.java | 8 ++--- .../org/apache/clerezza/api/impl}/TripleImpl.java | 10 +++--- .../clerezza/api/impl}/TypedLiteralImpl.java | 7 ++-- .../clerezza/api/impl}/WatchableGraphWrapper.java | 29 +++++++++-------- .../clerezza/api/impl}/debug/ReadLockDebug.java | 2 +- .../impl}/debug/ReentrantReadWriteLockTracker.java | 2 +- .../clerezza/api/impl}/debug/WriteLockDebug.java | 2 +- .../api/impl}/graphmatching/GraphMatcher.java | 16 ++++----- .../graphmatching/GraphNotIsomorphicException.java | 2 +- .../impl}/graphmatching/GroupMappingIterator.java | 3 +- .../api/impl}/graphmatching/HashMatching.java | 22 ++++++------- .../api/impl}/graphmatching/MappingIterator.java | 2 +- .../impl}/graphmatching/PermutationIterator.java | 2 +- .../clerezza/api/impl}/graphmatching/Utils.java | 6 ++-- .../graphmatching/collections/IntHashMap.java | 2 +- .../graphmatching/collections/IntHashSet.java | 2 +- .../graphmatching/collections/IntIterator.java | 2 +- .../impl}/graphmatching/collections/IntSet.java | 2 +- .../apache/clerezza/api/impl}/package-info.java | 2 +- .../clerezza/api/impl}/simple/SimpleGraph.java | 15 +++++---- .../api/impl}/simple/SimpleImmutableGraph.java | 15 +++++---- .../clerezza/api/impl}/simple/SimpleMGraph.java | 7 ++-- .../api/impl}/graphmatching/GraphMatcherTest.java | 19 +++++------ .../api/impl}/graphmatching/HashMatchingTest.java | 8 ++--- .../graphmatching/PermutationIteratorTest.java | 3 +- .../api/impl}/graphmatching/Utils4Testing.java | 14 ++++---- .../api/impl}/simple/PlainLiteralImplTest.java | 8 ++--- .../clerezza/api/impl}/simple/SimpleGraphTest.java | 10 +++--- .../clerezza/api/impl}/simple/TripleImplTest.java | 14 ++++---- .../api/impl}/simple/TypedLiteralImplTest.java | 8 ++--- api/pom.xml | 38 ++++++++++------------ .../clerezza/{commons/rdf => api}/BlankNode.java | 2 +- .../{commons/rdf => api}/BlankNodeOrIRI.java | 2 +- .../clerezza/{commons/rdf => api}/Graph.java | 4 +-- .../apache/clerezza/{commons/rdf => api}/IRI.java | 2 +- .../{commons/rdf => api}/ImmutableGraph.java | 2 +- .../clerezza/{commons/rdf => api}/Language.java | 2 +- .../clerezza/{commons/rdf => api}/Literal.java | 2 +- .../clerezza/{commons/rdf => api}/RDFTerm.java | 2 +- .../clerezza/{commons/rdf => api}/Triple.java | 2 +- .../{commons/rdf => api}/WatchableGraph.java | 11 +++---- .../{commons/rdf => api}/event/AddEvent.java | 8 ++--- .../{commons/rdf => api}/event/FilterTriple.java | 10 +++--- .../{commons/rdf => api}/event/GraphEvent.java | 6 ++-- .../{commons/rdf => api}/event/GraphListener.java | 2 +- .../{commons/rdf => api}/event/RemoveEvent.java | 8 ++--- .../{commons/rdf => api}/package-info.java | 2 +- 54 files changed, 205 insertions(+), 232 deletions(-) diff --git a/impl.utils/pom.xml b/api.impl/pom.xml similarity index 72% rename from impl.utils/pom.xml rename to api.impl/pom.xml index b217d7e..871beb6 100644 --- a/impl.utils/pom.xml +++ b/api.impl/pom.xml @@ -24,22 +24,17 @@ <parent> <groupId>org.apache.clerezza</groupId> <artifactId>clerezza</artifactId> - <version>7</version> + <version>8-SNAPSHOT</version> <relativePath /> </parent> - <groupId>org.apache.clerezza.commons-rdf</groupId> - <artifactId>commons-rdf-impl-utils</artifactId> - <version>0.3-SNAPSHOT</version> + <artifactId>api.impl</artifactId> <packaging>bundle</packaging> - <name>Clerezza Commons RDF Implementation Utils</name> + <name>Clerezza API Implementation</name> <description> - Apache Commons RDF provides an API modelling the RDF data model as defined by - http://www.w3.org/TR/rdf11-concepts/ + This module implements Apache Clerezza API </description> - <url>http://clerezza.apache.org/commons-rdf/</url> - <issueManagement> <system>jira</system> <url>http://issues.apache.org/jira/browse/CLEREZZA</url> @@ -47,9 +42,9 @@ <inceptionYear>2015</inceptionYear> <scm> - <connection>scm:git:https://git-wip-us.apache.org/repos/asf/clerezza-rdf-core.git</connection> - <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/clerezza-rdf-core.git</developerConnection> - <url>https://git-wip-us.apache.org/repos/asf/clerezza-rdf-core.git</url> + <connection>scm:git:https://git-wip-us.apache.org/repos/asf/clerezza.git</connection> + <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/clerezza.git</developerConnection> + <url>https://git-wip-us.apache.org/repos/asf/clerezza.git</url> <tag>HEAD</tag> </scm> @@ -61,7 +56,7 @@ <extensions>true</extensions> <configuration> <instructions> - <Export-Package>org.apache.clerezza.commons.rdf.impl.utils.*</Export-Package> + <Export-Package>org.apache.clerezza.api.impl.*</Export-Package> </instructions> </configuration> </plugin> @@ -71,9 +66,9 @@ <dependencies> <dependency> - <groupId>org.apache.clerezza.commons-rdf</groupId> - <artifactId>commons-rdf-api</artifactId> - <version>0.3-SNAPSHOT</version> + <groupId>org.apache.clerezza</groupId> + <artifactId>api</artifactId> + <version>8-SNAPSHOT</version> </dependency> <dependency> <groupId>junit</groupId> diff --git a/impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/AbstractGraph.java b/api.impl/src/main/java/org/apache/clerezza/api/impl/AbstractGraph.java similarity index 87% rename from impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/AbstractGraph.java rename to api.impl/src/main/java/org/apache/clerezza/api/impl/AbstractGraph.java index 15efce6..ab236b6 100644 --- a/impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/AbstractGraph.java +++ b/api.impl/src/main/java/org/apache/clerezza/api/impl/AbstractGraph.java @@ -16,33 +16,24 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.clerezza.commons.rdf.impl.utils; +package org.apache.clerezza.api.impl; -import java.lang.ref.WeakReference; import java.util.AbstractCollection; import java.util.Collection; -import java.util.Collections; -import java.util.HashSet; import java.util.Iterator; -import java.util.Set; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; -import org.apache.clerezza.commons.rdf.BlankNodeOrIRI; -import org.apache.clerezza.commons.rdf.RDFTerm; -import org.apache.clerezza.commons.rdf.Triple; -import org.apache.clerezza.commons.rdf.Graph; -import org.apache.clerezza.commons.rdf.ImmutableGraph; -import org.apache.clerezza.commons.rdf.IRI; -import org.apache.clerezza.commons.rdf.WatchableGraph; -import org.apache.clerezza.commons.rdf.event.AddEvent; -import org.apache.clerezza.commons.rdf.event.FilterTriple; -import org.apache.clerezza.commons.rdf.event.GraphEvent; -import org.apache.clerezza.commons.rdf.event.GraphListener; -import org.apache.clerezza.commons.rdf.event.RemoveEvent; -import org.apache.clerezza.commons.rdf.impl.utils.debug.ReentrantReadWriteLockTracker; -import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleImmutableGraph; + +import org.apache.clerezza.api.Graph; +import org.apache.clerezza.api.IRI; +import org.apache.clerezza.api.BlankNodeOrIRI; +import org.apache.clerezza.api.RDFTerm; +import org.apache.clerezza.api.Triple; +import org.apache.clerezza.api.ImmutableGraph; +import org.apache.clerezza.api.impl.simple.SimpleImmutableGraph; +import org.apache.clerezza.api.impl.debug.ReentrantReadWriteLockTracker; /** * An abstract implementation of <code>Graph</code> implementing diff --git a/impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/AbstractImmutableGraph.java b/api.impl/src/main/java/org/apache/clerezza/api/impl/AbstractImmutableGraph.java similarity index 90% rename from impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/AbstractImmutableGraph.java rename to api.impl/src/main/java/org/apache/clerezza/api/impl/AbstractImmutableGraph.java index e5644ed..c46f0fc 100644 --- a/impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/AbstractImmutableGraph.java +++ b/api.impl/src/main/java/org/apache/clerezza/api/impl/AbstractImmutableGraph.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.clerezza.commons.rdf.impl.utils; +package org.apache.clerezza.api.impl; import java.util.Collection; import java.util.Iterator; -import org.apache.clerezza.commons.rdf.BlankNode; -import org.apache.clerezza.commons.rdf.ImmutableGraph; -import org.apache.clerezza.commons.rdf.RDFTerm; -import org.apache.clerezza.commons.rdf.Triple; -import org.apache.clerezza.commons.rdf.impl.utils.graphmatching.GraphMatcher; +import org.apache.clerezza.api.impl.graphmatching.GraphMatcher; +import org.apache.clerezza.api.BlankNode; +import org.apache.clerezza.api.ImmutableGraph; +import org.apache.clerezza.api.RDFTerm; +import org.apache.clerezza.api.Triple; /** * <code>AbstractGraph</code> is an abstract implementation of <code>ImmutableGraph</code> diff --git a/impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/AbstractLiteral.java b/api.impl/src/main/java/org/apache/clerezza/api/impl/AbstractLiteral.java similarity index 94% rename from impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/AbstractLiteral.java rename to api.impl/src/main/java/org/apache/clerezza/api/impl/AbstractLiteral.java index a236f06..48e3221 100644 --- a/impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/AbstractLiteral.java +++ b/api.impl/src/main/java/org/apache/clerezza/api/impl/AbstractLiteral.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.clerezza.commons.rdf.impl.utils; +package org.apache.clerezza.api.impl; -import org.apache.clerezza.commons.rdf.Literal; +import org.apache.clerezza.api.Literal; /** * diff --git a/impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/DelayedNotificator.java b/api.impl/src/main/java/org/apache/clerezza/api/impl/DelayedNotificator.java similarity index 95% rename from impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/DelayedNotificator.java rename to api.impl/src/main/java/org/apache/clerezza/api/impl/DelayedNotificator.java index 1cf3321..39d52f5 100644 --- a/impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/DelayedNotificator.java +++ b/api.impl/src/main/java/org/apache/clerezza/api/impl/DelayedNotificator.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.clerezza.commons.rdf.impl.utils; +package org.apache.clerezza.api.impl; import java.lang.ref.WeakReference; import java.util.*; import java.util.logging.Level; import java.util.logging.Logger; -import org.apache.clerezza.commons.rdf.event.GraphEvent; -import org.apache.clerezza.commons.rdf.event.GraphListener; +import org.apache.clerezza.api.event.GraphEvent; +import org.apache.clerezza.api.event.GraphListener; /** diff --git a/impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/LiteralImpl.java b/api.impl/src/main/java/org/apache/clerezza/api/impl/LiteralImpl.java similarity index 93% rename from impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/LiteralImpl.java rename to api.impl/src/main/java/org/apache/clerezza/api/impl/LiteralImpl.java index b2aa4be..e8ac986 100644 --- a/impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/LiteralImpl.java +++ b/api.impl/src/main/java/org/apache/clerezza/api/impl/LiteralImpl.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.clerezza.commons.rdf.impl.utils; +package org.apache.clerezza.api.impl; import java.io.Serializable; -import org.apache.clerezza.commons.rdf.IRI; -import org.apache.clerezza.commons.rdf.Language; +import org.apache.clerezza.api.IRI; +import org.apache.clerezza.api.Language; /** * diff --git a/impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/LockingIterator.java b/api.impl/src/main/java/org/apache/clerezza/api/impl/LockingIterator.java similarity index 95% rename from impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/LockingIterator.java rename to api.impl/src/main/java/org/apache/clerezza/api/impl/LockingIterator.java index 79747c2..84b73de 100644 --- a/impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/LockingIterator.java +++ b/api.impl/src/main/java/org/apache/clerezza/api/impl/LockingIterator.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.clerezza.commons.rdf.impl.utils; +package org.apache.clerezza.api.impl; import java.util.Iterator; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReadWriteLock; -import org.apache.clerezza.commons.rdf.Triple; +import org.apache.clerezza.api.Triple; /** * Wrapps an iterator<Triple> reading entering a read-lock on every invocation diff --git a/impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/PlainLiteralImpl.java b/api.impl/src/main/java/org/apache/clerezza/api/impl/PlainLiteralImpl.java similarity index 92% rename from impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/PlainLiteralImpl.java rename to api.impl/src/main/java/org/apache/clerezza/api/impl/PlainLiteralImpl.java index 49f2633..012aeca 100644 --- a/impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/PlainLiteralImpl.java +++ b/api.impl/src/main/java/org/apache/clerezza/api/impl/PlainLiteralImpl.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.clerezza.commons.rdf.impl.utils; +package org.apache.clerezza.api.impl; import java.io.Serializable; -import org.apache.clerezza.commons.rdf.IRI; -import org.apache.clerezza.commons.rdf.Language; -import org.apache.clerezza.commons.rdf.Literal; +import org.apache.clerezza.api.IRI; +import org.apache.clerezza.api.Language; +import org.apache.clerezza.api.Literal; /** * diff --git a/impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/TripleImpl.java b/api.impl/src/main/java/org/apache/clerezza/api/impl/TripleImpl.java similarity index 91% rename from impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/TripleImpl.java rename to api.impl/src/main/java/org/apache/clerezza/api/impl/TripleImpl.java index 6137c4b..1f67d39 100644 --- a/impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/TripleImpl.java +++ b/api.impl/src/main/java/org/apache/clerezza/api/impl/TripleImpl.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.clerezza.commons.rdf.impl.utils; +package org.apache.clerezza.api.impl; -import org.apache.clerezza.commons.rdf.BlankNodeOrIRI; -import org.apache.clerezza.commons.rdf.RDFTerm; -import org.apache.clerezza.commons.rdf.Triple; -import org.apache.clerezza.commons.rdf.IRI; +import org.apache.clerezza.api.BlankNodeOrIRI; +import org.apache.clerezza.api.RDFTerm; +import org.apache.clerezza.api.Triple; +import org.apache.clerezza.api.IRI; /** * diff --git a/impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/TypedLiteralImpl.java b/api.impl/src/main/java/org/apache/clerezza/api/impl/TypedLiteralImpl.java similarity index 91% rename from impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/TypedLiteralImpl.java rename to api.impl/src/main/java/org/apache/clerezza/api/impl/TypedLiteralImpl.java index 67f7c9c..0be7ab3 100644 --- a/impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/TypedLiteralImpl.java +++ b/api.impl/src/main/java/org/apache/clerezza/api/impl/TypedLiteralImpl.java @@ -16,13 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.clerezza.commons.rdf.impl.utils; +package org.apache.clerezza.api.impl; import java.io.Serializable; -import org.apache.clerezza.commons.rdf.IRI; -import org.apache.clerezza.commons.rdf.Language; -import org.apache.clerezza.commons.rdf.Literal; +import org.apache.clerezza.api.IRI; +import org.apache.clerezza.api.Language; /** * diff --git a/impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/WatchableGraphWrapper.java b/api.impl/src/main/java/org/apache/clerezza/api/impl/WatchableGraphWrapper.java similarity index 91% rename from impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/WatchableGraphWrapper.java rename to api.impl/src/main/java/org/apache/clerezza/api/impl/WatchableGraphWrapper.java index de61fe4..5533c9b 100644 --- a/impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/WatchableGraphWrapper.java +++ b/api.impl/src/main/java/org/apache/clerezza/api/impl/WatchableGraphWrapper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.clerezza.commons.rdf.impl.utils; +package org.apache.clerezza.api.impl; import java.lang.ref.WeakReference; import java.util.Collection; @@ -22,18 +22,19 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Set; import java.util.concurrent.locks.ReadWriteLock; -import org.apache.clerezza.commons.rdf.BlankNodeOrIRI; -import org.apache.clerezza.commons.rdf.Graph; -import org.apache.clerezza.commons.rdf.ImmutableGraph; -import org.apache.clerezza.commons.rdf.IRI; -import org.apache.clerezza.commons.rdf.RDFTerm; -import org.apache.clerezza.commons.rdf.Triple; -import org.apache.clerezza.commons.rdf.WatchableGraph; -import org.apache.clerezza.commons.rdf.event.AddEvent; -import org.apache.clerezza.commons.rdf.event.FilterTriple; -import org.apache.clerezza.commons.rdf.event.GraphEvent; -import org.apache.clerezza.commons.rdf.event.GraphListener; -import org.apache.clerezza.commons.rdf.event.RemoveEvent; + +import org.apache.clerezza.api.BlankNodeOrIRI; +import org.apache.clerezza.api.Graph; +import org.apache.clerezza.api.ImmutableGraph; +import org.apache.clerezza.api.IRI; +import org.apache.clerezza.api.RDFTerm; +import org.apache.clerezza.api.Triple; +import org.apache.clerezza.api.WatchableGraph; +import org.apache.clerezza.api.event.AddEvent; +import org.apache.clerezza.api.event.FilterTriple; +import org.apache.clerezza.api.event.GraphEvent; +import org.apache.clerezza.api.event.GraphListener; +import org.apache.clerezza.api.event.RemoveEvent; /** * @@ -69,7 +70,7 @@ public class WatchableGraphWrapper implements WatchableGraph { @Override public Iterator<Triple> filter(BlankNodeOrIRI subject, IRI predicate, - RDFTerm object) { + RDFTerm object) { final Iterator<Triple> baseIter = wrapped.filter(subject, predicate, object); return new Iterator<Triple>() { diff --git a/impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/debug/ReadLockDebug.java b/api.impl/src/main/java/org/apache/clerezza/api/impl/debug/ReadLockDebug.java similarity index 97% rename from impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/debug/ReadLockDebug.java rename to api.impl/src/main/java/org/apache/clerezza/api/impl/debug/ReadLockDebug.java index 1f47fe9..f826dee 100644 --- a/impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/debug/ReadLockDebug.java +++ b/api.impl/src/main/java/org/apache/clerezza/api/impl/debug/ReadLockDebug.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.clerezza.commons.rdf.impl.utils.debug; +package org.apache.clerezza.api.impl.debug; import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.Condition; diff --git a/impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/debug/ReentrantReadWriteLockTracker.java b/api.impl/src/main/java/org/apache/clerezza/api/impl/debug/ReentrantReadWriteLockTracker.java similarity index 98% rename from impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/debug/ReentrantReadWriteLockTracker.java rename to api.impl/src/main/java/org/apache/clerezza/api/impl/debug/ReentrantReadWriteLockTracker.java index 8f382aa..94e8a6c 100644 --- a/impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/debug/ReentrantReadWriteLockTracker.java +++ b/api.impl/src/main/java/org/apache/clerezza/api/impl/debug/ReentrantReadWriteLockTracker.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.clerezza.commons.rdf.impl.utils.debug; +package org.apache.clerezza.api.impl.debug; import java.util.Collection; import java.util.Collections; diff --git a/impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/debug/WriteLockDebug.java b/api.impl/src/main/java/org/apache/clerezza/api/impl/debug/WriteLockDebug.java similarity index 97% rename from impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/debug/WriteLockDebug.java rename to api.impl/src/main/java/org/apache/clerezza/api/impl/debug/WriteLockDebug.java index a4261e3..82301a3 100644 --- a/impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/debug/WriteLockDebug.java +++ b/api.impl/src/main/java/org/apache/clerezza/api/impl/debug/WriteLockDebug.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.clerezza.commons.rdf.impl.utils.debug; +package org.apache.clerezza.api.impl.debug; import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.Condition; diff --git a/impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/graphmatching/GraphMatcher.java b/api.impl/src/main/java/org/apache/clerezza/api/impl/graphmatching/GraphMatcher.java similarity index 91% rename from impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/graphmatching/GraphMatcher.java rename to api.impl/src/main/java/org/apache/clerezza/api/impl/graphmatching/GraphMatcher.java index ce65d1a..9180ae0 100644 --- a/impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/graphmatching/GraphMatcher.java +++ b/api.impl/src/main/java/org/apache/clerezza/api/impl/graphmatching/GraphMatcher.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.clerezza.commons.rdf.impl.utils.graphmatching; +package org.apache.clerezza.api.impl.graphmatching; @@ -26,13 +26,13 @@ import java.util.Map; import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; -import org.apache.clerezza.commons.rdf.BlankNode; -import org.apache.clerezza.commons.rdf.BlankNodeOrIRI; -import org.apache.clerezza.commons.rdf.Graph; -import org.apache.clerezza.commons.rdf.RDFTerm; -import org.apache.clerezza.commons.rdf.Triple; -import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl; -import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleMGraph; +import org.apache.clerezza.api.BlankNode; +import org.apache.clerezza.api.BlankNodeOrIRI; +import org.apache.clerezza.api.Graph; +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.simple.SimpleMGraph; /** * @author reto diff --git a/impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/graphmatching/GraphNotIsomorphicException.java b/api.impl/src/main/java/org/apache/clerezza/api/impl/graphmatching/GraphNotIsomorphicException.java similarity index 93% rename from impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/graphmatching/GraphNotIsomorphicException.java rename to api.impl/src/main/java/org/apache/clerezza/api/impl/graphmatching/GraphNotIsomorphicException.java index 5b5600f..3137098 100644 --- a/impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/graphmatching/GraphNotIsomorphicException.java +++ b/api.impl/src/main/java/org/apache/clerezza/api/impl/graphmatching/GraphNotIsomorphicException.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.clerezza.commons.rdf.impl.utils.graphmatching; +package org.apache.clerezza.api.impl.graphmatching; /** * diff --git a/impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/graphmatching/GroupMappingIterator.java b/api.impl/src/main/java/org/apache/clerezza/api/impl/graphmatching/GroupMappingIterator.java similarity index 97% rename from impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/graphmatching/GroupMappingIterator.java rename to api.impl/src/main/java/org/apache/clerezza/api/impl/graphmatching/GroupMappingIterator.java index 4c7a0ae..1d271bf 100644 --- a/impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/graphmatching/GroupMappingIterator.java +++ b/api.impl/src/main/java/org/apache/clerezza/api/impl/graphmatching/GroupMappingIterator.java @@ -15,11 +15,10 @@ * under the License. */ -package org.apache.clerezza.commons.rdf.impl.utils.graphmatching; +package org.apache.clerezza.api.impl.graphmatching; import java.util.ArrayList; import java.util.HashMap; -import java.util.HashSet; import java.util.Iterator; import java.util.Map; import java.util.NoSuchElementException; diff --git a/impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/graphmatching/HashMatching.java b/api.impl/src/main/java/org/apache/clerezza/api/impl/graphmatching/HashMatching.java similarity index 93% rename from impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/graphmatching/HashMatching.java rename to api.impl/src/main/java/org/apache/clerezza/api/impl/graphmatching/HashMatching.java index 369cf5c..13b8436 100644 --- a/impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/graphmatching/HashMatching.java +++ b/api.impl/src/main/java/org/apache/clerezza/api/impl/graphmatching/HashMatching.java @@ -17,24 +17,24 @@ * under the License. */ -package org.apache.clerezza.commons.rdf.impl.utils.graphmatching; +package org.apache.clerezza.api.impl.graphmatching; -import org.apache.clerezza.commons.rdf.impl.utils.graphmatching.collections.IntHashMap; +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.graphmatching.collections.IntIterator; +import org.apache.clerezza.api.impl.graphmatching.collections.IntHashMap; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import java.util.Map; import java.util.Set; -import org.apache.clerezza.commons.rdf.BlankNode; -import org.apache.clerezza.commons.rdf.Graph; -import org.apache.clerezza.commons.rdf.BlankNodeOrIRI; -import org.apache.clerezza.commons.rdf.RDFTerm; -import org.apache.clerezza.commons.rdf.Triple; -import org.apache.clerezza.commons.rdf.Graph; -import org.apache.clerezza.commons.rdf.IRI; -import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl; -import org.apache.clerezza.commons.rdf.impl.utils.graphmatching.collections.IntIterator; + +import org.apache.clerezza.api.BlankNodeOrIRI; +import org.apache.clerezza.api.RDFTerm; +import org.apache.clerezza.api.Triple; /** * diff --git a/impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/graphmatching/MappingIterator.java b/api.impl/src/main/java/org/apache/clerezza/api/impl/graphmatching/MappingIterator.java similarity index 97% rename from impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/graphmatching/MappingIterator.java rename to api.impl/src/main/java/org/apache/clerezza/api/impl/graphmatching/MappingIterator.java index 016b590..6c5c245 100644 --- a/impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/graphmatching/MappingIterator.java +++ b/api.impl/src/main/java/org/apache/clerezza/api/impl/graphmatching/MappingIterator.java @@ -1,4 +1,4 @@ -package org.apache.clerezza.commons.rdf.impl.utils.graphmatching; +package org.apache.clerezza.api.impl.graphmatching; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/graphmatching/PermutationIterator.java b/api.impl/src/main/java/org/apache/clerezza/api/impl/graphmatching/PermutationIterator.java similarity index 97% rename from impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/graphmatching/PermutationIterator.java rename to api.impl/src/main/java/org/apache/clerezza/api/impl/graphmatching/PermutationIterator.java index 6f01828..74e9eff 100644 --- a/impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/graphmatching/PermutationIterator.java +++ b/api.impl/src/main/java/org/apache/clerezza/api/impl/graphmatching/PermutationIterator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.clerezza.commons.rdf.impl.utils.graphmatching; +package org.apache.clerezza.api.impl.graphmatching; diff --git a/impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/graphmatching/Utils.java b/api.impl/src/main/java/org/apache/clerezza/api/impl/graphmatching/Utils.java similarity index 93% rename from impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/graphmatching/Utils.java rename to api.impl/src/main/java/org/apache/clerezza/api/impl/graphmatching/Utils.java index 68e178b..30f0f0d 100644 --- a/impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/graphmatching/Utils.java +++ b/api.impl/src/main/java/org/apache/clerezza/api/impl/graphmatching/Utils.java @@ -1,4 +1,4 @@ -package org.apache.clerezza.commons.rdf.impl.utils.graphmatching; +package org.apache.clerezza.api.impl.graphmatching; /* * * Licensed to the Apache Software Foundation (ASF) under one @@ -26,8 +26,8 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Set; -import org.apache.clerezza.commons.rdf.BlankNode; -import org.apache.clerezza.commons.rdf.Triple; +import org.apache.clerezza.api.BlankNode; +import org.apache.clerezza.api.Triple; public class Utils { diff --git a/impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/graphmatching/collections/IntHashMap.java b/api.impl/src/main/java/org/apache/clerezza/api/impl/graphmatching/collections/IntHashMap.java similarity index 99% rename from impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/graphmatching/collections/IntHashMap.java rename to api.impl/src/main/java/org/apache/clerezza/api/impl/graphmatching/collections/IntHashMap.java index 776a6af..ac117af 100644 --- a/impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/graphmatching/collections/IntHashMap.java +++ b/api.impl/src/main/java/org/apache/clerezza/api/impl/graphmatching/collections/IntHashMap.java @@ -19,7 +19,7 @@ * but rereleased by the original author under the ASF license (above). */ -package org.apache.clerezza.commons.rdf.impl.utils.graphmatching.collections; +package org.apache.clerezza.api.impl.graphmatching.collections; diff --git a/impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/graphmatching/collections/IntHashSet.java b/api.impl/src/main/java/org/apache/clerezza/api/impl/graphmatching/collections/IntHashSet.java similarity index 95% rename from impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/graphmatching/collections/IntHashSet.java rename to api.impl/src/main/java/org/apache/clerezza/api/impl/graphmatching/collections/IntHashSet.java index 70091b8..4d6b13b 100644 --- a/impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/graphmatching/collections/IntHashSet.java +++ b/api.impl/src/main/java/org/apache/clerezza/api/impl/graphmatching/collections/IntHashSet.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.apache.clerezza.commons.rdf.impl.utils.graphmatching.collections; +package org.apache.clerezza.api.impl.graphmatching.collections; import java.util.HashSet; import java.util.Iterator; diff --git a/impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/graphmatching/collections/IntIterator.java b/api.impl/src/main/java/org/apache/clerezza/api/impl/graphmatching/collections/IntIterator.java similarity index 92% rename from impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/graphmatching/collections/IntIterator.java rename to api.impl/src/main/java/org/apache/clerezza/api/impl/graphmatching/collections/IntIterator.java index d298066..3bf38ed 100644 --- a/impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/graphmatching/collections/IntIterator.java +++ b/api.impl/src/main/java/org/apache/clerezza/api/impl/graphmatching/collections/IntIterator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.apache.clerezza.commons.rdf.impl.utils.graphmatching.collections; +package org.apache.clerezza.api.impl.graphmatching.collections; import java.util.Iterator; diff --git a/impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/graphmatching/collections/IntSet.java b/api.impl/src/main/java/org/apache/clerezza/api/impl/graphmatching/collections/IntSet.java similarity index 92% rename from impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/graphmatching/collections/IntSet.java rename to api.impl/src/main/java/org/apache/clerezza/api/impl/graphmatching/collections/IntSet.java index b1d6c32..8bd64c1 100644 --- a/impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/graphmatching/collections/IntSet.java +++ b/api.impl/src/main/java/org/apache/clerezza/api/impl/graphmatching/collections/IntSet.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.apache.clerezza.commons.rdf.impl.utils.graphmatching.collections; +package org.apache.clerezza.api.impl.graphmatching.collections; import java.util.Set; diff --git a/impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/package-info.java b/api.impl/src/main/java/org/apache/clerezza/api/impl/package-info.java similarity index 94% rename from impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/package-info.java rename to api.impl/src/main/java/org/apache/clerezza/api/impl/package-info.java index a353062..6a35ba4 100644 --- a/impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/package-info.java +++ b/api.impl/src/main/java/org/apache/clerezza/api/impl/package-info.java @@ -18,4 +18,4 @@ /** * Common RDF API Implementation utilities. */ -package org.apache.clerezza.commons.rdf.impl.utils; \ No newline at end of file +package org.apache.clerezza.api.impl; \ No newline at end of file diff --git a/impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/simple/SimpleGraph.java b/api.impl/src/main/java/org/apache/clerezza/api/impl/simple/SimpleGraph.java similarity index 94% rename from impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/simple/SimpleGraph.java rename to api.impl/src/main/java/org/apache/clerezza/api/impl/simple/SimpleGraph.java index 96f168b..7220532 100644 --- a/impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/simple/SimpleGraph.java +++ b/api.impl/src/main/java/org/apache/clerezza/api/impl/simple/SimpleGraph.java @@ -16,9 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.clerezza.commons.rdf.impl.utils.simple; +package org.apache.clerezza.api.impl.simple; + +import org.apache.clerezza.api.IRI; +import org.apache.clerezza.api.impl.AbstractGraph; -import org.apache.clerezza.commons.rdf.impl.utils.AbstractGraph; import java.lang.ref.SoftReference; import java.util.ArrayList; import java.util.Collection; @@ -29,11 +31,10 @@ import java.util.Iterator; import java.util.List; import java.util.Set; -import org.apache.clerezza.commons.rdf.BlankNodeOrIRI; -import org.apache.clerezza.commons.rdf.ImmutableGraph; -import org.apache.clerezza.commons.rdf.RDFTerm; -import org.apache.clerezza.commons.rdf.Triple; -import org.apache.clerezza.commons.rdf.IRI; +import org.apache.clerezza.api.BlankNodeOrIRI; +import org.apache.clerezza.api.ImmutableGraph; +import org.apache.clerezza.api.RDFTerm; +import org.apache.clerezza.api.Triple; /** * For now this is a minimalistic implementation, without any indexes or other diff --git a/impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/simple/SimpleImmutableGraph.java b/api.impl/src/main/java/org/apache/clerezza/api/impl/simple/SimpleImmutableGraph.java similarity index 86% rename from impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/simple/SimpleImmutableGraph.java rename to api.impl/src/main/java/org/apache/clerezza/api/impl/simple/SimpleImmutableGraph.java index 4cb3390..d48fe5c 100644 --- a/impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/simple/SimpleImmutableGraph.java +++ b/api.impl/src/main/java/org/apache/clerezza/api/impl/simple/SimpleImmutableGraph.java @@ -16,16 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.clerezza.commons.rdf.impl.utils.simple; +package org.apache.clerezza.api.impl.simple; + +import org.apache.clerezza.api.impl.AbstractImmutableGraph; -import org.apache.clerezza.commons.rdf.impl.utils.AbstractImmutableGraph; import java.util.Iterator; -import org.apache.clerezza.commons.rdf.BlankNodeOrIRI; -import org.apache.clerezza.commons.rdf.RDFTerm; -import org.apache.clerezza.commons.rdf.Triple; -import org.apache.clerezza.commons.rdf.Graph; -import org.apache.clerezza.commons.rdf.IRI; +import org.apache.clerezza.api.BlankNodeOrIRI; +import org.apache.clerezza.api.RDFTerm; +import org.apache.clerezza.api.Triple; +import org.apache.clerezza.api.Graph; +import org.apache.clerezza.api.IRI; /** * diff --git a/impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/simple/SimpleMGraph.java b/api.impl/src/main/java/org/apache/clerezza/api/impl/simple/SimpleMGraph.java similarity index 86% rename from impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/simple/SimpleMGraph.java rename to api.impl/src/main/java/org/apache/clerezza/api/impl/simple/SimpleMGraph.java index 1c00cdd..da961c2 100644 --- a/impl.utils/src/main/java/org/apache/clerezza/commons/rdf/impl/utils/simple/SimpleMGraph.java +++ b/api.impl/src/main/java/org/apache/clerezza/api/impl/simple/SimpleMGraph.java @@ -16,15 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.clerezza.commons.rdf.impl.utils.simple; +package org.apache.clerezza.api.impl.simple; import java.util.Collection; import java.util.Iterator; import java.util.Set; -import org.apache.clerezza.commons.rdf.ImmutableGraph; -import org.apache.clerezza.commons.rdf.Graph; -import org.apache.clerezza.commons.rdf.Triple; +import org.apache.clerezza.api.Graph; +import org.apache.clerezza.api.Triple; /** * diff --git a/impl.utils/src/test/java/org/apache/clerezza/commons/rdf/impl/utils/graphmatching/GraphMatcherTest.java b/api.impl/src/test/java/org/apache/clerezza/api/impl/graphmatching/GraphMatcherTest.java similarity index 92% rename from impl.utils/src/test/java/org/apache/clerezza/commons/rdf/impl/utils/graphmatching/GraphMatcherTest.java rename to api.impl/src/test/java/org/apache/clerezza/api/impl/graphmatching/GraphMatcherTest.java index 24b92c5..00e02a2 100644 --- a/impl.utils/src/test/java/org/apache/clerezza/commons/rdf/impl/utils/graphmatching/GraphMatcherTest.java +++ b/api.impl/src/test/java/org/apache/clerezza/api/impl/graphmatching/GraphMatcherTest.java @@ -16,19 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.clerezza.commons.rdf.impl.utils.graphmatching; +package org.apache.clerezza.api.impl.graphmatching; + +import org.apache.clerezza.api.Graph; +import org.apache.clerezza.api.IRI; +import org.apache.clerezza.api.impl.simple.SimpleMGraph; +import org.apache.clerezza.api.impl.TripleImpl; -import org.apache.clerezza.commons.rdf.impl.utils.graphmatching.GraphMatcher; import java.util.Map; -import org.apache.clerezza.commons.rdf.BlankNode; -import org.apache.clerezza.commons.rdf.Graph; -import org.apache.clerezza.commons.rdf.BlankNodeOrIRI; -import org.apache.clerezza.commons.rdf.RDFTerm; -import org.apache.clerezza.commons.rdf.Triple; -import org.apache.clerezza.commons.rdf.Graph; -import org.apache.clerezza.commons.rdf.IRI; -import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleMGraph; -import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl; +import org.apache.clerezza.api.BlankNode; +import org.apache.clerezza.api.BlankNodeOrIRI; import org.junit.Assert; import org.junit.Test; diff --git a/impl.utils/src/test/java/org/apache/clerezza/commons/rdf/impl/utils/graphmatching/HashMatchingTest.java b/api.impl/src/test/java/org/apache/clerezza/api/impl/graphmatching/HashMatchingTest.java similarity index 87% rename from impl.utils/src/test/java/org/apache/clerezza/commons/rdf/impl/utils/graphmatching/HashMatchingTest.java rename to api.impl/src/test/java/org/apache/clerezza/api/impl/graphmatching/HashMatchingTest.java index 8acbce5..74f76e1 100644 --- a/impl.utils/src/test/java/org/apache/clerezza/commons/rdf/impl/utils/graphmatching/HashMatchingTest.java +++ b/api.impl/src/test/java/org/apache/clerezza/api/impl/graphmatching/HashMatchingTest.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.clerezza.commons.rdf.impl.utils.graphmatching; +package org.apache.clerezza.api.impl.graphmatching; import java.util.Map; -import org.apache.clerezza.commons.rdf.BlankNode; -import org.apache.clerezza.commons.rdf.Graph; -import org.apache.clerezza.commons.rdf.BlankNodeOrIRI; +import org.apache.clerezza.api.BlankNode; +import org.apache.clerezza.api.BlankNodeOrIRI; +import org.apache.clerezza.api.Graph; import org.junit.Assert; import org.junit.Test; diff --git a/impl.utils/src/test/java/org/apache/clerezza/commons/rdf/impl/utils/graphmatching/PermutationIteratorTest.java b/api.impl/src/test/java/org/apache/clerezza/api/impl/graphmatching/PermutationIteratorTest.java similarity index 94% rename from impl.utils/src/test/java/org/apache/clerezza/commons/rdf/impl/utils/graphmatching/PermutationIteratorTest.java rename to api.impl/src/test/java/org/apache/clerezza/api/impl/graphmatching/PermutationIteratorTest.java index 3f61508..bc31dd6 100644 --- a/impl.utils/src/test/java/org/apache/clerezza/commons/rdf/impl/utils/graphmatching/PermutationIteratorTest.java +++ b/api.impl/src/test/java/org/apache/clerezza/api/impl/graphmatching/PermutationIteratorTest.java @@ -17,9 +17,8 @@ * under the License. */ -package org.apache.clerezza.commons.rdf.impl.utils.graphmatching; +package org.apache.clerezza.api.impl.graphmatching; -import org.apache.clerezza.commons.rdf.impl.utils.graphmatching.PermutationIterator; import java.util.ArrayList; import java.util.HashSet; import java.util.List; diff --git a/impl.utils/src/test/java/org/apache/clerezza/commons/rdf/impl/utils/graphmatching/Utils4Testing.java b/api.impl/src/test/java/org/apache/clerezza/api/impl/graphmatching/Utils4Testing.java similarity index 78% rename from impl.utils/src/test/java/org/apache/clerezza/commons/rdf/impl/utils/graphmatching/Utils4Testing.java rename to api.impl/src/test/java/org/apache/clerezza/api/impl/graphmatching/Utils4Testing.java index ca3237c..85dbc20 100644 --- a/impl.utils/src/test/java/org/apache/clerezza/commons/rdf/impl/utils/graphmatching/Utils4Testing.java +++ b/api.impl/src/test/java/org/apache/clerezza/api/impl/graphmatching/Utils4Testing.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.clerezza.commons.rdf.impl.utils.graphmatching; +package org.apache.clerezza.api.impl.graphmatching; -import org.apache.clerezza.commons.rdf.BlankNode; -import org.apache.clerezza.commons.rdf.Graph; -import org.apache.clerezza.commons.rdf.BlankNodeOrIRI; -import org.apache.clerezza.commons.rdf.IRI; -import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleMGraph; -import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl; +import org.apache.clerezza.api.BlankNode; +import org.apache.clerezza.api.Graph; +import org.apache.clerezza.api.IRI; +import org.apache.clerezza.api.impl.simple.SimpleMGraph; +import org.apache.clerezza.api.impl.TripleImpl; +import org.apache.clerezza.api.BlankNodeOrIRI; /** * diff --git a/impl.utils/src/test/java/org/apache/clerezza/commons/rdf/impl/utils/simple/PlainLiteralImplTest.java b/api.impl/src/test/java/org/apache/clerezza/api/impl/simple/PlainLiteralImplTest.java similarity index 92% rename from impl.utils/src/test/java/org/apache/clerezza/commons/rdf/impl/utils/simple/PlainLiteralImplTest.java rename to api.impl/src/test/java/org/apache/clerezza/api/impl/simple/PlainLiteralImplTest.java index 538a16d..ff6e678 100644 --- a/impl.utils/src/test/java/org/apache/clerezza/commons/rdf/impl/utils/simple/PlainLiteralImplTest.java +++ b/api.impl/src/test/java/org/apache/clerezza/api/impl/simple/PlainLiteralImplTest.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.clerezza.commons.rdf.impl.utils.simple; +package org.apache.clerezza.api.impl.simple; -import org.apache.clerezza.commons.rdf.impl.utils.PlainLiteralImpl; +import org.apache.clerezza.api.impl.PlainLiteralImpl; import org.junit.Test; -import org.apache.clerezza.commons.rdf.Language; -import org.apache.clerezza.commons.rdf.Literal; +import org.apache.clerezza.api.Language; +import org.apache.clerezza.api.Literal; import org.junit.Assert; /** * diff --git a/impl.utils/src/test/java/org/apache/clerezza/commons/rdf/impl/utils/simple/SimpleGraphTest.java b/api.impl/src/test/java/org/apache/clerezza/api/impl/simple/SimpleGraphTest.java similarity index 92% rename from impl.utils/src/test/java/org/apache/clerezza/commons/rdf/impl/utils/simple/SimpleGraphTest.java rename to api.impl/src/test/java/org/apache/clerezza/api/impl/simple/SimpleGraphTest.java index 9c94a8d..ff3280d 100644 --- a/impl.utils/src/test/java/org/apache/clerezza/commons/rdf/impl/utils/simple/SimpleGraphTest.java +++ b/api.impl/src/test/java/org/apache/clerezza/api/impl/simple/SimpleGraphTest.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.clerezza.commons.rdf.impl.utils.simple; +package org.apache.clerezza.api.impl.simple; + +import org.apache.clerezza.api.impl.TripleImpl; -import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl; import java.util.ConcurrentModificationException; import java.util.Iterator; import org.junit.Assert; import org.junit.Test; -import org.apache.clerezza.commons.rdf.Triple; -import org.apache.clerezza.commons.rdf.IRI; -import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph; +import org.apache.clerezza.api.Triple; +import org.apache.clerezza.api.IRI; /** * diff --git a/impl.utils/src/test/java/org/apache/clerezza/commons/rdf/impl/utils/simple/TripleImplTest.java b/api.impl/src/test/java/org/apache/clerezza/api/impl/simple/TripleImplTest.java similarity index 80% rename from impl.utils/src/test/java/org/apache/clerezza/commons/rdf/impl/utils/simple/TripleImplTest.java rename to api.impl/src/test/java/org/apache/clerezza/api/impl/simple/TripleImplTest.java index b064a60..9b38af9 100644 --- a/impl.utils/src/test/java/org/apache/clerezza/commons/rdf/impl/utils/simple/TripleImplTest.java +++ b/api.impl/src/test/java/org/apache/clerezza/api/impl/simple/TripleImplTest.java @@ -3,7 +3,7 @@ * and open the template in the editor. */ -package org.apache.clerezza.commons.rdf.impl.utils.simple; +package org.apache.clerezza.api.impl.simple; /* * * Licensed to the Apache Software Foundation (ASF) under one @@ -26,15 +26,15 @@ package org.apache.clerezza.commons.rdf.impl.utils.simple; */ +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.PlainLiteralImpl; +import org.apache.clerezza.api.impl.TripleImpl; import org.junit.Test; import junit.framework.Assert; -import org.apache.clerezza.commons.rdf.BlankNodeOrIRI; -import org.apache.clerezza.commons.rdf.RDFTerm; -import org.apache.clerezza.commons.rdf.Triple; -import org.apache.clerezza.commons.rdf.IRI; -import org.apache.clerezza.commons.rdf.impl.utils.PlainLiteralImpl; -import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl; /** * * @author reto diff --git a/impl.utils/src/test/java/org/apache/clerezza/commons/rdf/impl/utils/simple/TypedLiteralImplTest.java b/api.impl/src/test/java/org/apache/clerezza/api/impl/simple/TypedLiteralImplTest.java similarity index 90% rename from impl.utils/src/test/java/org/apache/clerezza/commons/rdf/impl/utils/simple/TypedLiteralImplTest.java rename to api.impl/src/test/java/org/apache/clerezza/api/impl/simple/TypedLiteralImplTest.java index 2da82cd..dbde617 100644 --- a/impl.utils/src/test/java/org/apache/clerezza/commons/rdf/impl/utils/simple/TypedLiteralImplTest.java +++ b/api.impl/src/test/java/org/apache/clerezza/api/impl/simple/TypedLiteralImplTest.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.clerezza.commons.rdf.impl.utils.simple; +package org.apache.clerezza.api.impl.simple; -import org.apache.clerezza.commons.rdf.impl.utils.TypedLiteralImpl; +import org.apache.clerezza.api.IRI; +import org.apache.clerezza.api.impl.TypedLiteralImpl; import org.junit.Test; import junit.framework.Assert; -import org.apache.clerezza.commons.rdf.IRI; -import org.apache.clerezza.commons.rdf.Literal; +import org.apache.clerezza.api.Literal; /** * * @author reto/** diff --git a/api/pom.xml b/api/pom.xml index a58ef72..83921d6 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -18,41 +18,37 @@ --> -<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/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> - +<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/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> <groupId>org.apache.clerezza</groupId> <artifactId>clerezza</artifactId> - <version>7</version> - <relativePath /> - </parent> + <version>8-SNAPSHOT</version> + <relativePath/> + </parent> - <groupId>org.apache.clerezza.commons-rdf</groupId> - <artifactId>commons-rdf-api</artifactId> - <version>0.3-SNAPSHOT</version> + <artifactId>api</artifactId> <packaging>bundle</packaging> - <name>Clerezza Commons RDF API</name> + <name>Clerezza API</name> <description> - Apache Clerezza Commons RDF provides an API modelling the RDF data model as defined by + Apache Clerezza API implements the RDF data model as defined by http://www.w3.org/TR/rdf11-concepts/ </description> - - <url>http://clerezza.apache.org/commons-rdf/</url> - + <issueManagement> <system>jira</system> <url>http://issues.apache.org/jira/browse/CLEREZZA</url> </issueManagement> - + <inceptionYear>2015</inceptionYear> <scm> - <connection>scm:git:https://git-wip-us.apache.org/repos/asf/clerezza-rdf-core.git</connection> - <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/clerezza-rdf-core.git</developerConnection> - <url>https://git-wip-us.apache.org/repos/asf/clerezza-rdf-core.git</url> - <tag>HEAD</tag> - </scm> - + <connection>scm:git:https://git-wip-us.apache.org/repos/asf/clerezza.git</connection> + <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/clerezza.git</developerConnection> + <url>https://git-wip-us.apache.org/repos/asf/clerezza.git</url> + <tag>HEAD</tag> + </scm> <dependencies> <dependency> diff --git a/api/src/main/java/org/apache/clerezza/commons/rdf/BlankNode.java b/api/src/main/java/org/apache/clerezza/api/BlankNode.java similarity index 97% rename from api/src/main/java/org/apache/clerezza/commons/rdf/BlankNode.java rename to api/src/main/java/org/apache/clerezza/api/BlankNode.java index 9952fce..fab6270 100644 --- a/api/src/main/java/org/apache/clerezza/commons/rdf/BlankNode.java +++ b/api/src/main/java/org/apache/clerezza/api/BlankNode.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.clerezza.commons.rdf; +package org.apache.clerezza.api; /** * A Blank Node represents a resource, diff --git a/api/src/main/java/org/apache/clerezza/commons/rdf/BlankNodeOrIRI.java b/api/src/main/java/org/apache/clerezza/api/BlankNodeOrIRI.java similarity index 96% rename from api/src/main/java/org/apache/clerezza/commons/rdf/BlankNodeOrIRI.java rename to api/src/main/java/org/apache/clerezza/api/BlankNodeOrIRI.java index 8d80b4b..0cf66ac 100644 --- a/api/src/main/java/org/apache/clerezza/commons/rdf/BlankNodeOrIRI.java +++ b/api/src/main/java/org/apache/clerezza/api/BlankNodeOrIRI.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.clerezza.commons.rdf; +package org.apache.clerezza.api; /** * Represents a <code>Resource</code> that is not a <code>Literal</code>. diff --git a/api/src/main/java/org/apache/clerezza/commons/rdf/Graph.java b/api/src/main/java/org/apache/clerezza/api/Graph.java similarity index 95% rename from api/src/main/java/org/apache/clerezza/commons/rdf/Graph.java rename to api/src/main/java/org/apache/clerezza/api/Graph.java index 6904722..5c5648c 100644 --- a/api/src/main/java/org/apache/clerezza/commons/rdf/Graph.java +++ b/api/src/main/java/org/apache/clerezza/api/Graph.java @@ -16,13 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.clerezza.commons.rdf; +package org.apache.clerezza.api; import java.util.Collection; import java.util.Iterator; import java.util.concurrent.locks.ReadWriteLock; -import org.apache.clerezza.commons.rdf.event.FilterTriple; -import org.apache.clerezza.commons.rdf.event.GraphListener; /** diff --git a/api/src/main/java/org/apache/clerezza/commons/rdf/IRI.java b/api/src/main/java/org/apache/clerezza/api/IRI.java similarity index 98% rename from api/src/main/java/org/apache/clerezza/commons/rdf/IRI.java rename to api/src/main/java/org/apache/clerezza/api/IRI.java index be9b3a8..d17cc90 100644 --- a/api/src/main/java/org/apache/clerezza/commons/rdf/IRI.java +++ b/api/src/main/java/org/apache/clerezza/api/IRI.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.clerezza.commons.rdf; +package org.apache.clerezza.api; import java.io.Serializable; diff --git a/api/src/main/java/org/apache/clerezza/commons/rdf/ImmutableGraph.java b/api/src/main/java/org/apache/clerezza/api/ImmutableGraph.java similarity index 97% rename from api/src/main/java/org/apache/clerezza/commons/rdf/ImmutableGraph.java rename to api/src/main/java/org/apache/clerezza/api/ImmutableGraph.java index bd94671..efb7b49 100644 --- a/api/src/main/java/org/apache/clerezza/commons/rdf/ImmutableGraph.java +++ b/api/src/main/java/org/apache/clerezza/api/ImmutableGraph.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.clerezza.commons.rdf; +package org.apache.clerezza.api; /** * A graph, modeled as a set of triples. diff --git a/api/src/main/java/org/apache/clerezza/commons/rdf/Language.java b/api/src/main/java/org/apache/clerezza/api/Language.java similarity index 97% rename from api/src/main/java/org/apache/clerezza/commons/rdf/Language.java rename to api/src/main/java/org/apache/clerezza/api/Language.java index 62a921e..e5d24f4 100644 --- a/api/src/main/java/org/apache/clerezza/commons/rdf/Language.java +++ b/api/src/main/java/org/apache/clerezza/api/Language.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.clerezza.commons.rdf; +package org.apache.clerezza.api; /** * Represents a language as expressed by the RDF 4646 language tag diff --git a/api/src/main/java/org/apache/clerezza/commons/rdf/Literal.java b/api/src/main/java/org/apache/clerezza/api/Literal.java similarity index 98% rename from api/src/main/java/org/apache/clerezza/commons/rdf/Literal.java rename to api/src/main/java/org/apache/clerezza/api/Literal.java index 0f96256..641a64b 100644 --- a/api/src/main/java/org/apache/clerezza/commons/rdf/Literal.java +++ b/api/src/main/java/org/apache/clerezza/api/Literal.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.clerezza.commons.rdf; +package org.apache.clerezza.api; /** diff --git a/api/src/main/java/org/apache/clerezza/commons/rdf/RDFTerm.java b/api/src/main/java/org/apache/clerezza/api/RDFTerm.java similarity index 96% rename from api/src/main/java/org/apache/clerezza/commons/rdf/RDFTerm.java rename to api/src/main/java/org/apache/clerezza/api/RDFTerm.java index 197a182..58d3e4a 100644 --- a/api/src/main/java/org/apache/clerezza/commons/rdf/RDFTerm.java +++ b/api/src/main/java/org/apache/clerezza/api/RDFTerm.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.clerezza.commons.rdf; +package org.apache.clerezza.api; /** * 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/commons/rdf/Triple.java b/api/src/main/java/org/apache/clerezza/api/Triple.java similarity index 97% rename from api/src/main/java/org/apache/clerezza/commons/rdf/Triple.java rename to api/src/main/java/org/apache/clerezza/api/Triple.java index 67cdef0..f0f6ed4 100644 --- a/api/src/main/java/org/apache/clerezza/commons/rdf/Triple.java +++ b/api/src/main/java/org/apache/clerezza/api/Triple.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.clerezza.commons.rdf; +package org.apache.clerezza.api; /** * A structure containing a subject, a predicate, and an object. diff --git a/api/src/main/java/org/apache/clerezza/commons/rdf/WatchableGraph.java b/api/src/main/java/org/apache/clerezza/api/WatchableGraph.java similarity index 92% rename from api/src/main/java/org/apache/clerezza/commons/rdf/WatchableGraph.java rename to api/src/main/java/org/apache/clerezza/api/WatchableGraph.java index 4ed2cd4..d239d2a 100644 --- a/api/src/main/java/org/apache/clerezza/commons/rdf/WatchableGraph.java +++ b/api/src/main/java/org/apache/clerezza/api/WatchableGraph.java @@ -16,13 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.clerezza.commons.rdf; +package org.apache.clerezza.api; -import java.util.Collection; -import java.util.Iterator; -import java.util.concurrent.locks.ReadWriteLock; -import org.apache.clerezza.commons.rdf.event.FilterTriple; -import org.apache.clerezza.commons.rdf.event.GraphListener; +import org.apache.clerezza.api.event.FilterTriple; +import org.apache.clerezza.api.event.GraphListener; /** @@ -67,7 +64,7 @@ public interface WatchableGraph extends Graph { * @param delay The time period afer which the listener will be notified in milliseconds. */ public void addGraphListener(GraphListener listener, FilterTriple filter, - long delay); + long delay); /** * Adds the specified <code>GraphListener</code> to the graph. This listener diff --git a/api/src/main/java/org/apache/clerezza/commons/rdf/event/AddEvent.java b/api/src/main/java/org/apache/clerezza/api/event/AddEvent.java similarity index 84% rename from api/src/main/java/org/apache/clerezza/commons/rdf/event/AddEvent.java rename to api/src/main/java/org/apache/clerezza/api/event/AddEvent.java index c2716d6..bf64ef9 100644 --- a/api/src/main/java/org/apache/clerezza/commons/rdf/event/AddEvent.java +++ b/api/src/main/java/org/apache/clerezza/api/event/AddEvent.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.clerezza.commons.rdf.event; +package org.apache.clerezza.api.event; -import org.apache.clerezza.commons.rdf.Triple; -import org.apache.clerezza.commons.rdf.Graph; +import org.apache.clerezza.api.Graph; +import org.apache.clerezza.api.Triple; /** * This class represent a addition event that occured on a @@ -30,7 +30,7 @@ import org.apache.clerezza.commons.rdf.Graph; public class AddEvent extends GraphEvent { - public AddEvent(Graph graph, Triple triple) { + public AddEvent(Graph graph, Triple triple) { super(graph, triple); } diff --git a/api/src/main/java/org/apache/clerezza/commons/rdf/event/FilterTriple.java b/api/src/main/java/org/apache/clerezza/api/event/FilterTriple.java similarity index 91% rename from api/src/main/java/org/apache/clerezza/commons/rdf/event/FilterTriple.java rename to api/src/main/java/org/apache/clerezza/api/event/FilterTriple.java index 4e22df7..153241c 100644 --- a/api/src/main/java/org/apache/clerezza/commons/rdf/event/FilterTriple.java +++ b/api/src/main/java/org/apache/clerezza/api/event/FilterTriple.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.clerezza.commons.rdf.event; +package org.apache.clerezza.api.event; -import org.apache.clerezza.commons.rdf.BlankNodeOrIRI; -import org.apache.clerezza.commons.rdf.RDFTerm; -import org.apache.clerezza.commons.rdf.Triple; -import org.apache.clerezza.commons.rdf.IRI; +import org.apache.clerezza.api.IRI; +import org.apache.clerezza.api.BlankNodeOrIRI; +import org.apache.clerezza.api.RDFTerm; +import org.apache.clerezza.api.Triple; /** * The <code>FilterTriple</code> class provides a match()-method that tests diff --git a/api/src/main/java/org/apache/clerezza/commons/rdf/event/GraphEvent.java b/api/src/main/java/org/apache/clerezza/api/event/GraphEvent.java similarity index 92% rename from api/src/main/java/org/apache/clerezza/commons/rdf/event/GraphEvent.java rename to api/src/main/java/org/apache/clerezza/api/event/GraphEvent.java index b9e6ec0..aeea21c 100644 --- a/api/src/main/java/org/apache/clerezza/commons/rdf/event/GraphEvent.java +++ b/api/src/main/java/org/apache/clerezza/api/event/GraphEvent.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.clerezza.commons.rdf.event; +package org.apache.clerezza.api.event; -import org.apache.clerezza.commons.rdf.Triple; -import org.apache.clerezza.commons.rdf.Graph; +import org.apache.clerezza.api.Graph; +import org.apache.clerezza.api.Triple; /** * This class represent a modification event that occured on a diff --git a/api/src/main/java/org/apache/clerezza/commons/rdf/event/GraphListener.java b/api/src/main/java/org/apache/clerezza/api/event/GraphListener.java similarity index 97% rename from api/src/main/java/org/apache/clerezza/commons/rdf/event/GraphListener.java rename to api/src/main/java/org/apache/clerezza/api/event/GraphListener.java index 9041546..ce7ce5d 100644 --- a/api/src/main/java/org/apache/clerezza/commons/rdf/event/GraphListener.java +++ b/api/src/main/java/org/apache/clerezza/api/event/GraphListener.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.clerezza.commons.rdf.event; +package org.apache.clerezza.api.event; import java.util.List; diff --git a/api/src/main/java/org/apache/clerezza/commons/rdf/event/RemoveEvent.java b/api/src/main/java/org/apache/clerezza/api/event/RemoveEvent.java similarity index 83% rename from api/src/main/java/org/apache/clerezza/commons/rdf/event/RemoveEvent.java rename to api/src/main/java/org/apache/clerezza/api/event/RemoveEvent.java index 103febc..8f0134f 100644 --- a/api/src/main/java/org/apache/clerezza/commons/rdf/event/RemoveEvent.java +++ b/api/src/main/java/org/apache/clerezza/api/event/RemoveEvent.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.clerezza.commons.rdf.event; +package org.apache.clerezza.api.event; -import org.apache.clerezza.commons.rdf.Triple; -import org.apache.clerezza.commons.rdf.Graph; +import org.apache.clerezza.api.Graph; +import org.apache.clerezza.api.Triple; /** * This class represent a removal event that occured on a @@ -30,7 +30,7 @@ import org.apache.clerezza.commons.rdf.Graph; public class RemoveEvent extends GraphEvent { - public RemoveEvent(Graph graph, Triple triple) { + public RemoveEvent(Graph graph, Triple triple) { super(graph, triple); } diff --git a/api/src/main/java/org/apache/clerezza/commons/rdf/package-info.java b/api/src/main/java/org/apache/clerezza/api/package-info.java similarity index 95% rename from api/src/main/java/org/apache/clerezza/commons/rdf/package-info.java rename to api/src/main/java/org/apache/clerezza/api/package-info.java index 62354fe..0998a56 100644 --- a/api/src/main/java/org/apache/clerezza/commons/rdf/package-info.java +++ b/api/src/main/java/org/apache/clerezza/api/package-info.java @@ -18,4 +18,4 @@ /** * Common RDF API */ -package org.apache.clerezza.commons.rdf; \ No newline at end of file +package org.apache.clerezza.api; \ No newline at end of file
