commit 62ad95f3f1b7dfab11ba291dc25eb8c95d80dcc8
author Thomas Vachuska <tom@onlab.us> Wed Feb 18 12:11:36 2015 -0800
committer Gerrit Code Review <gerrit@onlab.us> Wed Feb 18 21:33:52 2015 +0000
tree 353d97ae219a35b2e59f7ffda15bcaedbb7d9feb
parent 36a8a6e8ef5934b3ef3e88d1e11db2756cd8ddc5

Added ability to upload apps as both app.xml or app.zip.
Added a number of app.xml files for built-in apps.
Added ability to install & activate in one command.

Change-Id: I3fa5fa487ef76d9fe3da4d6dce8045d538cba423

features/features.xml

diff --git a/features/features.xml b/features/features.xml
index 9440f52..aed7d7c 100644
--- a/features/features.xml
+++ b/features/features.xml
@@ -16,7 +16,8 @@
   -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
           name="onos-@FEATURE-VERSION">
-    <repository>mvn:org.onosproject/onos-features/@ONOS-VERSION/xml/features</repository>
+    <repository>mvn:org.onosproject/onos-features/@ONOS-VERSION/xml/features
+    </repository>
 
     <feature name="onos-thirdparty-base" version="@FEATURE-VERSION"
              description="ONOS 3rd party dependencies">
@@ -126,7 +127,7 @@
     </feature>
 
     <feature name="onos-null" version="@FEATURE-VERSION"
-            description="ONOS Null providers">
+             description="ONOS Null providers">
         <feature>onos-api</feature>
 
         <bundle>mvn:org.onosproject/onos-null-provider-device/@ONOS-VERSION</bundle>
@@ -197,12 +198,12 @@
         <feature>onos-api</feature>
         <bundle>mvn:org.onosproject/onos-app-config/@ONOS-VERSION</bundle>
     </feature>
-   
-     <feature name="onos-app-optical" version="@FEATURE-VERSION"
+
+    <feature name="onos-app-optical" version="@FEATURE-VERSION"
              description="ONOS optical network config">
         <feature>onos-api</feature>
         <bundle>mvn:org.onosproject/onos-app-optical/@ONOS-VERSION</bundle>
-     </feature>
+    </feature>
 
     <feature name="onos-app-sdnip" version="@FEATURE-VERSION"
              description="SDN-IP peering application">
@@ -210,8 +211,8 @@
         <feature>onos-app-proxyarp</feature>
         <feature>onos-app-config</feature>
         <bundle>mvn:org.onosproject/onos-app-sdnip/@ONOS-VERSION</bundle>
-	<bundle>mvn:org.onosproject/onos-app-routing-api/@ONOS-VERSION</bundle>
-	<bundle>mvn:org.onosproject/onos-app-routing/@ONOS-VERSION</bundle>
+        <bundle>mvn:org.onosproject/onos-app-routing-api/@ONOS-VERSION</bundle>
+        <bundle>mvn:org.onosproject/onos-app-routing/@ONOS-VERSION</bundle>
     </feature>
 
     <feature name="onos-app-calendar" version="@FEATURE-VERSION"