"); + respWriter.write("

"); if (result == null) { logger.warn("FileUpload service returned no result."); @@ -81,7 +82,7 @@ protected Document createFileXML(HttpServletRequest req) { - ServletFileUpload upload = new ServletFileUpload(); + ServletFileUpload upload = new ServletFileUpload(); try{ FileItemIterator iter = upload.getItemIterator(req); @@ -92,14 +93,18 @@ // Process the input stream ByteArrayOutputStream out = new ByteArrayOutputStream(); - int len; + int len, cnt = 0; byte[] buffer = new byte[stream.available()]; while ((len = stream.read(buffer, 0, buffer.length)) != -1) { out.write(buffer, 0, len); + cnt += len; } - buffer = Base64.encodeBase64(buffer); + buffer = Base64.encodeBase64(out.toByteArray()); String b64File = new String(buffer); + logger.debug("FileUploadServiceImpl.createFileXML(): " + cnt + + "/" + b64File.length() + + " bytes (orig/base64) file to be uploaded"); Document fileDoc = XMLUtils.newDocument(); diff -r a3fb76cf79b6 -r e8f152163a1e gwt-client/src/main/java/org/dive4elements/river/client/server/GGInATrustStrategy.java --- a/gwt-client/src/main/java/org/dive4elements/river/client/server/GGInATrustStrategy.java Wed Jun 05 11:56:38 2013 +0200 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/GGInATrustStrategy.java Tue Jun 11 09:40:56 2013 +0200 @@ -16,7 +16,7 @@ public class GGInATrustStrategy implements TrustStrategy { /** - * Tempoary class to accept all certificates for GGinA Authentication + * Temporary class to accept all certificates for GGinA Authentication. */ @Override diff -r a3fb76cf79b6 -r e8f152163a1e gwt-client/src/main/java/org/dive4elements/river/client/server/SamlServlet.java --- a/gwt-client/src/main/java/org/dive4elements/river/client/server/SamlServlet.java Wed Jun 05 11:56:38 2013 +0200 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/SamlServlet.java Tue Jun 11 09:40:56 2013 +0200 @@ -37,7 +37,7 @@ throws ServletException, IOException { String encoding = req.getCharacterEncoding(); - String samlTicketXML = req.getParameter("samlTicket"); + String samlTicketXML = req.getParameter("saml"); logger.debug("Processing post request"); @@ -86,6 +86,7 @@ Features features = (Features)sc.getAttribute(Features.CONTEXT_ATTRIBUTE); return new org.dive4elements.river.client.server.auth.saml.User( - assertion, features.getFeatures(assertion.getRoles()), null); + assertion, samlTicketXML, + features.getFeatures(assertion.getRoles()), null); } } diff -r a3fb76cf79b6 -r e8f152163a1e gwt-client/src/main/java/org/dive4elements/river/client/server/UserServiceImpl.java --- a/gwt-client/src/main/java/org/dive4elements/river/client/server/UserServiceImpl.java Wed Jun 05 11:56:38 2013 +0200 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/UserServiceImpl.java Tue Jun 11 09:40:56 2013 +0200 @@ -60,7 +60,8 @@ String name = user.getAttributeNS( ArtifactNamespaceContext.NAMESPACE_URI, "name"); - return new DefaultUser(uuid, name); + return new DefaultUser(uuid, name, + loginuser.getSamlXMLBase64()); } } catch (ConnectionException ce) { diff -r a3fb76cf79b6 -r e8f152163a1e gwt-client/src/main/java/org/dive4elements/river/client/server/auth/DefaultUser.java --- a/gwt-client/src/main/java/org/dive4elements/river/client/server/auth/DefaultUser.java Wed Jun 05 11:56:38 2013 +0200 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/auth/DefaultUser.java Tue Jun 11 09:40:56 2013 +0200 @@ -16,6 +16,7 @@ protected String name; protected String account; protected String password; + protected String samlXML; protected boolean expired; protected List roles; protected List features; @@ -26,12 +27,14 @@ public DefaultUser( String name, String password, + String samlXML, boolean expired, List roles, List features ) { this.name = name; this.password = password; + this.samlXML = samlXML; this.expired = expired; this.roles = roles; this.features = features; @@ -92,5 +95,14 @@ public void setAccount(String account) { this.account = account; } + + @Override + public String getSamlXMLBase64() { + return this.samlXML; + } + + public void setSamlXMLBase64(String samlXML) { + this.samlXML = samlXML; + } } // vim:set ts=4 sw=4 si et fenc=utf8 tw=80: diff -r a3fb76cf79b6 -r e8f152163a1e gwt-client/src/main/java/org/dive4elements/river/client/server/auth/User.java --- a/gwt-client/src/main/java/org/dive4elements/river/client/server/auth/User.java Wed Jun 05 11:56:38 2013 +0200 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/auth/User.java Tue Jun 11 09:40:56 2013 +0200 @@ -46,5 +46,12 @@ * Returns the users account name */ public String getAccount(); + + /** + * Returns the SAML ticket for single sign-on. + * @return The SAML ticket in base64 encoded XML. null if no ticket + * is available. + */ + public String getSamlXMLBase64(); } // vim:set ts=4 sw=4 si et fenc=utf8 tw=80: diff -r a3fb76cf79b6 -r e8f152163a1e gwt-client/src/main/java/org/dive4elements/river/client/server/auth/plain/Authenticator.java --- a/gwt-client/src/main/java/org/dive4elements/river/client/server/auth/plain/Authenticator.java Wed Jun 05 11:56:38 2013 +0200 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/auth/plain/Authenticator.java Tue Jun 11 09:40:56 2013 +0200 @@ -63,7 +63,7 @@ @Override public User getUser() { return isSuccess() - ? new DefaultUser(user, password, false, roles, this.features.getFeatures(roles)) + ? new DefaultUser(user, password, null, false, roles, this.features.getFeatures(roles)) : null; } } // class Authentication diff -r a3fb76cf79b6 -r e8f152163a1e gwt-client/src/main/java/org/dive4elements/river/client/server/auth/saml/User.java --- a/gwt-client/src/main/java/org/dive4elements/river/client/server/auth/saml/User.java Wed Jun 05 11:56:38 2013 +0200 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/auth/saml/User.java Tue Jun 11 09:40:56 2013 +0200 @@ -18,11 +18,13 @@ private Assertion assertion; - public User(Assertion assertion, List features, String password) { + public User(Assertion assertion, String samlXML, List features, + String password) { this.setName(assertion.getNameID()); this.setAccount(assertion.getNameID()); this.setRoles(assertion.getRoles()); this.assertion = assertion; + this.setSamlXMLBase64(samlXML); this.setAllowedFeatures(features); this.setPassword(password); } diff -r a3fb76cf79b6 -r e8f152163a1e gwt-client/src/main/java/org/dive4elements/river/client/server/auth/was/Response.java --- a/gwt-client/src/main/java/org/dive4elements/river/client/server/auth/was/Response.java Wed Jun 05 11:56:38 2013 +0200 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/auth/was/Response.java Tue Jun 11 09:40:56 2013 +0200 @@ -10,11 +10,13 @@ import java.io.IOException; import java.io.InputStream; +import java.io.StringBufferInputStream; import java.util.List; import org.apache.commons.codec.binary.Base64InputStream; import org.apache.http.HttpEntity; +import org.apache.http.util.EntityUtils; import org.apache.log4j.Logger; @@ -37,6 +39,7 @@ private static Logger logger = Logger.getLogger(Response.class); private Element root; + private String samlTicketXML; private Assertion assertion; private String username; private String password; @@ -53,8 +56,9 @@ } String contenttype = entity.getContentType().getValue(); + String samlTicketXML = EntityUtils.toString(entity); - InputStream in = entity.getContent(); + InputStream in = new StringBufferInputStream(samlTicketXML); if (!contenttype.equals("application/vnd.ogc.se_xml")) { // XXX: Assume base64 encoded content. @@ -70,6 +74,7 @@ "ServiceException")); } + this.samlTicketXML = samlTicketXML; this.root = root; this.username = username; this.password = password; @@ -113,7 +118,7 @@ this.assertion.getRoles()); logger.debug("User " + this.username + " with features " + features + " successfully authenticated."); - return new User(assertion, features, this.password); + return new User(assertion, this.samlTicketXML, features, this.password); } } // vim: set si et fileencoding=utf-8 ts=4 sw=4 tw=80: diff -r a3fb76cf79b6 -r e8f152163a1e gwt-client/src/main/java/org/dive4elements/river/client/shared/model/Capabilities.java --- a/gwt-client/src/main/java/org/dive4elements/river/client/shared/model/Capabilities.java Wed Jun 05 11:56:38 2013 +0200 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/shared/model/Capabilities.java Tue Jun 11 09:40:56 2013 +0200 @@ -12,7 +12,9 @@ import java.util.ArrayList; import java.util.List; - +/** + * Capabilities of a WMS. + */ public class Capabilities implements Serializable { protected String title; @@ -23,6 +25,7 @@ protected ContactInformation contactInformation; protected List layers; + protected List mapFormats; public Capabilities() { @@ -41,7 +44,8 @@ ContactInformation contactInformation, String fees, String accessConstraints, - List layers + List layers, + List mapFormats ) { this.title = title; this.onlineResource = onlineResource; @@ -49,6 +53,7 @@ this.fees = fees; this.accessConstraints = accessConstraints; this.layers = layers; + this.mapFormats = mapFormats; } @@ -82,6 +87,11 @@ } + public List getMapFormats() { + return mapFormats; + } + + @Override public String toString() { StringBuilder sb = new StringBuilder(); diff -r a3fb76cf79b6 -r e8f152163a1e gwt-client/src/main/java/org/dive4elements/river/client/shared/model/DefaultUser.java --- a/gwt-client/src/main/java/org/dive4elements/river/client/shared/model/DefaultUser.java Wed Jun 05 11:56:38 2013 +0200 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/shared/model/DefaultUser.java Tue Jun 11 09:40:56 2013 +0200 @@ -22,6 +22,8 @@ /** The name of the user.*/ protected String name; + /** The saml ticket used for single sign-on.*/ + protected String samlXML; /** * The default constructor. @@ -36,9 +38,10 @@ * @param identifier The uuid of the user. * @param name The name of the user. */ - public DefaultUser(String identifier, String name) { + public DefaultUser(String identifier, String name, String samlXML) { this.identifier = identifier; this.name = name; + this.samlXML = samlXML; } @@ -63,6 +66,16 @@ /** + * Returns the SAML ticket for single sign-on. + * + * @return the SAML ticket as base64 encoded XML + */ + public String getSamlXMLBase64() { + return samlXML; + } + + + /** * Set the identifier of the user. * * @param identifier The new identifier. @@ -80,5 +93,14 @@ public void setName(String name) { this.name = name; } + + /** + * Set the SAML Ticket for single sign-on. + * + * @param samlXML the SAML ticket as base64 encoded XML. + */ + public void setSamlXMLBase64(String samlXML) { + this.samlXML = samlXML; + } } // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r a3fb76cf79b6 -r e8f152163a1e gwt-client/src/main/java/org/dive4elements/river/client/shared/model/Recommendation.java --- a/gwt-client/src/main/java/org/dive4elements/river/client/shared/model/Recommendation.java Wed Jun 05 11:56:38 2013 +0200 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/shared/model/Recommendation.java Tue Jun 11 09:40:56 2013 +0200 @@ -117,6 +117,9 @@ protected String masterArtifact; /** Optional facet filter. */ protected Filter filter; + /** The out this Artifact should be added to **/ + protected String targetOut; + protected String displayName = null; public Recommendation() { @@ -126,16 +129,39 @@ this(factory, ids, null, null); } + public Recommendation(String factory, String ids, String targetOut) { + this(factory, ids, null, null, targetOut); + } + public Recommendation( String factory, String ids, String masterArtifact, Filter filter ) { + this(factory, ids, masterArtifact, filter, null); + } + + public Recommendation( + String factory, + String ids, + String masterArtifact, + Filter filter, + String targetOut + ) { this.factory = factory; this.ids = ids; this.masterArtifact = masterArtifact; this.filter = filter; + this.targetOut = targetOut; + } + + public String getTargetOut() { + return targetOut; + } + + public void setTargetOut(String value) { + targetOut = value; } public String getFactory() { @@ -190,6 +216,9 @@ hash += (getMasterArtifact() != null) ? getMasterArtifact().hashCode() : 0; + hash += (getTargetOut() != null) + ? getTargetOut().hashCode() + : 0; return hash; } @@ -221,7 +250,8 @@ return (same(this.getFactory(), rec.getFactory())) && (same(this.getIDs(), rec.getIDs())) && (same(this.getFilter(), rec.getFilter())) - && (same(this.getMasterArtifact(), rec.getMasterArtifact())); + && (same(this.getMasterArtifact(), rec.getMasterArtifact())) + && (same(this.getTargetOut(), rec.getTargetOut())); } } // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r a3fb76cf79b6 -r e8f152163a1e gwt-client/src/main/java/org/dive4elements/river/client/shared/model/ToLoad.java --- a/gwt-client/src/main/java/org/dive4elements/river/client/shared/model/ToLoad.java Wed Jun 05 11:56:38 2013 +0200 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/shared/model/ToLoad.java Tue Jun 11 09:40:56 2013 +0200 @@ -15,6 +15,8 @@ import java.io.Serializable; +import com.google.gwt.core.client.GWT; + public class ToLoad implements Serializable { @@ -49,6 +51,16 @@ } return key; } + public void add( + String artifactName, + String factory, + String out, + String name, + String ids, + String displayName + ) { + add(artifactName, factory, out, name, ids, displayName, null); + } public void add( String artifactName, @@ -56,8 +68,13 @@ String out, String name, String ids, - String displayName + String displayName, + String targetOut ) { + GWT.log("Adding artifact: " + artifactName + " Factory: " + factory + + " Out: " + out + " Name: " + name + " Ids: " + ids + + " Display Name: " + displayName + " Target Out: " + targetOut); + if (artifactName == null) { artifactName = uniqueKey(artifacts); } diff -r a3fb76cf79b6 -r e8f152163a1e gwt-client/src/main/java/org/dive4elements/river/client/shared/model/User.java --- a/gwt-client/src/main/java/org/dive4elements/river/client/shared/model/User.java Wed Jun 05 11:56:38 2013 +0200 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/shared/model/User.java Tue Jun 11 09:40:56 2013 +0200 @@ -17,8 +17,12 @@ String getName(); + String getSamlXMLBase64(); + void setName(String name); void setIdentifier(String identifier); + + void setSamlXMLBase64(String samlXml); } // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r a3fb76cf79b6 -r e8f152163a1e gwt-client/src/main/java/org/dive4elements/river/client/shared/model/WMSLayer.java --- a/gwt-client/src/main/java/org/dive4elements/river/client/shared/model/WMSLayer.java Wed Jun 05 11:56:38 2013 +0200 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/shared/model/WMSLayer.java Tue Jun 11 09:40:56 2013 +0200 @@ -22,6 +22,8 @@ protected List srs; protected List layers; + protected boolean queryable = true; + public WMSLayer() { layers = new ArrayList(); @@ -39,13 +41,15 @@ String title, String name, List srs, - List layers + List layers, + boolean queryable ) { - this.server = server; - this.title = title; - this.name = name; - this.srs = srs; - this.layers = layers; + this.server = server; + this.title = title; + this.name = name; + this.srs = srs; + this.layers = layers; + this.queryable = queryable; } @@ -74,6 +78,11 @@ } + public boolean isQueryable() { + return queryable; + } + + public boolean supportsSrs(String srs) { if (this.srs == null || this.srs.size() == 0) { return true; diff -r a3fb76cf79b6 -r e8f152163a1e gwt-client/src/main/webapp/WEB-INF/config.yaml --- a/gwt-client/src/main/webapp/WEB-INF/config.yaml Wed Jun 05 11:56:38 2013 +0200 +++ b/gwt-client/src/main/webapp/WEB-INF/config.yaml Tue Jun 11 09:40:56 2013 +0200 @@ -183,7 +183,7 @@ url: '${configDir}/../${logo}' # Scalebar - !columns - absoluteX: 460 + absoluteX: 455 absoluteY: 40 width: 150 items: @@ -197,11 +197,11 @@ # The legend - !columns absoluteX: 612 - absoluteY: 390 + absoluteY: 385 width: 200 items: - !legends - maxHeight: 310 + maxHeight: 350 maxWidth: 0 maxIconHeight: 0 inline: true @@ -213,7 +213,7 @@ fontEncoding: Identity-H classFont: FreeSans layerFont: FreeSans - defaultScale: 0.5 + defaultScale: 0.7 config: borderWidthLeft: 1 borderWidthRight: 1 @@ -227,7 +227,7 @@ items: - !image maxWidth: 260 - maxHeight: 184 + maxHeight: 190 url: '${configDir}/../images/white.png' # Title of the map @@ -238,21 +238,16 @@ condition: mapTitle items: - !text + fontSize: 18 text: '${mapTitle}' # The Stamp - !columns absoluteX: 562 - absoluteY: 555 + absoluteY: 550 width: 250 - # config: - # borderWidthLeft: 5 - # borderWidthRight: 5 - # borderWidthTop: 5 - # borderWidthBottom: 5 - #padding: 10 - #backgroundColor: #FFFFFF - #borderColor: #FFFFFF + config: + borderWidth: 1 items: - !attributes source: data @@ -266,7 +261,7 @@ cell: !columns config: cells: - - borderWidth: 1 + - borderWidth: 0.5 padding: 5 items: - !text @@ -284,7 +279,7 @@ cell: !columns config: cells: - - borderWidth: 1 + - borderWidth: 0.5 padding: 5 items: - !text diff -r a3fb76cf79b6 -r e8f152163a1e gwt-client/src/main/webapp/images/FLYS_Karte_interactive.html --- a/gwt-client/src/main/webapp/images/FLYS_Karte_interactive.html Wed Jun 05 11:56:38 2013 +0200 +++ b/gwt-client/src/main/webapp/images/FLYS_Karte_interactive.html Tue Jun 11 09:40:56 2013 +0200 @@ -2,25 +2,39 @@ @@ -41,30 +59,30 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + diff -r a3fb76cf79b6 -r e8f152163a1e gwt-client/src/main/webapp/images/FLYS_transp.png Binary file gwt-client/src/main/webapp/images/FLYS_transp.png has changed diff -r a3fb76cf79b6 -r e8f152163a1e gwt-client/src/main/webapp/images/symbol_selected.png Binary file gwt-client/src/main/webapp/images/symbol_selected.png has changed