Adding karaf files to project.

These changes allow the project to be built and tested using karaf locally
in the distribution/karaf directory (mvn clean install, followed by cd to
target/assmbly/bin and running ./karaf).

Change-Id: I0717f9cbdab46d7973f8c861fcb3916394352f84
Signed-off-by: Thomas Bachman <tbachman@yahoo.com>

diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml
index ca84b64455087fe74dc218dcc7d52d5d8500204a..fe2e16735ba60f719e8ae7610b16d9c83b6d6671 100644 (file)
--- a/commons/parent/pom.xml
+++ b/commons/parent/pom.xml
@@ -21,6 +21,8 @@
     <controller.distribution.version>0.1.2-SNAPSHOT</controller.distribution.version>
     <openflowplugin.distribution.version>0.0.3-SNAPSHOT</openflowplugin.distribution.version>
     <openflowjava.distribution.version>0.5-SNAPSHOT</openflowjava.distribution.version>
+    <config.configfile.directory>etc/opendaylight/karaf</config.configfile.directory>
+    <config.groupbasedpolicy.configfile>15-groupbasedpolicy-ofoverlay.xml</config.groupbasedpolicy.configfile>
   </properties>
 
   <build>

diff --git a/features/pom.xml b/features/pom.xml
new file mode 100644 (file)
index 0000000..724cc5f
--- /dev/null
+++ b/features/pom.xml
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2014 Cisco Systems, Inc. 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
+--><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>
+    <artifactId>commons.groupbasedpolicy</artifactId>
+    <groupId>org.opendaylight.groupbasedpolicy</groupId>
+    <version>0.1.0-SNAPSHOT</version>
+    <relativePath>../commons/parent</relativePath>
+  </parent>
+  <artifactId>features-groupbasedpolicy</artifactId>
+  <groupId>org.opendaylight.groupbasedpolicy</groupId>
+  <packaging>jar</packaging>
+  <properties>
+    <features.file>features.xml</features.file>
+    <branding.version>1.0.0-SNAPSHOT</branding.version>
+    <karaf.resources.version>1.4.2-SNAPSHOT</karaf.resources.version>
+    <karaf.version>3.0.1</karaf.version>
+    <feature.test.version>0.6.2-SNAPSHOT</feature.test.version>
+    <karaf.empty.version>1.4.2-SNAPSHOT</karaf.empty.version>
+    <surefire.version>2.16</surefire.version>
+  </properties>
+  <dependencies>
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>features-yangtools</artifactId>
+      <version>0.6.2-SNAPSHOT</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>features-mdsal</artifactId>
+      <version>1.1-SNAPSHOT</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.openflowplugin</groupId>
+      <artifactId>features-openflowplugin</artifactId>
+      <version>0.0.3-SNAPSHOT</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.groupbasedpolicy</groupId>
+      <artifactId>groupbasedpolicy</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>features-test</artifactId>
+      <version>${feature.test.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.groupbasedpolicy</groupId>
+      <artifactId>groupbasedpolicy-ofoverlay-config</artifactId>
+      <version>${project.version}</version>
+      <type>xml</type>
+      <classifier>config</classifier>
+    </dependency>
+
+   <!-- dependency for opendaylight-karaf-empty for use by testing -->
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>opendaylight-karaf-empty</artifactId>
+      <version>${karaf.empty.version}</version>
+      <type>zip</type>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.ovsdb</groupId>
+      <artifactId>features-openflow-nxm</artifactId>
+      <version>0.0.3-SNAPSHOT</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.openflowplugin</groupId>
+      <artifactId>features-openflowplugin</artifactId>
+      <version>0.0.3-SNAPSHOT</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.ovsdb</groupId>
+      <artifactId>features-openflow-nxm</artifactId>
+      <version>0.0.3-SNAPSHOT</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
+  </dependencies>
+  <build>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+        <filtering>true</filtering>
+      </resource>
+    </resources>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-resources-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>filter</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>resources</goal>
+            </goals>
+            </execution>
+          </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>attach-artifacts</id>
+            <phase>package</phase>
+            <goals>
+              <goal>attach-artifact</goal>
+            </goals>
+            <configuration>
+              <artifacts>
+                <artifact>
+                  <file>${project.build.directory}/classes/${features.file}</file>
+                  <type>xml</type>
+                  <classifier>features</classifier>
+                </artifact>
+              </artifacts>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>${surefire.version}</version>
+        <configuration>
+          <systemPropertyVariables>
+            <karaf.distro.groupId>org.opendaylight.controller</karaf.distro.groupId>
+            <karaf.distro.artifactId>opendaylight-karaf-empty</karaf.distro.artifactId>
+            <karaf.distro.version>${karaf.empty.version}</karaf.distro.version>
+          </systemPropertyVariables>
+          <dependenciesToScan>
+            <dependency>org.opendaylight.yangtools:features-test</dependency>
+          </dependenciesToScan>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <scm>
+    <connection>scm:git:ssh://git.opendaylight.org:29418/groupbasedpolicy.git</connection>
+    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/groupbasedpolicy.git</developerConnection>
+    <tag>HEAD</tag>
+    <url>https://git.opendaylight.org/gerrit/gitweb?p=groupbasedpolicy.git;a=summary</url>
+  </scm>
+</project>

diff --git a/features/src/main/resources/features.xml b/features/src/main/resources/features.xml
new file mode 100644 (file)
index 0000000..1cf84de
--- /dev/null
+++ b/features/src/main/resources/features.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- vi: set et smarttab sw=4 tabstop=4: -->
+<!--
+ Copyright (c) 2014 Cisco Systems, Inc. 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
+-->
+<features name="odl-groupbasedpolicy-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
+    <repository>mvn:org.opendaylight.yangtools/features-yangtools/0.6.2-SNAPSHOT/xml/features</repository>
+    <repository>mvn:org.opendaylight.controller/features-mdsal/1.1-SNAPSHOT/xml/features</repository>
+    <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin/0.0.3-SNAPSHOT/xml/features</repository>
+    <repository>mvn:org.opendaylight.ovsdb/features-openflow-nxm/0.0.3-SNAPSHOT/xml/features</repository>
+    <feature name='odl-groupbasedpolicy-ofoverlay' version='${project.version}' description='OpenDaylight :: groupbasedpolicy :: OpenFlow Overlay '>
+        <feature version="${mdsal.version}">odl-mdsal-broker</feature>
+        <feature version='0.6.2-SNAPSHOT'>odl-yangtools-binding</feature>
+        <feature version='0.6.2-SNAPSHOT'>odl-yangtools-models</feature>
+        <feature version="${openflowplugin.distribution.version}">odl-openflowplugin-flow-services</feature>
+        <feature version='0.0.3-SNAPSHOT'>odl-openflow-nxm-extensions</feature>
+        <bundle>mvn:org.opendaylight.groupbasedpolicy/groupbasedpolicy/${project.version}</bundle>
+        <bundle start="true">mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson.version}</bundle>
+        <bundle start="true">mvn:com.fasterxml.jackson.core/jackson-core/${jackson.version}</bundle>
+        <bundle start="true">mvn:com.fasterxml.jackson.core/jackson-databind/${jackson.version}</bundle>
+        <configfile finalname="${config.configfile.directory}/${config.groupbasedpolicy.configfile}">mvn:org.opendaylight.groupbasedpolicy/groupbasedpolicy-ofoverlay-config/${project.version}/xml/config</configfile>
+    </feature>
+</features>

