Integrate OpenFlowJava into OpenFlowPlugin build 29/59529/16
authorTomas Slusny <tomas.slusny@pantheon.tech>
Mon, 26 Jun 2017 14:34:09 +0000 (16:34 +0200)
committerTomas Slusny <tomas.slusny@pantheon.tech>
Mon, 10 Jul 2017 07:58:39 +0000 (09:58 +0200)
- Integrate OpenFlowJava artifacts building into OpenFlowPlugin maven
build
- Merge openflowjava-artifacts with openflowplugin-artifacts
- Remove odl-openflowjava-all feature, because it was unused and
contained only odl-openflowjava-protocol
- Change org.opendaylight.openflowjava groupId to
org.opendaylight.openflowplugin.openflowjava
- Move sample-client to OpenFlowPlugin samples and fix missing license
headers in sample-client

Resolves: bug 8747

Change-Id: I5cff2e93bcbe00aa7543a03c990aa4d61b0878b8
Signed-off-by: Tomas Slusny <tomas.slusny@pantheon.tech>
65 files changed:
artifacts/pom.xml
extension/features-extension-aggregator/odl-openflowplugin-onf-extensions/pom.xml
extension/openflowjava-extension-nicira-api/pom.xml
extension/openflowjava-extension-nicira/pom.xml
extension/openflowplugin-extension-api/pom.xml
extension/openflowplugin-extension-nicira/pom.xml
extension/openflowplugin-extension-onf/pom.xml
extension/test-extension/pom.xml
features-aggregator/odl-openflowplugin-nsf-model/pom.xml
model/model-flow-base/pom.xml
openflowjava/artifacts/pom.xml [deleted file]
openflowjava/features-openflowjava-aggregator/features-openflowjava/pom.xml [moved from openflowjava/features/features-openflowjava/pom.xml with 76% similarity]
openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/pom.xml [moved from openflowjava/features/odl-openflowjava-protocol/pom.xml with 88% similarity]
openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/src/main/feature/feature.xml [moved from openflowjava/features/odl-openflowjava-protocol/src/main/feature/feature.xml with 61% similarity]
openflowjava/features-openflowjava-aggregator/pom.xml [moved from openflowjava/features/pom.xml with 82% similarity]
openflowjava/features/odl-openflowjava-all/pom.xml [deleted file]
openflowjava/openflow-protocol-api/pom.xml
openflowjava/openflow-protocol-impl/pom.xml
openflowjava/openflow-protocol-it/pom.xml
openflowjava/openflow-protocol-spi/pom.xml
openflowjava/openflowjava-blueprint-config/pom.xml
openflowjava/openflowjava-config/pom.xml
openflowjava/openflowjava-util/pom.xml
openflowjava/parent/pom.xml [deleted file]
openflowjava/pom.xml
openflowplugin-api/pom.xml
openflowplugin-impl/pom.xml
openflowplugin-it/pom.xml
openflowplugin/pom.xml
parent/pom.xml
pom.xml
samples/learning-switch/pom.xml
samples/pom.xml [new file with mode: 0644]
samples/sample-consumer/pom.xml
samples/simple-client/pom.xml [moved from openflowjava/simple-client/pom.xml with 71% similarity]
samples/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/CallableClient.java [moved from openflowjava/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/CallableClient.java with 100% similarity]
samples/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/ClientEvent.java [moved from openflowjava/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/ClientEvent.java with 100% similarity]
samples/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/ClientSslContextFactory.java [moved from openflowjava/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/ClientSslContextFactory.java with 100% similarity]
samples/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/ClientSslKeyStore.java [moved from openflowjava/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/ClientSslKeyStore.java with 100% similarity]
samples/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/ClientSslTrustStore.java [moved from openflowjava/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/ClientSslTrustStore.java with 100% similarity]
samples/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/EventType.java [moved from openflowjava/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/EventType.java with 74% similarity]
samples/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/ListeningSimpleClient.java [moved from openflowjava/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/ListeningSimpleClient.java with 100% similarity]
samples/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/OFClient.java [moved from openflowjava/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/OFClient.java with 100% similarity]
samples/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/Scenario.java [moved from openflowjava/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/Scenario.java with 85% similarity]
samples/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/ScenarioFactory.java [moved from openflowjava/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/ScenarioFactory.java with 100% similarity]
samples/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/ScenarioHandler.java [moved from openflowjava/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/ScenarioHandler.java with 100% similarity]
samples/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/ScenarioService.java [moved from openflowjava/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/ScenarioService.java with 76% similarity]
samples/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/ScenarioServiceImpl.java [moved from openflowjava/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/ScenarioServiceImpl.java with 91% similarity]
samples/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/Scenarios.java [moved from openflowjava/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/Scenarios.java with 81% similarity]
samples/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/SendEvent.java [moved from openflowjava/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/SendEvent.java with 100% similarity]
samples/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/SimpleClient.java [moved from openflowjava/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/SimpleClient.java with 100% similarity]
samples/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/SimpleClientFramer.java [moved from openflowjava/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/SimpleClientFramer.java with 100% similarity]
samples/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/SimpleClientHandler.java [moved from openflowjava/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/SimpleClientHandler.java with 100% similarity]
samples/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/SimpleClientInitializer.java [moved from openflowjava/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/SimpleClientInitializer.java with 100% similarity]
samples/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/SleepEvent.java [moved from openflowjava/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/SleepEvent.java with 100% similarity]
samples/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/Step.java [moved from openflowjava/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/Step.java with 89% similarity]
samples/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/UdpSimpleClient.java [moved from openflowjava/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/UdpSimpleClient.java with 100% similarity]
samples/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/UdpSimpleClientFramer.java [moved from openflowjava/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/UdpSimpleClientFramer.java with 100% similarity]
samples/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/UdpSimpleClientInitializer.java [moved from openflowjava/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/UdpSimpleClientInitializer.java with 100% similarity]
samples/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/WaitForMessageEvent.java [moved from openflowjava/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/WaitForMessageEvent.java with 100% similarity]
samples/simple-client/src/main/resources/scenario.xml [moved from openflowjava/simple-client/src/main/resources/scenario.xml with 100% similarity]
samples/simple-client/src/main/resources/scenario.xsd [moved from openflowjava/simple-client/src/main/resources/scenario.xsd with 100% similarity]
samples/simple-client/src/main/resources/selfSignedController [moved from openflowjava/simple-client/src/main/resources/selfSignedController with 100% similarity]
samples/simple-client/src/main/resources/selfSignedSwitch [moved from openflowjava/simple-client/src/main/resources/selfSignedSwitch with 100% similarity]
test-common/pom.xml

index b5fb2b681483b76cee18f840c96051d8fe70a830..33988aa2bbb4d956bd6387475daabb691be71dba 100644 (file)
@@ -25,6 +25,7 @@
 
     <dependencyManagement>
         <dependencies>
+            <!-- core -->
             <dependency>
                 <!-- to be deprecated -->
                 <groupId>${project.groupId}</groupId>
                 <artifactId>test-common</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <!-- openflowjava -->
