Add missing application titles in app.xml with pom.xml clean up

Change-Id: I543572d696f30f2ceebd39d9c6c33be55f5da38d
2026-05-04 19:56:49 +02:00 · 2016-03-07 21:26:48 -08:00 · 2016-03-07 21:26:48 -08:00 · 2b746f4cbd
commit 2b746f4cbd
parent af520d3c22
36 changed files with 34 additions and 69 deletions
--- a/apps/aaa/app.xml
+++ b/apps/aaa/app.xml
@ -15,7 +15,7 @@
  ~ limitations under the License.
  -->
 <app name="org.onosproject.aaa" origin="ATT" version="${project.version}"
-     category="default" url="http://onosproject.org"
+     category="default" url="http://onosproject.org" title="ONOS Auth App"
     featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
     features="${project.artifactId}">
    <description>${project.description}</description>
--- a/apps/bgprouter/app.xml
+++ b/apps/bgprouter/app.xml
@ -15,7 +15,7 @@
  ~ limitations under the License.
  -->
 <app name="org.onosproject.bgprouter" origin="ON.Lab" version="${project.version}"
-     category="default" url="http://onosproject.org"
+     category="default" url="http://onosproject.org" title="BGP router App"
     featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
     features="${project.artifactId}">
    <description>${project.description}</description>
--- a/apps/cordmcast/pom.xml
+++ b/apps/cordmcast/pom.xml
@ -33,6 +33,7 @@

    <properties>
        <onos.app.name>org.onosproject.cordmcast</onos.app.name>
+        <onos.app.title>CORD Multicast App</onos.app.title>
    </properties>

    <dependencies>
--- a/apps/cordvtn/app.xml
+++ b/apps/cordvtn/app.xml
@ -15,7 +15,7 @@
  ~ limitations under the License.
  -->
 <app name="org.onosproject.cordvtn" origin="ON.Lab" version="${project.version}"
-        category="default" url="http://onosproject.org"
+        category="default" url="http://onosproject.org" title="CORD Virtual Tenant Network"
        featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
        features="${project.artifactId}"
        apps="org.onosproject.ovsdb-base,org.onosproject.openstackinterface,org.onosproject.dhcp">
--- a/apps/cordvtn/pom.xml
+++ b/apps/cordvtn/pom.xml
@ -32,11 +32,6 @@
    <description>Virtual tenant network service for CORD</description>

    <properties>
-        <onos.app.name>org.onosproject.cordvtn</onos.app.name>
-        <onos.app.title>CORD Virtual Tenant Network</onos.app.title>
-        <onos.app.category>default</onos.app.category>
-        <onos.app.url>http://onosproject.org</onos.app.url>
-        <onos.app.readme>Virtual tenant network service for CORD.</onos.app.readme>
        <web.context>/onos/cordvtn</web.context>
        <api.version>1.0.0</api.version>
        <api.title>CORD VTN REST API</api.title>
--- a/apps/cpman/app/app.xml
+++ b/apps/cpman/app/app.xml
@ -15,7 +15,7 @@
  ~ limitations under the License.
  -->
 <app name="org.onosproject.cpman" origin="ON.Lab" version="${project.version}"
-     category="default" url="http://onosproject.org"
+     category="default" url="http://onosproject.org" title="Control Plane Manager"
     featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
     features="${project.artifactId}" apps="org.onosproject.openflow-message">
    <description>${project.description}</description>
--- a/apps/dhcp/app/app.xml
+++ b/apps/dhcp/app/app.xml
@ -15,7 +15,7 @@
  ~ limitations under the License.
  -->
 <app name="org.onosproject.dhcp" origin="ON.Lab" version="${project.version}"
-     category="default" url="http://onosproject.org"
+     category="default" url="http://onosproject.org" title="DHCP Server REST API"
     featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
     features="${project.artifactId}">
    <description>${project.description}</description>
--- a/apps/faultmanagement/app/app.xml
+++ b/apps/faultmanagement/app/app.xml
@ -15,7 +15,7 @@
  ~ limitations under the License.
  -->
 <app name="org.onosproject.faultmanagement" origin="BTI Systems" version="${project.version}"
-     category="default" url="http://onosproject.org"
+     category="default" url="http://onosproject.org" title="ONOS Fault Mgmt App"
     featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
     features="${project.artifactId}">
    <description>${project.description}</description>
--- a/apps/metrics/pom.xml
+++ b/apps/metrics/pom.xml
@ -36,9 +36,7 @@
        <onos.app.title>Performance Metrics App</onos.app.title>
        <onos.app.category>default</onos.app.category>
        <onos.app.url>http://onosproject.org</onos.app.url>
