Merged with auth-branch

Author: jj

pom.xml

@@ -30,6 +30,7 @@
 		  <groupId>javax.servlet</groupId>
 		  <artifactId>servlet-api</artifactId>
 		  <version>2.5</version>
+            <scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>commons-fileupload</groupId>
@@ -52,7 +53,19 @@
 			<type>pom</type>
 			<version>2.10.1</version>
 		</dependency>
-	</dependencies>
+        <dependency>
+            <groupId>javax.mail</groupId>
+            <artifactId>mail</artifactId>
+            <version>1.4.7</version>
+        </dependency>
+
+        <!-- for digest authentication -->
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>1.9</version>
+        </dependency>
+    </dependencies>
 
 	<build>
 		<finalName>generator</finalName>

src/main/java/ImportRDF.java

@@ -10,6 +10,8 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import accounts.FrameworkUserManager;
+import authentication.FrameworkConfiguration;
 import org.codehaus.jackson.map.ObjectMapper;
 
 import com.hp.hpl.jena.query.Query;
@@ -22,6 +24,8 @@
 import com.hp.hpl.jena.rdf.model.Resource;
 import com.hp.hpl.jena.rdf.model.Statement;
 import com.hp.hpl.jena.rdf.model.StmtIterator;
+import rdf.RdfStoreManager;
+import util.HttpUtils;
 
 
 public class ImportRDF extends HttpServlet {
@@ -40,13 +44,15 @@ public class ImportRDF extends HttpServlet {
 	private static String jdbcConnection;
 	private static String jdbcUser;
 	private static String jdbcPassword;
+    private String username;
+    private String token;
 
 	public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException {
 	      doPost(request, response);
 	}
 
 	public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException {
-		
+
 		response.setContentType("application/json");
 
 		PrintWriter out = response.getWriter();
@@ -69,7 +75,9 @@ public void doPost(HttpServletRequest request, HttpServletResponse response) thr
 	    rdfFiles = request.getParameter("rdfFiles");
 	    rdfQuery    = request.getParameter("rdfQuery");
 	    rdfQueryEndpoint = request.getParameter("rdfQueryEndpoint");
-	    
+        username = request.getParameter("username");
+        token = HttpUtils.getCookieValue(request, "token");
+
 //	    boolean useJDBC= false;
 //	    System.out.println("rdfUrl   " +rdfUrl);
 //	    System.out.println("rdfFiles " +rdfFiles);
@@ -127,7 +135,7 @@ public void doPost(HttpServletRequest request, HttpServletResponse response) thr
 //		ujdbc.loadLocalFile(file, graph);
 //	}
 
-	private static int queryImport(String destEndpoint, String graph, String sourceEndpoint, String sparql) throws Exception{
+	private int queryImport(String destEndpoint, String graph, String sourceEndpoint, String sparql) throws Exception{
 		 Query query = QueryFactory.create(sparql);
 	     QueryExecution qexec = QueryExecutionFactory.sparqlService(sourceEndpoint, query);
 	     Model model = qexec.execConstruct();
@@ -136,7 +144,13 @@ private static int queryImport(String destEndpoint, String graph, String sourceE
 	     return inserted;
 	}
 
-	private static int httpUpdate(String endpoint, String graph, Model model) throws Exception{
+	private int httpUpdate(String endpoint, String graph, Model model) throws Exception{
+        RdfStoreManager rdfStoreManager = null;
+        if (username!=null && !username.isEmpty() && token!=null && !token.isEmpty()) {
+            FrameworkUserManager frameworkUserManager = FrameworkConfiguration.getInstance().getFrameworkUserManager();
+            if (frameworkUserManager.checkToken(username, token))
+                rdfStoreManager = frameworkUserManager.getRdfStoreManager(username);
+        }
 
 		// generate queries of 100 lines each
 		StmtIterator stmts = model.listStatements();
@@ -189,15 +203,22 @@ private static int httpUpdate(String endpoint, String graph, Model model) throws
 
 				ByteArrayOutputStream os = new ByteArrayOutputStream();
 				tmpModel.write(os, "N-TRIPLES");
-				String queryString = "INSERT {  " + os.toString() + "}";
-				os.close();
-				
-				HttpSPARQLUpdate p = new HttpSPARQLUpdate();
-		        p.setEndpoint(endpoint);
-		        p.setGraph(graph);
-		        p.setUpdateString(queryString);
-		        
-		        if (! p.execute())  throw new Exception("UPDATE/SPARQL failed: " + queryString);
+
+                if (rdfStoreManager!=null) {
+                    String queryString = "INSERT DATA { GRAPH <" + graph + "> { " + os.toString() + " } }";
+                    os.close();
+                    rdfStoreManager.execute(queryString, null);
+                } else {
+                    String queryString = "INSERT {  " + os.toString() + "}";
+                    os.close();
+
+                    HttpSPARQLUpdate p = new HttpSPARQLUpdate();
+                    p.setEndpoint(endpoint);
+                    p.setGraph(graph);
+                    p.setUpdateString(queryString);
+
+                    if (! p.execute())  throw new Exception("UPDATE/SPARQL failed: " + queryString);
+                }
 
 				total += linesCount;
 				linesCount = 0;			
@@ -210,15 +231,22 @@ private static int httpUpdate(String endpoint, String graph, Model model) throws
 
 			ByteArrayOutputStream os = new ByteArrayOutputStream();
 			tmpModel.write(os, "N-TRIPLES");
-			String queryString = "INSERT {  " + os.toString() + "}";
-			os.close();			
 
-			HttpSPARQLUpdate p = new HttpSPARQLUpdate();
-	        p.setEndpoint(endpoint);
-	        p.setGraph(graph);
-	        p.setUpdateString(queryString);
-	        
-	        if (!p.execute())  throw new Exception("UPDATE/SPARQL failed: " + queryString);
+            if (rdfStoreManager!=null) {
+                String queryString = "INSERT DATA { GRAPH <" + graph + "> { " + os.toString() + "} }";
+                os.close();
+                rdfStoreManager.execute(queryString, null);
+            } else {
+                String queryString = "INSERT {  " + os.toString() + "}";
+                os.close();
+
+                HttpSPARQLUpdate p = new HttpSPARQLUpdate();
+                p.setEndpoint(endpoint);
+                p.setGraph(graph);
+                p.setUpdateString(queryString);
+
+                if (!p.execute())  throw new Exception("UPDATE/SPARQL failed: " + queryString);
+            }
 
 	        total += linesCount;