Skip to content

Commit 18d76b2

Browse files
solegersoleger
committed
Cleaned up warnings, namespaces, and default values in assemblies.
1 parent 2e1876e commit 18d76b2

File tree

36 files changed

+166
-205
lines changed

36 files changed

+166
-205
lines changed

‎container/karaf/src/assembly/karaf.xml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
<dependencySets>
1616
<dependencySet>
1717
<unpack>true</unpack>
18-
<outputDirectory>/</outputDirectory>
18+
<!-- Output to the root directory -->
19+
<outputDirectory></outputDirectory>
1920
<useProjectArtifact>false</useProjectArtifact>
2021
<useTransitiveDependencies>false</useTransitiveDependencies>
2122
<scope>provided</scope>
@@ -49,8 +50,6 @@
4950
<directory>target/filtered-resources/etc</directory>
5051
<outputDirectory>etc</outputDirectory>
5152
<lineEnding>unix</lineEnding>
52-
<fileMode>0644</fileMode>
53-
<directoryMode>0755</directoryMode>
5453
<filtered>false</filtered>
5554
</fileSet>
5655
</fileSets>
@@ -60,7 +59,6 @@
6059
<source>target/filtered-resources/features/features.xml</source>
6160
<outputDirectory>system/org/opennms/container/${project.artifactId}/${project.version}</outputDirectory>
6261
<destName>${project.groupId}.${project.artifactId}-${project.version}-features.xml</destName>
63-
<fileMode>0644</fileMode>
6462
<lineEnding>unix</lineEnding>
6563
</file>
6664
</files>

‎container/standalone/src/assembly/bin.xml

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
<!-- Expanded Karaf Standard Distribution -->
1818
<fileSet>
1919
<directory>target/dependencies/apache-karaf-${karafVersion}</directory>
20-
<outputDirectory>/</outputDirectory>
20+
<!-- Output to the root directory -->
21+
<outputDirectory></outputDirectory>
2122
<excludes>
2223

2324
<!-- Exclude demos -->
@@ -47,60 +48,55 @@
4748
<!-- Copy over bin/* separately to get the correct file mode -->
4849
<fileSet>
4950
<directory>target/dependencies/apache-karaf-${karafVersion}</directory>
50-
<outputDirectory>/</outputDirectory>
51+
<!-- Output to the root directory -->
52+
<outputDirectory></outputDirectory>
5153
<includes>
5254
<include>bin/admin</include>
5355
<include>bin/client</include>
5456
<include>bin/start</include>
5557
<include>bin/stop</include>
5658
</includes>
5759
<fileMode>0755</fileMode>
58-
<directoryMode>0755</directoryMode>
5960
</fileSet>
6061

6162
<!-- Copy over jar files -->
6263
<fileSet>
6364
<directory>src/main/distribution</directory>
64-
<outputDirectory>/</outputDirectory>
65-
<fileMode>0644</fileMode>
66-
<directoryMode>0755</directoryMode>
65+
<!-- Output to the root directory -->
66+
<outputDirectory></outputDirectory>
6767
</fileSet>
6868

6969
<fileSet>
7070
<directory>target/classes/etc</directory>
71-
<outputDirectory>/etc/</outputDirectory>
71+
<outputDirectory>etc</outputDirectory>
7272
<lineEnding>unix</lineEnding>
73-
<fileMode>0644</fileMode>
74-
<directoryMode>0755</directoryMode>
7573
</fileSet>
7674

7775
<fileSet>
7876
<directory>target/features-repo</directory>
79-
<outputDirectory>/system</outputDirectory>
77+
<outputDirectory>system</outputDirectory>
8078
</fileSet>
8179

8280
</fileSets>
8381

8482
<files>
8583
<file>
8684
<source>${basedir}/target/dependencies/apache-karaf-${karafVersion}/bin/karaf</source>
87-
<outputDirectory>/bin/</outputDirectory>
85+
<outputDirectory>bin</outputDirectory>
8886
<destName>karaf</destName>
8987
<fileMode>0755</fileMode>
9088
<lineEnding>unix</lineEnding>
9189
</file>
9290
<file>
9391
<source>${basedir}/target/classes/features.xml</source>
94-
<outputDirectory>/system/org/opennms/container/${project.groupId}.${project.artifactId}/${project.version}</outputDirectory>
92+
<outputDirectory>system/org/opennms/container/${project.groupId}.${project.artifactId}/${project.version}</outputDirectory>
9593
<destName>${project.artifactId}-${project.version}-features.xml</destName>
96-
<fileMode>0644</fileMode>
9794
<lineEnding>unix</lineEnding>
9895
</file>
9996
<file>
10097
<source>${basedir}/target/dependencies/opennms-branding.jar</source>
101-
<outputDirectory>/lib</outputDirectory>
98+
<outputDirectory>lib</outputDirectory>
10299
<destName>opennms-branding.jar</destName>
103-
<fileMode>0644</fileMode>
104100
</file>
105101
</files>
106102

‎core/schema/src/assembly/liquibase.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,11 @@
1111
<fileSets>
1212
<fileSet>
1313
<directory>src/main/liquibase</directory>
14-
<outputDirectory></outputDirectory>
14+
<!-- Output to the root directory -->
15+
<outputDirectory></outputDirectory>
1516
<includes>
1617
<include>**/*.xml</include>
1718
</includes>
18-
<fileMode>0644</fileMode>
19-
<directoryMode>0755</directoryMode>
2019
</fileSet>
2120
</fileSets>
2221
</assembly>

