Merge branch 'hotfix/UV_Core_v2.0.3'

UnifiedViews · Jun 16, 2015 · 25453df · 25453df
2 parents 2c2603b + 8229c0b
commit 25453df
Show file tree

Hide file tree

Showing 21 changed files with 88 additions and 53 deletions.
diff --git a/backend/pom.xml b/backend/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>eu.unifiedviews</groupId>
 		<artifactId>uv-core</artifactId>
-		<version>2.0.2</version>
+		<version>2.0.3</version>
 	</parent>
 	<artifactId>backend</artifactId>
 	<packaging>jar</packaging>

diff --git a/backend/src/main/java/cz/cuni/mff/xrg/odcs/backend/AppEntry.java b/backend/src/main/java/cz/cuni/mff/xrg/odcs/backend/AppEntry.java
@@ -9,6 +9,7 @@
 import org.h2.store.fs.FileUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeansException;
 import org.springframework.context.support.AbstractApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
@@ -207,42 +208,47 @@ private void run(String[] args) {
         // initialise
         initSpring();
 
-        // initialize locale settings from DB, so we need spring first
-        initLocale();
-
-        // the log back is not initialised here .. 
-        // we add file appender
-        initLogbackAppender(context.getBean(AppConfig.class));
-
-        // the sql appender cooperate with spring, so we need spring first
-        initLogbackSqlAppender();
-
-        // Initialize DPUs by preloading all thier JAR bundles
-        // TODO use lazyloading instead of preload?
-        ModuleFacade modules = context.getBean(ModuleFacade.class);
-        modules.preLoadAllDPUs();
-
-        // try to get application-lock 
-        // we construct lock key based on port		
-        final StringBuilder lockKey = new StringBuilder();
-        lockKey.append("INTLIB_");
-        lockKey.append(context.getBean(AppConfig.class).getInteger(ConfigProperty.BACKEND_PORT));
-        if (!AppLock.setLock(lockKey.toString())) {
-            // another application is already running
-            LOG.info("Another instance of ODCleanStore is probably running.");
-            context.close();
-            return;
-        }
+        try {
+            // initialize locale settings from DB, so we need spring first
+            initLocale();
+
+            // the log back is not initialised here ..
+            // we add file appender
+            initLogbackAppender(context.getBean(AppConfig.class));
+
+            // the sql appender cooperate with spring, so we need spring first
+            initLogbackSqlAppender();
+
+            // Initialize DPUs by preloading all thier JAR bundles
+            // TODO use lazyloading instead of preload?
+            ModuleFacade modules = context.getBean(ModuleFacade.class);
+            modules.preLoadAllDPUs();
+
+            // try to get application-lock
+            // we construct lock key based on port
+            final StringBuilder lockKey = new StringBuilder();
+            lockKey.append("INTLIB_");
+            lockKey.append(context.getBean(AppConfig.class).getInteger(ConfigProperty.BACKEND_PORT));
+            if (!AppLock.setLock(lockKey.toString())) {
+                // another application is already running
+                LOG.info("Another instance of UnifiedViews is probably running.");
+                context.close();
+                return;
+            }
 
-        // print some information ..
-        LOG.info("Running ...");
+            // print some information ..
+            LOG.info("Running ...");
 
-        // infinite loop
-        while (true) {
-            try {
-                Thread.sleep(1000 * 60);
-            } catch (InterruptedException ex) {
+            // infinite loop
+            while (true) {
+                try {
+                    Thread.sleep(1000 * 60);
+                } catch (InterruptedException ex) {
+                }
             }
+        } catch (Exception e) {
+            context.close();
+            LOG.error("Failed to initialize UnifiedViews backend.", e);
         }
     }
 

diff --git a/backend/src/main/resources/backend-context.xml b/backend/src/main/resources/backend-context.xml
@@ -24,7 +24,11 @@
     <!-- Used for asynch calls even for scheduled functions. -->
     <task:executor id="taskExecutor" pool-size="8"/>
     <!-- Used for Scheduled tasks.-->
-    <task:scheduler id="taskScheduler" pool-size="8"/>
+    <bean id="taskScheduler" class="org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler">
+        <property name="poolSize" value="8" />
+        <property name="waitForTasksToCompleteOnShutdown" value="false" />
+        <property name="daemon" value="true" />
+    </bean>
 
     <!-- Define aspects for managing DB reconnects. -->
     <bean id="facadeAspect" class="cz.cuni.mff.xrg.odcs.backend.db.SQLDatabaseReconnectAspect"/>

diff --git a/commons-app/pom.xml b/commons-app/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>eu.unifiedviews</groupId>
 		<artifactId>uv-core</artifactId>
-		<version>2.0.2</version>
+		<version>2.0.3</version>
 	</parent>
 	<artifactId>commons-app</artifactId>
 	<name>commons-app</name>

diff --git a/dataunit-file-impl/pom.xml b/dataunit-file-impl/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>eu.unifiedviews</groupId>
 		<artifactId>uv-core</artifactId>
-		<version>2.0.2</version>
+		<version>2.0.3</version>
 	</parent>
 	<artifactId>dataunit-file-impl</artifactId>
 	<name>dataunit-file-impl</name>

diff --git a/dataunit-file/pom.xml b/dataunit-file/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>eu.unifiedviews</groupId>
 		<artifactId>uv-core</artifactId>
-		<version>2.0.2</version>
+		<version>2.0.3</version>
 	</parent>
 	<artifactId>dataunit-file</artifactId>
 	<name>dataunit-file</name>

diff --git a/dataunit-rdf-impl/pom.xml b/dataunit-rdf-impl/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>uv-core</artifactId>
 		<groupId>eu.unifiedviews</groupId>
-		<version>2.0.2</version>
+		<version>2.0.3</version>
 	</parent>
 	<artifactId>dataunit-rdf-impl</artifactId>
 	<name>dataunit-rdf-impl</name>

diff --git a/dataunit-rdf/pom.xml b/dataunit-rdf/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>eu.unifiedviews</groupId>
 		<artifactId>uv-core</artifactId>
-		<version>2.0.2</version>
+		<version>2.0.3</version>
 	</parent>
 	<artifactId>dataunit-rdf</artifactId>
 	<name>dataunit-rdf</name>

diff --git a/dataunit-relational-impl/pom.xml b/dataunit-relational-impl/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>uv-core</artifactId>
 		<groupId>eu.unifiedviews</groupId>
-		<version>2.0.2</version>
+		<version>2.0.3</version>
 	</parent>
 
 	<groupId>eu.unifiedviews</groupId>

diff --git a/dataunit/pom.xml b/dataunit/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>eu.unifiedviews</groupId>
 		<artifactId>uv-core</artifactId>
-		<version>2.0.2</version>
+		<version>2.0.3</version>
 	</parent>
 	<artifactId>dataunit</artifactId>
 	<description>Base project for new DataUnit's implementations.</description>

diff --git a/frontend/pom.xml b/frontend/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>eu.unifiedviews</groupId>
 		<artifactId>uv-core</artifactId>
-		<version>2.0.2</version>
+		<version>2.0.3</version>
 	</parent>
 	<artifactId>frontend</artifactId>
 	<packaging>war</packaging>

diff --git a/frontend/src/main/java/cz/cuni/mff/xrg/odcs/frontend/gui/components/DebuggingView.java b/frontend/src/main/java/cz/cuni/mff/xrg/odcs/frontend/gui/components/DebuggingView.java
@@ -343,9 +343,13 @@ public void setExecution(PipelineExecution execution, DPUInstanceRecord instance
     }
 
     private void setExecution(PipelineExecution execution, DPUInstanceRecord instance, boolean checkRedundancy) {
+        if (execution == null) {
+            return;
+        }
+
         if (checkRedundancy) {
-            if (execution == null || (execution.equals(this.pipelineExec)
-                    && (instance == null || instance.equals(this.debugDpu)))) {
+            if (execution.equals(this.pipelineExec)
+                    && (instance == null || instance.equals(this.debugDpu))) {
                 //Already set
                 return;
             }

diff --git a/frontend/src/main/webapp/WEB-INF/web_sso.xml b/frontend/src/main/webapp/WEB-INF/web_sso.xml
@@ -52,6 +52,9 @@
 		<!-- To allow session-scoped beans -->
 		<listener-class>org.springframework.web.context.request.RequestContextListener</listener-class>
 	</listener>
+    <listener>
+        <listener-class>org.jasig.cas.client.session.SingleSignOutHttpSessionListener</listener-class>
+    </listener>
 
 	<servlet>
 		<servlet-name>Vaadin Application Servlet</servlet-name>

diff --git a/lib/lib-core/pom.xml b/lib/lib-core/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>eu.unifiedviews</groupId>
 		<artifactId>lib</artifactId>
-		<version>2.0.2</version>
+		<version>2.0.3</version>
 	</parent>
 	<artifactId>lib-core</artifactId>
 	<packaging>pom</packaging>

diff --git a/lib/pom.xml b/lib/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>eu.unifiedviews</groupId>
 		<artifactId>uv-core</artifactId>
-		<version>2.0.2</version>
+		<version>2.0.3</version>
 	</parent>
 	<artifactId>lib</artifactId>
 	<packaging>pom</packaging>

diff --git a/master/pom.xml b/master/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>eu.unifiedviews</groupId>
 		<artifactId>uv-core</artifactId>
-		<version>2.0.2</version>
+		<version>2.0.3</version>
 	</parent>
 	<packaging>war</packaging>
 	<artifactId>master</artifactId>

diff --git a/master/src/main/java/eu/unifiedviews/master/api/ExecutionResource.java b/master/src/main/java/eu/unifiedviews/master/api/ExecutionResource.java
@@ -13,6 +13,7 @@
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
+import cz.cuni.mff.xrg.odcs.commons.app.user.User;
 import eu.unifiedviews.master.authentication.AuthenticationRequired;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -184,7 +185,12 @@ public PipelineExecutionDTO createPipelineExecution(@PathParam("pipelineid") Str
             }
 
             execution = pipelineFacade.createExecution(pipeline);
-            execution.setOwner(userFacade.getUser(1L));
+            // try to get user
+            User user = userFacade.getUserByExtId(newExecution.getUserExternalId());
+            if (user == null) {
+                throw new ApiException(Response.Status.NOT_FOUND, String.format("User '%s' could not be found! Execution could not be created.", newExecution.getUserExternalId()));
+            }
+            execution.setOwner(user);
 
             execution.setDebugging(newExecution.isDebugging());
             execution.setOrderNumber(1L);

diff --git a/master/src/main/java/eu/unifiedviews/master/api/PipelineResource.java b/master/src/main/java/eu/unifiedviews/master/api/PipelineResource.java
@@ -14,6 +14,7 @@
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
+import cz.cuni.mff.xrg.odcs.commons.app.user.User;
 import eu.unifiedviews.master.authentication.AuthenticationRequired;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -54,7 +55,12 @@ public PipelineDTO createPipeline(PipelineDTO pipelineDTO) {
             if (pipeline == null) {
                 throw new ApiException(Response.Status.NOT_FOUND, String.format("Pipeline could not be created."));
             }
-            pipeline.setUser(userFacade.getUser(1L));
+            // try to get user
+            User user = userFacade.getUserByExtId(pipelineDTO.getUserExternalId());
+            if (user == null) {
+                throw new ApiException(Response.Status.NOT_FOUND, String.format("User '%s' could not be found! Pipeline could not be created.", pipelineDTO.getUserExternalId()));
+            }
+            pipeline.setUser(user);
             pipeline = PipelineDTOConverter.convertFromDTO(pipelineDTO, pipeline);
             pipelineFacade.save(pipeline);
         } catch (ApiException ex) {

diff --git a/master/src/main/java/eu/unifiedviews/master/api/ScheduleResource.java b/master/src/main/java/eu/unifiedviews/master/api/ScheduleResource.java
@@ -17,6 +17,7 @@
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
+import cz.cuni.mff.xrg.odcs.commons.app.user.User;
 import eu.unifiedviews.master.authentication.AuthenticationRequired;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -246,7 +247,12 @@ public PipelineScheduleDTO createPipelineSchedule(@PathParam("pipelineid") Strin
             if (schedule == null) {
                 throw new ApiException(Response.Status.INTERNAL_SERVER_ERROR, "ScheduleFacade returned null!");
             }
-            schedule.setOwner(userFacade.getUser(1L));
+            // try to get user
+            User user = userFacade.getUserByExtId(scheduleToUpdate.getUserExternalId());
+            if (user == null) {
+                throw new ApiException(Response.Status.NOT_FOUND, String.format("User '%s' could not be found! Schedule could not be created.", scheduleToUpdate.getUserExternalId()));
+            }
+            schedule.setOwner(user);
             schedule.setPipeline(pipeline);
             List<Pipeline> afterPipelines = null;
             if (scheduleToUpdate.getAfterPipelines() != null) {

diff --git a/module-test/pom.xml b/module-test/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>eu.unifiedviews</groupId>
 		<artifactId>uv-core</artifactId>
-		<version>2.0.2</version>
+		<version>2.0.3</version>
 	</parent>
 	<artifactId>module-test</artifactId>
 	<description>Contains classes for test support.</description>

diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
 
 	<groupId>eu.unifiedviews</groupId>
 	<artifactId>uv-core</artifactId>
-	<version>2.0.2</version>
+	<version>2.0.3</version>
 	<packaging>pom</packaging>
 	<name>UnifiedViews-Core</name>
 	<description />