[ONOS-3080] ONOSFW consists of three parts vtn/vtnweb/vtnrsc. Before we

need deploy three applications, but now vtn/vtnweb/vtnrsc as three
bundles are packaged as a single application. instead to install three
application. of cource if the other apps want to depend on any one of
three bundles, it can do.

Change-Id: I3535b36ac082dbb90cb714ba83d2336c950a22a1

@@ -53,9 +53,7 @@
         <module>olt</module>
         <module>olt</module>
         <module>cip</module>
         <module>cip</module>
         <module>flowanalyzer</module>
         <module>flowanalyzer</module>
-        <module>vtnrsc</module>
         <module>vtn</module>
         <module>vtn</module>
-        <module>vtnweb</module>
         <module>dhcp</module>
         <module>dhcp</module>
         <module>cordvtn</module>
         <module>cordvtn</module>
         <module>mfwd</module>
         <module>mfwd</module>

+<?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.vtn" origin="ON.Lab" version="${project.version}"
+     featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
+     features="${project.artifactId}">
+    <description>${project.description}</description>
+
+    <artifact>mvn:${project.groupId}/onos-app-vtn-mgr/${project.version}</artifact>
+    <artifact>mvn:${project.groupId}/onos-app-vtn-web/${project.version}</artifact>
+    <artifact>mvn:${project.groupId}/onos-app-vtn-rsc/${project.version}</artifact>
+</app>

@@ -20,8 +20,8 @@
              description="${project.description}">
              description="${project.description}">
         <feature>onos-api</feature>
         <feature>onos-api</feature>
         <feature>onos-drivers</feature>
         <feature>onos-drivers</feature>
-        <feature>onos-app-vtnrsc</feature>
-        <feature>onos-app-vtnweb</feature>
-        <bundle>mvn:${project.groupId}/${project.artifactId}/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-app-vtn-mgr/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-app-vtn-web/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-app-vtn-rsc/${project.version}</bundle>
     </feature>
     </feature>
 </features>
 </features>

+<?xml version="1.0" encoding="UTF-8"?>
+<!-- ~ Copyright 2014 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. -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.onosproject</groupId>
+		<artifactId>onos-app-vtn</artifactId>
+		<version>1.4.0-SNAPSHOT</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+
+	<artifactId>onos-app-vtn-onosfw</artifactId>
+	<packaging>pom</packaging>
+
+	<description>ONOS framework applications</description>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.onosproject</groupId>
+			<artifactId>onos-app-vtn-rsc</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.onosproject</groupId>
+			<artifactId>onos-app-vtn-web</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.onosproject</groupId>
+			<artifactId>onos-app-vtn-mgr</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+	</dependencies>
+
+</project>

-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 <!--
-  ~ Copyright 2015 Open Networking Laboratory
+  ~ Copyright 2014 Open Networking Laboratory
   ~
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
   ~ you may not use this file except in compliance with the License.
@@ -14,11 +14,11 @@
   ~ See the License for the specific language governing permissions and
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   ~ limitations under the License.
   -->
   -->
-<project
-        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-        xmlns="http://maven.apache.org/POM/4.0.0"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <modelVersion>4.0.0</modelVersion>
+
     <parent>
     <parent>
         <groupId>org.onosproject</groupId>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
         <artifactId>onos-apps</artifactId>
@@ -27,32 +27,14 @@
     </parent>
     </parent>
 
 
     <artifactId>onos-app-vtn</artifactId>
     <artifactId>onos-app-vtn</artifactId>
-    <packaging>bundle</packaging>
+    <packaging>pom</packaging>
 
 
+    <description>ONOS framework applications</description>
 
 
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <onos.app.name>org.onosproject.vtn</onos.app.name>
-    </properties>
-    <dependencies>
-        <dependency>
-            <groupId>javax.ws.rs</groupId>
-            <artifactId>jsr311-api</artifactId>
-            <version>1.1.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onosproject</groupId>
-            <artifactId>onos-incubator-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.onosproject</groupId>
-            <artifactId>onos-core-serializers</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-vtnrsc</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
+    <modules>
+        <module>vtnrsc</module>
+        <module>vtnmgr</module>
+        <module>vtnweb</module>
+        <module>app</module>
+  	</modules>
 </project>
 </project>

+<?xml version="1.0"?>
+<!--
+  ~ 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.
+  -->
+<project
+        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+        xmlns="http://maven.apache.org/POM/4.0.0"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.onosproject</groupId>
+        <artifactId>onos-app-vtn</artifactId>
+        <version>1.4.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>onos-app-vtn-mgr</artifactId>
+    <packaging>bundle</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>javax.ws.rs</groupId>
+            <artifactId>jsr311-api</artifactId>
+            <version>1.1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onosproject</groupId>
+            <artifactId>onos-incubator-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.onosproject</groupId>
+            <artifactId>onos-core-serializers</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onosproject</groupId>
+            <artifactId>onos-app-vtn-rsc</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+</project>

