Minor Update

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

src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java

@@ -5,6 +5,7 @@ package org.gcube.portlets.user.td.client;
 
 import java.util.ArrayList;
 
+import org.gcube.portlets.user.td.client.logs.TDMLogs;
 import org.gcube.portlets.user.td.client.template.TemplateApplyDialog;
 import org.gcube.portlets.user.td.client.template.TemplateDeleteDialog;
 import org.gcube.portlets.user.td.client.template.TemplateOpenDialog;
@@ -38,6 +39,7 @@ import org.gcube.portlets.user.td.widgetcommonevent.client.event.TasksMonitorEve
 import org.gcube.portlets.user.td.widgetcommonevent.client.event.UIStateEvent;
 import org.gcube.portlets.user.td.widgetcommonevent.client.event.WidgetRequestEvent;
 import org.gcube.portlets.user.td.widgetcommonevent.client.type.RibbonType;
+import org.gcube.portlets.user.td.widgetcommonevent.client.type.SessionExpiredType;
 import org.gcube.portlets.user.td.widgetcommonevent.client.type.TaskType;
 import org.gcube.portlets.user.td.widgetcommonevent.client.type.UIStateType;
 import org.gcube.portlets.user.td.widgetcommonevent.client.type.WidgetRequestType;
@@ -67,7 +69,6 @@ import com.sencha.gxt.widget.core.client.box.ConfirmMessageBox;
 import com.sencha.gxt.widget.core.client.container.BorderLayoutContainer.BorderLayoutData;
 import com.sencha.gxt.widget.core.client.event.HideEvent;
 import com.sencha.gxt.widget.core.client.event.HideEvent.HideHandler;
-import com.sencha.gxt.widget.core.client.info.Info;
 
 //import org.gcube.portlets.user.tdtemplate.client.TdTemplateController;
 
@@ -477,6 +478,9 @@ public class TabularDataController {
 				break;
 			case HELP:
 				break;
+			case LOGS:
+				openLogsWindow();
+				break;
 			case RULENEW:
 				break;
 			case RULEMANAGE:
@@ -629,6 +633,12 @@ public class TabularDataController {
 		}
 	}
 	
