You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by an...@apache.org on 2013/04/05 20:50:31 UTC
svn commit: r1465093 - in /stanbol/trunk/rules/adapters:
clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/
jena/src/main/java/org/apache/stanbol/rules/adapters/jena/
sparql/src/main/java/org/apache/stanbol/rules/adapters/sparql/ swrl/s...
Author: anuzzolese
Date: Fri Apr 5 18:50:31 2013
New Revision: 1465093
URL: http://svn.apache.org/r1465093
Log:
[STANBOL-560] Fixed class loading in the rules adapters.
Modified:
stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/ClerezzaAdapter.java
stanbol/trunk/rules/adapters/jena/src/main/java/org/apache/stanbol/rules/adapters/jena/JenaAdapter.java
stanbol/trunk/rules/adapters/sparql/src/main/java/org/apache/stanbol/rules/adapters/sparql/SPARQLAdapter.java
stanbol/trunk/rules/adapters/swrl/src/main/java/org/apache/stanbol/rules/adapters/swrl/SWRLAdapter.java
Modified: stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/ClerezzaAdapter.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/ClerezzaAdapter.java?rev=1465093&r1=1465092&r2=1465093&view=diff
==============================================================================
--- stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/ClerezzaAdapter.java (original)
+++ stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/ClerezzaAdapter.java Fri Apr 5 18:50:31 2013
@@ -167,6 +167,7 @@ public class ClerezzaAdapter extends Abs
RuleAtom ruleAtom = it.next();
ClerezzaSparqlObject clerezzaSparqlObject = null;
+ log.debug("Type to adapt {}", type);
clerezzaSparqlObject = (ClerezzaSparqlObject) adaptRuleAtomTo(ruleAtom, type);
Object clerezzaObj = clerezzaSparqlObject.getClerezzaObject();
@@ -210,6 +211,7 @@ public class ClerezzaAdapter extends Abs
if (type == ConstructQuery.class) {
+
//ClassLoader loader = Thread.currentThread().getContextClassLoader();
//log.info("loader : " + loader);
@@ -222,18 +224,7 @@ public class ClerezzaAdapter extends Abs
String canonicalName = ARTIFACT + "." + className;
try {
- Class<AdaptableAtom> clerezzaAtomClass = null;
- if(componentContext != null){
- // in OSGi environment
- clerezzaAtomClass = componentContext.getBundleContext().getBundle().loadClass(canonicalName);
- }
- else{
- // in non-OSGi environment
- clerezzaAtomClass = (Class<AdaptableAtom>) Thread.currentThread().getContextClassLoader().loadClass(canonicalName);
- }
- /* Class<AdaptableAtom> clerezzaAtomClass = (Class<AdaptableAtom>) loader
- .loadClass(canonicalName);
- */
+ Class<AdaptableAtom> clerezzaAtomClass = (Class<AdaptableAtom>) Class.forName(canonicalName);
try {
AdaptableAtom clerezzaAtom = clerezzaAtomClass.newInstance();
@@ -243,19 +234,15 @@ public class ClerezzaAdapter extends Abs
return (T) clerezzaAtom.adapt(ruleAtom);
} catch (InstantiationException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ log.error(e.getMessage(), e);
} catch (IllegalAccessException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ log.error(e.getMessage(), e);
}
} catch (ClassNotFoundException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ log.error(e.getMessage(), e);
} catch (SecurityException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ log.error(e.getMessage(), e);
}
}
Modified: stanbol/trunk/rules/adapters/jena/src/main/java/org/apache/stanbol/rules/adapters/jena/JenaAdapter.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/rules/adapters/jena/src/main/java/org/apache/stanbol/rules/adapters/jena/JenaAdapter.java?rev=1465093&r1=1465092&r2=1465093&view=diff
==============================================================================
--- stanbol/trunk/rules/adapters/jena/src/main/java/org/apache/stanbol/rules/adapters/jena/JenaAdapter.java (original)
+++ stanbol/trunk/rules/adapters/jena/src/main/java/org/apache/stanbol/rules/adapters/jena/JenaAdapter.java Fri Apr 5 18:50:31 2013
@@ -211,15 +211,7 @@ public class JenaAdapter extends Abstrac
try {
- Class<AdaptableAtom> jenaAtomClass = null;
- if(componentContext != null){
- // in OSGi environment
- jenaAtomClass = componentContext.getBundleContext().getBundle().loadClass(canonicalName);
- }
- else{
- // in non-OSGi environment
- jenaAtomClass = (Class<AdaptableAtom>) Thread.currentThread().getContextClassLoader().loadClass(canonicalName);
- }
+ Class<AdaptableAtom> jenaAtomClass = (Class<AdaptableAtom>) Class.forName(canonicalName);
try
@@ -237,19 +229,15 @@ public class JenaAdapter extends Abstrac
return (T) jenaAtom.adapt(ruleAtom);
} catch (InstantiationException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ log.error(e.getMessage(), e);
} catch (IllegalAccessException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ log.error(e.getMessage(), e);
}
} catch (ClassNotFoundException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ log.error(e.getMessage(), e);
} catch (SecurityException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ log.error(e.getMessage(), e);
}
} else {
Modified: stanbol/trunk/rules/adapters/sparql/src/main/java/org/apache/stanbol/rules/adapters/sparql/SPARQLAdapter.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/rules/adapters/sparql/src/main/java/org/apache/stanbol/rules/adapters/sparql/SPARQLAdapter.java?rev=1465093&r1=1465092&r2=1465093&view=diff
==============================================================================
--- stanbol/trunk/rules/adapters/sparql/src/main/java/org/apache/stanbol/rules/adapters/sparql/SPARQLAdapter.java (original)
+++ stanbol/trunk/rules/adapters/sparql/src/main/java/org/apache/stanbol/rules/adapters/sparql/SPARQLAdapter.java Fri Apr 5 18:50:31 2013
@@ -207,15 +207,7 @@ public class SPARQLAdapter extends Abstr
try {
- Class<AdaptableAtom> sparqlAtomClass = null;
- if(componentContext != null){
- // in OSGi environment
- sparqlAtomClass = componentContext.getBundleContext().getBundle().loadClass(canonicalName);
- }
- else{
- // in non-OSGi environment
- sparqlAtomClass = (Class<AdaptableAtom>) Thread.currentThread().getContextClassLoader().loadClass(canonicalName);
- }
+ Class<AdaptableAtom> sparqlAtomClass = (Class<AdaptableAtom>) Class.forName(canonicalName);
try {
AdaptableAtom sparqlAtom = sparqlAtomClass.newInstance();
@@ -224,22 +216,17 @@ public class SPARQLAdapter extends Abstr
return (T) sparqlAtom.adapt(ruleAtom);
} catch (InstantiationException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ log.error(e.getMessage(), e);
} catch (IllegalAccessException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ log.error(e.getMessage(), e);
} catch (RuleAtomCallExeption e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ log.error(e.getMessage(), e);
}
} catch (ClassNotFoundException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ log.error(e.getMessage(), e);
} catch (SecurityException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ log.error(e.getMessage(), e);
}
}
Modified: stanbol/trunk/rules/adapters/swrl/src/main/java/org/apache/stanbol/rules/adapters/swrl/SWRLAdapter.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/rules/adapters/swrl/src/main/java/org/apache/stanbol/rules/adapters/swrl/SWRLAdapter.java?rev=1465093&r1=1465092&r2=1465093&view=diff
==============================================================================
--- stanbol/trunk/rules/adapters/swrl/src/main/java/org/apache/stanbol/rules/adapters/swrl/SWRLAdapter.java (original)
+++ stanbol/trunk/rules/adapters/swrl/src/main/java/org/apache/stanbol/rules/adapters/swrl/SWRLAdapter.java Fri Apr 5 18:50:31 2013
@@ -150,15 +150,7 @@ public class SWRLAdapter extends Abstrac
try {
- Class<AdaptableAtom> swrlAtomClass = null;
- if(componentContext != null){
- // in OSGi environment
- swrlAtomClass = componentContext.getBundleContext().getBundle().loadClass(canonicalName);
- }
- else{
- // in non-OSGi environment
- swrlAtomClass = (Class<AdaptableAtom>) Thread.currentThread().getContextClassLoader().loadClass(canonicalName);
- }
+ Class<AdaptableAtom> swrlAtomClass = (Class<AdaptableAtom>) Class.forName(canonicalName);
try {
AdaptableAtom swrlAtom = swrlAtomClass.newInstance();
@@ -168,19 +160,15 @@ public class SWRLAdapter extends Abstrac
return (T) swrlAtom.adapt(ruleAtom);
} catch (InstantiationException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ log.error(e.getMessage(), e);
} catch (IllegalAccessException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ log.error(e.getMessage(), e);
}
} catch (ClassNotFoundException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ log.error(e.getMessage(), e);
} catch (SecurityException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ log.error(e.getMessage(), e);
}
} else {