From 05cac54906949a2fddfbbd37ed3e74fb683b86fb Mon Sep 17 00:00:00 2001
From: Giancarlo Panichi <giancarlo.panichi@isti.cnr.it>
Date: Wed, 18 Dec 2013 13:11:51 +0000
Subject: [PATCH] Updated with task manager and old pom configuration.

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-portlet@87158 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .settings/org.eclipse.jdt.core.prefs          |   4 +-
 ....eclipse.wst.common.project.facet.core.xml |   2 +-
 pom.xml                                       | 166 +++++++++++-------
 .../user/td/client/TabularDataController.java |   2 +-
 4 files changed, 102 insertions(+), 72 deletions(-)

diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index 443e085..8ad6fb0 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,8 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.5
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml
index 4045d87..7893960 100644
--- a/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -3,5 +3,5 @@
   <fixed facet="wst.jsdt.web"/>
   <installed facet="jst.web" version="2.3"/>
   <installed facet="wst.jsdt.web" version="1.0"/>
-  <installed facet="java" version="1.7"/>
+  <installed facet="java" version="1.5"/>
 </faceted-project>
diff --git a/pom.xml b/pom.xml
index e0ba298..0163d77 100644
--- a/pom.xml
+++ b/pom.xml
@@ -91,7 +91,7 @@
 		<!-- GXT 2 -->
 		<dependency>
 			<groupId>com.extjs.gxt</groupId>
- 			<artifactId>gxt</artifactId>
+			<artifactId>gxt</artifactId>
 			<version>2.2.5</version>
 		</dependency>
 
@@ -283,8 +283,9 @@
 			</resource>
 
 		</resources>
-		<plugins>
 
+	
+		<plugins>
 
 			<!-- GWT Maven Plugin -->
 			<plugin>
@@ -295,29 +296,19 @@
 					<execution>
 						<goals>
 							<goal>compile</goal>
-							<!-- <goal>test</goal> -->
+							<goal>test</goal>
 						</goals>
 					</execution>
 				</executions>
-				<!-- Plugin configuration. There are many available options, see gwt-maven-plugin 
-					documentation at codehaus.org -->
 				<configuration>
 					<runTarget>TabularDataPortlet.html</runTarget>
 					<hostedWebapp>${webappDirectory}</hostedWebapp>
-					<webappDirectory>${webappDirectory}</webappDirectory>
-					<!-- <webResources> -->
-					<!-- <resource> -->
-					<!-- <directory>lib</directory> -->
-					<!-- <includes> -->
-					<!-- <include>gxt-2.2.5.jar</include> -->
-					<!-- </includes> -->
-					<!-- <targetPath>WEB-INF/lib</targetPath> -->
-					<!-- </resource> -->
-					<!-- </webResources> -->
+					<module>org.gcube.portlets.user.td.tabulardataportlet</module>
 				</configuration>
-
 			</plugin>
 
+
+
 			<!-- Copy static web files before executing gwt:run -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -326,86 +317,125 @@
 				<executions>
 					<execution>
 						<phase>compile</phase>
-						<goals>
-							<goal>exploded</goal>
-						</goals>
+						<!-- <goals> <goal>exploded</goal> </goals> -->
 					</execution>
 				</executions>
 				<configuration>
 					<webappDirectory>${webappDirectory}</webappDirectory>
-
-
-					<!-- Include static jar into WEB-INF/lib -->
-					<webResources>
-						<resource>
-							<directory>lib</directory>
-							<includes>
-								<include>*.jar</include>
-							</includes>
-							<targetPath>WEB-INF/lib</targetPath>
-						</resource>
-					</webResources>
-
-
+					<!-- Include static jar into WEB-INF/lib <webResources> <resource> <directory>lib</directory> 
+						<includes> <include>*.jar</include> </includes> <targetPath>WEB-INF/lib</targetPath> 
+						</resource> </webResources> -->
 				</configuration>
-
 			</plugin>
