You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by al...@apache.org on 2012/10/08 12:25:08 UTC
svn commit: r1395504 [1/2] - in /stanbol/trunk:
contrib/reengineer/db/src/test/java/org/apache/stanbol/reengineer/db/
contrib/reengineer/xml/src/test/java/org/apache/stanbol/reengineer/xml/
ontologymanager/generic/core/src/main/java/org/apache/stanbol/...
Author: alexdma
Date: Mon Oct 8 10:25:06 2012
New Revision: 1395504
URL: http://svn.apache.org/viewvc?rev=1395504&view=rev
Log:
STANBOL-672:
* Moved back from PersistentCollectorFactory to OntologySpaceFactory. Before moving the Scope implementation to the core bundle we first need to implement STANBOL-710, and then we can make the move and manage all collectors through a single factory in the Clerezza multiplexer. This means that the ScopeManager implementation temporarily requires to reference both a scope factory and a session factory, though they are implemented by the same component.
* More deprecated ontonet API additions and Javadoc
* Added SLF4J and JUnit dependencies to all bundles with tests. This should enable logging and help remain compatible with Maven 2
Added:
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/OntologyNetworkConfiguration.java
- copied, changed from r1394600, stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/OntologyNetworkConfiguration.java
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/collector/DuplicateIDException.java
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/collector/ImportManagementPolicy.java
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/collector/IrremovableOntologyException.java
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/collector/MissingOntologyException.java
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/collector/OntologyCollectorModificationException.java
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/collector/UnmodifiableOntologyCollectorException.java
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/StoredOntologySource.java
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologyHandleException.java
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologyLoadingException.java
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologyNetworkMultiplexer.java
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OrphanOntologyKeyException.java
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/scope/OntologyScopeFactory.java
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/scope/OntologySpaceFactory.java
- copied, changed from r1394600, stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/scope/PersistentCollectorFactory.java
Removed:
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/OntologyNetworkConfiguration.java
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/scope/PersistentCollectorFactory.java
Modified:
stanbol/trunk/contrib/reengineer/db/src/test/java/org/apache/stanbol/reengineer/db/DBExtractorTest.java
stanbol/trunk/contrib/reengineer/xml/src/test/java/org/apache/stanbol/reengineer/xml/XMLReengineerTest.java
stanbol/trunk/ontologymanager/generic/core/src/main/java/org/apache/stanbol/ontologymanager/core/scope/ScopeManagerImpl.java
stanbol/trunk/ontologymanager/generic/core/src/main/java/org/apache/stanbol/ontologymanager/core/scope/ScopeRegistryImpl.java
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/NamedArtifact.java
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ONManager.java
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/OfflineConfiguration.java
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/Vocabulary.java
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/OntologyInputSource.java
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/scope/CoreOntologySpace.java
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/scope/CustomOntologySpace.java
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/Session.java
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/SessionListenable.java
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/SessionListener.java
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/SessionManager.java
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/OfflineConfiguration.java
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/io/OntologyInputSource.java
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/ontology/OntologyProvider.java
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/scope/ScopeFactory.java
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/scope/ScopeManager.java
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/scope/ScopeRegistry.java
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/session/Session.java
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/session/SessionListenable.java
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/session/SessionManager.java
stanbol/trunk/ontologymanager/multiplexer/clerezza/pom.xml
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/collector/ClerezzaCollectorFactory.java
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/impl/ScopeImpl.java
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/ontology/ClerezzaOntologyProvider.java
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/session/SessionManagerImpl.java
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/test/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/MockOsgiContext.java
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/test/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/collector/TestOntologyNetworkPersistence.java
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/test/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/scope/TestClerezzaSpaces.java
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/test/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/scope/TestOntologySpaces.java
stanbol/trunk/ontologymanager/registry/pom.xml
stanbol/trunk/ontologymanager/sources/clerezza/pom.xml
stanbol/trunk/ontologymanager/sources/owlapi/pom.xml
Modified: stanbol/trunk/contrib/reengineer/db/src/test/java/org/apache/stanbol/reengineer/db/DBExtractorTest.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/contrib/reengineer/db/src/test/java/org/apache/stanbol/reengineer/db/DBExtractorTest.java?rev=1395504&r1=1395503&r2=1395504&view=diff
==============================================================================
--- stanbol/trunk/contrib/reengineer/db/src/test/java/org/apache/stanbol/reengineer/db/DBExtractorTest.java (original)
+++ stanbol/trunk/contrib/reengineer/db/src/test/java/org/apache/stanbol/reengineer/db/DBExtractorTest.java Mon Oct 8 10:25:06 2012
@@ -16,7 +16,6 @@ import org.apache.stanbol.ontologymanage
import org.apache.stanbol.ontologymanager.multiplexer.clerezza.ontology.ClerezzaOntologyProvider;
import org.apache.stanbol.ontologymanager.servicesapi.OfflineConfiguration;
import org.apache.stanbol.ontologymanager.servicesapi.ontology.OntologyProvider;
-import org.apache.stanbol.ontologymanager.servicesapi.scope.PersistentCollectorFactory;
import org.apache.stanbol.ontologymanager.servicesapi.scope.ScopeManager;
import org.apache.stanbol.reengineer.base.impl.ReengineerManagerImpl;
import org.junit.Before;
@@ -51,9 +50,9 @@ public class DBExtractorTest {
new Parser());
// Two different ontology storages, the same sparql engine and tcprovider
- PersistentCollectorFactory sf = new ClerezzaCollectorFactory(ontologyProvider, emptyConf);
+ ClerezzaCollectorFactory sf = new ClerezzaCollectorFactory(ontologyProvider, emptyConf);
- onManager = new ScopeManagerImpl(ontologyProvider, offline, sf, emptyConf);
+ onManager = new ScopeManagerImpl(ontologyProvider, offline, sf, sf, emptyConf);
dbExtractor = new DBExtractor(new ReengineerManagerImpl(emptyConf), onManager, tcm, wtcp, emptyConf);
graphNS = "http://kres.iks-project.eu/reengineering/test";
outputIRI = IRI.create(graphNS);
Modified: stanbol/trunk/contrib/reengineer/xml/src/test/java/org/apache/stanbol/reengineer/xml/XMLReengineerTest.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/contrib/reengineer/xml/src/test/java/org/apache/stanbol/reengineer/xml/XMLReengineerTest.java?rev=1395504&r1=1395503&r2=1395504&view=diff
==============================================================================
--- stanbol/trunk/contrib/reengineer/xml/src/test/java/org/apache/stanbol/reengineer/xml/XMLReengineerTest.java (original)
+++ stanbol/trunk/contrib/reengineer/xml/src/test/java/org/apache/stanbol/reengineer/xml/XMLReengineerTest.java Mon Oct 8 10:25:06 2012
@@ -127,8 +127,8 @@ public class XMLReengineerTest {
// Two different ontology storages, the same sparql engine and tcprovider
OntologyProvider<TcProvider> provider = new ClerezzaOntologyProvider(tcm, offline, new Parser());
- ScopeManager onManager = new ScopeManagerImpl(provider, offline, new ClerezzaCollectorFactory(
- provider, emptyConf), emptyConf);
+ ClerezzaCollectorFactory factory = new ClerezzaCollectorFactory(provider, emptyConf);
+ ScopeManager onManager = new ScopeManagerImpl(provider, offline, factory, factory, emptyConf);
xmlExtractor = new XMLExtractor(new ReengineerManagerImpl(emptyConf), onManager, emptyConf);
}
Modified: stanbol/trunk/ontologymanager/generic/core/src/main/java/org/apache/stanbol/ontologymanager/core/scope/ScopeManagerImpl.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/generic/core/src/main/java/org/apache/stanbol/ontologymanager/core/scope/ScopeManagerImpl.java?rev=1395504&r1=1395503&r2=1395504&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/generic/core/src/main/java/org/apache/stanbol/ontologymanager/core/scope/ScopeManagerImpl.java (original)
+++ stanbol/trunk/ontologymanager/generic/core/src/main/java/org/apache/stanbol/ontologymanager/core/scope/ScopeManagerImpl.java Mon Oct 8 10:25:06 2012
@@ -37,8 +37,8 @@ import org.apache.felix.scr.annotations.
import org.apache.stanbol.commons.owl.OWLOntologyManagerFactory;
import org.apache.stanbol.commons.stanboltools.offline.OfflineMode;
import org.apache.stanbol.ontologymanager.ontonet.api.ONManager;
+import org.apache.stanbol.ontologymanager.ontonet.api.OntologyNetworkConfiguration;
import org.apache.stanbol.ontologymanager.servicesapi.OfflineConfiguration;
-import org.apache.stanbol.ontologymanager.servicesapi.OntologyNetworkConfiguration;
import org.apache.stanbol.ontologymanager.servicesapi.collector.DuplicateIDException;
import org.apache.stanbol.ontologymanager.servicesapi.collector.MissingOntologyException;
import org.apache.stanbol.ontologymanager.servicesapi.collector.UnmodifiableOntologyCollectorException;
@@ -48,8 +48,10 @@ import org.apache.stanbol.ontologymanage
import org.apache.stanbol.ontologymanager.servicesapi.ontology.OntologyProvider;
import org.apache.stanbol.ontologymanager.servicesapi.scope.NoSuchScopeException;
import org.apache.stanbol.ontologymanager.servicesapi.scope.OntologySpace;
-import org.apache.stanbol.ontologymanager.servicesapi.scope.PersistentCollectorFactory;
+import org.apache.stanbol.ontologymanager.servicesapi.scope.OntologySpaceFactory;
import org.apache.stanbol.ontologymanager.servicesapi.scope.Scope;
+import org.apache.stanbol.ontologymanager.servicesapi.scope.ScopeEventListener;
+import org.apache.stanbol.ontologymanager.servicesapi.scope.ScopeFactory;
import org.apache.stanbol.ontologymanager.servicesapi.scope.ScopeManager;
import org.apache.stanbol.ontologymanager.servicesapi.scope.ScopeRegistry;
import org.apache.stanbol.ontologymanager.servicesapi.util.OntologyNetworkConfigurationUtils;
@@ -111,8 +113,15 @@ public class ScopeManagerImpl extends Sc
+ ".option.loose", name = "LOOSE")}, value = _CONNECTIVITY_POLICY_DEFAULT)
private String connectivityPolicyString;
+ /*
+ * TODO when adapters are implemented for exporting, factory implementations can be Clerezza-independent
+ * and this object can become a scope factory itself.
+ */
+ @Reference
+ private ScopeFactory scopeFactory;
+
@Reference
- private PersistentCollectorFactory factory;
+ private OntologySpaceFactory spaceFactory;
private final Logger log = LoggerFactory.getLogger(getClass());
@@ -149,9 +158,9 @@ public class ScopeManagerImpl extends Sc
* <p>
* DO NOT USE to manually create instances - the ONManagerImpl instances do need to be configured! YOU
* NEED TO USE
- * {@link #ONManagerImpl(OntologyProvider, OfflineConfiguration, PersistentCollectorFactory, Dictionary)}
- * or its overloads, to parse the configuration and then initialise the rule store if running outside an
- * OSGI environment.
+ * {@link #ONManagerImpl(OntologyProvider, OfflineConfiguration, OntologySpaceFactory, Dictionary)} or its
+ * overloads, to parse the configuration and then initialise the rule store if running outside an OSGI
+ * environment.
*/
public ScopeManagerImpl() {
super();
@@ -172,11 +181,13 @@ public class ScopeManagerImpl extends Sc
*/
public ScopeManagerImpl(OntologyProvider<?> ontologyProvider,
OfflineConfiguration offline,
- PersistentCollectorFactory factory,
+ ScopeFactory scopeFactory,
+ OntologySpaceFactory spaceFactory,
Dictionary<String,Object> configuration) {
this();
this.ontologyProvider = ontologyProvider;
- this.factory = factory;
+ this.scopeFactory = scopeFactory;
+ this.spaceFactory = spaceFactory;
this.offline = offline;
try {
activate(configuration);
@@ -308,14 +319,14 @@ public class ScopeManagerImpl extends Sc
// (OntologyProvider<TcProvider>) ontologyProvider, new Hashtable<String,Object>());
// }
IRI iri = IRI.create(ontonetNS + scopeRegistryId + "/");
- factory.setDefaultNamespace(iri);
+ spaceFactory.setDefaultNamespace(iri);
// Add listeners
// if (ontologyProvider instanceof ScopeEventListener) factory
// .addScopeEventListener((ScopeEventListener) ontologyProvider);
Multiplexer multiplexer = ontologyProvider.getOntologyNetworkDescriptor();
this.addScopeRegistrationListener(multiplexer);
- factory.addScopeEventListener(multiplexer);
+ this.addScopeEventListener(multiplexer);
}
private void bootstrapOntologyNetwork(OWLOntology configOntology) {
@@ -417,13 +428,13 @@ public class ScopeManagerImpl extends Sc
// Commented out: for the time being we try not to propagate additions to scopes.
// if (ontologyProvider instanceof OntologyCollectorListener) scope
// .addOntologyCollectorListener((OntologyCollectorListener) ontologyProvider);
- // fireScopeCreated(scope);
+ fireScopeCreated(scope);
this.registerScope(scope);
}
@Override
public Scope createOntologyScope(String scopeID, OntologyInputSource<?>... coreOntologies) throws DuplicateIDException {
- Scope sc = factory.createOntologyScope(scopeID, coreOntologies);
+ Scope sc = scopeFactory.createOntologyScope(scopeID, coreOntologies);
configureScope(sc);
return sc;
}
@@ -471,16 +482,6 @@ public class ScopeManagerImpl extends Sc
return ontonetNS.toString();
}
- /**
- * Returns the ontology space factory that was created along with the manager context.
- *
- * @return the ontology space factory
- */
- @Override
- public PersistentCollectorFactory getPersistentCollectorFactory() {
- return factory;
- }
-
@Override
public ScopeRegistry getScopeRegistry() {
return this;
@@ -562,4 +563,14 @@ public class ScopeManagerImpl extends Sc
this.ontonetNS = IRI.create(namespace);
}
+ protected void fireScopeCreated(Scope scope) {
+ for (ScopeEventListener l : listeners)
+ l.scopeCreated(scope);
+ }
+
+ @Override
+ public OntologySpaceFactory getOntologySpaceFactory() {
+ return spaceFactory;
+ }
+
}
Modified: stanbol/trunk/ontologymanager/generic/core/src/main/java/org/apache/stanbol/ontologymanager/core/scope/ScopeRegistryImpl.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/generic/core/src/main/java/org/apache/stanbol/ontologymanager/core/scope/ScopeRegistryImpl.java?rev=1395504&r1=1395503&r2=1395504&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/generic/core/src/main/java/org/apache/stanbol/ontologymanager/core/scope/ScopeRegistryImpl.java (original)
+++ stanbol/trunk/ontologymanager/generic/core/src/main/java/org/apache/stanbol/ontologymanager/core/scope/ScopeRegistryImpl.java Mon Oct 8 10:25:06 2012
@@ -16,6 +16,7 @@
*/
package org.apache.stanbol.ontologymanager.core.scope;
+import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
@@ -48,16 +49,26 @@ public class ScopeRegistryImpl implement
}
@Override
- public void addScopeRegistrationListener(ScopeEventListener listener) {
+ public void addScopeEventListener(ScopeEventListener listener) {
listeners.add(listener);
}
@Override
- public void clearScopeRegistrationListeners() {
+ public void addScopeRegistrationListener(ScopeEventListener listener) {
+ addScopeEventListener(listener);
+ }
+
+ @Override
+ public void clearScopeEventListeners() {
listeners.clear();
}
@Override
+ public void clearScopeRegistrationListeners() {
+ clearScopeEventListeners();
+ }
+
+ @Override
public boolean containsScope(String scopeID) {
// containsKey() is not reliable enough
return scopeMap.get(scopeID) != null;
@@ -123,11 +134,16 @@ public class ScopeRegistryImpl implement
}
@Override
- public Set<ScopeEventListener> getScopeRegistrationListeners() {
+ public Collection<ScopeEventListener> getScopeEventListeners() {
return listeners;
}
@Override
+ public Set<ScopeEventListener> getScopeRegistrationListeners() {
+ return new HashSet<ScopeEventListener>(listeners);
+ }
+
+ @Override
public boolean isScopeActive(String scopeID) {
if (!containsScope(scopeID)) throw new NoSuchScopeException(scopeID);
return activeScopeIRIs.contains(scopeID);
@@ -146,11 +162,16 @@ public class ScopeRegistryImpl implement
}
@Override
- public void removeScopeRegistrationListener(ScopeEventListener listener) {
+ public void removeScopeEventListener(ScopeEventListener listener) {
listeners.remove(listener);
}
@Override
+ public void removeScopeRegistrationListener(ScopeEventListener listener) {
+ removeScopeEventListener(listener);
+ }
+
+ @Override
public void setScopeActive(String scopeID, boolean active) {
if (!containsScope(scopeID)) throw new NoSuchScopeException(scopeID);
// Prevent no-changes from firing events.
Modified: stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/NamedArtifact.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/NamedArtifact.java?rev=1395504&r1=1395503&r2=1395504&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/NamedArtifact.java (original)
+++ stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/NamedArtifact.java Mon Oct 8 10:25:06 2012
@@ -16,7 +16,20 @@
*/
package org.apache.stanbol.ontologymanager.ontonet.api;
-@Deprecated
+/**
+ * Denotes any API artifact that has a qualified identifier. Both the identifier and the concatenation of the
+ * namespace with the identifier should be unique in the system. Having both a non-null namespace and ID is
+ * optional, but at least one of them should be non-null.
+ *
+ * @deprecated Packages, class names etc. containing "ontonet" in any capitalization are being phased out.
+ * Please switch to {@link org.apache.stanbol.ontologymanager.servicesapi.NamedArtifact} as soon
+ * as possible.
+ *
+ * @see org.apache.stanbol.ontologymanager.servicesapi.NamedArtifact
+ *
+ * @author alexdma
+ *
+ */
public interface NamedArtifact extends org.apache.stanbol.ontologymanager.servicesapi.NamedArtifact {
}
Modified: stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ONManager.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ONManager.java?rev=1395504&r1=1395503&r2=1395504&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ONManager.java (original)
+++ stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ONManager.java Mon Oct 8 10:25:06 2012
@@ -17,8 +17,19 @@
package org.apache.stanbol.ontologymanager.ontonet.api;
import org.apache.stanbol.ontologymanager.ontonet.api.scope.ScopeRegistry;
+import org.apache.stanbol.ontologymanager.servicesapi.scope.ScopeManager;
-@Deprecated
+/**
+ * A component that provides all the facilities for creating, registering and querying ontology scopes.
+ *
+ * @deprecated Packages, class names etc. containing "ontonet" in any capitalization are being phased out.
+ * Please switch to {@link ScopeManager} as soon as possible.
+ *
+ * @see ScopeManager
+ *
+ * @author alexdma
+ *
+ */
public interface ONManager extends org.apache.stanbol.ontologymanager.servicesapi.scope.ScopeManager,
ScopeRegistry {
Modified: stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/OfflineConfiguration.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/OfflineConfiguration.java?rev=1395504&r1=1395503&r2=1395504&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/OfflineConfiguration.java (original)
+++ stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/OfflineConfiguration.java Mon Oct 8 10:25:06 2012
@@ -16,7 +16,19 @@
*/
package org.apache.stanbol.ontologymanager.ontonet.api;
-@Deprecated
+/**
+ * Provides the configuration needed by the ontology manager in order to locate offline ontologies and export
+ * them to the Web.
+ *
+ * @deprecated Packages, class names etc. containing "ontonet" in any capitalization are being phased out.
+ * Please switch to {@link org.apache.stanbol.ontologymanager.servicesapi.OfflineConfiguration} as
+ * soon as possible.
+ *
+ * @see org.apache.stanbol.ontologymanager.servicesapi.OfflineConfiguration
+ *
+ * @author alexdma
+ *
+ */
public interface OfflineConfiguration extends
org.apache.stanbol.ontologymanager.servicesapi.OfflineConfiguration {
Copied: stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/OntologyNetworkConfiguration.java (from r1394600, stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/OntologyNetworkConfiguration.java)
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/OntologyNetworkConfiguration.java?p2=stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/OntologyNetworkConfiguration.java&p1=stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/OntologyNetworkConfiguration.java&r1=1394600&r2=1395504&rev=1395504&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/OntologyNetworkConfiguration.java (original)
+++ stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/OntologyNetworkConfiguration.java Mon Oct 8 10:25:06 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.stanbol.ontologymanager.servicesapi;
+package org.apache.stanbol.ontologymanager.ontonet.api;
import java.util.Collection;
import java.util.Map;
@@ -24,10 +24,12 @@ import org.semanticweb.owlapi.model.OWLO
/**
* Contains ownership and collector information on all ontology networks currently configured.
*
+ * @deprecated as it is only for use by component activators, it will probably be confined to a private
+ * package.
+ *
* @author alexdma
*
*/
-@Deprecated
public class OntologyNetworkConfiguration {
private Map<String,Collection<String>> scopesForSessions;
Modified: stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/Vocabulary.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/Vocabulary.java?rev=1395504&r1=1395503&r2=1395504&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/Vocabulary.java (original)
+++ stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/Vocabulary.java Mon Oct 8 10:25:06 2012
@@ -16,7 +16,20 @@
*/
package org.apache.stanbol.ontologymanager.ontonet.api;
-@Deprecated
+/**
+ * An internal representation of the vocabulary that Stanbol uses internally for representing stored
+ * ontologies and virtual ontology networks, and restoring them on startup. This vocabulary is not intended to
+ * be used for ontologies exposed to the public.
+ *
+ * @deprecated Packages, class names etc. containing "ontonet" in any capitalization are being phased out.
+ * Please switch to {@link org.apache.stanbol.ontologymanager.servicesapi.Vocabulary} as soon as
+ * possible.
+ *
+ * @see org.apache.stanbol.ontologymanager.servicesapi.Vocabulary
+ *
+ * @author alexdma
+ *
+ */
public class Vocabulary extends org.apache.stanbol.ontologymanager.servicesapi.Vocabulary {
}
Added: stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/collector/DuplicateIDException.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/collector/DuplicateIDException.java?rev=1395504&view=auto
==============================================================================
--- stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/collector/DuplicateIDException.java (added)
+++ stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/collector/DuplicateIDException.java Mon Oct 8 10:25:06 2012
@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.stanbol.ontologymanager.ontonet.api.collector;
+
+@Deprecated
+public class DuplicateIDException extends
+ org.apache.stanbol.ontologymanager.servicesapi.collector.DuplicateIDException {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = -7598213876617720105L;
+
+ /**
+ * Creates a new instance of DuplicateIDException.
+ *
+ * @param dupe
+ * the duplicate ID.
+ */
+ public DuplicateIDException(String dupe) {
+ super(dupe);
+ }
+
+ /**
+ * Creates a new instance of DuplicateIDException.
+ *
+ * @param dupe
+ * the duplicate ID.
+ * @param message
+ * the detail message.
+ */
+ public DuplicateIDException(String dupe, String message) {
+ super(dupe, message);
+ }
+
+ /**
+ * Creates a new instance of DuplicateIDException.
+ *
+ * @param dupe
+ * the duplicate ID.
+ * @param cause
+ * the throwable that caused this exception to be thrown.
+ */
+ public DuplicateIDException(String dupe, Throwable cause) {
+ super(dupe, cause);
+ }
+
+}
Added: stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/collector/ImportManagementPolicy.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/collector/ImportManagementPolicy.java?rev=1395504&view=auto
==============================================================================
--- stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/collector/ImportManagementPolicy.java (added)
+++ stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/collector/ImportManagementPolicy.java Mon Oct 8 10:25:06 2012
@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.stanbol.ontologymanager.ontonet.api.collector;
+
+/**
+ * The policies that determine how OntoNet should handle OWL import statements and/or the imported ontologies
+ * (i.e. import targets) when performing operations such as load/export of ontologies, and rewriting of import
+ * statements.
+ *
+ * @author alexdma
+ *
+ */
+public enum ImportManagementPolicy {
+
+ /**
+ * The root ontology contains all the import statements that point to (recursively) imported ontologies,
+ * which instead are cleared of all import statements. Can be used to minimize the number of statements
+ * and remove cycles.
+ */
+ FLATTEN,
+
+ /**
+ * Remove all import statements from the root ontology's import closure, and recursively copy all the
+ * axioms from imported ontologies into the root one.
+ */
+ MERGE,
+
+ /**
+ * Keep the import structure as it is. Note that the import targets can still be rewritten even by
+ * following this policy.
+ */
+ PRESERVE;
+
+}
Added: stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/collector/IrremovableOntologyException.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/collector/IrremovableOntologyException.java?rev=1395504&view=auto
==============================================================================
--- stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/collector/IrremovableOntologyException.java (added)
+++ stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/collector/IrremovableOntologyException.java Mon Oct 8 10:25:06 2012
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.stanbol.ontologymanager.ontonet.api.collector;
+
+import org.apache.stanbol.ontologymanager.servicesapi.collector.OntologyCollector;
+
+@Deprecated
+public class IrremovableOntologyException extends OntologyCollectorModificationException {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 2804710441701624939L;
+
+ public IrremovableOntologyException(OntologyCollector collector, Throwable cause) {
+ super(collector, cause);
+ }
+
+}
Added: stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/collector/MissingOntologyException.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/collector/MissingOntologyException.java?rev=1395504&view=auto
==============================================================================
--- stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/collector/MissingOntologyException.java (added)
+++ stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/collector/MissingOntologyException.java Mon Oct 8 10:25:06 2012
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.stanbol.ontologymanager.ontonet.api.collector;
+
+import org.apache.stanbol.ontologymanager.servicesapi.collector.OntologyCollector;
+import org.semanticweb.owlapi.model.OWLOntologyID;
+
+@Deprecated
+public class MissingOntologyException extends OntologyCollectorModificationException {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = -9149624746478931517L;
+ protected OWLOntologyID publicKey;
+
+ public MissingOntologyException(OntologyCollector collector, OWLOntologyID publicKey) {
+ super(collector);
+ this.publicKey = publicKey;
+ }
+
+ /**
+ * Returns the unique identifier of the ontology whose removal was denied.
+ *
+ * @return the ID of the ontology that was not removed.
+ */
+ public OWLOntologyID getOntologyKey() {
+ return publicKey;
+ }
+
+}
Added: stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/collector/OntologyCollectorModificationException.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/collector/OntologyCollectorModificationException.java?rev=1395504&view=auto
==============================================================================
--- stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/collector/OntologyCollectorModificationException.java (added)
+++ stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/collector/OntologyCollectorModificationException.java Mon Oct 8 10:25:06 2012
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.stanbol.ontologymanager.ontonet.api.collector;
+
+import org.apache.stanbol.ontologymanager.servicesapi.collector.OntologyCollector;
+
+@Deprecated
+public class OntologyCollectorModificationException extends
+ org.apache.stanbol.ontologymanager.servicesapi.collector.OntologyCollectorModificationException {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = -5425012774368075246L;
+
+ public OntologyCollectorModificationException(OntologyCollector collector) {
+ super(collector);
+ }
+
+ public OntologyCollectorModificationException(OntologyCollector collector, Throwable cause) {
+ super(collector, cause);
+ }
+
+}
Added: stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/collector/UnmodifiableOntologyCollectorException.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/collector/UnmodifiableOntologyCollectorException.java?rev=1395504&view=auto
==============================================================================
--- stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/collector/UnmodifiableOntologyCollectorException.java (added)
+++ stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/collector/UnmodifiableOntologyCollectorException.java Mon Oct 8 10:25:06 2012
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.stanbol.ontologymanager.ontonet.api.collector;
+
+import org.apache.stanbol.ontologymanager.servicesapi.collector.OntologyCollector;
+
+@Deprecated
+public class UnmodifiableOntologyCollectorException extends OntologyCollectorModificationException {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 18384908686644080L;
+
+ public UnmodifiableOntologyCollectorException(OntologyCollector collector) {
+ super(collector);
+ }
+
+}
Modified: stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/OntologyInputSource.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/OntologyInputSource.java?rev=1395504&r1=1395503&r2=1395504&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/OntologyInputSource.java (original)
+++ stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/OntologyInputSource.java Mon Oct 8 10:25:06 2012
@@ -16,7 +16,33 @@
*/
package org.apache.stanbol.ontologymanager.ontonet.api.io;
-@Deprecated
+/**
+ * An ontology input source provides a point for loading an ontology. Currently it provides two ways of
+ * obtaining an ontology document:
+ *
+ * <ol>
+ * <li>From an OWLOntology.
+ * <li>By dereferencing a physical IRI.
+ * <li>By querying a triple store.
+ * </ol>
+ *
+ * Consumers that use an ontology input source will attempt to obtain a concrete representation of an ontology
+ * in the above order. Implementations of this interface may try to dereference the IRI internally and just
+ * provide the OWLOntology, or directly provide the physical IRI for other classes to dereference.
+ * Implementations should allow multiple attempts at loading an ontology.
+ *
+ * @deprecated Packages, class names etc. containing "ontonet" in any capitalization are being phased out.
+ * Please switch to {@link org.apache.stanbol.ontologymanager.servicesapi.io.OntologyInputSource}
+ * as soon as possible.
+ *
+ * @see org.apache.stanbol.ontologymanager.servicesapi.io.OntologyInputSource
+ *
+ * @author alexdma
+ *
+ * @param <O>
+ * the root ontology object delivered by this input source.
+ *
+ */
public interface OntologyInputSource<O> extends
org.apache.stanbol.ontologymanager.servicesapi.io.OntologyInputSource<O> {
Added: stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/StoredOntologySource.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/StoredOntologySource.java?rev=1395504&view=auto
==============================================================================
--- stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/StoredOntologySource.java (added)
+++ stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/StoredOntologySource.java Mon Oct 8 10:25:06 2012
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.stanbol.ontologymanager.ontonet.api.io;
+
+import org.semanticweb.owlapi.model.OWLOntologyID;
+
+@Deprecated
+public class StoredOntologySource extends
+ org.apache.stanbol.ontologymanager.servicesapi.io.StoredOntologySource {
+
+ public StoredOntologySource(OWLOntologyID publicKey) {
+ super(publicKey);
+ }
+
+}
Added: stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologyHandleException.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologyHandleException.java?rev=1395504&view=auto
==============================================================================
--- stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologyHandleException.java (added)
+++ stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologyHandleException.java Mon Oct 8 10:25:06 2012
@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.stanbol.ontologymanager.ontonet.api.ontology;
+
+import java.util.Set;
+
+import org.apache.stanbol.ontologymanager.servicesapi.collector.OntologyCollector;
+import org.semanticweb.owlapi.model.OWLOntologyID;
+
+@Deprecated
+public class OntologyHandleException extends
+ org.apache.stanbol.ontologymanager.servicesapi.ontology.OntologyHandleException {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 296650804776257376L;
+
+ public OntologyHandleException(Set<OntologyCollector> collectorHandles, Set<OWLOntologyID> dependents) {
+ super(collectorHandles, dependents);
+ }
+
+ public OntologyHandleException(String message) {
+ super(message);
+ }
+
+ public OntologyHandleException(String message,
+ Set<OntologyCollector> collectorHandles,
+ Set<OWLOntologyID> dependents) {
+
+ super(message, collectorHandles, dependents);
+ }
+
+}
Added: stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologyLoadingException.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologyLoadingException.java?rev=1395504&view=auto
==============================================================================
--- stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologyLoadingException.java (added)
+++ stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologyLoadingException.java Mon Oct 8 10:25:06 2012
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.stanbol.ontologymanager.ontonet.api.ontology;
+
+@Deprecated
+public class OntologyLoadingException extends
+ org.apache.stanbol.ontologymanager.servicesapi.ontology.OntologyLoadingException {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = -4406721649095540941L;
+
+ public OntologyLoadingException(Throwable cause) {
+ super(cause);
+ }
+
+ /**
+ * Creates a new instance of {@link OntologyLoadingException}.
+ *
+ * @param message
+ * the exception message.
+ */
+ public OntologyLoadingException(String message) {
+ super(message);
+ }
+
+}
Added: stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologyNetworkMultiplexer.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologyNetworkMultiplexer.java?rev=1395504&view=auto
==============================================================================
--- stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologyNetworkMultiplexer.java (added)
+++ stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologyNetworkMultiplexer.java Mon Oct 8 10:25:06 2012
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.stanbol.ontologymanager.ontonet.api.ontology;
+
+import org.apache.stanbol.ontologymanager.servicesapi.ontology.Multiplexer;
+
+/**
+ * The object that "knows" the relationships between stored graphs and their usage in ontology spaces or
+ * sessions.
+ *
+ * @deprecated Packages, class names etc. containing "ontonet" in any capitalization are being phased out.
+ * Please switch to {@link Multiplexer} as soon as possible.
+ *
+ * @see Multiplexer
+ *
+ * @author alexdma
+ *
+ */
+public interface OntologyNetworkMultiplexer extends Multiplexer {
+
+}
Added: stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OrphanOntologyKeyException.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OrphanOntologyKeyException.java?rev=1395504&view=auto
==============================================================================
--- stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OrphanOntologyKeyException.java (added)
+++ stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OrphanOntologyKeyException.java Mon Oct 8 10:25:06 2012
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.stanbol.ontologymanager.ontonet.api.ontology;
+
+import org.semanticweb.owlapi.model.OWLOntologyID;
+
+@Deprecated
+public class OrphanOntologyKeyException extends
+ org.apache.stanbol.ontologymanager.servicesapi.ontology.OrphanOntologyKeyException {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = -2841412277788505762L;
+
+ /**
+ * Creates a new instance of {@link OrphanOntologyKeyException} with the supplied orphan key.
+ *
+ * @param key
+ * the orphan ontology key.
+ */
+ public OrphanOntologyKeyException(OWLOntologyID orphan) {
+ super(orphan);
+ }
+
+}
Modified: stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/scope/CoreOntologySpace.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/scope/CoreOntologySpace.java?rev=1395504&r1=1395503&r2=1395504&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/scope/CoreOntologySpace.java (original)
+++ stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/scope/CoreOntologySpace.java Mon Oct 8 10:25:06 2012
@@ -16,7 +16,21 @@
*/
package org.apache.stanbol.ontologymanager.ontonet.api.scope;
-@Deprecated
+/**
+ * An ontology collector that maintains references to core ontologies that will be imported by any ontology in
+ * the custom space of a scope. They are used for boosting reasoning operations. Core spaces should only be
+ * created and populated upon creation of the corresponding ontology scope and not modified afterwards.
+ *
+ * @deprecated Packages, class names etc. containing "ontonet" in any capitalization are being phased out. In
+ * addition, the distinction between core and custom spaces will disappear at the operational
+ * level. Please switch to
+ * {@link org.apache.stanbol.ontologymanager.servicesapi.scope.OntologySpace} as soon as possible.
+ *
+ * @see org.apache.stanbol.ontologymanager.servicesapi.scope.OntologySpace
+ *
+ * @author alexdma
+ *
+ */
public interface CoreOntologySpace extends OntologySpace {
}
Modified: stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/scope/CustomOntologySpace.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/scope/CustomOntologySpace.java?rev=1395504&r1=1395503&r2=1395504&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/scope/CustomOntologySpace.java (original)
+++ stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/scope/CustomOntologySpace.java Mon Oct 8 10:25:06 2012
@@ -16,7 +16,19 @@
*/
package org.apache.stanbol.ontologymanager.ontonet.api.scope;
-@Deprecated
+/**
+ * An ontology collector that references modifiable ontologies in a scope.
+ *
+ * @deprecated Packages, class names etc. containing "ontonet" in any capitalization are being phased out. In
+ * addition, the distinction between core and custom spaces will disappear at the operational
+ * level. Please switch to
+ * {@link org.apache.stanbol.ontologymanager.servicesapi.scope.OntologySpace} as soon as possible.
+ *
+ * @see org.apache.stanbol.ontologymanager.servicesapi.scope.OntologySpace
+ *
+ * @author alexdma
+ *
+ */
public interface CustomOntologySpace extends OntologySpace {
}
Added: stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/scope/OntologyScopeFactory.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/scope/OntologyScopeFactory.java?rev=1395504&view=auto
==============================================================================
--- stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/scope/OntologyScopeFactory.java (added)
+++ stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/scope/OntologyScopeFactory.java Mon Oct 8 10:25:06 2012
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.stanbol.ontologymanager.ontonet.api.scope;
+
+import org.apache.stanbol.ontologymanager.ontonet.api.NamedArtifact;
+import org.apache.stanbol.ontologymanager.ontonet.api.collector.DuplicateIDException;
+import org.apache.stanbol.ontologymanager.ontonet.api.io.OntologyInputSource;
+import org.apache.stanbol.ontologymanager.servicesapi.scope.ScopeFactory;
+
+public interface OntologyScopeFactory extends ScopeFactory, NamedArtifact, ScopeEventListenable {
+
+ OntologyScope createOntologyScope(String scopeID, OntologyInputSource<?>... coreOntologies) throws DuplicateIDException;
+
+}
Modified: stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/Session.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/Session.java?rev=1395504&r1=1395503&r2=1395504&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/Session.java (original)
+++ stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/Session.java Mon Oct 8 10:25:06 2012
@@ -20,7 +20,23 @@ import org.apache.stanbol.ontologymanage
import org.apache.stanbol.ontologymanager.ontonet.api.collector.OntologyCollector;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OWLExportable;
-@Deprecated
+/**
+ * An ontology collector that can be used by client applications to store volatile data, e.g. for the duration
+ * of a service call. It has an aggressive severance policy and tries to delete as many managed ontologies as
+ * possible when it goes down.<br>
+ * <br>
+ * Note that sessions are generally disjoint with HTTP sessions or the like, but can be used in conjunction
+ * with them, or manipulated to mimic their behaviour.
+ *
+ * @deprecated Packages, class names etc. containing "ontonet" in any capitalization are being phased out.
+ * Please switch to {@link org.apache.stanbol.ontologymanager.servicesapi.session.Session} as soon
+ * as possible.
+ *
+ * @see org.apache.stanbol.ontologymanager.servicesapi.session.Session
+ *
+ * @author alexdma
+ *
+ */
public interface Session extends org.apache.stanbol.ontologymanager.servicesapi.session.Session,
OntologyCollector, OWLExportable, Lockable, SessionListenable {
Modified: stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/SessionListenable.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/SessionListenable.java?rev=1395504&r1=1395503&r2=1395504&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/SessionListenable.java (original)
+++ stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/SessionListenable.java Mon Oct 8 10:25:06 2012
@@ -16,7 +16,19 @@
*/
package org.apache.stanbol.ontologymanager.ontonet.api.session;
-@Deprecated
+/**
+ * An object that can fire or propagate changes in {@link Session} objects.
+ *
+ * @deprecated Packages, class names etc. containing "ontonet" in any capitalization are being phased out.
+ * Please switch to
+ * {@link org.apache.stanbol.ontologymanager.servicesapi.session.SessionListenable} as soon as
+ * possible.
+ *
+ * @see org.apache.stanbol.ontologymanager.servicesapi.session.SessionListenable
+ *
+ * @author alexdma
+ *
+ */
public interface SessionListenable extends
org.apache.stanbol.ontologymanager.servicesapi.session.SessionListenable {
Modified: stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/SessionListener.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/SessionListener.java?rev=1395504&r1=1395503&r2=1395504&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/SessionListener.java (original)
+++ stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/SessionListener.java Mon Oct 8 10:25:06 2012
@@ -16,7 +16,19 @@
*/
package org.apache.stanbol.ontologymanager.ontonet.api.session;
-@Deprecated
+/**
+ * Objects that want to listen to events affecting sessions should implement this interface and add themselves
+ * as listener to a manager.
+ *
+ * @deprecated Packages, class names etc. containing "ontonet" in any capitalization are being phased out.
+ * Please switch to {@link org.apache.stanbol.ontologymanager.servicesapi.session.SessionListener}
+ * as soon as possible.
+ *
+ * @see org.apache.stanbol.ontologymanager.servicesapi.session.SessionListener
+ *
+ * @author alexdma
+ *
+ */
public interface SessionListener extends
org.apache.stanbol.ontologymanager.servicesapi.session.SessionListener {
Modified: stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/SessionManager.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/SessionManager.java?rev=1395504&r1=1395503&r2=1395504&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/SessionManager.java (original)
+++ stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/SessionManager.java Mon Oct 8 10:25:06 2012
@@ -16,7 +16,22 @@
*/
package org.apache.stanbol.ontologymanager.ontonet.api.session;
-@Deprecated
+/**
+ * Manages session objects via CRUD-like operations. A <code>SessionManager</code> maintains in-memory storage
+ * of sessions, creates new ones and either destroys or stores existing ones persistently. All sessions are
+ * managed via unique identifiers of the <code>org.semanticweb.owlapi.model.IRI</code> type.<br>
+ * <br>
+ * NOTE: implementations should either be synchronized, or document whenever they are not.
+ *
+ * @deprecated Packages, class names etc. containing "ontonet" in any capitalization are being phased out.
+ * Please switch to {@link org.apache.stanbol.ontologymanager.servicesapi.session.SessionManager}
+ * as soon as possible.
+ *
+ * @see org.apache.stanbol.ontologymanager.servicesapi.session.SessionManager
+ *
+ * @author alexdma
+ *
+ */
public interface SessionManager extends org.apache.stanbol.ontologymanager.servicesapi.session.SessionManager {
}
Modified: stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/OfflineConfiguration.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/OfflineConfiguration.java?rev=1395504&r1=1395503&r2=1395504&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/OfflineConfiguration.java (original)
+++ stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/OfflineConfiguration.java Mon Oct 8 10:25:06 2012
@@ -18,12 +18,11 @@ package org.apache.stanbol.ontologymanag
import java.util.List;
-import org.apache.stanbol.ontologymanager.servicesapi.scope.ScopeManager;
import org.semanticweb.owlapi.model.IRI;
/**
- * Provides the configuration needed for the {@link ScopeManager}. A configuration should only be handled
- * internally by the {@link ScopeManager} implementation.
+ * Provides the configuration needed by the ontology manager in order to locate offline ontologies and export
+ * them to the Web.
*
* @author alexdma
*
Modified: stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/io/OntologyInputSource.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/io/OntologyInputSource.java?rev=1395504&r1=1395503&r2=1395504&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/io/OntologyInputSource.java (original)
+++ stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/io/OntologyInputSource.java Mon Oct 8 10:25:06 2012
@@ -33,6 +33,8 @@ package org.apache.stanbol.ontologymanag
*
* @author alexdma
*
+ * @param <O>
+ * the root ontology object delivered by this input source.
*/
public interface OntologyInputSource<O> {
Modified: stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/ontology/OntologyProvider.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/ontology/OntologyProvider.java?rev=1395504&r1=1395503&r2=1395504&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/ontology/OntologyProvider.java (original)
+++ stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/ontology/OntologyProvider.java Mon Oct 8 10:25:06 2012
@@ -25,7 +25,7 @@ import org.apache.clerezza.rdf.core.MGra
import org.apache.clerezza.rdf.core.TripleCollection;
import org.apache.clerezza.rdf.core.access.TcProvider;
import org.apache.clerezza.rdf.core.serializedform.UnsupportedFormatException;
-import org.apache.stanbol.ontologymanager.servicesapi.OntologyNetworkConfiguration;
+import org.apache.stanbol.ontologymanager.ontonet.api.OntologyNetworkConfiguration;
import org.apache.stanbol.ontologymanager.servicesapi.collector.ImportManagementPolicy;
import org.apache.stanbol.ontologymanager.servicesapi.io.Origin;
import org.semanticweb.owlapi.model.IRI;
Copied: stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/scope/OntologySpaceFactory.java (from r1394600, stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/scope/PersistentCollectorFactory.java)
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/scope/OntologySpaceFactory.java?p2=stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/scope/OntologySpaceFactory.java&p1=stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/scope/PersistentCollectorFactory.java&r1=1394600&r2=1395504&rev=1395504&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/scope/PersistentCollectorFactory.java (original)
+++ stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/scope/OntologySpaceFactory.java Mon Oct 8 10:25:06 2012
@@ -29,7 +29,7 @@ import org.apache.stanbol.ontologymanage
*
* @author alexdma
*/
-public interface PersistentCollectorFactory extends ScopeFactory, ScopeEventListenable, NamedArtifact {
+public interface OntologySpaceFactory extends ScopeEventListenable, NamedArtifact {
/**
* Creates and sets up a default core ontology space. Equivalent to calling
Modified: stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/scope/ScopeFactory.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/scope/ScopeFactory.java?rev=1395504&r1=1395503&r2=1395504&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/scope/ScopeFactory.java (original)
+++ stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/scope/ScopeFactory.java Mon Oct 8 10:25:06 2012
@@ -19,7 +19,7 @@ package org.apache.stanbol.ontologymanag
import org.apache.stanbol.ontologymanager.servicesapi.collector.DuplicateIDException;
import org.apache.stanbol.ontologymanager.servicesapi.io.OntologyInputSource;
-public interface ScopeFactory {
+public interface ScopeFactory extends ScopeEventListenable {
/**
* Creates and returns a new ontology scope with the core space ontologies obtained from
Modified: stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/scope/ScopeManager.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/scope/ScopeManager.java?rev=1395504&r1=1395503&r2=1395504&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/scope/ScopeManager.java (original)
+++ stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/scope/ScopeManager.java Mon Oct 8 10:25:06 2012
@@ -18,13 +18,13 @@ package org.apache.stanbol.ontologymanag
import java.io.File;
+import org.apache.stanbol.ontologymanager.ontonet.api.scope.OntologyScope;
import org.apache.stanbol.ontologymanager.servicesapi.OfflineConfiguration;
import org.apache.stanbol.ontologymanager.servicesapi.io.OntologyInputSource;
/**
- * An Ontology Network Manager holds all references and tools for creating, modifying and deleting the logical
- * realms that store Web Ontologies, as well as offer facilities for handling the ontologies contained
- * therein.<br>
+ * A Scope Manager holds all references and tools for creating, modifying and deleting the logical realms that
+ * store Web Ontologies, as well as offer facilities for handling the ontologies contained therein.<br>
* <br>
* Note that since this object is both a {@link ScopeRegistry} and an {@link ScopeFactory}, the call to
* {@link ScopeRegistry#registerScope(OntologyScope)} or its overloads after
@@ -59,6 +59,8 @@ public interface ScopeManager extends Sc
*/
OfflineConfiguration getOfflineConfiguration();
+ OntologySpaceFactory getOntologySpaceFactory();
+
/**
* Implementations should be able to create a {@link File} object from this path.
*
@@ -78,15 +80,6 @@ public interface ScopeManager extends Sc
String getOntologyNetworkNamespace();
/**
- * Returns the ontology space factory that was created along with the manager context. <br>
- * <br>
- * Note: Because this can be backend-dependent, this method is not deprecated yet.
- *
- * @return the default ontology space factory.
- */
- PersistentCollectorFactory getPersistentCollectorFactory();
-
- /**
* Returns the unique ontology scope registry for this context.
*
* @deprecated This methods now returns the current object, which is also a {@link ScopeRegistry}.
Modified: stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/scope/ScopeRegistry.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/scope/ScopeRegistry.java?rev=1395504&r1=1395503&r2=1395504&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/scope/ScopeRegistry.java (original)
+++ stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/scope/ScopeRegistry.java Mon Oct 8 10:25:06 2012
@@ -28,12 +28,14 @@ import org.apache.stanbol.ontologymanage
* @author alexdma
*
*/
-public interface ScopeRegistry {
+public interface ScopeRegistry extends ScopeEventListenable {
/**
* Adds a scope registration listener to this registry. If the listener was already added, this should
* result in no effect.
*
+ * @deprecated use {@link ScopeEventListenable#addScopeEventListener(ScopeEventListener)}
+ *
* @param listener
* the listener to be added
*/
@@ -41,6 +43,8 @@ public interface ScopeRegistry {
/**
* Removes all registered scope registration listeners.
+ *
+ * @deprecated use {@link ScopeEventListenable#clearScopeEventListeners()}
*/
void clearScopeRegistrationListeners();
@@ -82,6 +86,8 @@ public interface ScopeRegistry {
/**
* Returns the set of registered scope registration listeners, in no particular order.
*
+ * @deprecated use {@link ScopeEventListenable#getScopeEventListeners()}
+ *
* @return the set of scope registration listeners
*/
Set<ScopeEventListener> getScopeRegistrationListeners();
@@ -110,6 +116,8 @@ public interface ScopeRegistry {
* Removes a scope registration listener from this registry. If the listener was not previously added,
* this should result in no effect.
*
+ * @deprecated use {@link ScopeEventListenable#removeScopeEventListener(ScopeEventListener)}
+ *
* @param listener
* the listener to be removed
*/
Modified: stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/session/Session.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/session/Session.java?rev=1395504&r1=1395503&r2=1395504&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/session/Session.java (original)
+++ stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/session/Session.java Mon Oct 8 10:25:06 2012
@@ -23,7 +23,12 @@ import org.apache.stanbol.ontologymanage
import org.apache.stanbol.ontologymanager.servicesapi.ontology.OWLExportable;
/**
- * Note that sessions are possibly disjoint with HTTP sessions or the like.
+ * An ontology collector that can be used by client applications to store volatile data, e.g. for the duration
+ * of a service call. It has an aggressive severance policy and tries to delete as many managed ontologies as
+ * possible when it goes down.<br>
+ * <br>
+ * Note that sessions are generally disjoint with HTTP sessions or the like, but can be used in conjunction
+ * with them, or manipulated to mimic their behaviour.
*
* @author alexdma
*
Modified: stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/session/SessionListenable.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/session/SessionListenable.java?rev=1395504&r1=1395503&r2=1395504&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/session/SessionListenable.java (original)
+++ stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/session/SessionListenable.java Mon Oct 8 10:25:06 2012
@@ -1,54 +1,59 @@
/*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements. See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.stanbol.ontologymanager.servicesapi.session;
import java.util.Collection;
+/**
+ * An object that can fire or propagate changes in {@link Session} objects.
+ *
+ * @author alexdma
+ *
+ */
public interface SessionListenable {
- /**
- * Adds the given SessionListener to the pool of registered listeners.
- *
- * @param listener
- * the session listener to be added
- */
+ /**
+ * Adds the given SessionListener to the pool of registered listeners.
+ *
+ * @param listener
+ * the session listener to be added
+ */
void addSessionListener(SessionListener listener);
- /**
- * Clears the pool of registered session listeners.
- */
+ /**
+ * Clears the pool of registered session listeners.
+ */
void clearSessionListeners();
- /**
- * Returns all the registered session listeners. It is up to developers to
- * decide whether implementations should return sets (unordered but without
- * redundancy), lists (e.g. in the order they wer registered but potentially
- * redundant) or other data structures that implement {@link Collection}.
- *
- * @return a collection of registered session listeners.
- */
+ /**
+ * Returns all the registered session listeners. It is up to developers to decide whether implementations
+ * should return sets (unordered but without redundancy), lists (e.g. in the order they wer registered but
+ * potentially redundant) or other data structures that implement {@link Collection}.
+ *
+ * @return a collection of registered session listeners.
+ */
Collection<SessionListener> getSessionListeners();
- /**
- * Removes the given SessionListener from the pool of active listeners.
- *
- * @param listener
- * the session listener to be removed
- */
+ /**
+ * Removes the given SessionListener from the pool of active listeners.
+ *
+ * @param listener
+ * the session listener to be removed
+ */
void removeSessionListener(SessionListener listener);
}
Modified: stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/session/SessionManager.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/session/SessionManager.java?rev=1395504&r1=1395503&r2=1395504&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/session/SessionManager.java (original)
+++ stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/session/SessionManager.java Mon Oct 8 10:25:06 2012
@@ -27,7 +27,7 @@ import org.semanticweb.owlapi.model.OWLO
* of sessions, creates new ones and either destroys or stores existing ones persistently. All sessions are
* managed via unique identifiers of the <code>org.semanticweb.owlapi.model.IRI</code> type.<br>
* <br>
- * NOTE: implementations should be synchronized, or document whenever they are not.
+ * NOTE: implementations should either be synchronized, or document whenever they are not.
*
* @author alexdma
*
Modified: stanbol/trunk/ontologymanager/multiplexer/clerezza/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/multiplexer/clerezza/pom.xml?rev=1395504&r1=1395503&r2=1395504&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/multiplexer/clerezza/pom.xml (original)
+++ stanbol/trunk/ontologymanager/multiplexer/clerezza/pom.xml Mon Oct 8 10:25:06 2012
@@ -118,7 +118,14 @@
<artifactId>rdf.utils</artifactId>
<scope>test</scope>
</dependency>
-
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ </dependency>
</dependencies>