Refine application title and category in app.xml and pom.xml

- Remove ONOS keyword from application title
- Capitalize each keyword in application title
- Make it consistent to use App, Provider and Driver in
  application title
- Add right category name for each application
- Add missing application title and category
- Make application category comment more descriptive

Change-Id: Ib886b4a4293c38bd546a4107b20569f1bd7031a7

@@ -15,7 +15,7 @@
   ~ limitations under the License.
   -->
 <app name="org.onosproject.aaa" origin="ATT" version="${project.version}"
-     category="default" url="http://onosproject.org" title="ONOS Auth App"
+     category="Security" url="http://onosproject.org" title="Authentication App"
      featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
      features="${project.artifactId}">
     <description>${project.description}</description>

@@ -40,8 +40,8 @@
     <properties>
         <onos.app.name>org.onosproject.acl</onos.app.name>
         <onos.app.origin>DLUT</onos.app.origin>
-        <onos.app.title>ONOS ACL App</onos.app.title>
-        <onos.app.category>default</onos.app.category>
+        <onos.app.title>ACL App</onos.app.title>
+        <onos.app.category>Security</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
         <onos.app.readme>ONOS ACL application.</onos.app.readme>
 

@@ -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" title="BGP router App"
+     category="Traffic Steering" 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>

@@ -33,7 +33,7 @@
 
     <properties>
         <onos.app.name>org.onosproject.cip</onos.app.name>
-        <onos.app.category>default</onos.app.category>
+        <onos.app.category>Utility</onos.app.category>
         <onos.app.title>Cluster IP Alias App</onos.app.title>
         <onos.app.url>http://onosproject.org</onos.app.url>
         <onos.app.readme>Cluster IP alias application.</onos.app.readme>

@@ -33,7 +33,7 @@
     <properties>
         <onos.app.name>org.onosproject.cordfabric</onos.app.name>
         <onos.app.title>CORD Fabric App</onos.app.title>
-        <onos.app.category>default</onos.app.category>
+        <onos.app.category>Traffic Steering</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
         <onos.app.readme>Simple fabric application for CORD.</onos.app.readme>
         <web.context>/onos/cordfabric</web.context>

@@ -33,7 +33,9 @@
 
     <properties>
         <onos.app.name>org.onosproject.cordmcast</onos.app.name>
+        <onos.app.category>Traffic Steering</onos.app.category>
         <onos.app.title>CORD Multicast App</onos.app.title>
+        <onos.app.url>http://opencord.org</onos.app.url>
     </properties>
 
     <dependencies>

@@ -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" title="CORD Virtual Tenant Network"
+        category="Traffic Steering" 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">

@@ -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" title="Control Plane Manager"
+     category="Monitoring" url="http://onosproject.org" title="Control Plane Management App"
      featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
      features="${project.artifactId}" apps="org.onosproject.openflow-message">
     <description>${project.description}</description>

@@ -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" title="DHCP Server REST API"
+     category="Utility" url="http://onosproject.org" title="DHCP App"
      featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
      features="${project.artifactId}">
     <description>${project.description}</description>

@@ -33,8 +33,8 @@
 
     <properties>
         <onos.app.name>org.onosproject.drivermatrix</onos.app.name>
-        <onos.app.title>Driver Behaviour Support Matrix</onos.app.title>
-        <onos.app.category>default</onos.app.category>
+        <onos.app.title>Driver Behaviour Support Matrix App</onos.app.title>
+        <onos.app.category>Utility</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
         <onos.app.readme>Driver behaviour support matrix.</onos.app.readme>
     </properties>

@@ -32,8 +32,8 @@
 
     <properties>
         <onos.app.name>org.onosproject.events</onos.app.name>
-        <onos.app.title>ONOS Event History App</onos.app.title>
-        <onos.app.category>default</onos.app.category>
+        <onos.app.title>Event History App</onos.app.title>
+        <onos.app.category>Utility</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
         <onos.app.readme>ONOS event history display application.</onos.app.readme>
     </properties>

@@ -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" title="ONOS Fault Mgmt App"
+     category="Monitoring" url="https://wiki.onosproject.org/display/ONOS/Fault+Management" title="Fault Management App"
      featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
      features="${project.artifactId}">
     <description>${project.description}</description>

@@ -33,8 +33,8 @@
 
     <properties>
         <onos.app.name>org.onosproject.flowanalyzer</onos.app.name>
