X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fdistribution%2Fopendaylight%2Fsrc%2Fassemble%2Fbin.xml;h=e5fc98a8639b88ceacb0c134631c32010c904ded;hp=8be21f6450735266c4092ffa054ef3e18c021d66;hb=17d82f582a6bc13c78be3b19954ff8c021180e93;hpb=9c8108faabf300747a2a5529dc7a8ef76e79c2bc

diff --git a/opendaylight/distribution/opendaylight/src/assemble/bin.xml b/opendaylight/distribution/opendaylight/src/assemble/bin.xml
index 8be21f6450..e5fc98a863 100644
--- a/opendaylight/distribution/opendaylight/src/assemble/bin.xml
+++ b/opendaylight/distribution/opendaylight/src/assemble/bin.xml
@@ -1,46 +1,12 @@
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" 
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
   <id>osgipackage</id>
   <formats>
     <format>dir</format>
     <format>zip</format>
   </formats>
   <includeBaseDirectory>false</includeBaseDirectory>
-  <moduleSets>
-    <moduleSet>
-      <excludes>
-        <exclude>org.opendaylight.controller.thirdparty:org.openflow.openflowj</exclude>
-        <exclude>org.opendaylight.controller:clustering.stub</exclude>
-		<exclude>org.opendaylight.controller:logging.bridge</exclude>
-		<exclude>org.opendaylight.controller:protocol_plugins.stub</exclude>
-		<exclude>org.opendaylight.controller:*.integrationtest</exclude>
-        <exclude>org.opendaylight.controller:hosttracker_new</exclude>
-        <exclude>org.opendaylight.controller:hosttracker_new.implementation</exclude>
-      </excludes>
-      <binaries>
-        <outputDirectory>opendaylight/plugins</outputDirectory>
-        <outputFileNameMapping>
-          ${module.groupId}.${module.artifactId}-${module.version}${dashClassifier?}.${module.extension}
-        </outputFileNameMapping>
-        <unpack>false</unpack>
-        <includeDependencies>false</includeDependencies>
-      </binaries>
-    </moduleSet>
-	<moduleSet>
-	  <includes>
-		<include>org.opendaylight.controller:logging.bridge</include>
-	  </includes>
-	  <binaries>
-		<outputDirectory>opendaylight/lib</outputDirectory>
-		<outputFileNameMapping>
-		  ${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}
-		</outputFileNameMapping>
-		<unpack>false</unpack>
-		<includeDependencies>false</includeDependencies>
-	  </binaries>
-	</moduleSet>
-  </moduleSets>
   <dependencySets>
     <dependencySet>
       <outputDirectory>opendaylight/plugins</outputDirectory>
@@ -54,15 +20,16 @@
         <exclude>virgomirror:org.eclipse.jdt.core.compiler.batch</exclude>
         <exclude>org.apache.felix:org.apache.felix.fileinstall</exclude>
         <exclude>geminiweb:org.eclipse.virgo.kernel.equinox.extensions</exclude>
-		<exclude>org.slf4j:slf4j-api</exclude>
-		<exclude>ch.qos.logback:logback-core</exclude>
-		<exclude>ch.qos.logback:logback-classic</exclude>
-		<exclude>com.sun.jersey:jersey-core</exclude>
-		<exclude>com.sun.jersey:jersey-json</exclude>
-		<exclude>com.sun.jersey:jersey-server</exclude>
+        <exclude>org.slf4j:slf4j-api</exclude>
+        <exclude>ch.qos.logback:logback-core</exclude>
+        <exclude>ch.qos.logback:logback-classic</exclude>
+        <exclude>com.sun.jersey:jersey-core</exclude>
+        <exclude>com.sun.jersey:jersey-server</exclude>
+        <exclude>org.opendaylight.controller:logging.bridge</exclude>
+        <exclude>org.opendaylight.controller:sanitytest</exclude>
       </excludes>
       <outputFileNameMapping>
-        ${artifact.groupId}.${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}      
+        ${artifact.groupId}.${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}
       </outputFileNameMapping>
       <unpack>false</unpack>
       <scope>runtime</scope>
@@ -80,16 +47,16 @@
         <include>virgomirror:org.eclipse.jdt.core.compiler.batch</include>
         <include>org.apache.felix:org.apache.felix.fileinstall</include>
         <include>geminiweb:org.eclipse.virgo.kernel.equinox.extensions</include>
-		<include>org.slf4j:slf4j-api</include>
-		<include>ch.qos.logback:logback-core</include>
-		<include>ch.qos.logback:logback-classic</include>
-		<include>com.sun.jersey:jersey-core</include>
-		<include>com.sun.jersey:jersey-json</include>
-		<include>com.sun.jersey:jersey-server</include>
+        <include>org.slf4j:slf4j-api</include>
+        <include>ch.qos.logback:logback-core</include>
+        <include>ch.qos.logback:logback-classic</include>
+        <include>com.sun.jersey:jersey-core</include>
+        <include>com.sun.jersey:jersey-server</include>
+        <include>org.opendaylight.controller:logging.bridge</include>
       </includes>
       <useTransitiveDependencies>false</useTransitiveDependencies>
       <outputFileNameMapping>
-        ${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}      
+        ${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}
       </outputFileNameMapping>
       <unpack>false</unpack>
       <scope>runtime</scope>
@@ -102,11 +69,19 @@
       </directory>
       <excludes>
         <exclude>version.properties</exclude>
+        <exclude>configuration/config.ini</exclude>
       </excludes>
       <outputDirectory>
         opendaylight/
       </outputDirectory>
     </fileSet>
+    <fileSet>
+      <directory>${project.build.directory}/configuration/initial</directory>
+      <outputDirectory>/opendaylight/configuration/initial</outputDirectory>
+      <excludes>
+        <exclude>**/META-INF/**</exclude>
+      </excludes>
+    </fileSet>
   </fileSets>
   <files>
     <file>
@@ -114,5 +89,10 @@
       <outputDirectory>opendaylight</outputDirectory>
       <filtered>true</filtered>
     </file>
+      <file>
+        <source>src/main/resources/configuration/config.ini</source>
+        <outputDirectory>opendaylight/configuration</outputDirectory>
+        <filtered>true</filtered>
+      </file>
   </files>
 </assembly>