This commit is contained in:
Massimiliano Assante 2013-03-19 16:14:31 +00:00
parent c6ec76b5fa
commit 16f4cf0b8d
3 changed files with 15 additions and 12 deletions

View File

@ -1,4 +1,4 @@
#Sat Mar 16 12:23:44 CET 2013
#Mon Mar 18 11:42:27 CET 2013
=\=\=\=\=\=\=
<<<<<<<=.mine
>>>>>>>=.r71295

View File

@ -91,7 +91,7 @@
<dependency>
<groupId>org.gcube.portlets.user</groupId>
<artifactId>gcube-widgets</artifactId>
<version>[1.4.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
<version>[1.5.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
<scope>${setScope}</scope>
</dependency>
<dependency>
@ -121,7 +121,7 @@
<dependency>
<groupId>org.gcube.portlets.user</groupId>
<artifactId>workspace-light-tree</artifactId>
<version>[2.9.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
<version>[2.9.0-SNAPSHOT, 2.9.3-SNAPSHOT)</version>
<scope>${setScope}</scope>
</dependency>
<dependency>
@ -163,7 +163,7 @@
<groupId>org.gcube.portlets.user</groupId>
<artifactId>home-library-jcr</artifactId>
<version>[1.3.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
<!-- <classifier>${setClassifier}</classifier> -->
<classifier>${setClassifier}</classifier>
<scope>${setScope}</scope>
</dependency>
<dependency>

View File

@ -1,18 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<module rename-to='reports'>
<!-- Inherit the core Web Toolkit stuff. -->
<inherits name='com.google.gwt.user.User' />
<inherits name='org.gcube.portlets.d4sreporting.common.Reporting' />
<inherits name='org.gcube.portlets.user.gcubewidgets.WidgetFactory' />
<!-- inherits name='org.gube.portlets.user.reporting.fimesexporter.Fimesexporter' /-->
<inherits name='org.gcube.portlets.user.workspace.WorkspaceTree' />
<inherits name='org.gcube.portlets.user.guidedtour.GuidedTour' />
<!-- To Comment out -->
<!-- <set-property name="user.agent" value="gecko1_8" /> -->
<inherits name='org.gcube.portlets.user.guidedtour.GuidedTour' />
<inherits name='org.gcube.portlets.d4sreporting.common.Reporting' />
<inherits name='org.gcube.portlets.user.workspace.lighttree.WorkspacePortletLightTree' />
<inherits name='org.gcube.portlets.user.gcubewidgets.WidgetFactory' />
<inherits name='com.extjs.gxt.ui.GXT' />
<inherits name='com.extjs.gxt.themes.Themes' />
<inherits name='org.gcube.portlets.user.workspace.WorkspaceTree' />
<inherits name='org.gcube.portlets.user.workspace.lighttree.WorkspacePortletLightTree' />
<inherits name='org.gcube.portlets.user.exporter.Report_exporter_widget' />
<!-- Specify the app entry point class. -->