-        <onos.app.title>Flow Space Analyzer</onos.app.title>
-        <onos.app.category>default</onos.app.category>
+        <onos.app.title>Flow Space Analysis App</onos.app.title>
+        <onos.app.category>Monitoring</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
         <onos.app.readme>Simple flow space analyzer.</onos.app.readme>
     </properties>

@@ -34,7 +34,7 @@
     <properties>
         <onos.app.name>org.onosproject.fwd</onos.app.name>
         <onos.app.title>Reactive Forwarding App</onos.app.title>
-        <onos.app.category>default</onos.app.category>
+        <onos.app.category>Traffic Steering</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
         <onos.app.readme>Reactive forwarding application using flow subsystem.</onos.app.readme>
     </properties>

@@ -34,7 +34,7 @@
     <properties>
         <onos.app.name>org.onosproject.igmp</onos.app.name>
         <onos.app.title>IGMP App</onos.app.title>
-        <onos.app.category>default</onos.app.category>
+        <onos.app.category>Traffic Steering</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
         <onos.app.readme>IGMP implementation.</onos.app.readme>
     </properties>

@@ -31,7 +31,7 @@
     <properties>
         <onos.app.name>org.onosproject.iptopology-api</onos.app.name>
         <onos.app.title>IP Layer Topology API</onos.app.title>
-        <onos.app.category>default</onos.app.category>
+        <onos.app.category>Test</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
         <onos.app.readme>IP layer topology API.</onos.app.readme>
     </properties>

@@ -34,7 +34,7 @@
     <properties>
         <onos.app.name>org.onosproject.metrics</onos.app.name>
         <onos.app.title>Performance Metrics App</onos.app.title>
-        <onos.app.category>default</onos.app.category>
+        <onos.app.category>Monitoring</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
         <onos.app.readme>Performance metrics collection application.</onos.app.readme>
     </properties>

@@ -34,7 +34,7 @@
     <properties>
         <onos.app.name>org.onosproject.mfwd</onos.app.name>
         <onos.app.title>Multicast Forwarding App</onos.app.title>
-        <onos.app.category>default</onos.app.category>
+        <onos.app.category>Traffic Steering</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
         <onos.app.readme>Multicast forwarding application.</onos.app.readme>
     </properties>

@@ -34,7 +34,7 @@
     <properties>
         <onos.app.name>org.onosproject.mlb</onos.app.name>
         <onos.app.title>Mastership Load Balancer App</onos.app.title>
-        <onos.app.category>default</onos.app.category>
+        <onos.app.category>Utility</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
         <onos.app.readme>
             Application that balances mastership among nodes.

@@ -34,7 +34,7 @@
     <properties>
         <onos.app.name>org.onosproject.mobility</onos.app.name>
         <onos.app.title>Host Mobility App</onos.app.title>
-        <onos.app.category>default</onos.app.category>
+        <onos.app.category>Utility</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
         <onos.app.readme>Host mobility application.</onos.app.readme>
     </properties>

@@ -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" title="ONOS OLT App"
+     category="Traffic Steering" url="http://onosproject.org" title="Optical Line Terminal App"
      featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
      features="${project.artifactId}">
     <description>${project.description}</description>

@@ -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" title="Openstack Interface App"
+     category="Utility" 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>

@@ -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" title="Openstack Networking App"
+     category="Utility" 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">

@@ -34,8 +34,8 @@
 
     <properties>
         <onos.app.name>org.onosproject.openstacknode</onos.app.name>
-        <onos.app.title>SONA Openstack Node Bootstrap App</onos.app.title>
-        <onos.app.category>default</onos.app.category>
+        <onos.app.title>OpenStack Node Bootstrap App</onos.app.title>
+        <onos.app.category>Utility</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
         <onos.app.readme>SONA Openstack Node Bootstrap Application</onos.app.readme>
         <onos.app.requires>

@@ -34,7 +34,7 @@
     <properties>
         <onos.app.name>org.onosproject.optical</onos.app.name>
         <onos.app.title>Packet/Optical Use-Case App</onos.app.title>
-        <onos.app.category>default</onos.app.category>
+        <onos.app.category>Traffic Steering</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
         <onos.app.readme>Packet/Optical use-case application.</onos.app.readme>
     </properties>

