http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/sail/src/main/java/org/apache/rya/rdftriplestore/inference/AbstractInferVisitor.java ---------------------------------------------------------------------- diff --git a/sail/src/main/java/org/apache/rya/rdftriplestore/inference/AbstractInferVisitor.java b/sail/src/main/java/org/apache/rya/rdftriplestore/inference/AbstractInferVisitor.java index f6d3ff0..5480d95 100644 --- a/sail/src/main/java/org/apache/rya/rdftriplestore/inference/AbstractInferVisitor.java +++ b/sail/src/main/java/org/apache/rya/rdftriplestore/inference/AbstractInferVisitor.java @@ -1,4 +1,4 @@ -package mvm.rya.rdftriplestore.inference; +package org.apache.rya.rdftriplestore.inference; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,11 +21,11 @@ package mvm.rya.rdftriplestore.inference; -import mvm.rya.api.RdfCloudTripleStoreConfiguration; -import mvm.rya.rdftriplestore.utils.FixedStatementPattern; -import mvm.rya.rdftriplestore.utils.TransitivePropertySP; -import mvm.rya.rdftriplestore.utils.FixedStatementPattern; -import mvm.rya.rdftriplestore.utils.TransitivePropertySP; +import org.apache.rya.api.RdfCloudTripleStoreConfiguration; +import org.apache.rya.rdftriplestore.utils.FixedStatementPattern; +import org.apache.rya.rdftriplestore.utils.TransitivePropertySP; +import org.apache.rya.rdftriplestore.utils.FixedStatementPattern; +import org.apache.rya.rdftriplestore.utils.TransitivePropertySP; import org.openrdf.query.algebra.Join; import org.openrdf.query.algebra.StatementPattern; import org.openrdf.query.algebra.Union;
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/sail/src/main/java/org/apache/rya/rdftriplestore/inference/DoNotExpandSP.java ---------------------------------------------------------------------- diff --git a/sail/src/main/java/org/apache/rya/rdftriplestore/inference/DoNotExpandSP.java b/sail/src/main/java/org/apache/rya/rdftriplestore/inference/DoNotExpandSP.java index aed7ed0..717e48a 100644 --- a/sail/src/main/java/org/apache/rya/rdftriplestore/inference/DoNotExpandSP.java +++ b/sail/src/main/java/org/apache/rya/rdftriplestore/inference/DoNotExpandSP.java @@ -1,4 +1,4 @@ -package mvm.rya.rdftriplestore.inference; +package org.apache.rya.rdftriplestore.inference; /* * Licensed to the Apache Software Foundation (ASF) under one http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/sail/src/main/java/org/apache/rya/rdftriplestore/inference/InferConstants.java ---------------------------------------------------------------------- diff --git a/sail/src/main/java/org/apache/rya/rdftriplestore/inference/InferConstants.java b/sail/src/main/java/org/apache/rya/rdftriplestore/inference/InferConstants.java index aa0b99b..adf31b0 100644 --- a/sail/src/main/java/org/apache/rya/rdftriplestore/inference/InferConstants.java +++ b/sail/src/main/java/org/apache/rya/rdftriplestore/inference/InferConstants.java @@ -1,4 +1,4 @@ -package mvm.rya.rdftriplestore.inference; +package org.apache.rya.rdftriplestore.inference; /* * Licensed to the Apache Software Foundation (ASF) under one http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/sail/src/main/java/org/apache/rya/rdftriplestore/inference/InferJoin.java ---------------------------------------------------------------------- diff --git a/sail/src/main/java/org/apache/rya/rdftriplestore/inference/InferJoin.java b/sail/src/main/java/org/apache/rya/rdftriplestore/inference/InferJoin.java index 87854ac..de18e14 100644 --- a/sail/src/main/java/org/apache/rya/rdftriplestore/inference/InferJoin.java +++ b/sail/src/main/java/org/apache/rya/rdftriplestore/inference/InferJoin.java @@ -1,4 +1,4 @@ -package mvm.rya.rdftriplestore.inference; +package org.apache.rya.rdftriplestore.inference; /* * Licensed to the Apache Software Foundation (ASF) under one http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/sail/src/main/java/org/apache/rya/rdftriplestore/inference/InferUnion.java ---------------------------------------------------------------------- diff --git a/sail/src/main/java/org/apache/rya/rdftriplestore/inference/InferUnion.java b/sail/src/main/java/org/apache/rya/rdftriplestore/inference/InferUnion.java index 4d229d0..f783881 100644 --- a/sail/src/main/java/org/apache/rya/rdftriplestore/inference/InferUnion.java +++ b/sail/src/main/java/org/apache/rya/rdftriplestore/inference/InferUnion.java @@ -1,4 +1,4 @@ -package mvm.rya.rdftriplestore.inference; +package org.apache.rya.rdftriplestore.inference; /* * Licensed to the Apache Software Foundation (ASF) under one http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/sail/src/main/java/org/apache/rya/rdftriplestore/inference/InferenceEngine.java ---------------------------------------------------------------------- diff --git a/sail/src/main/java/org/apache/rya/rdftriplestore/inference/InferenceEngine.java b/sail/src/main/java/org/apache/rya/rdftriplestore/inference/InferenceEngine.java index 515f370..3ffa211 100644 --- a/sail/src/main/java/org/apache/rya/rdftriplestore/inference/InferenceEngine.java +++ b/sail/src/main/java/org/apache/rya/rdftriplestore/inference/InferenceEngine.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package mvm.rya.rdftriplestore.inference; +package org.apache.rya.rdftriplestore.inference; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; @@ -54,10 +54,10 @@ import org.apache.tinkerpop.gremlin.structure.Vertex; import com.google.common.collect.Iterators; import info.aduna.iteration.CloseableIteration; -import mvm.rya.api.RdfCloudTripleStoreConfiguration; -import mvm.rya.api.persist.RyaDAO; -import mvm.rya.api.persist.RyaDAOException; -import mvm.rya.api.persist.utils.RyaDAOHelper; +import org.apache.rya.api.RdfCloudTripleStoreConfiguration; +import org.apache.rya.api.persist.RyaDAO; +import org.apache.rya.api.persist.RyaDAOException; +import org.apache.rya.api.persist.utils.RyaDAOHelper; /** * Will pull down inference relationships from dao every x seconds. <br> http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/sail/src/main/java/org/apache/rya/rdftriplestore/inference/InferenceEngineException.java ---------------------------------------------------------------------- diff --git a/sail/src/main/java/org/apache/rya/rdftriplestore/inference/InferenceEngineException.java b/sail/src/main/java/org/apache/rya/rdftriplestore/inference/InferenceEngineException.java index 4fc94e3..45bdfd7 100644 --- a/sail/src/main/java/org/apache/rya/rdftriplestore/inference/InferenceEngineException.java +++ b/sail/src/main/java/org/apache/rya/rdftriplestore/inference/InferenceEngineException.java @@ -1,4 +1,4 @@ -package mvm.rya.rdftriplestore.inference; +package org.apache.rya.rdftriplestore.inference; /* * Licensed to the Apache Software Foundation (ASF) under one http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/sail/src/main/java/org/apache/rya/rdftriplestore/inference/InverseOfVisitor.java ---------------------------------------------------------------------- diff --git a/sail/src/main/java/org/apache/rya/rdftriplestore/inference/InverseOfVisitor.java b/sail/src/main/java/org/apache/rya/rdftriplestore/inference/InverseOfVisitor.java index 6f8004c..2f026fc 100644 --- a/sail/src/main/java/org/apache/rya/rdftriplestore/inference/InverseOfVisitor.java +++ b/sail/src/main/java/org/apache/rya/rdftriplestore/inference/InverseOfVisitor.java @@ -1,4 +1,4 @@ -package mvm.rya.rdftriplestore.inference; +package org.apache.rya.rdftriplestore.inference; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,7 +21,7 @@ package mvm.rya.rdftriplestore.inference; -import mvm.rya.api.RdfCloudTripleStoreConfiguration; +import org.apache.rya.api.RdfCloudTripleStoreConfiguration; import org.openrdf.model.URI; import org.openrdf.model.vocabulary.RDF; import org.openrdf.model.vocabulary.RDFS; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/sail/src/main/java/org/apache/rya/rdftriplestore/inference/InverseURI.java ---------------------------------------------------------------------- diff --git a/sail/src/main/java/org/apache/rya/rdftriplestore/inference/InverseURI.java b/sail/src/main/java/org/apache/rya/rdftriplestore/inference/InverseURI.java index c9e14cd..6ad9225 100644 --- a/sail/src/main/java/org/apache/rya/rdftriplestore/inference/InverseURI.java +++ b/sail/src/main/java/org/apache/rya/rdftriplestore/inference/InverseURI.java @@ -1,4 +1,4 @@ -package mvm.rya.rdftriplestore.inference; +package org.apache.rya.rdftriplestore.inference; /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/sail/src/main/java/org/apache/rya/rdftriplestore/inference/PropertyChainVisitor.java ---------------------------------------------------------------------- diff --git a/sail/src/main/java/org/apache/rya/rdftriplestore/inference/PropertyChainVisitor.java b/sail/src/main/java/org/apache/rya/rdftriplestore/inference/PropertyChainVisitor.java index 6e487b2..67d4365 100644 --- a/sail/src/main/java/org/apache/rya/rdftriplestore/inference/PropertyChainVisitor.java +++ b/sail/src/main/java/org/apache/rya/rdftriplestore/inference/PropertyChainVisitor.java @@ -1,4 +1,4 @@ -package mvm.rya.rdftriplestore.inference; +package org.apache.rya.rdftriplestore.inference; import java.util.ArrayList; import java.util.List; @@ -35,10 +35,10 @@ import org.openrdf.query.algebra.Var; -import mvm.rya.api.RdfCloudTripleStoreConfiguration; -import mvm.rya.api.utils.NullableStatementImpl; -import mvm.rya.rdftriplestore.utils.FixedStatementPattern; -import mvm.rya.rdftriplestore.utils.FixedStatementPattern; +import org.apache.rya.api.RdfCloudTripleStoreConfiguration; +import org.apache.rya.api.utils.NullableStatementImpl; +import org.apache.rya.rdftriplestore.utils.FixedStatementPattern; +import org.apache.rya.rdftriplestore.utils.FixedStatementPattern; /** * All predicates are changed http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/sail/src/main/java/org/apache/rya/rdftriplestore/inference/SameAsVisitor.java ---------------------------------------------------------------------- diff --git a/sail/src/main/java/org/apache/rya/rdftriplestore/inference/SameAsVisitor.java b/sail/src/main/java/org/apache/rya/rdftriplestore/inference/SameAsVisitor.java index d035026..2cdbdee 100644 --- a/sail/src/main/java/org/apache/rya/rdftriplestore/inference/SameAsVisitor.java +++ b/sail/src/main/java/org/apache/rya/rdftriplestore/inference/SameAsVisitor.java @@ -1,4 +1,4 @@ -package mvm.rya.rdftriplestore.inference; +package org.apache.rya.rdftriplestore.inference; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,10 +21,10 @@ package mvm.rya.rdftriplestore.inference; -import mvm.rya.api.RdfCloudTripleStoreConfiguration; -import mvm.rya.api.utils.NullableStatementImpl; -import mvm.rya.rdftriplestore.utils.FixedStatementPattern; -import mvm.rya.rdftriplestore.utils.TransitivePropertySP; +import org.apache.rya.api.RdfCloudTripleStoreConfiguration; +import org.apache.rya.api.utils.NullableStatementImpl; +import org.apache.rya.rdftriplestore.utils.FixedStatementPattern; +import org.apache.rya.rdftriplestore.utils.TransitivePropertySP; import org.openrdf.model.Resource; import org.openrdf.model.URI; import org.openrdf.model.Value; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/sail/src/main/java/org/apache/rya/rdftriplestore/inference/SubClassOfVisitor.java ---------------------------------------------------------------------- diff --git a/sail/src/main/java/org/apache/rya/rdftriplestore/inference/SubClassOfVisitor.java b/sail/src/main/java/org/apache/rya/rdftriplestore/inference/SubClassOfVisitor.java index 294550b..89d3b7b 100644 --- a/sail/src/main/java/org/apache/rya/rdftriplestore/inference/SubClassOfVisitor.java +++ b/sail/src/main/java/org/apache/rya/rdftriplestore/inference/SubClassOfVisitor.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package mvm.rya.rdftriplestore.inference; +package org.apache.rya.rdftriplestore.inference; -import mvm.rya.api.RdfCloudTripleStoreConfiguration; -import mvm.rya.api.utils.NullableStatementImpl; -import mvm.rya.rdftriplestore.utils.FixedStatementPattern; -import mvm.rya.rdftriplestore.utils.FixedStatementPattern; +import org.apache.rya.api.RdfCloudTripleStoreConfiguration; +import org.apache.rya.api.utils.NullableStatementImpl; +import org.apache.rya.rdftriplestore.utils.FixedStatementPattern; +import org.apache.rya.rdftriplestore.utils.FixedStatementPattern; import org.openrdf.model.URI; import org.openrdf.model.vocabulary.RDF; import org.openrdf.model.vocabulary.RDFS; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/sail/src/main/java/org/apache/rya/rdftriplestore/inference/SubPropertyOfVisitor.java ---------------------------------------------------------------------- diff --git a/sail/src/main/java/org/apache/rya/rdftriplestore/inference/SubPropertyOfVisitor.java b/sail/src/main/java/org/apache/rya/rdftriplestore/inference/SubPropertyOfVisitor.java index 4bf427e..9447658 100644 --- a/sail/src/main/java/org/apache/rya/rdftriplestore/inference/SubPropertyOfVisitor.java +++ b/sail/src/main/java/org/apache/rya/rdftriplestore/inference/SubPropertyOfVisitor.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package mvm.rya.rdftriplestore.inference; +package org.apache.rya.rdftriplestore.inference; -import mvm.rya.api.RdfCloudTripleStoreConfiguration; -import mvm.rya.api.utils.NullableStatementImpl; -import mvm.rya.rdftriplestore.utils.FixedStatementPattern; -import mvm.rya.rdftriplestore.utils.FixedStatementPattern; +import org.apache.rya.api.RdfCloudTripleStoreConfiguration; +import org.apache.rya.api.utils.NullableStatementImpl; +import org.apache.rya.rdftriplestore.utils.FixedStatementPattern; +import org.apache.rya.rdftriplestore.utils.FixedStatementPattern; import org.openrdf.model.URI; import org.openrdf.model.vocabulary.RDF; import org.openrdf.model.vocabulary.RDFS; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/sail/src/main/java/org/apache/rya/rdftriplestore/inference/SymmetricPropertyVisitor.java ---------------------------------------------------------------------- diff --git a/sail/src/main/java/org/apache/rya/rdftriplestore/inference/SymmetricPropertyVisitor.java b/sail/src/main/java/org/apache/rya/rdftriplestore/inference/SymmetricPropertyVisitor.java index 63c073b..7195ccd 100644 --- a/sail/src/main/java/org/apache/rya/rdftriplestore/inference/SymmetricPropertyVisitor.java +++ b/sail/src/main/java/org/apache/rya/rdftriplestore/inference/SymmetricPropertyVisitor.java @@ -1,4 +1,4 @@ -package mvm.rya.rdftriplestore.inference; +package org.apache.rya.rdftriplestore.inference; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,7 +21,7 @@ package mvm.rya.rdftriplestore.inference; -import mvm.rya.api.RdfCloudTripleStoreConfiguration; +import org.apache.rya.api.RdfCloudTripleStoreConfiguration; import org.openrdf.model.URI; import org.openrdf.model.vocabulary.RDF; import org.openrdf.model.vocabulary.RDFS; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/sail/src/main/java/org/apache/rya/rdftriplestore/inference/TransitivePropertyVisitor.java ---------------------------------------------------------------------- diff --git a/sail/src/main/java/org/apache/rya/rdftriplestore/inference/TransitivePropertyVisitor.java b/sail/src/main/java/org/apache/rya/rdftriplestore/inference/TransitivePropertyVisitor.java index 2f795fb..b50da9c 100644 --- a/sail/src/main/java/org/apache/rya/rdftriplestore/inference/TransitivePropertyVisitor.java +++ b/sail/src/main/java/org/apache/rya/rdftriplestore/inference/TransitivePropertyVisitor.java @@ -1,4 +1,4 @@ -package mvm.rya.rdftriplestore.inference; +package org.apache.rya.rdftriplestore.inference; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,9 +21,9 @@ package mvm.rya.rdftriplestore.inference; -import mvm.rya.api.RdfCloudTripleStoreConfiguration; -import mvm.rya.rdftriplestore.utils.TransitivePropertySP; -import mvm.rya.rdftriplestore.utils.TransitivePropertySP; +import org.apache.rya.api.RdfCloudTripleStoreConfiguration; +import org.apache.rya.rdftriplestore.utils.TransitivePropertySP; +import org.apache.rya.rdftriplestore.utils.TransitivePropertySP; import org.openrdf.model.URI; import org.openrdf.model.vocabulary.RDF; import org.openrdf.model.vocabulary.RDFS; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/sail/src/main/java/org/apache/rya/rdftriplestore/namespace/NamespaceManager.java ---------------------------------------------------------------------- diff --git a/sail/src/main/java/org/apache/rya/rdftriplestore/namespace/NamespaceManager.java b/sail/src/main/java/org/apache/rya/rdftriplestore/namespace/NamespaceManager.java index dd8e4fa..3664d64 100644 --- a/sail/src/main/java/org/apache/rya/rdftriplestore/namespace/NamespaceManager.java +++ b/sail/src/main/java/org/apache/rya/rdftriplestore/namespace/NamespaceManager.java @@ -1,4 +1,4 @@ -package mvm.rya.rdftriplestore.namespace; +package org.apache.rya.rdftriplestore.namespace; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -22,10 +22,10 @@ package mvm.rya.rdftriplestore.namespace; import info.aduna.iteration.CloseableIteration; -import mvm.rya.api.RdfCloudTripleStoreConfiguration; -import mvm.rya.api.persist.RdfDAOException; -import mvm.rya.api.persist.RyaDAO; -import mvm.rya.api.persist.RyaNamespaceManager; +import org.apache.rya.api.RdfCloudTripleStoreConfiguration; +import org.apache.rya.api.persist.RdfDAOException; +import org.apache.rya.api.persist.RyaDAO; +import org.apache.rya.api.persist.RyaNamespaceManager; import net.sf.ehcache.Cache; import net.sf.ehcache.CacheManager; import net.sf.ehcache.Element; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/sail/src/main/java/org/apache/rya/rdftriplestore/utils/CombineContextsRdfInserter.java ---------------------------------------------------------------------- diff --git a/sail/src/main/java/org/apache/rya/rdftriplestore/utils/CombineContextsRdfInserter.java b/sail/src/main/java/org/apache/rya/rdftriplestore/utils/CombineContextsRdfInserter.java index b7f7623..6a61201 100644 --- a/sail/src/main/java/org/apache/rya/rdftriplestore/utils/CombineContextsRdfInserter.java +++ b/sail/src/main/java/org/apache/rya/rdftriplestore/utils/CombineContextsRdfInserter.java @@ -1,4 +1,4 @@ -package mvm.rya.rdftriplestore.utils; +package org.apache.rya.rdftriplestore.utils; /* * Licensed to the Apache Software Foundation (ASF) under one http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/sail/src/main/java/org/apache/rya/rdftriplestore/utils/DefaultStatistics.java ---------------------------------------------------------------------- diff --git a/sail/src/main/java/org/apache/rya/rdftriplestore/utils/DefaultStatistics.java b/sail/src/main/java/org/apache/rya/rdftriplestore/utils/DefaultStatistics.java index d86140b..94c32d2 100644 --- a/sail/src/main/java/org/apache/rya/rdftriplestore/utils/DefaultStatistics.java +++ b/sail/src/main/java/org/apache/rya/rdftriplestore/utils/DefaultStatistics.java @@ -1,4 +1,4 @@ -package mvm.rya.rdftriplestore.utils; +package org.apache.rya.rdftriplestore.utils; /* * Licensed to the Apache Software Foundation (ASF) under one http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/sail/src/main/java/org/apache/rya/rdftriplestore/utils/FixedStatementPattern.java ---------------------------------------------------------------------- diff --git a/sail/src/main/java/org/apache/rya/rdftriplestore/utils/FixedStatementPattern.java b/sail/src/main/java/org/apache/rya/rdftriplestore/utils/FixedStatementPattern.java index 891e122..bfefe12 100644 --- a/sail/src/main/java/org/apache/rya/rdftriplestore/utils/FixedStatementPattern.java +++ b/sail/src/main/java/org/apache/rya/rdftriplestore/utils/FixedStatementPattern.java @@ -1,4 +1,4 @@ -package mvm.rya.rdftriplestore.utils; +package org.apache.rya.rdftriplestore.utils; /* * Licensed to the Apache Software Foundation (ASF) under one http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/sail/src/main/java/org/apache/rya/rdftriplestore/utils/TransitivePropertySP.java ---------------------------------------------------------------------- diff --git a/sail/src/main/java/org/apache/rya/rdftriplestore/utils/TransitivePropertySP.java b/sail/src/main/java/org/apache/rya/rdftriplestore/utils/TransitivePropertySP.java index 4f2e378..9cdb113 100644 --- a/sail/src/main/java/org/apache/rya/rdftriplestore/utils/TransitivePropertySP.java +++ b/sail/src/main/java/org/apache/rya/rdftriplestore/utils/TransitivePropertySP.java @@ -1,4 +1,4 @@ -package mvm.rya.rdftriplestore.utils; +package org.apache.rya.rdftriplestore.utils; /* * Licensed to the Apache Software Foundation (ASF) under one http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/sail/src/test/java/org/apache/rya/ArbitraryLengthQueryTest.java ---------------------------------------------------------------------- diff --git a/sail/src/test/java/org/apache/rya/ArbitraryLengthQueryTest.java b/sail/src/test/java/org/apache/rya/ArbitraryLengthQueryTest.java index 4a5d871..3b6056f 100644 --- a/sail/src/test/java/org/apache/rya/ArbitraryLengthQueryTest.java +++ b/sail/src/test/java/org/apache/rya/ArbitraryLengthQueryTest.java @@ -1,4 +1,4 @@ -package mvm.rya; +package org.apache.rya; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -41,12 +41,12 @@ import org.openrdf.repository.RepositoryException; import org.openrdf.rio.RDFFormat; import org.openrdf.rio.RDFParseException; -import mvm.rya.accumulo.AccumuloRdfConfiguration; -import mvm.rya.accumulo.AccumuloRyaDAO; -import mvm.rya.rdftriplestore.RdfCloudTripleStore; -import mvm.rya.rdftriplestore.RyaSailRepository; -import mvm.rya.rdftriplestore.inference.InferenceEngine; -import mvm.rya.rdftriplestore.namespace.NamespaceManager; +import org.apache.rya.accumulo.AccumuloRdfConfiguration; +import org.apache.rya.accumulo.AccumuloRyaDAO; +import org.apache.rya.rdftriplestore.RdfCloudTripleStore; +import org.apache.rya.rdftriplestore.RyaSailRepository; +import org.apache.rya.rdftriplestore.inference.InferenceEngine; +import org.apache.rya.rdftriplestore.namespace.NamespaceManager; import junit.framework.TestCase; /** http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/sail/src/test/java/org/apache/rya/HashJoinTest.java ---------------------------------------------------------------------- diff --git a/sail/src/test/java/org/apache/rya/HashJoinTest.java b/sail/src/test/java/org/apache/rya/HashJoinTest.java index bbcdbcd..f011d00 100644 --- a/sail/src/test/java/org/apache/rya/HashJoinTest.java +++ b/sail/src/test/java/org/apache/rya/HashJoinTest.java @@ -1,4 +1,4 @@ -package mvm.rya; +package org.apache.rya; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,14 +23,14 @@ package mvm.rya; import info.aduna.iteration.CloseableIteration; import junit.framework.TestCase; -import mvm.rya.accumulo.AccumuloRdfConfiguration; -import mvm.rya.accumulo.AccumuloRyaDAO; -import mvm.rya.api.RdfCloudTripleStoreUtils; -import mvm.rya.api.domain.RyaStatement; -import mvm.rya.api.domain.RyaType; -import mvm.rya.api.domain.RyaURI; -import mvm.rya.api.persist.RyaDAOException; -import mvm.rya.api.persist.query.join.HashJoin; +import org.apache.rya.accumulo.AccumuloRdfConfiguration; +import org.apache.rya.accumulo.AccumuloRyaDAO; +import org.apache.rya.api.RdfCloudTripleStoreUtils; +import org.apache.rya.api.domain.RyaStatement; +import org.apache.rya.api.domain.RyaType; +import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.persist.RyaDAOException; +import org.apache.rya.api.persist.query.join.HashJoin; import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.client.mock.MockInstance; import org.junit.After; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/sail/src/test/java/org/apache/rya/IterativeJoinTest.java ---------------------------------------------------------------------- diff --git a/sail/src/test/java/org/apache/rya/IterativeJoinTest.java b/sail/src/test/java/org/apache/rya/IterativeJoinTest.java index 610b8eb..c84919e 100644 --- a/sail/src/test/java/org/apache/rya/IterativeJoinTest.java +++ b/sail/src/test/java/org/apache/rya/IterativeJoinTest.java @@ -1,4 +1,4 @@ -package mvm.rya; +package org.apache.rya; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,14 +23,14 @@ package mvm.rya; import info.aduna.iteration.CloseableIteration; import junit.framework.TestCase; -import mvm.rya.accumulo.AccumuloRdfConfiguration; -import mvm.rya.accumulo.AccumuloRyaDAO; -import mvm.rya.api.RdfCloudTripleStoreUtils; -import mvm.rya.api.domain.RyaStatement; -import mvm.rya.api.domain.RyaType; -import mvm.rya.api.domain.RyaURI; -import mvm.rya.api.persist.RyaDAOException; -import mvm.rya.api.persist.query.join.IterativeJoin; +import org.apache.rya.accumulo.AccumuloRdfConfiguration; +import org.apache.rya.accumulo.AccumuloRyaDAO; +import org.apache.rya.api.RdfCloudTripleStoreUtils; +import org.apache.rya.api.domain.RyaStatement; +import org.apache.rya.api.domain.RyaType; +import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.persist.RyaDAOException; +import org.apache.rya.api.persist.query.join.IterativeJoin; import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.client.mock.MockInstance; import org.junit.After; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/sail/src/test/java/org/apache/rya/MergeJoinTest.java ---------------------------------------------------------------------- diff --git a/sail/src/test/java/org/apache/rya/MergeJoinTest.java b/sail/src/test/java/org/apache/rya/MergeJoinTest.java index e4f07c4..d7ac948 100644 --- a/sail/src/test/java/org/apache/rya/MergeJoinTest.java +++ b/sail/src/test/java/org/apache/rya/MergeJoinTest.java @@ -1,4 +1,4 @@ -package mvm.rya; +package org.apache.rya; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -22,13 +22,13 @@ package mvm.rya; import info.aduna.iteration.CloseableIteration; -import mvm.rya.accumulo.AccumuloRdfConfiguration; -import mvm.rya.accumulo.AccumuloRyaDAO; -import mvm.rya.api.domain.RyaStatement; -import mvm.rya.api.domain.RyaType; -import mvm.rya.api.domain.RyaURI; -import mvm.rya.api.persist.RyaDAOException; -import mvm.rya.api.persist.query.join.MergeJoin; +import org.apache.rya.accumulo.AccumuloRdfConfiguration; +import org.apache.rya.accumulo.AccumuloRyaDAO; +import org.apache.rya.api.domain.RyaStatement; +import org.apache.rya.api.domain.RyaType; +import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.persist.RyaDAOException; +import org.apache.rya.api.persist.query.join.MergeJoin; import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.client.mock.MockInstance; import org.junit.After; @@ -40,7 +40,7 @@ import java.util.HashSet; import java.util.Set; import static junit.framework.Assert.*; -import static mvm.rya.api.RdfCloudTripleStoreUtils.CustomEntry; +import static org.apache.rya.api.RdfCloudTripleStoreUtils.CustomEntry; /** * TODO: Move to rya.api when we have proper mock ryaDao http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/sail/src/test/java/org/apache/rya/RdfCloudTripleStoreConnectionTest.java ---------------------------------------------------------------------- diff --git a/sail/src/test/java/org/apache/rya/RdfCloudTripleStoreConnectionTest.java b/sail/src/test/java/org/apache/rya/RdfCloudTripleStoreConnectionTest.java index c806c61..f34129e 100644 --- a/sail/src/test/java/org/apache/rya/RdfCloudTripleStoreConnectionTest.java +++ b/sail/src/test/java/org/apache/rya/RdfCloudTripleStoreConnectionTest.java @@ -16,22 +16,22 @@ * specific language governing permissions and limitations * under the License. */ -package mvm.rya; +package org.apache.rya; -import static mvm.rya.api.RdfCloudTripleStoreConstants.NAMESPACE; +import static org.apache.rya.api.RdfCloudTripleStoreConstants.NAMESPACE; import java.io.InputStream; import java.util.List; import junit.framework.TestCase; -import mvm.rya.accumulo.AccumuloRdfConfiguration; -import mvm.rya.accumulo.AccumuloRyaDAO; -import mvm.rya.api.RdfCloudTripleStoreConfiguration; -import mvm.rya.api.RdfCloudTripleStoreConstants; -import mvm.rya.rdftriplestore.RdfCloudTripleStore; -import mvm.rya.rdftriplestore.RyaSailRepository; -import mvm.rya.rdftriplestore.inference.InferenceEngine; -import mvm.rya.rdftriplestore.namespace.NamespaceManager; +import org.apache.rya.accumulo.AccumuloRdfConfiguration; +import org.apache.rya.accumulo.AccumuloRyaDAO; +import org.apache.rya.api.RdfCloudTripleStoreConfiguration; +import org.apache.rya.api.RdfCloudTripleStoreConstants; +import org.apache.rya.rdftriplestore.RdfCloudTripleStore; +import org.apache.rya.rdftriplestore.RyaSailRepository; +import org.apache.rya.rdftriplestore.inference.InferenceEngine; +import org.apache.rya.rdftriplestore.namespace.NamespaceManager; import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.client.Instance; @@ -214,10 +214,10 @@ public class RdfCloudTripleStoreConnectionTest extends TestCase { conn.add(cpu, loadPerc, ten); conn.commit(); - String query = "PREFIX mvm: <" + NAMESPACE + ">\n" + + String query = "PREFIX org.apache: <" + NAMESPACE + ">\n" + "select * where {" + "?x <" + loadPerc.stringValue() + "> ?o.\n" + - "FILTER(mvm:range(?o, '6', '8'))." + + "FILTER(org.apache:range(?o, '6', '8'))." + "}"; TupleQuery tupleQuery = conn.prepareTupleQuery(QueryLanguage.SPARQL, query); CountTupleHandler cth = new CountTupleHandler(); @@ -240,10 +240,10 @@ public class RdfCloudTripleStoreConnectionTest extends TestCase { conn.add(cpu, loadPerc4, ten); conn.commit(); - String query = "PREFIX mvm: <" + NAMESPACE + ">\n" + + String query = "PREFIX org.apache: <" + NAMESPACE + ">\n" + "select * where {" + "?x ?p ?o.\n" + - "FILTER(mvm:range(?p, <" + loadPerc.stringValue() + ">, <" + loadPerc3.stringValue() + ">))." + + "FILTER(org.apache:range(?p, <" + loadPerc.stringValue() + ">, <" + loadPerc3.stringValue() + ">))." + "}"; TupleQuery tupleQuery = conn.prepareTupleQuery(QueryLanguage.SPARQL, query); CountTupleHandler cth = new CountTupleHandler(); @@ -266,10 +266,10 @@ public class RdfCloudTripleStoreConnectionTest extends TestCase { conn.add(cpu, loadPerc4, ten); conn.commit(); - String query = "PREFIX mvm: <" + NAMESPACE + ">\n" + + String query = "PREFIX org.apache: <" + NAMESPACE + ">\n" + "select * where {" + "<" + cpu.stringValue() + "> ?p ?o.\n" + - "FILTER(mvm:range(?p, <" + loadPerc.stringValue() + ">, <" + loadPerc3.stringValue() + ">))." + + "FILTER(org.apache:range(?p, <" + loadPerc.stringValue() + ">, <" + loadPerc3.stringValue() + ">))." + "}"; TupleQuery tupleQuery = conn.prepareTupleQuery(QueryLanguage.SPARQL, query); CountTupleHandler cth = new CountTupleHandler(); @@ -291,10 +291,10 @@ public class RdfCloudTripleStoreConnectionTest extends TestCase { conn.add(cpu3, loadPerc, ten); conn.commit(); - String query = "PREFIX mvm: <" + NAMESPACE + ">\n" + + String query = "PREFIX org.apache: <" + NAMESPACE + ">\n" + "select * where {" + "?s ?p ?o.\n" + - "FILTER(mvm:range(?s, <" + cpu.stringValue() + ">, <" + cpu2.stringValue() + ">))." + + "FILTER(org.apache:range(?s, <" + cpu.stringValue() + ">, <" + cpu2.stringValue() + ">))." + "}"; TupleQuery tupleQuery = conn.prepareTupleQuery(QueryLanguage.SPARQL, query); CountTupleHandler cth = new CountTupleHandler(); @@ -314,10 +314,10 @@ public class RdfCloudTripleStoreConnectionTest extends TestCase { conn.add(cpu, loadPerc, ten); conn.commit(); - String query = "PREFIX mvm: <" + NAMESPACE + ">\n" + + String query = "PREFIX org.apache: <" + NAMESPACE + ">\n" + "select * where {" + "<" + cpu.stringValue() + "> <" + loadPerc.stringValue() + "> ?o.\n" + - "FILTER(mvm:range(?o, '6', '8'))." + + "FILTER(org.apache:range(?o, '6', '8'))." + "}"; TupleQuery tupleQuery = conn.prepareTupleQuery(QueryLanguage.SPARQL, query); CountTupleHandler cth = new CountTupleHandler(); @@ -337,10 +337,10 @@ public class RdfCloudTripleStoreConnectionTest extends TestCase { conn.add(cpu, loadPerc, ten); conn.commit(); - String query = "PREFIX mvm: <" + NAMESPACE + ">\n" + + String query = "PREFIX org.apache: <" + NAMESPACE + ">\n" + "select * where {" + "?s ?p ?o.\n" + - "FILTER(mvm:range(?o, '6', '8'))." + + "FILTER(org.apache:range(?o, '6', '8'))." + "}"; TupleQuery tupleQuery = conn.prepareTupleQuery(QueryLanguage.SPARQL, query); CountTupleHandler cth = new CountTupleHandler(); @@ -362,7 +362,7 @@ public class RdfCloudTripleStoreConnectionTest extends TestCase { conn.add(cpu, RDF.TYPE, testClass); conn.commit(); - String query = "PREFIX mvm: <" + NAMESPACE + ">\n" + + String query = "PREFIX org.apache: <" + NAMESPACE + ">\n" + "select * where {" + String.format("<%s> ?p ?o.\n", cpu.stringValue()) + "FILTER(regex(?o, '^1'))." + http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/sail/src/test/java/org/apache/rya/RdfCloudTripleStoreTest.java ---------------------------------------------------------------------- diff --git a/sail/src/test/java/org/apache/rya/RdfCloudTripleStoreTest.java b/sail/src/test/java/org/apache/rya/RdfCloudTripleStoreTest.java index eee6bce..fa8e6f5 100644 --- a/sail/src/test/java/org/apache/rya/RdfCloudTripleStoreTest.java +++ b/sail/src/test/java/org/apache/rya/RdfCloudTripleStoreTest.java @@ -1,4 +1,4 @@ -package mvm.rya; +package org.apache.rya; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -22,10 +22,10 @@ package mvm.rya; import junit.framework.TestCase; -import mvm.rya.accumulo.AccumuloRdfConfiguration; -import mvm.rya.accumulo.AccumuloRyaDAO; -import mvm.rya.api.RdfCloudTripleStoreConstants; -import mvm.rya.rdftriplestore.RdfCloudTripleStore; +import org.apache.rya.accumulo.AccumuloRdfConfiguration; +import org.apache.rya.accumulo.AccumuloRyaDAO; +import org.apache.rya.api.RdfCloudTripleStoreConstants; +import org.apache.rya.rdftriplestore.RdfCloudTripleStore; import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.client.mock.MockInstance; import org.openrdf.model.Namespace; @@ -347,8 +347,8 @@ public class RdfCloudTripleStoreTest extends TestCase { public void testEventsForUri() throws Exception { String query = "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>\n" + "PREFIX ns:<" + NAMESPACE + ">\n" + - "PREFIX mvmpart: <urn:mvm.mmrts.partition.rdf/08/2011#>\n" + - "PREFIX mvm: <" + RdfCloudTripleStoreConstants.NAMESPACE + ">\n" + + "PREFIX org.apachepart: <urn:org.apache.mmrts.partition.rdf/08/2011#>\n" + + "PREFIX org.apache: <" + RdfCloudTripleStoreConstants.NAMESPACE + ">\n" + "PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>\n" + "select * where {\n" + "{" + @@ -356,49 +356,49 @@ public class RdfCloudTripleStoreTest extends TestCase { " ?s ns:createdItem ns:objectuuid1.\n" + " ?s ns:performedBy ?pb.\n" + " ?s ns:performedAt ?pa.\n" + - " FILTER(mvm:range(?pa, " + getXmlDate(START) + ", " + getXmlDate(END) + "))\n" + + " FILTER(org.apache:range(?pa, " + getXmlDate(START) + ", " + getXmlDate(END) + "))\n" + "}\n" + "UNION {" + " ?s rdf:type ns:Clicked.\n" + " ?s ns:clickedItem ns:objectuuid1.\n" + " ?s ns:performedBy ?pb.\n" + " ?s ns:performedAt ?pa.\n" + - " FILTER(mvm:range(?pa, " + getXmlDate(START) + ", " + getXmlDate(END) + "))\n" + + " FILTER(org.apache:range(?pa, " + getXmlDate(START) + ", " + getXmlDate(END) + "))\n" + "}\n" + "UNION {" + " ?s rdf:type ns:Deleted.\n" + " ?s ns:deletedItem ns:objectuuid1.\n" + " ?s ns:performedBy ?pb.\n" + " ?s ns:performedAt ?pa.\n" + - " FILTER(mvm:range(?pa, " + getXmlDate(START) + ", " + getXmlDate(END) + "))\n" + + " FILTER(org.apache:range(?pa, " + getXmlDate(START) + ", " + getXmlDate(END) + "))\n" + "}\n" + "UNION {" + " ?s rdf:type ns:Dropped.\n" + " ?s ns:droppedItem ns:objectuuid1.\n" + " ?s ns:performedBy ?pb.\n" + " ?s ns:performedAt ?pa.\n" + - " FILTER(mvm:range(?pa, " + getXmlDate(START) + ", " + getXmlDate(END) + "))\n" + + " FILTER(org.apache:range(?pa, " + getXmlDate(START) + ", " + getXmlDate(END) + "))\n" + "}\n" + "UNION {" + " ?s rdf:type ns:Received.\n" + " ?s ns:receivedItem ns:objectuuid1.\n" + " ?s ns:performedBy ?pb.\n" + " ?s ns:performedAt ?pa.\n" + - " FILTER(mvm:range(?pa, " + getXmlDate(START) + ", " + getXmlDate(END) + "))\n" + + " FILTER(org.apache:range(?pa, " + getXmlDate(START) + ", " + getXmlDate(END) + "))\n" + "}\n" + "UNION {" + " ?s rdf:type ns:Stored.\n" + " ?s ns:storedItem ns:objectuuid1.\n" + " ?s ns:performedBy ?pb.\n" + " ?s ns:performedAt ?pa.\n" + - " FILTER(mvm:range(?pa, " + getXmlDate(START) + ", " + getXmlDate(END) + "))\n" + + " FILTER(org.apache:range(?pa, " + getXmlDate(START) + ", " + getXmlDate(END) + "))\n" + "}\n" + "UNION {" + " ?s rdf:type ns:Sent.\n" + " ?s ns:sentItem ns:objectuuid1.\n" + " ?s ns:performedBy ?pb.\n" + " ?s ns:performedAt ?pa.\n" + - " FILTER(mvm:range(?pa, " + getXmlDate(START) + ", " + getXmlDate(END) + "))\n" + + " FILTER(org.apache:range(?pa, " + getXmlDate(START) + ", " + getXmlDate(END) + "))\n" + "}\n" + "}\n"; TupleQuery tupleQuery = connection.prepareTupleQuery(QueryLanguage.SPARQL, query); @@ -414,51 +414,51 @@ public class RdfCloudTripleStoreTest extends TestCase { public void testAllEvents() throws Exception { String query = "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>\n" + "PREFIX ns:<" + NAMESPACE + ">\n" + - "PREFIX mvmpart: <urn:mvm.mmrts.partition.rdf/08/2011#>\n" + - "PREFIX mvm: <" + RdfCloudTripleStoreConstants.NAMESPACE + ">\n" + + "PREFIX org.apachepart: <urn:org.apache.mmrts.partition.rdf/08/2011#>\n" + + "PREFIX org.apache: <" + RdfCloudTripleStoreConstants.NAMESPACE + ">\n" + "PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>\n" + "select * where {\n" + "{" + " ?s rdf:type ns:Created.\n" + " ?s ns:performedBy ?pb.\n" + " ?s ns:performedAt ?pa.\n" + - " FILTER(mvm:range(?pa, " + getXmlDate(START) + ", " + getXmlDate(END) + "))\n" + + " FILTER(org.apache:range(?pa, " + getXmlDate(START) + ", " + getXmlDate(END) + "))\n" + "}\n" + "UNION {" + " ?s rdf:type ns:Clicked.\n" + " ?s ns:performedBy ?pb.\n" + " ?s ns:performedAt ?pa.\n" + - " FILTER(mvm:range(?pa, " + getXmlDate(START) + ", " + getXmlDate(END) + "))\n" + + " FILTER(org.apache:range(?pa, " + getXmlDate(START) + ", " + getXmlDate(END) + "))\n" + "}\n" + "UNION {" + " ?s rdf:type ns:Deleted.\n" + " ?s ns:performedBy ?pb.\n" + " ?s ns:performedAt ?pa.\n" + - " FILTER(mvm:range(?pa, " + getXmlDate(START) + ", " + getXmlDate(END) + "))\n" + + " FILTER(org.apache:range(?pa, " + getXmlDate(START) + ", " + getXmlDate(END) + "))\n" + "}\n" + "UNION {" + " ?s rdf:type ns:Dropped.\n" + " ?s ns:performedBy ?pb.\n" + " ?s ns:performedAt ?pa.\n" + - " FILTER(mvm:range(?pa, " + getXmlDate(START) + ", " + getXmlDate(END) + "))\n" + + " FILTER(org.apache:range(?pa, " + getXmlDate(START) + ", " + getXmlDate(END) + "))\n" + "}\n" + "UNION {" + " ?s rdf:type ns:Received.\n" + " ?s ns:performedBy ?pb.\n" + " ?s ns:performedAt ?pa.\n" + - " FILTER(mvm:range(?pa, " + getXmlDate(START) + ", " + getXmlDate(END) + "))\n" + + " FILTER(org.apache:range(?pa, " + getXmlDate(START) + ", " + getXmlDate(END) + "))\n" + "}\n" + "UNION {" + " ?s rdf:type ns:Stored.\n" + " ?s ns:performedBy ?pb.\n" + " ?s ns:performedAt ?pa.\n" + - " FILTER(mvm:range(?pa, " + getXmlDate(START) + ", " + getXmlDate(END) + "))\n" + + " FILTER(org.apache:range(?pa, " + getXmlDate(START) + ", " + getXmlDate(END) + "))\n" + "}\n" + "UNION {" + " ?s rdf:type ns:Sent.\n" + " ?s ns:performedBy ?pb.\n" + " ?s ns:performedAt ?pa.\n" + - " FILTER(mvm:range(?pa, " + getXmlDate(START) + ", " + getXmlDate(END) + "))\n" + + " FILTER(org.apache:range(?pa, " + getXmlDate(START) + ", " + getXmlDate(END) + "))\n" + "}\n" + "}\n"; TupleQuery tupleQuery = connection.prepareTupleQuery(QueryLanguage.SPARQL, query); @@ -475,8 +475,8 @@ public class RdfCloudTripleStoreTest extends TestCase { public void testEventsBtwnSystems() throws Exception { //TODO: How to do XMLDateTime ranges String query = "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>\n" + "PREFIX ns:<" + NAMESPACE + ">\n" + - "PREFIX mvmpart: <urn:mvm.mmrts.partition.rdf/08/2011#>\n" + - "PREFIX mvm: <" + RdfCloudTripleStoreConstants.NAMESPACE + ">\n" + + "PREFIX org.apachepart: <urn:org.apache.mmrts.partition.rdf/08/2011#>\n" + + "PREFIX org.apache: <" + RdfCloudTripleStoreConstants.NAMESPACE + ">\n" + "PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>\n" + "select * where {\n" + " ?sendEvent rdf:type ns:Sent;\n" + @@ -487,9 +487,9 @@ public class RdfCloudTripleStoreTest extends TestCase { " ns:receivedItem ?objUuid;\n" + " ns:performedBy <urn:system:E>;\n" + " ns:performedAt ?rpa.\n" + -// " FILTER(mvm:range(?spa, \"2011-07-12T05:12:00.000Z\"^^xsd:dateTime, \"2011-07-12T07:12:00.000Z\"^^xsd:dateTime))\n" + - " FILTER(mvm:range(?spa, " + getXmlDate(START) + ", " + getXmlDate(END) + "))\n" + - " FILTER(mvm:range(?rpa, " + getXmlDate(START) + ", " + getXmlDate(END) + "))\n" + +// " FILTER(org.apache:range(?spa, \"2011-07-12T05:12:00.000Z\"^^xsd:dateTime, \"2011-07-12T07:12:00.000Z\"^^xsd:dateTime))\n" + + " FILTER(org.apache:range(?spa, " + getXmlDate(START) + ", " + getXmlDate(END) + "))\n" + + " FILTER(org.apache:range(?rpa, " + getXmlDate(START) + ", " + getXmlDate(END) + "))\n" + "}\n"; TupleQuery tupleQuery = connection.prepareTupleQuery(QueryLanguage.SPARQL, query); // tupleQuery.setBinding(START_BINDING, vf.createLiteral(START)); @@ -504,15 +504,15 @@ public class RdfCloudTripleStoreTest extends TestCase { public void testHeartbeatCounts() throws Exception { String query = "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>\n" + "PREFIX hns:<" + HBNAMESPACE + ">\n" + - "PREFIX mvmpart: <urn:mvm.mmrts.partition.rdf/08/2011#>\n" + - "PREFIX mvm: <" + RdfCloudTripleStoreConstants.NAMESPACE + ">\n" + + "PREFIX org.apachepart: <urn:org.apache.mmrts.partition.rdf/08/2011#>\n" + + "PREFIX org.apache: <" + RdfCloudTripleStoreConstants.NAMESPACE + ">\n" + "PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>\n" + "select * where {\n" + " ?hb rdf:type hns:HeartbeatMeasurement;\n" + " hns:count ?count;\n" + " hns:timestamp ?ts;\n" + " hns:systemName ?systemName.\n" + - " FILTER(mvm:range(?ts, \"" + START + "\", \"" + (START + 3) + "\"))\n" + + " FILTER(org.apache:range(?ts, \"" + START + "\", \"" + (START + 3) + "\"))\n" + "}\n"; // System.out.println(query); TupleQuery tupleQuery = connection.prepareTupleQuery(QueryLanguage.SPARQL, query); @@ -583,11 +583,11 @@ public class RdfCloudTripleStoreTest extends TestCase { public void testMultiShardLookupTimeRange() throws Exception { //MMRTS-113 String query = "PREFIX hb: <http://here/2010/tracked-data-provenance/heartbeat/ns#>\n" + - "PREFIX mvmpart: <urn:mvm.mmrts.partition.rdf/08/2011#>\n" + + "PREFIX org.apachepart: <urn:org.apache.mmrts.partition.rdf/08/2011#>\n" + "SELECT * WHERE\n" + "{\n" + "?id hb:timestamp ?timestamp.\n" + -// "FILTER(mvmpart:timeRange(?id, hb:timestamp, " + START + " , " + (START + 2) + " , 'TIMESTAMP'))\n" + +// "FILTER(org.apachepart:timeRange(?id, hb:timestamp, " + START + " , " + (START + 2) + " , 'TIMESTAMP'))\n" + "?id hb:count ?count.\n" + "?system hb:heartbeat ?id.\n" + "}"; @@ -601,11 +601,11 @@ public class RdfCloudTripleStoreTest extends TestCase { public void testMultiShardLookupTimeRangeValueConst() throws Exception { //MMRTS-113 String query = "PREFIX hb: <http://here/2010/tracked-data-provenance/heartbeat/ns#>\n" + - "PREFIX mvmpart: <urn:mvm.mmrts.partition.rdf/08/2011#>\n" + + "PREFIX org.apachepart: <urn:org.apache.mmrts.partition.rdf/08/2011#>\n" + "SELECT * WHERE\n" + "{\n" + "<http://here/2010/tracked-data-provenance/heartbeat/ns#hbuuid2> hb:timestamp ?timestamp.\n" + -// "FILTER(mvmpart:timeRange(<http://here/2010/tracked-data-provenance/heartbeat/ns#hbuuid2>, hb:timestamp, " + START + " , " + END + " , 'TIMESTAMP'))\n" + +// "FILTER(org.apachepart:timeRange(<http://here/2010/tracked-data-provenance/heartbeat/ns#hbuuid2>, hb:timestamp, " + START + " , " + END + " , 'TIMESTAMP'))\n" + "<http://here/2010/tracked-data-provenance/heartbeat/ns#hbuuid2> hb:count ?count.\n" + "?system hb:heartbeat <http://here/2010/tracked-data-provenance/heartbeat/ns#hbuuid2>.\n" + "}"; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/sail/src/test/java/org/apache/rya/RdfCloudTripleStoreUtilsTest.java ---------------------------------------------------------------------- diff --git a/sail/src/test/java/org/apache/rya/RdfCloudTripleStoreUtilsTest.java b/sail/src/test/java/org/apache/rya/RdfCloudTripleStoreUtilsTest.java index de49ef2..c80c6c4 100644 --- a/sail/src/test/java/org/apache/rya/RdfCloudTripleStoreUtilsTest.java +++ b/sail/src/test/java/org/apache/rya/RdfCloudTripleStoreUtilsTest.java @@ -17,7 +17,7 @@ * under the License. */ -//package mvm.rya; +//package org.apache.rya; // //import java.util.List; @@ -32,7 +32,7 @@ // //import com.google.common.io.ByteStreams; // -//import static mvm.rya.api.RdfCloudTripleStoreUtils.*; +//import static org.apache.rya.api.RdfCloudTripleStoreUtils.*; // //public class RdfCloudTripleStoreUtilsTest extends TestCase { // http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/sail/src/test/java/org/apache/rya/rdftriplestore/evaluation/QueryJoinSelectOptimizerTest.java ---------------------------------------------------------------------- diff --git a/sail/src/test/java/org/apache/rya/rdftriplestore/evaluation/QueryJoinSelectOptimizerTest.java b/sail/src/test/java/org/apache/rya/rdftriplestore/evaluation/QueryJoinSelectOptimizerTest.java index c97c854..daf446c 100644 --- a/sail/src/test/java/org/apache/rya/rdftriplestore/evaluation/QueryJoinSelectOptimizerTest.java +++ b/sail/src/test/java/org/apache/rya/rdftriplestore/evaluation/QueryJoinSelectOptimizerTest.java @@ -1,4 +1,4 @@ -package mvm.rya.rdftriplestore.evaluation; +package org.apache.rya.rdftriplestore.evaluation; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -27,14 +27,14 @@ import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; -import mvm.rya.accumulo.AccumuloRdfConfiguration; -import mvm.rya.api.RdfCloudTripleStoreConfiguration; -import mvm.rya.api.layout.TablePrefixLayoutStrategy; -import mvm.rya.api.persist.RdfEvalStatsDAO; -import mvm.rya.joinselect.AccumuloSelectivityEvalDAO; -import mvm.rya.prospector.service.ProspectorServiceEvalStatsDAO; -import mvm.rya.rdftriplestore.evaluation.QueryJoinSelectOptimizer; -import mvm.rya.rdftriplestore.evaluation.RdfCloudTripleStoreSelectivityEvaluationStatistics; +import org.apache.rya.accumulo.AccumuloRdfConfiguration; +import org.apache.rya.api.RdfCloudTripleStoreConfiguration; +import org.apache.rya.api.layout.TablePrefixLayoutStrategy; +import org.apache.rya.api.persist.RdfEvalStatsDAO; +import org.apache.rya.joinselect.AccumuloSelectivityEvalDAO; +import org.apache.rya.prospector.service.ProspectorServiceEvalStatsDAO; +import org.apache.rya.rdftriplestore.evaluation.QueryJoinSelectOptimizer; +import org.apache.rya.rdftriplestore.evaluation.RdfCloudTripleStoreSelectivityEvaluationStatistics; import org.apache.accumulo.core.client.AccumuloException; import org.apache.accumulo.core.client.AccumuloSecurityException; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/sail/src/test/java/org/apache/rya/rdftriplestore/evaluation/RdfCloudTripleStoreSelectivityEvaluationStatisticsTest.java ---------------------------------------------------------------------- diff --git a/sail/src/test/java/org/apache/rya/rdftriplestore/evaluation/RdfCloudTripleStoreSelectivityEvaluationStatisticsTest.java b/sail/src/test/java/org/apache/rya/rdftriplestore/evaluation/RdfCloudTripleStoreSelectivityEvaluationStatisticsTest.java index c5f56cf..bac1b11 100644 --- a/sail/src/test/java/org/apache/rya/rdftriplestore/evaluation/RdfCloudTripleStoreSelectivityEvaluationStatisticsTest.java +++ b/sail/src/test/java/org/apache/rya/rdftriplestore/evaluation/RdfCloudTripleStoreSelectivityEvaluationStatisticsTest.java @@ -1,4 +1,4 @@ -package mvm.rya.rdftriplestore.evaluation; +package org.apache.rya.rdftriplestore.evaluation; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -27,12 +27,12 @@ import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; -import mvm.rya.accumulo.AccumuloRdfConfiguration; -import mvm.rya.api.RdfCloudTripleStoreConfiguration; -import mvm.rya.api.layout.TablePrefixLayoutStrategy; -import mvm.rya.api.persist.RdfEvalStatsDAO; -import mvm.rya.joinselect.AccumuloSelectivityEvalDAO; -import mvm.rya.prospector.service.ProspectorServiceEvalStatsDAO; +import org.apache.rya.accumulo.AccumuloRdfConfiguration; +import org.apache.rya.api.RdfCloudTripleStoreConfiguration; +import org.apache.rya.api.layout.TablePrefixLayoutStrategy; +import org.apache.rya.api.persist.RdfEvalStatsDAO; +import org.apache.rya.joinselect.AccumuloSelectivityEvalDAO; +import org.apache.rya.prospector.service.ProspectorServiceEvalStatsDAO; import org.apache.accumulo.core.client.AccumuloException; import org.apache.accumulo.core.client.AccumuloSecurityException; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/sail/src/test/java/org/apache/rya/triplestore/inference/PropertyChainTest.java ---------------------------------------------------------------------- diff --git a/sail/src/test/java/org/apache/rya/triplestore/inference/PropertyChainTest.java b/sail/src/test/java/org/apache/rya/triplestore/inference/PropertyChainTest.java index 3aab403..3a53b3d 100644 --- a/sail/src/test/java/org/apache/rya/triplestore/inference/PropertyChainTest.java +++ b/sail/src/test/java/org/apache/rya/triplestore/inference/PropertyChainTest.java @@ -1,4 +1,4 @@ -package mvm.rya.triplestore.inference; +package org.apache.rya.triplestore.inference; /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -36,12 +36,12 @@ import org.openrdf.repository.sail.SailRepository; import org.openrdf.repository.sail.SailRepositoryConnection; import junit.framework.TestCase; -import mvm.rya.accumulo.AccumuloRdfConfiguration; -import mvm.rya.accumulo.AccumuloRyaDAO; -import mvm.rya.api.RdfCloudTripleStoreConstants; -import mvm.rya.rdftriplestore.RdfCloudTripleStore; -import mvm.rya.rdftriplestore.inference.InferenceEngine; -import mvm.rya.rdftriplestore.inference.InverseURI; +import org.apache.rya.accumulo.AccumuloRdfConfiguration; +import org.apache.rya.accumulo.AccumuloRyaDAO; +import org.apache.rya.api.RdfCloudTripleStoreConstants; +import org.apache.rya.rdftriplestore.RdfCloudTripleStore; +import org.apache.rya.rdftriplestore.inference.InferenceEngine; +import org.apache.rya.rdftriplestore.inference.InverseURI; /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/sail/src/test/java/org/apache/rya/triplestore/inference/SameAsTest.java ---------------------------------------------------------------------- diff --git a/sail/src/test/java/org/apache/rya/triplestore/inference/SameAsTest.java b/sail/src/test/java/org/apache/rya/triplestore/inference/SameAsTest.java index d214123..a861392 100644 --- a/sail/src/test/java/org/apache/rya/triplestore/inference/SameAsTest.java +++ b/sail/src/test/java/org/apache/rya/triplestore/inference/SameAsTest.java @@ -1,4 +1,4 @@ -package mvm.rya.triplestore.inference; +package org.apache.rya.triplestore.inference; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,12 +23,12 @@ package mvm.rya.triplestore.inference; import info.aduna.iteration.Iterations; import junit.framework.TestCase; -import mvm.rya.accumulo.AccumuloRdfConfiguration; -import mvm.rya.accumulo.AccumuloRyaDAO; -import mvm.rya.api.RdfCloudTripleStoreConstants; -import mvm.rya.api.resolver.RdfToRyaConversions; -import mvm.rya.rdftriplestore.RdfCloudTripleStore; -import mvm.rya.rdftriplestore.inference.InferenceEngine; +import org.apache.rya.accumulo.AccumuloRdfConfiguration; +import org.apache.rya.accumulo.AccumuloRyaDAO; +import org.apache.rya.api.RdfCloudTripleStoreConstants; +import org.apache.rya.api.resolver.RdfToRyaConversions; +import org.apache.rya.rdftriplestore.RdfCloudTripleStore; +import org.apache.rya.rdftriplestore.inference.InferenceEngine; import org.apache.accumulo.core.Constants; import org.apache.accumulo.core.client.Connector; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/web/web.rya/src/main/java/org/apache/cloud/rdf/web/cloudbase/sail/AbstractRDFWebServlet.java ---------------------------------------------------------------------- diff --git a/web/web.rya/src/main/java/org/apache/cloud/rdf/web/cloudbase/sail/AbstractRDFWebServlet.java b/web/web.rya/src/main/java/org/apache/cloud/rdf/web/cloudbase/sail/AbstractRDFWebServlet.java index 313a3c3..b94af1e 100644 --- a/web/web.rya/src/main/java/org/apache/cloud/rdf/web/cloudbase/sail/AbstractRDFWebServlet.java +++ b/web/web.rya/src/main/java/org/apache/cloud/rdf/web/cloudbase/sail/AbstractRDFWebServlet.java @@ -17,13 +17,13 @@ * under the License. */ -//package mvm.cloud.rdf.web.cloudbase.sail; +//package org.apache.cloud.rdf.web.cloudbase.sail; // //import cloudbase.core.client.Connector; //import cloudbase.core.client.ZooKeeperInstance; -//import mvm.rya.cloudbase.CloudbaseRdfDAO; -//import mvm.rya.cloudbase.CloudbaseRdfEvalStatsDAO; +//import org.apache.rya.cloudbase.CloudbaseRdfDAO; +//import org.apache.rya.cloudbase.CloudbaseRdfEvalStatsDAO; //import RdfCloudTripleStore; //import org.openrdf.repository.Repository; //import org.openrdf.repository.RepositoryException; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/web/web.rya/src/main/java/org/apache/cloud/rdf/web/cloudbase/sail/DeleteDataServlet.java ---------------------------------------------------------------------- diff --git a/web/web.rya/src/main/java/org/apache/cloud/rdf/web/cloudbase/sail/DeleteDataServlet.java b/web/web.rya/src/main/java/org/apache/cloud/rdf/web/cloudbase/sail/DeleteDataServlet.java index 661fe38..7cff739 100644 --- a/web/web.rya/src/main/java/org/apache/cloud/rdf/web/cloudbase/sail/DeleteDataServlet.java +++ b/web/web.rya/src/main/java/org/apache/cloud/rdf/web/cloudbase/sail/DeleteDataServlet.java @@ -17,7 +17,7 @@ * under the License. */ -//package mvm.cloud.rdf.web.cloudbase.sail; +//package org.apache.cloud.rdf.web.cloudbase.sail; // //import org.openrdf.query.QueryLanguage; @@ -47,7 +47,7 @@ // // query data // TupleQuery tupleQuery = conn.prepareTupleQuery( // QueryLanguage.SPARQL, query_s); -// TupleQueryResultWriter deleter = new mvm.mmrts.rdftriplestore.QueryResultsDeleter(conn); +// TupleQueryResultWriter deleter = new org.apache.mmrts.rdftriplestore.QueryResultsDeleter(conn); // tupleQuery.evaluate(deleter); // // } catch (Exception e) { http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/web/web.rya/src/main/java/org/apache/cloud/rdf/web/cloudbase/sail/LoadDataServlet.java ---------------------------------------------------------------------- diff --git a/web/web.rya/src/main/java/org/apache/cloud/rdf/web/cloudbase/sail/LoadDataServlet.java b/web/web.rya/src/main/java/org/apache/cloud/rdf/web/cloudbase/sail/LoadDataServlet.java index 175ef2a..17e3478 100644 --- a/web/web.rya/src/main/java/org/apache/cloud/rdf/web/cloudbase/sail/LoadDataServlet.java +++ b/web/web.rya/src/main/java/org/apache/cloud/rdf/web/cloudbase/sail/LoadDataServlet.java @@ -17,7 +17,7 @@ * under the License. */ -//package mvm.cloud.rdf.web.cloudbase.sail; +//package org.apache.cloud.rdf.web.cloudbase.sail; // //import org.openrdf.model.Resource; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/web/web.rya/src/main/java/org/apache/cloud/rdf/web/cloudbase/sail/QueryDataServlet.java ---------------------------------------------------------------------- diff --git a/web/web.rya/src/main/java/org/apache/cloud/rdf/web/cloudbase/sail/QueryDataServlet.java b/web/web.rya/src/main/java/org/apache/cloud/rdf/web/cloudbase/sail/QueryDataServlet.java index dfcd035..fdc0598 100644 --- a/web/web.rya/src/main/java/org/apache/cloud/rdf/web/cloudbase/sail/QueryDataServlet.java +++ b/web/web.rya/src/main/java/org/apache/cloud/rdf/web/cloudbase/sail/QueryDataServlet.java @@ -17,7 +17,7 @@ * under the License. */ -//package mvm.cloud.rdf.web.cloudbase.sail; +//package org.apache.cloud.rdf.web.cloudbase.sail; // //import RdfCloudTripleStoreConstants; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/web/web.rya/src/main/java/org/apache/cloud/rdf/web/cloudbase/sail/QuerySerqlDataServlet.java ---------------------------------------------------------------------- diff --git a/web/web.rya/src/main/java/org/apache/cloud/rdf/web/cloudbase/sail/QuerySerqlDataServlet.java b/web/web.rya/src/main/java/org/apache/cloud/rdf/web/cloudbase/sail/QuerySerqlDataServlet.java index b1eb5e3..89dd84a 100644 --- a/web/web.rya/src/main/java/org/apache/cloud/rdf/web/cloudbase/sail/QuerySerqlDataServlet.java +++ b/web/web.rya/src/main/java/org/apache/cloud/rdf/web/cloudbase/sail/QuerySerqlDataServlet.java @@ -17,7 +17,7 @@ * under the License. */ -//package mvm.cloud.rdf.web.cloudbase.sail; +//package org.apache.cloud.rdf.web.cloudbase.sail; // //import org.openrdf.query.GraphQuery; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/web/web.rya/src/main/java/org/apache/cloud/rdf/web/cloudbase/sail/RDFWebConstants.java ---------------------------------------------------------------------- diff --git a/web/web.rya/src/main/java/org/apache/cloud/rdf/web/cloudbase/sail/RDFWebConstants.java b/web/web.rya/src/main/java/org/apache/cloud/rdf/web/cloudbase/sail/RDFWebConstants.java index 16cfe71..49c32fb 100644 --- a/web/web.rya/src/main/java/org/apache/cloud/rdf/web/cloudbase/sail/RDFWebConstants.java +++ b/web/web.rya/src/main/java/org/apache/cloud/rdf/web/cloudbase/sail/RDFWebConstants.java @@ -17,7 +17,7 @@ * under the License. */ -//package mvm.cloud.rdf.web.cloudbase.sail; +//package org.apache.cloud.rdf.web.cloudbase.sail; // ///** http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/web/web.rya/src/main/java/org/apache/cloud/rdf/web/sail/RdfController.java ---------------------------------------------------------------------- diff --git a/web/web.rya/src/main/java/org/apache/cloud/rdf/web/sail/RdfController.java b/web/web.rya/src/main/java/org/apache/cloud/rdf/web/sail/RdfController.java index 41be580..93c5972 100644 --- a/web/web.rya/src/main/java/org/apache/cloud/rdf/web/sail/RdfController.java +++ b/web/web.rya/src/main/java/org/apache/cloud/rdf/web/sail/RdfController.java @@ -1,4 +1,4 @@ -package mvm.cloud.rdf.web.sail; +package org.apache.cloud.rdf.web.sail; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,7 +21,7 @@ package mvm.cloud.rdf.web.sail; -import static mvm.rya.api.RdfCloudTripleStoreConstants.VALUE_FACTORY; +import static org.apache.rya.api.RdfCloudTripleStoreConstants.VALUE_FACTORY; import java.io.IOException; import java.io.StringReader; @@ -34,9 +34,9 @@ import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import mvm.rya.api.security.SecurityProvider; -import mvm.rya.api.RdfCloudTripleStoreConfiguration; -import mvm.rya.rdftriplestore.RdfCloudTripleStoreConnection; +import org.apache.rya.api.security.SecurityProvider; +import org.apache.rya.api.RdfCloudTripleStoreConfiguration; +import org.apache.rya.rdftriplestore.RdfCloudTripleStoreConnection; import org.openrdf.model.Resource; import org.openrdf.model.Statement; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/web/web.rya/src/main/java/org/apache/cloud/rdf/web/sail/ResultFormat.java ---------------------------------------------------------------------- diff --git a/web/web.rya/src/main/java/org/apache/cloud/rdf/web/sail/ResultFormat.java b/web/web.rya/src/main/java/org/apache/cloud/rdf/web/sail/ResultFormat.java index 7e763d5..6564971 100644 --- a/web/web.rya/src/main/java/org/apache/cloud/rdf/web/sail/ResultFormat.java +++ b/web/web.rya/src/main/java/org/apache/cloud/rdf/web/sail/ResultFormat.java @@ -1,4 +1,4 @@ -package mvm.cloud.rdf.web.sail; +package org.apache.cloud.rdf.web.sail; /* * Licensed to the Apache Software Foundation (ASF) under one http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/web/web.rya/src/main/java/org/apache/cloud/rdf/web/sail/SecurityProviderImpl.java ---------------------------------------------------------------------- diff --git a/web/web.rya/src/main/java/org/apache/cloud/rdf/web/sail/SecurityProviderImpl.java b/web/web.rya/src/main/java/org/apache/cloud/rdf/web/sail/SecurityProviderImpl.java index 58fc0f4..99b3088 100644 --- a/web/web.rya/src/main/java/org/apache/cloud/rdf/web/sail/SecurityProviderImpl.java +++ b/web/web.rya/src/main/java/org/apache/cloud/rdf/web/sail/SecurityProviderImpl.java @@ -1,4 +1,4 @@ -package mvm.cloud.rdf.web.sail; +package org.apache.cloud.rdf.web.sail; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -22,7 +22,7 @@ package mvm.cloud.rdf.web.sail; import javax.servlet.http.HttpServletRequest; -import mvm.rya.api.security.SecurityProvider; +import org.apache.rya.api.security.SecurityProvider; public class SecurityProviderImpl implements SecurityProvider{ http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/web/web.rya/src/test/java/org/apache/cloud/rdf/web/cloudbase/sail/DeleteDataServletRun.java ---------------------------------------------------------------------- diff --git a/web/web.rya/src/test/java/org/apache/cloud/rdf/web/cloudbase/sail/DeleteDataServletRun.java b/web/web.rya/src/test/java/org/apache/cloud/rdf/web/cloudbase/sail/DeleteDataServletRun.java index 061bda9..0935da5 100644 --- a/web/web.rya/src/test/java/org/apache/cloud/rdf/web/cloudbase/sail/DeleteDataServletRun.java +++ b/web/web.rya/src/test/java/org/apache/cloud/rdf/web/cloudbase/sail/DeleteDataServletRun.java @@ -1,4 +1,4 @@ -package mvm.cloud.rdf.web.cloudbase.sail; +package org.apache.cloud.rdf.web.cloudbase.sail; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -42,45 +42,45 @@ public class DeleteDataServletRun { // " ?obj <http://www.w3.org/2000/01/rdf-schema#label> ?label }"; long dayBefore = System.currentTimeMillis() - 86400000; System.out.println(dayBefore); -// String query = "SELECT DISTINCT ?obj WHERE { ?serv <http://mvm.com/rdf/mm/relatesTo> <http://mvm.com/rdf/mm/LTS::stratus30> . " + -// " ?serv <http://mvm.com/rdf/mm/relatesTo> ?obj ." + -// " ?serv <http://mvm.com/rdf/mm/timestamp> ?ts ." + +// String query = "SELECT DISTINCT ?obj WHERE { ?serv <http://org.apache.com/rdf/mm/relatesTo> <http://org.apache.com/rdf/mm/LTS::stratus30> . " + +// " ?serv <http://org.apache.com/rdf/mm/relatesTo> ?obj ." + +// " ?serv <http://org.apache.com/rdf/mm/timestamp> ?ts ." + //// " FILTER (?ts >= '"+dayBefore+"') " + // " }" + // " ORDER BY ?obj "; - String giveAllClusters = "SELECT DISTINCT ?uu WHERE { ?uu <http://mvm.com/rdf/mm/relatesTo> ?obj . " + + String giveAllClusters = "SELECT DISTINCT ?uu WHERE { ?uu <http://org.apache.com/rdf/mm/relatesTo> ?obj . " + " }" + " ORDER BY ?uu "; -// String query = "SELECT DISTINCT ?obj WHERE { <http://mvm.com/rdf/mm/1a4eaa7c-842c-456a-94c0-6547de6be841> <http://mvm.com/rdf/mm/relatesTo> ?obj . " + +// String query = "SELECT DISTINCT ?obj WHERE { <http://org.apache.com/rdf/mm/1a4eaa7c-842c-456a-94c0-6547de6be841> <http://org.apache.com/rdf/mm/relatesTo> ?obj . " + // " }" + // " ORDER BY ?obj "; //hasfunction query - String hasFunctionQuery = "SELECT DISTINCT ?obj WHERE { ?uu <http://mvm.com/rdf/mm/hasFunction> <http://mvm.com/rdf/mm/america> . " + - " ?uu <http://mvm.com/rdf/mm/relatesTo> ?obj" + + String hasFunctionQuery = "SELECT DISTINCT ?obj WHERE { ?uu <http://org.apache.com/rdf/mm/hasFunction> <http://org.apache.com/rdf/mm/america> . " + + " ?uu <http://org.apache.com/rdf/mm/relatesTo> ?obj" + " }" + " ORDER BY ?obj "; - String allFunctions = "SELECT DISTINCT ?func ?obj WHERE { ?uu <http://mvm.com/rdf/mm/hasFunction> ?func . " + - " ?uu <http://mvm.com/rdf/mm/relatesTo> ?obj" + + String allFunctions = "SELECT DISTINCT ?func ?obj WHERE { ?uu <http://org.apache.com/rdf/mm/hasFunction> ?func . " + + " ?uu <http://org.apache.com/rdf/mm/relatesTo> ?obj" + " }" + " ORDER BY ?func "; - String allFunctionsThresh = "SELECT DISTINCT ?func ?obj ?thresh WHERE { ?uu <http://mvm.com/rdf/mm/hasFunction> ?func . " + - " ?uu <http://mvm.com/rdf/mm/relatesTo> ?obj ." + - " ?uu <http://mvm.com/rdf/mm/threshold> ?thresh" + + String allFunctionsThresh = "SELECT DISTINCT ?func ?obj ?thresh WHERE { ?uu <http://org.apache.com/rdf/mm/hasFunction> ?func . " + + " ?uu <http://org.apache.com/rdf/mm/relatesTo> ?obj ." + + " ?uu <http://org.apache.com/rdf/mm/threshold> ?thresh" + " }" + " ORDER BY ?func "; - String cwdQuery = "SELECT DISTINCT ?obj ?packname WHERE { ?subj <urn:mvm.cwd/2.0/man/uuid> ?obj . " + - " ?subj <urn:mvm.cwd/2.0/man/installedPackages> ?instPacks ." + - " ?instPacks <urn:mvm.cwd/2.0/man/package> ?packid ." + - " ?packid <urn:mvm.cwd/2.0/man/name> ?packname } "; + String cwdQuery = "SELECT DISTINCT ?obj ?packname WHERE { ?subj <urn:org.apache.cwd/2.0/man/uuid> ?obj . " + + " ?subj <urn:org.apache.cwd/2.0/man/installedPackages> ?instPacks ." + + " ?instPacks <urn:org.apache.cwd/2.0/man/package> ?packid ." + + " ?packid <urn:org.apache.cwd/2.0/man/name> ?packname } "; - String cwdAllServersQuery = "SELECT DISTINCT ?obj WHERE { ?subj <urn:mvm.cwd/2.0/man/uuid> ?obj } "; + String cwdAllServersQuery = "SELECT DISTINCT ?obj WHERE { ?subj <urn:org.apache.cwd/2.0/man/uuid> ?obj } "; // rearrange for better filter // 0.124s @@ -157,7 +157,7 @@ public class DeleteDataServletRun { " }"; String bongoAllCollections = "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>\n" + - " PREFIX bg: <http://mvm.com/rdf/bongo/bongo.owl#>\n" + + " PREFIX bg: <http://org.apache.com/rdf/bongo/bongo.owl#>\n" + " SELECT * WHERE\n" + " {\n" + " ?x rdf:type bg:Collection .\n" + @@ -168,7 +168,7 @@ public class DeleteDataServletRun { " }"; String bongoEntriesForCategory = "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>\n" + - " PREFIX bg: <http://mvm.com/rdf/bongo/bongo.owl#>\n" + + " PREFIX bg: <http://org.apache.com/rdf/bongo/bongo.owl#>\n" + " SELECT ?uniqueid WHERE\n" + " {\n" + " ?entryid bg:inCollection bg:CollA .\n" + @@ -179,7 +179,7 @@ public class DeleteDataServletRun { " }"; String bongoEntriesForAuthor = "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>\n" + - " PREFIX bg: <http://mvm.com/rdf/bongo/bongo.owl#>\n" + + " PREFIX bg: <http://org.apache.com/rdf/bongo/bongo.owl#>\n" + " SELECT ?uniqueid WHERE\n" + " {\n" + " ?entryid bg:inCollection bg:CollA .\n" + @@ -190,7 +190,7 @@ public class DeleteDataServletRun { " }"; String bongoEntriesForModifiedTime = "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>\n" + - " PREFIX bg: <http://mvm.com/rdf/bongo/bongo.owl#>\n" + + " PREFIX bg: <http://org.apache.com/rdf/bongo/bongo.owl#>\n" + " PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>\n" + " SELECT DISTINCT ?entryid WHERE\n" + " {\n" + @@ -201,7 +201,7 @@ public class DeleteDataServletRun { " FILTER (xsd:dateTime(?modifiedTime) >= \"2011-10-21T13:18:30\"^^xsd:dateTime) \n" + " }"; String bongoEntriesSortTitle = "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>\n" + - " PREFIX bg: <http://mvm.com/rdf/bongo/bongo.owl#>\n" + + " PREFIX bg: <http://org.apache.com/rdf/bongo/bongo.owl#>\n" + " PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>\n" + " SELECT DISTINCT ?uniqueid WHERE\n" + " {\n" + @@ -212,7 +212,7 @@ public class DeleteDataServletRun { " } ORDER BY ?title"; String bongoEntriesForTitle = "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>\n" + - " PREFIX bg: <http://mvm.com/rdf/bongo/bongo.owl#>\n" + + " PREFIX bg: <http://org.apache.com/rdf/bongo/bongo.owl#>\n" + " PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>\n" + " SELECT DISTINCT ?uniqueid WHERE\n" + " {\n" + @@ -223,7 +223,7 @@ public class DeleteDataServletRun { " FILTER (regex(?title,\"Entry1Title\")) }"; String bongoQuery = "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>\n" + - " PREFIX bg: <http://mvm.com/rdf/bongo/bongo.owl#>\n" + + " PREFIX bg: <http://org.apache.com/rdf/bongo/bongo.owl#>\n" + " SELECT * WHERE\n" + " {\n" + " ?col rdf:type bg:Collection .\n" + @@ -235,7 +235,7 @@ public class DeleteDataServletRun { " }"; String bongoAllEntriesInCollection = "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>\n" + - " PREFIX bg: <http://mvm.com/rdf/bongo/bongo.owl#>\n" + + " PREFIX bg: <http://org.apache.com/rdf/bongo/bongo.owl#>\n" + " SELECT * WHERE\n" + " {\n" + " ?y bg:inCollection bg:CollA .\n" + @@ -246,7 +246,7 @@ public class DeleteDataServletRun { " }"; String bongoAllForEntry1 = "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>\n" + - " PREFIX bg: <http://mvm.com/rdf/bongo/bongo.owl#>\n" + + " PREFIX bg: <http://org.apache.com/rdf/bongo/bongo.owl#>\n" + " SELECT * WHERE\n" + " {\n" + " bg:EntryM rdf:type bg:Entry .\n" + @@ -267,14 +267,14 @@ public class DeleteDataServletRun { " }"; String bongoEntryAllAuthors = "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>\n" + - " PREFIX bg: <http://mvm.com/rdf/bongo/bongo.owl#>\n" + + " PREFIX bg: <http://org.apache.com/rdf/bongo/bongo.owl#>\n" + " SELECT * WHERE\n" + " {\n" + " bg:Entry1 bg:hasAuthor ?y .\n" + " }"; String bongoEntriesModAfter = "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>\n" + - " PREFIX bg: <http://mvm.com/rdf/bongo/bongo.owl#>\n" + + " PREFIX bg: <http://org.apache.com/rdf/bongo/bongo.owl#>\n" + " PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>\n" + " SELECT * WHERE\n" + " {\n" + @@ -283,7 +283,7 @@ public class DeleteDataServletRun { " }"; String cimData = "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>\n" + - " PREFIX mm: <http://mvm.com/owl/mm.owl#>\n" + + " PREFIX mm: <http://org.apache.com/owl/mm.owl#>\n" + " PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>\n" + " SELECT * WHERE\n" + " {\n" + @@ -293,30 +293,30 @@ public class DeleteDataServletRun { " }"; String cimData2 = "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>\n" + - " PREFIX mm: <http://mvm.com/owl/mm.owl#>\n" + - " PREFIX mmcs: <http://mvm.com/owl/mm.owl#urn:uuid:some:>\n" + + " PREFIX mm: <http://org.apache.com/owl/mm.owl#>\n" + + " PREFIX mmcs: <http://org.apache.com/owl/mm.owl#urn:uuid:some:>\n" + " SELECT ?pred ?obj WHERE {\n" + " mmcs:computersystem ?pred ?obj\n" + " }"; String cimData3 = "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>\n" + "SELECT ?pred ?obj WHERE {\n" + - "<http://mvm.com/owl/mm.owl#urn:mm:mvm:lts:root/cimv2:PG_OperatingSystem.CreationClassName=CIM_OperatingSystem,CSCreationClassName=CIM_UnitaryComputerSystem,CSName=nimbus02.bullpen.net,Name=Red_Hat_Enterprise_Linux_Server> ?pred ?obj\n" + + "<http://org.apache.com/owl/mm.owl#urn:mm:org.apache:lts:root/cimv2:PG_OperatingSystem.CreationClassName=CIM_OperatingSystem,CSCreationClassName=CIM_UnitaryComputerSystem,CSName=nimbus02.bullpen.net,Name=Red_Hat_Enterprise_Linux_Server> ?pred ?obj\n" + "}"; String cimHasInstalledSoftware = "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>\n" + - "PREFIX mm: <http://mvm.com/owl/2010/10/mm.owl#>\n" + + "PREFIX mm: <http://org.apache.com/owl/2010/10/mm.owl#>\n" + "SELECT DISTINCT ?obj ?name ?caption WHERE {\n" + -// " <http://mvm.com/owl/2010/10/mm.owl#urn:mm:mvm:LTS:root/cimv2:PG_OperatingSystem:CIM_ComputerSystem:stratus06.bullpen.net:Red_Hat_Enterprise_Linux_Server> mm:hasInstalledSoftware ?obj .\n" + +// " <http://org.apache.com/owl/2010/10/mm.owl#urn:mm:org.apache:LTS:root/cimv2:PG_OperatingSystem:CIM_ComputerSystem:stratus06.bullpen.net:Red_Hat_Enterprise_Linux_Server> mm:hasInstalledSoftware ?obj .\n" + " ?serv mm:hasInstalledSoftware ?obj .\n" + " ?obj mm:name ?name ;\n" + " mm:caption ?caption .\n" + "}"; String cimHasRunningSoftware = "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>\n" + - "PREFIX mm: <http://mvm.com/owl/2010/10/mm.owl#>\n" + + "PREFIX mm: <http://org.apache.com/owl/2010/10/mm.owl#>\n" + "SELECT * WHERE {\n" + - " <http://mvm.com/owl/2010/10/mm.owl#urn:mm:mvm:LTS:root/cimv2:PG_OperatingSystem:CIM_ComputerSystem:stratus10:Red_Hat_Enterprise_Linux_Server> mm:hasRunningProcess ?obj .\n" + + " <http://org.apache.com/owl/2010/10/mm.owl#urn:mm:org.apache:LTS:root/cimv2:PG_OperatingSystem:CIM_ComputerSystem:stratus10:Red_Hat_Enterprise_Linux_Server> mm:hasRunningProcess ?obj .\n" + " ?obj mm:name ?name ; \n" + " mm:handle ?handle ; \n" + " mm:description ?description ; \n" + @@ -325,28 +325,28 @@ public class DeleteDataServletRun { "}"; String cimCpu = "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>\n" + - "PREFIX mm: <http://mvm.com/owl/2010/10/mm.owl#>\n" + + "PREFIX mm: <http://org.apache.com/owl/2010/10/mm.owl#>\n" + "SELECT * \n" + "WHERE {\n" + - " <http://mvm.com/owl/2010/10/mm.owl#urn:mm:mvm:LTS:root/cimv2:CIM_ComputerSystem:stratus10> mm:hasProcessor ?obj .\n" + + " <http://org.apache.com/owl/2010/10/mm.owl#urn:mm:org.apache:LTS:root/cimv2:CIM_ComputerSystem:stratus10> mm:hasProcessor ?obj .\n" + " ?obj mm:maxClockSpeed ?speed .\n" + " ?obj mm:loadPercentage ?load .\n" + " ?obj mm:elementName ?type ." + "}"; String cimCpuLoad = "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>\n" + - "PREFIX mm: <http://mvm.com/owl/2010/10/mm.owl#>\n" + + "PREFIX mm: <http://org.apache.com/owl/2010/10/mm.owl#>\n" + "SELECT * \n" + "WHERE {\n" + - " <http://mvm.com/owl/2010/10/mm.owl#urn:mm:mvm:LTS:root/cimv2:CIM_ComputerSystem:stratus10> mm:hasProcessor ?obj .\n" + + " <http://org.apache.com/owl/2010/10/mm.owl#urn:mm:org.apache:LTS:root/cimv2:CIM_ComputerSystem:stratus10> mm:hasProcessor ?obj .\n" + " ?obj mm:loadPercentage ?load ." + "}"; String cimHasFileSystem = "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>\n" + - "PREFIX mm: <http://mvm.com/owl/2010/10/mm.owl#>\n" + + "PREFIX mm: <http://org.apache.com/owl/2010/10/mm.owl#>\n" + "SELECT * WHERE {\n" + -// " <http://mvm.com/owl/2010/10/mm.owl#urn:mm:mvm:LTS:root/cimv2:PG_OperatingSystem:CIM_ComputerSystem:stratus10:Red_Hat_Enterprise_Linux_Server> mm:hasFileSystem ?obj ." + +// " <http://org.apache.com/owl/2010/10/mm.owl#urn:mm:org.apache:LTS:root/cimv2:PG_OperatingSystem:CIM_ComputerSystem:stratus10:Red_Hat_Enterprise_Linux_Server> mm:hasFileSystem ?obj ." + " ?serv mm:hasFileSystem ?obj ." + " ?obj mm:availableSpace ?available .\n" + " ?obj mm:fileSystemSize ?size .\n" + @@ -354,8 +354,8 @@ public class DeleteDataServletRun { "}"; String clusterKolm = "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>\n" + - "PREFIX mm: <http://mvm.com/owl/2010/10/mm.owl#>\n" + - "PREFIX kolm: <http://mvm.com/lrn/2010/11/kolm#>\n" + + "PREFIX mm: <http://org.apache.com/owl/2010/10/mm.owl#>\n" + + "PREFIX kolm: <http://org.apache.com/lrn/2010/11/kolm#>\n" + "SELECT ?name ?cluster ?srv ?ncd ?thresh ?ts WHERE {\n" + " ?cluster kolm:relatesTo ?pt ;\n" + " kolm:threshold ?thresh .\n" + @@ -367,8 +367,8 @@ public class DeleteDataServletRun { " ORDER BY ?cluster ?srv ?ncd"; String clusterKolm2 = "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>\n" + - "PREFIX mm: <http://mvm.com/owl/2010/10/mm.owl#>\n" + - "PREFIX kolm: <http://mvm.com/lrn/2010/11/kolm#>\n" + + "PREFIX mm: <http://org.apache.com/owl/2010/10/mm.owl#>\n" + + "PREFIX kolm: <http://org.apache.com/lrn/2010/11/kolm#>\n" + "SELECT ?cserv ?srv ?ncd ?thresh ?ts WHERE {\n" + " ?cpt kolm:ncd \"0.0\" .\n" + " ?cpt kolm:serverRef ?cserv .\n" + @@ -385,8 +385,8 @@ public class DeleteDataServletRun { " ORDER BY ?cserv ?ncd ?srv"; String clusterKolmOtherClusters = "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>\n" + - "PREFIX mm: <http://mvm.com/owl/2010/10/mm.owl#>\n" + - "PREFIX kolm: <http://mvm.com/lrn/2010/11/kolm#>\n" + + "PREFIX mm: <http://org.apache.com/owl/2010/10/mm.owl#>\n" + + "PREFIX kolm: <http://org.apache.com/lrn/2010/11/kolm#>\n" + "SELECT ?cserv ?srv ?ncd WHERE {\n" + " ?cpt kolm:ncd \"0.0\" .\n" + " ?cpt kolm:serverRef ?cserv .\n" + @@ -403,24 +403,24 @@ public class DeleteDataServletRun { " ORDER BY ?cserv ?srv ?ncd"; String clusterKolmStratus13 = "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>\n" + - "PREFIX mm: <http://mvm.com/owl/2010/10/mm.owl#>\n" + - "PREFIX kolm: <http://mvm.com/lrn/2010/11/kolm#>\n" + + "PREFIX mm: <http://org.apache.com/owl/2010/10/mm.owl#>\n" + + "PREFIX kolm: <http://org.apache.com/lrn/2010/11/kolm#>\n" + "SELECT DISTINCT ?srv ?ncd WHERE {\n" + - " ?pt kolm:serverRef <http://mvm.com/owl/2010/10/mm.owl#urn:mm:mvm:LTS:root/cimv2:PG_OperatingSystem:CIM_ComputerSystem:stratus13:Red_Hat_Enterprise_Linux_Server> .\n" + + " ?pt kolm:serverRef <http://org.apache.com/owl/2010/10/mm.owl#urn:mm:org.apache:LTS:root/cimv2:PG_OperatingSystem:CIM_ComputerSystem:stratus13:Red_Hat_Enterprise_Linux_Server> .\n" + " ?cluster kolm:relatesTo ?pt .\n" + " ?cluster kolm:relatesTo ?pt2 .\n" + " ?pt2 kolm:serverRef ?srv .\n" + // " ?cluster kolm:relatesTo ?pt ;\n" + // " kolm:threshold ?thresh .\n" + -// " ?pt kolm:serverRef <http://mvm.com/owl/2010/10/mm.owl#urn:mm:mvm:LTS:root/cimv2:PG_OperatingSystem:CIM_ComputerSystem:stratus10:Red_Hat_Enterprise_Linux_Server> ;\n" + +// " ?pt kolm:serverRef <http://org.apache.com/owl/2010/10/mm.owl#urn:mm:org.apache:LTS:root/cimv2:PG_OperatingSystem:CIM_ComputerSystem:stratus10:Red_Hat_Enterprise_Linux_Server> ;\n" + " ?pt2 kolm:ncd ?ncd .\n" + " ?cluster kolm:timestamp ?ts .\n" + -// " <http://mvm.com/owl/2010/10/mm.owl#urn:mm:mvm:LTS:root/cimv2:PG_OperatingSystem:CIM_ComputerSystem:stratus10:Red_Hat_Enterprise_Linux_Server> mm:CSName ?name .\n" + +// " <http://org.apache.com/owl/2010/10/mm.owl#urn:mm:org.apache:LTS:root/cimv2:PG_OperatingSystem:CIM_ComputerSystem:stratus10:Red_Hat_Enterprise_Linux_Server> mm:CSName ?name .\n" + "} \n" + " ORDER BY ?ncd"; String cimLatestMeasure = "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>\n" + - "PREFIX mm: <http://mvm.com/owl/2010/10/mm.owl#>\n" + + "PREFIX mm: <http://org.apache.com/owl/2010/10/mm.owl#>\n" + "SELECT ?proc ?val ?time WHERE {\n" + " ?proc mm:loadPercentage ?val .\n" + " ?subj rdf:subject ?proc .\n" + @@ -431,8 +431,8 @@ public class DeleteDataServletRun { "ORDER BY DESC(?time)\n" + "LIMIT 250"; - String deleteBlankNodesCim = "prefix Base: <http://mvm.com/base/2011/05/base.owl#>\n" + - "prefix Core: <http://mvm.com/2011/05/core#>\n" + + String deleteBlankNodesCim = "prefix Base: <http://org.apache.com/base/2011/05/base.owl#>\n" + + "prefix Core: <http://org.apache.com/2011/05/core#>\n" + "\n" + "select *\n" + "{ \n" + @@ -442,7 +442,7 @@ public class DeleteDataServletRun { "FILTER isBlank(?server).\n" + "}"; -// String query = "DELETE {?subj <http://mvm.com/rdf/mm/relatesTo> <http://mvm.com/rdf/mm/LTS::stratus30>} WHERE { ?subj <http://mvm.com/rdf/mm/relatesTo> <http://mvm.com/rdf/mm/LTS::stratus30>}"; +// String query = "DELETE {?subj <http://org.apache.com/rdf/mm/relatesTo> <http://org.apache.com/rdf/mm/LTS::stratus30>} WHERE { ?subj <http://org.apache.com/rdf/mm/relatesTo> <http://org.apache.com/rdf/mm/LTS::stratus30>}"; // String query = deleteBlankNodesCim; System.out.println(query);