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 2011/03/16 16:48:04 UTC

svn commit: r1082169 [1/3] - in /incubator/stanbol/trunk/kres: eu.iksproject.kres.jersey/ eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/manager/ eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/reasoners/ eu.iksproj...

Author: alexdma
Date: Wed Mar 16 15:48:01 2011
New Revision: 1082169

URL: http://svn.apache.org/viewvc?rev=1082169&view=rev
Log:
STANBOL-39 :
- Moved kres.manager to ontologymanaer.ontonet
- Refactored remaining kres bundles to no longer use kres.manager and kres.rules and refer to the updated bundles instead
- Minimized dependencies in ontologymanager.ontonet

Added:
    incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/resources/RuleOntology/
    incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/resources/RuleOntology/OffLineKReSOntologyRules.owl
    incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/resources/RuleOntology/TestKReSOntologyRules.owl
    incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/resources/RuleOntology/TestRuleFileExample.txt
    incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/resources/RuleOntology/rmi_config.owl
    incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/
    incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/Activator.java
      - copied, changed from r1081888, incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/Activator.java
    incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ConfigurationManagement.java
      - copied, changed from r1081888, incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ConfigurationManagement.java
    incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ONManager.java
      - copied, changed from r1081894, incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ONManager.java
    incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/io/
      - copied from r1081888, incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/io/
    incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/io/OntologyRegistryIRISource.java
      - copied, changed from r1081894, incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/io/OntologyRegistryIRISource.java
    incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ontology/
      - copied from r1081888, incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/
    incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ontology/AbstractOntologySpaceImpl.java
      - copied, changed from r1081894, incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/AbstractOntologySpaceImpl.java
    incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ontology/CoreOntologySpaceImpl.java
      - copied, changed from r1081894, incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/CoreOntologySpaceImpl.java
    incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ontology/CustomOntologySpaceImpl.java
      - copied, changed from r1081894, incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/CustomOntologySpaceImpl.java
    incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ontology/OntologyIndexImpl.java
      - copied, changed from r1081894, incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/OntologyIndexImpl.java
    incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ontology/OntologyScopeFactoryImpl.java
      - copied, changed from r1081894, incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/OntologyScopeFactoryImpl.java
    incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ontology/OntologyScopeImpl.java
      - copied, changed from r1081894, incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/OntologyScopeImpl.java
    incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ontology/OntologySpaceFactoryImpl.java
      - copied, changed from r1081894, incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/OntologySpaceFactoryImpl.java
    incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ontology/ScopeRegistryImpl.java
      - copied, changed from r1081894, incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/ScopeRegistryImpl.java
    incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ontology/SessionOntologySpaceImpl.java
      - copied, changed from r1081894, incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/SessionOntologySpaceImpl.java
    incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/registry/
    incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/registry/cache/
      - copied from r1081888, incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/registry/cache/
    incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/registry/model/
    incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/registry/model/impl/
      - copied from r1081888, incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/registry/model/impl/
    incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/registry/model/impl/RegistryLoader.java
      - copied, changed from r1081894, incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/registry/model/impl/RegistryLoader.java
    incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/renderers/
      - copied from r1081888, incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/renderers/
    incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/renderers/ScopeSetRenderer.java
      - copied, changed from r1081894, incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/renderers/ScopeSetRenderer.java
    incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/renderers/SessionRenderer.java
      - copied, changed from r1081894, incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/renderers/SessionRenderer.java
    incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/session/
      - copied from r1081888, incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/session/
    incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/session/KReSSessionImpl.java
      - copied, changed from r1081894, incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/session/KReSSessionImpl.java
    incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/session/KReSSessionManagerImpl.java
      - copied, changed from r1081894, incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/session/KReSSessionManagerImpl.java
    incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/session/ScopeSessionSynchronizer.java
      - copied, changed from r1081894, incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/session/ScopeSessionSynchronizer.java
    incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/session/TimestampedSessionIDGenerator.java
      - copied, changed from r1081894, incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/session/TimestampedSessionIDGenerator.java
    incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/util/
      - copied from r1081888, incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/util/
    incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/util/OntologyUtils.java
      - copied, changed from r1081894, incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/util/OntologyUtils.java
    incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/xd/
    incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/xd/lang/
      - copied from r1081888, incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/org/stlab/xd/lang/
    incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/xd/utils/
      - copied from r1081888, incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/org/stlab/xd/utils/
    incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/xd/vocabulary/
      - copied from r1081888, incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/org/stlab/xd/vocabulary/
    incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/resources/META-INF/
      - copied from r1081888, incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/resources/META-INF/
    incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/test/java/org/
    incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/test/java/org/apache/
    incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/test/java/org/apache/stanbol/
    incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/
    incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/
    incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/Constants.java
      - copied, changed from r1081888, incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/test/java/eu/iksproject/kres/manager/Constants.java
    incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/Namespace.java
      - copied, changed from r1081894, incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/test/java/eu/iksproject/kres/manager/Namespace.java
    incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/StructureTest.java
      - copied, changed from r1081888, incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/test/java/eu/iksproject/kres/manager/StructureTest.java
    incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/ontology/
      - copied from r1081888, incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/test/java/eu/iksproject/kres/manager/ontology/
    incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/ontology/TestIndexing.java
      - copied, changed from r1081894, incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/test/java/eu/iksproject/kres/manager/ontology/TestIndexing.java
    incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/ontology/TestOntologyScope.java
      - copied, changed from r1081894, incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/test/java/eu/iksproject/kres/manager/ontology/TestOntologyScope.java
    incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/ontology/TestOntologySpaces.java
      - copied, changed from r1081894, incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/test/java/eu/iksproject/kres/manager/ontology/TestOntologySpaces.java
    incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/registry/
      - copied from r1081888, incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/test/java/eu/iksproject/kres/manager/registry/
    incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/registry/TestRegistry.java
      - copied, changed from r1081894, incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/test/java/eu/iksproject/kres/manager/registry/TestRegistry.java
    incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/session/
      - copied from r1081888, incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/test/java/eu/iksproject/kres/manager/session/
    incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/session/TestSessions.java
      - copied, changed from r1081894, incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/test/java/eu/iksproject/kres/manager/session/TestSessions.java
