You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by co...@apache.org on 2011/03/25 15:08:55 UTC
svn commit: r1085383 - in
/incubator/stanbol/trunk/kres/ontologymanager/ontonet: ./
src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/
src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/registry/
src/main/java/org/apache/stanbol/on...
Author: concelvio
Date: Fri Mar 25 14:08:54 2011
New Revision: 1085383
URL: http://svn.apache.org/viewvc?rev=1085383&view=rev
Log:
STANBOL-39:
- changed parent version in pom.xml to ${stanbol-version}
- removed kres-version from pom.xml
- changed name ONManager.java to ONManagerImpl.java
- changed name KReSONManager.java to ONManager.java
- changed name RegistryLoader.java to RegistryLoaderImpl.java
- changed name KReSRegistryLodare.java to RegistryLoader.java
- changed name KReSSession.java to Session.java
- changed name KReSSessionImpl.java to SessionImpl.java
- changed name KReSSessionIDGenerator.java to SessionIDGenerator.java
- changed name KReSSessionManagerImpl.java to SessionManagerImpl.java
- change class reference where required
Added:
incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ONManager.java
- copied, changed from r1085259, incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/KReSONManager.java
incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/registry/RegistryLoader.java
- copied, changed from r1085259, incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/registry/KReSRegistryLoader.java
incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/Session.java
- copied, changed from r1085259, incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/KReSSession.java
incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/SessionIDGenerator.java
- copied, changed from r1085259, incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/KReSSessionIDGenerator.java
incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ONManagerImpl.java
- copied, changed from r1085259, incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ONManager.java
incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/registry/model/impl/RegistryLoaderImpl.java
- copied, changed from r1085259, incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/registry/model/impl/RegistryLoader.java
incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/session/SessionImpl.java
- copied, changed from r1085259, incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/session/KReSSessionImpl.java
incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/session/SessionManagerImpl.java
- copied, changed from r1085259, incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/session/KReSSessionManagerImpl.java
Removed:
incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/KReSONManager.java
incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/registry/KReSRegistryLoader.java
incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/KReSSession.java
incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/KReSSessionIDGenerator.java
incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ONManager.java
incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/registry/model/impl/RegistryLoader.java
incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/session/KReSSessionImpl.java
incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/session/KReSSessionManagerImpl.java
Modified:
incubator/stanbol/trunk/kres/ontologymanager/ontonet/pom.xml
incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/KReSSessionManager.java
incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/SessionEvent.java
incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/SessionManager.java
incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/io/OntologyRegistryIRISource.java
incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ontology/OntologyIndexImpl.java
incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/renderers/SessionRenderer.java
incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/session/ScopeSessionSynchronizer.java
incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/session/TimestampedSessionIDGenerator.java
incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/xd/utils/RDFSLabelGetter.java
incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/Namespace.java
incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/ontology/TestIndexing.java
incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/ontology/TestOntologyScope.java
incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/ontology/TestOntologySpaces.java
incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/registry/TestRegistry.java
incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/session/TestSessions.java
Modified: incubator/stanbol/trunk/kres/ontologymanager/ontonet/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/ontologymanager/ontonet/pom.xml?rev=1085383&r1=1085382&r2=1085383&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/ontologymanager/ontonet/pom.xml (original)
+++ incubator/stanbol/trunk/kres/ontologymanager/ontonet/pom.xml Fri Mar 25 14:08:54 2011
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>stanbol-parent</artifactId>
- <version>0.9-SNAPSHOT</version>
+ <version>${stanbol-version}</version>
<relativePath>../../../parent</relativePath>
</parent>
@@ -39,10 +39,6 @@
<inceptionYear>2010</inceptionYear>
- <properties>
- <kres-version>0.7</kres-version>
- </properties>
-
<build>
<plugins>
<plugin>
Copied: incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ONManager.java (from r1085259, incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/KReSONManager.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ONManager.java?p2=incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ONManager.java&p1=incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/KReSONManager.java&r1=1085259&r2=1085383&rev=1085383&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/KReSONManager.java (original)
+++ incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ONManager.java Fri Mar 25 14:08:54 2011
@@ -4,7 +4,7 @@ import org.apache.stanbol.ontologymanage
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyScopeFactory;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologySpaceFactory;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.ScopeRegistry;
-import org.apache.stanbol.ontologymanager.ontonet.api.registry.KReSRegistryLoader;
+import org.apache.stanbol.ontologymanager.ontonet.api.registry.RegistryLoader;
import org.apache.stanbol.ontologymanager.ontonet.api.session.KReSSessionManager;
import org.apache.stanbol.ontologymanager.ontonet.impl.ontology.OntologyStorage;
import org.semanticweb.owlapi.model.OWLDataFactory;
@@ -18,7 +18,7 @@ import org.semanticweb.owlapi.model.OWLO
* @author andrea.nuzzolese
*
*/
-public interface KReSONManager {
+public interface ONManager {
/**
* Returns the default object that automatically indexes ontologies as they
@@ -74,7 +74,7 @@ public interface KReSONManager {
*
* @return the default ontology registry loader.
*/
- public KReSRegistryLoader getRegistryLoader();
+ public RegistryLoader getRegistryLoader();
/**
* Returns the unique ontology scope registry for this context.
Copied: incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/registry/RegistryLoader.java (from r1085259, incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/registry/KReSRegistryLoader.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/registry/RegistryLoader.java?p2=incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/registry/RegistryLoader.java&p1=incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/registry/KReSRegistryLoader.java&r1=1085259&r2=1085383&rev=1085383&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/registry/KReSRegistryLoader.java (original)
+++ incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/registry/RegistryLoader.java Fri Mar 25 14:08:54 2011
@@ -11,7 +11,7 @@ import org.semanticweb.owlapi.model.OWLO
import org.semanticweb.owlapi.model.OWLOntologyCreationException;
import org.semanticweb.owlapi.model.OWLOntologyManager;
-public interface KReSRegistryLoader {
+public interface RegistryLoader {
public Set<OWLOntology> gatherOntologies(RegistryItem registryItem,
Modified: incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/KReSSessionManager.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/KReSSessionManager.java?rev=1085383&r1=1085382&r2=1085383&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/KReSSessionManager.java (original)
+++ incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/KReSSessionManager.java Fri Mar 25 14:08:54 2011
@@ -30,7 +30,7 @@ public interface KReSSessionManager exte
*
* @return the generated KReS session
*/
- public KReSSession createSession();
+ public Session createSession();
/**
* Generates AND REGISTERS a new KReS session and tries to assign it the
@@ -44,7 +44,7 @@ public interface KReSSessionManager exte
* @throws DuplicateSessionIDException
* if a KReS session with that sessionID is already registered
*/
- public KReSSession createSession(IRI sessionID)
+ public Session createSession(IRI sessionID)
throws DuplicateSessionIDException;
/**
@@ -63,7 +63,7 @@ public interface KReSSessionManager exte
* the IRI that uniquely identifies the session
* @return the unique KReS session identified by <code>sessionID</code>
*/
- public KReSSession getSession(IRI sessionID);
+ public Session getSession(IRI sessionID);
/**
* Returns the ontology space associated with this session.
Copied: incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/Session.java (from r1085259, incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/KReSSession.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/Session.java?p2=incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/Session.java&p1=incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/KReSSession.java&r1=1085259&r2=1085383&rev=1085383&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/KReSSession.java (original)
+++ incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/Session.java Fri Mar 25 14:08:54 2011
@@ -8,7 +8,7 @@ import org.semanticweb.owlapi.model.IRI;
* @author alessandro
*
*/
-public interface KReSSession extends SessionListenable {
+public interface Session extends SessionListenable {
/**
* The states a KReS session can be in: ACTIVE (for running sessions),
Modified: incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/SessionEvent.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/SessionEvent.java?rev=1085383&r1=1085382&r2=1085383&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/SessionEvent.java (original)
+++ incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/SessionEvent.java Fri Mar 25 14:08:54 2011
@@ -15,7 +15,7 @@ public class SessionEvent {
/**
* The KReS session affected by this event.
*/
- private KReSSession affectedSession;
+ private Session affectedSession;
private OperationType operationType;
@@ -29,7 +29,7 @@ public class SessionEvent {
* @param session
* the KReS session affected by this event
*/
- public SessionEvent(KReSSession session, OperationType operationType)
+ public SessionEvent(Session session, OperationType operationType)
throws Exception {
if (operationType == null)
throw new Exception(
@@ -46,7 +46,7 @@ public class SessionEvent {
*
* @return the affected KReS session
*/
- public KReSSession getSession() {
+ public Session getSession() {
return affectedSession;
}
Copied: incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/SessionIDGenerator.java (from r1085259, incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/KReSSessionIDGenerator.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/SessionIDGenerator.java?p2=incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/SessionIDGenerator.java&p1=incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/KReSSessionIDGenerator.java&r1=1085259&r2=1085383&rev=1085383&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/KReSSessionIDGenerator.java (original)
+++ incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/SessionIDGenerator.java Fri Mar 25 14:08:54 2011
@@ -12,7 +12,7 @@ import org.semanticweb.owlapi.model.IRI;
* @author alessandro
*
*/
-public interface KReSSessionIDGenerator {
+public interface SessionIDGenerator {
/**
* Generates a new context-free session ID. Whether this causes duplicate
Modified: incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/SessionManager.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/SessionManager.java?rev=1085383&r1=1085382&r2=1085383&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/SessionManager.java (original)
+++ incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/SessionManager.java Fri Mar 25 14:08:54 2011
@@ -42,7 +42,7 @@ public interface SessionManager {
*
* @return the generated KReS session
*/
- public KReSSession createSession();
+ public Session createSession();
/**
* Generates a new KReS session and tries to assign it the supplied session
@@ -56,7 +56,7 @@ public interface SessionManager {
* @throws DuplicateSessionIDException
* if a KReS session with that sessionID is already registered
*/
- public KReSSession createSession(IRI sessionID)
+ public Session createSession(IRI sessionID)
throws DuplicateSessionIDException;
/**
@@ -75,7 +75,7 @@ public interface SessionManager {
* the IRI that uniquely identifies the session
* @return the unique KReS session identified by <code>sessionID</code>
*/
- public KReSSession getSession(IRI sessionID);
+ public Session getSession(IRI sessionID);
/**
* Returns all the registered session listeners. It is up to developers to
Copied: incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ONManagerImpl.java (from r1085259, incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ONManager.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ONManagerImpl.java?p2=incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ONManagerImpl.java&p1=incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ONManager.java&r1=1085259&r2=1085383&rev=1085383&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ONManager.java (original)
+++ incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ONManagerImpl.java Fri Mar 25 14:08:54 2011
@@ -14,7 +14,7 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.Service;
import org.apache.stanbol.ontologymanager.ontonet.api.DuplicateIDException;
-import org.apache.stanbol.ontologymanager.ontonet.api.KReSONManager;
+import org.apache.stanbol.ontologymanager.ontonet.api.ONManager;
import org.apache.stanbol.ontologymanager.ontonet.api.io.BlankOntologySource;
import org.apache.stanbol.ontologymanager.ontonet.api.io.OntologyInputSource;
import org.apache.stanbol.ontologymanager.ontonet.api.io.RootOntologyIRISource;
@@ -34,8 +34,8 @@ import org.apache.stanbol.ontologymanage
import org.apache.stanbol.ontologymanager.ontonet.impl.ontology.OntologySpaceFactoryImpl;
import org.apache.stanbol.ontologymanager.ontonet.impl.ontology.OntologyStorage;
import org.apache.stanbol.ontologymanager.ontonet.impl.ontology.ScopeRegistryImpl;
-import org.apache.stanbol.ontologymanager.ontonet.impl.registry.model.impl.RegistryLoader;
-import org.apache.stanbol.ontologymanager.ontonet.impl.session.KReSSessionManagerImpl;
+import org.apache.stanbol.ontologymanager.ontonet.impl.registry.model.impl.RegistryLoaderImpl;
+import org.apache.stanbol.ontologymanager.ontonet.impl.session.SessionManagerImpl;
import org.apache.stanbol.ontologymanager.ontonet.impl.session.ScopeSessionSynchronizer;
import org.osgi.service.component.ComponentContext;
import org.semanticweb.owlapi.apibinding.OWLManager;
@@ -59,19 +59,19 @@ import org.slf4j.LoggerFactory;
*
*/
@Component(immediate = true, metatype = true)
-@Service(KReSONManager.class)
+@Service(ONManager.class)
// @Property(name="service.ranking",intValue=5)
-public class ONManager implements KReSONManager {
+public class ONManagerImpl implements ONManager {
public static final String _ALIAS_DEFAULT = "/ontology";
public static final String _CONFIG_FILE_PATH_DEFAULT = "";
public static final String _KRES_NAMESPACE_DEFAULT = "http://kres.iksproject.eu/";
// @Property(value = _ALIAS_DEFAULT)
- public static final String ALIAS = "eu.iksproject.kres.manager.ontologyNetworkManager.alias";
+ public static final String ALIAS = "org.apache.stanbol.ontologyNetworkManager.alias";
@Property(value = _CONFIG_FILE_PATH_DEFAULT)
- public static String CONFIG_FILE_PATH = "eu.iksproject.kres.manager.ontologyNetworkManager.config_ont";
+ public static String CONFIG_FILE_PATH = "org.apache.stanbol.ontologyNetworkManager.config_ont";
@Property(value = _KRES_NAMESPACE_DEFAULT)
public static String KRES_NAMESPACE = "kres.namespace";
@@ -81,9 +81,9 @@ public class ONManager implements KReSON
private String configPath = _CONFIG_FILE_PATH_DEFAULT;
private String kresNs = _KRES_NAMESPACE_DEFAULT;
- // private static ONManager me = new ONManager();
+ // private static ONManagerImpl me = new ONManagerImpl();
//
- // public static ONManager get() {
+ // public static ONManagerImpl get() {
// return me;
// }
@@ -101,7 +101,7 @@ public class ONManager implements KReSON
private OWLDataFactory owlFactory;
- private RegistryLoader registryLoader;
+ private RegistryLoaderImpl registryLoader;
private ScopeRegistry scopeRegistry;
@@ -120,7 +120,7 @@ public class ONManager implements KReSON
*/
private String[] toActivate = new String[] {};
- public ONManager() {
+ public ONManagerImpl() {
super();
owlFactory = OWLManager.getOWLDataFactory();
owlCacheManager = OWLManager.createOWLOntologyManager();
@@ -135,13 +135,13 @@ public class ONManager implements KReSON
ontologyScopeFactory.addScopeEventListener(oIndex);
// This requires the OWL cache manager
- registryLoader = new RegistryLoader(this);
+ registryLoader = new RegistryLoaderImpl(this);
// TODO : assign dynamically in case the FISE persistence store is not
// available.
// storage = new FISEPersistenceStorage();
- sessionManager = new KReSSessionManagerImpl(IRI.create("http://kres.iks-project.eu/"),
+ sessionManager = new SessionManagerImpl(IRI.create("http://kres.iks-project.eu/"),
getScopeRegistry(), storage);
sessionManager.addSessionListener(new ScopeSessionSynchronizer(this));
}
@@ -151,7 +151,7 @@ public class ONManager implements KReSON
*
* TODO : Felix component constraints prevent this constructor from being private, find a way around...
*/
- public ONManager(TcManager tcm, WeightedTcProvider wtcp, Dictionary<String,Object> configuration) {
+ public ONManagerImpl(TcManager tcm, WeightedTcProvider wtcp, Dictionary<String,Object> configuration) {
this();
storage = new OntologyStorage(tcm, wtcp);
try {
@@ -169,7 +169,7 @@ public class ONManager implements KReSON
@SuppressWarnings("unchecked")
@Activate
protected void activate(ComponentContext context) throws IOException {
- log.info("in " + ONManager.class + " activate with context " + context);
+ log.info("in " + ONManagerImpl.class + " activate with context " + context);
if (context == null) {
throw new IllegalStateException("No valid" + ComponentContext.class + " parsed in activate!");
}
@@ -324,11 +324,11 @@ public class ONManager implements KReSON
}
/**
- * Deactivation of the ONManager resets all its resources.
+ * Deactivation of the ONManagerImpl resets all its resources.
*/
@Deactivate
protected void deactivate(ComponentContext context) {
- log.info("in " + ONManager.class + " deactivate with context " + context);
+ log.info("in " + ONManagerImpl.class + " deactivate with context " + context);
}
@Override
@@ -381,7 +381,7 @@ public class ONManager implements KReSON
*
* @return the default ontology registry loader
*/
- public RegistryLoader getRegistryLoader() {
+ public RegistryLoaderImpl getRegistryLoader() {
return registryLoader;
}
Modified: incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/io/OntologyRegistryIRISource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/io/OntologyRegistryIRISource.java?rev=1085383&r1=1085382&r2=1085383&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/io/OntologyRegistryIRISource.java (original)
+++ incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/io/OntologyRegistryIRISource.java Fri Mar 25 14:08:54 2011
@@ -5,7 +5,7 @@ import java.util.Set;
import org.apache.stanbol.ontologymanager.ontonet.api.io.AbstractOntologyInputSource;
import org.apache.stanbol.ontologymanager.ontonet.api.io.OntologyInputSource;
-import org.apache.stanbol.ontologymanager.ontonet.api.registry.KReSRegistryLoader;
+import org.apache.stanbol.ontologymanager.ontonet.api.registry.RegistryLoader;
import org.apache.stanbol.ontologymanager.ontonet.api.registry.models.Registry;
import org.apache.stanbol.ontologymanager.ontonet.api.registry.models.RegistryItem;
import org.apache.stanbol.ontologymanager.ontonet.impl.util.OntologyUtils;
@@ -31,7 +31,7 @@ public class OntologyRegistryIRISource e
protected IRI registryIRI = null;
public OntologyRegistryIRISource(IRI registryIRI,
- OWLOntologyManager ontologyManager, KReSRegistryLoader loader) {
+ OWLOntologyManager ontologyManager, RegistryLoader loader) {
this(registryIRI, ontologyManager, loader, null);
}
@@ -43,7 +43,7 @@ public class OntologyRegistryIRISource e
* @param registryIRI
*/
public OntologyRegistryIRISource(IRI registryIRI,
- OWLOntologyManager ontologyManager, KReSRegistryLoader loader,
+ OWLOntologyManager ontologyManager, RegistryLoader loader,
OntologyInputSource parentSrc) {
this.registryIRI = registryIRI;
Modified: incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ontology/OntologyIndexImpl.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ontology/OntologyIndexImpl.java?rev=1085383&r1=1085382&r2=1085383&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ontology/OntologyIndexImpl.java (original)
+++ incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ontology/OntologyIndexImpl.java Fri Mar 25 14:08:54 2011
@@ -5,7 +5,7 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import org.apache.stanbol.ontologymanager.ontonet.api.KReSONManager;
+import org.apache.stanbol.ontologymanager.ontonet.api.ONManager;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.NoSuchScopeException;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyIndex;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyScope;
@@ -26,9 +26,9 @@ public class OntologyIndexImpl implement
private ScopeRegistry scopeRegistry;
- private KReSONManager onm;
+ private ONManager onm;
- public OntologyIndexImpl(KReSONManager onm) {
+ public OntologyIndexImpl(ONManager onm) {
ontScopeMap = new HashMap<IRI, Set<IRI>>();
if (onm == null)
Copied: incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/registry/model/impl/RegistryLoaderImpl.java (from r1085259, incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/registry/model/impl/RegistryLoader.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/registry/model/impl/RegistryLoaderImpl.java?p2=incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/registry/model/impl/RegistryLoaderImpl.java&p1=incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/registry/model/impl/RegistryLoader.java&r1=1085259&r2=1085383&rev=1085383&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/registry/model/impl/RegistryLoader.java (original)
+++ incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/registry/model/impl/RegistryLoaderImpl.java Fri Mar 25 14:08:54 2011
@@ -14,8 +14,8 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.stanbol.ontologymanager.ontonet.api.KReSONManager;
-import org.apache.stanbol.ontologymanager.ontonet.api.registry.KReSRegistryLoader;
+import org.apache.stanbol.ontologymanager.ontonet.api.ONManager;
+import org.apache.stanbol.ontologymanager.ontonet.api.registry.RegistryLoader;
import org.apache.stanbol.ontologymanager.ontonet.api.registry.io.XDRegistrySource;
import org.apache.stanbol.ontologymanager.ontonet.api.registry.models.AbstractRegistryItem;
import org.apache.stanbol.ontologymanager.ontonet.api.registry.models.Registry;
@@ -50,11 +50,11 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class RegistryLoader implements KReSRegistryLoader {
+public class RegistryLoaderImpl implements RegistryLoader {
private final OWLClass cRegistryLibrary;
- private KReSONManager onm;
+ private ONManager onm;
private Logger log = LoggerFactory.getLogger(getClass());
@@ -67,7 +67,7 @@ public class RegistryLoader implements K
/**
*/
- public RegistryLoader(KReSONManager onm) {
+ public RegistryLoaderImpl(ONManager onm) {
this.onm = onm;
OWLDataFactory factory = OWLManager.getOWLDataFactory();
cRegistryLibrary = factory.getOWLClass(IRI
Modified: incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/renderers/SessionRenderer.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/renderers/SessionRenderer.java?rev=1085383&r1=1085382&r2=1085383&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/renderers/SessionRenderer.java (original)
+++ incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/renderers/SessionRenderer.java Fri Mar 25 14:08:54 2011
@@ -3,7 +3,7 @@ package org.apache.stanbol.ontologymanag
import java.util.LinkedList;
import java.util.List;
-import org.apache.stanbol.ontologymanager.ontonet.api.session.KReSSession;
+import org.apache.stanbol.ontologymanager.ontonet.api.session.Session;
import org.semanticweb.owlapi.apibinding.OWLManager;
import org.semanticweb.owlapi.io.RDFXMLOntologyFormat;
import org.semanticweb.owlapi.io.StringDocumentTarget;
@@ -41,7 +41,7 @@ public class SessionRenderer {
}
- public static String getSessionMetadataRDF(KReSSession session) {
+ public static String getSessionMetadataRDF(Session session) {
OWLOntologyManager mgr = OWLManager.createOWLOntologyManager();
OWLOntology ont = null;
try {
Modified: incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/session/ScopeSessionSynchronizer.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/session/ScopeSessionSynchronizer.java?rev=1085383&r1=1085382&r2=1085383&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/session/ScopeSessionSynchronizer.java (original)
+++ incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/session/ScopeSessionSynchronizer.java Fri Mar 25 14:08:54 2011
@@ -1,18 +1,18 @@
package org.apache.stanbol.ontologymanager.ontonet.impl.session;
-import org.apache.stanbol.ontologymanager.ontonet.api.KReSONManager;
+import org.apache.stanbol.ontologymanager.ontonet.api.ONManager;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyScope;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologySpaceFactory;
-import org.apache.stanbol.ontologymanager.ontonet.api.session.KReSSession;
+import org.apache.stanbol.ontologymanager.ontonet.api.session.Session;
import org.apache.stanbol.ontologymanager.ontonet.api.session.SessionEvent;
import org.apache.stanbol.ontologymanager.ontonet.api.session.SessionListener;
import org.semanticweb.owlapi.model.IRI;
public class ScopeSessionSynchronizer implements SessionListener {
- private KReSONManager manager;
+ private ONManager manager;
- public ScopeSessionSynchronizer(KReSONManager manager) {
+ public ScopeSessionSynchronizer(ONManager manager) {
// WARN do not use ONManager here, as it will most probably be
// instantiated by it.
this.manager = manager;
@@ -32,7 +32,7 @@ public class ScopeSessionSynchronizer im
public void sessionChanged(SessionEvent event) {
// System.err.println("Session " + event.getSession() + " has been "
// + event.getOperationType());
- KReSSession ses = event.getSession();
+ Session ses = event.getSession();
switch (event.getOperationType()) {
case CREATE:
ses.addSessionListener(this);
Copied: incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/session/SessionImpl.java (from r1085259, incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/session/KReSSessionImpl.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/session/SessionImpl.java?p2=incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/session/SessionImpl.java&p1=incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/session/KReSSessionImpl.java&r1=1085259&r2=1085383&rev=1085383&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/session/KReSSessionImpl.java (original)
+++ incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/session/SessionImpl.java Fri Mar 25 14:08:54 2011
@@ -4,23 +4,23 @@ import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
-import org.apache.stanbol.ontologymanager.ontonet.api.session.KReSSession;
+import org.apache.stanbol.ontologymanager.ontonet.api.session.Session;
import org.apache.stanbol.ontologymanager.ontonet.api.session.NonReferenceableSessionException;
import org.apache.stanbol.ontologymanager.ontonet.api.session.SessionEvent;
import org.apache.stanbol.ontologymanager.ontonet.api.session.SessionListener;
-import org.apache.stanbol.ontologymanager.ontonet.api.session.KReSSession.State;
+import org.apache.stanbol.ontologymanager.ontonet.api.session.Session.State;
import org.apache.stanbol.ontologymanager.ontonet.api.session.SessionEvent.OperationType;
import org.semanticweb.owlapi.model.IRI;
import org.slf4j.LoggerFactory;
/**
- * Standard implementation of the {@link KReSSession} interface. A
- * KReSSessionImpl is initially inactive and creates its own identifier.
+ * Standard implementation of the {@link Session} interface. A
+ * SessionImpl is initially inactive and creates its own identifier.
*
* @author alessandro
*
*/
-public class KReSSessionImpl implements KReSSession {
+public class SessionImpl implements Session {
/**
* A KReS session knows about its own ID.
@@ -41,12 +41,12 @@ public class KReSSessionImpl implements
* @param sessionID
* the IRI to be set as unique identifier for this session
*/
- public KReSSessionImpl(IRI sessionID) {
+ public SessionImpl(IRI sessionID) {
this.id = sessionID;
listeners = new HashSet<SessionListener>();
}
- public KReSSessionImpl(IRI sessionID, State initialState)
+ public SessionImpl(IRI sessionID, State initialState)
throws NonReferenceableSessionException {
this(sessionID);
if (initialState == State.ZOMBIE)
@@ -82,7 +82,7 @@ public class KReSSessionImpl implements
/*
* (non-Javadoc)
*
- * @see eu.iksproject.kres.api.manager.session.KReSSession#close()
+ * @see eu.iksproject.kres.api.manager.session.Session#close()
*/
@Override
public void close() throws NonReferenceableSessionException {
@@ -95,7 +95,7 @@ public class KReSSessionImpl implements
/*
* (non-Javadoc)
*
- * @see eu.iksproject.kres.api.manager.session.KReSSession#getID()
+ * @see eu.iksproject.kres.api.manager.session.Session#getID()
*/
@Override
public IRI getID() {
@@ -117,7 +117,7 @@ public class KReSSessionImpl implements
/*
* (non-Javadoc)
*
- * @see eu.iksproject.kres.api.manager.session.KReSSession#getSessionState()
+ * @see eu.iksproject.kres.api.manager.session.Session#getSessionState()
*/
@Override
public State getSessionState() {
@@ -127,7 +127,7 @@ public class KReSSessionImpl implements
/*
* (non-Javadoc)
*
- * @see eu.iksproject.kres.api.manager.session.KReSSession#isActive()
+ * @see eu.iksproject.kres.api.manager.session.Session#isActive()
*/
@Override
public boolean isActive() {
@@ -143,7 +143,7 @@ public class KReSSessionImpl implements
* (non-Javadoc)
*
* @see
- * eu.iksproject.kres.api.manager.session.KReSSession#setActive(boolean)
+ * eu.iksproject.kres.api.manager.session.Session#setActive(boolean)
*/
@Override
public State setActive(boolean active)
Copied: incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/session/SessionManagerImpl.java (from r1085259, incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/session/KReSSessionManagerImpl.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/session/SessionManagerImpl.java?p2=incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/session/SessionManagerImpl.java&p1=incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/session/KReSSessionManagerImpl.java&r1=1085259&r2=1085383&rev=1085383&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/session/KReSSessionManagerImpl.java (original)
+++ incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/session/SessionManagerImpl.java Fri Mar 25 14:08:54 2011
@@ -11,13 +11,13 @@ import org.apache.stanbol.ontologymanage
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.ScopeRegistry;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.SessionOntologySpace;
import org.apache.stanbol.ontologymanager.ontonet.api.session.DuplicateSessionIDException;
-import org.apache.stanbol.ontologymanager.ontonet.api.session.KReSSession;
-import org.apache.stanbol.ontologymanager.ontonet.api.session.KReSSessionIDGenerator;
+import org.apache.stanbol.ontologymanager.ontonet.api.session.Session;
+import org.apache.stanbol.ontologymanager.ontonet.api.session.SessionIDGenerator;
import org.apache.stanbol.ontologymanager.ontonet.api.session.KReSSessionManager;
import org.apache.stanbol.ontologymanager.ontonet.api.session.NonReferenceableSessionException;
import org.apache.stanbol.ontologymanager.ontonet.api.session.SessionEvent;
import org.apache.stanbol.ontologymanager.ontonet.api.session.SessionListener;
-import org.apache.stanbol.ontologymanager.ontonet.api.session.KReSSession.State;
+import org.apache.stanbol.ontologymanager.ontonet.api.session.Session.State;
import org.apache.stanbol.ontologymanager.ontonet.api.session.SessionEvent.OperationType;
import org.apache.stanbol.ontologymanager.ontonet.impl.ontology.OntologyStorage;
import org.semanticweb.owlapi.model.IRI;
@@ -35,23 +35,23 @@ import org.slf4j.LoggerFactory;
* @author alessandro
*
*/
-public class KReSSessionManagerImpl implements KReSSessionManager {
+public class SessionManagerImpl implements KReSSessionManager {
- private Map<IRI, KReSSession> sessionsByID;
+ private Map<IRI, Session> sessionsByID;
protected Set<SessionListener> listeners;
protected Logger log = LoggerFactory.getLogger(getClass());
- protected KReSSessionIDGenerator idgen;
+ protected SessionIDGenerator idgen;
protected ScopeRegistry scopeRegistry;
protected OntologyStorage store;
- public KReSSessionManagerImpl(IRI baseIri, ScopeRegistry scopeRegistry, OntologyStorage store) {
+ public SessionManagerImpl(IRI baseIri, ScopeRegistry scopeRegistry, OntologyStorage store) {
idgen = new TimestampedSessionIDGenerator(baseIri);
listeners = new HashSet<SessionListener>();
- sessionsByID = new HashMap<IRI, KReSSession>();
+ sessionsByID = new HashMap<IRI, Session>();
this.scopeRegistry = scopeRegistry;
this.store = store;
}
@@ -87,9 +87,9 @@ this.scopeRegistry = scopeRegistry;
* eu.iksproject.kres.api.manager.session.SessionManager#createSession()
*/
@Override
- public KReSSession createSession() {
+ public Session createSession() {
Set<IRI> exclude = getRegisteredSessionIDs();
- KReSSession session = null;
+ Session session = null;
while (session == null)
try {
session = createSession(idgen.createSessionID(exclude));
@@ -108,11 +108,11 @@ this.scopeRegistry = scopeRegistry;
* .semanticweb.owlapi.model.IRI)
*/
@Override
- public KReSSession createSession(IRI sessionID)
+ public Session createSession(IRI sessionID)
throws DuplicateSessionIDException {
if (sessionsByID.containsKey(sessionID))
throw new DuplicateSessionIDException(sessionID);
- KReSSession session = new KReSSessionImpl(sessionID);
+ Session session = new SessionImpl(sessionID);
addSession(session);
fireSessionCreated(session);
return session;
@@ -128,10 +128,10 @@ this.scopeRegistry = scopeRegistry;
@Override
public void destroySession(IRI sessionID) {
try {
- KReSSession ses = sessionsByID.get(sessionID);
+ Session ses = sessionsByID.get(sessionID);
ses.close();
- if (ses instanceof KReSSessionImpl)
- ((KReSSessionImpl) ses).state = State.ZOMBIE;
+ if (ses instanceof SessionImpl)
+ ((SessionImpl) ses).state = State.ZOMBIE;
// Make session no longer referenceable
removeSession(ses);
fireSessionDestroyed(ses);
@@ -151,7 +151,7 @@ this.scopeRegistry = scopeRegistry;
* semanticweb.owlapi.model.IRI)
*/
@Override
- public KReSSession getSession(IRI sessionID) {
+ public Session getSession(IRI sessionID) {
return sessionsByID.get(sessionID);
}
@@ -160,7 +160,7 @@ this.scopeRegistry = scopeRegistry;
return sessionsByID.keySet();
}
- protected void fireSessionCreated(KReSSession session) {
+ protected void fireSessionCreated(Session session) {
SessionEvent e;
try {
e = new SessionEvent(session, OperationType.CREATE);
@@ -177,7 +177,7 @@ this.scopeRegistry = scopeRegistry;
}
- protected void fireSessionDestroyed(KReSSession session) {
+ protected void fireSessionDestroyed(Session session) {
SessionEvent e;
try {
e = new SessionEvent(session, OperationType.KILL);
@@ -194,13 +194,13 @@ this.scopeRegistry = scopeRegistry;
}
- protected void addSession(KReSSession session) {
+ protected void addSession(Session session) {
sessionsByID.put(session.getID(), session);
}
- protected void removeSession(KReSSession session) {
+ protected void removeSession(Session session) {
IRI id = session.getID();
- KReSSession s2 = sessionsByID.get(id);
+ Session s2 = sessionsByID.get(id);
if (session == s2)
sessionsByID.remove(id);
}
Modified: incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/session/TimestampedSessionIDGenerator.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/session/TimestampedSessionIDGenerator.java?rev=1085383&r1=1085382&r2=1085383&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/session/TimestampedSessionIDGenerator.java (original)
+++ incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/session/TimestampedSessionIDGenerator.java Fri Mar 25 14:08:54 2011
@@ -3,12 +3,12 @@ package org.apache.stanbol.ontologymanag
import java.util.Date;
import java.util.Set;
-import org.apache.stanbol.ontologymanager.ontonet.api.session.KReSSessionIDGenerator;
+import org.apache.stanbol.ontologymanager.ontonet.api.session.SessionIDGenerator;
import org.apache.stanbol.ontologymanager.ontonet.impl.util.StringUtils;
import org.semanticweb.owlapi.model.IRI;
-public class TimestampedSessionIDGenerator implements KReSSessionIDGenerator {
+public class TimestampedSessionIDGenerator implements SessionIDGenerator {
private IRI baseIRI;
Modified: incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/xd/utils/RDFSLabelGetter.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/xd/utils/RDFSLabelGetter.java?rev=1085383&r1=1085382&r2=1085383&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/xd/utils/RDFSLabelGetter.java (original)
+++ incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/xd/utils/RDFSLabelGetter.java Fri Mar 25 14:08:54 2011
@@ -7,7 +7,7 @@ import java.util.Map;
import java.util.Set;
import java.util.Map.Entry;
-import org.apache.stanbol.ontologymanager.ontonet.impl.ONManager;
+import org.apache.stanbol.ontologymanager.ontonet.impl.ONManagerImpl;
import org.apache.stanbol.ontologymanager.ontonet.xd.lang.Language;
import org.semanticweb.owlapi.apibinding.OWLManager;
import org.semanticweb.owlapi.model.IRI;
Modified: incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/Namespace.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/Namespace.java?rev=1085383&r1=1085382&r2=1085383&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/Namespace.java (original)
+++ incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/Namespace.java Fri Mar 25 14:08:54 2011
@@ -4,19 +4,19 @@ import static org.junit.Assert.assertNot
import java.util.Hashtable;
-import org.apache.stanbol.ontologymanager.ontonet.api.KReSONManager;
-import org.apache.stanbol.ontologymanager.ontonet.impl.ONManager;
+import org.apache.stanbol.ontologymanager.ontonet.api.ONManager;
+import org.apache.stanbol.ontologymanager.ontonet.impl.ONManagerImpl;
import org.junit.BeforeClass;
import org.junit.Test;
public class Namespace {
- private static KReSONManager onm;
+ private static ONManager onm;
@BeforeClass
public static void setUp() {
- // An ONManager with no store and default settings
- onm = new ONManager(null,null, new Hashtable<String, Object>());
+ // An ONManagerImpl with no store and default settings
+ onm = new ONManagerImpl(null,null, new Hashtable<String, Object>());
}
@Test
Modified: incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/ontology/TestIndexing.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/ontology/TestIndexing.java?rev=1085383&r1=1085382&r2=1085383&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/ontology/TestIndexing.java (original)
+++ incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/ontology/TestIndexing.java Fri Mar 25 14:08:54 2011
@@ -9,13 +9,13 @@ import static org.junit.Assert.fail;
import java.util.Hashtable;
import org.apache.stanbol.ontologymanager.ontonet.api.DuplicateIDException;
-import org.apache.stanbol.ontologymanager.ontonet.api.KReSONManager;
+import org.apache.stanbol.ontologymanager.ontonet.api.ONManager;
import org.apache.stanbol.ontologymanager.ontonet.api.io.RootOntologyIRISource;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyIndex;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyScope;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologySpaceModificationException;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.UnmodifiableOntologySpaceException;
-import org.apache.stanbol.ontologymanager.ontonet.impl.ONManager;
+import org.apache.stanbol.ontologymanager.ontonet.impl.ONManagerImpl;
import org.apache.stanbol.ontologymanager.ontonet.impl.io.OntologyRegistryIRISource;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -28,7 +28,7 @@ import org.semanticweb.owlapi.model.OWLO
public class TestIndexing {
- private static KReSONManager onm;
+ private static ONManager onm;
private static OWLOntologyManager mgr = OWLManager
.createOWLOntologyManager();
@@ -49,8 +49,8 @@ public class TestIndexing {
@BeforeClass
public static void setup() {
- // An ONManager with no store and default settings
- onm = new ONManager(null,null, new Hashtable<String, Object>());
+ // An ONManagerImpl with no store and default settings
+ onm = new ONManagerImpl(null,null, new Hashtable<String, Object>());
// Since it is registered, this scope must be unique, or subsequent
// tests will fail on duplicate ID exceptions!
Modified: incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/ontology/TestOntologyScope.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/ontology/TestOntologyScope.java?rev=1085383&r1=1085382&r2=1085383&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/ontology/TestOntologyScope.java (original)
+++ incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/ontology/TestOntologyScope.java Fri Mar 25 14:08:54 2011
@@ -9,13 +9,13 @@ import java.util.Hashtable;
import org.apache.stanbol.ontologymanager.ontonet.Constants;
import org.apache.stanbol.ontologymanager.ontonet.api.DuplicateIDException;
-import org.apache.stanbol.ontologymanager.ontonet.api.KReSONManager;
+import org.apache.stanbol.ontologymanager.ontonet.api.ONManager;
import org.apache.stanbol.ontologymanager.ontonet.api.io.OntologyInputSource;
import org.apache.stanbol.ontologymanager.ontonet.api.io.RootOntologySource;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyScope;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyScopeFactory;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.ScopeRegistry;
-import org.apache.stanbol.ontologymanager.ontonet.impl.ONManager;
+import org.apache.stanbol.ontologymanager.ontonet.impl.ONManagerImpl;
import org.apache.stanbol.ontologymanager.ontonet.impl.ontology.CoreOntologySpaceImpl;
import org.apache.stanbol.ontologymanager.ontonet.impl.ontology.CustomOntologySpaceImpl;
import org.apache.stanbol.ontologymanager.ontonet.impl.ontology.OntologyScopeFactoryImpl;
@@ -44,7 +44,7 @@ public class TestOntologyScope {
*/
private static OntologyScope blankScope;
- private static KReSONManager onm;
+ private static ONManager onm;
private static OntologyScopeFactory factory = null;
@@ -58,8 +58,8 @@ public class TestOntologyScope {
@BeforeClass
public static void setup() {
- // An ONManager with no store and default settings
- onm = new ONManager(null,null, new Hashtable<String, Object>());
+ // An ONManagerImpl with no store and default settings
+ onm = new ONManagerImpl(null,null, new Hashtable<String, Object>());
factory = onm.getOntologyScopeFactory();
if (factory == null)
fail("Could not instantiate ontology space factory");
Modified: incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/ontology/TestOntologySpaces.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/ontology/TestOntologySpaces.java?rev=1085383&r1=1085382&r2=1085383&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/ontology/TestOntologySpaces.java (original)
+++ incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/ontology/TestOntologySpaces.java Fri Mar 25 14:08:54 2011
@@ -8,7 +8,7 @@ import static org.junit.Assert.fail;
import java.util.Hashtable;
import org.apache.stanbol.ontologymanager.ontonet.Constants;
-import org.apache.stanbol.ontologymanager.ontonet.api.KReSONManager;
+import org.apache.stanbol.ontologymanager.ontonet.api.ONManager;
import org.apache.stanbol.ontologymanager.ontonet.api.io.OntologyInputSource;
import org.apache.stanbol.ontologymanager.ontonet.api.io.RootOntologyIRISource;
import org.apache.stanbol.ontologymanager.ontonet.api.io.RootOntologySource;
@@ -18,7 +18,7 @@ import org.apache.stanbol.ontologymanage
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologySpaceModificationException;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.SessionOntologySpace;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.UnmodifiableOntologySpaceException;
-import org.apache.stanbol.ontologymanager.ontonet.impl.ONManager;
+import org.apache.stanbol.ontologymanager.ontonet.impl.ONManagerImpl;
import org.junit.BeforeClass;
import org.junit.Test;
import org.semanticweb.owlapi.apibinding.OWLManager;
@@ -46,7 +46,7 @@ public class TestOntologySpaces {
private static OWLOntology ont = null, ont2 = null;
- private static KReSONManager onm;
+ private static ONManager onm;
private static OntologyInputSource ontSrc, ont2Src, pizzaSrc, wineSrc;
@@ -56,8 +56,8 @@ public class TestOntologySpaces {
@BeforeClass
public static void setup() {
- // An ONManager with no store and default settings
- onm = new ONManager(null,null, new Hashtable<String, Object>());
+ // An ONManagerImpl with no store and default settings
+ onm = new ONManagerImpl(null,null, new Hashtable<String, Object>());
spaceFactory = onm.getOntologySpaceFactory();
if (spaceFactory == null)
fail("Could not instantiate ontology space factory");
Modified: incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/registry/TestRegistry.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/registry/TestRegistry.java?rev=1085383&r1=1085382&r2=1085383&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/registry/TestRegistry.java (original)
+++ incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/registry/TestRegistry.java Fri Mar 25 14:08:54 2011
@@ -6,12 +6,12 @@ import static org.junit.Assert.fail;
import java.util.Hashtable;
import org.apache.stanbol.ontologymanager.ontonet.api.DuplicateIDException;
-import org.apache.stanbol.ontologymanager.ontonet.api.KReSONManager;
+import org.apache.stanbol.ontologymanager.ontonet.api.ONManager;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.CoreOntologySpace;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyScope;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.SessionOntologySpace;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.UnmodifiableOntologySpaceException;
-import org.apache.stanbol.ontologymanager.ontonet.impl.ONManager;
+import org.apache.stanbol.ontologymanager.ontonet.impl.ONManagerImpl;
import org.apache.stanbol.ontologymanager.ontonet.impl.io.OntologyRegistryIRISource;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -20,7 +20,7 @@ import org.semanticweb.owlapi.model.IRI;
public class TestRegistry {
- private static KReSONManager onm;
+ private static ONManager onm;
private static IRI testRegistryIri = IRI
.create("http://www.ontologydesignpatterns.org/registry/krestest.owl");
@@ -31,8 +31,8 @@ public class TestRegistry {
@BeforeClass
public static void setup() {
- // An ONManager with no store and default settings
- onm = new ONManager(null,null, new Hashtable<String, Object>());
+ // An ONManagerImpl with no store and default settings
+ onm = new ONManagerImpl(null,null, new Hashtable<String, Object>());
}
@Test
Modified: incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/session/TestSessions.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/session/TestSessions.java?rev=1085383&r1=1085382&r2=1085383&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/session/TestSessions.java (original)
+++ incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/session/TestSessions.java Fri Mar 25 14:08:54 2011
@@ -13,18 +13,18 @@ import java.util.Set;
import org.apache.stanbol.ontologymanager.ontonet.Constants;
import org.apache.stanbol.ontologymanager.ontonet.api.DuplicateIDException;
-import org.apache.stanbol.ontologymanager.ontonet.api.KReSONManager;
+import org.apache.stanbol.ontologymanager.ontonet.api.ONManager;
import org.apache.stanbol.ontologymanager.ontonet.api.io.OntologyInputSource;
import org.apache.stanbol.ontologymanager.ontonet.api.io.RootOntologySource;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyScope;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyScopeFactory;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologySpaceFactory;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.ScopeRegistry;
-import org.apache.stanbol.ontologymanager.ontonet.api.session.KReSSession;
+import org.apache.stanbol.ontologymanager.ontonet.api.session.Session;
import org.apache.stanbol.ontologymanager.ontonet.api.session.KReSSessionManager;
import org.apache.stanbol.ontologymanager.ontonet.api.session.NonReferenceableSessionException;
-import org.apache.stanbol.ontologymanager.ontonet.api.session.KReSSession.State;
-import org.apache.stanbol.ontologymanager.ontonet.impl.ONManager;
+import org.apache.stanbol.ontologymanager.ontonet.api.session.Session.State;
+import org.apache.stanbol.ontologymanager.ontonet.impl.ONManagerImpl;
import org.junit.BeforeClass;
import org.junit.Test;
import org.semanticweb.owlapi.apibinding.OWLManager;
@@ -54,8 +54,8 @@ public class TestSessions {
@BeforeClass
public static void setup() {
- // An ONManager with no store and default settings
- KReSONManager onm = new ONManager(null,null, new Hashtable<String, Object>());
+ // An ONManagerImpl with no store and default settings
+ ONManager onm = new ONManagerImpl(null,null, new Hashtable<String, Object>());
sesmgr = onm.getSessionManager();
scopeFactory = onm.getOntologyScopeFactory();
spaceFactory = onm.getOntologySpaceFactory();
@@ -85,7 +85,7 @@ public class TestSessions {
+ e.getDulicateID());
}
assertNotNull(scope);
- KReSSession ses = sesmgr.createSession();
+ Session ses = sesmgr.createSession();
assertTrue(scope.getSessionSpaces().isEmpty());
scope.addSessionSpace(spaceFactory
.createSessionOntologySpace(scopeIri1), ses.getID());
@@ -111,7 +111,7 @@ public class TestSessions {
fail("Unexpected DuplicateIDException was caught while testing scope "
+ e.getDulicateID());
}
- KReSSession ses = sesmgr.createSession();
+ Session ses = sesmgr.createSession();
IRI sesid = ses.getID();
assertFalse(scope1.getSessionSpaces().isEmpty());
assertNotNull(scope1.getSessionSpace(sesid));
@@ -123,7 +123,7 @@ public class TestSessions {
@Test
public void testRegisterSession() {
int before = sesmgr.getRegisteredSessionIDs().size();
- KReSSession ses = sesmgr.createSession();
+ Session ses = sesmgr.createSession();
assertNotNull(ses);
assertEquals(before + 1, sesmgr.getRegisteredSessionIDs().size());
}
@@ -132,11 +132,11 @@ public class TestSessions {
public void testSessionCreationDestruction() {
int size = 500;
int initialSize = sesmgr.getRegisteredSessionIDs().size();
- Set<KReSSession> sessions = new HashSet<KReSSession>();
+ Set<Session> sessions = new HashSet<Session>();
// Create and open 500 sessions.
synchronized (sesmgr) {
for (int i = 0; i < size; i++) {
- KReSSession ses = sesmgr.createSession();
+ Session ses = sesmgr.createSession();
try {
ses.open();
} catch (NonReferenceableSessionException e) {
@@ -149,24 +149,24 @@ public class TestSessions {
.size());
}
boolean open = true;
- for (KReSSession ses : sessions)
+ for (Session ses : sessions)
open &= ses.getSessionState() == State.ACTIVE;
// Check that all created sessions have been opened
assertTrue(open);
// Kill 'em all, to quote Metallica
synchronized (sesmgr) {
- for (KReSSession ses : sessions)
+ for (Session ses : sessions)
sesmgr.destroySession(ses.getID());
assertEquals(initialSize, sesmgr.getRegisteredSessionIDs().size());
}
// Check that they are all zombies
boolean zombi = true;
- for (KReSSession ses : sessions)
+ for (Session ses : sessions)
zombi &= ses.getSessionState() == State.ZOMBIE;
assertTrue(zombi);
// Try to resurrect them (hopefully failing)
boolean resurrect = false;
- for (KReSSession ses : sessions)
+ for (Session ses : sessions)
try {
ses.open();
resurrect |= true;