@@ -34,9 +34,8 @@
     <properties>
         <onos.app.name>org.onosproject.pathpainter</onos.app.name>
         <onos.app.title>Path Visualization App</onos.app.title>
-        <onos.app.category>default</onos.app.category>
+        <onos.app.category>Utility</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.readme>
             Allows the user to visualize different types of paths between
             network entities such as switches and hosts.

@@ -31,7 +31,7 @@
     <properties>
         <onos.app.name>org.onosproject.pcep-api</onos.app.name>
         <onos.app.title>PCEP Protocol API</onos.app.title>
-        <onos.app.category>default</onos.app.category>
+        <onos.app.category>Traffic Steering</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
         <onos.app.readme>PCEP protocol API.</onos.app.readme>
     </properties>

@@ -33,8 +33,8 @@
 
     <properties>
         <onos.app.name>org.onosproject.pim</onos.app.name>
-        <onos.app.title>Protocol Independent Multicast Emulation</onos.app.title>
-        <onos.app.category>default</onos.app.category>
+        <onos.app.title>Protocol Independent Multicast Emulation App</onos.app.title>
+        <onos.app.category>Traffic Steering</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
         <onos.app.readme>Protocol independent multicast emulation.</onos.app.readme>
     </properties>

@@ -34,7 +34,7 @@
     <properties>
         <onos.app.name>org.onosproject.proxyarp</onos.app.name>
         <onos.app.title>Proxy ARP/NDP App</onos.app.title>
-        <onos.app.category>default</onos.app.category>
+        <onos.app.category>Traffic Steering</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
         <onos.app.readme>Proxy ARP/NDP application.</onos.app.readme>
     </properties>

@@ -34,7 +34,7 @@
     <properties>
         <onos.app.name>org.onosproject.reactive.routing</onos.app.name>
         <onos.app.title>SDN-IP Reactive Routing App</onos.app.title>
-        <onos.app.category>default</onos.app.category>
+        <onos.app.category>Traffic Steering</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
         <onos.app.readme>SDN-IP reactive routing application.</onos.app.readme>
     </properties>

@@ -33,7 +33,7 @@
     <properties>
         <onos.app.name>org.onosproject.routing-api</onos.app.name>
         <onos.app.title>Routing API</onos.app.title>
-        <onos.app.category>default</onos.app.category>
+        <onos.app.category>Traffic Steering</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
         <onos.app.readme>API for routing applications.</onos.app.readme>
     </properties>

@@ -33,7 +33,7 @@
     <properties>
         <onos.app.name>org.onosproject.routing</onos.app.name>
         <onos.app.title>SDN-IP Routing App</onos.app.title>
-        <onos.app.category>default</onos.app.category>
+        <onos.app.category>Traffic Steering</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
         <onos.app.readme>SDN-IP routing application.</onos.app.readme>
     </properties>

@@ -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" title="SDN-IP App"
+     category="Traffic Steering" 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>

@@ -33,7 +33,7 @@
     <properties>
         <onos.app.name>org.onosproject.segmentrouting</onos.app.name>
         <onos.app.title>Segment Routing App</onos.app.title>
-        <onos.app.category>default</onos.app.category>
+        <onos.app.category>Traffic Steering</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
         <onos.app.readme>Segment routing application.</onos.app.readme>
         <web.context>/onos/segmentrouting</web.context>

@@ -33,8 +33,8 @@
 
     <properties>
         <onos.app.name>org.onosproject.demo</onos.app.name>
-        <onos.app.title>Flow Throughput Demo</onos.app.title>
-        <onos.app.category>test</onos.app.category>
+        <onos.app.title>Flow Throughput Demo App</onos.app.title>
+        <onos.app.category>Test</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
         <onos.app.readme>Flow throughput test application.</onos.app.readme>
         <web.context>/onos/demo</web.context>

@@ -35,7 +35,7 @@
     <properties>
         <onos.app.name>org.onosproject.distributedprimitives</onos.app.name>
         <onos.app.title>Distributed Primitives Test App</onos.app.title>
-        <onos.app.category>test</onos.app.category>
+        <onos.app.category>Test</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
         <onos.app.readme>ONOS app to test distributed primitives.</onos.app.readme>
     </properties>

@@ -35,7 +35,7 @@
     <properties>
         <onos.app.name>org.onosproject.election</onos.app.name>
         <onos.app.title>Master Election Test App</onos.app.title>
