diff --git a/src/main/java/org/gcube/portlets/user/databasesmanager/client/DatabasesManager.java b/src/main/java/org/gcube/portlets/user/databasesmanager/client/DatabasesManager.java index bf208a6..3dac070 100644 --- a/src/main/java/org/gcube/portlets/user/databasesmanager/client/DatabasesManager.java +++ b/src/main/java/org/gcube/portlets/user/databasesmanager/client/DatabasesManager.java @@ -11,7 +11,7 @@ import com.google.gwt.user.client.ui.RootPanel; import org.gcube.portlets.user.databasesmanager.client.panels.GxtBorderLayoutPanel; import org.gcube.portlets.user.databasesmanager.client.resources.Resources; -import org.gcube.portlets.user.databasesmanager.client.utils.ConstantsPortlet; +import org.gcube.portlets.user.databasesmanager.shared.ConstantsPortlet; import org.gcube.portlets.widgets.sessionchecker.client.CheckSession; /** diff --git a/src/main/java/org/gcube/portlets/user/databasesmanager/client/datamodel/SQLDialect.java b/src/main/java/org/gcube/portlets/user/databasesmanager/client/datamodel/SQLDialect.java index 2d2fe21..b69166b 100644 --- a/src/main/java/org/gcube/portlets/user/databasesmanager/client/datamodel/SQLDialect.java +++ b/src/main/java/org/gcube/portlets/user/databasesmanager/client/datamodel/SQLDialect.java @@ -2,7 +2,9 @@ package org.gcube.portlets.user.databasesmanager.client.datamodel; import java.util.ArrayList; import java.util.List; -import org.gcube.portlets.user.databasesmanager.client.utils.ConstantsPortlet; + +import org.gcube.portlets.user.databasesmanager.shared.ConstantsPortlet; + import com.extjs.gxt.ui.client.data.BaseModelData; public class SQLDialect extends BaseModelData { diff --git a/src/main/java/org/gcube/portlets/user/databasesmanager/client/panels/GxtBorderLayoutPanel.java b/src/main/java/org/gcube/portlets/user/databasesmanager/client/panels/GxtBorderLayoutPanel.java index 001e356..d4a9026 100644 --- a/src/main/java/org/gcube/portlets/user/databasesmanager/client/panels/GxtBorderLayoutPanel.java +++ b/src/main/java/org/gcube/portlets/user/databasesmanager/client/panels/GxtBorderLayoutPanel.java @@ -31,7 +31,7 @@ import org.gcube.portlets.user.databasesmanager.client.events.interfaces.SmartSa import org.gcube.portlets.user.databasesmanager.client.events.interfaces.SubmitQueryEventHandler; import org.gcube.portlets.user.databasesmanager.client.resources.Images; import org.gcube.portlets.user.databasesmanager.client.toolbar.GxtToolbarFunctionality; -import org.gcube.portlets.user.databasesmanager.client.utils.ConstantsPortlet; +import org.gcube.portlets.user.databasesmanager.shared.ConstantsPortlet; import org.gcube.portlets.user.databasesmanager.shared.SessionExpiredException; import org.gcube.portlets.widgets.sessionchecker.client.CheckSession; diff --git a/src/main/java/org/gcube/portlets/user/databasesmanager/client/panels/GxtTreePanel.java b/src/main/java/org/gcube/portlets/user/databasesmanager/client/panels/GxtTreePanel.java index 5824223..dee7da2 100644 --- a/src/main/java/org/gcube/portlets/user/databasesmanager/client/panels/GxtTreePanel.java +++ b/src/main/java/org/gcube/portlets/user/databasesmanager/client/panels/GxtTreePanel.java @@ -14,7 +14,6 @@ import org.gcube.portlets.user.databasesmanager.client.events.RefreshDataEvent; import org.gcube.portlets.user.databasesmanager.client.events.SelectedItemEvent; import org.gcube.portlets.user.databasesmanager.client.events.interfaces.RefreshDataEventHandler; import org.gcube.portlets.user.databasesmanager.client.resources.Images; -import org.gcube.portlets.user.databasesmanager.client.utils.ConstantsPortlet; import com.extjs.gxt.ui.client.Style.Scroll; import com.extjs.gxt.ui.client.Style.SelectionMode; import com.extjs.gxt.ui.client.data.ModelIconProvider; @@ -33,6 +32,7 @@ import com.google.gwt.user.client.Event; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwt.user.client.ui.AbstractImagePrototype; import org.gcube.portlets.user.databasesmanager.client.datamodel.GeneralOutputFromServlet; +import org.gcube.portlets.user.databasesmanager.shared.ConstantsPortlet; import org.gcube.portlets.user.databasesmanager.shared.SessionExpiredException; import org.gcube.portlets.widgets.sessionchecker.client.CheckSession; diff --git a/src/main/java/org/gcube/portlets/user/databasesmanager/client/toolbar/GxtToolbarFunctionality.java b/src/main/java/org/gcube/portlets/user/databasesmanager/client/toolbar/GxtToolbarFunctionality.java index 3d9a078..a3c085a 100644 --- a/src/main/java/org/gcube/portlets/user/databasesmanager/client/toolbar/GxtToolbarFunctionality.java +++ b/src/main/java/org/gcube/portlets/user/databasesmanager/client/toolbar/GxtToolbarFunctionality.java @@ -19,8 +19,8 @@ import org.gcube.portlets.user.databasesmanager.client.events.SubmitQueryEvent; import org.gcube.portlets.user.databasesmanager.client.events.interfaces.SelectedItemEventHandler; import org.gcube.portlets.user.databasesmanager.client.events.interfaces.SelectedTableEventHandler; import org.gcube.portlets.user.databasesmanager.client.form.GxtFormSubmitQuery; -import org.gcube.portlets.user.databasesmanager.client.utils.ConstantsPortlet; import org.gcube.portlets.user.databasesmanager.client.utils.UIDGenerator; +import org.gcube.portlets.user.databasesmanager.shared.ConstantsPortlet; import org.gcube.portlets.user.databasesmanager.shared.SessionExpiredException; import org.gcube.portlets.widgets.sessionchecker.client.CheckSession; diff --git a/src/main/java/org/gcube/portlets/user/databasesmanager/server/GWTdbManagerServiceImpl.java b/src/main/java/org/gcube/portlets/user/databasesmanager/server/GWTdbManagerServiceImpl.java index 448ba5e..9b0bf17 100644 --- a/src/main/java/org/gcube/portlets/user/databasesmanager/server/GWTdbManagerServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/databasesmanager/server/GWTdbManagerServiceImpl.java @@ -24,6 +24,8 @@ import net.sf.ehcache.Cache; import net.sf.ehcache.CacheManager; import net.sf.ehcache.config.CacheConfiguration; import net.sf.ehcache.config.MemoryUnit; +import net.sf.ehcache.config.SizeOfPolicyConfiguration; +import net.sf.ehcache.config.SizeOfPolicyConfiguration.MaxDepthExceededBehavior; import net.sf.ehcache.store.MemoryStoreEvictionPolicy; import org.apache.regexp.RE; import org.gcube.application.framework.core.session.ASLSession; @@ -61,9 +63,9 @@ import org.gcube.portlets.user.databasesmanager.client.datamodel.Result; import org.gcube.portlets.user.databasesmanager.client.datamodel.SamplingResultWithFileFromServlet; import org.gcube.portlets.user.databasesmanager.client.datamodel.Row; import org.gcube.portlets.user.databasesmanager.client.datamodel.SubmitQueryResultWithFileFromServlet; -import org.gcube.portlets.user.databasesmanager.client.utils.ConstantsPortlet; import org.gcube.portlets.user.databasesmanager.server.util.DataExchangedThroughQueue; import org.gcube.portlets.user.databasesmanager.server.util.SessionUtil; +import org.gcube.portlets.user.databasesmanager.shared.ConstantsPortlet; import org.gcube.portlets.user.databasesmanager.shared.SessionExpiredException; import org.gcube.portlets.user.databasesmanager.shared.StatisticalManagerException; import com.extjs.gxt.ui.client.data.BasePagingLoadResult; @@ -183,6 +185,10 @@ public class GWTdbManagerServiceImpl extends RemoteServiceServlet implements config.overflowToDisk(true); config.diskPersistent(false); config.diskStorePath(cachePath); +// SizeOfPolicyConfiguration size = new SizeOfPolicyConfiguration(); +// size.setMaxDepth(1000); +// size.maxDepthExceededBehavior(MaxDepthExceededBehavior.ABORT); +// config.sizeOfPolicy(size); DBCache = new Cache(config); } catch (Exception e) { // logger.error("dbmanager-> Error while starting the servlet. Failed to create the cache", diff --git a/src/main/java/org/gcube/portlets/user/databasesmanager/client/utils/ConstantsPortlet.java b/src/main/java/org/gcube/portlets/user/databasesmanager/shared/ConstantsPortlet.java similarity index 96% rename from src/main/java/org/gcube/portlets/user/databasesmanager/client/utils/ConstantsPortlet.java rename to src/main/java/org/gcube/portlets/user/databasesmanager/shared/ConstantsPortlet.java index 2ee9402..274f391 100644 --- a/src/main/java/org/gcube/portlets/user/databasesmanager/client/utils/ConstantsPortlet.java +++ b/src/main/java/org/gcube/portlets/user/databasesmanager/shared/ConstantsPortlet.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.databasesmanager.client.utils; +package org.gcube.portlets.user.databasesmanager.shared; public class ConstantsPortlet {