From 8def4ef14ad31ecb200ce87b429da1537da0b318 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Thu, 24 Oct 2013 14:07:25 +0000 Subject: [PATCH] Updated package name git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-information-widget@84061 82a268e6-3cf1-43bd-a215-b396298e98cf --- InformationTest-dev.launch | 6 +++--- InformationTest-prod.launch | 2 +- pom.xml | 2 +- .../client/InformationEntry.java | 2 +- .../client/TabularResourceProperties.java | 10 ++++++---- .../Information.gwt.xml | 0 .../client/Messages.properties | 0 .../client/Messages_fr.properties | 0 .../client/GwtTestInformation.java | 15 ++++++--------- .../InformationJUnit.gwt.xml | 0 10 files changed, 18 insertions(+), 19 deletions(-) rename src/main/java/org/gcube/portlets/user/td/{information => informationwidget}/client/InformationEntry.java (91%) rename src/main/java/org/gcube/portlets/user/td/{information => informationwidget}/client/TabularResourceProperties.java (94%) rename src/main/resources/org/gcube/portlets/user/td/{information => informationwidget}/Information.gwt.xml (100%) rename src/main/resources/org/gcube/portlets/user/td/{information => informationwidget}/client/Messages.properties (100%) rename src/main/resources/org/gcube/portlets/user/td/{information => informationwidget}/client/Messages_fr.properties (100%) rename src/test/java/org/gcube/portlets/user/td/{information => informationwidget}/client/GwtTestInformation.java (79%) rename src/test/resources/org/gcube/portlets/user/td/{information => informationwidget}/InformationJUnit.gwt.xml (100%) diff --git a/InformationTest-dev.launch b/InformationTest-dev.launch index 1072144..19e0cdf 100644 --- a/InformationTest-dev.launch +++ b/InformationTest-dev.launch @@ -7,7 +7,7 @@ - + @@ -17,6 +17,6 @@ - - + + diff --git a/InformationTest-prod.launch b/InformationTest-prod.launch index 582f3aa..fdc6cb5 100644 --- a/InformationTest-prod.launch +++ b/InformationTest-prod.launch @@ -7,7 +7,7 @@ - + diff --git a/pom.xml b/pom.xml index 1fdf79a..dc494d7 100644 --- a/pom.xml +++ b/pom.xml @@ -201,7 +201,7 @@ Information.html ${webappDirectory} - org.gcube.portlets.user.td.information.Information + org.gcube.portlets.user.td.informationwidget.Information diff --git a/src/main/java/org/gcube/portlets/user/td/information/client/InformationEntry.java b/src/main/java/org/gcube/portlets/user/td/informationwidget/client/InformationEntry.java similarity index 91% rename from src/main/java/org/gcube/portlets/user/td/information/client/InformationEntry.java rename to src/main/java/org/gcube/portlets/user/td/informationwidget/client/InformationEntry.java index bd0f9a3..9e7f1df 100644 --- a/src/main/java/org/gcube/portlets/user/td/information/client/InformationEntry.java +++ b/src/main/java/org/gcube/portlets/user/td/informationwidget/client/InformationEntry.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.td.information.client; +package org.gcube.portlets.user.td.informationwidget.client; import com.allen_sauer.gwt.log.client.Log; import com.google.gwt.core.client.EntryPoint; diff --git a/src/main/java/org/gcube/portlets/user/td/information/client/TabularResourceProperties.java b/src/main/java/org/gcube/portlets/user/td/informationwidget/client/TabularResourceProperties.java similarity index 94% rename from src/main/java/org/gcube/portlets/user/td/information/client/TabularResourceProperties.java rename to src/main/java/org/gcube/portlets/user/td/informationwidget/client/TabularResourceProperties.java index f1ea67a..c2f2aa5 100644 --- a/src/main/java/org/gcube/portlets/user/td/information/client/TabularResourceProperties.java +++ b/src/main/java/org/gcube/portlets/user/td/informationwidget/client/TabularResourceProperties.java @@ -1,9 +1,11 @@ -package org.gcube.portlets.user.td.information.client; +package org.gcube.portlets.user.td.informationwidget.client; import java.util.HashMap; -import org.gcube.portlets.user.td.gxtservice.client.rpc.TDGXTServiceAsync; -import org.gcube.portlets.user.td.gxtservice.shared.TabResource; +import org.gcube.portlets.user.td.gwtservice.client.rpc.TDGWTServiceAsync; +import org.gcube.portlets.user.td.gwtservice.shared.TabResource; + + import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.web.bindery.event.shared.EventBus; @@ -33,7 +35,7 @@ public class TabularResourceProperties extends ContentPanel { setId(name); this.eventBus = eventBus; - TDGXTServiceAsync.INSTANCE + TDGWTServiceAsync.INSTANCE .getTabResource(new AsyncCallback() { @Override diff --git a/src/main/resources/org/gcube/portlets/user/td/information/Information.gwt.xml b/src/main/resources/org/gcube/portlets/user/td/informationwidget/Information.gwt.xml similarity index 100% rename from src/main/resources/org/gcube/portlets/user/td/information/Information.gwt.xml rename to src/main/resources/org/gcube/portlets/user/td/informationwidget/Information.gwt.xml diff --git a/src/main/resources/org/gcube/portlets/user/td/information/client/Messages.properties b/src/main/resources/org/gcube/portlets/user/td/informationwidget/client/Messages.properties similarity index 100% rename from src/main/resources/org/gcube/portlets/user/td/information/client/Messages.properties rename to src/main/resources/org/gcube/portlets/user/td/informationwidget/client/Messages.properties diff --git a/src/main/resources/org/gcube/portlets/user/td/information/client/Messages_fr.properties b/src/main/resources/org/gcube/portlets/user/td/informationwidget/client/Messages_fr.properties similarity index 100% rename from src/main/resources/org/gcube/portlets/user/td/information/client/Messages_fr.properties rename to src/main/resources/org/gcube/portlets/user/td/informationwidget/client/Messages_fr.properties diff --git a/src/test/java/org/gcube/portlets/user/td/information/client/GwtTestInformation.java b/src/test/java/org/gcube/portlets/user/td/informationwidget/client/GwtTestInformation.java similarity index 79% rename from src/test/java/org/gcube/portlets/user/td/information/client/GwtTestInformation.java rename to src/test/java/org/gcube/portlets/user/td/informationwidget/client/GwtTestInformation.java index a7c18e3..36032e0 100644 --- a/src/test/java/org/gcube/portlets/user/td/information/client/GwtTestInformation.java +++ b/src/test/java/org/gcube/portlets/user/td/informationwidget/client/GwtTestInformation.java @@ -1,14 +1,11 @@ -package org.gcube.portlets.user.td.information.client; +package org.gcube.portlets.user.td.informationwidget.client; -import org.gcube.portlets.user.td.gxtservice.client.rpc.TDGXTService; -import org.gcube.portlets.user.td.gxtservice.client.rpc.TDGXTServiceAsync; -import org.gcube.portlets.user.td.gxtservice.shared.TDGXTServiceException; -import org.gcube.portlets.user.td.gxtservice.shared.TabResource; +import org.gcube.portlets.user.td.gwtservice.client.rpc.TDGWTService; +import org.gcube.portlets.user.td.gwtservice.client.rpc.TDGWTServiceAsync; import com.google.gwt.core.client.GWT; import com.google.gwt.junit.client.GWTTestCase; -import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwt.user.client.rpc.ServiceDefTarget; /** @@ -36,10 +33,10 @@ public class GwtTestInformation extends GWTTestCase { */ public void testInformation() { // Create the service that we will test. - TDGXTServiceAsync tdGXTService = GWT.create(TDGXTService.class); + TDGWTServiceAsync tdGXTService = GWT.create(TDGWTService.class); ServiceDefTarget target = (ServiceDefTarget) tdGXTService; - System.out.println(GWT.getModuleBaseURL() + "/TDGXTService"); - target.setServiceEntryPoint(GWT.getModuleBaseURL() + "/TDGXTService"); + System.out.println(GWT.getModuleBaseURL() + "/TDGWTService"); + target.setServiceEntryPoint(GWT.getModuleBaseURL() + "/TDGWTService"); // Since RPC calls are asynchronous, we will need to wait for a response // after this test method returns. This line tells the test runner to wait diff --git a/src/test/resources/org/gcube/portlets/user/td/information/InformationJUnit.gwt.xml b/src/test/resources/org/gcube/portlets/user/td/informationwidget/InformationJUnit.gwt.xml similarity index 100% rename from src/test/resources/org/gcube/portlets/user/td/information/InformationJUnit.gwt.xml rename to src/test/resources/org/gcube/portlets/user/td/informationwidget/InformationJUnit.gwt.xml