# HG changeset patch # User Christian Lins # Date 1346755360 0 # Node ID 98fac4872ae6bf83271f2df826e1f52a76f2c117 # Parent 091397efaca5585325ac53f90dd57390cde8cf03 Add missing imports and fix package declaration of RemoteServiceServlet flys-client/trunk@5353 c6561f87-3c4e-4783-a992-168aeb5c3f6f diff -r 091397efaca5 -r 98fac4872ae6 flys-client/ChangeLog --- a/flys-client/ChangeLog Tue Sep 04 09:19:33 2012 +0000 +++ b/flys-client/ChangeLog Tue Sep 04 10:42:40 2012 +0000 @@ -1,3 +1,10 @@ +2012-09-04 Christian Lins + + * src/main/java/de/intevation/flys/client/server/RiverServiceImpl.java, + src/main/java/de/intevation/flys/client/server/ModuleServiceImpl.java, + src/main/java/de/intevation/flys/client/client/services/RemoteServiceServlet.java: + Add missing imports and fix package declaration. + 2012-09-04 Raimund Renkert Issue 791. diff -r 091397efaca5 -r 98fac4872ae6 flys-client/pom.xml --- a/flys-client/pom.xml Tue Sep 04 09:19:33 2012 +0000 +++ b/flys-client/pom.xml Tue Sep 04 10:42:40 2012 +0000 @@ -156,6 +156,8 @@ target/www true + 8882 + INFO' -bindAddress 0.0.0.0 -codeServerPort 9992 -logLevel 'INFO diff -r 091397efaca5 -r 98fac4872ae6 flys-client/src/main/java/de/intevation/flys/client/client/services/RemoteServiceServlet.java --- a/flys-client/src/main/java/de/intevation/flys/client/client/services/RemoteServiceServlet.java Tue Sep 04 09:19:33 2012 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/services/RemoteServiceServlet.java Tue Sep 04 10:42:40 2012 +0000 @@ -1,9 +1,9 @@ -package de.intevation.flys.client.server; +package de.intevation.flys.client.client.services; + +import de.intevation.flys.client.server.auth.User; import javax.servlet.http.HttpSession; -import de.intevation.flys.client.server.auth.User; - public class RemoteServiceServlet extends com.google.gwt.user.server.rpc.RemoteServiceServlet { diff -r 091397efaca5 -r 98fac4872ae6 flys-client/src/main/java/de/intevation/flys/client/server/ModuleServiceImpl.java --- a/flys-client/src/main/java/de/intevation/flys/client/server/ModuleServiceImpl.java Tue Sep 04 09:19:33 2012 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/server/ModuleServiceImpl.java Tue Sep 04 10:42:40 2012 +0000 @@ -1,28 +1,27 @@ package de.intevation.flys.client.server; +import de.intevation.artifacts.common.ArtifactNamespaceContext; +import de.intevation.artifacts.common.utils.XMLUtils; +import de.intevation.artifacts.httpclient.exceptions.ConnectionException; +import de.intevation.artifacts.httpclient.http.HttpClient; +import de.intevation.artifacts.httpclient.http.HttpClientImpl; +import de.intevation.flys.client.client.services.ModuleService; +import de.intevation.flys.client.client.services.RemoteServiceServlet; +import de.intevation.flys.client.server.auth.User; +import de.intevation.flys.client.shared.exceptions.ServerException; +import de.intevation.flys.client.shared.model.DefaultModule; +import de.intevation.flys.client.shared.model.Module; + import java.util.ArrayList; import java.util.List; import javax.xml.xpath.XPathConstants; import org.apache.log4j.Logger; - import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; -import de.intevation.artifacts.common.ArtifactNamespaceContext; -import de.intevation.artifacts.common.utils.XMLUtils; -import de.intevation.artifacts.httpclient.exceptions.ConnectionException; -import de.intevation.artifacts.httpclient.http.HttpClient; -import de.intevation.artifacts.httpclient.http.HttpClientImpl; - -import de.intevation.flys.client.client.services.ModuleService; -import de.intevation.flys.client.server.auth.User; -import de.intevation.flys.client.shared.exceptions.ServerException; -import de.intevation.flys.client.shared.model.DefaultModule; -import de.intevation.flys.client.shared.model.Module; - public class ModuleServiceImpl extends RemoteServiceServlet implements ModuleService diff -r 091397efaca5 -r 98fac4872ae6 flys-client/src/main/java/de/intevation/flys/client/server/RiverServiceImpl.java --- a/flys-client/src/main/java/de/intevation/flys/client/server/RiverServiceImpl.java Tue Sep 04 09:19:33 2012 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/server/RiverServiceImpl.java Tue Sep 04 10:42:40 2012 +0000 @@ -1,30 +1,26 @@ package de.intevation.flys.client.server; +import de.intevation.artifacts.common.ArtifactNamespaceContext; +import de.intevation.artifacts.common.utils.XMLUtils; +import de.intevation.artifacts.httpclient.exceptions.ConnectionException; +import de.intevation.artifacts.httpclient.http.HttpClient; +import de.intevation.artifacts.httpclient.http.HttpClientImpl; +import de.intevation.flys.client.client.services.RemoteServiceServlet; +import de.intevation.flys.client.client.services.RiverService; +import de.intevation.flys.client.server.auth.User; +import de.intevation.flys.client.shared.exceptions.ServerException; +import de.intevation.flys.client.shared.model.DefaultRiver; +import de.intevation.flys.client.shared.model.River; + import java.util.ArrayList; import java.util.List; import javax.xml.xpath.XPathConstants; -import org.w3c.dom.Document; -import org.w3c.dom.NodeList; -import org.w3c.dom.Element; - import org.apache.log4j.Logger; - - -import de.intevation.artifacts.common.ArtifactNamespaceContext; -import de.intevation.artifacts.common.utils.XMLUtils; - -import de.intevation.artifacts.httpclient.exceptions.ConnectionException; -import de.intevation.artifacts.httpclient.http.HttpClient; -import de.intevation.artifacts.httpclient.http.HttpClientImpl; - -import de.intevation.flys.client.shared.exceptions.ServerException; -import de.intevation.flys.client.shared.model.DefaultRiver; -import de.intevation.flys.client.shared.model.River; -import de.intevation.flys.client.client.services.RiverService; - -import de.intevation.flys.client.server.auth.User; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.NodeList; /** diff -r 091397efaca5 -r 98fac4872ae6 flys-client/src/main/webapp/WEB-INF/web.xml --- a/flys-client/src/main/webapp/WEB-INF/web.xml Tue Sep 04 09:19:33 2012 +0000 +++ b/flys-client/src/main/webapp/WEB-INF/web.xml Tue Sep 04 10:42:40 2012 +0000 @@ -7,7 +7,7 @@ server-url - http://localhost:8181 + http://localhost:2323 @@ -511,7 +511,7 @@ de.intevation.flys.client.server.GGInAFilter deactivate - false + true