svn - r33523 - in trunk/modules/unsupported/proc
|
|
svn_geotools
|
Author: mbedward
Date: 2009-07-08 00:14:53 -0400 (Wed, 08 Jul 2009) New Revision: 33523 Modified: trunk/modules/unsupported/process/pom.xml trunk/modules/unsupported/process/src/main/java/org/geotools/process/ProcessExecutor.java trunk/modules/unsupported/process/src/main/java/org/geotools/process/ProgressTask.java trunk/modules/unsupported/process/src/main/java/org/geotools/process/ThreadPoolProcessExecutor.java trunk/modules/unsupported/process/src/main/java/org/geotools/process/feature/BufferFeatureCollectionFactory.java trunk/modules/unsupported/process/src/main/java/org/geotools/process/literal/BufferFactory.java trunk/modules/unsupported/process/src/main/java/org/geotools/process/literal/DoubleAdditionFactory.java trunk/modules/unsupported/process/src/main/java/org/geotools/process/literal/FeatureBufferFactory.java trunk/modules/unsupported/process/src/main/java/org/geotools/process/literal/IntersectionFactory.java trunk/modules/unsupported/process/src/main/java/org/geotools/process/literal/IntersectionProcess.java trunk/modules/unsupported/process/src/main/java/org/geotools/process/literal/UnionFactory.java Log: yet another attempt at unit tests in hudson build; fixed compilation warnings Modified: trunk/modules/unsupported/process/pom.xml =================================================================== --- trunk/modules/unsupported/process/pom.xml 2009-07-08 04:03:13 UTC (rev 33522) +++ trunk/modules/unsupported/process/pom.xml 2009-07-08 04:14:53 UTC (rev 33523) @@ -7,7 +7,10 @@ Version: $Id$ ======================================================================= --> -<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"> +<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"> <modelVersion>4.0.0</modelVersion> <parent> @@ -18,71 +21,35 @@ <!-- =========================================================== --> - <!-- Properties and Profiles --> - <!-- explanation of their effect. --> - <!-- --> - <!-- Available profiles are: --> - <!-- --> - <!-- nameOfprofile Explantion of what the profile does --> - <!-- for the user. --> - <!-- --> - <!-- Example: mvn -PnameOfprofile install --> - <!-- --> - <!-- Note ... --> - <!-- =========================================================== --> - <!-- Default setting of properties --> - <!-- - <properties> - <nameOfproperty>valueOfsetting</nameOfproperty> - </properties> - --> - - <!-- Profiles set on the command-line to override default properties. --> - <!-- - <profiles> - <profile> - <id>nameOfprofile</id> - <properties> - <nameOfproperty>valueOfsetting</nameOfproperty> - </properties> - </profile> - </profiles> - --> - - - <!-- =========================================================== --> <!-- Module Description --> <!-- =========================================================== --> - <groupId>org.geotools</groupId> - <artifactId>gt-process</artifactId> - <packaging>jar</packaging> - <name>Process</name> - + <groupId>org.geotools</groupId> + <artifactId>gt-process</artifactId> + <packaging>jar</packaging> + <name>Process</name> <scm> - <connection>scm:svn:http://svn.osgeo.org/geotools/trunk/modules/unsupported/process/</connection> + <connection> + scm:svn:http://svn.osgeo.org/geotools/trunk/modules/unsupported/process/ + </connection> <url>http://svn.osgeo.org/geotools/trunk/modules/unsupported/process/</url> </scm> - <description>This is an API for creating processes/operations.</description> + <description> + An API for creating custom processes/operations plus a + collection of pre-written processes including vector/raster + conversion. + </description> - <organization> - </organization> - - <!-- for your project. --> + <licenses> + <license> + <name>Lesser General Public License (LGPL)</name> + <url>http://www.gnu.org/copyleft/lesser.txt</url> + <distribution>repo</distribution> + </license> + </licenses> - <!-- Pick your license. --> - <!-- - <licenses> - <license> - <name>Lesser General Public License (LGPL)</name> - <url>http://www.gnu.org/copyleft/lesser.txt</url> - <distribution>repo</distribution> - </license> - </licenses> - --> - <!-- =========================================================== --> <!-- Developers and Contributors --> <!-- =========================================================== --> @@ -104,6 +71,10 @@ <organization>Dept Environment and Climate Change</organization> <organizationUrl>http://www.environment.nsw.gov.au</organizationUrl> <timezone>+10</timezone> + <roles> + <role>Java Developer</role> + <role>Module Maintainer</role> + </roles> </developer> </developers> @@ -141,66 +112,29 @@ <dependency> <groupId>javax.media</groupId> <artifactId>jai_core</artifactId> - <version>1.1.3</version> - <scope>provided</scope> + <!-- The version number is specified in the parent POM. --> + <scope>provided</scope> <!-- Users should execute JAI installer. --> </dependency> + <dependency> + <groupId>javax.media</groupId> + <artifactId>jai_imageio</artifactId> + <!-- The version number is specified in the parent POM. --> + <scope>provided</scope> <!-- Users should execute JAI installer. --> + </dependency> + + <!-- Test dependencies --> + <dependency> + <groupId>org.geotools</groupId> + <artifactId>gt-sample-data</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>javax.media</groupId> + <artifactId>jai_codec</artifactId> + <!-- The version number is specified in the parent POM. --> + <scope>test</scope> + </dependency> </dependencies> - - <!-- =========================================================== --> - <!-- Build Configuration --> - <!-- copies all JARs in a single directory. --> - <!-- =========================================================== --> - <build> - - <plugins> - <!-- ==== Compilation ============================== --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <!-- ==== Switch commenting to skip tests = --> - <skip>${allow.test.skip}</skip> - <includes> - <include></include> - </includes> - <excludes> - <exclude></exclude> - </excludes> - </configuration> - </plugin> - - <!-- ==== Testing ============================== --> - <!-- ==== Code Formatting ============================== --> - <!-- - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>jalopy-maven-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>format</goal> - </goals> - </execution> - </executions> - </plugin> - --> - <!-- ==== Code Coverage ============================== --> - <!-- - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-clover-plugin</artifactId> - <executions> - <execution> - <goals> - <goal></goal> - </goals> - </execution> - </executions> - </plugin> - --> - </plugins> - - </build> - </project> Modified: trunk/modules/unsupported/process/src/main/java/org/geotools/process/ProcessExecutor.java =================================================================== --- trunk/modules/unsupported/process/src/main/java/org/geotools/process/ProcessExecutor.java 2009-07-08 04:03:13 UTC (rev 33522) +++ trunk/modules/unsupported/process/src/main/java/org/geotools/process/ProcessExecutor.java 2009-07-08 04:14:53 UTC (rev 33523) @@ -16,19 +16,11 @@ */ package org.geotools.process; -import java.util.Collection; -import java.util.List; import java.util.Map; import java.util.concurrent.Callable; -import java.util.concurrent.ExecutionException; import java.util.concurrent.Executor; -import java.util.concurrent.ExecutorCompletionService; import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.Future; import java.util.concurrent.RejectedExecutionException; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; /** * An {@link Executor} that provides methods to manage termination and Modified: trunk/modules/unsupported/process/src/main/java/org/geotools/process/ProgressTask.java =================================================================== --- trunk/modules/unsupported/process/src/main/java/org/geotools/process/ProgressTask.java 2009-07-08 04:03:13 UTC (rev 33522) +++ trunk/modules/unsupported/process/src/main/java/org/geotools/process/ProgressTask.java 2009-07-08 04:14:53 UTC (rev 33523) @@ -182,6 +182,7 @@ /** * Implements AQS base acquire to succeed if ran or canceled */ + @Override protected int tryAcquireShared(int ignore) { return innerIsDone()? 1 : -1; } @@ -190,6 +191,7 @@ * Implements AQS base release to always signal after setting * final done status by nulling the runningThread. */ + @Override protected boolean tryReleaseShared(int ignore) { runningThread = null; return true; @@ -326,6 +328,7 @@ innerSetException( t ); } + @Deprecated public String getDescription() { return getTask().toString(); } @@ -350,6 +353,7 @@ innerCancel( stop ); } + @Deprecated public void setDescription( String description ) { processName = new SimpleInternationalString( description ); } Modified: trunk/modules/unsupported/process/src/main/java/org/geotools/process/ThreadPoolProcessExecutor.java =================================================================== --- trunk/modules/unsupported/process/src/main/java/org/geotools/process/ThreadPoolProcessExecutor.java 2009-07-08 04:03:13 UTC (rev 33522) +++ trunk/modules/unsupported/process/src/main/java/org/geotools/process/ThreadPoolProcessExecutor.java 2009-07-08 04:14:53 UTC (rev 33523) @@ -17,10 +17,6 @@ package org.geotools.process; import java.util.Map; -import java.util.concurrent.BlockingQueue; -import java.util.concurrent.Callable; -import java.util.concurrent.Future; -import java.util.concurrent.FutureTask; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadFactory; import java.util.concurrent.ThreadPoolExecutor; Modified: trunk/modules/unsupported/process/src/main/java/org/geotools/process/feature/BufferFeatureCollectionFactory.java =================================================================== --- trunk/modules/unsupported/process/src/main/java/org/geotools/process/feature/BufferFeatureCollectionFactory.java 2009-07-08 04:03:13 UTC (rev 33522) +++ trunk/modules/unsupported/process/src/main/java/org/geotools/process/feature/BufferFeatureCollectionFactory.java 2009-07-08 04:14:53 UTC (rev 33523) @@ -19,7 +19,6 @@ import java.util.Map; import org.geotools.data.Parameter; -import org.geotools.process.Process; import org.geotools.text.Text; import org.opengis.util.InternationalString; Modified: trunk/modules/unsupported/process/src/main/java/org/geotools/process/literal/BufferFactory.java =================================================================== --- trunk/modules/unsupported/process/src/main/java/org/geotools/process/literal/BufferFactory.java 2009-07-08 04:03:13 UTC (rev 33522) +++ trunk/modules/unsupported/process/src/main/java/org/geotools/process/literal/BufferFactory.java 2009-07-08 04:14:53 UTC (rev 33523) @@ -94,6 +94,7 @@ return new BufferProcess( this ); } + @Override public String getName() { return "buffer"; } Modified: trunk/modules/unsupported/process/src/main/java/org/geotools/process/literal/DoubleAdditionFactory.java =================================================================== --- trunk/modules/unsupported/process/src/main/java/org/geotools/process/literal/DoubleAdditionFactory.java 2009-07-08 04:03:13 UTC (rev 33522) +++ trunk/modules/unsupported/process/src/main/java/org/geotools/process/literal/DoubleAdditionFactory.java 2009-07-08 04:14:53 UTC (rev 33523) @@ -82,6 +82,7 @@ return new DoubleAdditionProcess(this); } + @Override public String getName() { return "DoubleAddition"; Modified: trunk/modules/unsupported/process/src/main/java/org/geotools/process/literal/FeatureBufferFactory.java =================================================================== --- trunk/modules/unsupported/process/src/main/java/org/geotools/process/literal/FeatureBufferFactory.java 2009-07-08 04:03:13 UTC (rev 33522) +++ trunk/modules/unsupported/process/src/main/java/org/geotools/process/literal/FeatureBufferFactory.java 2009-07-08 04:14:53 UTC (rev 33523) @@ -81,6 +81,7 @@ return Text.text("FeatureBuffer"); } + @Override public String getName() { return "FeatureBuffer"; Modified: trunk/modules/unsupported/process/src/main/java/org/geotools/process/literal/IntersectionFactory.java =================================================================== --- trunk/modules/unsupported/process/src/main/java/org/geotools/process/literal/IntersectionFactory.java 2009-07-08 04:03:13 UTC (rev 33522) +++ trunk/modules/unsupported/process/src/main/java/org/geotools/process/literal/IntersectionFactory.java 2009-07-08 04:14:53 UTC (rev 33523) @@ -22,10 +22,8 @@ import org.geotools.data.Parameter; import org.geotools.process.Process; -import org.geotools.process.ProcessFactory; import org.geotools.process.impl.AbstractProcessFactory; import org.geotools.text.Text; -import org.geotools.util.SimpleInternationalString; import org.opengis.util.InternationalString; import com.vividsolutions.jts.geom.Geometry; @@ -98,6 +96,7 @@ return Text.text("Intersection"); } + @Override public String getName() { return "Intersect"; } Modified: trunk/modules/unsupported/process/src/main/java/org/geotools/process/literal/IntersectionProcess.java =================================================================== --- trunk/modules/unsupported/process/src/main/java/org/geotools/process/literal/IntersectionProcess.java 2009-07-08 04:03:13 UTC (rev 33522) +++ trunk/modules/unsupported/process/src/main/java/org/geotools/process/literal/IntersectionProcess.java 2009-07-08 04:14:53 UTC (rev 33523) @@ -16,15 +16,9 @@ */ package org.geotools.process.literal; -import java.util.HashMap; -import java.util.Map; -import org.geotools.process.Process; import org.geotools.process.ProcessFactory; import org.geotools.process.impl.SimpleProcess; -import org.geotools.text.Text; -import org.geotools.util.NullProgressListener; -import org.opengis.util.ProgressListener; import com.vividsolutions.jts.geom.Geometry; Modified: trunk/modules/unsupported/process/src/main/java/org/geotools/process/literal/UnionFactory.java =================================================================== --- trunk/modules/unsupported/process/src/main/java/org/geotools/process/literal/UnionFactory.java 2009-07-08 04:03:13 UTC (rev 33522) +++ trunk/modules/unsupported/process/src/main/java/org/geotools/process/literal/UnionFactory.java 2009-07-08 04:14:53 UTC (rev 33523) @@ -94,6 +94,7 @@ return Text.text("Union"); } + @Override public String getName() { return "Union"; } ------------------------------------------------------------------------------ Enter the BlackBerry Developer Challenge This is your chance to win up to $100,000 in prizes! For a limited time, vendors submitting new applications to BlackBerry App World(TM) will have the opportunity to enter the BlackBerry Developer Challenge. See full prize details at: http://p.sf.net/sfu/Challenge _______________________________________________ GeoTools-commits mailing list [hidden email] https://lists.sourceforge.net/lists/listinfo/geotools-commits |
||||||||||||||||
| Free Embeddable Forum Powered by Nabble | Help |