-        <onos.app.readme>
-            Performance metrics collection application.
-        </onos.app.readme>
+        <onos.app.readme>Performance metrics collection application.</onos.app.readme>
    </properties>

    <dependencies>
--- a/apps/mfwd/pom.xml
+++ b/apps/mfwd/pom.xml
@ -36,9 +36,7 @@
        <onos.app.title>Multicast Forwarding App</onos.app.title>
        <onos.app.category>default</onos.app.category>
        <onos.app.url>http://onosproject.org</onos.app.url>
-        <onos.app.readme>
-            Multicast forwarding application.
-        </onos.app.readme>
+        <onos.app.readme>Multicast forwarding application.</onos.app.readme>
    </properties>

    <dependencies>
--- a/apps/mlb/pom.xml
+++ b/apps/mlb/pom.xml
@ -36,7 +36,8 @@
        <onos.app.title>Mastership Load Balancer App</onos.app.title>
        <onos.app.category>default</onos.app.category>
        <onos.app.url>http://onosproject.org</onos.app.url>
-        <onos.app.readme>Application that balances mastership among nodes.
+        <onos.app.readme>
+            Application that balances mastership among nodes.
        </onos.app.readme>
    </properties>

--- a/apps/mobility/pom.xml
+++ b/apps/mobility/pom.xml
@ -36,9 +36,7 @@
        <onos.app.title>Host Mobility App</onos.app.title>
        <onos.app.category>default</onos.app.category>
        <onos.app.url>http://onosproject.org</onos.app.url>
-        <onos.app.readme>
-            Host mobility application.
-        </onos.app.readme>
+        <onos.app.readme>Host mobility application.</onos.app.readme>
    </properties>

    <dependencies>
--- a/apps/olt/app/app.xml
+++ b/apps/olt/app/app.xml
@ -15,7 +15,7 @@
  ~ limitations under the License.
  -->
 <app name="org.onosproject.olt" origin="ON.Lab" version="${project.version}"
-     category="default" url="http://onosproject.org"
+     category="default" url="http://onosproject.org" title="ONOS OLT App"
     featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
     features="${project.artifactId}">
    <description>${project.description}</description>
--- a/apps/openstackinterface/app/app.xml
+++ b/apps/openstackinterface/app/app.xml
@ -15,7 +15,7 @@
  ~ limitations under the License.
  -->
 <app name="org.onosproject.openstackinterface" origin="ON.Lab" version="${project.version}"
-     category="default" url="http://onosproject.org"
+     category="default" url="http://onosproject.org" title="Openstack Interface App"
     featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
     features="${project.artifactId}">
    <description>${project.description}</description>
--- a/apps/openstackinterface/app/pom.xml
+++ b/apps/openstackinterface/app/pom.xml
@ -29,12 +29,9 @@
    <artifactId>onos-app-openstackinterface-app</artifactId>
    <packaging>bundle</packaging>

+    <description>Openstack Interface Application</description>

    <properties>
-        <onos.app.name>org.onosproject.openstackinterface</onos.app.name>
-        <onos.app.title>Openstack Interface App</onos.app.title>
-        <onos.app.category>default</onos.app.category>
-        <onos.app.url>http://onosproject.org</onos.app.url>
        <onos.app.readme>Openstack Interface Application.</onos.app.readme>
    </properties>

@ -95,6 +92,4 @@
            <version>${project.version}</version>
        </dependency>
    </dependencies>
-
-
 </project>
--- a/apps/openstacknetworking/app/app.xml
+++ b/apps/openstacknetworking/app/app.xml
@ -15,7 +15,7 @@
  ~ limitations under the License.
  -->
 <app name="org.onosproject.openstacknetworking" origin="ON.Lab" version="${project.version}"
-     category="default" url="http://onosproject.org"
+     category="default" url="http://onosproject.org" title="Openstack Networking App"
     featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
     features="${project.artifactId}"
     apps="org.onosproject.openstackswitching,org.onosproject.openstackrouting">
--- a/apps/openstacknetworking/app/pom.xml
+++ b/apps/openstacknetworking/app/pom.xml
@ -30,10 +30,6 @@
    <packaging>pom</packaging>

    <properties>
-        <onos.app.name>org.onosproject.openstacknetworking</onos.app.name>
-        <onos.app.title>Openstack Networking App</onos.app.title>
-        <onos.app.category>default</onos.app.category>
-        <onos.app.url>http://onosproject.org</onos.app.url>
        <onos.app.readme>Openstack Networking Application.</onos.app.readme>
    </properties>