diff --git a/groupbasedpolicy-ofoverlay-config/.gitignore b/groupbasedpolicy-ofoverlay-config/.gitignore
new file mode 100644 (file)
index 0000000..a48e45b
--- /dev/null
+++ b/groupbasedpolicy-ofoverlay-config/.gitignore
@@ -0,0 +1 @@
+/target-ide

diff --git a/groupbasedpolicy-ofoverlay-config/pom.xml b/groupbasedpolicy-ofoverlay-config/pom.xml
new file mode 100644 (file)
index 0000000..70dfcef
--- /dev/null
+++ b/groupbasedpolicy-ofoverlay-config/pom.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2014 Cisco Systems, Inc. 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
+-->
+<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.groupbasedpolicy</groupId>
+      <artifactId>commons.groupbasedpolicy</artifactId>
+      <version>0.1.0-SNAPSHOT</version>
+      <relativePath>../commons/parent</relativePath>
+    </parent>
+
+    <groupId>org.opendaylight.groupbasedpolicy</groupId>
+    <artifactId>groupbasedpolicy-ofoverlay-config</artifactId>
+    <description>Controller Configuration files for groupbasedpolicy</description>
+    <packaging>jar</packaging>
+    <build>
+      <plugins>
+          <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>build-helper-maven-plugin</artifactId>
+          <executions>
+            <execution>
+              <id>attach-artifacts</id>
+              <goals>
+                <goal>attach-artifact</goal>
+              </goals>
+              <phase>package</phase>
+              <configuration>
+                <artifacts>
+                  <artifact>
+                    <file>${project.build.directory}/classes/initial/15-groupbasedpolicy-ofoverlay.xml</file>
+                    <type>xml</type>
+                    <classifier>config</classifier>
+                  </artifact>
+                </artifacts>
+              </configuration>
+            </execution>
+          </executions>
+        </plugin>
+      </plugins>
+    </build>
+</project>

diff --git a/groupbasedpolicy-ofoverlay-config/src/main/resources/initial/15-groupbasedpolicy-ofoverlay.xml b/groupbasedpolicy-ofoverlay-config/src/main/resources/initial/15-groupbasedpolicy-ofoverlay.xml
new file mode 100644 (file)
index 0000000..2d59c5a
--- /dev/null
+++ b/groupbasedpolicy-ofoverlay-config/src/main/resources/initial/15-groupbasedpolicy-ofoverlay.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- vi: set et smarttab sw=4 tabstop=4: -->
+<!--
+ Copyright (c) 2013 Cisco Systems, Inc. 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
+-->
+<snapshot>
+    <configuration>
+        <data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
+            <modules xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
+                <module>
+                    <type xmlns:ofoverlay="urn:opendaylight:params:xml:ns:yang:controller:config:ofoverlay-provider:impl">
+                        ofoverlay:ofoverlay-provider-impl
+                    </type>
+                    <name>ofoverlay-provider-impl</name>
+
+                    <rpc-registry>
+                        <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-rpc-registry</type>
+                        <name>binding-rpc-broker</name>
+                    </rpc-registry>
+
+                    <data-broker>
+                      <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-async-data-broker</type>
+                      <name>binding-data-broker</name>
+                    </data-broker>
+                </module>
+            </modules>
+        </data>
+
+    </configuration>
+
+    <required-capabilities>
+        <capability>urn:opendaylight:params:xml:ns:yang:controller:config:ofoverlay-provider:impl?module=ofoverlay-provider-impl&amp;revision=2014-06-11</capability>
+    </required-capabilities>
+
+</snapshot>
+

diff --git a/pom.xml b/pom.xml
index 4a26a389ffc1c09eed407bd5a77648caa5f1a2f7..74872a236d4c4776597262e8244e34160bdec397 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,9 @@
   <modules>
     <module>commons/parent</module>
     <module>groupbasedpolicy</module>
+    <module>groupbasedpolicy-ofoverlay-config</module>
     <module>distribution</module>
+    <module>features</module>
   </modules>
 
   <build>