last modifications

Author: alegrm

src/main/java/authentication/FrameworkConfiguration.java

@@ -67,10 +67,11 @@ public class FrameworkConfiguration {
      * 
      * @param context
      * @return
+     * @throws IOException
      * @throws Exception
      */
     public static synchronized FrameworkConfiguration getInstance(
-	    ServletContext context) throws Exception {
+	    ServletContext context) throws IOException {
 
 	if (instance == null) {
 
@@ -122,9 +123,10 @@ public static synchronized FrameworkConfiguration getInstance(
 		instance.setFrameworkUri(soln.get("uri").toString());
 		instance.setPublicSparqlEndpoint(soln.get("endpoint")
 			.toString());
-		instance.setResourceNamespace(instance.getFrameworkUri()
+		instance.setResourceNamespace(instance
+			.getFrameworkUri()
 			.substring(0,
-				instance.getFrameworkUri().lastIndexOf("/")));
+				instance.getFrameworkUri().lastIndexOf("/") + 1));
 	    }
 	    qexec.close();
 

src/main/java/authentication/web/HttpRequestManager.java

@@ -14,6 +14,8 @@
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.log4j.Logger;
 
+import util.UnsupportedAuthenticationSchema;
+
 public class HttpRequestManager {
 
     private static final Logger log = Logger
@@ -36,7 +38,7 @@ public static String executePost(String url, String urlParameters)
     }
 
     public static String executePost(String url, String urlParameters,
-	    String username, String password) throws Exception {
+	    String username, String password) throws IOException {
 	// TODO: May be try to do Authorized post by default first ??? to avoid
 	// doing two queries? are all the queries made by the generator will use
 	// the
@@ -71,8 +73,10 @@ public static String executePost(String url, String urlParameters,
 		    throw new HTTPException(responseCode);
 		}
 	    } else
-		throw new Exception("Unsupported authentication type: "
-			+ wwwAuthenticateHeader.getAuthenticationScheme());
+		throw new UnsupportedAuthenticationSchema(
+			"Unsupported authentication type: "
+				+ wwwAuthenticateHeader
+					.getAuthenticationScheme());
 	case 400: // bad request
 	    log.error(connection.getResponseCode() + "\n\t "
 		    + connection.getResponseMessage() + "\n\t url:" + url
@@ -115,7 +119,8 @@ private static HttpURLConnection sendPost(String url, String urlParameters)
 
     private static HttpURLConnection sendAuthorizedPost(String url,
 	    String urlParameters, WWWAuthenticateHeader wwwAuthenticateHeader,
-	    String username, String password) throws Exception {
+	    String username, String password) throws IOException,
+	    UnsupportedAuthenticationSchema {
 	log.debug("Execute authorized POST to " + url);
 	URL targetURL = new URL(url);
 	HttpURLConnection connection = (HttpURLConnection) targetURL
@@ -173,11 +178,13 @@ private static WWWAuthenticateHeader getWWWAuthenticationHeader(
 
     private static String getDigestAuthorizationProperty(String endpoint,
 	    WWWAuthenticateHeader wwwAuthenticateHeader, String username,
-	    String password, String requestMethod) throws Exception {
+	    String password, String requestMethod)
+	    throws UnsupportedAuthenticationSchema {
 	if (!wwwAuthenticateHeader.isDigest())
-	    throw new Exception("Unexpected authentication scheme "
-		    + wwwAuthenticateHeader.getAuthenticationScheme()
-		    + ", Digest expected");
+	    throw new UnsupportedAuthenticationSchema(
+		    "Unexpected authentication scheme "
+			    + wwwAuthenticateHeader.getAuthenticationScheme()
+			    + ", Digest expected");
 	String nc = "00000001";
 	String cnonce = DigestUtils.md5Hex(Long.toString(System
 		.currentTimeMillis()));

src/main/java/authentication/web/RdfStoreProxy.java

@@ -72,8 +72,8 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
 	String mode = req.getParameter("mode");
 	String query = req.getParameter("query");
 
-	// System.out.println("mode " + mode);
-	// System.out.println("username " + username);
+	log.debug("mode " + mode);
+	log.debug("username " + username);
 
 	try {
 	    RdfStoreManager rdfStoreManager;

src/main/java/rdf/SecureRdfStoreManagerImpl.java

@@ -12,7 +12,7 @@ public SecureRdfStoreManagerImpl(String endpoint, String username, String passwo
         this.password = password;
     }
 
-    protected String executePost(String endpoint, String urlParameters) throws Exception {
+    protected String executePost(String endpoint, String urlParameters) throws Exception{
         return HttpRequestManager.executePost(endpoint, urlParameters, username, password);
     }
 }

src/main/java/rest/Configuration.java

@@ -1,11 +1,14 @@
 package rest;
 
+import java.io.IOException;
+
 import javax.servlet.ServletContext;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
 
 import org.apache.log4j.Logger;
 
@@ -30,7 +33,7 @@ public class Configuration {
      */
     @GET
     @Produces(MediaType.APPLICATION_JSON)
-    public String getConfiguration(@Context ServletContext context) {
+    public Response getConfiguration(@Context ServletContext context) {
 
 	FrameworkConfiguration frameworkConf;
 	JsonObject config = null;
@@ -41,17 +44,23 @@ public String getConfiguration(@Context ServletContext context) {
 	    config.addProperty("ns", frameworkConf.getResourceNamespace());
 	    config.addProperty("defaultSettingsGraphUri",
 		    frameworkConf.getSettingsGraph());
-	    config.addProperty("groupsGraphUri",
-		    frameworkConf.getGroupsGraph());
+	    config.addProperty("groupsGraphUri", frameworkConf.getGroupsGraph());
 	    config.addProperty("frameworkOntologyNs",
 		    frameworkConf.getFrameworkOntologyNS());
 	    config.addProperty("accountsGraph",
 		    frameworkConf.getAccountsGraph());
+	    config.addProperty("sparqlEndpoint",
+		    frameworkConf.getPublicSparqlEndpoint());
+	    config.addProperty("authSparqlEndpoint",
+		    frameworkConf.getAuthSparqlEndpoint());
 
-	} catch (Exception e) {
+	} catch (IOException e) {
 	    log.error(e);
 	    e.printStackTrace();
+	    return Response.status(Response.Status.EXPECTATION_FAILED)
+		    .entity("Error reading configuration files.").build();
 	}
-	return config.toString();
+	return Response.ok(config.toString(), MediaType.APPLICATION_JSON)
+		.build();
     }
 }

src/main/java/rest/WorkbenchSetup.java

@@ -64,7 +64,7 @@ public Response reset(@Context ServletContext context) {
 			.entity(e.getMessage()).build();
 	}
 	log.info("System was reseted successfully.");
-	return Response.ok().build();
+	return Response.ok().entity("System reseted successfully").build();
     }
 
     /**
@@ -101,7 +101,8 @@ public Response initialize(@Context ServletContext context) {
 			.entity(e.getMessage()).build();
 	    }
 	    log.info("System was set up successfully.");
-	    return Response.ok().build();
+	    return Response.ok().entity("System initialized successfully")
+		    .build();
 	}
     }
 }

src/main/java/setup/InitialSetupServlet.java

@@ -128,7 +128,8 @@ public void setUp(FrameworkConfiguration config, boolean reset)
 	    userManager.grantLOLook("SPARQL");
 	} catch (Exception e) {
 	    // role is already granted
-	    e.printStackTrace();
+	    log.warn("SPARQL has already SPARQL_UPDATE rol");
+	    // e.printStackTrace();
 	}
 
 	log.info(" Default Graphs creation and configuration ");

src/main/java/setup/RDFStoreSetupManager.java

@@ -0,0 +1,12 @@
+package util;
+
+public class UnsupportedAuthenticationSchema extends RuntimeException {
+    /**
+     * 
+     */
+    private static final long serialVersionUID = 1L;
+
+    public UnsupportedAuthenticationSchema(String message) {
+	super(message);
+    }
+}