Updated MainBox

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-mainbox-widget@100614 82a268e6-3cf1-43bd-a215-b396298e98cf

MainBox.launch

@@ -10,7 +10,7 @@
 </listAttribute>
 <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="com.google.gdt.eclipse.maven.mavenClasspathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gwt.dev.DevMode"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-remoteUI &quot;${gwt_remote_ui_server_port}:${unique_id}&quot; -startupUrl MainBox.html -logLevel INFO -codeServerPort 9997 -port 8888"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-remoteUI &quot;${gwt_remote_ui_server_port}:${unique_id}&quot; -startupUrl MainBox.html -logLevel INFO -codeServerPort 9997 -port 8888 org.gcube.portlets.user.td.mainboxwidget.MainBox"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="tabular-data-mainbox-widget"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx512m -Dgwt.nowarn.legacy.tools"/>
 </launchConfiguration>

pom.xml

@@ -84,47 +84,47 @@
 			<artifactId>gwt-user</artifactId>
 		</dependency>
 
-		<dependency>
-			<groupId>javax.validation</groupId>
-			<artifactId>validation-api</artifactId>
-			<version>1.0.0.GA</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>javax.validation</groupId>
-			<artifactId>validation-api</artifactId>
-			<version>1.0.0.GA</version>
-			<classifier>sources</classifier>
-			<scope>test</scope>
-		</dependency>
-
-
-
+		<!-- GXT 3 -->
 		<dependency>
 			<groupId>com.sencha.gxt</groupId>
 			<artifactId>gxt</artifactId>
 			<version>3.0.1</version>
-			<scope>provided</scope>
 		</dependency>
-		
-		
+
 		<!-- Portal -->
 		<dependency>
 			<groupId>org.gcube.core</groupId>
 			<artifactId>common-scope-maps</artifactId>
+			<version>[1.0.2-SNAPSHOT,2.0.0-SNAPSHOT)</version>
+			<scope>compile</scope>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.gcube.portal</groupId>
 			<artifactId>custom-portal-handler</artifactId>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.gcube.applicationsupportlayer</groupId>
 			<artifactId>aslcore</artifactId>
 		</dependency>
-		
-		
+
+		<dependency>
+			<groupId>org.gcube.applicationsupportlayer</groupId>
+			<artifactId>accesslogger</artifactId>
+		</dependency>
+
+
+
+		<!-- Service Client -->
+		<dependency>
+			<groupId>org.gcube.data.analysis.tabulardata</groupId>
+			<artifactId>service-client-impl</artifactId>
+			<version>[2.0.0-SNAPSHOT,3.0.0-SNAPSHOT)</version>
+			<scope>provided</scope>
+		</dependency>
+
+
 
 		<!-- tabular-data-gwt-service -->
 		<dependency>
@@ -141,15 +141,15 @@
 			<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
 			<scope>provided</scope>
 		</dependency>
-		
-		
+
+
 		<!-- TDX Source -->
 		<dependency>
 			<groupId>org.gcube.portlets.user</groupId>
 			<artifactId>tabular-data-widgetx-tdx-source</artifactId>
 			<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
 		</dependency>
-		
+
 
 		<!-- tabular-data-monitor-widget -->
 		<dependency>
@@ -159,7 +159,7 @@
 			<scope>provided</scope>
 		</dependency>
 
-	
+
 		<!-- tabular-data-resources-widget -->
 		<dependency>
 			<groupId>org.gcube.portlets.user</groupId>
@@ -168,7 +168,7 @@
 			<scope>provided</scope>
 		</dependency>
 
-	
+
 		<!-- LOGGING -->
 		<dependency>
 			<groupId>com.allen-sauer.gwt.log</groupId>
@@ -199,6 +199,16 @@
 	<build>
 		<!-- Generate compiled stuff in the folder used for developing mode -->
 		<outputDirectory>${webappDirectory}/WEB-INF/classes</outputDirectory>
