From 070becb56df9295742b081f78edd8d6d1d14ccf6 Mon Sep 17 00:00:00 2001
From: Luis Faria <lfaria@keep.pt>
Date: Tue, 4 Mar 2014 15:56:59 +0000
Subject: [PATCH] incremented version to 0.2.1, solved redirect type in
 creating simple request, solved send mail dependency error

---
 adaptors/c3po-adaptor/pom.xml                        |  2 +-
 adaptors/pom.xml                                     |  4 ++--
 adaptors/pronom-adaptor/pom.xml                      |  2 +-
 adaptors/report-api-adaptor/pom.xml                  |  2 +-
 core/pom.xml                                         | 12 +++++++++++-
 model/pom.xml                                        |  2 +-
 notifications/email-notification/pom.xml             |  2 +-
 notifications/pom.xml                                |  4 ++--
 pom.xml                                              |  6 +++---
 web/pom.xml                                          |  2 +-
 .../templates/server/createAsyncRequestSimple.hbs    |  2 +-
 11 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/adaptors/c3po-adaptor/pom.xml b/adaptors/c3po-adaptor/pom.xml
index d235094..c8ca673 100644
--- a/adaptors/c3po-adaptor/pom.xml
+++ b/adaptors/c3po-adaptor/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>scout-adaptors</artifactId>
     <groupId>eu.scape-project</groupId>
-    <version>0.2.0</version>
+    <version>0.2.1</version>
   </parent>
   <artifactId>c3po-adaptor</artifactId>
   <name>c3po Adaptor</name>
diff --git a/adaptors/pom.xml b/adaptors/pom.xml
index c0621cf..e583a63 100644
--- a/adaptors/pom.xml
+++ b/adaptors/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>scout</artifactId>
 		<groupId>eu.scape-project</groupId>
-		<version>0.2.0</version>
+		<version>0.2.1</version>
 	</parent>
 	<artifactId>scout-adaptors</artifactId>
 	<packaging>pom</packaging>
@@ -51,7 +51,7 @@
 			<dependency>
 				<groupId>eu.scape-project</groupId>
 				<artifactId>scout-model</artifactId>
-				<version>0.2.0</version>
+				<version>0.2.1</version>
 				<scope>provided</scope>
 				<exclusions>
 					<exclusion>
diff --git a/adaptors/pronom-adaptor/pom.xml b/adaptors/pronom-adaptor/pom.xml
index 14a7a16..4ccc77d 100644
--- a/adaptors/pronom-adaptor/pom.xml
+++ b/adaptors/pronom-adaptor/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>scout-adaptors</artifactId>
 		<groupId>eu.scape-project</groupId>
-		<version>0.2.0</version>
+		<version>0.2.1</version>
 	</parent>
 	<artifactId>pronom-adaptor</artifactId>
 	<version>0.0.6</version>
diff --git a/adaptors/report-api-adaptor/pom.xml b/adaptors/report-api-adaptor/pom.xml
index d5967c0..bad1b5b 100644
--- a/adaptors/report-api-adaptor/pom.xml
+++ b/adaptors/report-api-adaptor/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>scout-adaptors</artifactId>
 		<groupId>eu.scape-project</groupId>
-		<version>0.2.0</version>
+		<version>0.2.1</version>
 	</parent>
 	<artifactId>report-api-adaptor</artifactId>
 	<version>0.0.2</version>
diff --git a/core/pom.xml b/core/pom.xml
index 4465fe9..c2aaf52 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>scout</artifactId>
 		<groupId>eu.scape-project</groupId>
-		<version>0.2.0</version>
+		<version>0.2.1</version>
 	</parent>
 	<artifactId>scout-core</artifactId>
 	<name>Scout Core Module</name>
@@ -56,6 +56,16 @@
 			<groupId>org.apache.ws.commons.axiom</groupId>
 			<artifactId>axiom-impl</artifactId>
 			<version>1.2.14</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.apache.geronimo.specs</groupId>
+					<artifactId>geronimo-activation_1.1_spec</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.apache.geronimo.specs</groupId>
+					<artifactId>geronimo-javamail_1.4_spec</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/model/pom.xml b/model/pom.xml
index 11599bf..8561c01 100644
--- a/model/pom.xml
+++ b/model/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>scout</artifactId>
 		<groupId>eu.scape-project</groupId>
-		<version>0.2.0</version>
+		<version>0.2.1</version>
 	</parent>
 	<artifactId>scout-model</artifactId>
 	<name>Scout Domain Model</name>
diff --git a/notifications/email-notification/pom.xml b/notifications/email-notification/pom.xml
index f187d84..c2b7ccf 100644
--- a/notifications/email-notification/pom.xml
+++ b/notifications/email-notification/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>scout-notifications</artifactId>
 		<groupId>eu.scape-project</groupId>
-		<version>0.2.0</version>
+		<version>0.2.1</version>
 	</parent>
 	<artifactId>email-notification</artifactId>
 	<version>0.0.3</version>
diff --git a/notifications/pom.xml b/notifications/pom.xml
index 8d24eae..77156c8 100644
--- a/notifications/pom.xml
+++ b/notifications/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>scout</artifactId>
 		<groupId>eu.scape-project</groupId>
-		<version>0.2.0</version>
+		<version>0.2.1</version>
 	</parent>
 	<artifactId>scout-notifications</artifactId>
 	<packaging>pom</packaging>
@@ -50,7 +50,7 @@
 			<dependency>
 				<groupId>eu.scape-project</groupId>
 				<artifactId>scout-model</artifactId>
-				<version>0.2.0</version>
+				<version>0.2.1</version>
 				<scope>provided</scope>
 				<exclusions>
 					<exclusion>
diff --git a/pom.xml b/pom.xml
index 0824956..17f16de 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>eu.scape-project</groupId>
 	<artifactId>scout</artifactId>
-	<version>0.2.0</version>
+	<version>0.2.1</version>
 	<packaging>pom</packaging>
 	<description>Scout is a monitor component as defined in the SCAPE project</description>
 	<name>Scout</name>
@@ -244,12 +244,12 @@
 			<dependency>
 				<groupId>eu.scape-project</groupId>
 				<artifactId>scout-core</artifactId>
-				<version>0.2.0</version>
+				<version>0.2.1</version>
 			</dependency>
 			<dependency>
 				<groupId>eu.scape-project</groupId>
 				<artifactId>scout-model</artifactId>
-				<version>0.2.0</version>
+				<version>0.2.1</version>
 			</dependency>
 			<dependency>
 				<groupId>com.github.jknack</groupId>
diff --git a/web/pom.xml b/web/pom.xml
index 5a15846..8474000 100755
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>scout</artifactId>
 		<groupId>eu.scape-project</groupId>
-		<version>0.2.0</version>
+		<version>0.2.1</version>
 	</parent>
 	<artifactId>scout-web</artifactId>
 	<packaging>war</packaging>
diff --git a/web/src/main/resources/templates/server/createAsyncRequestSimple.hbs b/web/src/main/resources/templates/server/createAsyncRequestSimple.hbs
index bb1ebcb..480ed73 100644
--- a/web/src/main/resources/templates/server/createAsyncRequestSimple.hbs
+++ b/web/src/main/resources/templates/server/createAsyncRequestSimple.hbs
@@ -204,7 +204,7 @@
 				postdata['template'] = templateId;
 				var jqxhr = $.post("", postdata, function() {
 					console.log("created trigger");
-					document.location = "{{mustacheletPath}}/dashboarclassd";
+					document.location = "{{mustacheletPath}}/dashboard";
 				});
 
 				jqxhr.fail(function() {