Fix common POM 54/5954/2
authorAndrew Kim <h.andrew.kim@gmail.com>
Tue, 8 Apr 2014 02:43:19 +0000 (21:43 -0500)
committerAndrew Kim <h.andrew.kim@gmail.com>
Tue, 8 Apr 2014 02:49:03 +0000 (21:49 -0500)
Change-Id: I6fc46404e3fb466c6d69659ed43f63efe8252b94
Signed-off-by: Andrew Kim <h.andrew.kim@gmail.com>
README.md
common/opendaylight/full/pom.xml [deleted file]
common/pom.xml

index 163c460fa63fd897825096df1fb1bb537846aa66..aaac234de1a33f0a099c0043119086e58b39ac96 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,9 +1,5 @@
 # OpenDaylight Toolkit
 
-[![Build Status](https://travis-ci.org/opendaylight-toolkit/opendaylight-toolkit.svg?branch=master)](https://travis-ci.org/opendaylight-toolkit/opendaylight-toolkit)
-
-![alt text](http://media.playdota.com/items/121/icon.jpg "Mekansm")
-
 Quick HowTo
 -----------
 
@@ -19,6 +15,8 @@ Quick HowTo
 
 >**package:** <code>&lt;press enter, default&gt;</code>
 
+>**REST-Resource-Name** *simple* <code>&lt;or any resource name&gt;</code>
+
 3) *[optional]* Install the necessary web bower components, under directories <code>web/src/main/resources/js</code> and <code>web/src/main/resources/css</code> issue <code>bower install</code>
 
 >Note: you may need to install bower on your system using <code>npm -g install bower</code>
diff --git a/common/opendaylight/full/pom.xml b/common/opendaylight/full/pom.xml
deleted file mode 100644 (file)
index 482b3dc..0000000
+++ /dev/null
@@ -1,316 +0,0 @@
-<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/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.opendaylight.toolkit</groupId>
-  <artifactId>common.opendaylight.full</artifactId>
-  <version>0.0.1-SNAPSHOT</version>
-  <packaging>pom</packaging>
-
-  <prerequisites>
-    <maven>3.0</maven>
-  </prerequisites>
-
-  <repositories>
-    <!-- OpenDayLight Repo Mirror -->
-    <repository>
-      <id>opendaylight-mirror</id>
-      <name>opendaylight-mirror</name>
-      <url>${nexusproxy}/groups/public/</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-        <enabled>true</enabled>
-        <updatePolicy>never</updatePolicy>
-      </releases>
-    </repository>
-    <!-- OpenDayLight Snapshot artifact -->
-    <repository>
-      <id>opendaylight-snapshot</id>
-      <name>opendaylight-snapshot</name>
-      <url>${nexusproxy}/repositories/opendaylight.snapshot/</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-    </repository>
-  </repositories>
-
-  <dependencyManagement>
-    <dependencies>
-      <!-- OpenDaylight Toolkit -->
-      <dependency>
-        <groupId>org.opendaylight.toolkit</groupId>
-        <artifactId>web</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-      </dependency>
-
-      <!-- ODL Mirror -->
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>arphandler</artifactId>
-        <version>0.5.2-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>clustering.services</artifactId>
-        <version>0.5.1-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>clustering.services-implementation</artifactId>
-        <version>0.4.2-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>clustering.test</artifactId>
-        <version>0.4.2-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>configuration</artifactId>
-        <version>0.4.3-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>configuration.implementation</artifactId>
-        <version>0.4.3-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>containermanager</artifactId>
-        <version>0.5.2-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>appauth</artifactId>
-        <version>0.4.2-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>containermanager.implementation</artifactId>
-        <version>0.5.2-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>forwarding.staticrouting</artifactId>
-        <version>0.5.2-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>routing.dijkstra_implementation</artifactId>
-        <version>0.4.2-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>forwardingrulesmanager</artifactId>
-        <version>0.5.1-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>forwardingrulesmanager.implementation</artifactId>
-        <version>0.4.2-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>hosttracker</artifactId>
-        <version>0.5.2-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>hosttracker.implementation</artifactId>
-        <version>0.5.2-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>switchmanager</artifactId>
-        <version>0.7.1-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>switchmanager.implementation</artifactId>
-        <version>0.4.2-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>statisticsmanager</artifactId>
-        <version>0.5.1-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>statisticsmanager.implementation</artifactId>
-        <version>0.4.2-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>topologymanager</artifactId>
-        <version>0.4.2-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>usermanager</artifactId>
-        <version>0.4.2-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>usermanager.implementation</artifactId>
-        <version>0.4.2-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>protocol_plugins.openflow</artifactId>
-        <version>0.4.2-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>sal</artifactId>
-        <version>0.8.1-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>sal.implementation</artifactId>
-        <version>0.4.2-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>logging.bridge</artifactId>
-        <version>0.4.2-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>security</artifactId>
-        <version>0.4.2-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>sal.connection</artifactId>
-        <version>0.1.2-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>connectionmanager</artifactId>
-        <version>0.1.2-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>connectionmanager.implementation</artifactId>
-        <version>0.1.2-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>sal.connection.implementation</artifactId>
-        <version>0.1.2-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>sal.networkconfiguration</artifactId>
-        <version>${sal.networkconfiguration.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>sal.networkconfiguration.implementation</artifactId>
-        <version>${sal.networkconfiguration.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller.thirdparty</groupId>
-        <artifactId>org.openflow.openflowj</artifactId>
-        <version>1.0.3-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.ovsdb</groupId>
-        <artifactId>ovsdb</artifactId>
-        <version>0.5.1-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller.thirdparty</groupId>
-        <artifactId>net.sf.jung2</artifactId>
-        <version>2.0.2-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller.thirdparty</groupId>
-        <artifactId>com.sun.jersey.jersey-servlet</artifactId>
-        <version>1.18-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller.thirdparty</groupId>
-        <artifactId>org.apache.catalina.filters.CorsFilter</artifactId>
-        <version>7.0.43-SNAPSHOT</version>
-      </dependency>
-
-      <!-- ODL Northbound -->
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>commons.northbound</artifactId>
-        <version>0.4.2-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>connectionmanager.northbound</artifactId>
-        <version>0.1.2-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>containermanager.northbound</artifactId>
-        <version>0.4.2-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>controllermanager.northbound</artifactId>
-        <version>0.0.2-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>flowprogrammer.northbound</artifactId>
-        <version>0.4.2-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>forwarding.staticrouting.northbound</artifactId>
-        <version>0.4.2-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>hosttracker.northbound</artifactId>
-        <version>0.4.2-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>statistics.northbound</artifactId>
-        <version>0.4.2-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>subnets.northbound</artifactId>
-        <version>0.4.2-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>switchmanager.northbound</artifactId>
-        <version>0.4.2-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>topology.northbound</artifactId>
-        <version>0.4.2-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>usermanager.northbound</artifactId>
-        <version>0.0.2-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>bundlescanner.implementation</artifactId>
-        <version>0.4.2-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>bundlescanner</artifactId>
-        <version>0.4.2-SNAPSHOT</version>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-</project>
index e303f0ee1c498d392f182efd8ae9c51e45d4f0f0..d55d184440bc8ae1c5051e5fcdcd95ee83ac2627 100644 (file)
@@ -2,13 +2,7 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <parent>
-    <groupId>org.opendaylight.toolkit</groupId>
-    <artifactId>common.opendaylight.full</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-    <relativePath>opendaylight/full/</relativePath>
-  </parent>
-
+  <groupId>org.opendaylight.toolkit</groupId>
   <artifactId>common</artifactId>
   <version>0.0.1-SNAPSHOT</version>
   <packaging>pom</packaging>
@@ -43,8 +37,6 @@
     <netty.version>4.0.10.Final</netty.version>
     <guava.version>14.0.1</guava.version>
     <sal.networkconfiguration.version>0.0.3-SNAPSHOT</sal.networkconfiguration.version>
-
-
     <!-- web dependencies -->
     <jackson.version>2.3.0</jackson.version>
     <geminiweb.version>2.2.0.RELEASE</geminiweb.version>
@@ -88,7 +80,6 @@
       </dependency>
       
       <!-- ODL Mirror -->
-      <!--
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>arphandler</artifactId>
         <artifactId>org.apache.catalina.filters.CorsFilter</artifactId>
         <version>7.0.43-SNAPSHOT</version>
       </dependency>
-      -->
 
       <!-- ODL Northbound -->
-      <!--
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>commons.northbound</artifactId>
         <artifactId>bundlescanner</artifactId>
         <version>0.4.2-SNAPSHOT</version>
       </dependency>
-      -->
 
       <!-- enunciate -->
       <dependency>