Permalink
Browse files

Merge pull request #165 from GeoffWilliams/getfeature_viewparams_support

support for viewParams vendor parameter in GetFeature XML model
  • Loading branch information...
2 parents ebd7321 + fbcabd1 commit 573031df76cf4a5fac27fd341ebcb6ef64dc2920 @aaime aaime committed May 1, 2013
Showing with 16,284 additions and 18,248 deletions.
  1. +163 −208 modules/ogc/net.opengis.wfs/src/net/opengis/wfs/GetFeatureType.java
  2. +152 −190 modules/ogc/net.opengis.wfs/src/net/opengis/wfs/WfsFactory.java
  3. +3,138 −3,483 modules/ogc/net.opengis.wfs/src/net/opengis/wfs/WfsPackage.java
  4. +362 −314 modules/ogc/net.opengis.wfs/src/net/opengis/wfs/impl/GetFeatureTypeImpl.java
  5. +508 −467 modules/ogc/net.opengis.wfs/src/net/opengis/wfs/impl/WfsFactoryImpl.java
  6. +2,224 −2,610 modules/ogc/net.opengis.wfs/src/net/opengis/wfs/impl/WfsPackageImpl.java
  7. +130 −135 modules/ogc/net.opengis.wfs/src/net/opengis/wfs20/GetFeatureType.java
  8. +128 −191 modules/ogc/net.opengis.wfs/src/net/opengis/wfs20/Wfs20Factory.java
  9. +3,286 −3,872 modules/ogc/net.opengis.wfs/src/net/opengis/wfs20/Wfs20Package.java
  10. +402 −336 modules/ogc/net.opengis.wfs/src/net/opengis/wfs20/impl/GetFeatureTypeImpl.java
  11. +695 −563 modules/ogc/net.opengis.wfs/src/net/opengis/wfs20/impl/Wfs20FactoryImpl.java
  12. +3,021 −3,908 modules/ogc/net.opengis.wfs/src/net/opengis/wfs20/impl/Wfs20PackageImpl.java
  13. +608 −621 modules/ogc/net.opengis.wfs/src/net/opengis/wfs20/util/Wfs20AdapterFactory.java
  14. +708 −770 modules/ogc/net.opengis.wfs/src/net/opengis/wfs20/util/Wfs20Switch.java
  15. +717 −550 modules/ogc/net.opengis.wfs/src/net/opengis/wfs20/util/Wfs20Validator.java
  16. +9 −4 modules/ogc/net.opengis.wfs/wfs.ecore
  17. +4 −5 modules/ogc/net.opengis.wfs/wfs.genmodel
  18. +25 −18 modules/ogc/net.opengis.wfs/wfs20.ecore
  19. +4 −3 modules/ogc/net.opengis.wfs/wfs20.genmodel

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="wfs"
- nsURI="http://www.opengis.net/wfs" nsPrefix="wfs">
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="wfs" nsURI="http://www.opengis.net/wfs" nsPrefix="wfs">
<eClassifiers xsi:type="ecore:EClass" name="ActionType">
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
<details key="name" value="ActionType"/>
@@ -763,6 +761,13 @@
<eStructuralFeatures xsi:type="ecore:EAttribute" name="formatOptions" eType="#//Map"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="metadata" eType="#//Map"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="startIndex" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBigInteger"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="viewParams" unique="false"
+ upperBound="-1" eType="#//Map">
+ <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+ <details key="kind" value="attribute"/>
+ <details key="namespace" value="##targetNamespace"/>
+ </eAnnotations>
+ </eStructuralFeatures>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="GetFeatureWithLockType" eSuperTypes="#//GetFeatureType">
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
@@ -1,9 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
- xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/net.opengis.wfs/src"
- modelPluginID="net.opengis.wfs" modelName="Wfs" importerID="org.eclipse.emf.importer.java"
- usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/XMLType.genmodel#//type platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../net.opengis.ows/ows10.genmodel#//ows10">
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/net.opengis.wfs/src" modelPluginID="net.opengis.wfs"
+ modelName="Wfs" importerID="org.eclipse.emf.importer.java" usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/XMLType.genmodel#//type platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../net.opengis.ows/ows10.genmodel#//ows10 platform:/plugin/org.eclipse.emf.ecore/model/XMLNamespace.genmodel#//namespace ../net.opengis.ows/ows11.genmodel#//ows11 ../net.opengis.fes/fes20.genmodel#//fes20 ../org.w3.xlink/xlink.genmodel#//xlink">
<foreignModel>@model</foreignModel>
<genPackages prefix="Wfs" basePackage="net.opengis" disposableProviderFactory="true"
adapterFactory="false" ecorePackage="wfs.ecore#/">
@@ -147,6 +145,7 @@
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute wfs.ecore#//GetFeatureType/formatOptions"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute wfs.ecore#//GetFeatureType/metadata"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute wfs.ecore#//GetFeatureType/startIndex"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wfs.ecore#//GetFeatureType/viewParams"/>
</genClasses>
<genClasses ecoreClass="wfs.ecore#//GetFeatureWithLockType">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute wfs.ecore#//GetFeatureWithLockType/expiry"/>
@@ -973,24 +973,6 @@
<details key="name" value="GetFeatureType"/>
<details key="kind" value="elementOnly"/>
</eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="abstractQueryExpressionGroup"
- unique="false" lowerBound="1" upperBound="-1" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EFeatureMapEntry">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="group"/>
- <details key="name" value="AbstractQueryExpression:group"/>
- <details key="namespace" value="http://www.opengis.net/fes/2.0"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="abstractQueryExpression"
- lowerBound="1" upperBound="-1" eType="ecore:EClass ../net.opengis.fes/fes20.ecore#//AbstractQueryExpressionType"
- volatile="true" transient="true" derived="true" containment="true" resolveProxies="false">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="element"/>
- <details key="name" value="AbstractQueryExpression"/>
- <details key="namespace" value="http://www.opengis.net/fes/2.0"/>
- <details key="group" value="http://www.opengis.net/fes/2.0#AbstractQueryExpression:group"/>
- </eAnnotations>
- </eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="count" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//NonNegativeInteger">
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
<details key="kind" value="attribute"/>
@@ -1041,6 +1023,31 @@
</eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="metadata" eType="#//Map"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="formatOptions" eType="#//Map"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="viewParams" unique="false"
+ upperBound="-1" eType="#//Map">
+ <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+ <details key="kind" value="attribute"/>
+ <details key="namespace" value="##targetNamespace"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="abstractQueryExpressionGroup"
+ unique="false" lowerBound="1" upperBound="-1" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EFeatureMapEntry">
+ <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+ <details key="kind" value="group"/>
+ <details key="name" value="AbstractQueryExpression:group"/>
+ <details key="namespace" value="http://www.opengis.net/fes/2.0"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="abstractQueryExpression"
+ lowerBound="1" upperBound="-1" eType="ecore:EClass ../net.opengis.fes/fes20.ecore#//AbstractQueryExpressionType"
+ volatile="true" transient="true" derived="true" containment="true" resolveProxies="false">
+ <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+ <details key="kind" value="element"/>
+ <details key="name" value="AbstractQueryExpression"/>
+ <details key="namespace" value="http://www.opengis.net/fes/2.0"/>
+ <details key="group" value="http://www.opengis.net/fes/2.0#AbstractQueryExpression:group"/>
+ </eAnnotations>
+ </eStructuralFeatures>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="GetFeatureWithLockType" eSuperTypes="#//GetFeatureType">
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
@@ -2,7 +2,7 @@
<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/net.opengis.wfs/src" modelPluginID="net.opengis.wfs"
modelName="Wfs20" importerID="org.eclipse.emf.importer.java" complianceLevel="5.0"
- copyrightFields="false" usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/XMLType.genmodel#//type platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../net.opengis.ows/ows10.genmodel#//ows10 platform:/plugin/org.eclipse.emf.ecore/model/XMLNamespace.genmodel#//namespace ../net.opengis.ows/ows11.genmodel#//ows11 ../net.opengis.fes/fes20.genmodel#//fes20 ../org.w3.xlink/xlink.genmodel#//xlink">
+ copyrightFields="false" runtimeVersion="2.6" usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/XMLType.genmodel#//type platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../net.opengis.ows/ows10.genmodel#//ows10 platform:/plugin/org.eclipse.emf.ecore/model/XMLNamespace.genmodel#//namespace ../net.opengis.ows/ows11.genmodel#//ows11 ../net.opengis.fes/fes20.genmodel#//fes20 ../org.w3.xlink/xlink.genmodel#//xlink">
<foreignModel>@model</foreignModel>
<genPackages prefix="Wfs20" basePackage="net.opengis" disposableProviderFactory="true"
ecorePackage="wfs20.ecore#/">
@@ -215,8 +215,6 @@
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute wfs20.ecore#//GetCapabilitiesType/service"/>
</genClasses>
<genClasses ecoreClass="wfs20.ecore#//GetFeatureType">
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute wfs20.ecore#//GetFeatureType/abstractQueryExpressionGroup"/>
- <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference wfs20.ecore#//GetFeatureType/abstractQueryExpression"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute wfs20.ecore#//GetFeatureType/count"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute wfs20.ecore#//GetFeatureType/outputFormat"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute wfs20.ecore#//GetFeatureType/resolve"/>
@@ -226,6 +224,9 @@
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute wfs20.ecore#//GetFeatureType/startIndex"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute wfs20.ecore#//GetFeatureType/metadata"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute wfs20.ecore#//GetFeatureType/formatOptions"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wfs20.ecore#//GetFeatureType/viewParams"/>
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute wfs20.ecore#//GetFeatureType/abstractQueryExpressionGroup"/>
+ <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference wfs20.ecore#//GetFeatureType/abstractQueryExpression"/>
</genClasses>
<genClasses ecoreClass="wfs20.ecore#//GetFeatureWithLockType">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute wfs20.ecore#//GetFeatureWithLockType/expiry"/>

0 comments on commit 573031d

Please sign in to comment.