Author: bencaradocdavies
Date: 2009-07-08 21:21:14 -0400 (Wed, 08 Jul 2009)
New Revision: 33529
Modified:
trunk/modules/unsupported/app-schema/app-schema/pom.xml
trunk/modules/unsupported/app-schema/app-schema/src/main/java/org/geotools/data/complex/filter/UnmappingFilterVisitor.java
trunk/modules/unsupported/app-schema/app-schema/src/test/java/org/geotools/data/complex/FeatureChainingTest.java
trunk/modules/unsupported/app-schema/pom.xml
Log:
Removed registered function support from app-schema. Disabled gt-jdbc-regfunc module.
Modified: trunk/modules/unsupported/app-schema/app-schema/pom.xml
===================================================================
--- trunk/modules/unsupported/app-schema/app-schema/pom.xml 2009-07-08 15:33:24 UTC (rev 33528)
+++ trunk/modules/unsupported/app-schema/app-schema/pom.xml 2009-07-09 01:21:14 UTC (rev 33529)
@@ -78,11 +78,6 @@
<dependency>
<groupId>org.geotools</groupId>
- <artifactId>gt-jdbc-regfunc</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.geotools</groupId>
<artifactId>gt-data</artifactId>
<version>${project.version}</version>
</dependency>
Modified: trunk/modules/unsupported/app-schema/app-schema/src/main/java/org/geotools/data/complex/filter/UnmappingFilterVisitor.java
===================================================================
--- trunk/modules/unsupported/app-schema/app-schema/src/main/java/org/geotools/data/complex/filter/UnmappingFilterVisitor.java 2009-07-08 15:33:24 UTC (rev 33528)
+++ trunk/modules/unsupported/app-schema/app-schema/src/main/java/org/geotools/data/complex/filter/UnmappingFilterVisitor.java 2009-07-09 01:21:14 UTC (rev 33529)
@@ -36,9 +36,9 @@
import org.geotools.data.complex.NestedAttributeMapping;
import org.geotools.data.complex.filter.XPath.Step;
import org.geotools.data.complex.filter.XPath.StepList;
+import org.geotools.factory.CommonFactoryFinder;
import org.geotools.feature.NameImpl;
import org.geotools.feature.Types;
-import org.geotools.filter.RegfuncFilterFactoryImpl;
import org.geotools.filter.NestedAttributeExpression;
import org.opengis.feature.type.AttributeDescriptor;
import org.opengis.feature.type.Name;
@@ -122,11 +122,8 @@
private FeatureTypeMapping mappings;
- // private static final FilterFactory2 ff = (FilterFactory2) CommonFactoryFinder
- // .getFilterFactory(null);
- // TODO: once Regfunc stuff pulled up into FilterFactoryImpl
- // the code below can be replaced by the original above.
- private static final FilterFactory2 ff = new RegfuncFilterFactoryImpl(null);
+ private static final FilterFactory2 ff = (FilterFactory2) CommonFactoryFinder
+ .getFilterFactory(null);
/**
* visit(*Expression) holds the unmapped expression here. Package visible just for unit tests
Modified: trunk/modules/unsupported/app-schema/app-schema/src/test/java/org/geotools/data/complex/FeatureChainingTest.java
===================================================================
--- trunk/modules/unsupported/app-schema/app-schema/src/test/java/org/geotools/data/complex/FeatureChainingTest.java 2009-07-08 15:33:24 UTC (rev 33528)
+++ trunk/modules/unsupported/app-schema/app-schema/src/test/java/org/geotools/data/complex/FeatureChainingTest.java 2009-07-09 01:21:14 UTC (rev 33529)
@@ -25,15 +25,17 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+
import junit.framework.TestCase;
+
import org.geotools.data.DataAccess;
import org.geotools.data.DataAccessFinder;
import org.geotools.data.FeatureSource;
import org.geotools.feature.FeatureCollection;
import org.geotools.feature.FeatureImpl;
import org.geotools.feature.Types;
+import org.geotools.filter.FilterFactoryImpl;
import org.geotools.filter.FunctionExpressionImpl;
-import org.geotools.filter.RegfuncFilterFactoryImpl;
import org.opengis.feature.Feature;
import org.opengis.feature.Property;
import org.opengis.feature.type.FeatureType;
@@ -72,7 +74,7 @@
static final Name CONTROLLED_CONCEPT = Types.typeName(GSMLNS, "ControlledConcept");
- static FilterFactory ff = new RegfuncFilterFactoryImpl(null);
+ static FilterFactory ff = new FilterFactoryImpl(null);
/**
* Map of geological unit values to mapped feature objects based on
Modified: trunk/modules/unsupported/app-schema/pom.xml
===================================================================
--- trunk/modules/unsupported/app-schema/pom.xml 2009-07-08 15:33:24 UTC (rev 33528)
+++ trunk/modules/unsupported/app-schema/pom.xml 2009-07-09 01:21:14 UTC (rev 33529)
@@ -50,9 +50,7 @@
<!-- =========================================================== -->
<modules>
<module>app-schema</module>
- <module>jdbc-regfunc</module>
<module>sample-data-access</module>
- <!-- <module>sample-data-access-isogeom</module> -->
</modules>
</project>
------------------------------------------------------------------------------
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