‎features/ncs/ncs-alarm-gui/src/assembly/jsps.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,12 @@
1010
<includeBaseDirectory>false</includeBaseDirectory>
1111
<fileSets>
1212
<fileSet>
13-
<outputDirectory>.</outputDirectory>
13+
<!-- Output to the root directory -->
14+
<outputDirectory></outputDirectory>
1415
<directory>src/main/webapp</directory>
1516
<includes>
1617
<include>WEB-INF/jsp/**/*.jsp</include>
1718
</includes>
18-
<fileMode>0644</fileMode>
19-
<directoryMode>0755</directoryMode>
2019
</fileSet>
2120
</fileSets>
2221
</assembly>

‎features/remote-poller-jnlp/src/assembly/jnlp.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,8 @@
1111
<fileSets>
1212
<fileSet>
1313
<directory>target/jnlp</directory>
14-
<outputDirectory>/</outputDirectory>
15-
<fileMode>0644</fileMode>
16-
<directoryMode>0755</directoryMode>
14+
<!-- Output to the root directory -->
15+
<outputDirectory></outputDirectory>
1716
</fileSet>
1817
</fileSets>
1918
</assembly>

‎integrations/opennms-analytics-filters/src/assembly/xsds.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
<fileSet>
1313
<directory>target/xsds</directory>
1414
<outputDirectory>xsds</outputDirectory>
15-
<fileMode>0644</fileMode>
16-
<directoryMode>0755</directoryMode>
1715
</fileSet>
1816
</fileSets>
1917
</assembly>

‎opennms-assemblies/remote-poller-standalone/src/assembly/remote-poller.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
<include>*.sh</include>
1717
</includes>
1818
<fileMode>0755</fileMode>
19-
<directoryMode>0755</directoryMode>
2019
</fileSet>
2120
<fileSet>
2221
<directory>target/classes</directory>
@@ -25,8 +24,6 @@
2524
<include>*.init</include>
2625
<include>*.sysconfig</include>
2726
</includes>
28-
<fileMode>0644</fileMode>
29-
<directoryMode>0755</directoryMode>
3027
</fileSet>
3128
</fileSets>
3229
<dependencySets>
@@ -36,8 +33,6 @@
3633
<includes>
3734
<include>org.opennms.assemblies:org.opennms.assemblies.remote-poller-onejar:jar:signed-jar-with-dependencies:${project.version}</include>
3835
</includes>
39-
<fileMode>0644</fileMode>
40-
<directoryMode>0755</directoryMode>
4136
</dependencySet>
4237
</dependencySets>
4338
</assembly>

‎opennms-assemblies/remote-poller-windows/src/assembly/remote-poller.xml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,23 @@
1111
<fileSets>
1212
<fileSet>
1313
<directory>target/classes</directory>
14-
<outputDirectory>/</outputDirectory>
14+
<!-- Output to the root directory -->
15+
<outputDirectory></outputDirectory>
1516
<includes>
1617
<include>*.bat</include>
1718
</includes>
1819
<fileMode>0755</fileMode>
19-
<directoryMode>0755</directoryMode>
2020
</fileSet>
2121
<fileSet>
2222
<directory>target/classes</directory>
23-
<outputDirectory>/</outputDirectory>
23+
<!-- Output to the root directory -->
24+
<outputDirectory></outputDirectory>
2425
<includes>
2526
<include>*.*</include>
2627
</includes>
2728
<excludes>
2829
<exclude>*.bat</exclude>
2930
</excludes>
30-
<fileMode>0644</fileMode>
31-
<directoryMode>0755</directoryMode>
3231
</fileSet>
3332
</fileSets>
3433
<dependencySets>
@@ -38,8 +37,6 @@
3837
<includes>
3938
<include>org.opennms.assemblies:org.opennms.assemblies.remote-poller-onejar:jar:signed-jar-with-dependencies:${project.version}</include>
4039
</includes>
41-
<fileMode>0644</fileMode>
42-
<directoryMode>0755</directoryMode>
4340
</dependencySet>
4441
</dependencySets>
4542
</assembly>

‎opennms-assemblies/rxtx-assembly/src/assembly/rxtx.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
<fileSets>
1212
<fileSet>
1313
<directory>target/dependency/lib</directory>
14-
<outputDirectory>/</outputDirectory>
14+
<!-- Output to the root directory -->
15+
<outputDirectory></outputDirectory>
1516
<fileMode>0755</fileMode>
1617
<directoryMode>0755</directoryMode>
1718
</fileSet>

‎opennms-assemblies/xsds/src/assembly/xsds.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
</unpackOptions>
2020
<useProjectArtifact>false</useProjectArtifact>
2121
<useTransitiveDependencies>false</useTransitiveDependencies>
22-
<outputDirectory>/</outputDirectory>
22+
<!-- Output to the root directory -->
23+
<outputDirectory></outputDirectory>
2324
<includes>
2425
<include>org.opennms.core:org.opennms.core.db:jar:xsds:${project.version}</include>
2526
<include>org.opennms.core:org.opennms.core.soa:jar:xsds:${project.version}</include>
@@ -43,8 +44,6 @@
4344
<include>org.opennms.protocols:org.opennms.protocols.xml:jar:xsds:${project.version}</include>
4445
<include>org.opennms.protocols:org.opennms.protocols.xmp:jar:xsds:${project.version}</include>
4546
</includes>
46-
<fileMode>0644</fileMode>
47-
<directoryMode>0755</directoryMode>
4847
</dependencySet>
4948
</dependencySets>
5049
</assembly>

0 commit comments

Comments
 (0)