-        <onos.app.category>test</onos.app.category>
+        <onos.app.category>Test</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
         <onos.app.readme>Master election test application.</onos.app.readme>
     </properties>

@@ -34,7 +34,7 @@
     <properties>
         <onos.app.name>org.onosproject.intentperf</onos.app.name>
         <onos.app.title>Intent Performance Test App</onos.app.title>
-        <onos.app.category>test</onos.app.category>
+        <onos.app.category>Test</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
         <onos.app.readme>intent performance test application.</onos.app.readme>
     </properties>

@@ -35,7 +35,7 @@
     <properties>
         <onos.app.name>org.onosproject.loadtest</onos.app.name>
         <onos.app.title>Distributed Load Test App</onos.app.title>
-        <onos.app.category>test</onos.app.category>
+        <onos.app.category>Test</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
         <onos.app.readme>Distributed consensus load test application.</onos.app.readme>
     </properties>

@@ -34,7 +34,7 @@
     <properties>
         <onos.app.name>org.onosproject.messagingperf</onos.app.name>
         <onos.app.title>Messaging Performance Test App</onos.app.title>
-        <onos.app.category>test</onos.app.category>
+        <onos.app.category>Test</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
         <onos.app.readme>Messaging performance test application.</onos.app.readme>
     </properties>

@@ -34,7 +34,7 @@
     <properties>
         <onos.app.name>org.onosproject.virtualbng</onos.app.name>
         <onos.app.title>Virtual Broadband Gateway App</onos.app.title>
-        <onos.app.category>default</onos.app.category>
+        <onos.app.category>Utility</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
         <onos.app.readme>Virtual broadband gateway application.</onos.app.readme>
         <web.context>/onos/virtualbng</web.context>

@@ -33,7 +33,9 @@
 
     <properties>
         <onos.app.name>org.onosproject.vpls</onos.app.name>
+        <onos.app.category>Traffic Steering</onos.app.category>
         <onos.app.title>VLAN L2 Broadcast Network App</onos.app.title>
+        <onos.app.url>http://onosproject.org</onos.app.url>
     </properties>
 
     <dependencies>

@@ -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" title="Virtual Router App"
+     category="Traffic Steering" 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>

@@ -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" title="ONOS Framework App"
+     category="Utility" url="http://onosproject.org" title="OPNFV App"
      featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
      features="${project.artifactId}">
     <description>${project.description}</description>

@@ -34,7 +34,7 @@
     <properties>
         <onos.app.name>org.onosproject.xosintegration</onos.app.name>
         <onos.app.title>ONOS XOS Integration App</onos.app.title>
-        <onos.app.category>default</onos.app.category>
+        <onos.app.category>Utility</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
         <onos.app.readme>ONOS XOS integration application.</onos.app.readme>
     </properties>

