Skip to content

Commit

Permalink
[GEOT-5618] WMSConfiguration misses dependency onto XLinkConfiguration
Browse files Browse the repository at this point in the history
  • Loading branch information
@aaime
aaime committed Jan 13, 2017
1 parent 5488728 commit db76944
Show file tree
Hide file tree
Showing 3 changed files with 293 additions and 2 deletions.
4 changes: 2 additions & 2 deletions modules/extension/xsd/xsd-wms/src/main/java/org/geotools/wms/v1_3/WMSConfiguration.java
View file
Expand Up @@ -15,6 +15,7 @@
* Lesser General Public License for more details.
*/
package org.geotools.wms.v1_3;
import org.geotools.xlink.XLINKConfiguration;
import org.geotools.xml.Configuration;
import org.picocontainer.MutablePicoContainer;

Expand All @@ -35,8 +36,7 @@ public class WMSConfiguration extends Configuration {
*/
public WMSConfiguration() {
super(WMS.getInstance());

//TODO: add dependencies here
addDependency(new XLINKConfiguration());
}

/**
Expand Down
35 changes: 35 additions & 0 deletions modules/extension/xsd/xsd-wms/src/test/java/org/geotools/wms/v1_3/WMSConfigurationTest.java
View file
@@ -0,0 +1,35 @@
package org.geotools.wms.v1_3;

import static junit.framework.TestCase.fail;

import java.io.IOException;
import java.io.InputStream;
import java.util.Iterator;

import javax.xml.parsers.ParserConfigurationException;

import org.geotools.xml.Parser;
import org.junit.Test;
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;

public class WMSConfigurationTest {

@Test
public void testValidate() throws IOException, SAXException, ParserConfigurationException {
Parser p = new Parser(new WMSConfiguration());
p.setValidating(true);
try (InputStream is = getClass().getResourceAsStream("./caps130.xml")) {
p.parse(is);
}
if (!p.getValidationErrors().isEmpty()) {
for (Iterator e = p.getValidationErrors().iterator(); e.hasNext();) {
SAXParseException ex = (SAXParseException) e.next();
System.out.println(
ex.getLineNumber() + "," + ex.getColumnNumber() + " -" + ex.toString());
}
fail("Document did not validate.");
}

}
}
256 changes: 256 additions & 0 deletions modules/extension/xsd/xsd-wms/src/test/resources/org/geotools/wms/v1_3/caps130.xml
View file
@@ -0,0 +1,256 @@
<?xml version="1.0" encoding="UTF-8"?>
<WMS_Capabilities xmlns="http://www.opengis.net/wms" xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" updateSequence="22" version="1.3.0">
<Service>
<Name>WMS</Name>
<Title />
<Abstract />
<KeywordList />
<OnlineResource xlink:href="http://localhost/geoserver/" xlink:type="simple" />
<ContactInformation>
<ContactPersonPrimary>
<ContactPerson>Andrea Aime</ContactPerson>
<ContactOrganization />
</ContactPersonPrimary>
<ContactPosition />
<ContactAddress>
<AddressType />
<Address />
<City />
<StateOrProvince />
<PostCode />
<Country />
</ContactAddress>
<ContactVoiceTelephone />
<ContactFacsimileTelephone />
<ContactElectronicMailAddress>andrea@geoserver.org</ContactElectronicMailAddress>
</ContactInformation>
<Fees>none</Fees>
<AccessConstraints>none</AccessConstraints>
</Service>
<Capability>
<Request>
<GetCapabilities>
<Format>text/xml</Format>
<DCPType>
<HTTP>
<Get>
<OnlineResource xlink:href="http://localhost/geoserver/ows?SERVICE=WMS&amp;"
xlink:type="simple" />
</Get>
<Post>
<OnlineResource xlink:href="http://localhost/geoserver/ows?SERVICE=WMS&amp;"
xlink:type="simple" />
</Post>
</HTTP>
</DCPType>
</GetCapabilities>
<GetMap>
<Format>image/png</Format>
<Format>application/atom+xml</Format>
<Format>application/json;type=utfgrid</Format>
<Format>application/pdf</Format>
<Format>application/rss+xml</Format>
<Format>image/geotiff</Format>
<Format>image/geotiff8</Format>
<Format>image/gif</Format>
<Format>image/jpeg</Format>
<Format>image/png; mode=8bit</Format>
<Format>image/svg+xml</Format>
<Format>image/tiff</Format>
<Format>image/tiff8</Format>
<Format>image/vnd.jpeg-png</Format>
<Format>text/html; subtype=openlayers</Format>
<DCPType>
<HTTP>
<Get>
<OnlineResource xlink:href="http://localhost/geoserver/ows?SERVICE=WMS&amp;"
xlink:type="simple" />
</Get>
</HTTP>
</DCPType>
</GetMap>
<GetFeatureInfo>
<Format>text/plain</Format>
<Format>application/vnd.ogc.gml</Format>
<Format>text/xml</Format>
<Format>application/vnd.ogc.gml/3.1.1</Format>
<Format>text/xml; subtype=gml/3.1.1</Format>
<Format>text/html</Format>
<Format>application/json</Format>
<DCPType>
<HTTP>
<Get>
<OnlineResource xlink:href="http://localhost/geoserver/ows?SERVICE=WMS&amp;"
xlink:type="simple" />
</Get>
</HTTP>
</DCPType>
</GetFeatureInfo>
</Request>
<Exception>
<Format>XML</Format>
<Format>INIMAGE</Format>
<Format>BLANK</Format>
<Format>JSON</Format>
</Exception>
<Layer>
<Title />
<Abstract />
<CRS>EPSG:4326</CRS>
<CRS>EPSG:404000</CRS>
<CRS>CRS:84</CRS>
<EX_GeographicBoundingBox>
<westBoundLongitude>-180.0</westBoundLongitude>
<eastBoundLongitude>180.0</eastBoundLongitude>
<southBoundLatitude>-90.0</southBoundLatitude>
<northBoundLatitude>90.0</northBoundLatitude>
</EX_GeographicBoundingBox>
<BoundingBox CRS="CRS:84" maxx="180.0" maxy="90.0" minx="-180.0" miny="-90.0" />
<MinScaleDenominator>8.0E7</MinScaleDenominator>
<MaxScaleDenominator>1.0E9</MaxScaleDenominator>
<Layer queryable="1">
<Name>testLayerGroup1</Name>
<Title>testLayerGroup1</Title>
<Abstract>Layer-Group type layer: testLayerGroup1</Abstract>
<CRS>EPSG:4326</CRS>
<EX_GeographicBoundingBox>
<westBoundLongitude>-180.0</westBoundLongitude>
<eastBoundLongitude>180.0</eastBoundLongitude>
<southBoundLatitude>-90.0</southBoundLatitude>
<northBoundLatitude>90.0</northBoundLatitude>
</EX_GeographicBoundingBox>
<BoundingBox CRS="EPSG:4326" maxx="90.0" maxy="180.0" minx="-90.0" miny="-180.0" />
<Layer opaque="0" queryable="1">
<Name>sf:Regionated</Name>
<Title>Regionated</Title>
<Abstract>abstract about Regionated</Abstract>
<KeywordList>
<Keyword>Regionated</Keyword>
</KeywordList>
<CRS>EPSG:4326</CRS>
<CRS>CRS:84</CRS>
<EX_GeographicBoundingBox>
<westBoundLongitude>-180.0</westBoundLongitude>
<eastBoundLongitude>180.0</eastBoundLongitude>
<southBoundLatitude>-90.0</southBoundLatitude>
<northBoundLatitude>90.0</northBoundLatitude>
</EX_GeographicBoundingBox>
<BoundingBox CRS="CRS:84" maxx="180.0" maxy="90.0" minx="-180.0" miny="-90.0" />
<BoundingBox CRS="EPSG:4326" maxx="90.0" maxy="180.0" minx="-90.0" miny="-180.0" />
<Style>
<Name>Regionated</Name>
<Title>GeoServer SLD Cook Book: Zoom-based point</Title>
<LegendURL height="60" width="73">
<Format>image/png</Format>
<OnlineResource
xlink:href="http://localhost/geoserver/ows?service=WMS&amp;request=GetLegendGraphic&amp;format=image%2Fpng&amp;width=20&amp;height=20&amp;layer=sf%3ARegionated"
xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" />
</LegendURL>
</Style>
<MinScaleDenominator>8.0E7</MinScaleDenominator>
<MaxScaleDenominator>6.4E8</MaxScaleDenominator>
</Layer>
<Layer opaque="0" queryable="1">
<Name>sf:Accident3</Name>
<Title>Accident3</Title>
<Abstract>abstract about Accident3</Abstract>
<KeywordList>
<Keyword>Accident3</Keyword>
</KeywordList>
<CRS>EPSG:4326</CRS>
<CRS>CRS:84</CRS>
<EX_GeographicBoundingBox>
<westBoundLongitude>-180.0</westBoundLongitude>
<eastBoundLongitude>180.0</eastBoundLongitude>
<southBoundLatitude>-90.0</southBoundLatitude>
<northBoundLatitude>90.0</northBoundLatitude>
</EX_GeographicBoundingBox>
<BoundingBox CRS="CRS:84" maxx="180.0" maxy="90.0" minx="-180.0" miny="-90.0" />
<BoundingBox CRS="EPSG:4326" maxx="90.0" maxy="180.0" minx="-90.0" miny="-180.0" />
<Style>
<Name>Accident3</Name>
<Title>GeoServer SLD Cook Book: Zoom-based point</Title>
<LegendURL height="40" width="60">
<Format>image/png</Format>
<OnlineResource
xlink:href="http://localhost/geoserver/ows?service=WMS&amp;request=GetLegendGraphic&amp;format=image%2Fpng&amp;width=20&amp;height=20&amp;layer=sf%3AAccident3"
xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" />
</LegendURL>
</Style>
<MinScaleDenominator>3.2E8</MinScaleDenominator>
</Layer>
</Layer>
<Layer queryable="1">
<Name>testLayerGroup3</Name>
<Title>testLayerGroup3</Title>
<Abstract>Layer-Group type layer: testLayerGroup3</Abstract>
<CRS>EPSG:4326</CRS>
<EX_GeographicBoundingBox>
<westBoundLongitude>-180.0</westBoundLongitude>
<eastBoundLongitude>180.0</eastBoundLongitude>
<southBoundLatitude>-90.0</southBoundLatitude>
<northBoundLatitude>90.0</northBoundLatitude>
</EX_GeographicBoundingBox>
<BoundingBox CRS="EPSG:4326" maxx="90.0" maxy="180.0" minx="-90.0" miny="-180.0" />
</Layer>
<Layer opaque="0" queryable="1">
<Name>sf:Accident</Name>
<Title>Accident</Title>
<Abstract>abstract about Accident</Abstract>
<KeywordList>
<Keyword>Accident</Keyword>
</KeywordList>
<CRS>EPSG:4326</CRS>
<CRS>CRS:84</CRS>
<EX_GeographicBoundingBox>
<westBoundLongitude>-180.0</westBoundLongitude>
<eastBoundLongitude>180.0</eastBoundLongitude>
<southBoundLatitude>-90.0</southBoundLatitude>
<northBoundLatitude>90.0</northBoundLatitude>
</EX_GeographicBoundingBox>
<BoundingBox CRS="CRS:84" maxx="180.0" maxy="90.0" minx="-180.0" miny="-90.0" />
<BoundingBox CRS="EPSG:4326" maxx="90.0" maxy="180.0" minx="-90.0" miny="-180.0" />
<Style>
<Name>Accident</Name>
<Title>GeoServer SLD Cook Book: Zoom-based point</Title>
<LegendURL height="40" width="60">
<Format>image/png</Format>
<OnlineResource
xlink:href="http://localhost/geoserver/ows?service=WMS&amp;request=GetLegendGraphic&amp;format=image%2Fpng&amp;width=20&amp;height=20&amp;layer=sf%3AAccident"
xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" />
</LegendURL>
</Style>
</Layer>
<Layer opaque="0" queryable="1">
<Name>sf:Accident2</Name>
<Title>Accident2</Title>
<Abstract>abstract about Accident2</Abstract>
<KeywordList>
<Keyword>Accident2</Keyword>
</KeywordList>
<CRS>EPSG:4326</CRS>
<CRS>CRS:84</CRS>
<EX_GeographicBoundingBox>
<westBoundLongitude>-180.0</westBoundLongitude>
<eastBoundLongitude>180.0</eastBoundLongitude>
<southBoundLatitude>-90.0</southBoundLatitude>
<northBoundLatitude>90.0</northBoundLatitude>
</EX_GeographicBoundingBox>
<BoundingBox CRS="CRS:84" maxx="180.0" maxy="90.0" minx="-180.0" miny="-90.0" />
<BoundingBox CRS="EPSG:4326" maxx="90.0" maxy="180.0" minx="-90.0" miny="-180.0" />
<Style>
<Name>Accident2</Name>
<Title>GeoServer SLD Cook Book: Zoom-based point</Title>
<LegendURL height="40" width="60">
<Format>image/png</Format>
<OnlineResource
xlink:href="http://localhost/geoserver/ows?service=WMS&amp;request=GetLegendGraphic&amp;format=image%2Fpng&amp;width=20&amp;height=20&amp;layer=sf%3AAccident2"
xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" />
</LegendURL>
</Style>
<MaxScaleDenominator>6.4E8</MaxScaleDenominator>
</Layer>
</Layer>
</Capability>
</WMS_Capabilities>

0 comments on commit db76944

Please sign in to comment.