Adding more app.xml files.

Upgrading app.xml versions.
Cleaned-up features.xml.

Change-Id: I7c5a85480568ffe35281286aefc9aa4e1b3b2afd

@@ -14,7 +14,7 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<app name="org.onosproject.app.metrics.intent" origin="ON.Lab" version="1.1.0"
-        features="onos-app-metrics-intent">
-    <description>ONOS intent metrics test application</description>
+<app name="org.onosproject.bgprouter" origin="ON.Lab" version="1.2.0"
+        features="onos-app-bgprouter">
+    <description>ONOS BGP router application</description>
 </app>

@@ -14,7 +14,7 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<app name="org.onosproject.app.config" origin="ON.Lab" version="1.1.0"
+<app name="org.onosproject.config" origin="ON.Lab" version="1.2.0"
         features="onos-app-config">
     <description>ONOS network configuration application</description>
 </app>

@@ -14,7 +14,7 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<app name="org.onosproject.app.fwd" origin="ON.Lab" version="1.1.0"
+<app name="org.onosproject.fwd" origin="ON.Lab" version="1.2.0"
         features="onos-app-fwd">
     <description>ONOS Reactive forwarding application using flow subsystem</description>
 </app>

@@ -14,7 +14,7 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<app name="org.onosproject.app.metrics.topology" origin="ON.Lab" version="1.1.0"
-        features="onos-app-metrics-topology">
-    <description>ONOS topology metrics test application</description>
+<app name="org.onosproject.metrics" origin="ON.Lab" version="1.2.0"
+        features="onos-app-config">
+    <description>ONOS performance metrics collection</description>
 </app>

@@ -14,7 +14,7 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<app name="org.onosproject.app.mobility" origin="ON.Lab" version="1.1.0"
+<app name="org.onosproject.mobility" origin="ON.Lab" version="1.2.0"
         features="onos-app-mobility">
     <description>ONOS host mobility application</description>
 </app>

@@ -14,7 +14,7 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<app name="org.onosproject.app.optical" origin="ON.Lab" version="1.1.0"
+<app name="org.onosproject.optical" origin="ON.Lab" version="1.2.0"
         features="onos-app-optical">
     <description>ONOS Packet/Optical use-case application</description>
 </app>

@@ -14,7 +14,7 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<app name="org.onosproject.app.proxyarp" origin="ON.Lab" version="1.1.0"
+<app name="org.onosproject.proxyarp" origin="ON.Lab" version="1.2.0"
         features="onos-app-proxyarp">
-    <description>ONOS proxy ARP application</description>
+    <description>ONOS proxy ARP/NDP application</description>
 </app>

@@ -14,7 +14,7 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<app name="org.onosproject.app.sdnip" origin="ON.Lab" version="1.1.0"
+<app name="org.onosproject.sdnip" origin="ON.Lab" version="1.2.0"
         features="onos-app-sdnip">
     <description>ONOS SDN/IP use-case application</description>
 </app>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2015 Open Networking Laboratory
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<app name="org.onosproject.election" origin="ON.Lab" version="1.2.0"
+        features="onos-app-metrics">
+    <description>ONOS master election test application</description>
+</app>

@@ -155,7 +155,7 @@
         <bundle>mvn:org.onosproject/onos-of-provider-group/@ONOS-VERSION</bundle>
     </feature>
 
-    <!-- ONOS built-in apps -->
+    <!-- ONOS built-in app features -->
 
     <feature name="onos-app-fwd" version="@FEATURE-VERSION"
              description="ONOS sample forwarding application">
@@ -225,7 +225,23 @@
         <bundle>mvn:org.onosproject/onos-app-metrics-topology/@ONOS-VERSION</bundle>
     </feature>
 
-    <!-- Sample apps: to be moved to a different repo -->
+
+    <!-- ONOS test app features -->
+
+    <feature name="onos-app-intent-perf" version="@FEATURE-VERSION"
+             description="ONOS intent perf applications">
+        <feature>onos-api</feature>
+        <bundle>mvn:org.onosproject/onos-app-intent-perf/@ONOS-VERSION</bundle>
+    </feature>
+
+    <feature name="onos-app-election" version="@FEATURE-VERSION"
+             description="ONOS app leadership election test">
+        <feature>onos-api</feature>
+        <bundle>mvn:org.onosproject/onos-app-election/@ONOS-VERSION</bundle>
+    </feature>
+
+
+    <!-- ONOS sample app features: to be moved to a different repo -->
 
     <feature name="onos-app-tvue" version="@FEATURE-VERSION"
              description="ONOS sample topology viewer application">
@@ -248,24 +264,12 @@
         <bundle>mvn:org.onosproject/onos-app-demo/@ONOS-VERSION</bundle>
     </feature>
 
-    <feature name="onos-app-intent-perf" version="@FEATURE-VERSION"
-             description="ONOS intent perf applications">
-        <feature>onos-api</feature>
-        <bundle>mvn:org.onosproject/onos-app-intent-perf/@ONOS-VERSION</bundle>
-    </feature>
-
     <feature name="onos-app-database-perf" version="@FEATURE-VERSION"
              description="ONOS partitioned database perf application">
         <feature>onos-api</feature>
         <bundle>mvn:org.onosproject/onos-app-database-perf/@ONOS-VERSION</bundle>
     </feature>
 
-    <feature name="onos-app-election" version="@FEATURE-VERSION"
-             description="ONOS app leadership election test">
-        <feature>onos-api</feature>
-        <bundle>mvn:org.onosproject/onos-app-election/@ONOS-VERSION</bundle>
-    </feature>
-
     <feature name="onos-app-calendar" version="@FEATURE-VERSION"
              description="REST interface for scheduling intents from an external calendar">
         <feature>onos-api</feature>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2015 Open Networking Laboratory
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<app name="org.onosproject.null" origin="ON.Lab" version="1.2.0"
+        features="onos-null">
+    <description>ONOS null southbound providers for testing</description>
+</app>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2015 Open Networking Laboratory
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<app name="org.onosproject.openflow" origin="ON.Lab" version="1.2.0"
+        features="onos-openflow">
+    <description>ONOS OpenFlow protocol southbound providers</description>
+</app>