Skip to content

Commit 63a0e40

Browse files
jbonofrejbonofre
committedFeb 11, 2010
[SMX4-479] Override etc/org.ops4j.pax.logging.cfg to log into ${karaf.base}/data/log/servicemix.log. Clean README, NOTICE, LICENSE, etc files. Change file mode of several files.
git-svn-id: https://svn.apache.org/repos/asf/servicemix/smx4/features/trunk@909149 13f79535-47bb-0310-9956-ffa450edef68
·
features-4.5.3features-4.2.0
1 parent 1ccc705 commit 63a0e40

File tree

8 files changed

+58
-18
lines changed

8 files changed

+58
-18
lines changed
 

‎BUILDING.txt ‎BUILDING

File renamed without changes.

‎LICENSE.txt ‎LICENSE

File renamed without changes.

‎NOTICE.txt ‎NOTICE

File renamed without changes.

‎README.txt ‎README

File renamed without changes.

‎RELEASE-NOTES.txt ‎RELEASE-NOTES

File renamed without changes.

‎assembly/src/main/descriptors/unix-bin.xml

+13-10
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,15 @@
2929
<outputDirectory>/</outputDirectory>
3030
<excludes>
3131
<exclude>**/demos/**</exclude>
32-
<exclude>bin/start</exclude>
3332
<exclude>etc/system.properties</exclude>
3433
<exclude>etc/org.apache.felix.karaf.features.cfg</exclude>
34+
<exclude>etc/org.ops4j.pax.logging.cfg</exclude>
3535
<exclude>etc/config.properties</exclude>
36-
<exclude>LICENSE.txt</exclude>
37-
<exclude>NOTICE.txt</exclude>
38-
<exclude>README.txt</exclude>
39-
<exclude>RELEASE-NOTES.txt</exclude>
36+
<exclude>LICENSE</exclude>
37+
<exclude>NOTICE</exclude>
38+
<exclude>README</exclude>
39+
<exclude>RELEASE-NOTES</exclude>
40+
<exclude>manual*</exclude>
4041
</excludes>
4142
</fileSet>
4243

@@ -88,10 +89,11 @@
8889
<directory>${basedir}/..</directory>
8990
<outputDirectory>/</outputDirectory>
9091
<includes>
91-
<include>README.txt</include>
92-
<include>RELEASE*.txt</include>
92+
<include>README</include>
93+
<include>RELEASE*</include>
9394
</includes>
9495
<lineEnding>unix</lineEnding>
96+
<fileMode>0644</fileMode>
9597
</fileSet>
9698

9799
<!-- Copy over jar files -->
@@ -113,8 +115,9 @@
113115
<directory>target/classes/etc</directory>
114116
<outputDirectory>/etc/</outputDirectory>
115117
<lineEnding>unix</lineEnding>
118+
<fileMode>0644</fileMode>
116119
</fileSet>
117-
<fileSet>
120+
<fileSet>
118121
<directory>src/main/distribution/unix-shell</directory>
119122
<outputDirectory>/</outputDirectory>
120123
<lineEnding>unix</lineEnding>
@@ -166,14 +169,14 @@
166169
<file>
167170
<source>${basedir}/target/maven-shared-archive-resources/META-INF/LICENSE</source>
168171
<outputDirectory>/</outputDirectory>
169-
<destName>LICENSE.txt</destName>
172+
<destName>LICENSE</destName>
170173
<fileMode>0644</fileMode>
171174
<lineEnding>unix</lineEnding>
172175
</file>
173176
<file>
174177
<source>${basedir}/target/maven-shared-archive-resources/META-INF/NOTICE</source>
175178
<outputDirectory>/</outputDirectory>
176-
<destName>NOTICE.txt</destName>
179+
<destName>NOTICE</destName>
177180
<fileMode>0644</fileMode>
178181
<lineEnding>unix</lineEnding>
179182
</file>

‎assembly/src/main/descriptors/windows-bin.xml

+12-8
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,13 @@
3131
<exclude>bin/start.bat</exclude>
3232
<exclude>etc/system.properties</exclude>
3333
<exclude>etc/org.apache.felix.karaf.features.cfg</exclude>
34+
<exclude>etc/org.ops4j.pax.logging.cfg</exclude>
3435
<exclude>etc/config.properties</exclude>
35-
<exclude>LICENSE.txt</exclude>
36-
<exclude>NOTICE.txt</exclude>
37-
<exclude>README.txt</exclude>
38-
<exclude>RELEASE-NOTES.txt</exclude>
36+
<exclude>LICENSE</exclude>
37+
<exclude>NOTICE</exclude>
38+
<exclude>README</exclude>
39+
<exclude>RELEASE-NOTES</exclude>
40+
<exclude>manual*</exclude>
3941
</excludes>
4042
</fileSet>
4143

@@ -77,10 +79,11 @@
7779
<directory>${basedir}/..</directory>
7880
<outputDirectory>/</outputDirectory>
7981
<includes>
80-
<include>README.txt</include>
81-
<include>RELEASE*.txt</include>
82+
<include>README</include>
83+
<include>RELEASE*</include>
8284
</includes>
8385
<lineEnding>dos</lineEnding>
86+
<fileMode>0644</fileMode>
8487
</fileSet>
8588

8689
<!-- Copy over everything that needs to get dos line endings -->
@@ -93,6 +96,7 @@
9396
<directory>target/classes/etc</directory>
9497
<outputDirectory>/etc/</outputDirectory>
9598
<lineEnding>dos</lineEnding>
99+
<fileMode>0644</fileMode>
96100
</fileSet>
97101
<fileSet>
98102
<directory>src/main/distribution/windows-text</directory>
@@ -154,14 +158,14 @@
154158
<file>
155159
<source>${basedir}/target/maven-shared-archive-resources/META-INF/LICENSE</source>
156160
<outputDirectory>/</outputDirectory>
157-
<destName>LICENSE.txt</destName>
161+
<destName>LICENSE</destName>
158162
<fileMode>0644</fileMode>
159163
<lineEnding>dos</lineEnding>
160164
</file>
161165
<file>
162166
<source>${basedir}/target/maven-shared-archive-resources/META-INF/NOTICE</source>
163167
<outputDirectory>/</outputDirectory>
164-
<destName>NOTICE.txt</destName>
168+
<destName>NOTICE</destName>
165169
<fileMode>0644</fileMode>
166170
<lineEnding>dos</lineEnding>
167171
</file>

‎assembly/src/main/filtered-resources/etc/org.ops4j.pax.logging.cfg

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
################################################################################
2+
#
3+
# Licensed to the Apache Software Foundation (ASF) under one or more
4+
# contributor license agreements. See the NOTICE file distributed with
5+
# this work for additional information regarding copyright ownership.
6+
# The ASF licenses this file to You under the Apache License, Version 2.0
7+
# (the "License"); you may not use this file except in compliance with
8+
# the License. You may obtain a copy of the License at
9+
#
10+
# http://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing, software
13+
# distributed under the License is distributed on an "AS IS" BASIS,
14+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
# See the License for the specific language governing permissions and
16+
# limitations under the License.
17+
#
18+
################################################################################
19+
20+
# Root logger
21+
log4j.rootLogger=INFO, out, osgi:VmLogAppender
22+
23+
# CONSOLE appender not used by default
24+
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
25+
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
26+
log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} | %-5.5p | %-16.16t | %-32.32c{1} | %-32.32C %4L | %m%n
27+
28+
# File appender
29+
log4j.appender.out=org.apache.log4j.FileAppender
30+
log4j.appender.out.layout=org.apache.log4j.PatternLayout
31+
log4j.appender.out.layout.ConversionPattern=%d{ABSOLUTE} | %-5.5p | %-16.16t | %-32.32c{1} | %-32.32C %4L | %m%n
32+
log4j.appender.out.file=${karaf.base}/data/log/servicemix.log
33+
log4j.appender.out.append=true

0 commit comments

Comments
 (0)
Please sign in to comment.