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>
diff --git a/database-perf/app.xml b/database-perf/app.xml
deleted file mode 100644
index 58cdbb4..0000000
--- a/database-perf/app.xml
+++ /dev/null
@@ -1,23 +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.dbperf" 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/database-perf/pom.xml b/database-perf/pom.xml
index 3a39614..b40f6d5 100644
--- a/database-perf/pom.xml
+++ b/database-perf/pom.xml
@@ -31,24 +31,8 @@
<description>Partitioned database performance test application</description>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.5.3</version>
- <configuration>
- <descriptor>src/assembly/bin.xml</descriptor>
- </configuration>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <properties>
+ <onos.app.name>org.onosproject.dbperf</onos.app.name>
+ </properties>
+
</project>
diff --git a/database-perf/src/assembly/app.xml b/database-perf/src/assembly/app.xml
deleted file mode 100644
index 9133a55..0000000
--- a/database-perf/src/assembly/app.xml
+++ /dev/null
@@ -1,20 +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.databaseperf" origin="ON.Lab" version="1.1.0"
- features="onos-app-database-perf">
- <description>Partitioned database performance measurement application</description>
-</app>
diff --git a/database-perf/src/assembly/bin.xml b/database-perf/src/assembly/bin.xml
deleted file mode 100644
index 0bb0671..0000000
--- a/database-perf/src/assembly/bin.xml
+++ /dev/null
@@ -1,36 +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.
- -->
-<assembly
- xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
- <formats>
- <format>zip</format>
- </formats>
- <id>onos</id>
- <includeBaseDirectory>false</includeBaseDirectory>
- <files>
- <file>
- <source>src/assembly/app.xml</source>
- <destName>app.xml</destName>
- </file>
- <file>
- <source>target/${project.artifactId}-${project.version}.jar</source>
- <destName>m2/org/onosproject/${project.artifactId}/${project.version}/${project.artifactId}-${project.version}.jar</destName>
- </file>
- </files>
-</assembly>
diff --git a/ifwd/app.xml b/ifwd/app.xml
deleted file mode 100644
index 5c70cf7..0000000
--- a/ifwd/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.ifwd" 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/ifwd/pom.xml b/ifwd/pom.xml
index 7177000..9a35e38 100644
--- a/ifwd/pom.xml
+++ b/ifwd/pom.xml
@@ -31,4 +31,8 @@
<description>Reactive forwarding application using intent service (experimental)</description>
+ <properties>
+ <onos.app.name>org.onosproject.ifwd</onos.app.name>
+ </properties>
+
</project>
diff --git a/oneping/app.xml b/oneping/app.xml
deleted file mode 100644
index 942321d..0000000
--- a/oneping/app.xml
+++ /dev/null
@@ -1,23 +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.oneping" 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/oneping/pom.xml b/oneping/pom.xml
index 3b0e5c9..902f7b2 100644
--- a/oneping/pom.xml
+++ b/oneping/pom.xml
@@ -31,4 +31,8 @@
<description>One-Ping-Only sample application</description>
+ <properties>
+ <onos.app.name>org.onosproject.oneping</onos.app.name>
+ </properties>
+
</project>
diff --git a/tvue/app.xml b/tvue/app.xml
deleted file mode 100644
index f418bb3..0000000
--- a/tvue/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.tvue" 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/tvue/features.xml b/tvue/features.xml
index e68a066..6023642 100644
--- a/tvue/features.xml
+++ b/tvue/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/tvue/pom.xml b/tvue/pom.xml
index fa3bc90..b51f4c5 100644
--- a/tvue/pom.xml
+++ b/tvue/pom.xml
@@ -32,6 +32,7 @@
<description>Early prototype GUI - deprecated</description>
<properties>
+ <onos.app.name>org.onosproject.tvue</onos.app.name>
<web.context>/onos/tvue</web.context>
</properties>