Merge branch 'master' of [email protected]:ontos-lds.git

Conflicts:
	src/main/webapp/css/app.css
	src/main/webapp/js/workbench/extraction-and-loading/d2rq-mapping-controller.js
	src/main/webapp/js/workbench/extraction-and-loading/d2rq-task-controller.js
	src/main/webapp/js/workbench/manual-revision-and-authoring/ontology-controller.js

Author: jj

.gitignore

@@ -1,6 +1,7 @@
 #Framework configuration files
 /src/main/webapp/WEB-INF/web.xml
 /src/main/resources/framework-configuration.ttl
+/src/main/resources/framework-components-local.ttl
 
 #Mac
 .DS_Store
@@ -18,3 +19,4 @@
 /src/main/webapp/VAADIN/gwt-unitCache
 /src/main/webapp/VAADIN/widgetsets
 /target
+/bin

src/main/java/ExecuteD2RQTaskServlet.java

@@ -24,7 +24,7 @@ public class ExecuteD2RQTaskServlet extends HttpServlet {
     public void init(ServletConfig config) throws ServletException {
         super.init(config);
         try {
-            frameworkUserManager = FrameworkConfiguration.getInstance(getServletContext(), false).getFrameworkUserManager();
+            frameworkUserManager = FrameworkConfiguration.getInstance(getServletContext()).getFrameworkUserManager();
         } catch (Exception e) {
             throw new ServletException(e);
         }

src/main/java/ImportRDF.java

@@ -146,7 +146,7 @@ private int httpUpdate(String endpoint, String graph, Model model) throws Except
     RdfStoreManager rdfStoreManager = null;
     if (username != null && !username.isEmpty() && token != null && !token.isEmpty()) {
       FrameworkUserManager frameworkUserManager = FrameworkConfiguration.getInstance(
-          getServletContext(), false).getFrameworkUserManager();
+          getServletContext()).getFrameworkUserManager();
       if (frameworkUserManager.checkToken(username, token))
         rdfStoreManager = frameworkUserManager.getRdfStoreManager(username);
     }

src/main/java/accounts/FrameworkUserManager.java

@@ -8,4 +8,5 @@ public interface UserManager {
     public void setRdfGraphPermissions(String user, String graph, int permissions) throws Exception;
     public void deleteRdfGraphPermissions(String user, String graph) throws Exception;
     public void setDefaultGraphPermissions(String graph, int permissions) throws Exception;
+    public boolean checkUserExists(String username, String email) throws Exception;
 }

src/main/java/accounts/UserManager.java

@@ -5,7 +5,7 @@ public class UserProfile {
     private String settingsGraph;
     private String accountURI;
     private String email;
-    private boolean admin;
+    private UserRole role;
 
     public String getUsername() {
         return username;
@@ -39,12 +39,12 @@ public void setEmail(String email) {
         this.email = email;
     }
 
-    public boolean isAdmin() {
-        return admin;
+    public UserRole getRole() {
+        return role;
     }
 
-    public void setAdmin(boolean admin) {
-        this.admin = admin;
+    public void setRole(UserRole role) {
+        this.role = role;
     }
 
     @Override

src/main/java/accounts/UserProfile.java

@@ -0,0 +1,36 @@
+package accounts;
+
+import java.util.Collection;
+
+/**
+ * Created by taleksaschina on 24.06.2014.
+ */
+public class UserRole {
+    private String uri;
+    private String name;
+    private Collection<String> services;
+
+    public String getUri() {
+        return uri;
+    }
+
+    public void setUri(String uri) {
+        this.uri = uri;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Collection<String> getServices() {
+        return services;
+    }
+
+    public void setServices(Collection<String> services) {
+        this.services = services;
+    }
+}

src/main/java/accounts/UserRole.java

@@ -1,9 +1,6 @@
 package accounts;
 
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.SQLException;
-import java.sql.Statement;
+import java.sql.*;
 
 public class VirtuosoUserManager implements UserManager {
   private static final String jdbcDriver = "virtuoso.jdbc4.Driver";
@@ -29,8 +26,10 @@ public VirtuosoUserManager(String connectionString, String user, String password
   }
 
   @Override
-  public void createUser(String name, String password) throws ClassNotFoundException, SQLException {
-    executeUpdate(getConnection(), "DB.DBA.USER_CREATE('" + name + "', '" + password + "')");
+  public void createUser(String name, String password) throws Exception {
+    if (checkUserExists(name, null))
+        throw new Exception("User " + name + " already exists");
+    executeUpdate(getConnection(), "DB.DBA.USER_CREATE('" + name + "', '" + password + "')");  //NB! this function doesn't throw exception if user already exists
     // executeUpdate(getConnection(), "USER_SET_OPTION('" + name +
     // "', 'DAV_ENABLE', 1)");
   }
@@ -42,7 +41,7 @@ public void dropUser(String name) throws ClassNotFoundException, SQLException {
 
   @Override
   public void grantRole(String user, String role) throws ClassNotFoundException, SQLException {
-    executeUpdate(getConnection(), "GRANT " + role + " TO \"" + user + "\"");
+    executeUpdate(getConnection(), "GRANT " + role + " TO \"" + user + "\""); //NB! this function throws exception if the role is already granted
   }
 
   @Override
@@ -82,9 +81,23 @@ public void setDefaultGraphPermissions(String graph, int permissions)
    * @throws SQLException
    */
   public void grantLOLook(String user) throws ClassNotFoundException, SQLException {
-    executeUpdate(getConnection(), "GRANT EXECUTE ON DB.DBA.L_O_LOOK TO '" + user + "'");
+    executeUpdate(getConnection(), "GRANT EXECUTE ON DB.DBA.L_O_LOOK TO \"" + user + "\"");
   }
 
+    @Override
+    public boolean checkUserExists(String username, String email) throws Exception {
+        //todo is there any simpler way to check if the user exists? some function?
+        String query = "select * from DB.DBA.SYS_USERS where U_NAME='" + username + "'";
+        Connection conn = getConnection();
+        Statement stmt = conn.createStatement();
+        try {
+            ResultSet resultSet = stmt.executeQuery(query);
+            return resultSet.next();
+        } finally {
+            stmt.close();
+        }
+    }
+
   private Connection getConnection() throws ClassNotFoundException, SQLException {
     if (connection == null || connection.isClosed()) {
       Class.forName(jdbcDriver);