@@ -67,6 +67,10 @@ public interface ApplicationDescription {
     /**
      * Returns category of the application.
      *
+     * The application developer can choose one of the category from the
+     * following examples to easily discern the high-level purpose of the application.
+     * (Security, Traffic Steering, Monitoring, Drivers, Provider, Utility)
+     *
      * @return application category text
      */
     String category();

@@ -60,6 +60,10 @@ public interface Application {
     /**
      * Returns category of the application.
      *
+     * The application developer can choose one of the category from the
+     * following examples to easily discern the high-level purpose of the application.
+     * (Security, Traffic Steering, Monitoring, Drivers, Provider, Utility)
+     *
      * @return application category text
      */
     String category();

@@ -32,6 +32,10 @@
 
     <properties>
         <onos.app.name>org.onosproject.drivers.ciena</onos.app.name>
+        <onos.app.origin>ON.Lab</onos.app.origin>
+        <onos.app.title>Ciena Device Drivers</onos.app.title>
+        <onos.app.category>Drivers</onos.app.category>
+        <onos.app.url>http://onosproject.org</onos.app.url>
     </properties>
 
     <dependencies>

@@ -32,6 +32,10 @@
 
     <properties>
         <onos.app.name>org.onosproject.drivers.cisco</onos.app.name>
+        <onos.app.origin>ON.Lab</onos.app.origin>
+        <onos.app.category>Drivers</onos.app.category>
+        <onos.app.title>Cisco Device Drivers</onos.app.title>
+        <onos.app.url>http://onosproject.org</onos.app.url>
     </properties>
 
     <dependencies>

@@ -32,6 +32,10 @@
 
     <properties>
         <onos.app.name>org.onosproject.drivers</onos.app.name>
+        <onos.app.origin>ON.Lab</onos.app.origin>
+        <onos.app.category>Drivers</onos.app.category>
+        <onos.app.title>Default Device Drivers</onos.app.title>
+        <onos.app.url>http://onosproject.org</onos.app.url>
     </properties>
     <dependencies>
         <dependency>

@@ -26,6 +26,18 @@
     <modelVersion>4.0.0</modelVersion>
 
     <description>Fujitsu device drivers</description>
+
+    <artifactId>onos-drivers-fujitsu</artifactId>
+    <packaging>bundle</packaging>
+
+    <properties>
+        <onos.app.name>org.onosproject.drivers.fujitsu</onos.app.name>
+        <onos.app.origin>ON.Lab</onos.app.origin>
+        <onos.app.category>Drivers</onos.app.category>
+        <onos.app.title>Fujitsu Device Drivers</onos.app.title>
+        <onos.app.url>http://onosproject.org</onos.app.url>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.onosproject</groupId>
@@ -39,11 +51,4 @@
         </dependency>
     </dependencies>
 
-    <artifactId>onos-drivers-fujitsu</artifactId>
-    <packaging>bundle</packaging>
-
-    <properties>
-        <onos.app.name>org.onosproject.drivers.fujitsu</onos.app.name>
-    </properties>
-
 </project>
\ No newline at end of file

@@ -31,6 +31,10 @@
 
     <properties>
         <onos.app.name>org.onosproject.drivers.lumentum</onos.app.name>
+        <onos.app.origin>ON.Lab</onos.app.origin>
+        <onos.app.category>Drivers</onos.app.category>
+        <onos.app.title>Lumentum Device Drivers</onos.app.title>
+        <onos.app.url>http://onosproject.org</onos.app.url>
     </properties>
 
     <dependencies>

@@ -28,10 +28,14 @@
     <artifactId>onos-drivers-netconf</artifactId>
     <packaging>bundle</packaging>
 
-    <description>Netconf device drivers</description>
+    <description>NETCONF device drivers</description>
 
     <properties>
         <onos.app.name>org.onosproject.drivers.netconf</onos.app.name>
+        <onos.app.origin>ON.Lab</onos.app.origin>
+        <onos.app.category>Drivers</onos.app.category>
+        <onos.app.title>NETCONF Device Drivers</onos.app.title>
+        <onos.app.url>http://onosproject.org</onos.app.url>
     </properties>
 
     <dependencies>

@@ -28,10 +28,14 @@
     <artifactId>onos-drivers-ovsdb</artifactId>
     <packaging>bundle</packaging>
 
-    <description>ovsdb device drivers</description>
+    <description>OVSDB device drivers</description>
 
     <properties>
         <onos.app.name>org.onosproject.drivers.ovsdb</onos.app.name>
+        <onos.app.origin>ON.Lab</onos.app.origin>
+        <onos.app.category>Drivers</onos.app.category>
+        <onos.app.title>OVSDB Device Drivers</onos.app.title>
+        <onos.app.url>http://onosproject.org</onos.app.url>
     </properties>
 
     <dependencies>

@@ -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" title="BGP Provider"
+     category="Provider" url="http://onosproject.org" title="BGP Provider"
      featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
      features="${project.artifactId}">
     <description>${project.description}</description>

@@ -33,7 +33,7 @@
         <onos.app.name>org.onosproject.hostprovider</onos.app.name>
         <onos.app.title>Host Location Provider</onos.app.title>
         <onos.app.origin>ON.Lab</onos.app.origin>
-        <onos.app.category>default</onos.app.category>
+        <onos.app.category>Provider</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
         <onos.app.readme>ONOS host location provider.</onos.app.readme>
     </properties>

@@ -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" title="LLDP Provider"
+     category="Provider" url="http://onosproject.org" title="LLDP Link Provider"
      featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
      features="${project.artifactId}">
     <description>${project.description}</description>

@@ -34,7 +34,7 @@
         <onos.app.name>org.onosproject.lldpprovider</onos.app.name>
         <onos.app.title>LLDP Link Provider</onos.app.title>
         <onos.app.origin>ON.Lab</onos.app.origin>
-        <onos.app.category>default</onos.app.category>
+        <onos.app.category>Provider</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
         <onos.app.readme>ONOS LLDP link provider.</onos.app.readme>
     </properties>

@@ -34,9 +34,9 @@
 
     <properties>
         <onos.app.name>org.onosproject.netcfghostprovider</onos.app.name>
-        <onos.app.title>Network Config host Provider</onos.app.title>
+        <onos.app.title>Network Config Host Provider</onos.app.title>
         <onos.app.origin>ON.Lab</onos.app.origin>
-        <onos.app.category>default</onos.app.category>
+        <onos.app.category>Provider</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
         <onos.app.readme>Host provider that uses network config service to discover hosts.</onos.app.readme>
     </properties>

@@ -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" title="Network Config Link Provider"
+     category="Provider" 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>

@@ -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" title="NetConf Provider"
+     category="Provider" url="https://wiki.onosproject.org/display/ONOS/NETCONF" title="NETCONF Provider"
      featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
      features="${project.artifactId}">
     <description>${project.description}</description>

@@ -35,7 +35,7 @@
         <onos.app.name>org.onosproject.null</onos.app.name>
         <onos.app.title>Null Southbound Provider</onos.app.title>
         <onos.app.origin>ON.Lab</onos.app.origin>
-        <onos.app.category>default</onos.app.category>
+        <onos.app.category>Provider</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
         <onos.app.readme>ONOS null southbound provider.</onos.app.readme>
     </properties>

@@ -32,6 +32,7 @@
     <properties>
         <onos.app.name>org.onosproject.openflow</onos.app.name>
         <onos.app.title>OpenFlow Southbound Meta App</onos.app.title>
+        <onos.app.category>Provider</onos.app.category>
         <onos.app.requires>
             org.onosproject.openflow-base,
             org.onosproject.hostprovider,

@@ -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" title="OpenFlow Provider"
+     category="Provider" url="http://onosproject.org" title="OpenFlow Provider"
      featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
      features="${project.artifactId}">
     <description>${project.description}</description>

@@ -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" title="Control Message Stat. Provider"
+     category="Provider" url="http://onosproject.org" title="Control Message Stats Provider"
      featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
      features="${project.artifactId}">
     <description>${project.description}</description>

@@ -32,6 +32,7 @@
     <properties>
         <onos.app.name>org.onosproject.ovsdb</onos.app.name>
         <onos.app.title>OVSDB Southbound Meta App</onos.app.title>
+        <onos.app.category>Provider</onos.app.category>
         <onos.app.requires>
             org.onosproject.ovsdb-base,
             org.onosproject.ovsdbhostprovider

@@ -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" title="OVSDB Provider"
+     category="Provider" url="http://onosproject.org" title="OVSDB Provider"
      featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
      features="${project.artifactId}">
     <description>${project.description}</description>

@@ -15,13 +15,13 @@
   ~ limitations under the License.
   -->
 <app name="org.onosproject.pcep" origin="ON.Lab" version="${project.version}"
-     category="default" url="http://onosproject.org" title="PCEP Provider"
+     category="Provider" url="http://onosproject.org" title="PCEP Provider"
      featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
      features="${project.artifactId}">
     <description>${project.description}</description>
     <artifact>mvn:${project.groupId}/onos-app-pcep-api/${project.version}</artifact>
-    <artifact>mvn:${project.groupId}/onos-pcepio/${project.version}</artifact>     
-    <artifact>mvn:${project.groupId}/onos-pcep-controller-api/${project.version}</artifact>     
+    <artifact>mvn:${project.groupId}/onos-pcepio/${project.version}</artifact>
+    <artifact>mvn:${project.groupId}/onos-pcep-controller-api/${project.version}</artifact>
     <artifact>mvn:${project.groupId}/onos-pcep-controller-impl/${project.version}</artifact>
     <artifact>mvn:${project.groupId}/onos-pcep-provider-topology/${project.version}</artifact>
     <artifact>mvn:${project.groupId}/onos-pcep-provider-tunnel/${project.version}</artifact>

@@ -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" title="REST Provider"
+     category="Provider" url="https://wiki.onosproject.org/display/ONOS/REST" title="REST/SB Provider"
      featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
      features="${project.artifactId}">
     <description>${project.description}</description>

@@ -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" title="SNMP Provider"
+     category="Provider" url="http://onosproject.org" title="SNMP Provider"
      featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
      features="${project.artifactId}">
     <description>${project.description}</description>