Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Fixed for bug 1197"
[controller.git]
/
opendaylight
/
distribution
/
opendaylight
/
src
/
assemble
/
bin.xml
diff --git
a/opendaylight/distribution/opendaylight/src/assemble/bin.xml
b/opendaylight/distribution/opendaylight/src/assemble/bin.xml
index 1e8f34e5b772cd845d3361fffdf71432a2c00958..e5fc98a8639b88ceacb0c134631c32010c904ded 100644
(file)
--- a/
opendaylight/distribution/opendaylight/src/assemble/bin.xml
+++ b/
opendaylight/distribution/opendaylight/src/assemble/bin.xml
@@
-24,9
+24,9
@@
<exclude>ch.qos.logback:logback-core</exclude>
<exclude>ch.qos.logback:logback-classic</exclude>
<exclude>com.sun.jersey:jersey-core</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.opendaylight.controller:logging.bridge</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}
</excludes>
<outputFileNameMapping>
${artifact.groupId}.${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}
@@
-51,7
+51,6
@@
<include>ch.qos.logback:logback-core</include>
<include>ch.qos.logback:logback-classic</include>
<include>com.sun.jersey:jersey-core</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.opendaylight.controller:logging.bridge</include>
</includes>
<include>com.sun.jersey:jersey-server</include>
<include>org.opendaylight.controller:logging.bridge</include>
</includes>
@@
-70,11
+69,19
@@
</directory>
<excludes>
<exclude>version.properties</exclude>
</directory>
<excludes>
<exclude>version.properties</exclude>
+ <exclude>configuration/config.ini</exclude>
</excludes>
<outputDirectory>
opendaylight/
</outputDirectory>
</fileSet>
</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>
</fileSets>
<files>
<file>
@@
-82,5
+89,10
@@
<outputDirectory>opendaylight</outputDirectory>
<filtered>true</filtered>
</file>
<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>
</files>
</assembly>