+            <dependency>
+                <groupId>${project.groupId}.openflowjava</groupId>
+                <artifactId>openflow-protocol-api</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}.openflowjava</groupId>
+                <artifactId>openflow-protocol-impl</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}.openflowjava</groupId>
+                <artifactId>openflow-protocol-impl</artifactId>
+                <version>${project.version}</version>
+                <type>test-jar</type>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}.openflowjava</groupId>
+                <artifactId>openflowjava-config</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}.openflowjava</groupId>
+                <artifactId>openflowjava-blueprint-config</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}.openflowjava</groupId>
+                <artifactId>openflow-protocol-spi</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}.openflowjava</groupId>
+                <artifactId>openflow-protocol-it</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}.openflowjava</groupId>
+                <artifactId>openflowjava-util</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <!-- models -->
             <dependency>
                 <groupId>${project.groupId}.model</groupId>
                 <type>cfg</type>
                 <classifier>config</classifier>
             </dependency>
+            <dependency>
+                <groupId>${project.groupId}.openflowjava</groupId>
+                <artifactId>openflowjava-blueprint-config</artifactId>
+                <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>config</classifier>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}.openflowjava</groupId>
+                <artifactId>openflowjava-blueprint-config</artifactId>
+                <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>legacyConfig</classifier>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}.openflowjava</groupId>
+                <artifactId>openflowjava-config</artifactId>
+                <type>xml</type>
+                <version>${project.version}</version>
+                <classifier>configstats</classifier>
+            </dependency>
             <!-- features -->
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
+            <dependency>
+                <groupId>${project.groupId}.openflowjava</groupId>
+                <artifactId>features-openflowjava</artifactId>
+                <version>${project.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>odl-openflowplugin-flow-services-rest</artifactId>
                 <type>xml</type>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>${project.groupId}.openflowjava</groupId>
+                <artifactId>odl-openflowjava-protocol</artifactId>
+                <classifier>features</classifier>
+                <type>xml</type>
+                <version>${project.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 </project>
index 85ee3db6fe659e826a8e1048342a711ad4aa7bed..9cf4bfff967b326d9b555eaf3537477f720f2a96 100644 (file)
 
     <name>OpenDaylight :: Openflow Plugin :: ONF Extensions</name>
 
-    <properties>
-        <openflowjava.version>0.9.0-SNAPSHOT</openflowjava.version>
-    </properties>
-
     <dependencies>
         <!-- feature dependencies -->
         <dependency>
index f76c87028d191c65f174ba28238cbbf24a797375..27c259df3d6b1b133498c996bf0002efb8689284 100644 (file)
 
     <dependencies>
         <dependency>
-            <groupId>org.opendaylight.openflowjava</groupId>
+            <groupId>${project.groupId}.openflowjava</groupId>
             <artifactId>openflow-protocol-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.openflowjava</groupId>
+            <groupId>${project.groupId}.openflowjava</groupId>
             <artifactId>openflow-protocol-spi</artifactId>
         </dependency>
 
index f92c4d3584de5d7defc43488c90825508b7411fc..ca3f3416b09ab36392cab4357f5c95472cb27891 100644 (file)
 
     <dependencies>
         <dependency>
-            <groupId>org.opendaylight.openflowjava</groupId>
+            <groupId>${project.groupId}.openflowjava</groupId>
             <artifactId>openflow-protocol-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.openflowjava</groupId>
+            <groupId>${project.groupId}.openflowjava</groupId>
             <artifactId>openflow-protocol-spi</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.openflowjava</groupId>
+            <groupId>${project.groupId}.openflowjava</groupId>
             <artifactId>openflowjava-util</artifactId>
         </dependency>
         <dependency>
index 7d5c96685b73acae3d593d66f19874c01bab6571..f72df284327da1e08850af1d2efdb5c4c1691e16 100644 (file)
@@ -80,7 +80,7 @@
 
         <!-- OpenFlowJava-API models -->
         <dependency>
-            <groupId>org.opendaylight.openflowjava</groupId>
+            <groupId>${project.groupId}.openflowjava</groupId>
             <artifactId>openflow-protocol-api</artifactId>
         </dependency>
 
index 5926681e65eea834ac5b9e404b89950bac5b13d0..7c265d2f8934b3259fc5bcafbb41caa451989f1d 100644 (file)
@@ -93,7 +93,7 @@
         </dependency>
         <!-- OpenFlowJava-API models -->
         <dependency>
-            <groupId>org.opendaylight.openflowjava</groupId>
+            <groupId>${project.groupId}.openflowjava</groupId>
             <artifactId>openflow-protocol-api</artifactId>
         </dependency>
         <!-- Test dependencies -->
index 48c6cefe90ac1e6803129e3608f32731858343d6..d575401bad07cf2cfedb82cc28c65a06cf9d7d34 100644 (file)
 
     <dependencies>
         <dependency>
-            <groupId>org.opendaylight.openflowplugin</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>openflowplugin-blueprint-config</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.openflowjava</groupId>
+            <groupId>${project.groupId}.openflowjava</groupId>
             <artifactId>openflowjava-blueprint-config</artifactId>
-            <version>${openflowjava.version}</version>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>openflowplugin-extension-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.openflowjava</groupId>
+            <groupId>${project.groupId}.openflowjava</groupId>
             <artifactId>openflow-protocol-spi</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.openflowplugin</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>openflowplugin-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.openflowplugin</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>openflowplugin</artifactId>
         </dependency>
         <dependency>
index 2428a75de7c8efd8563c6645be9066264b7d6536..a9d6824ca1b0d6f55dce2e7ec82630364b3e7c92 100644 (file)
 
         <!-- OpenFlowJava-API models -->
         <dependency>
-            <groupId>org.opendaylight.openflowjava</groupId>
+            <groupId>${project.groupId}.openflowjava</groupId>
             <artifactId>openflow-protocol-api</artifactId>
         </dependency>
     </dependencies>
index ea9a13bcccff91f3d8ef26ddb1dafce9a8c031c6..f8f030e262c76927464102e413b47aa2b6c14251 100644 (file)
@@ -18,7 +18,6 @@
 
     <properties>
         <mdsal.version>1.6.0-SNAPSHOT</mdsal.version>
-        <openflowjava.version>0.10.0-SNAPSHOT</openflowjava.version>
         <mdsal.model.version>0.11.0-SNAPSHOT</mdsal.model.version>
     </properties>
 
@@ -58,9 +57,9 @@
         </dependency>
 
         <dependency>
-            <groupId>org.opendaylight.openflowjava</groupId>
+            <groupId>${project.groupId}.openflowjava</groupId>
             <artifactId>odl-openflowjava-protocol</artifactId>
-            <version>${openflowjava.version}</version>
+            <version>${project.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
index f607fbcafe71b153a6943bc208ec456612ace9e6..bbb72445d40a84beaee18b07e728159e44046ef7 100644 (file)
@@ -21,7 +21,7 @@
       <artifactId>opendaylight-l2-types</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.openflowjava</groupId>
+      <groupId>org.opendaylight.openflowplugin.openflowjava</groupId>
       <artifactId>openflow-protocol-api</artifactId>
     </dependency>
   </dependencies>
diff --git a/openflowjava/artifacts/pom.xml b/openflowjava/artifacts/pom.xml
deleted file mode 100644 (file)
index 54204e9..0000000
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
- Copyright (c) 2013 Robert Varga. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<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>
-
-  <parent>
-    <groupId>org.opendaylight.odlparent</groupId>
-    <artifactId>odlparent-lite</artifactId>
-    <version>2.0.0</version>
-    <relativePath/>
-  </parent>
-
-    <groupId>org.opendaylight.openflowjava</groupId>
-    <artifactId>openflowjava-artifacts</artifactId>
-    <version>0.10.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-    <!-- <name> formatting is used by autorelease to parse and notify projects on
-         build failure. Please do not modify this unless you have a good reason. -->
-    <name>ODL :: openflowjava :: ${project.artifactId}</name>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>openflow-protocol-api</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>openflow-protocol-impl</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>openflow-protocol-impl</artifactId>
-                <version>${project.version}</version>
-                <type>test-jar</type>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-              <groupId>org.opendaylight.openflowjava</groupId>
-              <artifactId>openflowjava-blueprint-config</artifactId>
-              <version>${project.version}</version>
-              <type>xml</type>
-              <classifier>config</classifier>
-            </dependency>
-            <dependency>
-              <groupId>org.opendaylight.openflowjava</groupId>
-              <artifactId>openflowjava-blueprint-config</artifactId>
-              <version>${project.version}</version>
-              <type>xml</type>
-              <classifier>legacyConfig</classifier>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>openflow-protocol-spi</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>simple-client</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>openflowjava-util</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>openflowjava-config</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>openflowjava-config</artifactId>
-                <version>${project.version}</version>
-                <type>xml</type>
-                <classifier>configstats</classifier>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>features-openflowjava</artifactId>
-                <version>${project.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-</project>
similarity index 76%
rename from openflowjava/features/features-openflowjava/pom.xml
rename to openflowjava/features-openflowjava-aggregator/features-openflowjava/pom.xml
index 036501c457098dfdf8d30f67f8b27ce68c865cec..8580e78f1d2ec12f2363b4bb8756b7bc5dcefdc5 100644 (file)
@@ -8,22 +8,15 @@
     <relativePath/>
   </parent>
 
-  <groupId>org.opendaylight.openflowjava</groupId>
+  <groupId>org.opendaylight.openflowplugin.openflowjava</groupId>
   <artifactId>features-openflowjava</artifactId>
-  <version>0.10.0-SNAPSHOT</version>
+  <version>0.5.0-SNAPSHOT</version>
   <packaging>feature</packaging>
   <!-- <name> formatting is used by autorelease to parse and notify projects on
        build failure. Please do not modify this unless you have a good reason. -->
   <name>ODL :: openflowjava :: ${project.artifactId}</name>
 
   <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>odl-openflowjava-all</artifactId>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <classifier>features</classifier>
-    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>odl-openflowjava-protocol</artifactId>
similarity index 88%
rename from openflowjava/features/odl-openflowjava-protocol/pom.xml
rename to openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/pom.xml
index 9092873c84d0ab88e80808e64baacee1de58a5f6..ff4173c7f27111a5cc2b429f544526f60ed77014 100644 (file)
@@ -11,9 +11,9 @@
         <relativePath/>
     </parent>
 
-    <groupId>org.opendaylight.openflowjava</groupId>
+    <groupId>org.opendaylight.openflowplugin.openflowjava</groupId>
     <artifactId>odl-openflowjava-protocol</artifactId>
-    <version>0.10.0-SNAPSHOT</version>
+    <version>0.5.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <!-- <name> formatting is used by autorelease to parse and notify projects on
         <dependencies>
             <!-- This project -->
             <dependency>
-                <groupId>org.opendaylight.openflowjava</groupId>
-                <artifactId>openflowjava-artifacts</artifactId>
+                <groupId>org.opendaylight.openflowplugin</groupId>
+                <artifactId>openflowplugin-artifacts</artifactId>
                 <version>${project.version}</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
 
-            <!-- This project -->
+            <!-- Netty -->
             <dependency>
                 <groupId>org.opendaylight.odlparent</groupId>
                 <artifactId>odl-netty-4</artifactId>
         </dependency>
         <!-- bundle dependencies -->
         <dependency>
-            <groupId>org.opendaylight.openflowjava</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>openflow-protocol-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.openflowjava</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>openflow-protocol-spi</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.openflowjava</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>openflow-protocol-impl</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.openflowjava</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>openflowjava-util</artifactId>
         </dependency>
         <!-- config files -->
         <dependency>
-            <groupId>org.opendaylight.openflowjava</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>openflowjava-config</artifactId>
             <type>xml</type>
             <classifier>configstats</classifier>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.openflowjava</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>openflowjava-blueprint-config</artifactId>
             <type>xml</type>
             <classifier>config</classifier>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.openflowjava</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>openflowjava-blueprint-config</artifactId>
             <type>xml</type>
             <classifier>legacyConfig</classifier>
similarity index 61%
rename from openflowjava/features/odl-openflowjava-protocol/src/main/feature/feature.xml
rename to openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/src/main/feature/feature.xml
index b1261d3f1ac48d77eae5cc9f4c895315a5d0af07..0503c1def0c3d0fbf530daa50ab9a17e2bb51171 100644 (file)
@@ -2,8 +2,8 @@
 
 <features name="odl-openflowjava-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0">
     <feature name='odl-openflowjava-protocol' version='${project.version}'>
-        <configfile finalname="etc/opendaylight/karaf/45-openflowjava-stats.xml">mvn:org.opendaylight.openflowjava/openflowjava-config/${project.version}/xml/configstats</configfile>
-        <configfile finalname="etc/opendaylight/datastore/initial/config/default-openflow-connection-config.xml">mvn:org.opendaylight.openflowjava/openflowjava-blueprint-config/${project.version}/xml/config</configfile>
-        <configfile finalname="etc/opendaylight/datastore/initial/config/legacy-openflow-connection-config.xml">mvn:org.opendaylight.openflowjava/openflowjava-blueprint-config/${project.version}/xml/legacyConfig</configfile>
+        <configfile finalname="etc/opendaylight/karaf/45-openflowjava-stats.xml">mvn:org.opendaylight.openflowplugin.openflowjava/openflowjava-config/${project.version}/xml/configstats</configfile>
+        <configfile finalname="etc/opendaylight/datastore/initial/config/default-openflow-connection-config.xml">mvn:org.opendaylight.openflowplugin.openflowjava/openflowjava-blueprint-config/${project.version}/xml/config</configfile>
+        <configfile finalname="etc/opendaylight/datastore/initial/config/legacy-openflow-connection-config.xml">mvn:org.opendaylight.openflowplugin.openflowjava/openflowjava-blueprint-config/${project.version}/xml/legacyConfig</configfile>
     </feature>
 </features>
similarity index 82%
rename from openflowjava/features/pom.xml
rename to openflowjava/features-openflowjava-aggregator/pom.xml
index 44633fb45acb0aa4ab5abd5d52385e0f8fda5d54..ca2fff66a8a89cbafbfc84527f27f6e72ceca258 100644 (file)
@@ -8,9 +8,9 @@
     <relativePath/>
   </parent>
 
-  <groupId>org.opendaylight.openflowjava</groupId>
-  <artifactId>features-aggregator</artifactId>
-  <version>0.10.0-SNAPSHOT</version>
+  <groupId>org.opendaylight.openflowplugin.openflowjava</groupId>
+  <artifactId>features-openflowjava-aggregator</artifactId>
+  <version>0.5.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <!-- <name> formatting is used by autorelease to parse and notify projects on
        build failure. Please do not modify this unless you have a good reason. -->
@@ -19,7 +19,6 @@
   <modules>
     <module>features-openflowjava</module>
     <module>odl-openflowjava-protocol</module>
-    <module>odl-openflowjava-all</module>
   </modules>
 
 </project>
diff --git a/openflowjava/features/odl-openflowjava-all/pom.xml b/openflowjava/features/odl-openflowjava-all/pom.xml
deleted file mode 100644 (file)
index 38d7c4f..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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>
-    <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>single-feature-parent</artifactId>
-        <version>2.0.0</version>
-        <relativePath/>
-    </parent>
-
-    <groupId>org.opendaylight.openflowjava</groupId>
-    <artifactId>odl-openflowjava-all</artifactId>
-    <version>0.10.0-SNAPSHOT</version>
-    <packaging>feature</packaging>
-
-    <!-- <name> formatting is used by autorelease to parse and notify projects on
-         build failure. Please do not modify this unless you have a good reason. -->
-    <name>ODL :: openflowjava :: ${project.artifactId}</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.openflowjava</groupId>
-            <artifactId>odl-openflowjava-protocol</artifactId>
-            <version>${project.version}</version>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-    </dependencies>
-
-</project>
index 5a2777d092733074470a0cf0532e97e3fa83372d..a07a7dab576b843a05ac911b59f84b3b3f7e0e64 100644 (file)
@@ -7,9 +7,9 @@
         <version>0.11.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
-    <groupId>org.opendaylight.openflowjava</groupId>
+    <groupId>org.opendaylight.openflowplugin.openflowjava</groupId>
     <artifactId>openflow-protocol-api</artifactId>
-    <version>0.10.0-SNAPSHOT</version>
+    <version>0.5.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <!-- <name> formatting is used by autorelease to parse and notify projects on
          build failure. Please do not modify this unless you have a good reason. -->
index 62c2ddd3beb66815c7830db14507f28f3a3e71a5..54382806f20b2d7a49d4466c3ca4a3afd5be8eeb 100644 (file)
@@ -1,10 +1,10 @@
 <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>
     <parent>
-        <groupId>org.opendaylight.openflowjava</groupId>
+        <groupId>org.opendaylight.openflowplugin.openflowjava</groupId>
         <artifactId>openflowjava-parent</artifactId>
-        <version>0.10.0-SNAPSHOT</version>
-        <relativePath>../parent</relativePath>
+        <version>0.5.0-SNAPSHOT</version>
+        <relativePath>../</relativePath>
     </parent>
     <artifactId>openflow-protocol-impl</artifactId>
     <packaging>bundle</packaging>
             <artifactId>openflow-protocol-spi</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.openflowjava</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>openflowjava-util</artifactId>
         </dependency>
         <dependency>
index 58628b300b8d76b4d84780550d796e05f2e8d27e..ad88554fe51d545535d5af84c10790dfba22d561 100644 (file)
@@ -1,10 +1,10 @@
 <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>
     <parent>
-        <groupId>org.opendaylight.openflowjava</groupId>
+        <groupId>org.opendaylight.openflowplugin.openflowjava</groupId>
         <artifactId>openflowjava-parent</artifactId>
-        <version>0.10.0-SNAPSHOT</version>
-        <relativePath>../parent</relativePath>
+        <version>0.5.0-SNAPSHOT</version>
+        <relativePath>../</relativePath>
     </parent>
     <artifactId>openflow-protocol-it</artifactId>
     <packaging>bundle</packaging>
@@ -29,8 +29,9 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>simple-client</artifactId>
+            <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
index 67a9aa90e3a499788e4111404555db2f437eec6b..90469a1a0647c5cdd66357aeb352e05bd4840bf1 100644 (file)
@@ -1,10 +1,10 @@
 <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>
     <parent>
-        <groupId>org.opendaylight.openflowjava</groupId>
+        <groupId>org.opendaylight.openflowplugin.openflowjava</groupId>
         <artifactId>openflowjava-parent</artifactId>
-        <version>0.10.0-SNAPSHOT</version>
-        <relativePath>../parent</relativePath>
+        <version>0.5.0-SNAPSHOT</version>
+        <relativePath>../</relativePath>
     </parent>
     <artifactId>openflow-protocol-spi</artifactId>
     <packaging>bundle</packaging>
index 71efa0d2d614d56a2a3bc6efaaa939bf09c8a780..2f0273f52bcd1cb0966b38b0914a29c885624b28 100644 (file)
@@ -9,10 +9,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.opendaylight.openflowjava</groupId>
+        <groupId>org.opendaylight.openflowplugin.openflowjava</groupId>
         <artifactId>openflowjava-parent</artifactId>
-        <version>0.10.0-SNAPSHOT</version>
-        <relativePath>../parent</relativePath>
+        <version>0.5.0-SNAPSHOT</version>
+        <relativePath>../</relativePath>
     </parent>
     <artifactId>openflowjava-blueprint-config</artifactId>
     <description>Blueprint configuration files for openflowjava statistics</description>
index 419a0609968ee6ca9efa6226abd0397dae3cdb61..399688363ef0730fc30d605e702d4c527a8f978d 100644 (file)
@@ -9,10 +9,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.opendaylight.openflowjava</groupId>
+        <groupId>org.opendaylight.openflowplugin.openflowjava</groupId>
         <artifactId>openflowjava-parent</artifactId>
-        <version>0.10.0-SNAPSHOT</version>
-        <relativePath>../parent</relativePath>
+        <version>0.5.0-SNAPSHOT</version>
+        <relativePath>../</relativePath>
     </parent>
     <artifactId>openflowjava-config</artifactId>
     <description>Configuration files for openflowjava statistics</description>
index c296e5a70548a45a016fb3e8311e385d9388b21e..6685508823c41bade8711eff24232e0825fda1b3 100644 (file)
@@ -3,10 +3,10 @@
 
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.opendaylight.openflowjava</groupId>
+        <groupId>org.opendaylight.openflowplugin.openflowjava</groupId>
         <artifactId>openflowjava-parent</artifactId>
-        <version>0.10.0-SNAPSHOT</version>
-        <relativePath>../parent</relativePath>
+        <version>0.5.0-SNAPSHOT</version>
+        <relativePath>../</relativePath>
     </parent>
     <packaging>bundle</packaging>
     <artifactId>openflowjava-util</artifactId>
@@ -21,7 +21,7 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.openflowjava</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>openflow-protocol-api</artifactId>
         </dependency>
     </dependencies>
diff --git a/openflowjava/parent/pom.xml b/openflowjava/parent/pom.xml
deleted file mode 100644 (file)
index 4238e08..0000000
+++ /dev/null
@@ -1,392 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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>
-    <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>odlparent</artifactId>
-        <version>2.0.0</version>
-        <relativePath/>
-    </parent>
-
-    <groupId>org.opendaylight.openflowjava</groupId>
-    <artifactId>openflowjava-parent</artifactId>
-    <version>0.10.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-    <!-- <name> formatting is used by autorelease to parse and notify projects on
-         build failure. Please do not modify this unless you have a good reason. -->
-    <name>ODL :: openflowjava :: ${project.artifactId}</name>
-    <description>
-        Openflow protocol library - serializes and deserializes openflow messages + handles connections with openflow devices.
-    </description>
-    <url>https://wiki.opendaylight.org/view/Openflow_Protocol_Library:Main</url>
-
-    <licenses>
-        <license>
-            <name>The Eclipse Public License v1.0</name>
-            <url>http://www.eclipse.org/legal/epl-v10.html</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
-
-    <scm>
-        <connection>scm:git:ssh://git.opendaylight.org:29418/openflowjava.git</connection>
-        <developerConnection>scm:git:ssh://git.opendaylight.org:29418/openflowjava.git</developerConnection>
-        <url>https://wiki.opendaylight.org/view/Openflow_Protocol_Library:Main</url>
-        <tag>HEAD</tag>
-    </scm>
-
-    <developers>
-        <developer>
-            <name>Michal Polkorab</name>
-            <email>michal.polkorab@pantheon.sk</email>
-            <organization>Pantheon Technologies</organization>
-            <organizationUrl>https://www.pantheon.sk/en/</organizationUrl>
-        </developer>
-        <developer>
-            <name>Michal Rehak</name>
-            <email>mirehak@cisco.com</email>
-            <organization>Cisco Systems</organization>
-            <organizationUrl>www.cisco.com</organizationUrl>
-        </developer>
-    </developers>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <jmxGeneratorPath>${project.build.directory}/yang-gen-config</jmxGeneratorPath>
-        <salGeneratorPath>${project.build.directory}/yang-gen-sal</salGeneratorPath>
-
-        <config.version>0.7.0-SNAPSHOT</config.version>
-        <controller.mdsal.version>1.6.0-SNAPSHOT</controller.mdsal.version>
-        <mdsal.model.version>0.11.0-SNAPSHOT</mdsal.model.version>
-        <yangtools.version>1.2.0-SNAPSHOT</yangtools.version>
-        <argparse4j.version>0.7.0</argparse4j.version>
-    </properties>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-              <groupId>org.opendaylight.openflowjava</groupId>
-              <artifactId>openflowjava-artifacts</artifactId>
-              <version>${project.version}</version>
-              <type>pom</type>
-              <scope>import</scope>
-            </dependency>
-            <dependency>
-              <groupId>org.opendaylight.yangtools</groupId>
-              <artifactId>yangtools-artifacts</artifactId>
-              <version>${yangtools.version}</version>
-              <type>pom</type>
-              <scope>import</scope>
-            </dependency>
-            <dependency>
-              <groupId>org.opendaylight.controller</groupId>
-              <artifactId>config-artifacts</artifactId>
-              <version>${config.version}</version>
-              <type>pom</type>
-              <scope>import</scope>
-            </dependency>
-            <dependency>
-              <groupId>org.opendaylight.controller</groupId>
-              <artifactId>mdsal-artifacts</artifactId>
-              <version>${controller.mdsal.version}</version>
-              <scope>import</scope>
-              <type>pom</type>
-            </dependency>
-            <dependency>
-                <groupId>net.sourceforge.argparse4j</groupId>
-                <artifactId>argparse4j</artifactId>
-                <version>${argparse4j.version}</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <artifactId>maven-source-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-sources</id>
-                        <phase>deploy</phase>
-                        <goals>
-                            <goal>jar-no-fork</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-              <groupId>org.apache.felix</groupId>
-              <artifactId>maven-bundle-plugin</artifactId>
-              <extensions>true</extensions>
-              <configuration>
-                <instructions>
-                  <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
-                </instructions>
-                <manifestLocation>${project.build.directory}/META-INF</manifestLocation>
-              </configuration>
-            </plugin>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-checkstyle-plugin</artifactId>
-              <version>${checkstyle.version}</version>
-              <configuration>
-                <failOnViolation>false</failOnViolation>
-                <configLocation>checkstyle-logging.xml</configLocation>
-                <consoleOutput>true</consoleOutput>
-                <includeTestSourceDirectory>true</includeTestSourceDirectory>
-                <sourceDirectory>${project.basedir}</sourceDirectory>
-                <includes>**\/*.java,**\/*.xml,**\/*.ini,**\/*.sh,**\/*.bat,**\/*.yang</includes>
-                <excludes>**\/target\/,**\/bin\/,**\/target-ide\/,**\/src/main/yang-gen-config\/,**\/src/main/yang-gen-sal\/</excludes>
-              </configuration>
-              <dependencies>
-                <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>checkstyle-logging</artifactId>
-                <version>${yangtools.version}</version>
-                </dependency>
-              </dependencies>
-              <executions>
-                <execution>
-                <goals>
-                  <goal>check</goal>
-                </goals>
-                </execution>
-              </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                  <execution>
-                    <id>add-yang-sources</id>
-                    <phase>generate-sources</phase>
-                    <goals>
-                      <goal>add-source</goal>
-                    </goals>
-                    <configuration>
-                      <sources>
-                        <source>${jmxGeneratorPath}</source>
-                        <source>${salGeneratorPath}</source>
-                      </sources>
-                    </configuration>
-                  </execution>
-                </executions>
-            </plugin>
-        </plugins>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.opendaylight.yangtools</groupId>
-                    <artifactId>yang-maven-plugin</artifactId>
-                    <version>${yangtools.version}</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>build-helper-maven-plugin</artifactId>
-                    <version>1.8</version>
-                    <executions>
-                        <execution>
-                            <id>add-source</id>
-                            <goals>
-                                <goal>add-source</goal>
-                            </goals>
-                            <phase>generate-sources</phase>
-                            <configuration>
-                                <sources>
-                                    <source>src/main/yang</source>
-                                </sources>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-                <!-- Ignore/Execute plugin execution -->
-                <plugin>
-                  <groupId>org.eclipse.m2e</groupId>
-                  <artifactId>lifecycle-mapping</artifactId>
-                  <version>1.0.0</version>
-                  <configuration>
-                    <lifecycleMappingMetadata>
-                      <pluginExecutions>
-                        <pluginExecution>
-                          <pluginExecutionFilter>
-                            <groupId>org.codehaus.mojo</groupId>
-                            <artifactId>properties-maven-plugin</artifactId>
-                            <versionRange>[0.0,)</versionRange>
-                            <goals>
-                              <goal>set-system-properties</goal>
-                            </goals>
-                          </pluginExecutionFilter>
-                          <action>
-                            <ignore/>
-                          </action>
-                        </pluginExecution>
-                        <pluginExecution>
-                          <pluginExecutionFilter>
-                            <groupId>org.jacoco</groupId>
-                            <artifactId>jacoco-maven-plugin</artifactId>
-                            <versionRange>[0.0,)</versionRange>
-                            <goals>
-                              <goal>prepare-agent</goal>
-                              <goal>pre-test</goal>
-                              <goal>post-test</goal>
-                            </goals>
-                          </pluginExecutionFilter>
-                          <action>
-                            <ignore/>
-                          </action>
-                        </pluginExecution>
-                        <pluginExecution>
-                          <pluginExecutionFilter>
-                            <groupId>org.ops4j.pax.exam</groupId>
-                            <artifactId>maven-paxexam-plugin</artifactId>
-                            <versionRange>[1.2.4,)</versionRange>
-                            <goals>
-                              <goal>generate-depends-file</goal>
-                            </goals>
-                          </pluginExecutionFilter>
-                          <action>
-                            <execute>
-                              <runOnIncremental>false</runOnIncremental>
-                            </execute>
-                          </action>
-                        </pluginExecution>
-                        <pluginExecution>
-                          <pluginExecutionFilter>
-                            <groupId>org.apache.maven.plugins</groupId>
-                            <artifactId>maven-checkstyle-plugin</artifactId>
-                            <versionRange>[2.0,)</versionRange>
-                            <goals>
-                              <goal>check</goal>
-                            </goals>
-                          </pluginExecutionFilter>
-                          <action>
-                            <ignore/>
-                          </action>
-                        </pluginExecution>
-                        <pluginExecution>
-                          <pluginExecutionFilter>
-                            <groupId>org.codehaus.groovy.maven</groupId>
-                            <artifactId>gmaven-plugin</artifactId>
-                            <versionRange>1.0</versionRange>
-                            <goals>
-                              <goal>execute</goal>
-                            </goals>
-                          </pluginExecutionFilter>
-                          <action>
-                            <ignore/>
-                          </action>
-                        </pluginExecution>
-                        <pluginExecution>
-                          <pluginExecutionFilter>
-                            <groupId>org.apache.maven.plugins</groupId>
-                            <artifactId>maven-enforcer-plugin</artifactId>
-                            <versionRange>${enforcer.version}</versionRange>
-                            <goals>
-                              <goal>enforce</goal>
-                            </goals>
-                          </pluginExecutionFilter>
-                          <action>
-                            <ignore/>
-                          </action>
-                        </pluginExecution>
-                      </pluginExecutions>
-                    </lifecycleMappingMetadata>
-                  </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-    <reporting>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>findbugs-maven-plugin</artifactId>
-                <version>2.5.2</version>
-                <configuration>
-                    <effort>Max</effort>
-                    <threshold>Low</threshold>
-                    <goal>site</goal>
-                </configuration>
-            </plugin>
-            <plugin>
-              <artifactId>maven-jxr-plugin</artifactId>
-              <version>2.3</version>
-              <configuration>
-                <aggregate>true</aggregate>
-                <linkJavadoc>true</linkJavadoc>
-              </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>jdepend-maven-plugin</artifactId>
-                <version>2.0-beta-2</version>
-            </plugin>
-        </plugins>
-    </reporting>
-    <profiles>
-        <profile>
-            <id>viewbuild</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <properties>
-                <build.suffix>${project.version}</build.suffix>
-            </properties>
-        </profile>
-        <profile>
-            <id>jenkins</id>
-            <activation>
-                <property>
-                    <name>BUILDSUFFIX</name>
-                </property>
-            </activation>
-            <properties>
-                <build.suffix>${BUILDSUFFIX}</build.suffix>
-            </properties>
-        </profile>
-        <profile>
-            <id>repoBuild</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>2.8.1</version>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>aggregate</goal>
-                                </goals>
-                                <phase>site</phase>
-                            </execution>
-                            <execution>
-                                <id>attach-javadocs</id>
-                                <goals>
-                                    <goal>jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-source-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-sources</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>jar-no-fork</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-</project>
index e3eda8b0ce395f3feeaa2c52f1d533bfe88ed184..e1924f8baf22eae01b5a5455487131cee2c19825 100644 (file)
 <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>
     <parent>
-        <groupId>org.opendaylight.openflowjava</groupId>
-        <artifactId>openflowjava-parent</artifactId>
-        <version>0.10.0-SNAPSHOT</version>
-        <relativePath>parent</relativePath>
+        <groupId>org.opendaylight.openflowplugin</groupId>
+        <artifactId>openflowplugin-parent</artifactId>
+        <version>0.5.0-SNAPSHOT</version>
+        <relativePath>../parent</relativePath>
     </parent>
 
-    <artifactId>openflowjava-aggregator</artifactId>
+    <groupId>org.opendaylight.openflowplugin.openflowjava</groupId>
+    <artifactId>openflowjava-parent</artifactId>
     <packaging>pom</packaging>
 
     <modules>
-        <module>artifacts</module>
-        <module>features</module>
+        <module>features-openflowjava-aggregator</module>
         <module>openflowjava-config</module>
         <module>openflowjava-blueprint-config</module>
         <module>openflow-protocol-api</module>
         <module>openflow-protocol-impl</module>
         <module>openflow-protocol-it</module>
         <module>openflow-protocol-spi</module>
-        <module>parent</module>
-        <module>simple-client</module>
         <module>openflowjava-util</module>
     </modules>
-</project>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <artifactId>maven-source-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <phase>deploy</phase>
+                        <goals>
+                            <goal>jar-no-fork</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
+                    </instructions>
+                    <manifestLocation>${project.build.directory}/META-INF</manifestLocation>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>add-yang-sources</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>${jmxGeneratorPath}</source>
+                                <source>${salGeneratorPath}</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>build-helper-maven-plugin</artifactId>
+                    <version>1.8</version>
+                    <executions>
+                        <execution>
+                            <id>add-source</id>
+                            <goals>
+                                <goal>add-source</goal>
+                            </goals>
+                            <phase>generate-sources</phase>
+                            <configuration>
+                                <sources>
+                                    <source>src/main/yang</source>
+                                </sources>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+    <profiles>
+        <profile>
+            <id>viewbuild</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <properties>
+                <build.suffix>${project.version}</build.suffix>
+            </properties>
+        </profile>
+        <profile>
+            <id>jenkins</id>
+            <activation>
+                <property>
+                    <name>BUILDSUFFIX</name>
+                </property>
+            </activation>
+            <properties>
+                <build.suffix>${BUILDSUFFIX}</build.suffix>
+            </properties>
+        </profile>
+        <profile>
+            <id>repoBuild</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <version>2.8.1</version>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>aggregate</goal>
+                                </goals>
+                                <phase>site</phase>
+                            </execution>
+                            <execution>
+                                <id>attach-javadocs</id>
+                                <goals>
+                                    <goal>jar</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-source-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>attach-sources</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>jar-no-fork</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+</project>
\ No newline at end of file
index 6785e7684b7a97750d71446f9b48d6cbf4043675..2f05c4b26c4967b77c61e017ffe95be126c63e8d 100644 (file)
 
     <dependencies>
         <dependency>
-            <groupId>org.opendaylight.openflowplugin.model</groupId>
+            <groupId>${project.groupId}.model</groupId>
             <artifactId>model-flow-service</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.openflowplugin.model</groupId>
+            <groupId>${project.groupId}.model</groupId>
             <artifactId>model-flow-statistics</artifactId>
         </dependency>
         <dependency>
             <artifactId>sal-binding-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.openflowjava</groupId>
+            <groupId>${project.groupId}.openflowjava</groupId>
             <artifactId>openflow-protocol-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.openflowjava</groupId>
+            <groupId>${project.groupId}.openflowjava</groupId>
             <artifactId>openflow-protocol-spi</artifactId>
         </dependency>
         <dependency>
index 11072c60e69db56b60d8c69789630aefdb3a58ea..a8faa42a0808a97d5d2cd01618b6edde15e57ff8 100644 (file)
             <artifactId>sal-binding-broker-impl</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.openflowjava</groupId>
+            <groupId>${project.groupId}.openflowjava</groupId>
             <artifactId>openflow-protocol-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.openflowjava</groupId>
+            <groupId>${project.groupId}.openflowjava</groupId>
             <artifactId>openflow-protocol-spi</artifactId>
         </dependency>
         <dependency>
             <artifactId>sal-common-util</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.openflowjava</groupId>
+            <groupId>${project.groupId}.openflowjava</groupId>
             <artifactId>openflowjava-util</artifactId>
         </dependency>
         <dependency>
             <artifactId>sal-common-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.openflowjava</groupId>
+            <groupId>${project.groupId}.openflowjava</groupId>
             <artifactId>openflow-protocol-impl</artifactId>
         </dependency>
         <dependency>
index 15188ded72a332113907dab5de8eb2d5ce1b14a4..6786f2469c88995e38938fd44012b83833db9176 100644 (file)
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.openflowplugin</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>openflowplugin-api</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.openflowplugin</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>openflowplugin</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.openflowplugin</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>openflowplugin-common</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.openflowplugin</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>openflowplugin-extension-api</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.openflowjava</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>simple-client</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.openflowplugin.model</groupId>
+            <groupId>${project.groupId}.model</groupId>
             <artifactId>model-flow-base</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.openflowplugin.model</groupId>
+            <groupId>${project.groupId}.model</groupId>
             <artifactId>model-flow-statistics</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.openflowplugin.model</groupId>
+            <groupId>${project.groupId}.model</groupId>
             <artifactId>model-flow-service</artifactId>
             <scope>test</scope>
         </dependency>
index 598b8298713fd7d63cdb463b3aa72201e580ffc7..dec3e80fd79a6350f077b5937cc6c1485b1f0757 100644 (file)
     </build>
     <dependencies>
         <dependency>
-            <groupId>org.opendaylight.openflowplugin</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>openflowplugin-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.openflowplugin</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>openflowplugin-extension-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.openflowplugin.model</groupId>
+            <groupId>${project.groupId}.model</groupId>
             <artifactId>model-flow-base</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.openflowplugin.model</groupId>
+            <groupId>${project.groupId}.model</groupId>
             <artifactId>model-flow-service</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.openflowplugin.model</groupId>
+            <groupId>${project.groupId}.model</groupId>
             <artifactId>model-flow-statistics</artifactId>
         </dependency>
         <dependency>
         </dependency>
 
         <dependency>
-            <groupId>org.opendaylight.openflowjava</groupId>
+            <groupId>${project.groupId}.openflowjava</groupId>
             <artifactId>openflow-protocol-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.openflowjava</groupId>
+            <groupId>${project.groupId}.openflowjava</groupId>
             <artifactId>openflow-protocol-spi</artifactId>
         </dependency>
         <dependency>
             <artifactId>sal-common-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.openflowjava</groupId>
+            <groupId>${project.groupId}.openflowjava</groupId>
             <artifactId>openflowjava-util</artifactId>
         </dependency>
 
index da2895f9fdd16e443dda2d1a4b99174ed125ced5..30e1fb957d218b7873298992cd5a6552f0ccd91a 100644 (file)
 
     <properties>
         <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-        <openflowjava.version>0.10.0-SNAPSHOT</openflowjava.version>
-        <openflowplugin.version>0.5.0-SNAPSHOT</openflowplugin.version>
         <sal.api.version>0.13.0-SNAPSHOT</sal.api.version>
         <jmxGeneratorPath>${project.build.directory}/generated-sources/config</jmxGeneratorPath>
         <salGeneratorPath>${project.build.directory}/generated-sources/sal</salGeneratorPath>
-        <exi.nagasena.version>0000.0002.0053.0</exi.nagasena.version>
         <controller.distribution.version>0.6.0-SNAPSHOT</controller.distribution.version>
-
         <config.version>0.7.0-SNAPSHOT</config.version>
         <mdsal.version>1.6.0-SNAPSHOT</mdsal.version>
         <mdsal.model.version>0.11.0-SNAPSHOT</mdsal.model.version>
         <yangtools.version>1.2.0-SNAPSHOT</yangtools.version>
+        <argparse4j.version>0.7.0</argparse4j.version>
+        <exi.nagasena.version>0000.0002.0053.0</exi.nagasena.version>
     </properties>
 
     <dependencyManagement>
             <dependency>
                 <groupId>org.opendaylight.openflowplugin</groupId>
                 <artifactId>openflowplugin-artifacts</artifactId>
-                <version>${openflowplugin.version}</version>
+                <version>${project.version}</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
-
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yangtools-artifacts</artifactId>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
-            <dependency>
-                <groupId>org.opendaylight.openflowjava</groupId>
-                <artifactId>openflowjava-artifacts</artifactId>
-                <version>${openflowjava.version}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>liblldp</artifactId>
                 <version>${sal.api.version}</version>
             </dependency>
-
             <!-- thirdparty -->
             <dependency>
                 <groupId>openexi</groupId>
                 <artifactId>nagasena-rta</artifactId>
                 <version>${exi.nagasena.version}</version>
             </dependency>
+            <dependency>
+                <groupId>net.sourceforge.argparse4j</groupId>
+                <artifactId>argparse4j</artifactId>
+                <version>${argparse4j.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
                 <artifactId>build-helper-maven-plugin</artifactId>
             </plugin>
         </plugins>
-
         <pluginManagement>
             <plugins>
                 <plugin>
diff --git a/pom.xml b/pom.xml
index 77310fdeb4a75b2cfa25d41a5cfd73ccf3f9ed1b..e69d8366528d04cf803d45b05b6900747ab15070 100644 (file)
--- a/pom.xml
+++ b/pom.xml
     <packaging>pom</packaging>
 
     <scm>
-      <connection>scm:git:ssh://git.opendaylight.org:29418/openflowplugin.git</connection>
-      <developerConnection>scm:git:ssh://git.opendaylight.org:29418/openflowplugin.git</developerConnection>
-      <url>https://wiki.opendaylight.org/view/OpenDaylight_OpenFlow_Plugin:Main</url>
-      <tag>HEAD</tag>
+        <connection>scm:git:ssh://git.opendaylight.org:29418/openflowplugin.git</connection>
+        <developerConnection>scm:git:ssh://git.opendaylight.org:29418/openflowplugin.git</developerConnection>
+        <url>https://wiki.opendaylight.org/view/OpenDaylight_OpenFlow_Plugin:Main</url>
+        <tag>HEAD</tag>
     </scm>
 
     <modules>
-      <module>artifacts</module>
-      <module>parent</module>
-      <module>openflowplugin-api</module>
-      <module>openflowplugin</module>
-      <module>openflowplugin-impl</module>
-      <module>openflowplugin-common</module>
-      <module>extension</module>
-      <module>distribution/karaf</module>
-      <module>openflowplugin-blueprint-config</module>
-      <!-- <module>openflowplugin-it</module> -->
-      <module>test-provider</module>
-      <module>drop-test-karaf</module>
-      <module>test-common</module>
-      <module>features-aggregator</module>
-      <module>samples/sample-consumer</module>
-      <module>samples/learning-switch</module>
-      <module>samples/sample-bundles</module>
-      <module>applications</module>
-      <module>model</module>
-  </modules>
+        <module>artifacts</module>
+        <module>parent</module>
+        <module>openflowjava</module>
+        <module>openflowplugin-api</module>
+        <module>openflowplugin</module>
+        <module>openflowplugin-impl</module>
+        <module>openflowplugin-common</module>
+        <module>extension</module>
+        <module>distribution/karaf</module>
+        <module>openflowplugin-blueprint-config</module>
+        <!-- <module>openflowplugin-it</module> -->
+        <module>test-provider</module>
+        <module>drop-test-karaf</module>
+        <module>test-common</module>
+        <module>features-aggregator</module>
+        <module>applications</module>
+        <module>model</module>
+        <module>samples</module>
+    </modules>
 </project>
index 1ee4e2bb491a20f0a4a28fa2d9df0a11c021d22c..14d5532c7a8cb0bd0a4084bae3bd373b3cee8be8 100644 (file)
@@ -11,7 +11,6 @@
     <artifactId>learning-switch</artifactId>
     <packaging>bundle</packaging>
 
-
     <build>
         <plugins>
             <plugin>
diff --git a/samples/pom.xml b/samples/pom.xml
new file mode 100644 (file)
index 0000000..076bd96
--- /dev/null
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+    <parent>
+        <groupId>org.opendaylight.openflowplugin</groupId>
+        <artifactId>openflowplugin-parent</artifactId>
+        <version>0.5.0-SNAPSHOT</version>
+        <relativePath>../parent</relativePath>
+    </parent>
+
+    <artifactId>openflowplugin-samples-parent</artifactId>
+    <packaging>pom</packaging>
+    <modules>
+        <module>learning-switch</module>
+        <module>sample-consumer</module>
+        <module>sample-bundles</module>
+        <module>simple-client</module>
+    </modules>
+</project>
index 9c35fcbaac11967aed38cf1341e93495022d01a5..c09a969d904262c1475f91bec50060c8a66464a3 100644 (file)
@@ -9,7 +9,6 @@
     </parent>
 
     <artifactId>sample-consumer</artifactId>
-    <version>0.5.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <build>
similarity index 71%
rename from openflowjava/simple-client/pom.xml
rename to samples/simple-client/pom.xml
index b399646e61aaddf1f17eb89ce827ddd63ff7172b..999caf5c5153477921666df1386e7d893b36b103 100644 (file)
@@ -1,20 +1,14 @@
 <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>
     <parent>
-        <groupId>org.opendaylight.openflowjava</groupId>
-        <artifactId>openflowjava-parent</artifactId>
-        <version>0.10.0-SNAPSHOT</version>
-        <relativePath>../parent</relativePath>
+        <groupId>org.opendaylight.openflowplugin</groupId>
+        <artifactId>openflowplugin-parent</artifactId>
+        <version>0.5.0-SNAPSHOT</version>
+        <relativePath>../../parent</relativePath>
     </parent>
+
     <artifactId>simple-client</artifactId>
     <packaging>bundle</packaging>
-    <!-- <name> formatting is used by autorelease to parse and notify projects on
-         build failure. Please do not modify this unless you have a good reason. -->
-    <name>ODL :: openflowjava :: ${project.artifactId}</name>
-    <scm>
-        <url>https://wiki.opendaylight.org/view/Openflow_Protocol_Library:Main</url>
-      <tag>HEAD</tag>
-  </scm>
 
     <build>
         <plugins>
@@ -32,7 +26,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>${project.groupId}.openflowjava</groupId>
             <artifactId>openflow-protocol-impl</artifactId>
         </dependency>
         <dependency>
similarity index 74%
rename from openflowjava/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/EventType.java
rename to samples/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/EventType.java
index ff83c6bfce5b8b9493eae175726cb784f7a2cb86..2b7440f4102d95b76f390a3ea584324a22e5505c 100644 (file)
@@ -1,4 +1,10 @@
-
+/*
+ * Copyright (c) 2017 Pantheon Technologies s.r.o. and others. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
 package org.opendaylight.openflowjava.protocol.impl.clients;
 
 import javax.xml.bind.annotation.XmlEnum;
similarity index 85%
rename from openflowjava/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/Scenario.java
rename to samples/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/Scenario.java
index 1a989ce99c08ee8571c1516ca90c85fd4fca05f0..deb953a9d067e9f168683e727ae051d31e7ace55 100644 (file)
@@ -1,4 +1,10 @@
-
+/*
+ * Copyright (c) 2017 Pantheon Technologies s.r.o. and others. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
 package org.opendaylight.openflowjava.protocol.impl.clients;
 
 import java.util.ArrayList;
similarity index 76%
rename from openflowjava/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/ScenarioService.java
rename to samples/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/ScenarioService.java
index 0221acfc09707bdd2e64c41b5dd1f0b952d36bc6..8087998e022344f6cfcc47dea1c209c5fedc7240 100644 (file)
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) 2017 Pantheon Technologies s.r.o. and others. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
 package org.opendaylight.openflowjava.protocol.impl.clients;
 
 import org.xml.sax.SAXException;
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) 2017 Pantheon Technologies s.r.o. and others. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
 package org.opendaylight.openflowjava.protocol.impl.clients;
 
 import com.google.common.base.Preconditions;
similarity index 81%
rename from openflowjava/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/Scenarios.java
rename to samples/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/Scenarios.java
index 4c7695506c39cbe108d6ce85654b978bb38d51a8..48b3373e9575a20269ce391d15ee662860e9b005 100644 (file)
@@ -1,4 +1,10 @@
-
+/*
+ * Copyright (c) 2017 Pantheon Technologies s.r.o. and others. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
 package org.opendaylight.openflowjava.protocol.impl.clients;
 
 import java.util.ArrayList;
similarity index 89%
rename from openflowjava/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/Step.java
rename to samples/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/Step.java
index d3c230b7681b7d3250d9c02452c3f1b6a1f18a5a..e581c92af7664b5c4ce208eaed2e4b12cdd0e087 100644 (file)
@@ -1,4 +1,10 @@
-
+/*
+ * Copyright (c) 2017 Pantheon Technologies s.r.o. and others. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
 package org.opendaylight.openflowjava.protocol.impl.clients;
 
 import java.util.ArrayList;
index 4b701ee32507d5175fe587353843c278b2d762d7..b73fb5cb09fab952fc0287ca76dad5da6deb70a6 100644 (file)
@@ -37,7 +37,7 @@
             <artifactId>model-inventory</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.openflowjava</groupId>
+            <groupId>${project.groupId}.openflowjava</groupId>
             <artifactId>openflowjava-util</artifactId>
         </dependency>
         <dependency>