--- a/apps/optical/pom.xml
+++ b/apps/optical/pom.xml
@ -36,8 +36,7 @@
        <onos.app.title>Packet/Optical Use-Case App</onos.app.title>
        <onos.app.category>default</onos.app.category>
        <onos.app.url>http://onosproject.org</onos.app.url>
-        <onos.app.readme>Packet/Optical use-case application.
-        </onos.app.readme>
+        <onos.app.readme>Packet/Optical use-case application.</onos.app.readme>
    </properties>

    <dependencies>
--- a/apps/pathpainter/pom.xml
+++ b/apps/pathpainter/pom.xml
@ -36,9 +36,7 @@
        <onos.app.title>Path Visualization App</onos.app.title>
        <onos.app.category>default</onos.app.category>
        <onos.app.url>https://wiki.onosproject.org/display/ONOS/Path+Painter+Application+GUI</onos.app.url>
-        <onos.app.title>
-            Path visualization application
-        </onos.app.title>
+        <onos.app.title>Path visualization application</onos.app.title>
        <onos.app.readme>
            Allows the user to visualize different types of paths between
            network entities such as switches and hosts.
--- a/apps/sdnip/app.xml
+++ b/apps/sdnip/app.xml
@ -15,7 +15,7 @@
  ~ limitations under the License.
  -->
 <app name="org.onosproject.sdnip" origin="ON.Lab" version="${project.version}"
-     category="default" url="http://onosproject.org"
+     category="default" url="http://onosproject.org" title="SDN-IP App"
     featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
     features="${project.artifactId}">
    <description>${project.description}</description>
--- a/apps/vpls/pom.xml
+++ b/apps/vpls/pom.xml
@ -33,6 +33,7 @@

    <properties>
        <onos.app.name>org.onosproject.vpls</onos.app.name>
+        <onos.app.title>VLAN L2 Broadcast Network App</onos.app.title>
    </properties>

    <dependencies>
--- a/apps/vrouter/app.xml
+++ b/apps/vrouter/app.xml
@ -15,7 +15,7 @@
  ~ limitations under the License.
  -->
 <app name="org.onosproject.vrouter" origin="ON.Lab" version="${project.version}"
-     category="default" url="http://onosproject.org"
+     category="default" url="http://onosproject.org" title="Virtual Router App"
     featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
     features="${project.artifactId}">
    <description>${project.description}</description>
--- a/apps/vrouter/pom.xml
+++ b/apps/vrouter/pom.xml
@ -31,23 +31,16 @@
    <packaging>bundle</packaging>

    <description>Virtual router (vRouter) application</description>
-    <url>http://onosproject.org</url>
-
-    <properties>
-        <onos.version>1.5.0-SNAPSHOT</onos.version>
-    </properties>

    <dependencies>
        <dependency>
            <groupId>org.onosproject</groupId>
            <artifactId>onos-api</artifactId>
-            <version>${onos.version}</version>
        </dependency>

        <dependency>
            <groupId>org.onosproject</groupId>
            <artifactId>onlab-osgi</artifactId>
-            <version>${onos.version}</version>
        </dependency>

        <dependency>
@ -64,7 +57,6 @@
        <dependency>
            <groupId>org.onosproject</groupId>
            <artifactId>onos-api</artifactId>
-            <version>${onos.version}</version>
            <scope>test</scope>
            <classifier>tests</classifier>
        </dependency>
--- a/apps/vtn/app/app.xml
+++ b/apps/vtn/app/app.xml
@ -15,7 +15,7 @@
  ~ limitations under the License.
  -->
 <app name="org.onosproject.vtn" origin="ON.Lab" version="${project.version}"
-     category="default" url="http://onosproject.org"
+     category="default" url="http://onosproject.org" title="ONOS Framework App"
     featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
     features="${project.artifactId}">
    <description>${project.description}</description>
--- a/providers/bgp/app/app.xml
+++ b/providers/bgp/app/app.xml
@ -15,7 +15,7 @@
  ~ limitations under the License.
  -->
 <app name="org.onosproject.bgp" origin="ON.Lab" version="${project.version}"
-     category="default" url="http://onosproject.org"
+     category="default" url="http://onosproject.org" title="BGP Provider"
     featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
     features="${project.artifactId}">
    <description>${project.description}</description>
--- a/providers/lldp/app.xml
+++ b/providers/lldp/app.xml
@ -15,7 +15,7 @@
  ~ limitations under the License.
  -->
 <app name="org.onosproject.lldpprovider" origin="ON.Lab" version="${project.version}"
-     category="default" url="http://onosproject.org"
+     category="default" url="http://onosproject.org" title="LLDP Provider"
     featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
     features="${project.artifactId}">
    <description>${project.description}</description>
