Skip to content

Commit

Permalink
[GEOS-8338] Update Community Module 'sldExtension' to new Spring MVC
Browse files Browse the repository at this point in the history 
 - TAB to space
  • Loading branch information
Alessio Fabiani committed Oct 30, 2017
1 parent da5f609 commit dac9cc4
Show file tree
Hide file tree
Showing 36 changed files with 2,142 additions and 2,806 deletions.
180 changes: 99 additions & 81 deletions src/community/sldService/pom.xml
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
application directory. application directory.
--> -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>


<parent> <parent>
<groupId>org.geoserver</groupId> <groupId>org.geoserver</groupId>
Expand All @@ -16,85 +16,103 @@


<groupId>org.geoserver.community</groupId> <groupId>org.geoserver.community</groupId>
<artifactId>gs-sldservice</artifactId> <artifactId>gs-sldservice</artifactId>
<packaging>jar</packaging>
<name>REST SLD service</name> <name>REST SLD service</name>


<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.geoserver</groupId> <groupId>org.geoserver</groupId>
<artifactId>gs-main</artifactId> <artifactId>gs-main</artifactId>
<version>2.13-SNAPSHOT</version> <version>2.13-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.geoserver</groupId> <groupId>org.geoserver</groupId>
<artifactId>gs-rest</artifactId> <artifactId>gs-rest</artifactId>
<version>2.13-SNAPSHOT</version> <version>2.13-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.geoserver</groupId> <groupId>org.geoserver</groupId>
<artifactId>gs-restconfig</artifactId> <artifactId>gs-restconfig</artifactId>
<version>2.13-SNAPSHOT</version> <version>2.13-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.geoserver</groupId> <groupId>org.geoserver</groupId>
<artifactId>gs-wms</artifactId> <artifactId>gs-wms</artifactId>
<version>2.13-SNAPSHOT</version> <version>2.13-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>jdom</groupId> <groupId>jdom</groupId>
<artifactId>jdom</artifactId> <artifactId>jdom</artifactId>
<version>1.0</version> <version>1.0</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>xerces</groupId> <groupId>xerces</groupId>
<artifactId>xerces</artifactId> <artifactId>xerces</artifactId>
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>xom</groupId> <groupId>xom</groupId>
<artifactId>xom</artifactId> <artifactId>xom</artifactId>
<version>1.1</version> <version>1.1</version>
</dependency> </dependency>
<dependency>
<groupId>org.geoserver</groupId> <dependency>
<artifactId>gs-main</artifactId> <groupId>javax.servlet</groupId>
<version>${project.version}</version> <artifactId>javax.servlet-api</artifactId>
<classifier>tests</classifier> </dependency>
<scope>test</scope>
</dependency> <!-- test dependencies -->
<dependency> <dependency>
<groupId>org.geoserver</groupId> <groupId>org.geoserver</groupId>
<artifactId>gs-wcs1_0</artifactId> <artifactId>gs-main</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<scope>test</scope> <classifier>tests</classifier>
</dependency> <scope>test</scope>
<dependency> </dependency>
<groupId>org.geoserver</groupId> <dependency>
<artifactId>gs-wcs1_1</artifactId> <groupId>org.geoserver</groupId>
<version>${project.version}</version> <artifactId>gs-restconfig</artifactId>
<scope>test</scope> <version>${project.version}</version>
</dependency> <classifier>tests</classifier>
<dependency> <scope>test</scope>
<groupId>org.geoserver.extension</groupId> </dependency>
<artifactId>gs-h2</artifactId> <dependency>
<version>${project.version}</version> <groupId>org.geoserver</groupId>
<scope>test</scope> <artifactId>gs-wcs1_0</artifactId>
</dependency> <version>${project.version}</version>
<dependency> <scope>test</scope>
<groupId>org.springframework</groupId> </dependency>
<artifactId>spring-test</artifactId> <dependency>
<scope>test</scope> <groupId>org.geoserver</groupId>
</dependency> <artifactId>gs-wcs1_1</artifactId>
<dependency> <version>${project.version}</version>
<groupId>xmlunit</groupId> <scope>test</scope>
<artifactId>xmlunit</artifactId> </dependency>
<scope>test</scope> <dependency>
</dependency> <groupId>org.geoserver.extension</groupId>
<dependency> <artifactId>gs-h2</artifactId>
<groupId>org.mockito</groupId> <version>${project.version}</version>
<artifactId>mockito-core</artifactId> <scope>test</scope>
<scope>test</scope> </dependency>
</dependency> <dependency>
</dependencies> <groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>xmlunit</groupId>
<artifactId>xmlunit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project> </project>
37 changes: 11 additions & 26 deletions src/community/sldService/src/main/java/applicationContext.xml
View file
Original file line number Original file line Diff line number Diff line change
@@ -1,33 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
Copyright (C) 2014 - Open Source Geospatial Foundation. All rights reserved. Copyright (C) 2014 - 2016 Open Source Geospatial Foundation. All rights reserved.
This code is licensed under the GPL 2.0 license, available at the root This code is licensed under the GPL 2.0 license, available at the root
application directory. application directory.
--> -->
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd"> <beans xmlns="http://www.springframework.org/schema/beans"
<beans> xmlns:context="http://www.springframework.org/schema/context"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context.xsd">


<bean id="sldServiceRestConfigMapping" class="org.geoserver.rest.RESTMapping"> <!-- <mvc:annotation-driven/> -->
<property name="routes"> <context:component-scan base-package="org.geoserver.sldservice.rest"/>
<map>
<entry>
<key><value>/sldservice/{layer}/attributes</value></key>
<value>layerAttributesFinder</value>
</entry>
<entry>
<key><value>/sldservice/{layer}/classify</value></key>
<value>classifierFinder</value>
</entry>
<entry>
<key><value>/sldservice/{layer}/rasterize</value></key>
<value>rasterizerFinder</value>
</entry>
</map>
</property>
</bean>


<bean id="layerAttributesFinder" class="org.geoserver.sldservice.rest.finder.LayerAttributesFinder" parent="abstractCatalogFinder"/> </beans>
<bean id="classifierFinder" class="org.geoserver.sldservice.rest.finder.ClassifierResourceFinder" parent="abstractCatalogFinder"/>
<bean id="rasterizerFinder" class="org.geoserver.sldservice.rest.finder.RasterizerResourceFinder" parent="abstractCatalogFinder"/>

</beans>

0 comments on commit dac9cc4

Please sign in to comment.