From 2e5fefe4f1833e5209a4a0ecf2e4e245b1b89e3b Mon Sep 17 00:00:00 2001
From: Ed Warnicke <eaw@cisco.com>
Date: Tue, 9 Dec 2014 08:49:04 -0600
Subject: [PATCH] Introducing karaf-parent (and also group karaf things)

This patch introduces karaf-parent (to ease in the making
of karaf distributions) and moves all the karaf things into
a common directory.

Change-Id: I75e58d92a06104274eff3c71e3c6de4db2e29e47
Signed-off-by: Ed Warnicke <eaw@cisco.com>
---
 .../karaf-branding/.gitignore                 |   0
 .../karaf-branding/pom.xml                    |   0
 .../apache/karaf/branding/branding.properties |   0
 karaf/karaf-parent/pom.xml                    | 344 ++++++++++++++++++
 .../opendaylight-karaf-empty/pom.xml          |   2 +-
 .../opendaylight-karaf-resources/pom.xml      |  24 +-
 .../assembly/etc/org.ops4j.pax.url.mvn.cfg    | 106 ++++++
 .../src/main/resources/bin/instance           |   0
 .../src/main/resources/bin/instance.bat       |   0
 .../src/main/resources/bin/karaf              |   0
 .../src/main/resources/bin/karaf.bat          |   0
 .../src/main/resources/bin/setenv             |   0
 .../src/main/resources/bin/setenv.bat         |   0
 .../main/resources/configuration/context.xml  |   0
 .../main/resources/configuration/logback.xml  |   0
 .../configuration/tomcat-logging.properties   |   0
 .../resources/configuration/tomcat-server.xml |   0
 .../src/main/resources/etc/custom.properties  |   0
 .../src/main/resources/version.properties     |   0
 .../opendaylight-karaf/pom.xml                |   2 +-
 karaf/pom.xml                                 |  28 ++
 pom.xml                                       |   5 +-
 22 files changed, 504 insertions(+), 7 deletions(-)
 rename {opendaylight => karaf}/karaf-branding/.gitignore (100%)
 rename {opendaylight => karaf}/karaf-branding/pom.xml (100%)
 rename {opendaylight => karaf}/karaf-branding/src/main/resources/org/apache/karaf/branding/branding.properties (100%)
 create mode 100644 karaf/karaf-parent/pom.xml
 rename {opendaylight/distribution => karaf}/opendaylight-karaf-empty/pom.xml (99%)
 rename {opendaylight/distribution => karaf}/opendaylight-karaf-resources/pom.xml (72%)
 create mode 100644 karaf/opendaylight-karaf-resources/src/main/assembly/etc/org.ops4j.pax.url.mvn.cfg
 rename {opendaylight/distribution => karaf}/opendaylight-karaf-resources/src/main/resources/bin/instance (100%)
 rename {opendaylight/distribution => karaf}/opendaylight-karaf-resources/src/main/resources/bin/instance.bat (100%)
 rename {opendaylight/distribution => karaf}/opendaylight-karaf-resources/src/main/resources/bin/karaf (100%)
 rename {opendaylight/distribution => karaf}/opendaylight-karaf-resources/src/main/resources/bin/karaf.bat (100%)
 rename {opendaylight/distribution => karaf}/opendaylight-karaf-resources/src/main/resources/bin/setenv (100%)
 rename {opendaylight/distribution => karaf}/opendaylight-karaf-resources/src/main/resources/bin/setenv.bat (100%)
 rename {opendaylight/distribution => karaf}/opendaylight-karaf-resources/src/main/resources/configuration/context.xml (100%)
 rename {opendaylight/distribution => karaf}/opendaylight-karaf-resources/src/main/resources/configuration/logback.xml (100%)
 rename {opendaylight/distribution => karaf}/opendaylight-karaf-resources/src/main/resources/configuration/tomcat-logging.properties (100%)
 rename {opendaylight/distribution => karaf}/opendaylight-karaf-resources/src/main/resources/configuration/tomcat-server.xml (100%)
 rename {opendaylight/distribution => karaf}/opendaylight-karaf-resources/src/main/resources/etc/custom.properties (100%)
 rename {opendaylight/distribution => karaf}/opendaylight-karaf-resources/src/main/resources/version.properties (100%)
 rename {opendaylight/distribution => karaf}/opendaylight-karaf/pom.xml (99%)
 create mode 100644 karaf/pom.xml