@@ -20,25 +20,17 @@
 	<modelVersion>4.0.0</modelVersion>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 	<parent>
 		<groupId>org.onosproject</groupId>
 		<groupId>org.onosproject</groupId>
-		<artifactId>onos-apps</artifactId>
+		<artifactId>onos-app-vtn</artifactId>
 		<version>1.4.0-SNAPSHOT</version>
 		<version>1.4.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	</parent>
 
 
 
 
-	<artifactId>onos-app-vtnrsc</artifactId>
+	<artifactId>onos-app-vtn-rsc</artifactId>
 	<packaging>bundle</packaging>
 	<packaging>bundle</packaging>
 
 
-    <properties>
-		<onos.app.name>org.onosproject.vtnrsc</onos.app.name>
-	</properties>
 	<dependencies>
 	<dependencies>
 		<dependency>
 		<dependency>
-			<groupId>javax.ws.rs</groupId>
-			<artifactId>jsr311-api</artifactId>
-			<version>1.1.1</version>
-		</dependency>
-		<dependency>
 			<groupId>org.onosproject</groupId>
 			<groupId>org.onosproject</groupId>
 			<artifactId>onos-api</artifactId>
 			<artifactId>onos-api</artifactId>
 		</dependency>
 		</dependency>
@@ -57,15 +49,8 @@
 		</dependency>
 		</dependency>
 		<dependency>
 		<dependency>
 			<groupId>org.onosproject</groupId>
 			<groupId>org.onosproject</groupId>
-			<artifactId>onlab-junit</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.onosproject</groupId>
 			<artifactId>onos-core-serializers</artifactId>
 			<artifactId>onos-core-serializers</artifactId>
 			<version>${project.version}</version>
 			<version>${project.version}</version>
 		</dependency>
 		</dependency>
 	</dependencies>
 	</dependencies>
-
-
 </project>
 </project>

@@ -21,16 +21,15 @@
     <modelVersion>4.0.0</modelVersion>
     <modelVersion>4.0.0</modelVersion>
     <parent>
     <parent>
         <groupId>org.onosproject</groupId>
         <groupId>org.onosproject</groupId>
-        <artifactId>onos-apps</artifactId>
+        <artifactId>onos-app-vtn</artifactId>
         <version>1.4.0-SNAPSHOT</version>
         <version>1.4.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
         <relativePath>../pom.xml</relativePath>
     </parent>
     </parent>
 
 
 
 
-    <artifactId>onos-app-vtnweb</artifactId>
+    <artifactId>onos-app-vtn-web</artifactId>
     <packaging>bundle</packaging>
     <packaging>bundle</packaging>
     <properties>
     <properties>
-        <onos.app.name>org.onosproject.vtnweb</onos.app.name>
         <web.context>/onos/vtn</web.context>
         <web.context>/onos/vtn</web.context>
     </properties>
     </properties>
 
 
@@ -42,7 +41,7 @@
         </dependency>
         </dependency>
         <dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-vtnrsc</artifactId>
+            <artifactId>onos-app-vtn-rsc</artifactId>
             <version>${project.version}</version>
             <version>${project.version}</version>
         </dependency>
         </dependency>
     </dependencies>
     </dependencies>

-<?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.
-  -->
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee"
-         xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
-         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
-         id="ONOS" version="2.5">
-    <display-name>Vtnrsc Routing REST API v1.0</display-name>
-
-    <servlet>
-        <servlet-name>JAX-RS Service</servlet-name>
-        <servlet-class>com.sun.jersey.spi.container.servlet.ServletContainer</servlet-class>
-        <init-param>
-            <param-name>com.sun.jersey.config.property.resourceConfigClass</param-name>
-            <param-value>com.sun.jersey.api.core.ClassNamesResourceConfig</param-value>
-        </init-param>
-        <init-param>
-            <param-name>com.sun.jersey.config.property.classnames</param-name>
-            <param-value>
-                org.onosproject.app.vtnrsc.web.SubnetWebResource,
-                org.onosproject.app.vtnrsc.web.NeutronNetworkWebResource,
-                org.onosproject.app.vtnrsc.web.VirtualPortWebResource
-            </param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-
-    <servlet-mapping>
-        <servlet-name>JAX-RS Service</servlet-name>
-        <url-pattern>/*</url-pattern>
-    </servlet-mapping>
-</web-app>