Modified:
    incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/pom.xml
    incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/manager/Recipe.java
    incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/manager/Rule.java
    incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/reasoners/Classify.java
    incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/reasoners/ConsistencyCheck.java
    incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/reasoners/Enrichment.java
    incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/KReSSessionIDResource.java
    incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/KReSSessionResource.java
    incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/ONMOntResource.java
    incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/ONMRootResource.java
    incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/ONMScopeOntologyResource.java
    incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/ONMScopeResource.java
    incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/RuleStoreResource.java
    incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/test/java/eu/iksproject/kres/jersey/manager/RecipeTest.java
    incubator/stanbol/trunk/kres/eu.iksproject.kres.semion.reengineer.db/pom.xml
    incubator/stanbol/trunk/kres/eu.iksproject.kres.semion.reengineer.db/src/test/java/eu/iksproject/kres/semion/reengineer/db/DBExtractorTest.java
    incubator/stanbol/trunk/kres/eu.iksproject.kres.semion.reengineer.xml/pom.xml
    incubator/stanbol/trunk/kres/eu.iksproject.kres.semion.reengineer.xml/src/test/java/eu/iksproject/kres/semion/reengineer/xml/XMLReengineerTest.java
    incubator/stanbol/trunk/kres/eu.iksproject.kres.semion.refactorer/pom.xml
    incubator/stanbol/trunk/kres/eu.iksproject.kres.semion.refactorer/src/main/java/eu/iksproject/kres/semion/refactorer/SemionRefactorerImpl.java
    incubator/stanbol/trunk/kres/eu.iksproject.kres.semion.refactorer/src/test/java/eu/iksproject/kres/semion/refactorer/SemionRefactoringTest.java
    incubator/stanbol/trunk/kres/ontologymanager/ontonet/pom.xml
    incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/registry/cache/ODPRegistryCacheException.java
    incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/registry/cache/ODPRegistryCacheManager.java
    incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/registry/cache/URIUnresolvableException.java
    incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/util/OntologyConstants.java
    incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/util/OntologyLoaderPrinter.java
    incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/util/StringUtils.java
    incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/xd/lang/Language.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/main/java/org/apache/stanbol/ontologymanager/ontonet/xd/utils/XDAction.java
    incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/xd/vocabulary/CODOVocabulary.java
    incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/xd/vocabulary/Vocabulary.java
    incubator/stanbol/trunk/kres/rules/base/pom.xml

Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/pom.xml?rev=1082169&r1=1082168&r2=1082169&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/pom.xml (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/pom.xml Wed Mar 16 15:48:01 2011
@@ -219,20 +219,29 @@
 			<groupId>org.apache.stanbol</groupId>
 			<artifactId>org.apache.stanbol.ontologymanager.store</artifactId>
 			<version>${stanbol-version}</version>
-		</dependency>		
+		</dependency>
+		<dependency>
+			<groupId>org.apache.stanbol</groupId>
+			<artifactId>org.apache.stanbol.rules.manager</artifactId>
+			<version>${stanbol-version}</version>
+		</dependency>	
 		
+		<!--
 		<dependency>
 			<groupId>eu.iksproject</groupId>
 			<artifactId>eu.iksproject.kres.manager</artifactId>
 			<version>${kres-version}</version>
 			<scope>provided</scope>
 		</dependency>
+		-->
+		<!--
 		<dependency>
 			<groupId>eu.iksproject</groupId>
 			<artifactId>eu.iksproject.kres.rules</artifactId>
 			<version>${kres-version}</version>
 			<scope>provided</scope>
 		</dependency>
+		-->
 		<dependency>
 			<groupId>eu.iksproject</groupId>
 			<artifactId>eu.iksproject.kres.ontologies</artifactId>

Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/manager/Recipe.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/manager/Recipe.java?rev=1082169&r1=1082168&r2=1082169&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/manager/Recipe.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/manager/Recipe.java Wed Mar 16 15:48:01 2011
@@ -30,9 +30,14 @@ import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status;
 
 import org.apache.stanbol.ontologymanager.ontonet.api.KReSONManager;
+import org.apache.stanbol.ontologymanager.ontonet.impl.ONManager;
 import org.apache.stanbol.ontologymanager.store.api.OntologyStoreProvider;
 import org.apache.stanbol.ontologymanager.store.impl.OntologyStorageProviderImpl;
 import org.apache.stanbol.rules.base.api.RuleStore;
+import org.apache.stanbol.rules.manager.changes.KReSAddRecipe;
+import org.apache.stanbol.rules.manager.changes.KReSGetRecipe;
+import org.apache.stanbol.rules.manager.changes.KReSRemoveRecipe;
+import org.apache.stanbol.rules.manager.changes.KReSRuleStore;
 import org.semanticweb.owlapi.apibinding.OWLManager;
 import org.semanticweb.owlapi.model.AddImport;
 import org.semanticweb.owlapi.model.IRI;
@@ -48,308 +53,279 @@ import org.slf4j.LoggerFactory;
 
 import eu.iksproject.kres.jersey.format.KReSFormat;
 import eu.iksproject.kres.jersey.resource.NavigationMixin;
-import eu.iksproject.kres.manager.ONManager;
-import eu.iksproject.kres.rules.manager.KReSAddRecipe;
-import eu.iksproject.kres.rules.manager.KReSGetRecipe;
-import eu.iksproject.kres.rules.manager.KReSRemoveRecipe;
-import eu.iksproject.kres.rules.manager.KReSRuleStore;
 
 /**
- *
+ * 
  * @author elvio
  */
 @Path("/recipe")
 // /{uri:.+}")
-//@ImplicitProduces(MediaType.TEXT_HTML + ";qs=2")
-public class Recipe extends NavigationMixin{
+// @ImplicitProduces(MediaType.TEXT_HTML + ";qs=2")
+public class Recipe extends NavigationMixin {
 
-	protected KReSONManager onm;
+    protected KReSONManager onm;
 
-	private Logger log = LoggerFactory.getLogger(getClass());
+    private Logger log = LoggerFactory.getLogger(getClass());
 
     private RuleStore kresRuleStore;
-	private OntologyStoreProvider storeProvider;
+    private OntologyStoreProvider storeProvider;
 
-   /**
+    /**
      * To get the KReSRuleStore where are stored the rules and the recipes
-     *
-	 * @param servletContext
-	 *            {To get the context where the REST service is running.}
+     * 
+     * @param servletContext
+     *            {To get the context where the REST service is running.}
      */
-    public Recipe(@Context ServletContext servletContext){
-		this.kresRuleStore = (RuleStore) servletContext
-				.getAttribute(RuleStore.class.getName());
-		this.onm = (KReSONManager) servletContext
-				.getAttribute(KReSONManager.class.getName());
-		this.storeProvider = (OntologyStoreProvider) servletContext
-				.getAttribute(OntologyStoreProvider.class.getName());
-		// Contingency code for missing components follows.
-		/*
-		 * FIXME! The following code is required only for the tests. This should
-		 * be removed and the test should work without this code.
-		 */
-		if (storeProvider == null) {
-			log
-					.warn("No OntologyStoreProvider in servlet context. Instantiating manually...");
-			storeProvider = new OntologyStorageProviderImpl();
-		}
-		if (onm == null) {
-			log
-					.warn("No KReSONManager in servlet context. Instantiating manually...");
-			onm = new ONManager(storeProvider.getActiveOntologyStorage(),
-					new Hashtable<String, Object>());
-		}
-       if (kresRuleStore == null) {
-			log
-					.warn("No KReSRuleStore with stored rules and recipes found in servlet context. Instantiating manually with default values...");
-			this.kresRuleStore = new KReSRuleStore(onm,
-					new Hashtable<String, Object>(), "");
-			log
-					.debug("PATH TO OWL FILE LOADED: "
-							+ kresRuleStore.getFilePath());
+    public Recipe(@Context ServletContext servletContext) {
+        this.kresRuleStore = (RuleStore) servletContext.getAttribute(RuleStore.class.getName());
+        this.onm = (KReSONManager) servletContext.getAttribute(KReSONManager.class.getName());
+        this.storeProvider = (OntologyStoreProvider) servletContext.getAttribute(OntologyStoreProvider.class
+                .getName());
+        // Contingency code for missing components follows.
+        /*
+         * FIXME! The following code is required only for the tests. This should be removed and the test
+         * should work without this code.
+         */
+        if (storeProvider == null) {
+            log.warn("No OntologyStoreProvider in servlet context. Instantiating manually...");
+            storeProvider = new OntologyStorageProviderImpl();
+        }
+        if (onm == null) {
+            log.warn("No KReSONManager in servlet context. Instantiating manually...");
+            onm = new ONManager(storeProvider.getActiveOntologyStorage(), new Hashtable<String,Object>());
+        }
+        if (kresRuleStore == null) {
+            log
+                    .warn("No KReSRuleStore with stored rules and recipes found in servlet context. Instantiating manually with default values...");
+//            String iri = "http://www.ontologydesignpatterns.org/ont/iks/kres/rmi_config.owl";
+//            OWLOntology o;
+//            try {
+//                o = OWLManager.createOWLOntologyManager().loadOntologyFromOntologyDocument(IRI.create(iri));
+//                this.kresRuleStore = new KReSRuleStore(onm, new Hashtable<String,Object>(), "");
+//                log.debug("PATH TO OWL FILE LOADED: " + kresRuleStore.getFilePath());
+//            } catch (OWLOntologyCreationException e) {
+//
+//            }
+            
+            this.kresRuleStore = new KReSRuleStore(onm, new Hashtable<String,Object>(), "");
+
         }
     }
 
-   /**
-	 * Get a recipe with its rules from the rule base (that is the ontology that
-	 * contains the rules and the recipe).
-     *
-	 * @param uri
-	 *            {A string contains the IRI full name of the recipe.}
+    /**
+     * Get a recipe with its rules from the rule base (that is the ontology that contains the rules and the
+     * recipe).
+     * 
+     * @param uri
+     *            {A string contains the IRI full name of the recipe.}
      * @return Return: <br/>
-	 *         200 The recipe is retrieved (import declarations point to KReS
-	 *         Services) <br/>
-     *       404 The recipe does not exists in the manager <br/>
-     *       500 Some error occurred 
-     *
+     *         200 The recipe is retrieved (import declarations point to KReS Services) <br/>
+     *         404 The recipe does not exists in the manager <br/>
+     *         500 Some error occurred
+     * 
      */
     @GET
     @Path("/{uri:.+}")
-	@Produces(value = { KReSFormat.RDF_XML, KReSFormat.TURTLE,
-			KReSFormat.OWL_XML, KReSFormat.FUNCTIONAL_OWL,
-			KReSFormat.MANCHESTER_OWL, KReSFormat.RDF_JSON })
-    public Response getRecipe(@PathParam("uri") String uri){
-      try{
-
-       KReSGetRecipe rule = new KReSGetRecipe(kresRuleStore);
-
-			// String ID =
-			// kresRuleStore.getOntology().getOntologyID().toString().replace(">","").replace("<","")+"#";
-       
-       if(uri.equals("all")){
-
-           Vector<IRI> recipe = rule.getGeneralRecipes();
-           
-        if(recipe==null){
-            //The recipe does not exists in the manager
-            return Response.status(Status.NOT_FOUND).build();
-        }else{
-            
-					// The recipe is retrieved (import declarations point to
-					// KReS Services)
-            OWLOntology onto = kresRuleStore.getOntology();
-					OWLOntology newmodel = OWLManager
-							.createOWLOntologyManager().createOntology(
-									onto.getOntologyID());
-					OWLDataFactory factory = onto.getOWLOntologyManager()
-							.getOWLDataFactory();
-
-					Iterator<OWLOntology> importedonto = onto
-							.getDirectImports().iterator();
-            List<OWLOntologyChange> additions = new LinkedList<OWLOntologyChange>();
-					OWLDataFactory auxfactory = onto.getOWLOntologyManager()
-							.getOWLDataFactory();
-
-            while(importedonto.hasNext()){
-                OWLOntology auxonto = importedonto.next();
-						additions.add(new AddImport(newmodel, auxfactory
-								.getOWLImportsDeclaration(auxonto
-										.getOWLOntologyManager()
-										.getOntologyDocumentIRI(auxonto))));
-            }
+    @Produces(value = {KReSFormat.RDF_XML, KReSFormat.TURTLE, KReSFormat.OWL_XML, KReSFormat.FUNCTIONAL_OWL,
+                       KReSFormat.MANCHESTER_OWL, KReSFormat.RDF_JSON})
+    public Response getRecipe(@PathParam("uri") String uri) {
+        try {
+
+            KReSGetRecipe rule = new KReSGetRecipe(kresRuleStore);
+
+            // String ID =
+            // kresRuleStore.getOntology().getOntologyID().toString().replace(">","").replace("<","")+"#";
+
+            if (uri.equals("all")) {
+
+                Vector<IRI> recipe = rule.getGeneralRecipes();
+
+                if (recipe == null) {
+                    // The recipe does not exists in the manager
+                    return Response.status(Status.NOT_FOUND).build();
+                } else {
+
+                    // The recipe is retrieved (import declarations point to
+                    // KReS Services)
+                    OWLOntology onto = kresRuleStore.getOntology();
+                    OWLOntology newmodel = OWLManager.createOWLOntologyManager().createOntology(
+                        onto.getOntologyID());
+                    OWLDataFactory factory = onto.getOWLOntologyManager().getOWLDataFactory();
+
+                    Iterator<OWLOntology> importedonto = onto.getDirectImports().iterator();
+                    List<OWLOntologyChange> additions = new LinkedList<OWLOntologyChange>();
+                    OWLDataFactory auxfactory = onto.getOWLOntologyManager().getOWLDataFactory();
+
+                    while (importedonto.hasNext()) {
+                        OWLOntology auxonto = importedonto.next();
+                        additions.add(new AddImport(newmodel, auxfactory.getOWLImportsDeclaration(auxonto
+                                .getOWLOntologyManager().getOntologyDocumentIRI(auxonto))));
+                    }
+
+                    if (!additions.isEmpty()) newmodel.getOWLOntologyManager().applyChanges(additions);
+
+                    for (int i = 0; i < recipe.size(); i++) {
+                        OWLNamedIndividual ind = factory.getOWLNamedIndividual(recipe.get(i));
+                        Set<OWLIndividualAxiom> ax = onto.getAxioms(ind);
+                        newmodel.getOWLOntologyManager().addAxioms(newmodel, ax);
+
+                    }
+
+                    // try {
+                    // OWLManager.createOWLOntologyManager().saveOntology(
+                    // newmodel,
+                    // newmodel.getOWLOntologyManager()
+                    // .getOntologyFormat(newmodel),
+                    // System.out);
+                    // } catch (OWLOntologyStorageException e) {
+                    // // TODO Auto-generated catch block
+                    // e.printStackTrace();
+                    // }
 
-            if(!additions.isEmpty())
-						newmodel.getOWLOntologyManager()
-								.applyChanges(additions);
-
-            for(int i = 0; i<recipe.size(); i++){
-						OWLNamedIndividual ind = factory
-								.getOWLNamedIndividual(recipe.get(i));
-                Set<OWLIndividualAxiom> ax = onto.getAxioms(ind);
-						newmodel.getOWLOntologyManager()
-								.addAxioms(newmodel, ax);
-
-            }
-            
-//            try {
-//						OWLManager.createOWLOntologyManager().saveOntology(
-//								newmodel,
-//								newmodel.getOWLOntologyManager()
-//										.getOntologyFormat(newmodel),
-//								System.out);
-//    		} catch (OWLOntologyStorageException e) {
-//    			// TODO Auto-generated catch block
-//    			e.printStackTrace();
-//    		}
-            
-            return Response.ok(newmodel).build();
-        }
+                    return Response.ok(newmodel).build();
+                }
 
-       }else{
+            } else {
 
-        HashMap<IRI, String> recipe = rule.getRecipe(IRI.create(uri));
-     
-        if(recipe==null){
-            //The recipe deos not exists in the manager
-            return Response.status(Status.NOT_FOUND).build();
-        }else{
-					// The recipe is retrieved (import declarations point to
-					// KReS Services)
-            OWLOntology onto = kresRuleStore.getOntology();
-
-					OWLDataFactory factory = onto.getOWLOntologyManager()
-							.getOWLDataFactory();
-					OWLObjectProperty prop = factory
-							.getOWLObjectProperty(IRI
-									.create("http://kres.iks-project.eu/ontology/meta/rmi.owl#hasRule"));
-					OWLNamedIndividual ind = factory.getOWLNamedIndividual(IRI
-							.create(uri));
-					Set<OWLIndividual> value = ind.getObjectPropertyValues(
-							prop, onto);
-            Set<OWLIndividualAxiom> ax = onto.getAxioms(ind);
-            
-            Iterator<OWLIndividual> iter = value.iterator();
+                HashMap<IRI,String> recipe = rule.getRecipe(IRI.create(uri));
 
-					OWLOntology newmodel = OWLManager
-							.createOWLOntologyManager().createOntology(
-									onto.getOntologyID());
-
-					Iterator<OWLOntology> importedonto = onto
-							.getDirectImports().iterator();
-            List<OWLOntologyChange> additions = new LinkedList<OWLOntologyChange>();
-					OWLDataFactory auxfactory = onto.getOWLOntologyManager()
-							.getOWLDataFactory();
-
-            while(importedonto.hasNext()){
-                OWLOntology auxonto = importedonto.next();
-						additions.add(new AddImport(newmodel, auxfactory
-								.getOWLImportsDeclaration(auxonto
-										.getOWLOntologyManager()
-										.getOntologyDocumentIRI(auxonto))));
-            }
+                if (recipe == null) {
+                    // The recipe deos not exists in the manager
+                    return Response.status(Status.NOT_FOUND).build();
+                } else {
+                    // The recipe is retrieved (import declarations point to
+                    // KReS Services)
+                    OWLOntology onto = kresRuleStore.getOntology();
+
+                    OWLDataFactory factory = onto.getOWLOntologyManager().getOWLDataFactory();
+                    OWLObjectProperty prop = factory.getOWLObjectProperty(IRI
+                            .create("http://kres.iks-project.eu/ontology/meta/rmi.owl#hasRule"));
+                    OWLNamedIndividual ind = factory.getOWLNamedIndividual(IRI.create(uri));
+                    Set<OWLIndividual> value = ind.getObjectPropertyValues(prop, onto);
+                    Set<OWLIndividualAxiom> ax = onto.getAxioms(ind);
+
+                    Iterator<OWLIndividual> iter = value.iterator();
+
+                    OWLOntology newmodel = OWLManager.createOWLOntologyManager().createOntology(
+                        onto.getOntologyID());
+
+                    Iterator<OWLOntology> importedonto = onto.getDirectImports().iterator();
+                    List<OWLOntologyChange> additions = new LinkedList<OWLOntologyChange>();
+                    OWLDataFactory auxfactory = onto.getOWLOntologyManager().getOWLDataFactory();
+
+                    while (importedonto.hasNext()) {
+                        OWLOntology auxonto = importedonto.next();
+                        additions.add(new AddImport(newmodel, auxfactory.getOWLImportsDeclaration(auxonto
+                                .getOWLOntologyManager().getOntologyDocumentIRI(auxonto))));
+                    }
+
+                    if (!additions.isEmpty()) newmodel.getOWLOntologyManager().applyChanges(additions);
+
+                    newmodel.getOWLOntologyManager().addAxioms(newmodel, ax);
+
+                    while (iter.hasNext()) {
+
+                        ind = (OWLNamedIndividual) iter.next();
+                        ax = onto.getAxioms(ind);
+
+                        newmodel.getOWLOntologyManager().addAxioms(newmodel, ax);
+                    }
+
+                    // try {
+                    // OWLManager.createOWLOntologyManager().saveOntology(
+                    // newmodel,
+                    // newmodel.getOWLOntologyManager()
+                    // .getOntologyFormat(newmodel),
+                    // System.out);
+                    // } catch (OWLOntologyStorageException e) {
+                    // // TODO Auto-generated catch block
+                    // e.printStackTrace();
+                    // }
 
-            if(!additions.isEmpty())
-						newmodel.getOWLOntologyManager()
-								.applyChanges(additions);
-
-            newmodel.getOWLOntologyManager().addAxioms(newmodel,ax);
-
-            while(iter.hasNext()){
-        
-                ind = (OWLNamedIndividual) iter.next();
-                ax = onto.getAxioms(ind);
-              
-						newmodel.getOWLOntologyManager()
-								.addAxioms(newmodel, ax);
+                    return Response.ok(newmodel).build();
+                }
             }
-
-//            try {
-//						OWLManager.createOWLOntologyManager().saveOntology(
-//								newmodel,
-//								newmodel.getOWLOntologyManager()
-//										.getOntologyFormat(newmodel),
-//								System.out);
-//    		} catch (OWLOntologyStorageException e) {
-//    			// TODO Auto-generated catch block
-//    			e.printStackTrace();
-//    		}
-
-            return Response.ok(newmodel).build();
+        } catch (Exception e) {
+            // Some error occurred
+            throw new WebApplicationException(e, Status.INTERNAL_SERVER_ERROR);
         }
-       }
-      }catch (Exception e){
-          //Some error occurred
-         throw new WebApplicationException(e, Status.INTERNAL_SERVER_ERROR);
-      }
 
     }
 
-   /**
+    /**
      * To add a recipe without rules.
-	 * 
-	 * @param recipe
-	 *            {A string contains the IRI of the recipe to be added}
-	 * @param description
-	 *            {A string contains a description of the rule}
+     * 
+     * @param recipe
+     *            {A string contains the IRI of the recipe to be added}
+     * @param description
+     *            {A string contains a description of the rule}
      * @return Return: <br/>
-     *      200 The recipe has been added<br/>
-     *      409 The recipe has not been added<br/>
-     *      500 Some error occurred
+     *         200 The recipe has been added<br/>
+     *         409 The recipe has not been added<br/>
+     *         500 Some error occurred
      */
     @POST
     @Consumes(MediaType.MULTIPART_FORM_DATA)
-	@Produces(value = { KReSFormat.RDF_XML, KReSFormat.TURTLE,
-			KReSFormat.OWL_XML, KReSFormat.FUNCTIONAL_OWL,
-			KReSFormat.MANCHESTER_OWL, KReSFormat.RDF_JSON })
-	public Response addRecipe(@FormParam(value = "recipe") String recipe,
-			@FormParam(value = "description") String description) {
+    @Produces(value = {KReSFormat.RDF_XML, KReSFormat.TURTLE, KReSFormat.OWL_XML, KReSFormat.FUNCTIONAL_OWL,
+                       KReSFormat.MANCHESTER_OWL, KReSFormat.RDF_JSON})
+    public Response addRecipe(@FormParam(value = "recipe") String recipe,
+                              @FormParam(value = "description") String description) {
 
-        try{
+        try {
 
             KReSAddRecipe instance = new KReSAddRecipe(kresRuleStore);
 
-			// String ID =
-			// kresRuleStore.getOntology().getOntologyID().toString().replace(">","").replace("<","")+"#";
+            // String ID =
+            // kresRuleStore.getOntology().getOntologyID().toString().replace(">","").replace("<","")+"#";
 
-			boolean ok = instance.addSimpleRecipe(IRI.create(recipe),
-					description);
-                
-                if(!ok){
-
-                   return Response.status(Status.CONFLICT).build();
-                  
-                }else{
-                   kresRuleStore.saveOntology();
-                   return Response.status(Status.OK).build();
-                }
-   
-        }catch (Exception e){
+            boolean ok = instance.addSimpleRecipe(IRI.create(recipe), description);
+
+            if (!ok) {
+
+                return Response.status(Status.CONFLICT).build();
+
+            } else {
+                kresRuleStore.saveOntology();
+                return Response.status(Status.OK).build();
+            }
+
+        } catch (Exception e) {
             throw new WebApplicationException(e, Status.INTERNAL_SERVER_ERROR);
         }
     }
 
-   /**
+    /**
      * To delete a recipe
-	 * 
-	 * @param recipe
-	 *            {A tring contains an IRI of the recipe}
-	 * @return 200 The recipe has been deleted<br/>
-     *      409 The recipe has not been deleted<br/>
-     *      500 Some error occurred
+     * 
+     * @param recipe
+     *            {A tring contains an IRI of the recipe}
+     * @return 200 The recipe has been deleted<br/>
+     *         409 The recipe has not been deleted<br/>
+     *         500 Some error occurred
      */
     @DELETE
-    //@Consumes(MediaType.TEXT_PLAIN)
+    // @Consumes(MediaType.TEXT_PLAIN)
     @Produces("text/plain")
-    public Response removeRecipe(@QueryParam(value="recipe") String recipe){
+    public Response removeRecipe(@QueryParam(value = "recipe") String recipe) {
+
+        try {
 
-        try{
-            
             KReSRemoveRecipe instance = new KReSRemoveRecipe(kresRuleStore);
 
-			// String ID =
-			// kresRuleStore.getOntology().getOntologyID().toString().replace(">","").replace("<","")+"#";
+            // String ID =
+            // kresRuleStore.getOntology().getOntologyID().toString().replace(">","").replace("<","")+"#";
 
             boolean ok = instance.removeRecipe(IRI.create(recipe));
-            
-                if(!ok){
-                   return Response.status(Status.CONFLICT).build();
-                }else{
-                   kresRuleStore.saveOntology();
-                   return Response.ok().build();
-                }
 
-        }catch(Exception e){
-           throw new WebApplicationException(e, Status.INTERNAL_SERVER_ERROR);
+            if (!ok) {
+                return Response.status(Status.CONFLICT).build();
+            } else {
+                kresRuleStore.saveOntology();
+                return Response.ok().build();
+            }
+
+        } catch (Exception e) {
+            throw new WebApplicationException(e, Status.INTERNAL_SERVER_ERROR);
         }
     }
 

Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/manager/Rule.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/manager/Rule.java?rev=1082169&r1=1082168&r2=1082169&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/manager/Rule.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/manager/Rule.java Wed Mar 16 15:48:01 2011
@@ -32,9 +32,17 @@ import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status;
 
 import org.apache.stanbol.ontologymanager.ontonet.api.KReSONManager;
+import org.apache.stanbol.ontologymanager.ontonet.impl.ONManager;
 import org.apache.stanbol.ontologymanager.store.api.OntologyStoreProvider;
 import org.apache.stanbol.ontologymanager.store.impl.OntologyStorageProviderImpl;
 import org.apache.stanbol.rules.base.api.RuleStore;
+import org.apache.stanbol.rules.manager.changes.KReSAddRecipe;
+import org.apache.stanbol.rules.manager.changes.KReSAddRule;
+import org.apache.stanbol.rules.manager.changes.KReSGetRecipe;
+import org.apache.stanbol.rules.manager.changes.KReSGetRule;
+import org.apache.stanbol.rules.manager.changes.KReSRemoveRecipe;
+import org.apache.stanbol.rules.manager.changes.KReSRemoveRule;
+import org.apache.stanbol.rules.manager.changes.KReSRuleStore;
 import org.semanticweb.owlapi.apibinding.OWLManager;
 import org.semanticweb.owlapi.model.AddImport;
 import org.semanticweb.owlapi.model.IRI;
@@ -48,14 +56,6 @@ import org.slf4j.LoggerFactory;
 
 import eu.iksproject.kres.jersey.format.KReSFormat;
 import eu.iksproject.kres.jersey.resource.NavigationMixin;
-import eu.iksproject.kres.manager.ONManager;
-import eu.iksproject.kres.rules.manager.KReSAddRecipe;
-import eu.iksproject.kres.rules.manager.KReSAddRule;
-import eu.iksproject.kres.rules.manager.KReSGetRecipe;
-import eu.iksproject.kres.rules.manager.KReSGetRule;
-import eu.iksproject.kres.rules.manager.KReSRemoveRecipe;
-import eu.iksproject.kres.rules.manager.KReSRemoveRule;
-import eu.iksproject.kres.rules.manager.KReSRuleStore;
 
 /**
  *

Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/reasoners/Classify.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/reasoners/Classify.java?rev=1082169&r1=1082168&r2=1082169&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/reasoners/Classify.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/reasoners/Classify.java Wed Mar 16 15:48:01 2011
@@ -30,12 +30,16 @@ import org.apache.stanbol.ontologymanage
 import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologySpace;
 import org.apache.stanbol.ontologymanager.ontonet.api.ontology.ScopeRegistry;
 import org.apache.stanbol.ontologymanager.ontonet.api.ontology.SessionOntologySpace;
+import org.apache.stanbol.ontologymanager.ontonet.impl.ONManager;
 import org.apache.stanbol.ontologymanager.store.api.OntologyStoreProvider;
 import org.apache.stanbol.ontologymanager.store.impl.OntologyStorageProviderImpl;
 import org.apache.stanbol.rules.base.api.KReSRule;
 import org.apache.stanbol.rules.base.api.NoSuchRecipeException;
 import org.apache.stanbol.rules.base.api.RuleStore;
 import org.apache.stanbol.rules.base.api.util.KReSRuleList;
+import org.apache.stanbol.rules.manager.KReSKB;
+import org.apache.stanbol.rules.manager.changes.KReSRuleStore;
+import org.apache.stanbol.rules.manager.parse.KReSRuleParser;
 import org.semanticweb.owlapi.apibinding.OWLManager;
 import org.semanticweb.owlapi.model.AddImport;
 import org.semanticweb.owlapi.model.IRI;
@@ -58,13 +62,9 @@ import com.hp.hpl.jena.rdf.model.ModelFa
 import com.hp.hpl.jena.rdf.model.Resource;
 
 import eu.iksproject.kres.jersey.format.KReSFormat;
-import eu.iksproject.kres.manager.ONManager;
 import eu.iksproject.kres.reasoners.KReSCreateReasoner;
 import eu.iksproject.kres.reasoners.KReSRunReasoner;
 import eu.iksproject.kres.reasoners.KReSRunRules;
-import eu.iksproject.kres.rules.KReSKB;
-import eu.iksproject.kres.rules.manager.KReSRuleStore;
-import eu.iksproject.kres.rules.parser.KReSRuleParser;
 
 /**
  *

Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/reasoners/ConsistencyCheck.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/reasoners/ConsistencyCheck.java?rev=1082169&r1=1082168&r2=1082169&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/reasoners/ConsistencyCheck.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/reasoners/ConsistencyCheck.java Wed Mar 16 15:48:01 2011
@@ -27,12 +27,16 @@ import org.apache.stanbol.ontologymanage
 import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologySpace;
 import org.apache.stanbol.ontologymanager.ontonet.api.ontology.ScopeRegistry;
 import org.apache.stanbol.ontologymanager.ontonet.api.ontology.SessionOntologySpace;
+import org.apache.stanbol.ontologymanager.ontonet.impl.ONManager;
 import org.apache.stanbol.ontologymanager.store.api.OntologyStoreProvider;
 import org.apache.stanbol.ontologymanager.store.impl.OntologyStorageProviderImpl;
 import org.apache.stanbol.rules.base.api.KReSRule;
 import org.apache.stanbol.rules.base.api.NoSuchRecipeException;
 import org.apache.stanbol.rules.base.api.RuleStore;
 import org.apache.stanbol.rules.base.api.util.KReSRuleList;
+import org.apache.stanbol.rules.manager.KReSKB;
+import org.apache.stanbol.rules.manager.changes.KReSRuleStore;
+import org.apache.stanbol.rules.manager.parse.KReSRuleParser;
 import org.semanticweb.owlapi.apibinding.OWLManager;
 import org.semanticweb.owlapi.model.AddImport;
 import org.semanticweb.owlapi.model.IRI;
@@ -56,13 +60,9 @@ import com.hp.hpl.jena.rdf.model.Model;
 import com.hp.hpl.jena.rdf.model.ModelFactory;
 import com.hp.hpl.jena.rdf.model.Resource;
 
-import eu.iksproject.kres.manager.ONManager;
 import eu.iksproject.kres.reasoners.KReSCreateReasoner;
 import eu.iksproject.kres.reasoners.KReSRunReasoner;
 import eu.iksproject.kres.reasoners.KReSRunRules;
-import eu.iksproject.kres.rules.KReSKB;
-import eu.iksproject.kres.rules.manager.KReSRuleStore;
-import eu.iksproject.kres.rules.parser.KReSRuleParser;
 
 /**
  * This class implements the REST interface for the /check-consistency service

Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/reasoners/Enrichment.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/reasoners/Enrichment.java?rev=1082169&r1=1082168&r2=1082169&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/reasoners/Enrichment.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/reasoners/Enrichment.java Wed Mar 16 15:48:01 2011
@@ -30,12 +30,16 @@ import org.apache.stanbol.ontologymanage
 import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologySpace;
 import org.apache.stanbol.ontologymanager.ontonet.api.ontology.ScopeRegistry;
 import org.apache.stanbol.ontologymanager.ontonet.api.ontology.SessionOntologySpace;
+import org.apache.stanbol.ontologymanager.ontonet.impl.ONManager;
 import org.apache.stanbol.ontologymanager.store.api.OntologyStoreProvider;
 import org.apache.stanbol.ontologymanager.store.impl.OntologyStorageProviderImpl;
 import org.apache.stanbol.rules.base.api.KReSRule;
 import org.apache.stanbol.rules.base.api.NoSuchRecipeException;
 import org.apache.stanbol.rules.base.api.RuleStore;
 import org.apache.stanbol.rules.base.api.util.KReSRuleList;
+import org.apache.stanbol.rules.manager.KReSKB;
+import org.apache.stanbol.rules.manager.changes.KReSRuleStore;
+import org.apache.stanbol.rules.manager.parse.KReSRuleParser;
 import org.semanticweb.owlapi.apibinding.OWLManager;
 import org.semanticweb.owlapi.model.AddImport;
 import org.semanticweb.owlapi.model.IRI;
@@ -57,13 +61,9 @@ import com.hp.hpl.jena.rdf.model.Model;
 import com.hp.hpl.jena.rdf.model.ModelFactory;
 import com.hp.hpl.jena.rdf.model.Resource;
 
-import eu.iksproject.kres.manager.ONManager;
 import eu.iksproject.kres.reasoners.KReSCreateReasoner;
 import eu.iksproject.kres.reasoners.KReSRunReasoner;
 import eu.iksproject.kres.reasoners.KReSRunRules;
-import eu.iksproject.kres.rules.KReSKB;
-import eu.iksproject.kres.rules.manager.KReSRuleStore;
-import eu.iksproject.kres.rules.parser.KReSRuleParser;
 
 /**
  *

Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/KReSSessionIDResource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/KReSSessionIDResource.java?rev=1082169&r1=1082168&r2=1082169&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/KReSSessionIDResource.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/KReSSessionIDResource.java Wed Mar 16 15:48:01 2011
@@ -14,11 +14,10 @@ import javax.ws.rs.core.Response.Status;
 import org.apache.stanbol.ontologymanager.ontonet.api.KReSONManager;
 import org.apache.stanbol.ontologymanager.ontonet.api.session.KReSSession;
 import org.apache.stanbol.ontologymanager.ontonet.api.session.KReSSessionManager;
+import org.apache.stanbol.ontologymanager.ontonet.impl.ONManager;
+import org.apache.stanbol.ontologymanager.ontonet.impl.renderers.SessionRenderer;
 import org.semanticweb.owlapi.model.IRI;
 
-import eu.iksproject.kres.manager.ONManager;
-import eu.iksproject.kres.manager.renderers.SessionRenderer;
-
 @Path("/session/{id:.+}")
 public class KReSSessionIDResource extends NavigationMixin {
 

Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/KReSSessionResource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/KReSSessionResource.java?rev=1082169&r1=1082168&r2=1082169&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/KReSSessionResource.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/KReSSessionResource.java Wed Mar 16 15:48:01 2011
@@ -32,13 +32,13 @@ import org.apache.stanbol.ontologymanage
 import org.apache.stanbol.ontologymanager.ontonet.api.ontology.UnmodifiableOntologySpaceException;
 import org.apache.stanbol.ontologymanager.ontonet.api.session.KReSSession;
 import org.apache.stanbol.ontologymanager.ontonet.api.session.KReSSessionManager;
+import org.apache.stanbol.ontologymanager.ontonet.impl.ONManager;
+import org.apache.stanbol.ontologymanager.ontonet.impl.renderers.SessionRenderer;
 import org.semanticweb.owlapi.model.IRI;
 import org.semanticweb.owlapi.model.OWLOntology;
 import org.semanticweb.owlapi.model.OWLOntologyCreationException;
 
 import eu.iksproject.kres.jersey.format.KReSFormat;
-import eu.iksproject.kres.manager.ONManager;
-import eu.iksproject.kres.manager.renderers.SessionRenderer;
 
 @Path("/session")
 public class KReSSessionResource extends NavigationMixin {

Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/ONMOntResource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/ONMOntResource.java?rev=1082169&r1=1082168&r2=1082169&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/ONMOntResource.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/ONMOntResource.java Wed Mar 16 15:48:01 2011
@@ -14,6 +14,7 @@ import javax.ws.rs.core.Response;
 import org.apache.clerezza.rdf.core.serializedform.Serializer;
 import org.apache.stanbol.ontologymanager.ontonet.api.KReSONManager;
 import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyIndex;
+import org.apache.stanbol.ontologymanager.ontonet.impl.ONManager;
 import org.apache.stanbol.ontologymanager.store.api.OntologyStoreProvider;
 import org.apache.stanbol.ontologymanager.store.impl.OntologyStorageProviderImpl;
 import org.coode.owlapi.turtle.TurtleOntologyFormat;
@@ -27,8 +28,6 @@ import org.semanticweb.owlapi.model.OWLO
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import eu.iksproject.kres.manager.ONManager;
-
 @Path("/ontology/get")
 public class ONMOntResource extends NavigationMixin {
 

Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/ONMRootResource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/ONMRootResource.java?rev=1082169&r1=1082168&r2=1082169&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/ONMRootResource.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/ONMRootResource.java Wed Mar 16 15:48:01 2011
@@ -18,6 +18,8 @@ import javax.ws.rs.core.Response;
 import org.apache.stanbol.ontologymanager.ontonet.api.KReSONManager;
 import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyScope;
 import org.apache.stanbol.ontologymanager.ontonet.api.ontology.ScopeRegistry;
+import org.apache.stanbol.ontologymanager.ontonet.impl.ONManager;
+import org.apache.stanbol.ontologymanager.ontonet.impl.renderers.ScopeSetRenderer;
 import org.apache.stanbol.ontologymanager.store.api.OntologyStoreProvider;
 import org.apache.stanbol.ontologymanager.store.impl.OntologyStorageProviderImpl;
 import org.semanticweb.owlapi.model.OWLOntology;
@@ -25,8 +27,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import eu.iksproject.kres.jersey.format.KReSFormat;
-import eu.iksproject.kres.manager.ONManager;
-import eu.iksproject.kres.manager.renderers.ScopeSetRenderer;
 
 /**
  * The main Web resource of the KReS ontology manager. All the scopes, sessions

Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/ONMScopeOntologyResource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/ONMScopeOntologyResource.java?rev=1082169&r1=1082168&r2=1082169&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/ONMScopeOntologyResource.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/ONMScopeOntologyResource.java Wed Mar 16 15:48:01 2011
@@ -25,6 +25,7 @@ import org.apache.stanbol.ontologymanage
 import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologySpace;
 import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologySpaceModificationException;
 import org.apache.stanbol.ontologymanager.ontonet.api.ontology.ScopeRegistry;
+import org.apache.stanbol.ontologymanager.ontonet.impl.ONManager;
 import org.apache.stanbol.ontologymanager.store.api.OntologyStoreProvider;
 import org.apache.stanbol.ontologymanager.store.impl.OntologyStorageProviderImpl;
 import org.semanticweb.owlapi.apibinding.OWLManager;
@@ -42,7 +43,6 @@ import org.slf4j.LoggerFactory;
 
 import eu.iksproject.kres.jersey.format.KReSFormat;
 import eu.iksproject.kres.jersey.util.OntologyRenderUtils;
-import eu.iksproject.kres.manager.ONManager;
 
 /**
  * This resource represents ontologies loaded within a scope.

Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/ONMScopeResource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/ONMScopeResource.java?rev=1082169&r1=1082168&r2=1082169&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/ONMScopeResource.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/ONMScopeResource.java Wed Mar 16 15:48:01 2011
@@ -34,6 +34,8 @@ import org.apache.stanbol.ontologymanage
 import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologySpace;
 import org.apache.stanbol.ontologymanager.ontonet.api.ontology.ScopeRegistry;
 import org.apache.stanbol.ontologymanager.ontonet.api.ontology.UnmodifiableOntologySpaceException;
+import org.apache.stanbol.ontologymanager.ontonet.impl.ONManager;
+import org.apache.stanbol.ontologymanager.ontonet.impl.io.OntologyRegistryIRISource;
 import org.apache.stanbol.ontologymanager.store.api.OntologyStoreProvider;
 import org.apache.stanbol.ontologymanager.store.impl.OntologyStorageProviderImpl;
 import org.semanticweb.owlapi.model.IRI;
@@ -43,8 +45,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import eu.iksproject.kres.jersey.format.KReSFormat;
-import eu.iksproject.kres.manager.ONManager;
-import eu.iksproject.kres.manager.io.OntologyRegistryIRISource;
 
 @Path("/ontology/{scopeid}")
 public class ONMScopeResource extends NavigationMixin {

Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/RuleStoreResource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/RuleStoreResource.java?rev=1082169&r1=1082168&r2=1082169&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/RuleStoreResource.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/RuleStoreResource.java Wed Mar 16 15:48:01 2011
@@ -5,14 +5,15 @@
 
 package eu.iksproject.kres.jersey.resource;
 
-import eu.iksproject.kres.rules.manager.KReSRuleStore;
-import javax.ws.rs.core.Context;
 import javax.servlet.ServletContext;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
+import javax.ws.rs.core.Context;
 import javax.ws.rs.core.Response;
 
+import org.apache.stanbol.rules.manager.changes.KReSRuleStore;
+
 /**
  *
  * @author elvio

Added: incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/resources/RuleOntology/OffLineKReSOntologyRules.owl
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/resources/RuleOntology/OffLineKReSOntologyRules.owl?rev=1082169&view=auto
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/resources/RuleOntology/OffLineKReSOntologyRules.owl (added)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/resources/RuleOntology/OffLineKReSOntologyRules.owl Wed Mar 16 15:48:01 2011
@@ -0,0 +1,317 @@
+<?xml version="1.0"?>
+
+
+<!DOCTYPE rdf:RDF [
+    <!ENTITY owl "http://www.w3.org/2002/07/owl#" >
+    <!ENTITY xsd "http://www.w3.org/2001/XMLSchema#" >
+    <!ENTITY rdfs "http://www.w3.org/2000/01/rdf-schema#" >
+    <!ENTITY rdf "http://www.w3.org/1999/02/22-rdf-syntax-ns#" >
+    <!ENTITY rmi "http://kres.iks-project.eu/ontology/meta/rmi.owl#" >
+    <!ENTITY sequence "http://www.ontologydesignpatterns.org/cp/owl/sequence.owl#" >
+    <!ENTITY cpannotationschema "http://www.ontologydesignpatterns.org/schemas/cpannotationschema.owl#" >
+]>
+
+
+<rdf:RDF xmlns="http://eu.iksproject.kres/KReSOntologyRules.owl#"
+     xml:base="http://eu.iksproject.kres/KReSOntologyRules.owl"
+     xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
+     xmlns:cpannotationschema="http://www.ontologydesignpatterns.org/schemas/cpannotationschema.owl#"
+     xmlns:sequence="http://www.ontologydesignpatterns.org/cp/owl/sequence.owl#"
+     xmlns:owl="http://www.w3.org/2002/07/owl#"
+     xmlns:xsd="http://www.w3.org/2001/XMLSchema#"
+     xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+     xmlns:rmi="http://kres.iks-project.eu/ontology/meta/rmi.owl#">
+    <owl:Ontology rdf:about="http://kres.iks-project.eu/ontology/meta/rmi.owl"/>
+    
+
+
+    <!-- 
+    ///////////////////////////////////////////////////////////////////////////////////////
+    //
+    // Annotation properties
+    //
+    ///////////////////////////////////////////////////////////////////////////////////////
+     -->
+
+    <owl:AnnotationProperty rdf:about="&cpannotationschema;hasAuthor"/>
+    <owl:AnnotationProperty rdf:about="&cpannotationschema;hasConsequences"/>
+    <owl:AnnotationProperty rdf:about="&cpannotationschema;extractedFrom"/>
+    <owl:AnnotationProperty rdf:about="&cpannotationschema;coversRequirements"/>
+    <owl:AnnotationProperty rdf:about="&cpannotationschema;hasIntent"/>
+    <owl:AnnotationProperty rdf:about="&rdfs;label"/>
+    <owl:AnnotationProperty rdf:about="&rdfs;comment"/>
+    
+
+
+    <!-- 
+    ///////////////////////////////////////////////////////////////////////////////////////
+    //
+    // Object Properties
+    //
+    ///////////////////////////////////////////////////////////////////////////////////////
+     -->
+
+    
+
+
+    <!-- http://kres.iks-project.eu/ontology/meta/rmi.owl#endWith -->
+
+    <owl:ObjectProperty rdf:about="&rmi;endWith">
+        <rdfs:range rdf:resource="&rmi;KReSRule"/>
+        <rdfs:domain rdf:resource="&rmi;Recipe"/>
+        <rdfs:subPropertyOf rdf:resource="&owl;topObjectProperty"/>
+    </owl:ObjectProperty>
+    
+
+
+    <!-- http://kres.iks-project.eu/ontology/meta/rmi.owl#hasRule -->
+
+    <owl:ObjectProperty rdf:about="&rmi;hasRule">
+        <rdfs:range rdf:resource="&rmi;KReSRule"/>
+        <rdfs:domain rdf:resource="&rmi;Recipe"/>
+        <owl:inverseOf rdf:resource="&rmi;isRuleOf"/>
+        <rdfs:subPropertyOf rdf:resource="&owl;topObjectProperty"/>
+    </owl:ObjectProperty>
+    
+
+
+    <!-- http://kres.iks-project.eu/ontology/meta/rmi.owl#isRuleOf -->
+
+    <owl:ObjectProperty rdf:about="&rmi;isRuleOf">
+        <rdfs:domain rdf:resource="&rmi;KReSRule"/>
+        <rdfs:range rdf:resource="&rmi;Recipe"/>
+        <rdfs:subPropertyOf rdf:resource="&owl;topObjectProperty"/>
+    </owl:ObjectProperty>
+    
+
+
+    <!-- http://kres.iks-project.eu/ontology/meta/rmi.owl#startWith -->
+
+    <owl:ObjectProperty rdf:about="&rmi;startWith">
+        <rdfs:range rdf:resource="&rmi;KReSRule"/>
+        <rdfs:domain rdf:resource="&rmi;Recipe"/>
+        <rdfs:subPropertyOf rdf:resource="&owl;topObjectProperty"/>
+    </owl:ObjectProperty>
+    
+
+
+    <!-- http://www.ontologydesignpatterns.org/cp/owl/sequence.owl#directlyFollows -->
+
+    <owl:ObjectProperty rdf:about="&sequence;directlyFollows">
+        <rdfs:label xml:lang="en">directly follows</rdfs:label>
+        <rdfs:label xml:lang="it">segue direttamente</rdfs:label>
+        <rdfs:comment>The intransitive follows relation. For example, Wednesday directly precedes Thursday. Directness of precedence depends on the designer conceptualization.</rdfs:comment>
+        <owl:inverseOf rdf:resource="&sequence;directlyPrecedes"/>
+        <rdfs:subPropertyOf rdf:resource="&sequence;follows"/>
+        <rdfs:range rdf:resource="&owl;Thing"/>
+        <rdfs:domain rdf:resource="&owl;Thing"/>
+    </owl:ObjectProperty>
+    
+
+
+    <!-- http://www.ontologydesignpatterns.org/cp/owl/sequence.owl#directlyPrecedes -->
+
+    <owl:ObjectProperty rdf:about="&sequence;directlyPrecedes">
+        <rdfs:label xml:lang="en">directly precedes</rdfs:label>
+        <rdfs:label xml:lang="it">precede direttamente</rdfs:label>
+        <rdfs:comment>The intransitive precedes relation. For example, Monday directly precedes Tuesday. Directness of precedence depends on the designer conceptualization.</rdfs:comment>
+        <rdfs:subPropertyOf rdf:resource="&sequence;precedes"/>
+        <rdfs:range rdf:resource="&owl;Thing"/>
+        <rdfs:domain rdf:resource="&owl;Thing"/>
+    </owl:ObjectProperty>
+    
+
+
+    <!-- http://www.ontologydesignpatterns.org/cp/owl/sequence.owl#follows -->
+
+    <owl:ObjectProperty rdf:about="&sequence;follows">
+        <rdf:type rdf:resource="&owl;TransitiveProperty"/>
+        <rdfs:label xml:lang="en">follows</rdfs:label>
+        <rdfs:label xml:lang="it">segue</rdfs:label>
+        <rdfs:comment rdf:datatype="&xsd;string">A relation between entities, expressing a &#39;sequence&#39; schema. 
+E.g. &#39;year 2000 follows 1999&#39;, &#39;preparing coffee&#39; follows &#39;deciding what coffee to use&#39;, &#39;II World War follows I World War&#39;, etc. 
+It can be used between tasks, processes or time intervals, and subproperties would fit best in order to distinguish the different uses.</rdfs:comment>
+        <rdfs:domain rdf:resource="&owl;Thing"/>
+        <rdfs:range rdf:resource="&owl;Thing"/>
+    </owl:ObjectProperty>
+    
+
+
+    <!-- http://www.ontologydesignpatterns.org/cp/owl/sequence.owl#precedes -->
+
+    <owl:ObjectProperty rdf:about="&sequence;precedes">
+        <rdf:type rdf:resource="&owl;TransitiveProperty"/>
+        <rdfs:label xml:lang="en">precedes</rdfs:label>
+        <rdfs:label xml:lang="it">precede</rdfs:label>
+        <rdfs:comment rdf:datatype="&xsd;string">A relation between entities, expressing a &#39;sequence&#39; schema. 
+E.g. &#39;year 1999 precedes 2000&#39;, &#39;deciding what coffee to use&#39; precedes &#39;preparing coffee&#39;, &#39;World War II follows World War I&#39;, &#39;in the Milan to Rome autoroute, Bologna precedes Florence&#39;, etc.
+It can then be used between tasks, processes, time intervals, spatially locate objects, situations, etc. 
+Subproperties can be defined in order to distinguish the different uses.</rdfs:comment>
+        <owl:inverseOf rdf:resource="&sequence;follows"/>
+        <rdfs:domain rdf:resource="&owl;Thing"/>
+        <rdfs:range rdf:resource="&owl;Thing"/>
+    </owl:ObjectProperty>
+    
+
+
+    <!-- http://www.w3.org/2002/07/owl#topObjectProperty -->
+
+    <owl:ObjectProperty rdf:about="&owl;topObjectProperty"/>
+    
+
+
+    <!-- 
+    ///////////////////////////////////////////////////////////////////////////////////////
+    //
+    // Data properties
+    //
+    ///////////////////////////////////////////////////////////////////////////////////////
+     -->
+
+    
+
+
+    <!-- http://kres.iks-project.eu/ontology/meta/rmi.owl#hasBodyAndHead -->
+
+    <owl:DatatypeProperty rdf:about="&rmi;hasBodyAndHead">
+        <rdfs:domain rdf:resource="&rmi;KReSRule"/>
+        <rdfs:subPropertyOf rdf:resource="&rmi;topDataProperty"/>
+        <rdfs:range rdf:resource="&xsd;string"/>
+    </owl:DatatypeProperty>
+    
+
+
+    <!-- http://kres.iks-project.eu/ontology/meta/rmi.owl#hasDescription -->
+
+    <owl:DatatypeProperty rdf:about="&rmi;hasDescription">
+        <rdfs:subPropertyOf rdf:resource="&rmi;topDataProperty"/>
+        <rdfs:range rdf:resource="&xsd;string"/>
+        <rdfs:domain rdf:resource="&owl;Thing"/>
+    </owl:DatatypeProperty>
+    
+
+
+    <!-- http://kres.iks-project.eu/ontology/meta/rmi.owl#hasSequence -->
+
+    <owl:DatatypeProperty rdf:about="&rmi;hasSequence">
+        <rdfs:domain rdf:resource="&rmi;Recipe"/>
+        <rdfs:subPropertyOf rdf:resource="&rmi;topDataProperty"/>
+        <rdfs:range rdf:resource="&xsd;string"/>
+    </owl:DatatypeProperty>
+    
+
+
+    <!-- http://kres.iks-project.eu/ontology/meta/rmi.owl#topDataProperty -->
+
+    <owl:DatatypeProperty rdf:about="&rmi;topDataProperty"/>
+    
+
+
+    <!-- 
+    ///////////////////////////////////////////////////////////////////////////////////////
+    //
+    // Classes
+    //
+    ///////////////////////////////////////////////////////////////////////////////////////
+     -->
+
+    
+
+
+    <!-- http://kres.iks-project.eu/ontology/meta/rmi.owl#KReSRule -->
+
+    <owl:Class rdf:about="&rmi;KReSRule">
+        <rdfs:subClassOf rdf:resource="&owl;Thing"/>
+        <rdfs:subClassOf>
+            <owl:Restriction>
+                <owl:onProperty rdf:resource="&rmi;isRuleOf"/>
+                <owl:someValuesFrom rdf:resource="&rmi;Recipe"/>
+            </owl:Restriction>
+        </rdfs:subClassOf>
+        <owl:disjointWith rdf:resource="&rmi;Recipe"/>
+    </owl:Class>
+    
+
+
+    <!-- http://kres.iks-project.eu/ontology/meta/rmi.owl#Recipe -->
+
+    <owl:Class rdf:about="&rmi;Recipe">
+        <rdfs:subClassOf rdf:resource="&owl;Thing"/>
+        <rdfs:subClassOf>
+            <owl:Restriction>
+                <owl:onProperty rdf:resource="&rmi;hasRule"/>
+                <owl:onClass rdf:resource="&rmi;KReSRule"/>
+                <owl:minQualifiedCardinality rdf:datatype="&xsd;nonNegativeInteger">1</owl:minQualifiedCardinality>
+            </owl:Restriction>
+        </rdfs:subClassOf>
+    </owl:Class>
+    
+
+
+    <!-- http://www.w3.org/2002/07/owl#Thing -->
+
+    <owl:Class rdf:about="&owl;Thing"/>
+    
+
+
+    <!-- 
+    ///////////////////////////////////////////////////////////////////////////////////////
+    //
+    // Annotations
+    //
+    ///////////////////////////////////////////////////////////////////////////////////////
+     -->
+
+    <rdf:Description rdf:about="http://eu.iksproject.kres/KReSOntologyRules.owl#isRuleOf">
+        <rdfs:label xml:lang="en">is rule of</rdfs:label>
+        <rdfs:label xml:lang="it">&#232; regola di</rdfs:label>
+        <rdfs:comment xml:lang="en">This property links a KReS rule to a Recipe</rdfs:comment>
+    </rdf:Description>
+    <rdf:Description rdf:about="http://eu.iksproject.kres/KReSOntologyRules.owl#hasDescription">
+        <rdfs:label xml:lang="en">has description</rdfs:label>
+        <rdfs:label xml:lang="it">ha descrizione</rdfs:label>
+        <rdfs:comment xml:lang="en">Any kind of description about rules or recipes.</rdfs:comment>
+    </rdf:Description>
+    <rdf:Description rdf:about="http://eu.iksproject.kres/KReSOntologyRules.owl#startWith">
+        <rdfs:label xml:lang="en">start with</rdfs:label>
+        <rdfs:label xml:lang="it">inizia con</rdfs:label>
+        <rdfs:comment xml:lang="en">This property identifies the starting rule of the recipe.</rdfs:comment>
+    </rdf:Description>
+    <rdf:Description rdf:about="http://eu.iksproject.kres/KReSOntologyRules.owl#endWith">
+        <rdfs:label xml:lang="en">end with</rdfs:label>
+        <rdfs:label xml:lang="it">finisce con</rdfs:label>
+        <rdfs:comment xml:lang="en">This property identifies the last rule of the recipe.</rdfs:comment>
+    </rdf:Description>
+    <rdf:Description rdf:about="http://eu.iksproject.kres/KReSOntologyRules.owl#hasBodyAndHead">
+        <rdfs:label xml:lang="en">has body and head</rdfs:label>
+        <rdfs:label xml:lang="it">ha corpo e testa</rdfs:label>
+        <rdfs:comment xml:lang="en">Physical Storage of a rule. Here there is the kres rule string.</rdfs:comment>
+    </rdf:Description>
+    <rdf:Description rdf:about="http://eu.iksproject.kres/KReSOntologyRules.owl#KReSRule">
+        <rdfs:label xml:lang="en">SWRL rules</rdfs:label>
+        <rdfs:label xml:lang="it">Regole SWRL</rdfs:label>
+        <rdfs:comment xml:lang="en">This class contains the IRI (the name) that identifies the rule.</rdfs:comment>
+        <rdfs:comment xml:lang="it">Questa classe contiene gli IRI che identificano le regole (i nomi) su una o pi&#249; ontologie. </rdfs:comment>
+    </rdf:Description>
+    <rdf:Description rdf:about="http://eu.iksproject.kres/KReSOntologyRules.owl#Recipe">
+        <rdfs:label xml:lang="en">Receipt</rdfs:label>
+        <rdfs:label xml:lang="it">Ricetta</rdfs:label>
+        <rdfs:comment xml:lang="en">&quot;This class contains the IRI that identifies a sequence of rules to perform particular action on the dataset. It must have at least one KReS rule</rdfs:comment>
+        <rdfs:comment xml:lang="it">&quot;Questa classe contiene l&#39;IRI che identifica una sequenza di regole che eseguiranno una particolare azione sul dataset. L&#39;istanza di questa classe deve contenere almeno una regola KReS</rdfs:comment>
+    </rdf:Description>
+    <rdf:Description rdf:about="http://eu.iksproject.kres/KReSOntologyRules.owl#hasRule">
+        <rdfs:label xml:lang="en">has rule</rdfs:label>
+        <rdfs:label xml:lang="it">ha regola</rdfs:label>
+        <rdfs:comment xml:lang="en">This property links a Recipe instance to a KReS rule.</rdfs:comment>
+    </rdf:Description>
+    <rdf:Description rdf:about="http://eu.iksproject.kres/KReSOntologyRules.owl#hasSequence">
+        <rdfs:label xml:lang="en">has sequence</rdfs:label>
+        <rdfs:label xml:lang="it">ha sequenza</rdfs:label>
+        <rdfs:comment xml:lang="en">Define the rule sequence of a recipe.</rdfs:comment>
+    </rdf:Description>
+</rdf:RDF>
+
+
+
+<!-- Generated by the OWL API (version 3.0.0.1451) http://owlapi.sourceforge.net -->
+