Mercurial > dive4elements > river
changeset 1425:bc06a671ef60
Removed the URL parameter from service calls. The service
implementations read the URL from the web.xml config file now.
flys-client/trunk@3367 c6561f87-3c4e-4783-a992-168aeb5c3f6f
line wrap: on
line diff
--- a/flys-client/ChangeLog Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/ChangeLog Thu Dec 08 09:12:27 2011 +0000 @@ -1,3 +1,103 @@ +2011-11-17 Raimund Renkert <raimund.renkert@intevation.de> + + * src/main/java/de/intevation/flys/client/server/LoadArtifactServiceImpl.java, + src/main/java/de/intevation/flys/client/server/CollectionItemAttributeServiceImpl.java, + src/main/java/de/intevation/flys/client/server/FeedServiceImpl.java, + src/main/java/de/intevation/flys/client/server/SetCollectionNameServiceImpl.java, + src/main/java/de/intevation/flys/client/server/ChartInfoServiceImpl.java, + src/main/java/de/intevation/flys/client/server/UserServiceImpl.java, + src/main/java/de/intevation/flys/client/server/CollectionAttributeServiceImpl.java, + src/main/java/de/intevation/flys/client/server/MetaDataServiceImpl.java, + src/main/java/de/intevation/flys/client/server/ExportServiceImpl.java, + src/main/java/de/intevation/flys/client/server/MapInfoServiceImpl.java, + src/main/java/de/intevation/flys/client/server/SetCollectionTTLServiceImpl.java, + src/main/java/de/intevation/flys/client/server/DescribeCollectionServiceImpl.java, + src/main/java/de/intevation/flys/client/server/GetArtifactServiceImpl.java, + src/main/java/de/intevation/flys/client/server/ArtifactServiceImpl.java, + src/main/java/de/intevation/flys/client/server/CSVExportServiceImpl.java, + src/main/java/de/intevation/flys/client/server/DescribeArtifactServiceImpl.java, + src/main/java/de/intevation/flys/client/server/StepForwardServiceImpl.java, + src/main/java/de/intevation/flys/client/server/AdvanceServiceImpl.java, + src/main/java/de/intevation/flys/client/server/WQInfoServiceImpl.java, + src/main/java/de/intevation/flys/client/server/AddArtifactServiceImpl.java, + src/main/java/de/intevation/flys/client/server/DistanceInfoServiceImpl.java, + src/main/java/de/intevation/flys/client/server/RemoveArtifactServiceImpl.java, + src/main/java/de/intevation/flys/client/server/ReportServiceImpl.java, + src/main/java/de/intevation/flys/client/server/DeleteCollectionServiceImpl.java, + src/main/java/de/intevation/flys/client/server/CreateCollectionServiceImpl.java, + src/main/java/de/intevation/flys/client/server/ChartOutputServiceImpl.java, + src/main/java/de/intevation/flys/client/server/DistanceInfoXML.java, + src/main/java/de/intevation/flys/client/server/RiverServiceImpl.java, + src/main/java/de/intevation/flys/client/client/services/MetaDataServiceAsync.java, + src/main/java/de/intevation/flys/client/client/services/DeleteCollectionService.java, + src/main/java/de/intevation/flys/client/client/services/CreateCollectionService.java, + src/main/java/de/intevation/flys/client/client/services/RiverServiceAsync.java, + src/main/java/de/intevation/flys/client/client/services/RiverService.java, + src/main/java/de/intevation/flys/client/client/services/DescribeCollectionServiceAsync.java, + src/main/java/de/intevation/flys/client/client/services/LoadArtifactServiceAsync.java, + src/main/java/de/intevation/flys/client/client/services/DescribeArtifactServiceAsync.java, + src/main/java/de/intevation/flys/client/client/services/LoadArtifactService.java, + src/main/java/de/intevation/flys/client/client/services/StepForwardServiceAsync.java, + src/main/java/de/intevation/flys/client/client/services/CollectionItemAttributeService.java, + src/main/java/de/intevation/flys/client/client/services/FeedServiceAsync.java, + src/main/java/de/intevation/flys/client/client/services/FeedService.java, + src/main/java/de/intevation/flys/client/client/services/DistanceInfoServiceAsync.java, + src/main/java/de/intevation/flys/client/client/services/AddArtifactServiceAsync.java, + src/main/java/de/intevation/flys/client/client/services/SetCollectionNameService.java, + src/main/java/de/intevation/flys/client/client/services/ChartInfoServiceAsync.java, + src/main/java/de/intevation/flys/client/client/services/DeleteCollectionServiceAsync.java, + src/main/java/de/intevation/flys/client/client/services/CollectionAttributeServiceAsync.java, + src/main/java/de/intevation/flys/client/client/services/ChartInfoService.java, + src/main/java/de/intevation/flys/client/client/services/UserService.java, + src/main/java/de/intevation/flys/client/client/services/CollectionAttributeService.java, + src/main/java/de/intevation/flys/client/client/services/MetaDataService.java, + src/main/java/de/intevation/flys/client/client/services/MapInfoServiceAsync.java, + src/main/java/de/intevation/flys/client/client/services/MapInfoService.java, + src/main/java/de/intevation/flys/client/client/services/SetCollectionTTLServiceAsync.java, + src/main/java/de/intevation/flys/client/client/services/ArtifactServiceAsync.java, + src/main/java/de/intevation/flys/client/client/services/CSVExportServiceAsync.java, + src/main/java/de/intevation/flys/client/client/services/GetArtifactServiceAsync.java, + src/main/java/de/intevation/flys/client/client/services/SetCollectionTTLService.java, + src/main/java/de/intevation/flys/client/client/services/DescribeCollectionService.java, + src/main/java/de/intevation/flys/client/client/services/CollectionItemAttributeServiceAsync.java, + src/main/java/de/intevation/flys/client/client/services/ArtifactService.java, + src/main/java/de/intevation/flys/client/client/services/CSVExportService.java, + src/main/java/de/intevation/flys/client/client/services/GetArtifactService.java, + src/main/java/de/intevation/flys/client/client/services/DescribeArtifactService.java, + src/main/java/de/intevation/flys/client/client/services/AdvanceServiceAsync.java, + src/main/java/de/intevation/flys/client/client/services/StepForwardService.java, + src/main/java/de/intevation/flys/client/client/services/AdvanceService.java, + src/main/java/de/intevation/flys/client/client/services/WQInfoServiceAsync.java, + src/main/java/de/intevation/flys/client/client/services/WQInfoService.java, + src/main/java/de/intevation/flys/client/client/services/DistanceInfoService.java, + src/main/java/de/intevation/flys/client/client/services/AddArtifactService.java, + src/main/java/de/intevation/flys/client/client/services/SetCollectionNameServiceAsync.java, + src/main/java/de/intevation/flys/client/client/services/ReportServiceAsync.java, + src/main/java/de/intevation/flys/client/client/services/RemoveArtifactServiceAsync.java, + src/main/java/de/intevation/flys/client/client/services/ReportService.java, + src/main/java/de/intevation/flys/client/client/services/RemoveArtifactService.java, + src/main/java/de/intevation/flys/client/client/services/UserServiceAsync.java, + src/main/java/de/intevation/flys/client/client/services/CreateCollectionServiceAsync.java, + src/main/java/de/intevation/flys/client/client/ui/TableDataPanel.java, + src/main/java/de/intevation/flys/client/client/ui/DatacageTwinPanel.java, + src/main/java/de/intevation/flys/client/client/ui/ParameterList.java, + src/main/java/de/intevation/flys/client/client/ui/DatacageWindow.java, + src/main/java/de/intevation/flys/client/client/ui/chart/CrossSectionChartThemePanel.java, + src/main/java/de/intevation/flys/client/client/ui/chart/ChartOutputTab.java, + src/main/java/de/intevation/flys/client/client/ui/ThemePanel.java, + src/main/java/de/intevation/flys/client/client/ui/CollectionView.java, + src/main/java/de/intevation/flys/client/client/ui/DigitizePanel.java, + src/main/java/de/intevation/flys/client/client/ui/LoadingPanel.java, + src/main/java/de/intevation/flys/client/client/ui/map/MapOutputTab.java, + src/main/java/de/intevation/flys/client/client/ui/StyleEditorWindow.java, + src/main/java/de/intevation/flys/client/client/ui/ProjectList.java, + src/main/java/de/intevation/flys/client/client/ui/WspDatacagePanel.java, + src/main/java/de/intevation/flys/client/client/ui/WQInputPanel.java, + src/main/java/de/intevation/flys/client/client/ui/DatacageWidget.java, + src/main/java/de/intevation/flys/client/client/FLYS.java: + Removed the URL parameter from service calls. The service + implementations read the URL from the web.xml config file now. + 2011-12-08 Felix Wolfsteller <felix.wolfsteller@intevation.de> * src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties:
--- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYS.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYS.java Thu Dec 08 09:12:27 2011 +0000 @@ -136,12 +136,11 @@ initConfiguration(); Config config = Config.getInstance(); - String url = config.getServerUrl(); String locale = config.getLocale(); getRivers(); - userService.getCurrentUser(url, locale, new AsyncCallback<User>() { + userService.getCurrentUser(locale, new AsyncCallback<User>() { public void onFailure(Throwable caught) { GWT.log("Could not find a logged in user."); SC.warn(MSG.getString(caught.getMessage())); @@ -261,7 +260,7 @@ GWT.log("Fetch rivers from server '" + url + "'"); - riverService.list(url, locale, new AsyncCallback<River[]>() { + riverService.list(locale, new AsyncCallback<River[]>() { public void onFailure(Throwable caught) { GWT.log("Could not recieve a list of rivers."); SC.warn(MSG.getString(caught.getMessage())); @@ -335,10 +334,9 @@ GWT.log("Open existing project: " + collectionID); Config config = Config.getInstance(); - final String url = config.getServerUrl(); final String locale = config.getLocale(); - describeCollectionService.describe(collectionID, url, locale, + describeCollectionService.describe(collectionID, locale, new AsyncCallback<Collection>() { public void onFailure(Throwable caught) { SC.warn(MSG.getString(caught.getMessage())); @@ -370,7 +368,6 @@ } getArtifactService.getArtifact( - url, locale, item.identifier(), item.hash(), @@ -413,7 +410,7 @@ String url = config.getServerUrl(); String locale = config.getLocale(); - artifactService.create(url, locale, factory, null, + artifactService.create(locale, factory, null, new AsyncCallback<Artifact>() { public void onFailure(Throwable caught) { GWT.log("Could not create the new artifact.");
--- a/flys-client/src/main/java/de/intevation/flys/client/client/services/AddArtifactService.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/services/AddArtifactService.java Thu Dec 08 09:12:27 2011 +0000 @@ -29,7 +29,6 @@ Collection add( Collection collection, Artifact artifact, - String url, String locale) throws ServerException; }
--- a/flys-client/src/main/java/de/intevation/flys/client/client/services/AddArtifactServiceAsync.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/services/AddArtifactServiceAsync.java Thu Dec 08 09:12:27 2011 +0000 @@ -14,7 +14,6 @@ public void add( Collection collection, Artifact artifact, - String url, String locale, AsyncCallback<Collection> callback); }
--- a/flys-client/src/main/java/de/intevation/flys/client/client/services/AdvanceService.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/services/AdvanceService.java Thu Dec 08 09:12:27 2011 +0000 @@ -25,7 +25,6 @@ * @return the artifact which description might have been changed. */ public Artifact advance( - String serverUrl, String locale, Artifact artifact, String target)
--- a/flys-client/src/main/java/de/intevation/flys/client/client/services/AdvanceServiceAsync.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/services/AdvanceServiceAsync.java Thu Dec 08 09:12:27 2011 +0000 @@ -13,7 +13,6 @@ public interface AdvanceServiceAsync { public void advance( - String serverUrl, String locale, Artifact artifact, String target,
--- a/flys-client/src/main/java/de/intevation/flys/client/client/services/ArtifactService.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/services/ArtifactService.java Thu Dec 08 09:12:27 2011 +0000 @@ -27,7 +27,6 @@ * @return the new artifact. */ public Artifact create( - String serverUrl, String locale, String factory, Recommendation recommendation
--- a/flys-client/src/main/java/de/intevation/flys/client/client/services/ArtifactServiceAsync.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/services/ArtifactServiceAsync.java Thu Dec 08 09:12:27 2011 +0000 @@ -15,7 +15,6 @@ public interface ArtifactServiceAsync { public void create( - String serverUrl, String locale, String factory, Recommendation recommendation,
--- a/flys-client/src/main/java/de/intevation/flys/client/client/services/CSVExportService.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/services/CSVExportService.java Thu Dec 08 09:12:27 2011 +0000 @@ -20,7 +20,6 @@ * This method returns a list of DistanceInfoObjects for a specific river. */ List<String[]> getCSV( - String serverUrl, String locale, String uuid, String name)
--- a/flys-client/src/main/java/de/intevation/flys/client/client/services/CSVExportServiceAsync.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/services/CSVExportServiceAsync.java Thu Dec 08 09:12:27 2011 +0000 @@ -10,7 +10,6 @@ public interface CSVExportServiceAsync { void getCSV( - String url, String locale, String uuid, String name,
--- a/flys-client/src/main/java/de/intevation/flys/client/client/services/ChartInfoService.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/services/ChartInfoService.java Thu Dec 08 09:12:27 2011 +0000 @@ -17,7 +17,6 @@ ChartInfo getChartInfo( Collection collection, - String url, String locale, String type, Map<String, String> attr)
--- a/flys-client/src/main/java/de/intevation/flys/client/client/services/ChartInfoServiceAsync.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/services/ChartInfoServiceAsync.java Thu Dec 08 09:12:27 2011 +0000 @@ -15,7 +15,6 @@ public void getChartInfo( Collection collection, - String url, String locale, String type, Map<String, String> attr,
--- a/flys-client/src/main/java/de/intevation/flys/client/client/services/CollectionAttributeService.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/services/CollectionAttributeService.java Thu Dec 08 09:12:27 2011 +0000 @@ -13,7 +13,7 @@ @RemoteServiceRelativePath("collection-attribute") public interface CollectionAttributeService extends RemoteService { - Collection update(Collection collection, String url, String locale) + Collection update(Collection collection, String locale) throws ServerException; } // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :
--- a/flys-client/src/main/java/de/intevation/flys/client/client/services/CollectionAttributeServiceAsync.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/services/CollectionAttributeServiceAsync.java Thu Dec 08 09:12:27 2011 +0000 @@ -12,7 +12,6 @@ void update( Collection collection, - String url, String locale, AsyncCallback<Collection> callback); }
--- a/flys-client/src/main/java/de/intevation/flys/client/client/services/CollectionItemAttributeService.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/services/CollectionItemAttributeService.java Thu Dec 08 09:12:27 2011 +0000 @@ -18,14 +18,12 @@ CollectionItemAttribute getCollectionItemAttribute( Collection collection, String artifact, - String url, String locale) throws ServerException; void setCollectionItemAttribute( Collection collection, String artifact, - String url, String locale, CollectionItemAttribute attribute) throws ServerException;
--- a/flys-client/src/main/java/de/intevation/flys/client/client/services/CollectionItemAttributeServiceAsync.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/services/CollectionItemAttributeServiceAsync.java Thu Dec 08 09:12:27 2011 +0000 @@ -14,14 +14,12 @@ public void getCollectionItemAttribute( Collection collection, String artifact, - String serverUrl, String locale, AsyncCallback<CollectionItemAttribute> callback); public void setCollectionItemAttribute( Collection collection, String artifact, - String serverUrl, String locale, CollectionItemAttribute attributes, AsyncCallback<Void> callback);
--- a/flys-client/src/main/java/de/intevation/flys/client/client/services/CreateCollectionService.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/services/CreateCollectionService.java Thu Dec 08 09:12:27 2011 +0000 @@ -21,7 +21,7 @@ * * @return the uuid of the created collection. */ - Collection create(String serverUrl, String locale, String ownerId) + Collection create(String locale, String ownerId) throws ServerException; } // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :
--- a/flys-client/src/main/java/de/intevation/flys/client/client/services/CreateCollectionServiceAsync.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/services/CreateCollectionServiceAsync.java Thu Dec 08 09:12:27 2011 +0000 @@ -13,7 +13,6 @@ public interface CreateCollectionServiceAsync { void create( - String serverUrl, String locale, String owner, AsyncCallback<Collection> callback);
--- a/flys-client/src/main/java/de/intevation/flys/client/client/services/DeleteCollectionService.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/services/DeleteCollectionService.java Thu Dec 08 09:12:27 2011 +0000 @@ -20,9 +20,8 @@ * Deletes a collection. * * @param collection The Collection that should be deleted. - * @param url The url of the artifact server. */ - void delete(Collection collection, String url) + void delete(Collection collection) throws ServerException; } // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :
--- a/flys-client/src/main/java/de/intevation/flys/client/client/services/DeleteCollectionServiceAsync.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/services/DeleteCollectionServiceAsync.java Thu Dec 08 09:12:27 2011 +0000 @@ -12,7 +12,6 @@ public void delete( Collection collection, - String url, AsyncCallback<Void> callback); } // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :
--- a/flys-client/src/main/java/de/intevation/flys/client/client/services/DescribeArtifactService.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/services/DescribeArtifactService.java Thu Dec 08 09:12:27 2011 +0000 @@ -24,7 +24,6 @@ * @return the artifact which description might have been changed. */ public Artifact describe( - String url, String locale, Artifact artifact) throws ServerException;
--- a/flys-client/src/main/java/de/intevation/flys/client/client/services/DescribeArtifactServiceAsync.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/services/DescribeArtifactServiceAsync.java Thu Dec 08 09:12:27 2011 +0000 @@ -13,7 +13,6 @@ public interface DescribeArtifactServiceAsync { public void describe( - String url, String locale, Artifact artifact, AsyncCallback<Artifact> callback);
--- a/flys-client/src/main/java/de/intevation/flys/client/client/services/DescribeCollectionService.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/services/DescribeCollectionService.java Thu Dec 08 09:12:27 2011 +0000 @@ -25,7 +25,7 @@ * * @return the Collection after the operation. */ - Collection describe(String uuid, String url, String locale) + Collection describe(String uuid, String locale) throws ServerException; } // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :
--- a/flys-client/src/main/java/de/intevation/flys/client/client/services/DescribeCollectionServiceAsync.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/services/DescribeCollectionServiceAsync.java Thu Dec 08 09:12:27 2011 +0000 @@ -12,7 +12,6 @@ public void describe( String uuid, - String url, String locale, AsyncCallback<Collection> callback); }
--- a/flys-client/src/main/java/de/intevation/flys/client/client/services/DistanceInfoService.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/services/DistanceInfoService.java Thu Dec 08 09:12:27 2011 +0000 @@ -19,7 +19,6 @@ * This method returns a list of DistanceInfoObjects for a specific river. */ DistanceInfoObject[] getDistanceInfo( - String serverUrl, String locale, String river) throws ServerException;
--- a/flys-client/src/main/java/de/intevation/flys/client/client/services/DistanceInfoServiceAsync.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/services/DistanceInfoServiceAsync.java Thu Dec 08 09:12:27 2011 +0000 @@ -11,7 +11,6 @@ public interface DistanceInfoServiceAsync { void getDistanceInfo( - String url, String locale, String river, AsyncCallback<DistanceInfoObject[]> cb);
--- a/flys-client/src/main/java/de/intevation/flys/client/client/services/FeedService.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/services/FeedService.java Thu Dec 08 09:12:27 2011 +0000 @@ -24,7 +24,6 @@ * @return the artifact which description might have been changed. */ public Artifact feed( - String serverUrl, String locale, Artifact artifact, Data[] data)
--- a/flys-client/src/main/java/de/intevation/flys/client/client/services/FeedServiceAsync.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/services/FeedServiceAsync.java Thu Dec 08 09:12:27 2011 +0000 @@ -12,7 +12,6 @@ public interface FeedServiceAsync { public void feed( - String serverUrl, String locale, Artifact artifact, Data[] data,
--- a/flys-client/src/main/java/de/intevation/flys/client/client/services/GetArtifactService.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/services/GetArtifactService.java Thu Dec 08 09:12:27 2011 +0000 @@ -25,7 +25,7 @@ * * @return the artifact. */ - Artifact getArtifact(String url, String locale, String uuid, String hash) + Artifact getArtifact(String locale, String uuid, String hash) throws ServerException; } // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :
--- a/flys-client/src/main/java/de/intevation/flys/client/client/services/GetArtifactServiceAsync.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/services/GetArtifactServiceAsync.java Thu Dec 08 09:12:27 2011 +0000 @@ -11,7 +11,6 @@ public interface GetArtifactServiceAsync { public void getArtifact( - String serverUrl, String locale, String uuid, String hash,
--- a/flys-client/src/main/java/de/intevation/flys/client/client/services/LoadArtifactService.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/services/LoadArtifactService.java Thu Dec 08 09:12:27 2011 +0000 @@ -16,7 +16,6 @@ Collection parent, Recommendation recom, String factory, - String url, String locale) throws ServerException;
--- a/flys-client/src/main/java/de/intevation/flys/client/client/services/LoadArtifactServiceAsync.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/services/LoadArtifactServiceAsync.java Thu Dec 08 09:12:27 2011 +0000 @@ -16,7 +16,6 @@ Collection parent, Recommendation recom, String factory, - String url, String locale, AsyncCallback<Artifact> callback);
--- a/flys-client/src/main/java/de/intevation/flys/client/client/services/MapInfoService.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/services/MapInfoService.java Thu Dec 08 09:12:27 2011 +0000 @@ -13,7 +13,7 @@ @RemoteServiceRelativePath("map-info") public interface MapInfoService extends RemoteService { - MapInfo getMapInfo(String url, String locale, String river) + MapInfo getMapInfo(String locale, String river) throws ServerException; } // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :
--- a/flys-client/src/main/java/de/intevation/flys/client/client/services/MapInfoServiceAsync.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/services/MapInfoServiceAsync.java Thu Dec 08 09:12:27 2011 +0000 @@ -11,7 +11,6 @@ public interface MapInfoServiceAsync { public void getMapInfo( - String url, String locale, String river, AsyncCallback<MapInfo> callback);
--- a/flys-client/src/main/java/de/intevation/flys/client/client/services/MetaDataService.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/services/MetaDataService.java Thu Dec 08 09:12:27 2011 +0000 @@ -11,8 +11,11 @@ public interface MetaDataService extends RemoteService { DataCageTree getMetaData( - String serverUrl, String locale, - String artifactId, String userId, String outs, String parameters + String locale, + String artifactId, + String userId, + String outs, + String parameters ) throws ServerException; } // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :
--- a/flys-client/src/main/java/de/intevation/flys/client/client/services/MetaDataServiceAsync.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/services/MetaDataServiceAsync.java Thu Dec 08 09:12:27 2011 +0000 @@ -6,7 +6,6 @@ public interface MetaDataServiceAsync { void getMetaData( - String serverUrl, String locale, String artifactId, String userId,
--- a/flys-client/src/main/java/de/intevation/flys/client/client/services/RemoveArtifactService.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/services/RemoveArtifactService.java Thu Dec 08 09:12:27 2011 +0000 @@ -28,7 +28,6 @@ Collection remove( Collection collection, String artifactId, - String url, String locale) throws ServerException; }
--- a/flys-client/src/main/java/de/intevation/flys/client/client/services/RemoveArtifactServiceAsync.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/services/RemoveArtifactServiceAsync.java Thu Dec 08 09:12:27 2011 +0000 @@ -12,7 +12,6 @@ public void remove( Collection collection, String artifactId, - String url, String locale, AsyncCallback<Collection> callback); }
--- a/flys-client/src/main/java/de/intevation/flys/client/client/services/ReportService.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/services/ReportService.java Thu Dec 08 09:12:27 2011 +0000 @@ -9,7 +9,6 @@ { String report( String collectionId, - String url, String locale, String out); }
--- a/flys-client/src/main/java/de/intevation/flys/client/client/services/ReportServiceAsync.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/services/ReportServiceAsync.java Thu Dec 08 09:12:27 2011 +0000 @@ -6,7 +6,6 @@ { void report( String collectionId, - String url, String locale, String out, AsyncCallback<String> callback);
--- a/flys-client/src/main/java/de/intevation/flys/client/client/services/RiverService.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/services/RiverService.java Thu Dec 08 09:12:27 2011 +0000 @@ -18,12 +18,11 @@ /** * This method returns a list of rivers provided by the artifact server. * - * @param serverUrl The url of the artifact server. * @param locale The locale used for the request. * * @return a list of rivers provided by the artifact server. */ - public River[] list(String serverUrl, String locale) + public River[] list(String locale) throws ServerException; } // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :
--- a/flys-client/src/main/java/de/intevation/flys/client/client/services/RiverServiceAsync.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/services/RiverServiceAsync.java Thu Dec 08 09:12:27 2011 +0000 @@ -14,7 +14,6 @@ public interface RiverServiceAsync { public void list( - String serverUrl, String locale, AsyncCallback<River[]> callback); }
--- a/flys-client/src/main/java/de/intevation/flys/client/client/services/SetCollectionNameService.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/services/SetCollectionNameService.java Thu Dec 08 09:12:27 2011 +0000 @@ -20,9 +20,8 @@ * Set the name of a collection. * * @param collection The Collection that should be extended. - * @param url The url of the artifact server. */ - void setName(Collection collection, String url) + void setName(Collection collection) throws ServerException; } // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :
--- a/flys-client/src/main/java/de/intevation/flys/client/client/services/SetCollectionNameServiceAsync.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/services/SetCollectionNameServiceAsync.java Thu Dec 08 09:12:27 2011 +0000 @@ -12,7 +12,6 @@ public void setName( Collection collection, - String url, AsyncCallback<Void> callback); } // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :
--- a/flys-client/src/main/java/de/intevation/flys/client/client/services/SetCollectionTTLService.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/services/SetCollectionTTLService.java Thu Dec 08 09:12:27 2011 +0000 @@ -13,7 +13,7 @@ @RemoteServiceRelativePath("set-collectionttl") public interface SetCollectionTTLService extends RemoteService { - void setTTL(Collection c, String url) + void setTTL(Collection c) throws ServerException; } // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :
--- a/flys-client/src/main/java/de/intevation/flys/client/client/services/SetCollectionTTLServiceAsync.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/services/SetCollectionTTLServiceAsync.java Thu Dec 08 09:12:27 2011 +0000 @@ -12,7 +12,6 @@ public void setTTL( Collection collection, - String url, AsyncCallback<Void> callback); } // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :
--- a/flys-client/src/main/java/de/intevation/flys/client/client/services/StepForwardService.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/services/StepForwardService.java Thu Dec 08 09:12:27 2011 +0000 @@ -19,7 +19,6 @@ * This method inserts new data into the an existing artifact and * advances its state. * - * @param serverUrl The url of the artifact server. * @param locale The locale used for the request. * @param artifact The artifact. * @param data The data that should be inserted. @@ -27,7 +26,6 @@ * @return the artifact which description might have been changed. */ public Artifact go( - String serverUrl, String locale, Artifact artifact, Data[] data)
--- a/flys-client/src/main/java/de/intevation/flys/client/client/services/StepForwardServiceAsync.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/services/StepForwardServiceAsync.java Thu Dec 08 09:12:27 2011 +0000 @@ -14,7 +14,6 @@ public interface StepForwardServiceAsync { public void go( - String serverUrl, String locale, Artifact artifact, Data[] data,
--- a/flys-client/src/main/java/de/intevation/flys/client/client/services/UserService.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/services/UserService.java Thu Dec 08 09:12:27 2011 +0000 @@ -18,11 +18,11 @@ /** * This method retrieves the user that is currently logged in. * - * @param serverUrl The url of the artifact server. + * @param locale The current locale. * * @return the current {@link User}. */ - User getCurrentUser(String serverUrl, String locale) + User getCurrentUser(String locale) throws AuthenticationException; } // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :
--- a/flys-client/src/main/java/de/intevation/flys/client/client/services/UserServiceAsync.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/services/UserServiceAsync.java Thu Dec 08 09:12:27 2011 +0000 @@ -13,7 +13,6 @@ public interface UserServiceAsync { void getCurrentUser( - String serverUrl, String locale, AsyncCallback<User> callback); }
--- a/flys-client/src/main/java/de/intevation/flys/client/client/services/WQInfoService.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/services/WQInfoService.java Thu Dec 08 09:12:27 2011 +0000 @@ -19,7 +19,6 @@ * This method returns a list of DistanceInfoObjects for a specific river. */ WQInfoObject[] getWQInfo( - String serverUrl, String locale, String river, double start,
--- a/flys-client/src/main/java/de/intevation/flys/client/client/services/WQInfoServiceAsync.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/services/WQInfoServiceAsync.java Thu Dec 08 09:12:27 2011 +0000 @@ -11,7 +11,6 @@ public interface WQInfoServiceAsync { void getWQInfo( - String url, String locale, String river, double start,
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/CollectionView.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/CollectionView.java Thu Dec 08 09:12:27 2011 +0000 @@ -224,11 +224,11 @@ GWT.log("CollectionView.createNewCollection"); Config config = Config.getInstance(); - final String url = config.getServerUrl(); final String locale = config.getLocale(); createCollectionService.create( - url, locale, ownerId, + locale, + ownerId, new AsyncCallback<Collection>() { public void onFailure(Throwable caught) { GWT.log("Could not create the new collection."); @@ -368,10 +368,9 @@ if (c != null) { Config config = Config.getInstance(); - String url = config.getServerUrl(); String locale = config.getLocale(); - describeCollectionService.describe(c.identifier(), url, locale, + describeCollectionService.describe(c.identifier(), locale, new AsyncCallback<Collection>() { public void onFailure(Throwable caught) { GWT.log("Could not DESCRIBE collection."); @@ -575,7 +574,7 @@ artifactsQueue++; addArtifactService.add( - collection, artifact, url, locale, + collection, artifact, locale, new AsyncCallback<Collection>() { public void onFailure(Throwable caught) { GWT.log("An error occured while adding artifact."); @@ -597,13 +596,12 @@ protected void addRecommendationsToCollection() { Config config = Config.getInstance(); - final String url = config.getServerUrl(); final String locale = config.getLocale(); final Collection collection = getCollection(); collection.addRecommendations(newRecommendations); - updater.update(collection, url, locale, + updater.update(collection, locale, new AsyncCallback<Collection>() { public void onFailure(Throwable caught) { newRecommendations.removeAllElements(); @@ -654,7 +652,7 @@ GWT.log("Load recommended artifact with factory: " + factory); createArtifactService.create( - url, locale, factory, recommendation, + locale, factory, recommendation, new AsyncCallback<Artifact>() { public void onFailure(Throwable caught) { GWT.log("Error loading recommendations: " +
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/DatacageTwinPanel.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/DatacageTwinPanel.java Thu Dec 08 09:12:27 2011 +0000 @@ -286,7 +286,6 @@ } Config config = Config.getInstance(); - String url = config.getServerUrl(); String locale = config.getLocale(); ListGridRecord[] records = differencesList.getRecords(); @@ -367,7 +366,6 @@ for(final String uuid: artifactIdsToRemove) { removeArtifactService.remove(this.collection, uuid, - url, locale, new AsyncCallback<Collection>() { public void onFailure(Throwable caught) {
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/DatacageWidget.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/DatacageWidget.java Thu Dec 08 09:12:27 2011 +0000 @@ -357,14 +357,13 @@ protected void triggerTreeBuilding() { Config config = Config.getInstance(); - String url = config.getServerUrl(); String locale = config.getLocale(); String artifactId = artifact.getUuid(); String userId = (user != null) ? user.identifier() : null; metaDataService.getMetaData( - url, locale, + locale, artifactId, userId, outs,
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/DatacageWindow.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/DatacageWindow.java Thu Dec 08 09:12:27 2011 +0000 @@ -160,7 +160,6 @@ final Collection collection = view.getCollection(); final Artifact masterArtifact = view.getArtifact(); - final String serverUrl = cfg.getServerUrl(); final String locale = cfg.getLocale(); this.inProgress = recommendations.length; @@ -180,7 +179,6 @@ collection, recommendation, factory, - serverUrl, locale, new AsyncCallback<Artifact>() { public void onFailure(Throwable caught) {
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/DigitizePanel.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/DigitizePanel.java Thu Dec 08 09:12:27 2011 +0000 @@ -74,7 +74,6 @@ Canvas selectBox = super.create(clone); final Config cfg = Config.getInstance(); - final String url = cfg.getServerUrl(); final String locale = cfg.getLocale(); DataItem[] obj = barriers.getItems(); @@ -88,7 +87,7 @@ } String river = getDataValue("state.winfo.river", "river"); - mapInfo.getMapInfo(url, locale, river, new AsyncCallback<MapInfo>() { + mapInfo.getMapInfo(locale, river, new AsyncCallback<MapInfo>() { public void onFailure(Throwable caught) { String msg = caught.getMessage();
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/LoadingPanel.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/LoadingPanel.java Thu Dec 08 09:12:27 2011 +0000 @@ -131,10 +131,9 @@ updateMessage(); final Config config = Config.getInstance(); - final String url = config.getServerUrl(); final String locale = config.getLocale(); - describe.describe(url, locale, artifact, new AsyncCallback<Artifact>() { + describe.describe(locale, artifact, new AsyncCallback<Artifact>() { public void onFailure(Throwable t) { GWT.log("Error while DESCRIBE artifact: " + t.getMessage()); // SC.warn()...
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/ParameterList.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/ParameterList.java Thu Dec 08 09:12:27 2011 +0000 @@ -352,7 +352,7 @@ final Data[] feedData = new Data[] { data[1] }; artifactService.create( - url, locale, module.toLowerCase(), null, + locale, module.toLowerCase(), null, new AsyncCallback<Artifact>() { public void onFailure(Throwable caught) { GWT.log("Could not create the new artifact."); @@ -362,7 +362,7 @@ public void onSuccess(Artifact artifact) { GWT.log("Successfully created a new artifact."); - forwardService.go(url, locale, artifact, feedData, + forwardService.go(locale, artifact, feedData, new AsyncCallback<Artifact>() { public void onFailure(Throwable caught) { GWT.log("Could not feed the artifact."); @@ -578,10 +578,9 @@ GWT.log("CollectionView - onStepForward()"); Config config = Config.getInstance(); - String serverUrl = config.getServerUrl(); String locale = config.getLocale(); - forwardService.go(serverUrl, locale, artifact, event.getData(), + forwardService.go(locale, artifact, event.getData(), new AsyncCallback<Artifact>() { public void onFailure(Throwable caught) { GWT.log("Could not feed the artifact."); @@ -608,10 +607,9 @@ final String target = e.getTarget(); Config config = Config.getInstance(); - final String serverUrl = config.getServerUrl(); final String locale = config.getLocale(); - advanceService.advance(serverUrl, locale, artifact, target, + advanceService.advance(locale, artifact, target, new AsyncCallback<Artifact>() { public void onFailure(Throwable caught) { GWT.log("Could not go back to '" + target + "'"); @@ -632,10 +630,9 @@ public void onAdvance(final String target) { Config config = Config.getInstance(); - final String serverUrl = config.getServerUrl(); final String locale = config.getLocale(); - advanceService.advance(serverUrl, locale, artifact, target, + advanceService.advance(locale, artifact, target, new AsyncCallback<Artifact>() { public void onFailure(Throwable caught) { GWT.log("Could not go to '" + target + "'"); @@ -804,7 +801,6 @@ } Config config = Config.getInstance(); - String url = config.getServerUrl(); String locale = config.getLocale(); String cid = c.identifier(); @@ -812,7 +808,7 @@ for (ReportMode report: reports) { GWT.log("report '" + report.toString() + "'"); - reportService.report(cid, url, locale, report.getName(), + reportService.report(cid, locale, report.getName(), new AsyncCallback<String>() { public void onFailure(Throwable caught) { SC.warn(caught.getMessage());
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/ProjectList.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/ProjectList.java Thu Dec 08 09:12:27 2011 +0000 @@ -441,8 +441,7 @@ GWT.log("Update Collection name: " + c.identifier()); GWT.log("=> New name = " + c.getName()); - Config config = Config.getInstance(); - nameService.setName(c, config.getServerUrl(), new AsyncCallback<Void>(){ + nameService.setName(c, new AsyncCallback<Void>(){ public void onFailure(Throwable caught) { String msg = caught.getMessage(); @@ -478,8 +477,7 @@ GWT.log("Update Collection TTL: " + c.identifier()); GWT.log("=> New ttl = " + c.getTTL()); - Config config = Config.getInstance(); - ttlService.setTTL(c, config.getServerUrl(), new AsyncCallback<Void>() { + ttlService.setTTL(c, new AsyncCallback<Void>() { public void onFailure(Throwable caught) { String msg = caught.getMessage(); @@ -510,8 +508,7 @@ GWT.log("Delete Collection: " + c.identifier()); - Config config = Config.getInstance(); - deleteService.delete(c, config.getServerUrl(), new AsyncCallback<Void>(){ + deleteService.delete(c, new AsyncCallback<Void>(){ public void onFailure(Throwable caught) { String msg = caught.getMessage(); @@ -738,12 +735,11 @@ protected void cloneProject(Collection c) { Config config = Config.getInstance(); - String url = config.getServerUrl(); String locale = config.getLocale(); cloneCollection = c; - describeCollectionService.describe(c.identifier(), url, locale, + describeCollectionService.describe(c.identifier(), locale, new AsyncCallback<Collection>() { public void onFailure(Throwable caught) { GWT.log("Could not DESCRIBE collection."); @@ -781,7 +777,7 @@ String factory = recommendation.getFactory(); createArtifactService.create( - url, locale, factory, recommendation, + locale, factory, recommendation, new AsyncCallback<Artifact>() { public void onFailure(Throwable caught) { GWT.log("Error loading recommendations: " + @@ -799,12 +795,12 @@ protected void createCollection(final Artifact artifact) { Config config = Config.getInstance(); - final String url = config.getServerUrl(); final String locale = config.getLocale(); final String ownerid = user.identifier(); createCollectionService.create( - url, locale, ownerid, + locale, + ownerid, new AsyncCallback<Collection>() { public void onFailure(Throwable caught) { GWT.log("Could not create the new collection."); @@ -826,7 +822,7 @@ final String locale = config.getLocale(); addArtifactService.add( - c, a, url, locale, + c, a, locale, new AsyncCallback<Collection>() { public void onFailure(Throwable caught) { GWT.log("An error occured while adding artifact.");
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/StyleEditorWindow.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/StyleEditorWindow.java Thu Dec 08 09:12:27 2011 +0000 @@ -404,13 +404,11 @@ protected void saveStyle () { GWT.log("StyleEditorWindow.saveStyle()"); Config config = Config.getInstance(); - String url = config.getServerUrl(); String locale = config.getLocale(); itemAttributeService.setCollectionItemAttribute( this.collection, attributes.getArtifact(), - url, locale, attributes, new AsyncCallback<Void>() {
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/TableDataPanel.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/TableDataPanel.java Thu Dec 08 09:12:27 2011 +0000 @@ -65,13 +65,12 @@ */ public Canvas create() { Config config = Config.getInstance(); - String url = config.getServerUrl(); String locale = config.getLocale (); dataTable.setEmptyMessage(MESSAGES.empty_table()); dataTable.setShowHeaderContextMenu(false); dataTable.setCanDragSelectText(true); - exportService.getCSV(url, locale, uuid, name, + exportService.getCSV(locale, uuid, name, new AsyncCallback<List<String[]>>() { public void onFailure(Throwable caught) { GWT.log("Could not recieve csv.");
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/ThemePanel.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/ThemePanel.java Thu Dec 08 09:12:27 2011 +0000 @@ -261,7 +261,6 @@ */ public void updateCollection() { final Config config = Config.getInstance(); - final String url = config.getServerUrl(); final String loc = config.getLocale(); GWT.log("ThemePanel.updateCollection via RPC now"); @@ -269,7 +268,7 @@ // don't forget to enable the panel after the request has finished! disable(); - updater.update(collection, url, loc, new AsyncCallback<Collection>() { + updater.update(collection, loc, new AsyncCallback<Collection>() { public void onFailure(Throwable caught) { GWT.log("Could not update collection attributes."); SC.warn(MSG.getString(caught.getMessage())); @@ -570,7 +569,6 @@ protected void openStyleEditor(final FacetRecord record) { Config config = Config.getInstance(); - String url = config.getServerUrl(); String locale = config.getLocale(); String artifact = record.getTheme().getArtifact(); @@ -578,7 +576,6 @@ itemAttributeService.getCollectionItemAttribute( this.collection, artifact, - url, locale, new AsyncCallback<CollectionItemAttribute>() { public void onFailure (Throwable caught) {
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/WQInputPanel.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/WQInputPanel.java Thu Dec 08 09:12:27 2011 +0000 @@ -1406,7 +1406,7 @@ double[] mm = getMinMaxKM(data); String river = getRiverName(data); - wqInfoService.getWQInfo(url, locale, river, mm[0], mm[1], + wqInfoService.getWQInfo(locale, river, mm[0], mm[1], new AsyncCallback<WQInfoObject[]>() { public void onFailure(Throwable caught) { GWT.log("Could not recieve wq informations.");
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/WspDatacagePanel.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/WspDatacagePanel.java Thu Dec 08 09:12:27 2011 +0000 @@ -79,14 +79,13 @@ if (errors == null || errors.isEmpty()) { // 1) Fetch selected recommendation Config config = Config.getInstance(); - final String url = config.getServerUrl(); final String locale = config.getLocale(); final Collection c = this.collection; final Recommendation r = getSelectedRecommendation(); // 2) Create, load Artifact and fire event loadService.load( - c, r, "winfo", url, locale, + c, r, "winfo", locale, new AsyncCallback<Artifact>() { public void onFailure(Throwable caught) { SC.warn(MSG.getString(caught.getMessage()));
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/chart/ChartOutputTab.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/chart/ChartOutputTab.java Thu Dec 08 09:12:27 2011 +0000 @@ -429,12 +429,10 @@ */ public void updateChartInfo() { Config config = Config.getInstance(); - String url = config.getServerUrl(); String locale = config.getLocale(); info.getChartInfo( view.getCollection(), - url, locale, mode.getName(), getChartAttributes(),
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/chart/CrossSectionChartThemePanel.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/chart/CrossSectionChartThemePanel.java Thu Dec 08 09:12:27 2011 +0000 @@ -61,7 +61,6 @@ final FacetRecord facetRecord) { Config config = Config.getInstance(); - final String serverUrl = config.getServerUrl(); final String locale = config.getLocale(); ChangedHandler handler = new ChangedHandler() @@ -81,7 +80,7 @@ null, new DataItem[] {kmItem}); Data[] feedData = new Data[] {km}; - feedService.feed(serverUrl, + feedService.feed( locale, new DefaultArtifact( facetRecord.getTheme().getArtifact(),
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/map/MapOutputTab.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/map/MapOutputTab.java Thu Dec 08 09:12:27 2011 +0000 @@ -522,10 +522,9 @@ new DataItem[] {item} ); Config config = Config.getInstance(); - final String url = config.getServerUrl(); final String locale = config.getLocale(); - feedService.go(url, locale, getArtifact(), new Data[] { data }, + feedService.go(locale, getArtifact(), new Data[] { data }, new AsyncCallback<Artifact>() { public void onFailure(Throwable caught) { GWT.log("Could not save barrier geometries: " +
--- a/flys-client/src/main/java/de/intevation/flys/client/server/AddArtifactServiceImpl.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/server/AddArtifactServiceImpl.java Thu Dec 08 09:12:27 2011 +0000 @@ -22,11 +22,11 @@ public Collection add( Collection collection, Artifact artifact, - String url, String locale) throws ServerException { logger.info("AddArtifactServiceImpl.add"); + String url = getServletContext().getInitParameter("server-url"); return CollectionHelper.addArtifact(collection, artifact, url, locale); }
--- a/flys-client/src/main/java/de/intevation/flys/client/server/AdvanceServiceImpl.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/server/AdvanceServiceImpl.java Thu Dec 08 09:12:27 2011 +0000 @@ -40,7 +40,6 @@ public Artifact advance( - String serverUrl, String locale, Artifact artifact, String target) @@ -48,12 +47,14 @@ { logger.info("AdvanceServiceImpl.advance"); + String url = getServletContext().getInitParameter("server-url"); + Document advance = ClientProtocolUtils.newAdvanceDocument( artifact.getUuid(), artifact.getHash(), target); - HttpClient client = new HttpClientImpl(serverUrl, locale); + HttpClient client = new HttpClientImpl(url, locale); try { Document description = (Document) client.advance(
--- a/flys-client/src/main/java/de/intevation/flys/client/server/ArtifactServiceImpl.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/server/ArtifactServiceImpl.java Thu Dec 08 09:12:27 2011 +0000 @@ -28,14 +28,12 @@ * Creates new Artifacts based on a given Recommendation and factory. * <b>Note, that all the work is done in ArtifactHelper!</b> * - * @param serverUrl The URL of the ArtifactServer. * @param locale The locale used for HTTP request. * @param factory The factory that is used to create the new Artifact. * * @return a new Artifact. */ public Artifact create( - String serverUrl, String locale, String factory, Recommendation recom @@ -44,7 +42,9 @@ { logger.info("ArtifactServiceImpl.create"); - return ArtifactHelper.createArtifact(serverUrl, locale, factory, recom); + String url = getServletContext().getInitParameter("server-url"); + + return ArtifactHelper.createArtifact(url, locale, factory, recom); } } // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :
--- a/flys-client/src/main/java/de/intevation/flys/client/server/CSVExportServiceImpl.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/server/CSVExportServiceImpl.java Thu Dec 08 09:12:27 2011 +0000 @@ -41,7 +41,6 @@ "error_no_export_found"; public List<String[]> getCSV( - String url, String locale, String uuid, String name) @@ -49,6 +48,8 @@ { logger.info("CSVExportServiceImpl.getCSV"); + String url = getServletContext().getInitParameter("server-url"); + Document requestDoc = XMLUtils.newDocument(); XMLUtils.ElementCreator ec = new XMLUtils.ElementCreator(
--- a/flys-client/src/main/java/de/intevation/flys/client/server/ChartInfoServiceImpl.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/server/ChartInfoServiceImpl.java Thu Dec 08 09:12:27 2011 +0000 @@ -60,7 +60,6 @@ public ChartInfo getChartInfo( Collection collection, - String url, String locale, String type, Map<String, String> attr) @@ -68,6 +67,8 @@ { logger.info("ChartInfoServiceImpl.getChartInfo"); + String url = getServletContext().getInitParameter("server-url"); + Document request = ClientProtocolUtils.newOutCollectionDocument( collection.identifier(), type,
--- a/flys-client/src/main/java/de/intevation/flys/client/server/ChartOutputServiceImpl.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/server/ChartOutputServiceImpl.java Thu Dec 08 09:12:27 2011 +0000 @@ -39,7 +39,8 @@ try { OutputStream out = resp.getOutputStream(); - String serverUrl = req.getParameter("server"); + String url = getServletContext().getInitParameter("server-url"); + String uuid = req.getParameter("uuid"); String type = req.getParameter("type"); String locale = req.getParameter("locale"); @@ -50,7 +51,7 @@ uuid, type, type, ChartServiceHelper.getChartAttributes(prepareChartAttributes(req))); - HttpClient client = new HttpClientImpl(serverUrl, locale); + HttpClient client = new HttpClientImpl(url, locale); client.collectionOut(request, uuid, "chart", out); out.close();
--- a/flys-client/src/main/java/de/intevation/flys/client/server/CollectionAttributeServiceImpl.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/server/CollectionAttributeServiceImpl.java Thu Dec 08 09:12:27 2011 +0000 @@ -32,11 +32,13 @@ "error_update_collection_attribute"; - public Collection update(Collection collection, String url, String locale) + public Collection update(Collection collection, String locale) throws ServerException { logger.info("CollectionAttributeServiceImpl.update"); + String url = getServletContext().getInitParameter("server-url"); + Document attribute = CollectionHelper.createAttribute(collection); Document action = ClientProtocolUtils.newSetAttributeDocument( collection.identifier(), @@ -51,7 +53,7 @@ logger.debug("Collection attribute successfully set."); - return describe(collection.identifier(), url, locale); + return describe(collection.identifier(), locale); } catch (ConnectionException ce) { logger.error(ce, ce);
--- a/flys-client/src/main/java/de/intevation/flys/client/server/CollectionItemAttributeServiceImpl.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/server/CollectionItemAttributeServiceImpl.java Thu Dec 08 09:12:27 2011 +0000 @@ -48,13 +48,14 @@ public CollectionItemAttribute getCollectionItemAttribute( Collection collection, String artifact, - String url, String locale) throws ServerException { logger.info( "CollectionItemAttributeServiceImpl.getCollectionItemAttribute"); + String url = getServletContext().getInitParameter("server-url"); + Document requestDoc = XMLUtils.newDocument(); XMLUtils.ElementCreator ec = new XMLUtils.ElementCreator( @@ -93,7 +94,6 @@ public void setCollectionItemAttribute( Collection collection, String artifact, - String url, String locale, CollectionItemAttribute attributes) throws ServerException @@ -101,6 +101,8 @@ logger.info( "CollectionItemAttributeServiceImpl.setCollectionItemAttribute"); + String url = getServletContext().getInitParameter("server-url"); + Document doc = writeXML(attributes, artifact); try {
--- a/flys-client/src/main/java/de/intevation/flys/client/server/CreateCollectionServiceImpl.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/server/CreateCollectionServiceImpl.java Thu Dec 08 09:12:27 2011 +0000 @@ -49,14 +49,16 @@ "error_create_collection"; - public Collection create(String serverUrl, String locale, String ownerId) + public Collection create(String locale, String ownerId) throws ServerException { logger.info("Start creating a new collection."); + String url = getServletContext().getInitParameter("server-url"); + Document create = ClientProtocolUtils.newCreateCollectionDocument(null); - HttpClient client = new HttpClientImpl(serverUrl, locale); + HttpClient client = new HttpClientImpl(url, locale); try { Document doc = (Document) client.createCollection(
--- a/flys-client/src/main/java/de/intevation/flys/client/server/DeleteCollectionServiceImpl.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/server/DeleteCollectionServiceImpl.java Thu Dec 08 09:12:27 2011 +0000 @@ -25,11 +25,13 @@ public static final String XPATH_RESULT = "/art:result/text()"; public static final String OPERATION_FAILURE = "FAILED"; - public void delete(Collection c, String url) + public void delete(Collection c) throws ServerException { logger.info("Delete collection: " + c.identifier()); + String url = getServletContext().getInitParameter("server-url"); + Document del = ClientProtocolUtils.newDeleteCollectionDocument(); doAction(c, del, url);
--- a/flys-client/src/main/java/de/intevation/flys/client/server/DescribeArtifactServiceImpl.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/server/DescribeArtifactServiceImpl.java Thu Dec 08 09:12:27 2011 +0000 @@ -35,11 +35,13 @@ "error_describe_artifact"; - public Artifact describe(String url, String locale, Artifact artifact) + public Artifact describe(String locale, Artifact artifact) throws ServerException { logger.info("DescribeArtifactServiceImpl.describe"); + String url = getServletContext().getInitParameter("server-url"); + Document describe = ClientProtocolUtils.newDescribeDocument( artifact.getUuid(), artifact.getHash(),
--- a/flys-client/src/main/java/de/intevation/flys/client/server/DescribeCollectionServiceImpl.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/server/DescribeCollectionServiceImpl.java Thu Dec 08 09:12:27 2011 +0000 @@ -40,15 +40,17 @@ "error_describe_collection"; - public Collection describe(String uuid, String serverUrl, String locale) + public Collection describe(String uuid, String locale) throws ServerException { logger.info("DescribeCollectionServiceImpl.describe"); + String url = getServletContext().getInitParameter("server-url"); + Document describe = ClientProtocolUtils.newDescribeCollectionDocument( uuid); - HttpClient client = new HttpClientImpl(serverUrl, locale); + HttpClient client = new HttpClientImpl(url, locale); try { Document response = (Document) client.doCollectionAction(
--- a/flys-client/src/main/java/de/intevation/flys/client/server/DistanceInfoServiceImpl.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/server/DistanceInfoServiceImpl.java Thu Dec 08 09:12:27 2011 +0000 @@ -42,13 +42,14 @@ public DistanceInfoObject[] getDistanceInfo( - String url, String locale, String river) throws ServerException { logger.info("DistanceInfoServiceImpl.getDistanceInfo"); + String url = getServletContext().getInitParameter("server-url"); + Document doc = XMLUtils.newDocument(); XMLUtils.ElementCreator ec = new XMLUtils.ElementCreator(
--- a/flys-client/src/main/java/de/intevation/flys/client/server/DistanceInfoXML.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/server/DistanceInfoXML.java Thu Dec 08 09:12:27 2011 +0000 @@ -38,8 +38,9 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) { logger.info("DistanceInfoXML.doGet"); + String url = getServletContext().getInitParameter("server-url"); + String river = req.getParameter("river"); - String url = req.getParameter("server"); String filter = req.getParameter("filter"); Document doc = XMLUtils.newDocument();
--- a/flys-client/src/main/java/de/intevation/flys/client/server/ExportServiceImpl.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/server/ExportServiceImpl.java Thu Dec 08 09:12:27 2011 +0000 @@ -37,7 +37,8 @@ try { OutputStream out = resp.getOutputStream(); - String serverUrl = req.getParameter("server"); + String url = getServletContext().getInitParameter("server-url"); + String uuid = req.getParameter("uuid"); String mode = req.getParameter("mode"); String type = req.getParameter("type"); @@ -50,7 +51,7 @@ Document request = ClientProtocolUtils.newOutCollectionDocument( uuid, mode, type); - HttpClient client = new HttpClientImpl(serverUrl, locale); + HttpClient client = new HttpClientImpl(url, locale); client.collectionOut(request, uuid, mode, out); out.close();
--- a/flys-client/src/main/java/de/intevation/flys/client/server/FeedServiceImpl.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/server/FeedServiceImpl.java Thu Dec 08 09:12:27 2011 +0000 @@ -49,7 +49,6 @@ /** * This method triggers the FEED operation. * - * @param url The url of the artifact server. * @param artifact The artifact that needs to be fed. * @param data An array of Data objects that contain the information that * are used for the FEED operation. @@ -57,7 +56,6 @@ * @return a new artifact parsed from the description of FEED. */ public Artifact feed( - String url, String locale, Artifact artifact, Data[] data) @@ -65,6 +63,8 @@ { logger.info("StepForwardServiceImpl.feed"); + String url = getServletContext().getInitParameter("server-url"); + Document feed = ClientProtocolUtils.newFeedDocument( artifact.getUuid(), artifact.getHash(),
--- a/flys-client/src/main/java/de/intevation/flys/client/server/GetArtifactServiceImpl.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/server/GetArtifactServiceImpl.java Thu Dec 08 09:12:27 2011 +0000 @@ -43,7 +43,6 @@ public Artifact getArtifact( - String url, String locale, String uuid, String hash) @@ -51,6 +50,8 @@ { logger.info("GetArtifactServiceImpl.getArtifact"); + String url = getServletContext().getInitParameter("server-url"); + Document describe = ClientProtocolUtils.newDescribeDocument( uuid, hash, true);
--- a/flys-client/src/main/java/de/intevation/flys/client/server/LoadArtifactServiceImpl.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/server/LoadArtifactServiceImpl.java Thu Dec 08 09:12:27 2011 +0000 @@ -38,20 +38,20 @@ * @param parent collection to add recommendation to. * @param recom recommendation to create clone for. * @param factory factory to use. - * @param url servers url. * @param locale the locale to translate messages. */ public Artifact load( Collection parent, Recommendation recom, String factory, - String url, String locale ) throws ServerException { logger.info( "LoadArtifactServiceImpl.load: " + recom.getMasterArtifact()); + String url = getServletContext().getInitParameter("server-url"); + // 1) Clone the Artifact specified in >>recom<< Artifact clone = ArtifactHelper.createArtifact( url, locale, factory, recom); @@ -81,7 +81,6 @@ * @param factory name of factory to use when cloning artifacts (can be * null in which case the recommendations getFactory() will * be used. - * @param url servers url. * @param locale the locale to translate messages. * * @return cloned artifacts (same artifact might be contained multiple
--- a/flys-client/src/main/java/de/intevation/flys/client/server/MapInfoServiceImpl.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/server/MapInfoServiceImpl.java Thu Dec 08 09:12:27 2011 +0000 @@ -57,11 +57,13 @@ "mapinfo_service_no_result"; - public MapInfo getMapInfo(String url, String locale, String river) + public MapInfo getMapInfo(String locale, String river) throws ServerException { logger.info("MapInfoServiceImpl.getMapInfo"); + String url = getServletContext().getInitParameter("server-url"); + Document request = getRequestDocument(river);; HttpClient client = new HttpClientImpl(url, locale);
--- a/flys-client/src/main/java/de/intevation/flys/client/server/MetaDataServiceImpl.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/server/MetaDataServiceImpl.java Thu Dec 08 09:12:27 2011 +0000 @@ -37,7 +37,6 @@ @Override public DataCageTree getMetaData( - String url, String locale, String artifactId, String userId, @@ -47,6 +46,8 @@ { logger.info("MetaDataService.getMetaData"); + String url = getServletContext().getInitParameter("server-url"); + Document doc = XMLUtils.newDocument(); XMLUtils.ElementCreator ec = new XMLUtils.ElementCreator(
--- a/flys-client/src/main/java/de/intevation/flys/client/server/RemoveArtifactServiceImpl.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/server/RemoveArtifactServiceImpl.java Thu Dec 08 09:12:27 2011 +0000 @@ -21,12 +21,13 @@ public Collection remove( Collection collection, String artifactId, - String url, String locale) throws ServerException { logger.info("RemoveArtifactServiceImpl.remove"); + String url = getServletContext().getInitParameter("server-url"); + return CollectionHelper.removeArtifact(collection, artifactId, url, locale); } }
--- a/flys-client/src/main/java/de/intevation/flys/client/server/ReportServiceImpl.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/server/ReportServiceImpl.java Thu Dec 08 09:12:27 2011 +0000 @@ -32,12 +32,13 @@ @Override public String report( String collectionId, - String url, String locale, String out ) { logger.info("report: " + collectionId + " " + out); + String url = getServletContext().getInitParameter("server-url"); + Document request = ClientProtocolUtils.newOutCollectionDocument( collectionId, out,
--- a/flys-client/src/main/java/de/intevation/flys/client/server/RiverServiceImpl.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/server/RiverServiceImpl.java Thu Dec 08 09:12:27 2011 +0000 @@ -48,9 +48,11 @@ public static final String ERROR_NO_RIVERS_FOUND = "error_no_rivers_found"; - public River[] list(String serverUrl, String locale) + public River[] list(String locale) throws ServerException { + String url = getServletContext().getInitParameter("server-url"); + Document doc = XMLUtils.newDocument(); XMLUtils.ElementCreator ec = new XMLUtils.ElementCreator( @@ -60,10 +62,10 @@ doc.appendChild(ec.create("action")); - HttpClient client = new HttpClientImpl(serverUrl, locale); + HttpClient client = new HttpClientImpl(url, locale); try { - Document res = client.callService(serverUrl, "rivers", doc); + Document res = client.callService(url, "rivers", doc); NodeList rivers = (NodeList) XMLUtils.xpath( res,
--- a/flys-client/src/main/java/de/intevation/flys/client/server/SetCollectionNameServiceImpl.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/server/SetCollectionNameServiceImpl.java Thu Dec 08 09:12:27 2011 +0000 @@ -22,11 +22,13 @@ Logger.getLogger(SetCollectionNameServiceImpl.class); - public void setName(Collection c, String url) + public void setName(Collection c) throws ServerException { logger.info("Set name of collection: " + c.identifier()); + String url = getServletContext().getInitParameter("server-url"); + String name = c.getName(); Document set = ClientProtocolUtils.newSetCollectionNameDocument(name);
--- a/flys-client/src/main/java/de/intevation/flys/client/server/SetCollectionTTLServiceImpl.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/server/SetCollectionTTLServiceImpl.java Thu Dec 08 09:12:27 2011 +0000 @@ -25,11 +25,13 @@ public static final String XPATH_RESULT = "/art:result/text()"; public static final String OPERATION_FAILURE = "FAILED"; - public void setTTL(Collection c, String url) + public void setTTL(Collection c) throws ServerException { logger.info("Set ttl of collection: " + c.identifier()); + String url = getServletContext().getInitParameter("server-url"); + long ttl = c.getTTL(); String value = null;
--- a/flys-client/src/main/java/de/intevation/flys/client/server/StepForwardServiceImpl.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/server/StepForwardServiceImpl.java Thu Dec 08 09:12:27 2011 +0000 @@ -53,18 +53,19 @@ * This method wraps the artifact operations FEED and ADVANCE. FEED is * always triggerd, ADVANCE only, if there is at least one reachable state. * - * @param url The url of the artifact server. * @param locale The locale used for the request. * @param artifact The artifact that needs to be fed. * @param data An array of Data objects that contain the information that * * @return the modified artifact. */ - public Artifact go(String url, String locale, Artifact artifact, Data[] data) + public Artifact go(String locale, Artifact artifact, Data[] data) throws ServerException { logger.info("StepForwardServiceImpl.go"); + String url = getServletContext().getInitParameter("server-url"); + Artifact afterFeed = feed(url, locale, artifact, data); if (afterFeed == null) { @@ -82,7 +83,7 @@ // We use the first reachable state as default target, maybe we need to // change this later. - return advance(url, locale, afterFeed, reachable[0]); + return advance(locale, afterFeed, reachable[0]); }
--- a/flys-client/src/main/java/de/intevation/flys/client/server/UserServiceImpl.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/server/UserServiceImpl.java Thu Dec 08 09:12:27 2011 +0000 @@ -35,10 +35,12 @@ public static final String ERROR_NO_SUCH_USER = "error_no_such_user"; - public User getCurrentUser(String serverUrl, String locale) + public User getCurrentUser(String locale) throws AuthenticationException { - HttpClient client = new HttpClientImpl(serverUrl); + String url = getServletContext().getInitParameter("server-url"); + + HttpClient client = new HttpClientImpl(url); try { Document users = (Document) client.listUsers();
--- a/flys-client/src/main/java/de/intevation/flys/client/server/WQInfoServiceImpl.java Thu Dec 08 08:06:11 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/server/WQInfoServiceImpl.java Thu Dec 08 09:12:27 2011 +0000 @@ -45,7 +45,6 @@ public WQInfoObject[] getWQInfo( - String url, String locale, String river, double from, @@ -54,6 +53,8 @@ { logger.info("WQInfoServiceImpl.getWQInfo"); + String url = getServletContext().getInitParameter("server-url"); + Document doc = XMLUtils.newDocument(); XMLUtils.ElementCreator ec = new XMLUtils.ElementCreator(