--- a/providers/netcfglinks/app.xml
+++ b/providers/netcfglinks/app.xml
@ -15,7 +15,7 @@
  ~ limitations under the License.
  -->
 <app name="org.onosproject.netcfglinksprovider" origin="ON.Lab" version="${project.version}"
-     category="default" url="http://onosproject.org"
+     category="default" url="http://onosproject.org" title="Network Config Link Provider"
     featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
     features="${project.artifactId}">
    <description>${project.description}</description>
--- a/providers/netcfglinks/features.xml
+++ b/providers/netcfglinks/features.xml
@ -13,7 +13,8 @@
  ~ 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.
-  --><features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="${project.artifactId}-${project.version}">
+  -->
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="${project.artifactId}-${project.version}">
    <feature name="${project.artifactId}" version="${project.version}"
             description="${project.description}">
        <feature>onos-api</feature>
--- a/providers/netcfglinks/pom.xml
+++ b/providers/netcfglinks/pom.xml
@ -30,16 +30,8 @@
    <description>
        Links provider that uses network config service to predefine devices and links.
    </description>
-    <url>http://onosproject.org</url>
-
-    <properties>
-        <onos.app.name>org.onosproject.netcfglinksprovider</onos.app.name>
-        <onos.app.title>Network Config Link Provider</onos.app.title>
-        <onos.app.origin>ON.Lab</onos.app.origin>
-    </properties>

    <dependencies>
-
        <dependency>
            <groupId>org.onosproject</groupId>
            <artifactId>onlab-osgi</artifactId>
--- a/providers/netconf/app/app.xml
+++ b/providers/netconf/app/app.xml
@ -15,7 +15,7 @@
  ~ limitations under the License.
  -->
 <app name="org.onosproject.netconf" origin="ON.Lab" version="${project.version}"
-     category="default" url="http://onosproject.org"
+     category="default" url="http://onosproject.org" title="NetConf Provider"
     featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
     features="${project.artifactId}">
    <description>${project.description}</description>
--- a/providers/openflow/base/app.xml
+++ b/providers/openflow/base/app.xml
@ -15,7 +15,7 @@
  ~ limitations under the License.
  -->
 <app name="org.onosproject.openflow-base" origin="ON.Lab" version="${project.version}"
-     category="default" url="http://onosproject.org"
+     category="default" url="http://onosproject.org" title="OpenFlow Provider"
     featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
     features="${project.artifactId}">
    <description>${project.description}</description>
--- a/providers/openflow/message/app.xml
+++ b/providers/openflow/message/app.xml
@ -15,7 +15,7 @@
  ~ limitations under the License.
  -->
 <app name="org.onosproject.openflow-message" origin="ON.Lab" version="${project.version}"
-     category="default" url="http://onosproject.org"
+     category="default" url="http://onosproject.org" title="Control Message Stat. Provider"
     featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
     features="${project.artifactId}">
    <description>${project.description}</description>
--- a/providers/ovsdb/base/app.xml
+++ b/providers/ovsdb/base/app.xml
@ -15,7 +15,7 @@
  ~ limitations under the License.
  -->
 <app name="org.onosproject.ovsdb-base" origin="ON.Lab" version="${project.version}"
-     category="default" url="http://onosproject.org"
+     category="default" url="http://onosproject.org" title="OVSDB Provider"
     featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
     features="${project.artifactId}">
    <description>${project.description}</description>
--- a/providers/pcep/app/app.xml
+++ b/providers/pcep/app/app.xml
@ -15,7 +15,7 @@
  ~ limitations under the License.
  -->
 <app name="org.onosproject.pcep" origin="ON.Lab" version="${project.version}"
-     category="default" url="http://onosproject.org"
+     category="default" url="http://onosproject.org" title="PCEP Provider"
     featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
     features="${project.artifactId}">
    <description>${project.description}</description>
--- a/providers/rest/app/app.xml
+++ b/providers/rest/app/app.xml
@ -15,7 +15,7 @@
  ~ limitations under the License.
  -->
 <app name="org.onosproject.restsb" origin="ON.Lab" version="${project.version}"
-     category="default" url="http://onosproject.org"
+     category="default" url="http://onosproject.org" title="REST Provider"
     featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
     features="${project.artifactId}">
    <description>${project.description}</description>
--- a/providers/snmp/app/app.xml
+++ b/providers/snmp/app/app.xml
@ -15,7 +15,7 @@
  ~ limitations under the License.
  -->
 <app name="org.onosproject.snmp" origin="BTI Systems" version="${project.version}"
-     category="default" url="http://onosproject.org"
+     category="default" url="http://onosproject.org" title="SNMP Provider"
     featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
     features="${project.artifactId}">
    <description>${project.description}</description>