From 5a32d83d62c2b97bd6e2d9dc4790d82a2f30bd96 Mon Sep 17 00:00:00 2001
From: Max Schenkelberg <max.schenkelberg@raytheon.com>
Date: Fri, 10 Jan 2014 10:39:07 -0600
Subject: [PATCH] Issue #2620 Reordered developer feature.xml to match
 p2-build.xml

Change-Id: I15a073d17b1e6df21c9c34245b373bc091cc5e67

Former-commit-id: a3495d01dcc7d30c432fecbee5ffb7d7396e2c7b [formerly 13172879fd903b777c9394dd7db59afd86446614] [formerly ae7eb3938005419d423f7e6ca67120d69745381d] [formerly a3495d01dcc7d30c432fecbee5ffb7d7396e2c7b [formerly 13172879fd903b777c9394dd7db59afd86446614] [formerly ae7eb3938005419d423f7e6ca67120d69745381d] [formerly 73c022da20a4fcb26e8c297c2450d5b1ea4a5a2d [formerly ae7eb3938005419d423f7e6ca67120d69745381d [formerly ea87ef4868b35b4fa89d519478ade9fb9468cca8]]]]
Former-commit-id: 73c022da20a4fcb26e8c297c2450d5b1ea4a5a2d
Former-commit-id: 6fa1f6cc1231f531b042ef0cdf2264757c1c69c8 [formerly 59586b673b9b0e237f2b024d8d25f50c1e130081] [formerly 5235d6c097888869951204c434aba9265b112a4a [formerly 8abc1ec611a579ed92527f9e250bcae54d3e6cc0]]
Former-commit-id: 5724d8b4dac3d86c43f19041a75769997c3ccfee [formerly 20ba02a238569e33298a881857fb108378e81849]
Former-commit-id: 38d14b6ad6165af9caaf86fdcaa6564cf37faea9
---
 cave/build/p2-build.xml                       |  32 ++---
 .../feature.xml                               | 116 +++++++++---------
 2 files changed, 74 insertions(+), 74 deletions(-)

diff --git a/cave/build/p2-build.xml b/cave/build/p2-build.xml
index 0b45464eef..6ea8205954 100644
--- a/cave/build/p2-build.xml
+++ b/cave/build/p2-build.xml
@@ -169,10 +169,10 @@
 			<param name="feature"
 				value="com.raytheon.uf.viz.common.core.feature" />
 		</antcall>
-                <antcall target="p2.build.repo">
-                        <param name="feature"
-                                value="com.raytheon.uf.viz.localization.perspective.feature" />
-                </antcall>
+        <antcall target="p2.build.repo">
+            <param name="feature"
+                    value="com.raytheon.uf.viz.localization.perspective.feature" />
+        </antcall>
 		<antcall target="p2.build.repo">
 			<param name="feature"
 				value="com.raytheon.uf.viz.core.feature" />
@@ -293,18 +293,18 @@
 			<param name="feature"
 				value="com.raytheon.viz.volumebrowser.feature" />
 		</antcall>
-                <antcall target="p2.build.repo">
-                        <param name="feature"
-                                value="com.raytheon.uf.viz.acarssounding.feature" />
-                </antcall>
-                <antcall target="p2.build.repo">
-                        <param name="feature"
-                                value="com.raytheon.viz.avnfps.feature" />
-                </antcall>
-                <antcall target="p2.build.repo">
-                        <param name="feature"
-                                value="com.raytheon.uf.viz.dat.feature" />
-                </antcall>
+        <antcall target="p2.build.repo">
+            <param name="feature"
+                    value="com.raytheon.uf.viz.acarssounding.feature" />
+        </antcall>
+        <antcall target="p2.build.repo">
+            <param name="feature"
+                    value="com.raytheon.viz.avnfps.feature" />
+        </antcall>
+        <antcall target="p2.build.repo">
+            <param name="feature"
+                    value="com.raytheon.uf.viz.dat.feature" />
+        </antcall>
 		<antcall target="p2.build.repo">
 			<param name="feature"
 				value="com.raytheon.uf.viz.d2d.gfe.feature" />
diff --git a/cave/com.raytheon.viz.feature.awips.developer/feature.xml b/cave/com.raytheon.viz.feature.awips.developer/feature.xml
index 17cf845de2..1bfd01bc2c 100644
--- a/cave/com.raytheon.viz.feature.awips.developer/feature.xml
+++ b/cave/com.raytheon.viz.feature.awips.developer/feature.xml
@@ -28,6 +28,18 @@
    <includes
          id="com.raytheon.uf.viz.common.core.feature"
          version="0.0.0"/>
