Skip to content

Commit

Permalink
Changes to compile wps-sextante module with sextante libs 1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@ahuarte47
ahuarte47 committed Mar 26, 2015
1 parent b7f9390 commit 9a51904
Show file tree
Hide file tree
Showing 19 changed files with 1,590 additions and 1,292 deletions.
220 changes: 99 additions & 121 deletions src/community/wps-sextante/pom.xml
View file
Expand Up @@ -10,9 +10,9 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>


<parent> <parent>
<groupId>org.geoserver.community</groupId> <groupId>org.geoserver</groupId>
<artifactId>gs-wps</artifactId> <artifactId>community</artifactId>
<version>2.8-SNAPSHOT</version> <version>2.8-SNAPSHOT</version>
</parent> </parent>


<groupId>org.geoserver.community</groupId> <groupId>org.geoserver.community</groupId>
Expand All @@ -22,126 +22,104 @@
<name>Web Processing Service - Sextante integration</name> <name>Web Processing Service - Sextante integration</name>


<properties> <properties>
<sextante.version>0.6-SNAPSHOT</sextante.version> <sextante.version>1.0</sextante.version>
</properties> </properties>

<repositories>
<repository>
<id>Main 52north releases repo</id>
<url>http://52north.org/maven/repo/releases/</url>
</repository>
</repositories>


<dependencies> <dependencies>
<dependency>
<groupId>org.geoserver.community</groupId> <!-- Main module dependencies -->
<artifactId>gs-wps-core</artifactId> <dependency>
<version>${gs.version}</version> <groupId>org.geotools</groupId>
</dependency> <artifactId>gt-process</artifactId>
<dependency> <version>${gt.version}</version>
<groupId>es.unex.sextante.lib</groupId> </dependency>
<artifactId>sextante_gridAnalysis</artifactId> <dependency>
<version>${sextante.version}</version> <groupId>org.geoserver</groupId>
</dependency> <artifactId>gs-main</artifactId>
<dependency> <version>${gs.version}</version>
<groupId>es.unex.sextante.lib</groupId> </dependency>
<artifactId>sextante_gridCalculus</artifactId> <dependency>
<version>${sextante.version}</version> <groupId>org.geoserver.extension</groupId>
</dependency> <artifactId>gs-wps-core</artifactId>
<dependency> <version>${gs.version}</version>
<groupId>es.unex.sextante.lib</groupId> </dependency>
<artifactId>sextante_gridCategorical</artifactId>
<version>${sextante.version}</version> <!-- Sextante dependencies -->
</dependency> <dependency>
<dependency> <groupId>es.unex.sextante</groupId>
<groupId>es.unex.sextante.lib</groupId> <artifactId>sextante</artifactId>
<artifactId>sextante_gridStatistics</artifactId> <version>${sextante.version}</version>
<version>${sextante.version}</version> </dependency>
</dependency> <dependency>
<dependency> <groupId>es.unex.sextante</groupId>
<groupId>es.unex.sextante.lib</groupId> <artifactId>sextante_gui</artifactId>
<artifactId>sextante_gridTools</artifactId> <version>${sextante.version}</version>
<version>${sextante.version}</version> </dependency>
</dependency> <dependency>
<dependency> <groupId>es.unex.sextante</groupId>
<groupId>es.unex.sextante.lib</groupId> <artifactId>sextante_algorithms</artifactId>
<artifactId>sextante_hydrology</artifactId> <version>${sextante.version}</version>
<version>${sextante.version}</version> </dependency>
</dependency> <dependency>
<dependency> <groupId>es.unex.sextante</groupId>
<groupId>es.unex.sextante.lib</groupId> <artifactId>libMath</artifactId>
<artifactId>sextante_lighting</artifactId> <version>${sextante.version}</version>
<version>${sextante.version}</version> </dependency>
</dependency>
<dependency> <!-- Sextante supplemental dependencies -->
<groupId>es.unex.sextante.lib</groupId> <dependency>
<artifactId>sextante_locate</artifactId> <groupId>gov.nist.math</groupId>
<version>${sextante.version}</version> <artifactId>jama</artifactId>
</dependency> <version>1.0.2</version>
<dependency> </dependency>
<groupId>es.unex.sextante.lib</groupId> <dependency>
<artifactId>sextante_morphometry</artifactId> <groupId>org.jfree</groupId>
<version>${sextante.version}</version> <artifactId>jcommon</artifactId>
</dependency> <version>1.0.23</version>
<dependency> </dependency>
<groupId>es.unex.sextante.lib</groupId> <dependency>
<artifactId>sextante_pointAnalysis</artifactId> <groupId>org.jfree</groupId>
<version>${sextante.version}</version> <artifactId>jfreechart</artifactId>
</dependency> <version>1.0.15</version>
<dependency> </dependency>
<groupId>es.unex.sextante.lib</groupId> <dependency>
<artifactId>sextante_profiles</artifactId> <groupId>org.beanshell</groupId>
<version>${sextante.version}</version> <artifactId>bsh</artifactId>
</dependency> <version>2.0b4</version>
<dependency> </dependency>
<groupId>es.unex.sextante.lib</groupId>
<artifactId>sextante_rasterize</artifactId> <!-- test dependencies -->
<version>${sextante.version}</version> <dependency>
</dependency> <groupId>xmlunit</groupId>
<dependency> <artifactId>xmlunit</artifactId>
<groupId>es.unex.sextante.lib</groupId> <scope>test</scope>
<artifactId>sextante_tables</artifactId> </dependency>
<version>${sextante.version}</version> <dependency>
</dependency> <groupId>com.mockrunner</groupId>
<dependency> <artifactId>mockrunner</artifactId>
<groupId>es.unex.sextante.lib</groupId> <scope>test</scope>
<artifactId>sextante_topology</artifactId> </dependency>
<version>${sextante.version}</version> <dependency>
</dependency> <groupId>org.geoserver</groupId>
<dependency> <artifactId>gs-main</artifactId>
<groupId>es.unex.sextante.lib</groupId> <version>${gs.version}</version>
<artifactId>sextante_vectorize</artifactId> <classifier>tests</classifier>
<version>${sextante.version}</version> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>es.unex.sextante.lib</groupId> <groupId>org.geoserver.extension</groupId>
<artifactId>sextante_vegetationIndices</artifactId> <artifactId>gs-wps-core</artifactId>
<version>${sextante.version}</version> <version>${gs.version}</version>
</dependency> <classifier>tests</classifier>
<dependency> <scope>test</scope>
<groupId>es.unex.sextante.lib</groupId> </dependency>
<artifactId>sextante_vectorTools</artifactId>
<version>${sextante.version}</version>
</dependency>

