Removing need for boilerplate app.xml; Instead defining onos.app.name and onos.app.origin (optional) is sufficient to trigger generation of boilerplate app.xml and features.xml files.
Change-Id: If50cc3a18134602d47fcf6f240ee6b0a20c6c329
diff --git a/calendar/app.xml b/calendar/app.xml
deleted file mode 100644
index 23580cb..0000000
--- a/calendar/app.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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.calendar" origin="ON.Lab" version="${feature.version}"
- featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
- features="${project.artifactId}">
- <description>${project.description}</description>
- <artifact>mvn:${project.groupId}/${project.artifactId}/${project.version}</artifact>
-</app>
diff --git a/calendar/features.xml b/calendar/features.xml
index 3790de0..c8d8a9a 100644
--- a/calendar/features.xml
+++ b/calendar/features.xml
@@ -14,9 +14,9 @@
~ 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}-${feature.version}">
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="${project.artifactId}-${short.version}">
<repository>mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features</repository>
- <feature name="${project.artifactId}" version="${feature.version}"
+ <feature name="${project.artifactId}" version="${project.version}"
description="${project.description}">
<feature>onos-api</feature>
<feature>onos-thirdparty-web</feature>
diff --git a/calendar/pom.xml b/calendar/pom.xml
index b4579fc..6cc6041 100644
--- a/calendar/pom.xml
+++ b/calendar/pom.xml
@@ -32,6 +32,7 @@
<description>ONOS simple calendaring REST interface for intents</description>
<properties>
+ <onos.app.name>org.onosproject.calendar</onos.app.name>
<web.context>/onos/calendar</web.context>
</properties>