+		<resources>
+			<resource>
+				<directory>src/main/resources</directory>
+				<includes>
+					<include>**/*.*</include>
+				</includes>
+			</resource>
+
+		</resources>
+
 
 		<plugins>
 			<plugin>
@@ -228,6 +238,7 @@
 				<executions>
 					<execution>
 						<goals>
+							<goal>compile</goal>
 							<!-- <goal>test</goal> -->
 							<goal>resources</goal>
 						</goals>

src/main/java/org/gcube/portlets/user/td/mainboxwidget/MainBox.gwt.xml

@@ -3,30 +3,30 @@
 	<!-- Inherit the core Web Toolkit stuff. -->
 	<inherits name='com.google.gwt.user.User' />
 
-	<!-- We need the JUnit module in the main module, -->
-	<!-- otherwise eclipse complains (Google plugin bug?) -->
-	<inherits name='com.google.gwt.junit.JUnit' />
-
-	<!-- Inherit the default GWT style sheet. You can change -->
-	<!-- the theme of your GWT application by uncommenting -->
-	<!-- any one of the following lines. -->
-	<inherits name='com.google.gwt.user.theme.standard.Standard' />
-	<!-- <inherits name='com.google.gwt.user.theme.chrome.Chrome'/> -->
-	<!-- <inherits name='com.google.gwt.user.theme.dark.Dark'/> -->
-
 	<!-- Other module inherits -->
 	<inherits name='com.sencha.gxt.ui.GXT' />
 	<!-- <inherits name="com.extjs.gxt.ui.GXT" /> -->
 	<inherits name="com.allen_sauer.gwt.log.gwt-log-TRACE" />
+	
+	<!-- We need the JUnit module in the main module, -->
+	<!-- otherwise eclipse complains (Google plugin bug?) -->
+	<inherits name='com.google.gwt.junit.JUnit' />
+	
 
+	<inherits name="org.gcube.portlets.user.tdwx.TabularDataWidgetX" />
 	<inherits
 		name='org.gcube.portlets.user.td.widgetcommonevent.WidgetCommonEvent' />
+	
+	
 	<inherits name='org.gcube.portlets.user.td.monitorwidget.MonitorWidgetTD' />
 	<inherits name='org.gcube.portlets.user.td.resourceswidget.ResourcesWidget' />
 
+
+
+
 	<!-- Specify the app entry point class. -->
-	<!-- <entry-point class='org.gcube.portlets.user.td.mainboxwidget.client.MainBoxEntry' 
-		/> -->
+	<entry-point class='org.gcube.portlets.user.td.mainboxwidget.client.MainBoxEntry' 
+		/> 
 
 	<!-- Specify the paths for translatable code -->
 	<source path='client' />

src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/MainBox.java

@@ -2,16 +2,20 @@ package org.gcube.portlets.user.td.mainboxwidget.client;
 
 import java.util.ArrayList;
 
+import org.gcube.portlets.user.td.mainboxwidget.client.resources.MainboxResources;
 import org.gcube.portlets.user.td.mainboxwidget.client.tdx.TDXPanel;
+import org.gcube.portlets.user.td.mainboxwidget.client.welcome.WelcomePanel;
 import org.gcube.portlets.user.td.widgetcommonevent.client.event.DataViewActiveEvent;
 import org.gcube.portlets.user.td.widgetcommonevent.shared.dataview.DataView;
 import org.gcube.portlets.user.td.widgetcommonevent.shared.dataview.TabularResourceDataView;
 
 import com.allen_sauer.gwt.log.client.Log;
+import com.google.gwt.core.client.GWT;
 import com.google.gwt.event.logical.shared.SelectionEvent;
 import com.google.gwt.event.logical.shared.SelectionHandler;
 import com.google.gwt.user.client.ui.Widget;
 import com.google.web.bindery.event.shared.EventBus;
+import com.sencha.gxt.theme.blue.client.tabs.BlueTabPanelBottomAppearance;
 import com.sencha.gxt.widget.core.client.TabItemConfig;
 import com.sencha.gxt.widget.core.client.TabPanel;
 import com.sencha.gxt.widget.core.client.event.BeforeCloseEvent;
@@ -30,7 +34,7 @@ public class MainBox extends TabPanel {
 	protected ArrayList<TDXPanel> tdxPanelList;
 
 	public MainBox(String name, EventBus eventBus, MainBoxPanel mainBoxPanel) {
-		super();
+		super(GWT.<TabPanelAppearance> create(BlueTabPanelBottomAppearance.class));
 		Log.debug("Create MainBox");
 		setId(name);
 		this.eventBus = eventBus;
@@ -41,11 +45,16 @@ public class MainBox extends TabPanel {
 	}
 	
 	protected void init(){
+		
 		setBodyBorder(false);
 		setBorders(false);
 		setAnimScroll(true);
 		setTabScroll(true);
 		setCloseContextMenu(true);
+		setResizeTabs(true);
+		//setTabWidth(Integer.MAX_VALUE);
+		setMinTabWidth(20);
+		//setResizeTabs(true);
 
 		tdxPanelList = new ArrayList<TDXPanel>();
 		// setResizeTabs(true);
@@ -62,13 +71,16 @@ public class MainBox extends TabPanel {
 				} else {
 					
 				}
+				forceLayout();
+			
 			}
 		});
 	}
 
 	public void startTabs() {
 		Log.debug("Start MainBox Tabs");
-
+		//addWelcomeTab();
+		//setActiveWidget(getWidget(0));
 	}
 
 	public void openTDXTab(DataView dataView) {
@@ -140,12 +152,15 @@ public class MainBox extends TabPanel {
 
 		TabItemConfig tdxPanelItemConf = new TabItemConfig(
 				tabularResourceDataView.getTrId().getId(), true);
-
+		tdxPanelItemConf.setIcon(MainboxResources.INSTANCE.tabularResource());
 		final TDXPanel tdxPanel = new TDXPanel(eventBus);
 		tdxPanel.open(tabularResourceDataView);
 		tdxPanelList.add(tdxPanel);
+		
 		add(tdxPanel, tdxPanelItemConf);
 		
+		
+		
 		addBeforeCloseHandler(new BeforeCloseHandler<Widget>() {
 
 			public void onBeforeClose(BeforeCloseEvent<Widget> event) {
@@ -159,5 +174,32 @@ public class MainBox extends TabPanel {
 		});
 		setActiveWidget(tdxPanel);
 	};
+	
+	protected void addWelcomeTab() {
+		
+		
+		
+		TabItemConfig welcomeItemConf = new TabItemConfig(
+				"Welcome", false);
+
+		final WelcomePanel welcomePanel = new WelcomePanel(eventBus);
+		
+		add(welcomePanel, welcomeItemConf);
+		
+		
+		
+		addBeforeCloseHandler(new BeforeCloseHandler<Widget>() {
+
+			public void onBeforeClose(BeforeCloseEvent<Widget> event) {
+				if (welcomePanel == event.getItem()) {
+					remove(welcomePanel);
+					tdxPanelList.remove(welcomePanel);
+				}
+
+			}
+
+		});
+		setActiveWidget(welcomePanel);
+	};
 
 }

src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/MainBoxEntry.java

@@ -11,9 +11,12 @@ import com.google.gwt.user.client.rpc.AsyncCallback;
 import com.google.gwt.user.client.ui.RootPanel;
 import com.google.web.bindery.event.shared.EventBus;
 import com.google.web.bindery.event.shared.SimpleEventBus;
+import com.sencha.gxt.widget.core.client.container.Viewport;
 
 public class MainBoxEntry implements EntryPoint {
-
+	protected static final String JSP_TAG_ID = "tdp";
+	
+	
 	public void onModuleLoad() {
 
 		TabularDataServiceAsync.INSTANCE.hello(new AsyncCallback<String>() {
@@ -35,24 +38,65 @@ public class MainBoxEntry implements EntryPoint {
 
 	protected void loadDataView() {
 		// For example Tabular Resource 7 and table 402
-		TRId trId = new TRId("220", "3555");
+		TRId trId1 = new TRId("220", "3555");
+		TRId trId2 = new TRId("219", "3507");
+		TRId trId3 = new TRId("168", "2165");
 
 		EventBus eventBus = new SimpleEventBus();
 
 		try {
 			MainBoxPanel mainBoxPanel = new MainBoxPanel("MainBoxPanel",
 					eventBus);
+			
+			startInDevMode(mainBoxPanel);
+			
 
-			RootPanel.get().add(mainBoxPanel);
+			UIStateEvent uiStateEvent1 = new UIStateEvent(UIStateType.TR_OPEN);
+			uiStateEvent1.setTrId(trId1);
+			eventBus.fireEvent(uiStateEvent1);
 
-			UIStateEvent uiStateEvent = new UIStateEvent(UIStateType.TR_OPEN);
-			uiStateEvent.setTrId(trId);
-			eventBus.fireEvent(uiStateEvent);
+			UIStateEvent uiStateEvent2 = new UIStateEvent(UIStateType.TR_OPEN);
+			uiStateEvent2.setTrId(trId2);
+			eventBus.fireEvent(uiStateEvent2);
+
+			UIStateEvent uiStateEvent3 = new UIStateEvent(UIStateType.TR_OPEN);
+			uiStateEvent3.setTrId(trId3);
+			eventBus.fireEvent(uiStateEvent3);
 
 			Log.info("MainBoxPanel Added:" + mainBoxPanel);
 		} catch (Throwable e) {
 			e.printStackTrace();
 		}
 	}
-
+	
+	protected void startInDevMode(MainBoxPanel mainWidget) {
+		try {
+			RootPanel root = RootPanel.get(JSP_TAG_ID);
+			Log.info("Root Panel: " + root);
+			if (root == null) {
+				Log.info("Div with id " + JSP_TAG_ID
+						+ " not found, starting in dev mode");
+				Viewport viewport = new Viewport();
+				viewport.setWidget(mainWidget);
+				viewport.onResize();
+				RootPanel.get().add(viewport);
+			} else {
+				Log.info("Application div with id " + JSP_TAG_ID
+						+ " found, starting in portal mode");
+				/*PortalViewport viewport = new PortalViewport();
+				Log.info("Created Viewport");
+				viewport.setEnableScroll(false);
+				viewport.setWidget(mainWidget);
+				Log.info("Set Widget");
+				Log.info("getOffsetWidth(): " + viewport.getOffsetWidth());
+				Log.info("getOffsetHeight(): " + viewport.getOffsetHeight());
+				viewport.onResize();
+				root.add(viewport);
+				Log.info("Added viewport to root");*/
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+			Log.error("Error in attach viewport:" + e.getLocalizedMessage());
+		}
+	}
 }