diff --git a/opendaylight/karaf-branding/.gitignore b/karaf/karaf-branding/.gitignore
similarity index 100%
rename from opendaylight/karaf-branding/.gitignore
rename to karaf/karaf-branding/.gitignore
diff --git a/opendaylight/karaf-branding/pom.xml b/karaf/karaf-branding/pom.xml
similarity index 100%
rename from opendaylight/karaf-branding/pom.xml
rename to karaf/karaf-branding/pom.xml
diff --git a/opendaylight/karaf-branding/src/main/resources/org/apache/karaf/branding/branding.properties b/karaf/karaf-branding/src/main/resources/org/apache/karaf/branding/branding.properties
similarity index 100%
rename from opendaylight/karaf-branding/src/main/resources/org/apache/karaf/branding/branding.properties
rename to karaf/karaf-branding/src/main/resources/org/apache/karaf/branding/branding.properties
diff --git a/karaf/karaf-parent/pom.xml b/karaf/karaf-parent/pom.xml
new file mode 100644
index 0000000000..c8784a880d
--- /dev/null
+++ b/karaf/karaf-parent/pom.xml
@@ -0,0 +1,344 @@
+<?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">
+  <parent>
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>odlparent</artifactId>
+    <version>1.5.0-SNAPSHOT</version>
+    <relativePath/>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.opendaylight.controller</groupId>
+  <artifactId>karaf-parent</artifactId>
+  <name>${project.artifactId}</name>
+  <packaging>pom</packaging>
+  <prerequisites>
+    <maven>3.1.1</maven>
+  </prerequisites>
+  <properties>
+    <branding.version>1.1.0-SNAPSHOT</branding.version>
+    <karaf.resources.version>1.5.0-SNAPSHOT</karaf.resources.version>
+  </properties>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <!-- scope is compile so all features (there is only one) are installed
+        into startup.properties and the feature repo itself is not installed -->
+        <groupId>org.apache.karaf.features</groupId>
+        <artifactId>framework</artifactId>
+        <version>${karaf.version}</version>
+        <type>kar</type>
+        <exclusions>
+          <exclusion>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.apache.sshd</groupId>
+            <artifactId>sshd-core</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+  <dependencies>
+    <!-- ODL Branding -->
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>karaf.branding</artifactId>
+      <version>${branding.version}</version>
+      <scope>compile</scope>
+    </dependency>
+
+    <!-- Resources needed -->
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>opendaylight-karaf-resources</artifactId>
+      <version>${karaf.resources.version}</version>
+    </dependency>
+  </dependencies>
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.eclipse.m2e</groupId>
+          <artifactId>lifecycle-mapping</artifactId>
+          <version>1.0.0</version>
+          <configuration>
+            <lifecycleMappingMetadata>
+              <pluginExecutions>
+                <pluginExecution>
+                  <pluginExecutionFilter>
+                    <groupId>org.apache.felix</groupId>
+                    <artifactId>maven-bundle-plugin</artifactId>
+                    <versionRange>[0,)</versionRange>
+                    <goals>
+                      <goal>cleanVersions</goal>
+                    </goals>
+                  </pluginExecutionFilter>
+                  <action>
+                    <ignore></ignore>
+                  </action>
+                </pluginExecution>
+                <pluginExecution>
+                  <pluginExecutionFilter>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-dependency-plugin</artifactId>
+                    <versionRange>[0,)</versionRange>
+                    <goals>
+                      <goal>copy</goal>
+                      <goal>unpack</goal>
+                    </goals>
+                  </pluginExecutionFilter>
+                  <action>
+                    <ignore></ignore>
+                  </action>
+                </pluginExecution>
+                <pluginExecution>
+                  <pluginExecutionFilter>
+                    <groupId>org.apache.karaf.tooling</groupId>
+                    <artifactId>karaf-maven-plugin</artifactId>
+                    <versionRange>[0,)</versionRange>
+                    <goals>
+                      <goal>commands-generate-help</goal>
+                      <goal>features-add-to-repository</goal>
+                      <goal>install-kars</goal>
+                    </goals>
+                  </pluginExecutionFilter>
+                  <action>
+                    <ignore></ignore>
+                  </action>
+                </pluginExecution>
+                <pluginExecution>
+                  <pluginExecutionFilter>
+                    <groupId>org.fusesource.scalate</groupId>
+                    <artifactId>maven-scalate-plugin</artifactId>
+                    <versionRange>[0,)</versionRange>
+                    <goals>
+                      <goal>sitegen</goal>
+                    </goals>
+                  </pluginExecutionFilter>
+                  <action>
+                    <ignore></ignore>
+                  </action>
+                </pluginExecution>
+                <pluginExecution>
+                  <pluginExecutionFilter>
+                    <groupId>org.apache.servicemix.tooling</groupId>
+                    <artifactId>depends-maven-plugin</artifactId>
+                    <versionRange>[0,)</versionRange>
+                    <goals>
+                      <goal>generate-depends-file</goal>
+                    </goals>
+                  </pluginExecutionFilter>
+                  <action>
+                    <ignore></ignore>
+                  </action>
+                </pluginExecution>
+              </pluginExecutions>
+            </lifecycleMappingMetadata>
+          </configuration>
+        </plugin>
+
+        <plugin>
+          <artifactId>maven-resources-plugin</artifactId>
+          <executions>
+            <execution>
+              <id>copy-resources</id>
+              <!-- here the phase you need -->
+              <phase>prepare-package</phase>
+              <goals>
+                <goal>copy-resources</goal>
+              </goals>
+              <configuration>
+                <outputDirectory>${basedir}/target/assembly</outputDirectory>
+                <resources>
+                  <resource>
+                    <directory>src/main/assembly</directory>
+                  </resource>
+                </resources>
+                <overwrite>true</overwrite>
+              </configuration>
+            </execution>
+          </executions>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.karaf.tooling</groupId>
+          <artifactId>karaf-maven-plugin</artifactId>
+          <version>${karaf.version}</version>
+          <extensions>true</extensions>
+          <configuration>
+            <!-- no startupFeatures -->
+            <bootFeatures>
+              <feature>standard</feature>
+            </bootFeatures>
+            <!-- no installedFeatures -->
+          </configuration>
+          <executions>
+            <execution>
+              <id>populate-system</id>
+              <phase>generate-resources</phase>
+              <goals>
+                <goal>features-add-to-repository</goal>
+              </goals>
+              <configuration>
+                <descriptors>
+                  <descriptor>mvn:org.apache.karaf.features/standard/${karaf.version}/xml/features</descriptor>
+                </descriptors>
+                <features>
+                  <feature>standard</feature>
+                  <feature>config</feature>
+                  <feature>package</feature>
+                  <feature>kar</feature>
+                  <feature>ssh</feature>
+                  <feature>management</feature>
+                  <feature>war</feature>
+                </features>
+                <repository>target/assembly/system</repository>
+              </configuration>
+            </execution>
+            <execution>
+              <id>process-resources</id>
+              <goals>
+                <goal>install-kars</goal>
+              </goals>
+              <phase>process-resources</phase>
+            </execution>
+            <execution>
+              <id>package</id>
+              <goals>
+                <goal>instance-create-archive</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-checkstyle-plugin</artifactId>
+          <version>${checkstyle.version}</version>
+          <configuration>
+            <excludes>**\/target\/,**\/bin\/,**\/target-ide\/,**\/configuration\/initial\/</excludes>
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-dependency-plugin</artifactId>
+          <executions>
+            <execution>
+              <id>copy</id>
+              <goals>
+                <goal>copy</goal>
+              </goals>
+              <!-- here the phase you need -->
+              <phase>generate-resources</phase>
+              <configuration>
+                <artifactItems>
+                  <artifactItem>
+                    <groupId>org.opendaylight.controller</groupId>
+                    <artifactId>karaf.branding</artifactId>
+                    <version>${karaf.branding.version}</version>
+                    <outputDirectory>target/assembly/lib</outputDirectory>
+                    <destFileName>karaf.branding-${branding.version}.jar</destFileName>
+                  </artifactItem>
+                </artifactItems>
+              </configuration>
+            </execution>
+            <execution>
+              <id>unpack-karaf-resources</id>
+              <goals>
+                <goal>unpack-dependencies</goal>
+              </goals>
+              <phase>prepare-package</phase>
+              <configuration>
+                <outputDirectory>${project.build.directory}/assembly</outputDirectory>
+                <groupId>org.opendaylight.controller</groupId>
+                <includeArtifactIds>opendaylight-karaf-resources</includeArtifactIds>
+                <excludes>META-INF\/**</excludes>
+                <excludeTransitive>true</excludeTransitive>
+                <ignorePermissions>false</ignorePermissions>
+              </configuration>
+            </execution>
+            <execution>
+              <id>org.ops4j.pax.url.mvn.cfg</id>
+              <goals>
+                <goal>copy</goal>
+              </goals>
+              <phase>prepare-package</phase>
+              <configuration>
+                <artifactItems>
+                  <artifactItem>
+                    <groupId>org.opendaylight.controller</groupId>
+                    <artifactId>opendaylight-karaf-resources</artifactId>
+                    <type>properties</type>
+                    <classifier>config</classifier>
+                    <overWrite>true</overWrite>
+                    <outputDirectory>${project.build.directory}/assembly/etc/</outputDirectory>
+                    <destFileName>org.ops4j.pax.url.mvn.cfg</destFileName>
+                  </artifactItem>
+                </artifactItems>
+                <overWriteReleases>true</overWriteReleases>
+                <overWriteSnapshots>true</overWriteSnapshots>
+              </configuration>
+            </execution>
+          </executions>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-antrun-plugin</artifactId>
+          <executions>
+            <execution>
+              <phase>prepare-package</phase>
+              <goals>
+                <goal>run</goal>
+              </goals>
+              <configuration>
+                <tasks>
+                  <chmod perm="755">
+                    <fileset dir="${project.build.directory}/assembly/bin">
+                      <include name="karaf"/>
+                      <include name="instance"/>
+                      <include name="start"/>
+                      <include name="stop"/>
+                      <include name="status"/>
+                      <include name="client"/>
+                      <include name="shell"/>
+                    </fileset>
+                  </chmod>
+                </tasks>
+              </configuration>
+            </execution>
+          </executions>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+    <plugins>
+      <plugin>
+        <artifactId>maven-resources-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.karaf.tooling</groupId>
+        <artifactId>karaf-maven-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-checkstyle-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>
diff --git a/opendaylight/distribution/opendaylight-karaf-empty/pom.xml b/karaf/opendaylight-karaf-empty/pom.xml
similarity index 99%
rename from opendaylight/distribution/opendaylight-karaf-empty/pom.xml
rename to karaf/opendaylight-karaf-empty/pom.xml
index a66a502a70..a13023cbee 100644
--- a/opendaylight/distribution/opendaylight-karaf-empty/pom.xml
+++ b/karaf/opendaylight-karaf-empty/pom.xml
@@ -5,7 +5,7 @@
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
     <version>1.5.0-SNAPSHOT</version>
-    <relativePath>../../commons/opendaylight</relativePath>
+    <relativePath>../../opendaylight/commons/opendaylight</relativePath>
   </parent>
   <artifactId>opendaylight-karaf-empty</artifactId>
   <packaging>pom</packaging>
diff --git a/opendaylight/distribution/opendaylight-karaf-resources/pom.xml b/karaf/opendaylight-karaf-resources/pom.xml
similarity index 72%
rename from opendaylight/distribution/opendaylight-karaf-resources/pom.xml
rename to karaf/opendaylight-karaf-resources/pom.xml
index 35aac09339..0b2b8eff1f 100644
--- a/opendaylight/distribution/opendaylight-karaf-resources/pom.xml
+++ b/karaf/opendaylight-karaf-resources/pom.xml
@@ -13,7 +13,7 @@
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
     <version>1.5.0-SNAPSHOT</version>
-    <relativePath>../../commons/opendaylight</relativePath>
+    <relativePath>../../opendaylight/commons/opendaylight</relativePath>
   </parent>
   <artifactId>opendaylight-karaf-resources</artifactId>
   <description>Resources for opendaylight-karaf</description>
@@ -47,6 +47,28 @@
           </execution>
         </executions>
       </plugin>
+      <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>src/main/assembly/etc/org.ops4j.pax.url.mvn.cfg</file>
+                  <type>properties</type>
+                  <classifier>config</classifier>
+                </artifact>
+              </artifacts>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/karaf/opendaylight-karaf-resources/src/main/assembly/etc/org.ops4j.pax.url.mvn.cfg b/karaf/opendaylight-karaf-resources/src/main/assembly/etc/org.ops4j.pax.url.mvn.cfg
new file mode 100644
index 0000000000..9ee45e4dc4
--- /dev/null
+++ b/karaf/opendaylight-karaf-resources/src/main/assembly/etc/org.ops4j.pax.url.mvn.cfg
@@ -0,0 +1,106 @@
+################################################################################
+#
+#    Licensed to the Apache Software Foundation (ASF) under one or more
+#    contributor license agreements.  See the NOTICE file distributed with
+#    this work for additional information regarding copyright ownership.
+#    The ASF licenses this file to You under the Apache License, Version 2.0
+#    (the "License"); you may not use this file except in compliance with
+#    the License.  You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+################################################################################
+
+#
+# If set to true, the following property will not allow any certificate to be used
+# when accessing Maven repositories through SSL
+#
+#org.ops4j.pax.url.mvn.certificateCheck=
+
+#
+# Path to the local Maven settings file.
+# The repositories defined in this file will be automatically added to the list
+# of default repositories if the 'org.ops4j.pax.url.mvn.repositories' property
+# below is not set.
+# The following locations are checked for the existence of the settings.xml file
+#   * 1. looks for the specified url
+#   * 2. if not found looks for ${user.home}/.m2/settings.xml
+#   * 3. if not found looks for ${maven.home}/conf/settings.xml
+#   * 4. if not found looks for ${M2_HOME}/conf/settings.xml
+#
+#org.ops4j.pax.url.mvn.settings=
+
+#
+# Path to the local Maven repository which is used to avoid downloading
+# artifacts when they already exist locally.
+# The value of this property will be extracted from the settings.xml file
+# above, or defaulted to:
+#     System.getProperty( "user.home" ) + "/.m2/repository"
+#
+org.ops4j.pax.url.mvn.localRepository=${karaf.home}/${karaf.default.repository}
+
+#
+# Default this to false. It's just weird to use undocumented repos
+#
+org.ops4j.pax.url.mvn.useFallbackRepositories=false
+
+#
+# Uncomment if you don't wanna use the proxy settings
+# from the Maven conf/settings.xml file
+#
+# org.ops4j.pax.url.mvn.proxySupport=false
+
+#
+# Disable aether support by default.  This ensure that the defaultRepositories
+# below will be used
+#
+#org.ops4j.pax.url.mvn.disableAether=true
+
+#
+# Comma separated list of repositories scanned when resolving an artifact.
+# Those repositories will be checked before iterating through the
+#    below list of repositories and even before the local repository
+# A repository url can be appended with zero or more of the following flags:
+#    @snapshots  : the repository contains snaphots
+#    @noreleases : the repository does not contain any released artifacts
+#
+# The following property value will add the system folder as a repo.
+#
+#org.ops4j.pax.url.mvn.defaultRepositories=
+
+# Use the default local repo (e.g.~/.m2/repository) as a "remote" repo
+org.ops4j.pax.url.mvn.defaultLocalRepoAsRemote=false
+
+#
+# Comma separated list of repositories scanned when resolving an artifact.
+# The default list includes the following repositories containing releases:
+#    http://repo1.maven.org/maven2
+#    http://repository.apache.org/content/groups/snapshots-group
+#    http://svn.apache.org/repos/asf/servicemix/m2-repo
+#    http://repository.springsource.com/maven/bundles/release
+#    http://repository.springsource.com/maven/bundles/external
+# To add repositories to the default ones, prepend '+' to the list of repositories
+# to add.
+# A repository url can be appended with zero or more of the following flags:
+#    @snapshots  : the repository contains snaphots
+#    @noreleases : the repository does not contain any released artifacts
+#    @id=reponid : the id for the repository, just like in the settings.xml this is optional but recomendet 
+#
+# The default list doesn't contain any repository containing snapshots as it can impact the artifacts resolution.
+# You may want to add the following repositories containing snapshots:
+#    http://repository.apache.org/content/groups/snapshots-group@id=apache@snapshots@noreleases
+#    http://oss.sonatype.org/content/repositories/snapshots@id=sonatype.snapshots.deploy@snapshots@norelease
+#    http://oss.sonatype.org/content/repositories/ops4j-snapshots@id=ops4j.sonatype.snapshots.deploy@snapshots@noreleases
+#
+org.ops4j.pax.url.mvn.repositories= \
+	file:${karaf.home}/${karaf.default.repository}@id=system.repository, \
+    file:${karaf.data}/kar@id=kar.repository@multi, \
+    http://repo1.maven.org/maven2@id=central, \
+    http://repository.springsource.com/maven/bundles/release@id=spring.ebr.release, \
+    http://repository.springsource.com/maven/bundles/external@id=spring.ebr.external
diff --git a/opendaylight/distribution/opendaylight-karaf-resources/src/main/resources/bin/instance b/karaf/opendaylight-karaf-resources/src/main/resources/bin/instance
similarity index 100%
rename from opendaylight/distribution/opendaylight-karaf-resources/src/main/resources/bin/instance
rename to karaf/opendaylight-karaf-resources/src/main/resources/bin/instance
diff --git a/opendaylight/distribution/opendaylight-karaf-resources/src/main/resources/bin/instance.bat b/karaf/opendaylight-karaf-resources/src/main/resources/bin/instance.bat
similarity index 100%
rename from opendaylight/distribution/opendaylight-karaf-resources/src/main/resources/bin/instance.bat
rename to karaf/opendaylight-karaf-resources/src/main/resources/bin/instance.bat
diff --git a/opendaylight/distribution/opendaylight-karaf-resources/src/main/resources/bin/karaf b/karaf/opendaylight-karaf-resources/src/main/resources/bin/karaf
similarity index 100%
rename from opendaylight/distribution/opendaylight-karaf-resources/src/main/resources/bin/karaf
rename to karaf/opendaylight-karaf-resources/src/main/resources/bin/karaf
diff --git a/opendaylight/distribution/opendaylight-karaf-resources/src/main/resources/bin/karaf.bat b/karaf/opendaylight-karaf-resources/src/main/resources/bin/karaf.bat
similarity index 100%
rename from opendaylight/distribution/opendaylight-karaf-resources/src/main/resources/bin/karaf.bat
rename to karaf/opendaylight-karaf-resources/src/main/resources/bin/karaf.bat
diff --git a/opendaylight/distribution/opendaylight-karaf-resources/src/main/resources/bin/setenv b/karaf/opendaylight-karaf-resources/src/main/resources/bin/setenv
similarity index 100%
rename from opendaylight/distribution/opendaylight-karaf-resources/src/main/resources/bin/setenv
rename to karaf/opendaylight-karaf-resources/src/main/resources/bin/setenv
diff --git a/opendaylight/distribution/opendaylight-karaf-resources/src/main/resources/bin/setenv.bat b/karaf/opendaylight-karaf-resources/src/main/resources/bin/setenv.bat
similarity index 100%
rename from opendaylight/distribution/opendaylight-karaf-resources/src/main/resources/bin/setenv.bat
rename to karaf/opendaylight-karaf-resources/src/main/resources/bin/setenv.bat
diff --git a/opendaylight/distribution/opendaylight-karaf-resources/src/main/resources/configuration/context.xml b/karaf/opendaylight-karaf-resources/src/main/resources/configuration/context.xml
similarity index 100%
rename from opendaylight/distribution/opendaylight-karaf-resources/src/main/resources/configuration/context.xml
rename to karaf/opendaylight-karaf-resources/src/main/resources/configuration/context.xml
diff --git a/opendaylight/distribution/opendaylight-karaf-resources/src/main/resources/configuration/logback.xml b/karaf/opendaylight-karaf-resources/src/main/resources/configuration/logback.xml
similarity index 100%
rename from opendaylight/distribution/opendaylight-karaf-resources/src/main/resources/configuration/logback.xml
rename to karaf/opendaylight-karaf-resources/src/main/resources/configuration/logback.xml
diff --git a/opendaylight/distribution/opendaylight-karaf-resources/src/main/resources/configuration/tomcat-logging.properties b/karaf/opendaylight-karaf-resources/src/main/resources/configuration/tomcat-logging.properties
similarity index 100%
rename from opendaylight/distribution/opendaylight-karaf-resources/src/main/resources/configuration/tomcat-logging.properties
rename to karaf/opendaylight-karaf-resources/src/main/resources/configuration/tomcat-logging.properties
diff --git a/opendaylight/distribution/opendaylight-karaf-resources/src/main/resources/configuration/tomcat-server.xml b/karaf/opendaylight-karaf-resources/src/main/resources/configuration/tomcat-server.xml
similarity index 100%
rename from opendaylight/distribution/opendaylight-karaf-resources/src/main/resources/configuration/tomcat-server.xml
rename to karaf/opendaylight-karaf-resources/src/main/resources/configuration/tomcat-server.xml
diff --git a/opendaylight/distribution/opendaylight-karaf-resources/src/main/resources/etc/custom.properties b/karaf/opendaylight-karaf-resources/src/main/resources/etc/custom.properties
similarity index 100%
rename from opendaylight/distribution/opendaylight-karaf-resources/src/main/resources/etc/custom.properties
rename to karaf/opendaylight-karaf-resources/src/main/resources/etc/custom.properties
diff --git a/opendaylight/distribution/opendaylight-karaf-resources/src/main/resources/version.properties b/karaf/opendaylight-karaf-resources/src/main/resources/version.properties
similarity index 100%
rename from opendaylight/distribution/opendaylight-karaf-resources/src/main/resources/version.properties
rename to karaf/opendaylight-karaf-resources/src/main/resources/version.properties
diff --git a/opendaylight/distribution/opendaylight-karaf/pom.xml b/karaf/opendaylight-karaf/pom.xml
similarity index 99%
rename from opendaylight/distribution/opendaylight-karaf/pom.xml
rename to karaf/opendaylight-karaf/pom.xml
index 4c8f9c5913..e0ea4c0edf 100644
--- a/opendaylight/distribution/opendaylight-karaf/pom.xml
+++ b/karaf/opendaylight-karaf/pom.xml
@@ -5,7 +5,7 @@
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
     <version>1.5.0-SNAPSHOT</version>
-    <relativePath>../../commons/opendaylight</relativePath>
+    <relativePath>../../opendaylight/commons/opendaylight</relativePath>
   </parent>
   <artifactId>distribution.opendaylight-karaf</artifactId>
   <packaging>pom</packaging>
diff --git a/karaf/pom.xml b/karaf/pom.xml
new file mode 100644
index 0000000000..1d37ae1b04
--- /dev/null
+++ b/karaf/pom.xml
@@ -0,0 +1,28 @@
+<?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.controller</groupId>
+    <artifactId>commons.parent</artifactId>
+    <version>1.1.0-SNAPSHOT</version>
+    <relativePath>../opendaylight/commons/parent</relativePath>
+  </parent>
+
+  <artifactId>karaf-aggregator</artifactId>
+  <packaging>pom</packaging>
+  <modules>
+    <module>karaf-branding</module>
+    <module>karaf-parent</module>
+    <module>opendaylight-karaf</module>
+    <module>opendaylight-karaf-empty</module>
+    <module>opendaylight-karaf-resources</module>
+  </modules>
+</project>
diff --git a/pom.xml b/pom.xml
index 3bfffaa5d4..1217d72066 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,10 +45,7 @@
     <module>opendaylight/commons/liblldp</module>
 
     <!-- Karaf Distribution -->
-    <module>opendaylight/karaf-branding</module>
-    <module>opendaylight/distribution/opendaylight-karaf-empty</module>
-    <module>opendaylight/distribution/opendaylight-karaf</module>
-    <module>opendaylight/distribution/opendaylight-karaf-resources</module>
+    <module>karaf</module>
     <module>features</module>
 
     <!-- archetypes -->
-- 
2.36.6