<!-- test dependencies -->
<dependency>
<groupId>xmlunit</groupId>
<artifactId>xmlunit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.mockrunner</groupId>
<artifactId>mockrunner</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.geoserver</groupId>
<artifactId>gs-main</artifactId>
<version>${gs.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.geoserver.community</groupId>
<artifactId>gs-wps-core</artifactId>
<version>${gs.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>

</dependencies> </dependencies>
</project> </project>
82 changes: 0 additions & 82 deletions ...ty/wps-sextante/src/main/java/org/geoserver/wps/sextante/DatastoreVectorLayerFactory.java
View file

This file was deleted.

52 changes: 52 additions & 0 deletions src/community/wps-sextante/src/main/java/org/geoserver/wps/sextante/GTDBFIterator.java
View file
@@ -0,0 +1,52 @@
/* (c) 2015 Open Source Geospatial Foundation - all rights reserved
* This code is licensed under the GPL 2.0 license, available at the root
* application directory.
*/
package org.geoserver.wps.sextante;

import java.io.IOException;

import org.geotools.data.shapefile.dbf.DbaseFileReader;

import es.unex.sextante.core.Sextante;
import es.unex.sextante.dataObjects.IRecord;
import es.unex.sextante.dataObjects.IRecordsetIterator;
import es.unex.sextante.dataObjects.RecordImpl;
import es.unex.sextante.exceptions.IteratorException;

/**
*
* @author Cesar Martinez Izquierdo
*
*/
public class GTDBFIterator implements IRecordsetIterator{
private DbaseFileReader reader = null;

public GTDBFIterator(DbaseFileReader reader) {
this.reader = reader;
}

public void close() {
try {
this.reader.close();
} catch (IOException e) {
Sextante.addErrorToLog(e);
}
}

public boolean hasNext() {
return reader.hasNext();
}

public IRecord next() throws IteratorException {
if (reader.hasNext()) {
try {
return new RecordImpl(reader.readEntry());
} catch (IOException e) {
Sextante.addErrorToLog(e);
}
}
throw new IteratorException();
}

}

0 comments on commit 9a51904

Please sign in to comment.