src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/MainBoxPanel.java

@@ -26,15 +26,16 @@ public class MainBoxPanel extends ContentPanel {
 		this.eventBus = eventBus;
 		setId(name);
 		setHeaderVisible(false);
-		setResize(true);
 		setBodyBorder(false);
 		setBorders(false);
-		forceLayoutOnResize = true;
+		setResize(true);
+		forceLayoutOnResize=true;
 		mainBox = new MainBox("MainBox", eventBus, this);
 		add(mainBox);
 		startPanel();
 		bindToEvents();
-
+		onResize();
+		
 	}
 
 	protected void bindToEvents() {

src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/grid/GridContextMenu.java

@@ -2,7 +2,7 @@ package org.gcube.portlets.user.td.mainboxwidget.client.grid;
 
 import java.util.ArrayList;
 
-import org.gcube.portlets.user.td.mainboxwidget.client.resource.MainboxResources;
+import org.gcube.portlets.user.td.mainboxwidget.client.resources.MainboxResources;
 import org.gcube.portlets.user.td.widgetcommonevent.client.event.GridContextMenuItemEvent;
 import org.gcube.portlets.user.td.widgetcommonevent.shared.CellData;
 import org.gcube.portlets.user.td.widgetcommonevent.shared.GridOperationId;

src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/grid/GridHeaderColumnMenu.java

@@ -3,7 +3,7 @@ package org.gcube.portlets.user.td.mainboxwidget.client.grid;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.gcube.portlets.user.td.mainboxwidget.client.resource.MainboxResources;
+import org.gcube.portlets.user.td.mainboxwidget.client.resources.MainboxResources;
 import org.gcube.portlets.user.td.widgetcommonevent.shared.GridHeaderOperationId;
 
 import com.sencha.gxt.widget.core.client.menu.MenuItem;

src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/resources/MainboxResources.java

@@ -1,7 +1,7 @@
 /**
  * 
  */
-package org.gcube.portlets.user.td.mainboxwidget.client.resource;
+package org.gcube.portlets.user.td.mainboxwidget.client.resources;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.resources.client.ClientBundle;
@@ -103,4 +103,10 @@ public interface MainboxResources extends ClientBundle {
 	@Source("column-replace-by-expression.png")
 	ImageResource columnReplaceByExpression();
 
+	@Source("page-white_32.png")
+	ImageResource tabularResource32();
+
+	@Source("page-white.png")
+	ImageResource tabularResource();
+	
 }

src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/tdx/TDXPanel.java

@@ -14,10 +14,18 @@ import com.allen_sauer.gwt.log.client.Log;
 import com.google.web.bindery.event.shared.EventBus;
 import com.sencha.gxt.core.client.Style.SelectionMode;
 import com.sencha.gxt.widget.core.client.FramedPanel;
+import com.sencha.gxt.widget.core.client.container.MarginData;
 import com.sencha.gxt.widget.core.client.info.Info;
 
+/**
+ * 
+ * @author giancarlo email: <a
+ *         href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
+ *
+ */
 public class TDXPanel extends FramedPanel {
 
+	// private static final String HEIGHT = "600px";
 	protected EventBus eventBus;
 	protected TabularResourceDataView tabularResourceDataView;
 	protected TabularDataX tabularData;
@@ -25,17 +33,23 @@ public class TDXPanel extends FramedPanel {
 	public TDXPanel(EventBus eventBus) {
 		super();
 		this.eventBus = eventBus;
-		forceLayoutOnResize = true;
-		setBodyBorder(false);
-		setBorders(false);
-		setHeaderVisible(false);
-		// setWidth(500);
-		// setHeight(500);
+		init();
 		addGrid();
 		forceLayout();
 	}
 
-	public void addGrid() {
+	protected void init() {
+		// setWidth(WIDTH);
+		// setHeight(HEIGHT);
+		setHeaderVisible(false);
+		setBodyBorder(false);
+		setBorders(false);
+		setResize(true);
+		forceLayoutOnResize = true;
+	}
+
+	protected void addGrid() {
+
 		try {
 			tabularData = new TabularDataX(Constants.TDX_DATASOURCE_FACTORY_ID);
 			tabularData.addFailureHandler(new FailureEventHandler() {
@@ -51,7 +65,6 @@ public class TDXPanel extends FramedPanel {
 
 			// Grid Panel
 			TabularDataXGridPanel gridPanel = tabularData.getGridPanel();
-			gridPanel.setHeaderVisible(false);
 
 			GridHeaderColumnMenu columnHeaderMenu = new GridHeaderColumnMenu();
 			gridPanel.addGridHeaderContextMenuItems(columnHeaderMenu.getMenu(),
@@ -63,7 +76,7 @@ public class TDXPanel extends FramedPanel {
 
 			gridPanel.setSelectionModel(SelectionMode.MULTI);
 
-			this.add(gridPanel);
+			add(gridPanel, new MarginData());
 
 		} catch (Throwable e) {
 			e.printStackTrace();

src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/welcome/WelcomePanel.java

@@ -0,0 +1,50 @@
+package org.gcube.portlets.user.td.mainboxwidget.client.welcome;
+
+import org.gcube.portlets.user.td.widgetcommonevent.shared.dataview.TabularResourceDataView;
+import org.gcube.portlets.user.tdwx.client.TabularDataX;
+
+import com.google.gwt.user.client.ui.HTML;
+import com.google.web.bindery.event.shared.EventBus;
+import com.sencha.gxt.widget.core.client.FramedPanel;
+import com.sencha.gxt.widget.core.client.container.MarginData;
+
+public class WelcomePanel extends FramedPanel {
+	
+	protected EventBus eventBus;
+	protected TabularResourceDataView tabularResourceDataView;
+	protected TabularDataX tabularData;
+
+	public WelcomePanel(EventBus eventBus) {
+		super();
+		this.eventBus = eventBus;
+		init();
+		addWelcomeMessage();
+
+		forceLayout();
+	}
+	
+	protected void init(){
+		setHeaderVisible(false);
+		setBodyBorder(false);
+		setResize(true);
+		forceLayoutOnResize=true;
+	}
+
+	protected void addWelcomeMessage() {
+		try {
+			HTML welcome=new HTML("You Are Welcome!");
+		
+			
+			
+			add(welcome,new MarginData());
+			
+			
+
+		} catch (Throwable e) {
+			e.printStackTrace();
+		}
+	}
+
+
+
+}

src/main/resources/FARM.gcubekey

@@ -0,0 +1 @@
+<	ｬ@Qaj､F÷gｸ<67>

src/main/resources/devNext.gcubekey

@@ -0,0 +1 @@
+<	ｬ@Qaj､F÷gｸ<67>

src/main/resources/devsec.gcubekey

@@ -0,0 +1 @@
+<	ｬ@Qaj､F÷gｸ<67>

src/main/resources/gCubeApps.gcubekey

@@ -0,0 +1 @@
+<	ｬ@Qaj､F÷gｸ<67>

src/main/resources/gcube.gcubekey

@@ -0,0 +1 @@
+<	ｬ@Qaj､F÷gｸ<67>

src/main/resources/howto.txt

@@ -0,0 +1,6 @@
+You should put the infrastructure decrypt keys here. 
+
+the keys must be in named "<scope name>.gcubekey", e.g. "gcube.gcubekey" or "devsec.gcubekey"
+
+The content of this folder is automatically loaded in the classpath when tomcat starts up.
+

src/main/resources/org/gcube/portlets/user/td/mainboxwidget/MainBox.gwt.xml

@@ -3,25 +3,19 @@
 	<!-- Inherit the core Web Toolkit stuff. -->
 	<inherits name='com.google.gwt.user.User' />
 
+	<!-- Other module inherits -->
+	<inherits name='com.sencha.gxt.ui.GXT' />
+	<!-- <inherits name="com.extjs.gxt.ui.GXT" /> -->	  
+	<inherits name="com.allen_sauer.gwt.log.gwt-log-TRACE" />
+	
 	<!-- We need the JUnit module in the main module, -->
 	<!-- otherwise eclipse complains (Google plugin bug?) -->
 	<inherits name='com.google.gwt.junit.JUnit' />
+	
 
-	<!-- Inherit the default GWT style sheet. You can change -->
-	<!-- the theme of your GWT application by uncommenting -->
-	<!-- any one of the following lines. -->
-	<inherits name='com.google.gwt.user.theme.standard.Standard' />
-	<!-- <inherits name='com.google.gwt.user.theme.chrome.Chrome'/> -->
-	<!-- <inherits name='com.google.gwt.user.theme.dark.Dark'/> -->
-
-	<!-- Other module inherits -->
-	<inherits name='com.sencha.gxt.ui.GXT' />
-	<!-- <inherits name="com.extjs.gxt.ui.GXT" /> -->
-	<inherits name="com.allen_sauer.gwt.log.gwt-log-TRACE" />
-
+	<inherits name="org.gcube.portlets.user.tdwx.TabularDataWidgetX" />
 	<inherits
 		name='org.gcube.portlets.user.td.widgetcommonevent.WidgetCommonEvent' />
-	<inherits name="org.gcube.portlets.user.tdwx.TabularDataWidgetX" />
 	
 	
 	<inherits name='org.gcube.portlets.user.td.monitorwidget.MonitorWidgetTD' />

src/main/resources/symm.key

@@ -0,0 +1 @@
+<	ｬ@Qaj､F÷gｸ<67>

src/main/webapp/MainBox.html

@@ -12,6 +12,8 @@
     <!--                                                               -->
     <!-- Consider inlining CSS to reduce the number of requested files -->
     <!--                                                               -->
+    <link rel="stylesheet" type="text/css" href="MainBox/reset.css" />
+    <link rel="stylesheet" type="text/css" href="gxt/css/gxt-all.css" />
     <link type="text/css" rel="stylesheet" href="MainBox.css">
 
     <!--                                           -->

src/main/webapp/WEB-INF/web.xml

@@ -5,21 +5,21 @@
 
 <web-app>
 
-    <!-- Servlets -->
+	<!-- Servlets -->
 	<servlet>
 		<servlet-name>jUnitHostImpl</servlet-name>
 		<servlet-class>com.google.gwt.junit.server.JUnitHostImpl</servlet-class>
 	</servlet>
-	
+
 	<!-- Base Service -->
 	<servlet>
 		<servlet-name>tdservlet</servlet-name>
 		<servlet-class>org.gcube.portlets.user.td.mainboxwidget.server.TabularDataServiceImpl</servlet-class>
 		<load-on-startup>1</load-on-startup>
 	</servlet>
-	
-	
-	
+
+
+
 	<!-- TDWidget -->
 	<servlet>
 		<servlet-name>tdwxService</servlet-name>
@@ -30,21 +30,21 @@
 		<servlet-name>tdwxServlet</servlet-name>
 		<servlet-class>org.gcube.portlets.user.tdwx.server.TabularDataXServlet</servlet-class>
 	</servlet>
-	
+
 	<!-- Servlets Mapping -->
 	<!-- JUnit -->
 	<servlet-mapping>
 		<servlet-name>jUnitHostImpl</servlet-name>
-		<url-pattern>TDMainBoxManagerWidgets/junithost/*</url-pattern>
+		<url-pattern>/MainBox/junithost/*</url-pattern>
 	</servlet-mapping>
-	
+
 	<!-- Base Service -->
 	<servlet-mapping>
 		<servlet-name>tdservlet</servlet-name>
 		<url-pattern>/MainBox/tds</url-pattern>
 	</servlet-mapping>
-	
-	
+
+
 	<!-- TDWidget -->
 	<servlet-mapping>
 		<servlet-name>tdwxService</servlet-name>
@@ -56,9 +56,9 @@
 		<url-pattern>/MainBox/tdwxdata</url-pattern>
 	</servlet-mapping>
 
-  <!-- Default page to serve -->
-  <welcome-file-list>
-    <welcome-file>MainBox.html</welcome-file>
-  </welcome-file-list>
+	<!-- Default page to serve -->
+	<welcome-file-list>
+		<welcome-file>MainBox.html</welcome-file>
+	</welcome-file-list>
 
 </web-app>