+	protected void openLogsWindow(){
+		Log.debug("Request Open Logs Window");
+		TDMLogs tdmLogs=new TDMLogs(eventBus);
+		tdmLogs.show();
+	}
+	
 	protected void openBatchReplace(TRId trId, RequestProperties requestProperties){
 		Log.debug("Request Open Batch Replace Dialog: "+trId+" "+requestProperties);
 		if (trId != null) {
@@ -983,6 +993,8 @@ public class TabularDataController {
 		TRShare trShare = new TRShare(trId, eventBus);
 	}
 
+	
+	
 	protected void callDiscard() {
 		HistoryDiscard historyDiscard = new HistoryDiscard(eventBus);
 		historyDiscard.discard();
@@ -1416,28 +1428,10 @@ public class TabularDataController {
 
 	protected void asyncCodeLoadingFailed(Throwable reason) {
 		Log.error("Async code loading failed", reason);
-		Info.display("Async code loading failed",
+		eventBus.fireEvent(new SessionExpiredEvent(
-				"Please retry to call the operation.");
+				SessionExpiredType.EXPIREDONSERVER));
+		
 	}
 
-	/**
+	
-	 * {@inheritDoc}
-	 * 
-	 * @Override public HandlerRegistration addCloseHandler(CloseHandler<Long>
-	 *           handler) { //return eventBus.addHandler(CloseEvent.getType(),
-	 *           handler); }
-	 * 
-	 *           /** {@inheritDoc}
-	 * @Override public HandlerRegistration addOpenHandler(OpenHandler<Long>
-	 *           handler) { //return eventBus.addHandler(OpenEvent.getType(),
-	 *           handler); }
-	 */
-
-	/**
-	 * {@inheritDoc}
-	 * 
-	 * @Override public void fireEvent(GwtEvent<?> event) {
-	 *           eventBus.fireEvent(event); }
-	 */
-
 }

src/main/java/org/gcube/portlets/user/td/client/logs/TDMLogs.java

@@ -0,0 +1,177 @@
+package org.gcube.portlets.user.td.client.logs;
+
+import org.gcube.portlets.user.td.client.resource.TabularDataResources;
+import org.gcube.portlets.user.td.informationwidget.client.util.UtilsGXT3;
+import org.gcube.portlets.user.td.widgetcommonevent.client.event.SessionExpiredEvent;
+import org.gcube.portlets.user.td.widgetcommonevent.client.type.SessionExpiredType;
+
+import com.allen_sauer.gwt.log.client.Log;
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.http.client.Request;
+import com.google.gwt.http.client.RequestBuilder;
+import com.google.gwt.http.client.RequestCallback;
+import com.google.gwt.http.client.RequestException;
+import com.google.gwt.http.client.Response;
+import com.google.gwt.safehtml.shared.SafeHtml;
+import com.google.gwt.safehtml.shared.SafeHtmlBuilder;
+import com.google.gwt.user.client.ui.HTML;
+import com.google.web.bindery.event.shared.EventBus;
+import com.sencha.gxt.core.client.dom.ScrollSupport.ScrollMode;
+import com.sencha.gxt.core.client.util.Margins;
+import com.sencha.gxt.widget.core.client.FramedPanel;
+import com.sencha.gxt.widget.core.client.Window;
+import com.sencha.gxt.widget.core.client.button.TextButton;
+import com.sencha.gxt.widget.core.client.container.SimpleContainer;
+import com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer;
+import com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer.VerticalLayoutData;
+import com.sencha.gxt.widget.core.client.event.SelectEvent;
+import com.sencha.gxt.widget.core.client.event.SelectEvent.SelectHandler;
+import com.sencha.gxt.widget.core.client.toolbar.ToolBar;
+
+public class TDMLogs extends Window {
+	protected static final String TDMLogsServlet = "TDLogsServlet";
+	protected static final String WIDTH="500px";
+	protected static final String HEIGHT="500px";
+	protected EventBus eventBus;
+	protected VerticalLayoutContainer verticalContainer;
+	
+	public TDMLogs(EventBus eventBus){
+		super();
+		this.eventBus=eventBus;
+		init();
+		createLogsPanel();
+		callLogsServlet();
+	}
+	
+	public void init(){
+		setWidth("640px");
+		setHeight(HEIGHT);
+		setHeadingText("TDM Logs");
+		setBodyBorder(false);
+		setClosable(true);
+		
+	}
+	
+	protected void createLogsPanel() {
+		FramedPanel logsPanel=new FramedPanel();
+		logsPanel.setBodyBorder(false);
+		logsPanel.setHeaderVisible(false);
+		
+		ToolBar toolBar = new ToolBar();
+		TextButton btnReload = new TextButton();
+		// btnReload.setText("Reload");
+		btnReload.addSelectHandler(new SelectHandler() {
+			
+			@Override
+			public void onSelect(SelectEvent event) {
+				callLogsServlet();
+			}
+		});
+		
+		btnReload.setIcon(TabularDataResources.INSTANCE.refresh());
+		btnReload.setToolTip("Reload");
+		toolBar.add(btnReload);
+		
+		
+		SimpleContainer contentLogs = new SimpleContainer();
+		contentLogs.setBorders(false);
+		
+		verticalContainer = new VerticalLayoutContainer();
+		verticalContainer.setScrollMode(ScrollMode.AUTO);
+		verticalContainer.getElement().getStyle().setBackgroundColor("white");
+		
+		contentLogs.add(verticalContainer);
+		
+		VerticalLayoutContainer logsPanelLayout=new VerticalLayoutContainer();
+		
+		logsPanelLayout.add(toolBar, new VerticalLayoutData(-1,-1,new Margins(1)));
+		logsPanelLayout.add(contentLogs, new VerticalLayoutData(-1,-1,new Margins(1)));
+		
+		logsPanel.add(logsPanelLayout);
+		add(logsPanel);
+		
+	}
+	
+		
+	
+	public void callLogsServlet() {
+		String path = GWT.getModuleBaseURL() + TDMLogsServlet;
+		Log.debug("TDMLogsServlet path:" + path);
+		RequestBuilder builder = new RequestBuilder(RequestBuilder.GET, path);
+
+		try {
+			builder.sendRequest(null, new RequestCallback() {
+
+				public void onError(Request request, Throwable exception) {
+					Log.error("Error retrienving logs. "
+							+ exception.getLocalizedMessage());
+					exception.printStackTrace();
+					UtilsGXT3.alert("Logs", "Error retrienving logs");
+					close();
+				}
+
+				public void onResponseReceived(Request request,
+						Response response) {
+					if (Response.SC_OK == response.getStatusCode()) {
+						update(response.getText());
+					} else {
+						if (408 == response.getStatusCode()) {
+							Log.error("Error retrienving logs. Session expired.");
+							eventBus.fireEvent(new SessionExpiredEvent(
+										SessionExpiredType.EXPIREDONSERVER));
+						} else {
+							Log.error("Error retrienving logs. Response StatusCode: "
+									+ response.getStatusCode());
+							UtilsGXT3.alert("Logs", "Error retrienving logs");
+						}
+						close();
+					}
+				}
+			});
+		} catch (RequestException e) {
+			close();
+			Log.error("Error retrienving logs. " + e.getLocalizedMessage());
+			e.printStackTrace();
+			UtilsGXT3.alert("Logs", "Error retrienving logs");
+
+		}
+	}
+
+	
+	
+	protected void update(String text){
+		verticalContainer.clear();
+	
+		SafeHtmlBuilder builderLogs = new SafeHtmlBuilder();
+		builderLogs.appendEscapedLines(text);
+		SafeHtml safeLogs = builderLogs.toSafeHtml();
+		HTML hLogs = new HTML(safeLogs);
+
+		verticalContainer.add(hLogs, new VerticalLayoutData(-1,-1,new Margins(1)));
+		verticalContainer.forceLayout();
+	}
+	
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected void initTools() {
+		super.initTools();
+
+		closeBtn.addSelectHandler(new SelectHandler() {
+
+			public void onSelect(SelectEvent event) {
+				close();
+			}
+		});
+
+	}
+	
+	/**
+	 * 
+	 */
+	protected void close() {
+		hide();
+	}
+}

src/main/java/org/gcube/portlets/user/td/client/ribbon/FileToolBar.java

@@ -67,6 +67,7 @@ public class FileToolBar {
 	//protected TextButton discardAllButton;
 
 	protected TextButton helpButton;
+	protected TextButton logsButton;
 	
 
 	public FileToolBar(EventBus eventBus) {
@@ -113,25 +114,7 @@ public class FileToolBar {
 		fileLayout.getFlexCellFormatter().setRowSpan(0, 0, 2);
 		
 		
-		cloneButton = new TextButton("Clone",
+		
-				TabularDataResources.INSTANCE.clone32());
-		cloneButton.disable();
-		cloneButton.setId("cloneButton");
-		cloneButton.setScale(ButtonScale.LARGE);
-		cloneButton.setIconAlign(IconAlign.TOP);
-		cloneButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
-		cloneButton.setToolTip("Clone Tabular Resource");
-
-		cloneButton.addSelectHandler(new SelectHandler() {
-
-			public void onSelect(SelectEvent event) {
-				eventBus.fireEvent(new RibbonEvent(RibbonType.CLONE));
-			}
-		});
-
-		fileLayout.setWidget(0, 1, cloneButton);
-		fileLayout.getFlexCellFormatter().setRowSpan(0, 1, 2);
-
 		
 		closeButton = new TextButton("Close",
 				TabularDataResources.INSTANCE.close32());
@@ -149,9 +132,30 @@ public class FileToolBar {
 			}
 		});
 
-		fileLayout.setWidget(0, 2, closeButton);
+		fileLayout.setWidget(0, 1, closeButton);
+		fileLayout.getFlexCellFormatter().setRowSpan(0, 1, 2);
+		
+		
+		cloneButton = new TextButton("Clone",
+				TabularDataResources.INSTANCE.clone32());
+		cloneButton.disable();
+		cloneButton.setId("cloneButton");
+		cloneButton.setScale(ButtonScale.LARGE);
+		cloneButton.setIconAlign(IconAlign.TOP);
+		cloneButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
+		cloneButton.setToolTip("Clone Tabular Resource");
+
+		cloneButton.addSelectHandler(new SelectHandler() {
+
+			public void onSelect(SelectEvent event) {
+				eventBus.fireEvent(new RibbonEvent(RibbonType.CLONE));
+			}
+		});
+
+		fileLayout.setWidget(0, 2, cloneButton);
 		fileLayout.getFlexCellFormatter().setRowSpan(0, 2, 2);
 
+
 		deleteButton = new TextButton("Delete",
 				TabularDataResources.INSTANCE.delete());
 		deleteButton.disable();
@@ -496,6 +500,26 @@ public class FileToolBar {
 
 		helpLayout.setWidget(0, 0, helpButton);
 		helpLayout.getFlexCellFormatter().setRowSpan(0, 0, 2);
+		
+		
+		logsButton = new TextButton("Logs",
+				TabularDataResources.INSTANCE.help32());
+		logsButton.enable();
+		logsButton.setToolTip("Show Logs");
+		logsButton.setScale(ButtonScale.LARGE);
+		logsButton.setIconAlign(IconAlign.TOP);
+		logsButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
+		logsButton.addSelectHandler(new SelectHandler() {
+
+			public void onSelect(SelectEvent event) {
+				eventBus.fireEvent(new RibbonEvent(RibbonType.LOGS));
+			}
+		});
+
+		helpLayout.setWidget(0, 1, logsButton);
+		helpLayout.getFlexCellFormatter().setRowSpan(0, 1, 2);
+		
+		
 		cleanCells(helpLayout.getElement());
 
 		eventBus.addHandler(UIStateEvent.TYPE,

src/main/webapp/WEB-INF/classes/log4j_properties_sample

@@ -0,0 +1,19 @@
+log4j.rootCategory=TRACE, FILE, CONSOLE
+
+# Direct log messages to a log file
+log4j.appender.FILE=org.apache.log4j.RollingFileAppender
+#Redirect to Tomcat logs folder
+#log4j.appender.FILE.File=C:\\logging.log
+log4j.appender.FILE.File=${catalina.home}/webapps/tabular-data-portlet/logs/TabularDataManagerLog4j.log
+log4j.appender.FILE.MaxFileSize=10MB
+log4j.appender.FILE.MaxBackupIndex=10
+log4j.appender.FILE.layout=org.apache.log4j.PatternLayout
+log4j.appender.FILE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}:%L] %m%n
+
+# Console log
+log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+log4j.appender.CONSOLE.Target=System.out
+log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
+log4j.appender.CONSOLE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}:%L] %m%n
+ 
+ 

src/main/webapp/WEB-INF/classes/logback.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+
+	<!-- Insert the current time formatted as "yyyyMMdd'T'HHmmss" under the 
+		key "bySecond" into the logger context. This value will be available to all 
+		subsequent configuration elements. -->
+	<timestamp key="byDay" datePattern="yyyyMMdd" />
+
+	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+		<layout class="ch.qos.logback.classic.PatternLayout">
+			<Pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
+			</Pattern>
+		</layout>
+	</appender>
+
+	<appender name="FILE" class="ch.qos.logback.core.FileAppender">
+		<file>${CATALINA_HOME}/webapps/tabular-data-portlet/logs/TabularDataManagerLogBack.log</file>
+		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+			<!-- daily rollover -->
+			<fileNamePattern>TabularData.%d{yyyy-MM-dd}.log</fileNamePattern>
+
+			<!-- keep 30 days' worth of history -->
+			<maxHistory>30</maxHistory>
+		</rollingPolicy>
+
+		<encoder>
+			<pattern>%d [%thread] %-5level %logger{35} - %msg%n
+			</pattern>
+		</encoder>
+	</appender>
+
+	<root level="TRACE">
+		<appender-ref ref="STDOUT" />
+		<appender-ref ref="FILE" />
+	</root>
+</configuration>

src/main/webapp/WEB-INF/classes/logging_properties_sample

@@ -0,0 +1 @@
+debug.com.sun.portal.level=WARNING

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

@@ -4,7 +4,7 @@
     "http://java.sun.com/dtd/web-app_2_3.dtd">
 
 <web-app>
-	
+
 	<!-- Servlets -->
 	<servlet>
 		<servlet-name>tdservlet</servlet-name>
@@ -28,43 +28,43 @@
 		<servlet-name>TDGWTService</servlet-name>
 		<servlet-class>org.gcube.portlets.user.td.gwtservice.server.TDGWTServiceImpl</servlet-class>
 	</servlet>
-	
+
 	<!-- TD Expression -->
 	<servlet>
 		<servlet-name>ExpressionService</servlet-name>
 		<servlet-class>org.gcube.portlets.user.td.expressionwidget.server.ExpressionServiceImpl</servlet-class>
 	</servlet>
-	
+
 	<servlet>
 		<servlet-name>CExpressionMapServlet</servlet-name>
 		<servlet-class>org.gcube.portlets.user.td.expressionwidget.server.CExpressionMapServlet</servlet-class>
 	</servlet>
-	
+
 	<!-- Share -->
 	<servlet>
 		<servlet-name>workspacesharing</servlet-name>
 		<servlet-class>org.gcube.portlets.widgets.workspacesharingwidget.server.WorkspaceSharingServiceImpl</servlet-class>
 	</servlet>
-	
+
-	<!-- TD Tasks Widget Service  -->
+	<!-- TD Tasks Widget Service -->
 	<servlet>
 		<servlet-name>tabularDataTasksWidgetService</servlet-name>
 		<servlet-class>org.gcube.portlets.user.td.taskswidget.server.TdTasksWidgetServiceImpl</servlet-class>
 	</servlet>
 
-	<!--  Template Service -->
+	<!-- Template Service -->
 	<servlet>
 		<servlet-name>tdTemplateServiceImpl</servlet-name>
 		<servlet-class>org.gcube.portlets.user.tdtemplate.server.TdTemplateServiceImpl</servlet-class>
 	</servlet>
-	
+
 	<!-- TD Column Operation -->
-	 <servlet>
+	<servlet>
 		<servlet-name>TdColumnOperationServlet</servlet-name>
 		<servlet-class>org.gcube.portlets.user.tdcolumnoperation.server.TdColumnOperationServiceImpl</servlet-class>
 	</servlet>
 
-	
+
 
 	<!-- CSV IMPORT WIZARD -->
 	<servlet>
@@ -82,7 +82,7 @@
 		<servlet-name>CodelistMappingUploadServlet</servlet-name>
 		<servlet-class>org.gcube.portlets.user.td.gwtservice.server.CodelistMappingUploadServlet</servlet-class>
 	</servlet>
-	
+
 	<!-- Workspace Light Tree -->
 	<servlet>
 		<servlet-name>WorkspaceLightService</servlet-name>
@@ -91,33 +91,13 @@
 
 
 	<!-- CSV Import Wizard Workspace -->
-	<!--  <servlet>
+	<!-- <servlet> <servlet-name>CSVImportServiceWorkspace</servlet-name> <servlet-class>org.gcube.portlets.user.csvimportwizardgxt3.ws.server.ImportWizardWSServiceImpl</servlet-class> 
-		<servlet-name>CSVImportServiceWorkspace</servlet-name>
+		</servlet> <servlet> <servlet-name>downloadServlet</servlet-name> <servlet-class>org.gcube.portlets.user.workspace.server.DownloadServlet</servlet-class> 
-		<servlet-class>org.gcube.portlets.user.csvimportwizardgxt3.ws.server.ImportWizardWSServiceImpl</servlet-class>
+		</servlet> <servlet> <servlet-name>gWTWorkspaceServiceImpl</servlet-name> 
-	</servlet> 
+		<servlet-class>org.gcube.portlets.user.workspace.server.GWTWorkspaceServiceImpl</servlet-class> 
-
+		</servlet> <servlet> <servlet-name>imageServlet</servlet-name> <servlet-class>org.gcube.portlets.user.workspace.server.ImageServlet</servlet-class> 
-	<servlet>
+		</servlet> <servlet> <servlet-name>uploadServlet</servlet-name> <servlet-class>org.gcube.portlets.user.workspace.server.UploadServlet</servlet-class> 
-		<servlet-name>downloadServlet</servlet-name>
+		</servlet> -->
-		<servlet-class>org.gcube.portlets.user.workspace.server.DownloadServlet</servlet-class>
-	</servlet>
-
-
-	<servlet>
-		<servlet-name>gWTWorkspaceServiceImpl</servlet-name>
-		<servlet-class>org.gcube.portlets.user.workspace.server.GWTWorkspaceServiceImpl</servlet-class>
-	</servlet>
-
-
-	<servlet>
-		<servlet-name>imageServlet</servlet-name>
-		<servlet-class>org.gcube.portlets.user.workspace.server.ImageServlet</servlet-class>
-	</servlet>
-
-
-	<servlet>
-		<servlet-name>uploadServlet</servlet-name>
-		<servlet-class>org.gcube.portlets.user.workspace.server.UploadServlet</servlet-class>
-	</servlet> -->
 
 	<servlet>
 		<servlet-name>jUnitHostImpl</servlet-name>
@@ -129,7 +109,17 @@
 		<servlet-name>checkServlet</servlet-name>
 		<servlet-class>org.gcube.portlets.widgets.sessionchecker.server.SessionCheckerServiceImpl</servlet-class>
 	</servlet>
- 
+
+	<!-- TD Logs -->
+	<servlet>
+		<servlet-name>TDLogsServlet</servlet-name>
+		<servlet-class>org.gcube.portlets.user.td.gwtservice.server.TDLogsServlet</servlet-class>
+	</servlet>
+
+	
+	
+	
+
 	<!-- Servlets Mapping -->
 	<servlet-mapping>
 		<servlet-name>tdservlet</servlet-name>
@@ -153,7 +143,7 @@
 		<servlet-name>TDGWTService</servlet-name>
 		<url-pattern>/tabulardataportlet/TDGWTService</url-pattern>
 	</servlet-mapping>
-	
+
 	<!-- TD Expression -->
 	<servlet-mapping>
 		<servlet-name>ExpressionService</servlet-name>
@@ -163,26 +153,26 @@
 		<servlet-name>CExpressionMapServlet</servlet-name>
 		<url-pattern>/tabulardataportlet/CExpressionMap</url-pattern>
 	</servlet-mapping>
-	
+
 	<!-- Share -->
 	<servlet-mapping>
 		<servlet-name>workspacesharing</servlet-name>
 		<url-pattern>/tabulardataportlet/workspacesharing</url-pattern>
 	</servlet-mapping>
-	
+
-	
+
-	<!-- TD Tasks Widget Service  -->
+	<!-- TD Tasks Widget Service -->
 	<servlet-mapping>
 		<servlet-name>tabularDataTasksWidgetService</servlet-name>
 		<url-pattern>/tabulardataportlet/tabularDataTasksService</url-pattern>
 	</servlet-mapping>
 
-	<!-- Template Servlet  -->
+	<!-- Template Servlet -->
 	<servlet-mapping>
 		<servlet-name>tdTemplateServiceImpl</servlet-name>
 		<url-pattern>/tabulardataportlet/tdtemplate</url-pattern>
 	</servlet-mapping>
-	
+
 	<!-- TD Column Operation -->
 	<servlet-mapping>
 		<servlet-name>TdColumnOperationServlet</servlet-name>
@@ -199,14 +189,14 @@
 		<servlet-name>LocalUploadServlet</servlet-name>
 		<url-pattern>/tabulardataportlet/LocalUploadServlet</url-pattern>
 	</servlet-mapping>
-	
+
 	<!-- Codelist Mapping Import File Servlet -->
 	<servlet-mapping>
 		<servlet-name>CodelistMappingUploadServlet</servlet-name>
 		<url-pattern>/tabulardataportlet/CodelistMappingUploadServlet</url-pattern>
 	</servlet-mapping>
-	
+
-	
+
 	<!-- Workspace Light Tree -->
 	<servlet-mapping>
 		<servlet-name>WorkspaceLightService</servlet-name>
@@ -214,46 +204,39 @@
 	</servlet-mapping>
 
 	<!-- CSV Import Wizard Workspace -->
-	<!--   <servlet-mapping>
+	<!-- <servlet-mapping> <servlet-name>CSVImportServiceWorkspace</servlet-name> 
-		<servlet-name>CSVImportServiceWorkspace</servlet-name>
+		<url-pattern>/tabulardataportlet/CSVImportServiceWorkspace</url-pattern> 
-		<url-pattern>/tabulardataportlet/CSVImportServiceWorkspace</url-pattern>
+		</servlet-mapping> <servlet-mapping> <servlet-name>downloadServlet</servlet-name> 
-	</servlet-mapping> 
+		<url-pattern>/tabulardataportlet/DownloadService</url-pattern> </servlet-mapping> 
+		<servlet-mapping> <servlet-name>gWTWorkspaceServiceImpl</servlet-name> <url-pattern>/tabulardataportlet/WorkspaceService</url-pattern> 
+		</servlet-mapping> <servlet-mapping> <servlet-name>imageServlet</servlet-name> 
+		<url-pattern>/tabulardataportlet/ImageService</url-pattern> </servlet-mapping> 
+		<servlet-mapping> <servlet-name>uploadServlet</servlet-name> <url-pattern>/tabulardataportlet/UploadService</url-pattern> 
+		</servlet-mapping> -->
 
-	<servlet-mapping>
-		<servlet-name>downloadServlet</servlet-name>
-		<url-pattern>/tabulardataportlet/DownloadService</url-pattern>
-	</servlet-mapping>
 
-	<servlet-mapping>
-		<servlet-name>gWTWorkspaceServiceImpl</servlet-name>
-		<url-pattern>/tabulardataportlet/WorkspaceService</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>imageServlet</servlet-name>
-		<url-pattern>/tabulardataportlet/ImageService</url-pattern>
-	</servlet-mapping>
-	
-	<servlet-mapping>
-		<servlet-name>uploadServlet</servlet-name>
-		<url-pattern>/tabulardataportlet/UploadService</url-pattern>
-	</servlet-mapping> 
-
-	-->
-	
-	
 	<servlet-mapping>
 		<servlet-name>checkServlet</servlet-name>
 		<url-pattern>/tabulardataportlet/checksession</url-pattern>
 	</servlet-mapping>
+
+	<!-- TD logs -->
+	<servlet-mapping>
+		<servlet-name>TDLogsServlet</servlet-name>
+		<url-pattern>/tabulardataportlet/TDLogsServlet</url-pattern>
+	</servlet-mapping>
 	
-	
+
+
 	<servlet-mapping>
 		<servlet-name>jUnitHostImpl</servlet-name>
 		<url-pattern>/tabulardataportlet/junithost/*</url-pattern>
 	</servlet-mapping>
 
-
+	
+	
+	
+	
 	<!-- Default page to serve -->
 	<welcome-file-list>
 		<welcome-file>tabulardataportlet.html</welcome-file>