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:26:08 UTC
svn commit: r1085395 [1/2] - in /incubator/stanbol/trunk/kres/rules/manager:
./ src/main/java/org/apache/stanbol/rules/manager/
src/main/java/org/apache/stanbol/rules/manager/atoms/
src/main/java/org/apache/stanbol/rules/manager/changes/ src/main/java/...
Author: concelvio
Date: Fri Mar 25 14:26:06 2011
New Revision: 1085395
URL: http://svn.apache.org/viewvc?rev=1085395&view=rev
Log:
STANBOL-39:
- changed parent version in pom.xml to ${stanbol-version}
- removed kres-version from pom.xml
- changed name KReSKB.java to KB.java
- changed name KReSRuleContainer.java to RuleContainer.java
- changed name KReSRuleImpl.java to RuleImpl.java
- changed name KReSRuleParser.java to RuleParser.java
- changed name KReSBlankNode.java to RuleBlankNode.java
- changed name KReSCoreAtom.java to CoreAtom.java
- changed name KReSResource.java to ResourceAtom.java
- changed name KReSTypedLiteral.java to TypedLiteralAtom.java
- changed name KReSVariable.java to VarialbeAtom.java
- changed name KReSAddRecipe.java to AddRecipe.java
- changed name KReSAddRule.java to AddRule.java
- changed name KReSGetRecipe.java to GetRecipe.java
- changed name KReSGeRule.java to GetRule.java
- changed name KReSRemoveRule.java to RemoveRule.java
- changed name KReSRemoveRecipe.java to RemoveRecipe.java
- changed name KReSLoadRuleFile.java to LoadRuleFile.java
- changed name KReSRuleStore.java to RuleStoreImpl.java
- deleting KReSSetRuleStore.java is not used
- changed name KReSRuleGrammar.jj to RuleGrammar.jj
- changed name KReSRuleParser.java to RulePareerImpl.java
- changed name KReSRuleParserConstants.java to RulePareseConstants.java
- changed name KReSRuleParserTokenManager.java to RuleParserTokenManager.java
- changed name KReSAddRecipeTest.java to AddRecipeTest.java
- changed name KReSAddRuleTest.java to AddRuleTest.java
- changed name KReSGetRecipeTest.java to GetRecipeTest.java
- changed name KReSGeRuleTest.java to GetRuleTest.java
- changed name KReSRemoveRuleTest.java to RemoveRuleTest.java
- changed name KReSRemoveRecipeTest.java to RemoveRecipeTest.java
- changed name KReSLoadRuleFileTest.java to LoadRuleFileTest.java
- changed name KReSRuleStoreTest.java to RuleStoreTest.java
- changed name KReSRuleParserTest to RulePareserTest.java
- change class reference where required
Added:
incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/KB.java
- copied, changed from r1085259, incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/KReSKB.java
incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/RuleContainer.java
- copied, changed from r1085259, incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/KReSRuleContainer.java
incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/RuleImpl.java
- copied, changed from r1085259, incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/KReSRuleImpl.java
incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/RuleParser.java
- copied, changed from r1085259, incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/KReSRuleParser.java
incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/CoreAtom.java
- copied, changed from r1085259, incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/KReSCoreAtom.java
incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/ResourceAtom.java
- copied, changed from r1085259, incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/KReSResource.java
incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/RuleBlankNode.java
- copied, changed from r1085259, incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/KReSBlankNode.java
incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/TypedLiteralAtom.java
- copied, changed from r1085259, incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/KReSTypedLiteral.java
incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/VariableAtom.java
- copied, changed from r1085259, incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/KReSVariable.java
incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/AddRecipe.java
- copied, changed from r1085259, incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/KReSAddRecipe.java
incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/AddRule.java
- copied, changed from r1085259, incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/KReSAddRule.java
incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/GetRecipe.java
- copied, changed from r1085259, incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/KReSGetRecipe.java
incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/GetRule.java
- copied, changed from r1085259, incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/KReSGetRule.java
incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/LoadRuleFile.java
- copied, changed from r1085259, incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/KReSLoadRuleFile.java
incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/RemoveRecipe.java
- copied, changed from r1085259, incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/KReSRemoveRecipe.java
incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/RemoveRule.java
- copied, changed from r1085259, incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/KReSRemoveRule.java
incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/RuleStoreImpl.java
- copied, changed from r1085259, incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/KReSRuleStore.java
incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/parse/RuleGrammar.jj
- copied unchanged from r1085259, incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/parse/KReSRuleGrammar.jj
incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/parse/RuleParserConstants.java
- copied, changed from r1085259, incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/parse/KReSRuleParserConstants.java
incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/parse/RuleParserImpl.java
- copied, changed from r1085259, incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/parse/KReSRuleParser.java
incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/parse/RuleParserTokenManager.java
- copied, changed from r1085259, incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/parse/KReSRuleParserTokenManager.java
incubator/stanbol/trunk/kres/rules/manager/src/test/java/org/apache/stanbol/rules/manager/AddRecipeTest.java
- copied, changed from r1085259, incubator/stanbol/trunk/kres/rules/manager/src/test/java/org/apache/stanbol/rules/manager/KReSAddRecipeTest.java
incubator/stanbol/trunk/kres/rules/manager/src/test/java/org/apache/stanbol/rules/manager/AddRuleTest.java
- copied, changed from r1085259, incubator/stanbol/trunk/kres/rules/manager/src/test/java/org/apache/stanbol/rules/manager/KReSAddRuleTest.java
incubator/stanbol/trunk/kres/rules/manager/src/test/java/org/apache/stanbol/rules/manager/GetRecipeTest.java
- copied, changed from r1085259, incubator/stanbol/trunk/kres/rules/manager/src/test/java/org/apache/stanbol/rules/manager/KReSGetRecipeTest.java
incubator/stanbol/trunk/kres/rules/manager/src/test/java/org/apache/stanbol/rules/manager/GetRuleTest.java
- copied, changed from r1085259, incubator/stanbol/trunk/kres/rules/manager/src/test/java/org/apache/stanbol/rules/manager/KReSGetRuleTest.java
incubator/stanbol/trunk/kres/rules/manager/src/test/java/org/apache/stanbol/rules/manager/LoadRuleFileTest.java
- copied, changed from r1085259, incubator/stanbol/trunk/kres/rules/manager/src/test/java/org/apache/stanbol/rules/manager/KReSLoadRuleFileTest.java
incubator/stanbol/trunk/kres/rules/manager/src/test/java/org/apache/stanbol/rules/manager/RemoveRecipeTest.java
- copied, changed from r1085259, incubator/stanbol/trunk/kres/rules/manager/src/test/java/org/apache/stanbol/rules/manager/KReSRemoveRecipeTest.java
incubator/stanbol/trunk/kres/rules/manager/src/test/java/org/apache/stanbol/rules/manager/RemoveRuleTest.java
- copied, changed from r1085259, incubator/stanbol/trunk/kres/rules/manager/src/test/java/org/apache/stanbol/rules/manager/KReSRemoveRuleTest.java
incubator/stanbol/trunk/kres/rules/manager/src/test/java/org/apache/stanbol/rules/manager/RuleStoreTest.java
- copied, changed from r1085259, incubator/stanbol/trunk/kres/rules/manager/src/test/java/org/apache/stanbol/rules/manager/KReSRuleStoreTest.java
incubator/stanbol/trunk/kres/rules/manager/src/test/java/org/apache/stanbol/rules/manager/parse/RuleParserTest.java
- copied, changed from r1085259, incubator/stanbol/trunk/kres/rules/manager/src/test/java/org/apache/stanbol/rules/manager/parse/KReSRuleParserTest.java
Removed:
incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/KReSKB.java
incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/KReSRuleContainer.java
incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/KReSRuleImpl.java
incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/KReSRuleParser.java
incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/KReSBlankNode.java
incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/KReSCoreAtom.java
incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/KReSResource.java
incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/KReSTypedLiteral.java
incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/KReSVariable.java
incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/KReSAddRecipe.java
incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/KReSAddRule.java
incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/KReSGetRecipe.java
incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/KReSGetRule.java
incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/KReSLoadRuleFile.java
incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/KReSRemoveRecipe.java
incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/KReSRemoveRule.java
incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/KReSRuleStore.java
incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/KReSSetRuleStore.java
incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/parse/KReSRuleGrammar.jj
incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/parse/KReSRuleParser.java
incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/parse/KReSRuleParserConstants.java
incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/parse/KReSRuleParserTokenManager.java
incubator/stanbol/trunk/kres/rules/manager/src/test/java/org/apache/stanbol/rules/manager/KReSAddRecipeTest.java
incubator/stanbol/trunk/kres/rules/manager/src/test/java/org/apache/stanbol/rules/manager/KReSAddRuleTest.java
incubator/stanbol/trunk/kres/rules/manager/src/test/java/org/apache/stanbol/rules/manager/KReSGetRecipeTest.java
incubator/stanbol/trunk/kres/rules/manager/src/test/java/org/apache/stanbol/rules/manager/KReSGetRuleTest.java
incubator/stanbol/trunk/kres/rules/manager/src/test/java/org/apache/stanbol/rules/manager/KReSLoadRuleFileTest.java
incubator/stanbol/trunk/kres/rules/manager/src/test/java/org/apache/stanbol/rules/manager/KReSRemoveRecipeTest.java
incubator/stanbol/trunk/kres/rules/manager/src/test/java/org/apache/stanbol/rules/manager/KReSRemoveRuleTest.java
incubator/stanbol/trunk/kres/rules/manager/src/test/java/org/apache/stanbol/rules/manager/KReSRuleStoreTest.java
incubator/stanbol/trunk/kres/rules/manager/src/test/java/org/apache/stanbol/rules/manager/parse/KReSRuleParserTest.java
Modified:
incubator/stanbol/trunk/kres/rules/manager/pom.xml
incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/BlankNodeAtom.java
incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/ClassAtom.java
incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/ComparisonAtom.java
incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/DatavaluedPropertyAtom.java
incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/IndividualPropertyAtom.java
incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/LetAtom.java
incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/NewNodeAtom.java
incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/NumericFunctionAtom.java
incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/SPARQLConstructAtomAbstract.java
incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/SPARQLDeleteAtomAbstract.java
incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/SPARQLDeleteDataAtomAbstract.java
incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/StringFunctionAtom.java
incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/UObjectAtom.java
incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/UnionAtom.java
incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/RecipeImpl.java
Modified: incubator/stanbol/trunk/kres/rules/manager/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/rules/manager/pom.xml?rev=1085395&r1=1085394&r2=1085395&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/rules/manager/pom.xml (original)
+++ incubator/stanbol/trunk/kres/rules/manager/pom.xml Fri Mar 25 14:26:06 2011
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>stanbol-parent</artifactId>
- <version>0.9-SNAPSHOT</version>
+ <version>${stanbol-version}</version>
<relativePath>../../../parent</relativePath>
</parent>
@@ -40,10 +40,6 @@
<inceptionYear>2010</inceptionYear>
- <properties>
- <kres-version>0.7</kres-version>
- </properties>
-
<build>
<plugins>
<plugin>
@@ -116,14 +112,6 @@
</dependency>
<!-- Stanbol deps -->
- <!--
- <dependency>
- <groupId>eu.iksproject</groupId>
- <artifactId>eu.iksproject.kres.api</artifactId>
- <version>${kres-version}</version>
- <scope>provided</scope>
- </dependency>
- -->
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.owlapi</artifactId>
@@ -156,14 +144,6 @@
</dependency>
<!-- Testing deps -->
- <!--
- <dependency>
- <groupId>eu.iksproject</groupId>
- <artifactId>eu.iksproject.kres.manager</artifactId>
- <version>${kres-version}</version>
- <scope>test</scope>
- </dependency>
- -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Copied: incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/KB.java (from r1085259, incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/KReSKB.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/KB.java?p2=incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/KB.java&p1=incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/KReSKB.java&r1=1085259&r2=1085395&rev=1085395&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/KReSKB.java (original)
+++ incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/KB.java Fri Mar 25 14:26:06 2011
@@ -5,8 +5,8 @@ import java.io.IOException;
import java.io.OutputStream;
import java.util.Hashtable;
-import org.apache.stanbol.rules.base.api.KReSRule;
-import org.apache.stanbol.rules.base.api.util.KReSRuleList;
+import org.apache.stanbol.rules.base.api.Rule;
+import org.apache.stanbol.rules.base.api.util.RuleList;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -17,7 +17,7 @@ import com.hp.hpl.jena.ontology.OntModel
* Missing description
*
*/
-public class KReSKB {
+public class KB {
private final Logger log = LoggerFactory.getLogger(getClass());
@@ -29,14 +29,14 @@ public class KReSKB {
*/
private Hashtable<String, OntModel> ontologies;
- private KReSRuleList kReSRuleList;
+ private RuleList kReSRuleList;
- public KReSKB() {
+ public KB() {
log.debug("Setting up a KReSKB");
prefixes = new Hashtable<String, String>();
prefixes.put("var", "http://kres.iks-project.eu/ontology/meta/variables#");
- kReSRuleList = new KReSRuleList();
+ kReSRuleList = new RuleList();
}
public void addPrefix(String prefixString, String prefixURI){
@@ -48,12 +48,12 @@ public class KReSKB {
return prefixes.get(prefixString);
}
- public void addRule(KReSRule kReSRule){
+ public void addRule(Rule kReSRule){
System.out.println("Adding rule to Head");
kReSRuleList.add(kReSRule);
}
- public KReSRuleList getkReSRuleList() {
+ public RuleList getkReSRuleList() {
return kReSRuleList;
}
@@ -61,7 +61,7 @@ public class KReSKB {
String sparql = null;
if(kReSRuleList != null){
boolean firstIteration = true;
- for(KReSRule kReSRule : kReSRuleList){
+ for(Rule kReSRule : kReSRuleList){
if(firstIteration){
firstIteration = false;
}
@@ -77,7 +77,7 @@ public class KReSKB {
public void write(OutputStream outputStream) throws IOException{
boolean firstIt = true;
- for(KReSRule kReSRule : kReSRuleList){
+ for(Rule kReSRule : kReSRuleList){
String rule;
@@ -96,7 +96,7 @@ public class KReSKB {
public void write(FileWriter fileWriter) throws IOException{
boolean write = true;
- for(KReSRule kReSRule : kReSRuleList){
+ for(Rule kReSRule : kReSRuleList){
if(write){
fileWriter.write(kReSRule.toKReSSyntax());
write = false;
Copied: incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/RuleContainer.java (from r1085259, incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/KReSRuleContainer.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/RuleContainer.java?p2=incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/RuleContainer.java&p1=incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/KReSRuleContainer.java&r1=1085259&r2=1085395&rev=1085395&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/KReSRuleContainer.java (original)
+++ incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/RuleContainer.java Fri Mar 25 14:26:06 2011
@@ -4,11 +4,11 @@ import java.util.Collection;
import java.util.Hashtable;
import java.util.Set;
-public class KReSRuleContainer {
+public class RuleContainer {
private Hashtable<String, String> semionRules;
- public KReSRuleContainer() {
+ public RuleContainer() {
semionRules = new Hashtable<String, String>();
}
Copied: incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/RuleImpl.java (from r1085259, incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/KReSRuleImpl.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/RuleImpl.java?p2=incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/RuleImpl.java&p1=incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/KReSRuleImpl.java&r1=1085259&r2=1085395&rev=1085395&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/KReSRuleImpl.java (original)
+++ incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/RuleImpl.java Fri Mar 25 14:26:06 2011
@@ -5,9 +5,9 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
-import org.apache.stanbol.rules.base.api.KReSRule;
-import org.apache.stanbol.rules.base.api.KReSRuleAtom;
-import org.apache.stanbol.rules.base.api.KReSRuleExpressiveness;
+import org.apache.stanbol.rules.base.api.Rule;
+import org.apache.stanbol.rules.base.api.RuleAtom;
+import org.apache.stanbol.rules.base.api.RuleExpressiveness;
import org.apache.stanbol.rules.base.api.SPARQLObject;
import org.apache.stanbol.rules.base.api.util.AtomList;
import org.semanticweb.owlapi.model.IRI;
@@ -22,7 +22,7 @@ import com.hp.hpl.jena.rdf.model.Resourc
import org.apache.stanbol.rules.base.SWRL;
-public class KReSRuleImpl implements KReSRule {
+public class RuleImpl implements Rule {
private String ruleName;
@@ -37,9 +37,9 @@ public class KReSRuleImpl implements KRe
private boolean sparqlC;
private boolean sparqlD;
- KReSRuleExpressiveness expressiveness;
+ RuleExpressiveness expressiveness;
- public KReSRuleImpl(String ruleURI, AtomList body, AtomList head, KReSRuleExpressiveness expressiveness) {
+ public RuleImpl(String ruleURI, AtomList body, AtomList head, RuleExpressiveness expressiveness) {
this.ruleName = ruleURI;
this.head = head;
this.body = body;
@@ -70,9 +70,9 @@ public class KReSRuleImpl implements KRe
if(isSPARQLConstruct() || isSPARQLDelete()){
boolean found = false;
- Iterator<KReSRuleAtom> it = body.iterator();
+ Iterator<RuleAtom> it = body.iterator();
while(it.hasNext() && !found){
- KReSRuleAtom kReSRuleAtom = it.next();
+ RuleAtom kReSRuleAtom = it.next();
sparql = kReSRuleAtom.toSPARQL().getObject();
found = true;
}
@@ -85,7 +85,7 @@ public class KReSRuleImpl implements KRe
boolean firstIte = true;
- for(KReSRuleAtom kReSRuleAtom : head){
+ for(RuleAtom kReSRuleAtom : head){
if(!firstIte){
sparql += " . ";
}
@@ -98,7 +98,7 @@ public class KReSRuleImpl implements KRe
firstIte = true;
ArrayList<SPARQLObject> sparqlObjects = new ArrayList<SPARQLObject>();
- for(KReSRuleAtom kReSRuleAtom : body){
+ for(RuleAtom kReSRuleAtom : body){
SPARQLObject sparqlObject = kReSRuleAtom.toSPARQL();
if(sparqlObject instanceof SPARQLNot){
sparqlObjects.add((SPARQLNot) sparqlObject);
@@ -179,14 +179,14 @@ public class KReSRuleImpl implements KRe
//RDF list for body
RDFList list = model.createList();
- for(KReSRuleAtom atom : body){
+ for(RuleAtom atom : body){
list = list.cons(atom.toSWRL(model));
}
imp.addProperty(SWRL.body, list);
//RDF list for head
list = model.createList();
- for(KReSRuleAtom atom : head){
+ for(RuleAtom atom : head){
list = list.cons(atom.toSWRL(model));
}
imp.addProperty(SWRL.head, list);
@@ -201,10 +201,10 @@ public class KReSRuleImpl implements KRe
Set<SWRLAtom> bodyAtoms = new HashSet<SWRLAtom>();
Set<SWRLAtom> headAtoms = new HashSet<SWRLAtom>();
- for(KReSRuleAtom atom : body){
+ for(RuleAtom atom : body){
bodyAtoms.add(atom.toSWRL(factory));
}
- for(KReSRuleAtom atom : head){
+ for(RuleAtom atom : head){
headAtoms.add(atom.toSWRL(factory));
}
return factory.getSWRLRule(
@@ -224,7 +224,7 @@ public class KReSRuleImpl implements KRe
boolean addAnd = false;
rule = "RULE "+ruleName+" ASSERTS THAT "+System.getProperty("line.separator");
rule += "IF"+System.getProperty("line.separator");
- for(KReSRuleAtom atom : body){
+ for(RuleAtom atom : body){
rule += tab;
if(addAnd){
rule += "AND ";
@@ -239,7 +239,7 @@ public class KReSRuleImpl implements KRe
rule += "IMPLIES"+System.getProperty("line.separator");
addAnd = false;
- for(KReSRuleAtom atom : head){
+ for(RuleAtom atom : head){
rule += tab;
if(addAnd){
rule += "AND ";
@@ -276,9 +276,9 @@ public class KReSRuleImpl implements KRe
if(isSPARQLConstruct() || isSPARQLDelete()){
boolean found = false;
- Iterator<KReSRuleAtom> it = body.iterator();
+ Iterator<RuleAtom> it = body.iterator();
while(it.hasNext() && !found){
- KReSRuleAtom kReSRuleAtom = it.next();
+ RuleAtom kReSRuleAtom = it.next();
ruleInKReSSyntax = kReSRuleAtom.toSPARQL().getObject();
found = true;
}
@@ -287,7 +287,7 @@ public class KReSRuleImpl implements KRe
else{
boolean firstLoop = true;
- for(KReSRuleAtom atom : body){
+ for(RuleAtom atom : body){
if(!firstLoop){
ruleInKReSSyntax += " . ";
}
@@ -302,7 +302,7 @@ public class KReSRuleImpl implements KRe
ruleInKReSSyntax += " -> ";
firstLoop = true;
- for(KReSRuleAtom atom : head){
+ for(RuleAtom atom : head){
if(!firstLoop){
ruleInKReSSyntax += " . ";
}
@@ -377,7 +377,7 @@ public class KReSRuleImpl implements KRe
@Override
- public KReSRuleExpressiveness getExpressiveness() {
+ public RuleExpressiveness getExpressiveness() {
return expressiveness;
}
}
Copied: incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/RuleParser.java (from r1085259, incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/KReSRuleParser.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/RuleParser.java?p2=incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/RuleParser.java&p1=incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/KReSRuleParser.java&r1=1085259&r2=1085395&rev=1085395&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/KReSRuleParser.java (original)
+++ incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/RuleParser.java Fri Mar 25 14:26:06 2011
@@ -26,7 +26,7 @@ import com.hp.hpl.jena.vocabulary.RDF;
import org.apache.stanbol.rules.base.SWRL;
-public class KReSRuleParser {
+public class RuleParser {
public static String ruleNS = "http://www.prova.org/rules.rdf#";
@@ -36,14 +36,14 @@ public class KReSRuleParser {
private OntModel ruleOntology;
- public KReSRuleParser(Model sourceModel, Model destinationModel, Model ruleOntology) {
+ public RuleParser(Model sourceModel, Model destinationModel, Model ruleOntology) {
this.sourceModel = sourceModel;
this.destinationModel = destinationModel;
this.ruleOntology = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM, ruleOntology);
}
- public KReSRuleParser(OntModel inputOntology, Map<String, String>prefixMap, Model ruleOntology) {
+ public RuleParser(OntModel inputOntology, Map<String, String>prefixMap, Model ruleOntology) {
this.sourceModel = inputOntology;
this.ruleOntology = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM, ruleOntology);
Set<String> keys = prefixMap.keySet();
@@ -55,7 +55,7 @@ public class KReSRuleParser {
}
}
- public KReSRuleParser(OntModel inputOntology, Map<String, String>prefixMap) {
+ public RuleParser(OntModel inputOntology, Map<String, String>prefixMap) {
this.sourceModel = inputOntology;
this.ruleOntology = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM, null);
ruleOntology.setNsPrefix("owl", "http://www.w3.org/2002/07/owl#");
Modified: incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/BlankNodeAtom.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/BlankNodeAtom.java?rev=1085395&r1=1085394&r2=1085395&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/BlankNodeAtom.java (original)
+++ incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/BlankNodeAtom.java Fri Mar 25 14:26:06 2011
@@ -11,7 +11,7 @@ import com.hp.hpl.jena.rdf.model.Resourc
-public class BlankNodeAtom extends KReSCoreAtom {
+public class BlankNodeAtom extends CoreAtom {
private URIResource argument1;
private URIResource argument2;
Modified: incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/ClassAtom.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/ClassAtom.java?rev=1085395&r1=1085394&r2=1085395&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/ClassAtom.java (original)
+++ incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/ClassAtom.java Fri Mar 25 14:26:06 2011
@@ -18,7 +18,7 @@ import com.hp.hpl.jena.rdf.model.Resourc
import org.apache.stanbol.rules.base.SWRL;
-public class ClassAtom extends KReSCoreAtom {
+public class ClassAtom extends CoreAtom {
private URIResource classResource;
private URIResource argument1;
@@ -38,7 +38,7 @@ public class ClassAtom extends KReSCoreA
if(argument1.toString().startsWith("http://kres.iks-project.eu/ontology/meta/variables#")){
argument1SPARQL = "?"+argument1.toString().replace("http://kres.iks-project.eu/ontology/meta/variables#", "");
- KReSVariable variable = (KReSVariable) argument1;
+ VariableAtom variable = (VariableAtom) argument1;
negativeArg = variable.isNegative();
}
else{
@@ -47,7 +47,7 @@ public class ClassAtom extends KReSCoreA
if(classResource.toString().startsWith("http://kres.iks-project.eu/ontology/meta/variables#")){
argument2SPARQL = "?"+classResource.toString().replace("http://kres.iks-project.eu/ontology/meta/variables#", "");
- KReSVariable variable = (KReSVariable) classResource;
+ VariableAtom variable = (VariableAtom) classResource;
negativeClass = variable.isNegative();
}
else{
@@ -99,7 +99,7 @@ public class ClassAtom extends KReSCoreA
OWLClass classPredicate = factory.getOWLClass(IRI.create(classResource.getURI().toString()));
SWRLIArgument argumentResource;
- if(argument1 instanceof KReSResource){
+ if(argument1 instanceof ResourceAtom){
OWLIndividual owlIndividual = factory.getOWLNamedIndividual(IRI.create(argument1.getURI().toString()));
argumentResource = factory.getSWRLIndividualArgument(owlIndividual);
}
@@ -133,7 +133,7 @@ public class ClassAtom extends KReSCoreA
if(argument1.toString().startsWith("http://kres.iks-project.eu/ontology/meta/variables#")){
arg1 = "?"+argument1.toString().replace("http://kres.iks-project.eu/ontology/meta/variables#", "");
- KReSVariable variable = (KReSVariable) argument1;
+ VariableAtom variable = (VariableAtom) argument1;
if(variable.isNegative()){
arg1 = "notex(" + arg1 + ")";
}
@@ -144,7 +144,7 @@ public class ClassAtom extends KReSCoreA
if(classResource.toString().startsWith("http://kres.iks-project.eu/ontology/meta/variables#")){
arg2 = "?"+classResource.toString().replace("http://kres.iks-project.eu/ontology/meta/variables#", "");
- KReSVariable variable = (KReSVariable) classResource;
+ VariableAtom variable = (VariableAtom) classResource;
if(variable.isNegative()){
arg2 = "notex(" + arg2 + ")";
}
Modified: incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/ComparisonAtom.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/ComparisonAtom.java?rev=1085395&r1=1085394&r2=1085395&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/ComparisonAtom.java (original)
+++ incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/ComparisonAtom.java Fri Mar 25 14:26:06 2011
@@ -1,8 +1,8 @@
package org.apache.stanbol.rules.manager.atoms;
-import org.apache.stanbol.rules.base.api.KReSRuleAtom;
+import org.apache.stanbol.rules.base.api.RuleAtom;
-public abstract class ComparisonAtom implements KReSRuleAtom {
+public abstract class ComparisonAtom implements RuleAtom {
@Override
Copied: incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/CoreAtom.java (from r1085259, incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/KReSCoreAtom.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/CoreAtom.java?p2=incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/CoreAtom.java&p1=incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/KReSCoreAtom.java&r1=1085259&r2=1085395&rev=1085395&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/KReSCoreAtom.java (original)
+++ incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/CoreAtom.java Fri Mar 25 14:26:06 2011
@@ -1,10 +1,10 @@
package org.apache.stanbol.rules.manager.atoms;
-import org.apache.stanbol.rules.base.api.KReSRuleAtom;
+import org.apache.stanbol.rules.base.api.RuleAtom;
-public abstract class KReSCoreAtom implements KReSRuleAtom {
+public abstract class CoreAtom implements RuleAtom {
@Override
Modified: incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/DatavaluedPropertyAtom.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/DatavaluedPropertyAtom.java?rev=1085395&r1=1085394&r2=1085395&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/DatavaluedPropertyAtom.java (original)
+++ incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/DatavaluedPropertyAtom.java Fri Mar 25 14:26:06 2011
@@ -23,7 +23,7 @@ import com.hp.hpl.jena.rdf.model.Resourc
import org.apache.stanbol.rules.base.SWRL;
-public class DatavaluedPropertyAtom extends KReSCoreAtom {
+public class DatavaluedPropertyAtom extends CoreAtom {
private URIResource datatypeProperty;
private URIResource argument1;
@@ -48,19 +48,19 @@ public class DatavaluedPropertyAtom exte
if(arg1.startsWith("http://kres.iks-project.eu/ontology/meta/variables#")){
arg1 = "?"+arg1.replace("http://kres.iks-project.eu/ontology/meta/variables#", "");
- KReSVariable variable = (KReSVariable) argument1;
+ VariableAtom variable = (VariableAtom) argument1;
negativeArg1 = variable.isNegative();
}
if(dtP.startsWith("http://kres.iks-project.eu/ontology/meta/variables#")){
dtP = "?"+dtP.replace("http://kres.iks-project.eu/ontology/meta/variables#", "");
- KReSVariable variable = (KReSVariable) datatypeProperty;
+ VariableAtom variable = (VariableAtom) datatypeProperty;
negativeDtP = variable.isNegative();
}
if(arg2.startsWith("http://kres.iks-project.eu/ontology/meta/variables#")){
arg2 = "?"+arg2.replace("http://kres.iks-project.eu/ontology/meta/variables#", "");
- KReSVariable variable = (KReSVariable) argument2;
+ VariableAtom variable = (VariableAtom) argument2;
negativeArg2 = variable.isNegative();
}
@@ -72,9 +72,9 @@ public class DatavaluedPropertyAtom exte
else if(argument2 instanceof Integer){
arg2 = ((Integer) argument2).toString();
}
- else if(argument2 instanceof KReSTypedLiteral){
+ else if(argument2 instanceof TypedLiteralAtom){
- KReSTypedLiteral kReSTypeLiteral = (KReSTypedLiteral) argument2;
+ TypedLiteralAtom kReSTypeLiteral = (TypedLiteralAtom) argument2;
Object value = kReSTypeLiteral.getValue();
String xsdType = kReSTypeLiteral.getXsdType().toString();
@@ -238,7 +238,7 @@ public class DatavaluedPropertyAtom exte
if(argument1.toString().startsWith("http://kres.iks-project.eu/ontology/meta/variables#")){
arg1 = "?"+argument1.toString().replace("http://kres.iks-project.eu/ontology/meta/variables#", "");
- KReSVariable variable = (KReSVariable) argument1;
+ VariableAtom variable = (VariableAtom) argument1;
if(variable.isNegative()){
arg1 = "notex(" + arg1 + ")";
}
@@ -250,7 +250,7 @@ public class DatavaluedPropertyAtom exte
if(datatypeProperty.toString().startsWith("http://kres.iks-project.eu/ontology/meta/variables#")){
arg3 = "?"+datatypeProperty.toString().replace("http://kres.iks-project.eu/ontology/meta/variables#", "");
- KReSVariable variable = (KReSVariable) datatypeProperty;
+ VariableAtom variable = (VariableAtom) datatypeProperty;
if(variable.isNegative()){
arg3 = "notex(" + arg3 + ")";
}
@@ -262,7 +262,7 @@ public class DatavaluedPropertyAtom exte
if(argument2.toString().startsWith("http://kres.iks-project.eu/ontology/meta/variables#")){
arg2 = "?"+argument2.toString().replace("http://kres.iks-project.eu/ontology/meta/variables#", "");
- KReSVariable variable = (KReSVariable) argument2;
+ VariableAtom variable = (VariableAtom) argument2;
if(variable.isNegative()){
arg2 = "notex(" + arg2 + ")";
}
Modified: incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/IndividualPropertyAtom.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/IndividualPropertyAtom.java?rev=1085395&r1=1085394&r2=1085395&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/IndividualPropertyAtom.java (original)
+++ incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/IndividualPropertyAtom.java Fri Mar 25 14:26:06 2011
@@ -18,7 +18,7 @@ import com.hp.hpl.jena.rdf.model.Resourc
import org.apache.stanbol.rules.base.SWRL;
-public class IndividualPropertyAtom extends KReSCoreAtom {
+public class IndividualPropertyAtom extends CoreAtom {
private URIResource objectProperty;
@@ -43,7 +43,7 @@ public class IndividualPropertyAtom exte
if(arg1.startsWith("http://kres.iks-project.eu/ontology/meta/variables#")){
arg1 = "?"+arg1.replace("http://kres.iks-project.eu/ontology/meta/variables#", "");
- KReSVariable variable = (KReSVariable) argument1;
+ VariableAtom variable = (VariableAtom) argument1;
if(variable.isNegative()){
negativeArg1 = true;
}
@@ -51,7 +51,7 @@ public class IndividualPropertyAtom exte
if(arg2.startsWith("http://kres.iks-project.eu/ontology/meta/variables#")){
arg2 = "?"+arg2.replace("http://kres.iks-project.eu/ontology/meta/variables#", "");
- KReSVariable variable = (KReSVariable) argument2;
+ VariableAtom variable = (VariableAtom) argument2;
if(variable.isNegative()){
negativeArg2 = true;
}
@@ -59,7 +59,7 @@ public class IndividualPropertyAtom exte
if(objP.startsWith("http://kres.iks-project.eu/ontology/meta/variables#")){
objP = "?"+objP.replace("http://kres.iks-project.eu/ontology/meta/variables#", "");
- KReSVariable variable = (KReSVariable) objectProperty;
+ VariableAtom variable = (VariableAtom) objectProperty;
if(variable.isNegative()){
negativeObjP = true;
}
@@ -115,7 +115,7 @@ public class IndividualPropertyAtom exte
SWRLIArgument swrliArgument1;
SWRLIArgument swrliArgument2;
- if(argument1 instanceof KReSVariable){
+ if(argument1 instanceof VariableAtom){
swrliArgument1 = factory.getSWRLVariable(IRI.create(argument1.getURI().toString()));
}
else{
@@ -123,7 +123,7 @@ public class IndividualPropertyAtom exte
swrliArgument1 = factory.getSWRLIndividualArgument(owlIndividual);
}
- if(argument2 instanceof KReSVariable){
+ if(argument2 instanceof VariableAtom){
swrliArgument2 = factory.getSWRLVariable(IRI.create(argument2.getURI().toString()));
}
else{
@@ -162,7 +162,7 @@ public class IndividualPropertyAtom exte
if(argument1.toString().startsWith("http://kres.iks-project.eu/ontology/meta/variables#")){
arg1 = "?"+argument1.toString().replace("http://kres.iks-project.eu/ontology/meta/variables#", "");
- KReSVariable variable = (KReSVariable) argument1;
+ VariableAtom variable = (VariableAtom) argument1;
if(variable.isNegative()){
arg1 = "notex(" + arg1 + ")";
}
@@ -174,7 +174,7 @@ public class IndividualPropertyAtom exte
if(objectProperty.toString().startsWith("http://kres.iks-project.eu/ontology/meta/variables#")){
arg3 = "?"+objectProperty.toString().replace("http://kres.iks-project.eu/ontology/meta/variables#", "");
- KReSVariable variable = (KReSVariable) objectProperty;
+ VariableAtom variable = (VariableAtom) objectProperty;
if(variable.isNegative()){
arg3 = "notex(" + arg3 + ")";
}
@@ -185,7 +185,7 @@ public class IndividualPropertyAtom exte
if(argument2.toString().startsWith("http://kres.iks-project.eu/ontology/meta/variables#")){
arg2 = "?"+argument2.toString().replace("http://kres.iks-project.eu/ontology/meta/variables#", "");
- KReSVariable variable = (KReSVariable) argument2;
+ VariableAtom variable = (VariableAtom) argument2;
if(variable.isNegative()){
arg2 = "notex(" + arg2 + ")";
}
Modified: incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/LetAtom.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/LetAtom.java?rev=1085395&r1=1085394&r2=1085395&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/LetAtom.java (original)
+++ incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/LetAtom.java Fri Mar 25 14:26:06 2011
@@ -1,6 +1,6 @@
package org.apache.stanbol.rules.manager.atoms;
-import org.apache.stanbol.rules.base.api.KReSRuleAtom;
+import org.apache.stanbol.rules.base.api.RuleAtom;
import org.apache.stanbol.rules.base.api.SPARQLObject;
import org.apache.stanbol.rules.base.api.URIResource;
import org.apache.stanbol.rules.manager.SPARQLFunction;
@@ -11,7 +11,7 @@ import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.Resource;
-public class LetAtom implements KReSRuleAtom {
+public class LetAtom implements RuleAtom {
private URIResource variable;
private StringFunctionAtom parameterFunctionAtom;
Modified: incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/NewNodeAtom.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/NewNodeAtom.java?rev=1085395&r1=1085394&r2=1085395&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/NewNodeAtom.java (original)
+++ incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/NewNodeAtom.java Fri Mar 25 14:26:06 2011
@@ -1,6 +1,6 @@
package org.apache.stanbol.rules.manager.atoms;
-import org.apache.stanbol.rules.base.api.KReSRuleAtom;
+import org.apache.stanbol.rules.base.api.RuleAtom;
import org.apache.stanbol.rules.base.api.SPARQLObject;
import org.apache.stanbol.rules.base.api.URIResource;
import org.apache.stanbol.rules.manager.SPARQLFunction;
@@ -11,7 +11,7 @@ import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.Resource;
-public class NewNodeAtom implements KReSRuleAtom {
+public class NewNodeAtom implements RuleAtom {
private URIResource newNodeVariable;
@@ -35,7 +35,7 @@ public class NewNodeAtom implements KReS
String bindingString = null;
- if(binding instanceof KReSVariable){
+ if(binding instanceof VariableAtom){
bindingString = "?"+binding.toString().replace("http://kres.iks-project.eu/ontology/meta/variables#", "");
}
else{
@@ -58,7 +58,7 @@ public class NewNodeAtom implements KReS
String bindingString = null;
- if(binding instanceof KReSVariable){
+ if(binding instanceof VariableAtom){
bindingString = "?"+binding.toString().replace("http://kres.iks-project.eu/ontology/meta/variables#", "");
}
else{
Modified: incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/NumericFunctionAtom.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/NumericFunctionAtom.java?rev=1085395&r1=1085394&r2=1085395&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/NumericFunctionAtom.java (original)
+++ incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/NumericFunctionAtom.java Fri Mar 25 14:26:06 2011
@@ -1,8 +1,8 @@
package org.apache.stanbol.rules.manager.atoms;
-import org.apache.stanbol.rules.base.api.KReSRuleAtom;
+import org.apache.stanbol.rules.base.api.RuleAtom;
-public abstract class NumericFunctionAtom implements KReSRuleAtom {
+public abstract class NumericFunctionAtom implements RuleAtom {
@Override
Copied: incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/ResourceAtom.java (from r1085259, incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/KReSResource.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/ResourceAtom.java?p2=incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/ResourceAtom.java&p1=incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/KReSResource.java&r1=1085259&r2=1085395&rev=1085395&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/KReSResource.java (original)
+++ incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/ResourceAtom.java Fri Mar 25 14:26:06 2011
@@ -7,11 +7,11 @@ import org.apache.stanbol.rules.base.api
import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.Resource;
-public class KReSResource implements URIResource {
+public class ResourceAtom implements URIResource {
private URI uri;
- public KReSResource(URI uri){
+ public ResourceAtom(URI uri){
this.uri = uri;
}
Copied: incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/RuleBlankNode.java (from r1085259, incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/KReSBlankNode.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/RuleBlankNode.java?p2=incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/RuleBlankNode.java&p1=incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/KReSBlankNode.java&r1=1085259&r2=1085395&rev=1085395&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/KReSBlankNode.java (original)
+++ incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/RuleBlankNode.java Fri Mar 25 14:26:06 2011
@@ -7,11 +7,11 @@ import org.apache.stanbol.rules.base.api
import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.Resource;
-public class KReSBlankNode implements URIResource {
+public class RuleBlankNode implements URIResource {
private String bNode;
- public KReSBlankNode(String bNode) {
+ public RuleBlankNode(String bNode) {
this.bNode = bNode;
}
Modified: incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/SPARQLConstructAtomAbstract.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/SPARQLConstructAtomAbstract.java?rev=1085395&r1=1085394&r2=1085395&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/SPARQLConstructAtomAbstract.java (original)
+++ incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/SPARQLConstructAtomAbstract.java Fri Mar 25 14:26:06 2011
@@ -1,8 +1,8 @@
package org.apache.stanbol.rules.manager.atoms;
-import org.apache.stanbol.rules.base.api.KReSRuleAtom;
+import org.apache.stanbol.rules.base.api.RuleAtom;
-public abstract class SPARQLConstructAtomAbstract implements KReSRuleAtom {
+public abstract class SPARQLConstructAtomAbstract implements RuleAtom {
@Override
public boolean isSPARQLConstruct() {
Modified: incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/SPARQLDeleteAtomAbstract.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/SPARQLDeleteAtomAbstract.java?rev=1085395&r1=1085394&r2=1085395&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/SPARQLDeleteAtomAbstract.java (original)
+++ incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/SPARQLDeleteAtomAbstract.java Fri Mar 25 14:26:06 2011
@@ -1,8 +1,8 @@
package org.apache.stanbol.rules.manager.atoms;
-import org.apache.stanbol.rules.base.api.KReSRuleAtom;
+import org.apache.stanbol.rules.base.api.RuleAtom;
-public abstract class SPARQLDeleteAtomAbstract implements KReSRuleAtom {
+public abstract class SPARQLDeleteAtomAbstract implements RuleAtom {
@Override
public boolean isSPARQLConstruct() {
Modified: incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/SPARQLDeleteDataAtomAbstract.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/SPARQLDeleteDataAtomAbstract.java?rev=1085395&r1=1085394&r2=1085395&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/SPARQLDeleteDataAtomAbstract.java (original)
+++ incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/SPARQLDeleteDataAtomAbstract.java Fri Mar 25 14:26:06 2011
@@ -1,8 +1,8 @@
package org.apache.stanbol.rules.manager.atoms;
-import org.apache.stanbol.rules.base.api.KReSRuleAtom;
+import org.apache.stanbol.rules.base.api.RuleAtom;
-public abstract class SPARQLDeleteDataAtomAbstract implements KReSRuleAtom {
+public abstract class SPARQLDeleteDataAtomAbstract implements RuleAtom {
@Override
Modified: incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/StringFunctionAtom.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/StringFunctionAtom.java?rev=1085395&r1=1085394&r2=1085395&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/StringFunctionAtom.java (original)
+++ incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/StringFunctionAtom.java Fri Mar 25 14:26:06 2011
@@ -1,8 +1,8 @@
package org.apache.stanbol.rules.manager.atoms;
-import org.apache.stanbol.rules.base.api.KReSRuleAtom;
+import org.apache.stanbol.rules.base.api.RuleAtom;
-public abstract class StringFunctionAtom implements KReSRuleAtom {
+public abstract class StringFunctionAtom implements RuleAtom {
@Override
Copied: incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/TypedLiteralAtom.java (from r1085259, incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/KReSTypedLiteral.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/TypedLiteralAtom.java?p2=incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/TypedLiteralAtom.java&p1=incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/KReSTypedLiteral.java&r1=1085259&r2=1085395&rev=1085395&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/KReSTypedLiteral.java (original)
+++ incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/TypedLiteralAtom.java Fri Mar 25 14:26:06 2011
@@ -2,12 +2,12 @@ package org.apache.stanbol.rules.manager
import org.apache.stanbol.rules.base.api.URIResource;
-public class KReSTypedLiteral {
+public class TypedLiteralAtom {
private Object value;
private URIResource xsdType;
- public KReSTypedLiteral(Object value, URIResource xsdType) {
+ public TypedLiteralAtom(Object value, URIResource xsdType) {
this.value = value;
this.xsdType = xsdType;
}
Modified: incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/UObjectAtom.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/UObjectAtom.java?rev=1085395&r1=1085394&r2=1085395&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/UObjectAtom.java (original)
+++ incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/UObjectAtom.java Fri Mar 25 14:26:06 2011
@@ -22,7 +22,7 @@ public class UObjectAtom extends StringF
public UObjectAtom(Object argument) {
this.argument = argument;
- if(argument instanceof KReSVariable){
+ if(argument instanceof VariableAtom){
actualType = 2;
}
else if(argument instanceof String){
Modified: incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/UnionAtom.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/UnionAtom.java?rev=1085395&r1=1085394&r2=1085395&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/UnionAtom.java (original)
+++ incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/UnionAtom.java Fri Mar 25 14:26:06 2011
@@ -1,6 +1,6 @@
package org.apache.stanbol.rules.manager.atoms;
-import org.apache.stanbol.rules.base.api.KReSRuleAtom;
+import org.apache.stanbol.rules.base.api.RuleAtom;
import org.apache.stanbol.rules.base.api.SPARQLObject;
import org.apache.stanbol.rules.base.api.util.AtomList;
import org.apache.stanbol.rules.manager.SPARQLFunction;
@@ -11,7 +11,7 @@ import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.Resource;
-public class UnionAtom implements KReSRuleAtom {
+public class UnionAtom implements RuleAtom {
private AtomList atomList1;
private AtomList atomList2;
@@ -31,7 +31,7 @@ public class UnionAtom implements KReSRu
public SPARQLObject toSPARQL() {
String scope1 = "";
- for(KReSRuleAtom kReSRuleAtom : atomList1){
+ for(RuleAtom kReSRuleAtom : atomList1){
if(!scope1.isEmpty()){
scope1 += " . ";
}
@@ -40,7 +40,7 @@ public class UnionAtom implements KReSRu
String scope2 = "";
- for(KReSRuleAtom kReSRuleAtom : atomList2){
+ for(RuleAtom kReSRuleAtom : atomList2){
if(!scope2.isEmpty()){
scope2 += " . ";
}
@@ -62,7 +62,7 @@ public class UnionAtom implements KReSRu
public String toKReSSyntax() {
String scope1 = "";
- for(KReSRuleAtom kReSRuleAtom : atomList1){
+ for(RuleAtom kReSRuleAtom : atomList1){
if(!scope1.isEmpty()){
scope1 += " . ";
}
@@ -71,7 +71,7 @@ public class UnionAtom implements KReSRu
String scope2 = "";
- for(KReSRuleAtom kReSRuleAtom : atomList2){
+ for(RuleAtom kReSRuleAtom : atomList2){
if(!scope2.isEmpty()){
scope2 += " . ";
}
Copied: incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/VariableAtom.java (from r1085259, incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/KReSVariable.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/VariableAtom.java?p2=incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/VariableAtom.java&p1=incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/KReSVariable.java&r1=1085259&r2=1085395&rev=1085395&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/KReSVariable.java (original)
+++ incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/VariableAtom.java Fri Mar 25 14:26:06 2011
@@ -9,12 +9,12 @@ import com.hp.hpl.jena.rdf.model.Resourc
import org.apache.stanbol.rules.base.SWRL;
-public class KReSVariable implements URIResource {
+public class VariableAtom implements URIResource {
private URI uri;
private boolean negative;
- public KReSVariable(URI uri, boolean negative) {
+ public VariableAtom(URI uri, boolean negative) {
this.uri = uri;
this.negative = negative;
}
Copied: incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/AddRecipe.java (from r1085259, incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/KReSAddRecipe.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/AddRecipe.java?p2=incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/AddRecipe.java&p1=incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/KReSAddRecipe.java&r1=1085259&r2=1085395&rev=1085395&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/KReSAddRecipe.java (original)
+++ incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/AddRecipe.java Fri Mar 25 14:26:06 2011
@@ -35,7 +35,7 @@ import org.semanticweb.owlapi.model.OWLO
* If a recipe with a same name or IRI is already inside the KReSRuleStore an error is lunched and the process stopped.<br/>
*
*/
-public class KReSAddRecipe {
+public class AddRecipe {
private OWLOntology owlmodel;
private OWLOntologyManager owlmanager;
@@ -105,7 +105,7 @@ public class KReSAddRecipe {
* N.B. To get the new KReSRuleStore object there is the method getStore();<br/>
* @param store {The KReSRuleStore where to add the recipe.}
*/
- public KReSAddRecipe(RuleStore store){
+ public AddRecipe(RuleStore store){
this.storeaux = store;
//cloneOntology(storeaux.getOntology());
this.owlmanager = OWLManager.createOWLOntologyManager();
@@ -121,7 +121,7 @@ public class KReSAddRecipe {
* @param store {The KReSRuleStore where to add the recipe.}
* @param owlid {The base iri of resource}
*/
- public KReSAddRecipe(RuleStore store, String owlid){
+ public AddRecipe(RuleStore store, String owlid){
this.storeaux = store;
cloneOntology(storeaux.getOntology());
this.factory = owlmanager.getOWLDataFactory();
Copied: incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/AddRule.java (from r1085259, incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/KReSAddRule.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/AddRule.java?p2=incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/AddRule.java&p1=incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/KReSAddRule.java&r1=1085259&r2=1085395&rev=1085395&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/KReSAddRule.java (original)
+++ incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/AddRule.java Fri Mar 25 14:26:06 2011
@@ -32,7 +32,7 @@ import org.semanticweb.owlapi.model.OWLO
* If a rule with a same name or IRI is already inside the KReSRuleStore an error is lunched and the process stopped.
*
*/
-public class KReSAddRule {
+public class AddRule {
private OWLOntology owlmodel;
private OWLOntologyManager owlmanager;
@@ -101,7 +101,7 @@ public class KReSAddRule {
* N.B. To get the new KReSRuleStore object there is the method getStore().
* @param store {The KReSRuleStore where to add the rule.}
*/
- public KReSAddRule(RuleStore store){
+ public AddRule(RuleStore store){
this.storeaux = store;
cloneOntology(storeaux.getOntology());
this.factory = owlmanager.getOWLDataFactory();
@@ -115,7 +115,7 @@ public class KReSAddRule {
* @param owlid {The base iri of resource}
* @param store {The KReSRuleStore where to add the rule.}
*/
- public KReSAddRule(RuleStore store, String owlid){
+ public AddRule(RuleStore store, String owlid){
this.storeaux = store;
//cloneOntology(storeaux.getOntology());
this.owlmanager = OWLManager.createOWLOntologyManager();
Copied: incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/GetRecipe.java (from r1085259, incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/KReSGetRecipe.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/GetRecipe.java?p2=incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/GetRecipe.java&p1=incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/KReSGetRecipe.java&r1=1085259&r2=1085395&rev=1085395&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/KReSGetRecipe.java (original)
+++ incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/GetRecipe.java Fri Mar 25 14:26:06 2011
@@ -25,7 +25,7 @@ import org.semanticweb.owlapi.model.OWLO
*
* @author elvio
*/
-public class KReSGetRecipe {
+public class GetRecipe {
private OWLOntology owlmodel;
private String owlID;
@@ -38,7 +38,7 @@ public class KReSGetRecipe {
*
* @param store {The KReSRuleStore where there are the added rules and recipes.}
*/
- public KReSGetRecipe(RuleStore store){
+ public GetRecipe(RuleStore store){
this.owlmodel = store.getOntology();
this.owlIDrmi = "http://kres.iks-project.eu/ontology/meta/rmi.owl#";
this.owlID = owlmodel.getOntologyID().toString().replace("<","").replace(">","")+"#";
Copied: incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/GetRule.java (from r1085259, incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/KReSGetRule.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/GetRule.java?p2=incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/GetRule.java&p1=incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/KReSGetRule.java&r1=1085259&r2=1085395&rev=1085395&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/KReSGetRule.java (original)
+++ incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/GetRule.java Fri Mar 25 14:26:06 2011
@@ -35,7 +35,7 @@ import org.semanticweb.owlapi.util.OWLEn
*
* @author elvio
*/
-public class KReSGetRule {
+public class GetRule {
private OWLOntology owlmodel;
private String owlID;
@@ -48,7 +48,7 @@ public class KReSGetRule {
*
* @param store {The KReSRuleStore where there are the added rules and recipes.}
*/
- public KReSGetRule(RuleStore store){
+ public GetRule(RuleStore store){
this.owlmodel = store.getOntology();
this.owlIDrmi = "http://kres.iks-project.eu/ontology/meta/rmi.owl#";
this.owlID = owlmodel.getOntologyID().toString().replace("<","").replace(">","")+"#";
Copied: incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/LoadRuleFile.java (from r1085259, incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/KReSLoadRuleFile.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/LoadRuleFile.java?p2=incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/LoadRuleFile.java&p1=incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/KReSLoadRuleFile.java&r1=1085259&r2=1085395&rev=1085395&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/KReSLoadRuleFile.java (original)
+++ incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/LoadRuleFile.java Fri Mar 25 14:26:06 2011
@@ -62,7 +62,7 @@ import org.semanticweb.owlapi.model.OWLO
* N.B. The KReSRuleStore object used as input is not changed and to get the new modified KReSRuleStore there is the method getStore().
*
*/
-public class KReSLoadRuleFile {
+public class LoadRuleFile {
private OWLOntology owlmodel;
private OWLClass ontocls;
@@ -83,7 +83,7 @@ public class KReSLoadRuleFile {
* @param filepath {Path of the file contains thr rules and the recipes}
* @param store {The KReSRuleStore where the rules will be storage}
*/
- public KReSLoadRuleFile(String filepath, RuleStore store){
+ public LoadRuleFile(String filepath, RuleStore store){
this.storeaux = store;
this.owlIDrmi = "http://kres.iks-project.eu/ontology/meta/rmi.owl#";
Modified: incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/RecipeImpl.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/RecipeImpl.java?rev=1085395&r1=1085394&r2=1085395&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/RecipeImpl.java (original)
+++ incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/RecipeImpl.java Fri Mar 25 14:26:06 2011
@@ -7,9 +7,9 @@ import java.util.Map;
import java.util.Observable;
import java.util.Set;
-import org.apache.stanbol.rules.base.api.KReSRule;
+import org.apache.stanbol.rules.base.api.Rule;
import org.apache.stanbol.rules.base.api.Recipe;
-import org.apache.stanbol.rules.base.api.util.KReSRuleList;
+import org.apache.stanbol.rules.base.api.util.RuleList;
import org.semanticweb.owlapi.model.IRI;
import com.hp.hpl.jena.rdf.model.Model;
@@ -31,7 +31,7 @@ public class RecipeImpl extends Observab
private IRI recipeID;
private String recipeDescription;
- private KReSRuleList kReSRuleList;
+ private RuleList kReSRuleList;
@@ -45,14 +45,14 @@ public class RecipeImpl extends Observab
* @param recipeDescription
* @param kReSRuleList
*/
- public RecipeImpl(IRI recipeID, String recipeDescription, KReSRuleList kReSRuleList) {
+ public RecipeImpl(IRI recipeID, String recipeDescription, RuleList kReSRuleList) {
this.recipeID = recipeID;
this.recipeDescription = recipeDescription;
this.kReSRuleList = kReSRuleList;
}
- public KReSRuleList getkReSRuleList() {
+ public RuleList getkReSRuleList() {
return kReSRuleList;
}
@@ -69,7 +69,7 @@ public class RecipeImpl extends Observab
return null;
}
- public KReSRule getRule(String ruleURI) {
+ public Rule getRule(String ruleURI) {
//return new SWRLToKReSRule(ruleModel).parse(ruleURI);
return null;
}
@@ -103,7 +103,7 @@ public class RecipeImpl extends Observab
public String[] toSPARQL() {
String[] sparqlStrings = new String[kReSRuleList.size()];
int i=0;
- for(KReSRule kReSRule : kReSRuleList){
+ for(Rule kReSRule : kReSRuleList){
sparqlStrings[i] = kReSRule.toSPARQL();
i++;
}
@@ -116,7 +116,7 @@ public class RecipeImpl extends Observab
String kReSSyntax = "";
boolean firstLoop = true;
- for(KReSRule kReSRule : kReSRuleList){
+ for(Rule kReSRule : kReSRuleList){
if(!firstLoop){
kReSSyntax += " . ";
}
@@ -131,9 +131,9 @@ public class RecipeImpl extends Observab
@Override
- public void addKReSRule(KReSRule kReSRule) {
+ public void addKReSRule(Rule kReSRule) {
if(kReSRuleList == null){
- kReSRuleList = new KReSRuleList();
+ kReSRuleList = new RuleList();
}
kReSRuleList.add(kReSRule);
Copied: incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/RemoveRecipe.java (from r1085259, incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/KReSRemoveRecipe.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/RemoveRecipe.java?p2=incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/RemoveRecipe.java&p1=incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/KReSRemoveRecipe.java&r1=1085259&r2=1085395&rev=1085395&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/KReSRemoveRecipe.java (original)
+++ incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/RemoveRecipe.java Fri Mar 25 14:26:06 2011
@@ -34,7 +34,7 @@ import org.semanticweb.owlapi.util.OWLEn
* If the recipe name or IRI is not already inside the KReSRuleStore an error is lunched and the process stopped.
*
*/
-public class KReSRemoveRecipe {
+public class RemoveRecipe {
private OWLOntology owlmodel;
@@ -105,7 +105,7 @@ public class KReSRemoveRecipe {
* N.B. To get the new KReSRuleStore object there is the method getStore().
* @param store {The KReSRuleStore where there are the added rules and recipes.}
*/
- public KReSRemoveRecipe(RuleStore store){
+ public RemoveRecipe(RuleStore store){
this.storeaux = store;
cloneOntology(store.getOntology());
this.factory = owlmanager.getOWLDataFactory();
@@ -119,7 +119,7 @@ public class KReSRemoveRecipe {
* @param store {The KReSRuleStore where there are the added rules and recipes.}
* @param owlid {The base iri of resource}
*/
- public KReSRemoveRecipe(RuleStore store, String owlid){
+ public RemoveRecipe(RuleStore store, String owlid){
this.storeaux = store;
cloneOntology(storeaux.getOntology());
this.factory = owlmanager.getOWLDataFactory();
@@ -141,7 +141,7 @@ public class KReSRemoveRecipe {
OWLObjectProperty precedes = factory.getOWLObjectProperty(IRI.create("http://www.ontologydesignpatterns.org/cp/owl/sequence.owl#directlyPrecedes"));
OWLObjectPropertyAssertionAxiom objectPropAssertion;
- KReSGetRecipe getrecipe = new KReSGetRecipe(storeaux);
+ GetRecipe getrecipe = new GetRecipe(storeaux);
HashMap<IRI, String> map = getrecipe.getRecipe(recipeName);
String[] sequence = map.get(IRI.create(owlID+recipeName)).split(",");
@@ -218,7 +218,7 @@ public class KReSRemoveRecipe {
OWLObjectProperty precedes = factory.getOWLObjectProperty(IRI.create("http://www.ontologydesignpatterns.org/cp/owl/sequence.owl#directlyPrecedes"));
OWLObjectPropertyAssertionAxiom objectPropAssertion;
- KReSGetRecipe getrecipe = new KReSGetRecipe(storeaux);
+ GetRecipe getrecipe = new GetRecipe(storeaux);
HashMap<IRI, String> map = getrecipe.getRecipe(recipeName);
String[] sequence = map.get(recipeName).split(",");
Copied: incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/RemoveRule.java (from r1085259, incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/KReSRemoveRule.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/RemoveRule.java?p2=incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/RemoveRule.java&p1=incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/KReSRemoveRule.java&r1=1085259&r2=1085395&rev=1085395&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/KReSRemoveRule.java (original)
+++ incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/RemoveRule.java Fri Mar 25 14:26:06 2011
@@ -37,7 +37,7 @@ import org.semanticweb.owlapi.util.OWLEn
* If the rule name or IRI is not already inside the KReSRuleStore an error is lunched and the process stopped.
*
*/
-public class KReSRemoveRule {
+public class RemoveRule {
private OWLOntology owlmodel;
private OWLOntologyManager owlmanager;
private OWLDataFactory factory;
@@ -105,7 +105,7 @@ public class KReSRemoveRule {
* N.B. To get the new KReSRuleStore object there is the method getStore();
* @param store {The KReSRuleStore where there are the added rules and recipes.}
*/
- public KReSRemoveRule(RuleStore store){
+ public RemoveRule(RuleStore store){
this.storeaux = store;
cloneOntology(storeaux.getOntology());
this.factory = owlmanager.getOWLDataFactory();
@@ -118,7 +118,7 @@ public class KReSRemoveRule {
* N.B. To get the new KReSRuleStore object there is the method getStore();
* @param store {The KReSRuleStore where there are the added rules and recipes.}
*/
- public KReSRemoveRule(RuleStore store,String owlid){
+ public RemoveRule(RuleStore store,String owlid){
this.storeaux = store;
cloneOntology(storeaux.getOntology());
this.factory = owlmanager.getOWLDataFactory();
@@ -277,7 +277,7 @@ public class KReSRemoveRule {
}
//Get the recipe
- KReSGetRecipe getrecipe = new KReSGetRecipe(storeaux);
+ GetRecipe getrecipe = new GetRecipe(storeaux);
HashMap<IRI, String> map = getrecipe.getRecipe(recipeName);
String[] sequence = map.get(recipeName).split(",");
@@ -299,12 +299,12 @@ public class KReSRemoveRule {
}
//Remove the old recipe
- KReSRemoveRecipe remove;
+ RemoveRecipe remove;
try {
- remove = new KReSRemoveRecipe(storeaux);
+ remove = new RemoveRecipe(storeaux);
ok = remove.removeRecipe(recipeName);
} catch (Exception ex) {
- Logger.getLogger(KReSRemoveRule.class.getName()).log(Level.SEVERE, null, ex);
+ Logger.getLogger(RemoveRule.class.getName()).log(Level.SEVERE, null, ex);
}
if(!ok){
@@ -313,7 +313,7 @@ public class KReSRemoveRule {
}
//Add the recipe with without the specified rule
- KReSAddRecipe newadd = new KReSAddRecipe(storeaux);
+ AddRecipe newadd = new AddRecipe(storeaux);
if(ruleseq.isEmpty())
ok = newadd.addSimpleRecipe(recipeName, desc);
else