+         
+   <includes
+         id="com.raytheon.uf.viz.localization.perspective.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="com.raytheon.uf.viz.core.feature"
+         version="0.0.0"/>
+         
+   <includes
+         id="com.raytheon.uf.viz.core.maps.feature"
+         version="0.0.0"/>
 
    <includes
          id="com.raytheon.uf.viz.sounding.feature"
@@ -41,14 +53,6 @@
          id="com.raytheon.uf.viz.dataplugins.feature"
          version="0.0.0"/>
 
-   <includes
-         id="com.raytheon.uf.viz.core.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="com.raytheon.uf.viz.core.maps.feature"
-         version="0.0.0"/>
-
    <includes
          id="com.raytheon.uf.viz.d2d.core.feature"
          version="0.0.0"/>
@@ -77,10 +81,6 @@
          id="com.raytheon.uf.viz.displays.feature"
          version="0.0.0"/>
 
-   <includes
-         id="com.raytheon.uf.viz.d2d.skewt.feature"
-         version="0.0.0"/>
-
    <includes
          id="com.raytheon.viz.satellite.feature"
          version="0.0.0"/>
@@ -88,11 +88,19 @@
    <includes
          id="com.raytheon.uf.viz.ncep.core.feature"
          version="0.0.0"/>
-
+         
    <includes
          id="com.raytheon.uf.viz.ncep.dataplugins.feature"
          version="0.0.0"/>
-
+         
+   <includes
+         id="com.raytheon.viz.hydro.feature"
+         version="0.0.0"/>
+         
+   <includes
+         id="com.raytheon.uf.viz.d2d.xy.feature"
+         version="0.0.0"/>
+         
    <includes
          id="com.raytheon.uf.viz.ncep.displays.feature"
          version="0.0.0"/>
@@ -100,47 +108,23 @@
    <includes
          id="com.raytheon.uf.viz.ncep.nsharp.feature"
          version="0.0.0"/>
-
-   <includes
-         id="com.raytheon.viz.avnfps.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="com.raytheon.viz.hydro.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="com.raytheon.uf.viz.d2d.xy.feature"
-         version="0.0.0"/>
-
+         
    <includes
          id="com.raytheon.uf.viz.d2d.nsharp.feature"
          version="0.0.0"/>
-
+         
    <includes
-         id="com.raytheon.viz.volumebrowser.feature"
+         id="com.raytheon.uf.viz.archive.feature"
          version="0.0.0"/>
-
-   <includes
-         id="com.raytheon.uf.viz.d2d.gfe.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="com.raytheon.uf.viz.dat.feature"
-         version="0.0.0"/>
-
+         
    <includes
          id="com.raytheon.uf.viz.ncep.perspective.feature"
          version="0.0.0"/>
-
-   <includes
-         id="com.raytheon.uf.viz.localization.perspective.feature"
-         version="0.0.0"/>
-
+         
    <includes
          id="com.raytheon.uf.viz.nwsauth.feature"
          version="0.0.0"/>
-
+         
    <includes
          id="com.raytheon.uf.viz.thinclient.feature"
          version="0.0.0"/>
@@ -148,15 +132,11 @@
    <includes
          id="com.raytheon.uf.viz.datadelivery.feature"
          version="0.0.0"/>
-
+         
    <includes
          id="com.raytheon.uf.viz.useradmin.feature"
          version="0.0.0"/>
-
-   <includes
-         id="com.raytheon.uf.viz.collaboration.feature"
-         version="0.0.0"/>
-
+         
    <includes
          id="com.raytheon.uf.viz.kml.export.feature"
          version="0.0.0"/>
@@ -164,23 +144,43 @@
    <includes
          id="com.raytheon.uf.viz.npp.feature"
          version="0.0.0"/>
+         
+   <includes
+         id="com.raytheon.uf.viz.d2d.skewt.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="com.raytheon.viz.volumebrowser.feature"
+         version="0.0.0"/>
+         
+   <includes
+         id="com.raytheon.uf.viz.acarssounding.feature"
+         version="0.0.0"/>
+         
+   <includes
+         id="com.raytheon.viz.avnfps.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="com.raytheon.uf.viz.dat.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="com.raytheon.uf.viz.d2d.gfe.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="com.raytheon.uf.viz.collaboration.feature"
+         version="0.0.0"/>
 
    <includes
          id="com.raytheon.uf.viz.gisdatastore.feature"
          version="0.0.0"/>
 
-   <includes
-         id="com.raytheon.uf.viz.archive.feature"
-         version="0.0.0"/>
-
    <includes
          id="com.raytheon.uf.viz.d2d.ui.awips.feature"
          version="0.0.0"/>
 
-   <includes
-         id="com.raytheon.uf.viz.acarssounding.feature"
-         version="0.0.0"/>
-
    <requires>
       <import feature="com.raytheon.uf.viz.application.feature" version="1.0.0.qualifier"/>
    </requires>