+
+			<!-- Maven Surefire Plugin for Test -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>2.3.2</version>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>2.16</version>
 				<configuration>
-					<source>1.7</source>
-					<target>1.7</target>
+					<skipTests>false</skipTests>
+				</configuration>
+				<dependencies>
+					<dependency>
+						<groupId>org.apache.maven.surefire</groupId>
+						<artifactId>surefire-junit47</artifactId>
+						<version>2.16</version>
+					</dependency>
+				</dependencies>
+			</plugin>
+
+
+			<!-- Maven -->
+			<plugin>
+				<artifactId>maven-resources-plugin</artifactId>
+				<version>2.6</version>
+				<executions>
+					<execution>
+						<id>copy-profile</id>
+						<phase>process-resources</phase>
+						<goals>
+							<goal>copy-resources</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${configDirectory}</outputDirectory>
+							<resources>
+								<resource>
+									<directory>${templatesDirectory}</directory>
+									<includes>
+										<include>profile.xml</include>
+									</includes>
+									<filtering>true</filtering>
+								</resource>
+							</resources>
+						</configuration>
+					</execution>
+					<execution>
+						<id>copy-distro-resources</id>
+						<phase>process-resources</phase>
+						<goals>
+							<goal>copy-resources</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${distroDirectory}</outputDirectory>
+							<resources>
+								<resource>
+									<directory>${templatesDirectory}</directory>
+									<excludes>
+										<exclude>profile.xml</exclude>
+										<exclude>descriptor.xml</exclude>
+									</excludes>
+									<filtering>true</filtering>
+								</resource>
+							</resources>
+						</configuration>
+					</execution>
+
+
+
+				</executions>
+			</plugin>
+			<plugin>
+				<artifactId>maven-clean-plugin</artifactId>
+				<version>2.5</version>
+				<configuration>
+					<filesets>
+						<fileset>
+							<directory>${distroDirectory}</directory>
+							<includes>
+								<include>**</include>
+							</includes>
+							<followSymlinks>false</followSymlinks>
+						</fileset>
+						<fileset>
+							<directory>${configDirectory}</directory>
+							<includes>
+								<include>**</include>
+							</includes>
+							<followSymlinks>false</followSymlinks>
+						</fileset>
+					</filesets>
 				</configuration>
 			</plugin>
-			<!-- SA Plugin -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-assembly-plugin</artifactId>
 				<version>2.2</version>
 				<configuration>
 					<descriptors>
-						<descriptor>${distroDirectory}/descriptor.xml</descriptor>
+						<descriptor>${templatesDirectory}/descriptor.xml</descriptor>
 					</descriptors>
 				</configuration>
 				<executions>
 					<execution>
 						<id>servicearchive</id>
-						<phase>install</phase>
+						<phase>package</phase>
 						<goals>
 							<goal>single</goal>
 						</goals>
 					</execution>
 				</executions>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-resources-plugin</artifactId>
-				<version>2.5</version>
-				<executions>
-					<execution>
-						<id>copy-profile</id>
-						<phase>install</phase>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>target</outputDirectory>
-							<resources>
-								<resource>
-									<directory>${distroDirectory}</directory>
-									<filtering>true</filtering>
-									<includes>
-										<include>profile.xml</include>
-									</includes>
-								</resource>
-							</resources>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-
 
 		</plugins>
 	</build>
diff --git a/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java b/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java
index 7993a34..d843d87 100644
--- a/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java
+++ b/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java
@@ -443,7 +443,7 @@ public class TabularDataController {
 		TdTaskController.bindCommonBus(eventBus);
 		tdTaskMainWindow = tdTaskController.getWindowTaskMonitor(); 
 		
-		tdTaskMainWindow.setPopupPosition( Window.getClientWidth()/2, Window.getClientHeight()/2);
+		tdTaskMainWindow.setPopupPosition( (Window.getClientWidth()/2)-200, (Window.getClientHeight()/2)-300);
 				 
 		tdTaskMainWindow.show();