You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by al...@apache.org on 2012/02/07 19:38:26 UTC

svn commit: r1241547 [4/4] - in /incubator/stanbol/trunk: commons/owl/ commons/owl/src/main/java/org/apache/stanbol/commons/ commons/owl/src/main/java/org/apache/stanbol/commons/owl/ commons/owl/src/main/java/org/apache/stanbol/commons/owl/transformati...

Modified: incubator/stanbol/trunk/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/connection/DatabaseConnection.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/connection/DatabaseConnection.java?rev=1241547&r1=1241546&r2=1241547&view=diff
==============================================================================
--- incubator/stanbol/trunk/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/connection/DatabaseConnection.java (original)
+++ incubator/stanbol/trunk/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/connection/DatabaseConnection.java Tue Feb  7 18:38:23 2012
@@ -5,7 +5,7 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import org.apache.stanbol.owl.transformation.JenaToOwlConvert;
+import org.apache.stanbol.commons.owl.transformation.JenaToOwlConvert;
 import org.apache.stanbol.reengineer.db.vocab.DBS_L1;
 import org.semanticweb.owlapi.model.OWLOntology;
 
@@ -19,127 +19,115 @@ import com.hp.hpl.jena.vocabulary.RDF;
 
 public class DatabaseConnection {
 
-	
-	private OWLOntology schemaOntology;
-	private Connection connection;
-	
-	private java.sql.Statement stmt;
-	private PreparedStatement preparedStatement;
-	
-	public DatabaseConnection(OWLOntology schemaOntology) {
-		
-		this.schemaOntology = schemaOntology;
-	}
-	
-	
-	
-	public void openDBConnection(){
-		
-		
-		
-		String sparql = "SELECT ?dbName ?jdbcDNS ?jdbcDriver ?username ?password " +
-						"WHERE ?db <"+RDF.type.getURI()+"> <"+DBS_L1.DatabaseConnection.toString()+"> . " +
-						"?db <"+DBS_L1.hasPhysicalName.toString()+"> ?dbName . " +
-						"?db <"+DBS_L1.hasJDBCDns.toString()+"> ?jdbcDNS . " +
-						"?db <"+DBS_L1.hasJDBCDriver.toString()+"> ?jdbcDriver . " +
-						"?db <"+DBS_L1.hasUsername.toString()+"> ?username . " +
-						"?db <"+DBS_L1.hasPassword.toString()+"> ?password ";
-
-		
-		JenaToOwlConvert jenaToOwlConvert = new JenaToOwlConvert();
-		OntModel ontModel = jenaToOwlConvert.ModelOwlToJenaConvert(schemaOntology, "RDF/XML");
-		
-		Query sparqlQuery = QueryFactory.create(sparql);
-		QueryExecution qexec = QueryExecutionFactory.create(sparqlQuery, ontModel) ;
-		com.hp.hpl.jena.query.ResultSet jenaRs = qexec.execSelect();
-		if(jenaRs.hasNext()){
-			QuerySolution qs = jenaRs.next();
-			String jdbcDNS = qs.getLiteral("jdbcDNS").getLexicalForm();
-			String jdbcDriver = qs.getLiteral("jdbcDriver").getLexicalForm();
-			String username = qs.getLiteral("username").getLexicalForm();
-			String password = qs.getLiteral("password").getLexicalForm();
-			
-			if(jdbcDNS != null && username != null && password != null && jdbcDriver != null){
-				try {
-					Class.forName(jdbcDriver);
-					connection = java.sql.DriverManager.getConnection(jdbcDNS, username, password);
-				} catch (ClassNotFoundException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				} catch (SQLException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
-				
-			}
-		}
-		
-		
-		
-	}
-	
-	
-	public ResultSet executeQuery(String query){
-		try {
-			
-			openDBConnection();
-			
-			System.out.println(query);
-			preparedStatement = connection.prepareStatement(query);
-			
-			return preparedStatement.executeQuery();
-		} catch (SQLException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-			return null;
-		}
-	}
-	
-	
-	public synchronized ResultSet executeQuerySafeMemory(String query){
-		try {
-			
-			openDBConnection();
-			
-			stmt = connection.createStatement(java.sql.ResultSet.TYPE_FORWARD_ONLY,
-		              java.sql.ResultSet.CONCUR_READ_ONLY);
-			System.out.println("Integer.MIN_VALUE: "+Integer.MIN_VALUE);
-			stmt.setFetchSize(Integer.MIN_VALUE);
-			
-			
-			
-			return stmt.executeQuery(query);
-		} catch (SQLException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-			return null;
-		}
-	}
-	
-	public void closeDBConnection(){
-		try {
-			connection.close();
-		} catch (SQLException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-	}
-	
-	public void closeStatement(){
-		try {
-			stmt.close();
-		} catch (SQLException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-	}
-	
-	public void closePreparedStatement(){
-		try {
-			preparedStatement.close();
-		} catch (SQLException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-	}
+    private OWLOntology schemaOntology;
+    private Connection connection;
+
+    private java.sql.Statement stmt;
+    private PreparedStatement preparedStatement;
+
+    public DatabaseConnection(OWLOntology schemaOntology) {
+
+        this.schemaOntology = schemaOntology;
+    }
+
+    public void openDBConnection() {
+
+        String sparql = "SELECT ?dbName ?jdbcDNS ?jdbcDriver ?username ?password " + "WHERE ?db <"
+                        + RDF.type.getURI() + "> <" + DBS_L1.DatabaseConnection.toString() + "> . " + "?db <"
+                        + DBS_L1.hasPhysicalName.toString() + "> ?dbName . " + "?db <"
+                        + DBS_L1.hasJDBCDns.toString() + "> ?jdbcDNS . " + "?db <"
+                        + DBS_L1.hasJDBCDriver.toString() + "> ?jdbcDriver . " + "?db <"
+                        + DBS_L1.hasUsername.toString() + "> ?username . " + "?db <"
+                        + DBS_L1.hasPassword.toString() + "> ?password ";
+
+        JenaToOwlConvert jenaToOwlConvert = new JenaToOwlConvert();
+        OntModel ontModel = jenaToOwlConvert.ModelOwlToJenaConvert(schemaOntology, "RDF/XML");
+
+        Query sparqlQuery = QueryFactory.create(sparql);
+        QueryExecution qexec = QueryExecutionFactory.create(sparqlQuery, ontModel);
+        com.hp.hpl.jena.query.ResultSet jenaRs = qexec.execSelect();
+        if (jenaRs.hasNext()) {
+            QuerySolution qs = jenaRs.next();
+            String jdbcDNS = qs.getLiteral("jdbcDNS").getLexicalForm();
+            String jdbcDriver = qs.getLiteral("jdbcDriver").getLexicalForm();
+            String username = qs.getLiteral("username").getLexicalForm();
+            String password = qs.getLiteral("password").getLexicalForm();
+
+            if (jdbcDNS != null && username != null && password != null && jdbcDriver != null) {
+                try {
+                    Class.forName(jdbcDriver);
+                    connection = java.sql.DriverManager.getConnection(jdbcDNS, username, password);
+                } catch (ClassNotFoundException e) {
+                    // TODO Auto-generated catch block
+                    e.printStackTrace();
+                } catch (SQLException e) {
+                    // TODO Auto-generated catch block
+                    e.printStackTrace();
+                }
+
+            }
+        }
+
+    }
+
+    public ResultSet executeQuery(String query) {
+        try {
+
+            openDBConnection();
+
+            System.out.println(query);
+            preparedStatement = connection.prepareStatement(query);
+
+            return preparedStatement.executeQuery();
+        } catch (SQLException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    public synchronized ResultSet executeQuerySafeMemory(String query) {
+        try {
+
+            openDBConnection();
+
+            stmt = connection.createStatement(java.sql.ResultSet.TYPE_FORWARD_ONLY,
+                java.sql.ResultSet.CONCUR_READ_ONLY);
+            System.out.println("Integer.MIN_VALUE: " + Integer.MIN_VALUE);
+            stmt.setFetchSize(Integer.MIN_VALUE);
+
+            return stmt.executeQuery(query);
+        } catch (SQLException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    public void closeDBConnection() {
+        try {
+            connection.close();
+        } catch (SQLException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+    }
+
+    public void closeStatement() {
+        try {
+            stmt.close();
+        } catch (SQLException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+    }
+
+    public void closePreparedStatement() {
+        try {
+            preparedStatement.close();
+        } catch (SQLException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+    }
 }

Modified: incubator/stanbol/trunk/reengineer/web/src/main/java/org/apache/stanbol/reengineer/web/resources/ReengineerResource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/reengineer/web/src/main/java/org/apache/stanbol/reengineer/web/resources/ReengineerResource.java?rev=1241547&r1=1241546&r2=1241547&view=diff
==============================================================================
--- incubator/stanbol/trunk/reengineer/web/src/main/java/org/apache/stanbol/reengineer/web/resources/ReengineerResource.java (original)
+++ incubator/stanbol/trunk/reengineer/web/src/main/java/org/apache/stanbol/reengineer/web/resources/ReengineerResource.java Tue Feb  7 18:38:23 2012
@@ -45,10 +45,10 @@ import org.apache.clerezza.rdf.core.acce
 import org.apache.clerezza.rdf.core.access.TcManager;
 import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
 import org.apache.clerezza.rdf.core.impl.TripleImpl;
+import org.apache.stanbol.commons.owl.transformation.OWLAPIToClerezzaConverter;
+import org.apache.stanbol.commons.owl.util.OWLUtils;
 import org.apache.stanbol.commons.web.base.ContextHelper;
 import org.apache.stanbol.commons.web.base.resource.BaseStanbolResource;
-import org.apache.stanbol.owl.transformation.OWLAPIToClerezzaConverter;
-import org.apache.stanbol.owl.util.OWLUtils;
 import org.apache.stanbol.reengineer.base.api.DataSource;
 import org.apache.stanbol.reengineer.base.api.Reengineer;
 import org.apache.stanbol.reengineer.base.api.ReengineerManager;

Modified: incubator/stanbol/trunk/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/XMLExtractor.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/XMLExtractor.java?rev=1241547&r1=1241546&r2=1241547&view=diff
==============================================================================
--- incubator/stanbol/trunk/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/XMLExtractor.java (original)
+++ incubator/stanbol/trunk/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/XMLExtractor.java Tue Feb  7 18:38:23 2012
@@ -37,6 +37,7 @@ import org.apache.felix.scr.annotations.
 import org.apache.felix.scr.annotations.Property;
 import org.apache.felix.scr.annotations.Reference;
 import org.apache.felix.scr.annotations.Service;
+import org.apache.stanbol.commons.owl.OWLOntologyManagerFactory;
 import org.apache.stanbol.ontologymanager.ontonet.api.DuplicateIDException;
 import org.apache.stanbol.ontologymanager.ontonet.api.ONManager;
 import org.apache.stanbol.ontologymanager.ontonet.api.io.OntologyInputSource;
@@ -45,7 +46,6 @@ import org.apache.stanbol.ontologymanage
 import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyScopeFactory;
 import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologySpaceFactory;
 import org.apache.stanbol.ontologymanager.ontonet.api.ontology.ScopeRegistry;
-import org.apache.stanbol.owl.OWLOntologyManagerFactory;
 import org.apache.stanbol.reengineer.base.api.DataSource;
 import org.apache.stanbol.reengineer.base.api.Reengineer;
 import org.apache.stanbol.reengineer.base.api.ReengineerManager;

Modified: incubator/stanbol/trunk/rules/refactor/src/main/java/org/apache/stanbol/rules/refactor/impl/RefactorerImpl.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/rules/refactor/src/main/java/org/apache/stanbol/rules/refactor/impl/RefactorerImpl.java?rev=1241547&r1=1241546&r2=1241547&view=diff
==============================================================================
--- incubator/stanbol/trunk/rules/refactor/src/main/java/org/apache/stanbol/rules/refactor/impl/RefactorerImpl.java (original)
+++ incubator/stanbol/trunk/rules/refactor/src/main/java/org/apache/stanbol/rules/refactor/impl/RefactorerImpl.java Tue Feb  7 18:38:23 2012
@@ -38,12 +38,12 @@ import org.apache.felix.scr.annotations.
 import org.apache.felix.scr.annotations.Deactivate;
 import org.apache.felix.scr.annotations.Reference;
 import org.apache.felix.scr.annotations.Service;
+import org.apache.stanbol.commons.owl.transformation.JenaToClerezzaConverter;
+import org.apache.stanbol.commons.owl.transformation.JenaToOwlConvert;
+import org.apache.stanbol.commons.owl.transformation.OWLAPIToClerezzaConverter;
+import org.apache.stanbol.commons.owl.util.OWLUtils;
 import org.apache.stanbol.ontologymanager.ontonet.api.ONManager;
 import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyScope;
-import org.apache.stanbol.owl.transformation.JenaToClerezzaConverter;
-import org.apache.stanbol.owl.transformation.JenaToOwlConvert;
-import org.apache.stanbol.owl.transformation.OWLAPIToClerezzaConverter;
-import org.apache.stanbol.owl.util.OWLUtils;
 import org.apache.stanbol.rules.base.api.NoSuchRecipeException;
 import org.apache.stanbol.rules.base.api.Recipe;
 import org.apache.stanbol.rules.base.api.Rule;