Author: jbonofre
Date: Thu Feb 11 21:08:48 2010
New Revision: 909149
URL: http://svn.apache.org/viewvc?rev=909149&view=rev
Log:
[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.
Added:
servicemix/smx4/features/trunk/BUILDING
- copied unchanged from r909131,
servicemix/smx4/features/trunk/BUILDING.txt
servicemix/smx4/features/trunk/LICENSE
- copied unchanged from r909131,
servicemix/smx4/features/trunk/LICENSE.txt
servicemix/smx4/features/trunk/NOTICE
- copied unchanged from r909131, servicemix/smx4/features/trunk/NOTICE.txt
servicemix/smx4/features/trunk/README
- copied unchanged from r909131, servicemix/smx4/features/trunk/README.txt
servicemix/smx4/features/trunk/RELEASE-NOTES
- copied unchanged from r909131,
servicemix/smx4/features/trunk/RELEASE-NOTES.txt
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/org.ops4j.pax.logging.cfg
Removed:
servicemix/smx4/features/trunk/BUILDING.txt
servicemix/smx4/features/trunk/LICENSE.txt
servicemix/smx4/features/trunk/NOTICE.txt
servicemix/smx4/features/trunk/README.txt
servicemix/smx4/features/trunk/RELEASE-NOTES.txt
Modified:
servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml
servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml
Modified:
servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml?rev=909149&r1=909148&r2=909149&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml
(original)
+++ servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml
Thu Feb 11 21:08:48 2010
@@ -29,14 +29,15 @@
<outputDirectory>/</outputDirectory>
<excludes>
<exclude>**/demos/**</exclude>
- <exclude>bin/start</exclude>
<exclude>etc/system.properties</exclude>
<exclude>etc/org.apache.felix.karaf.features.cfg</exclude>
+ <exclude>etc/org.ops4j.pax.logging.cfg</exclude>
<exclude>etc/config.properties</exclude>
- <exclude>LICENSE.txt</exclude>
- <exclude>NOTICE.txt</exclude>
- <exclude>README.txt</exclude>
- <exclude>RELEASE-NOTES.txt</exclude>
+ <exclude>LICENSE</exclude>
+ <exclude>NOTICE</exclude>
+ <exclude>README</exclude>
+ <exclude>RELEASE-NOTES</exclude>
+ <exclude>manual*</exclude>
</excludes>
</fileSet>
@@ -88,10 +89,11 @@
<directory>${basedir}/..</directory>
<outputDirectory>/</outputDirectory>
<includes>
- <include>README.txt</include>
- <include>RELEASE*.txt</include>
+ <include>README</include>
+ <include>RELEASE*</include>
</includes>
<lineEnding>unix</lineEnding>
+ <fileMode>0644</fileMode>
</fileSet>
<!-- Copy over jar files -->
@@ -113,8 +115,9 @@
<directory>target/classes/etc</directory>
<outputDirectory>/etc/</outputDirectory>
<lineEnding>unix</lineEnding>
+ <fileMode>0644</fileMode>
</fileSet>
- <fileSet>
+ <fileSet>
<directory>src/main/distribution/unix-shell</directory>
<outputDirectory>/</outputDirectory>
<lineEnding>unix</lineEnding>
@@ -166,14 +169,14 @@
<file>
<source>${basedir}/target/maven-shared-archive-resources/META-INF/LICENSE</source>
<outputDirectory>/</outputDirectory>
- <destName>LICENSE.txt</destName>
+ <destName>LICENSE</destName>
<fileMode>0644</fileMode>
<lineEnding>unix</lineEnding>
</file>
<file>
<source>${basedir}/target/maven-shared-archive-resources/META-INF/NOTICE</source>
<outputDirectory>/</outputDirectory>
- <destName>NOTICE.txt</destName>
+ <destName>NOTICE</destName>
<fileMode>0644</fileMode>
<lineEnding>unix</lineEnding>
</file>
Modified:
servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml?rev=909149&r1=909148&r2=909149&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml
(original)
+++
servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml
Thu Feb 11 21:08:48 2010
@@ -31,11 +31,13 @@
<exclude>bin/start.bat</exclude>
<exclude>etc/system.properties</exclude>
<exclude>etc/org.apache.felix.karaf.features.cfg</exclude>
+ <exclude>etc/org.ops4j.pax.logging.cfg</exclude>
<exclude>etc/config.properties</exclude>
- <exclude>LICENSE.txt</exclude>
- <exclude>NOTICE.txt</exclude>
- <exclude>README.txt</exclude>
- <exclude>RELEASE-NOTES.txt</exclude>
+ <exclude>LICENSE</exclude>
+ <exclude>NOTICE</exclude>
+ <exclude>README</exclude>
+ <exclude>RELEASE-NOTES</exclude>
+ <exclude>manual*</exclude>
</excludes>
</fileSet>
@@ -77,10 +79,11 @@
<directory>${basedir}/..</directory>
<outputDirectory>/</outputDirectory>
<includes>
- <include>README.txt</include>
- <include>RELEASE*.txt</include>
+ <include>README</include>
+ <include>RELEASE*</include>
</includes>
<lineEnding>dos</lineEnding>
+ <fileMode>0644</fileMode>
</fileSet>
<!-- Copy over everything that needs to get dos line endings -->
@@ -93,6 +96,7 @@
<directory>target/classes/etc</directory>
<outputDirectory>/etc/</outputDirectory>
<lineEnding>dos</lineEnding>
+ <fileMode>0644</fileMode>
</fileSet>
<fileSet>
<directory>src/main/distribution/windows-text</directory>
@@ -154,14 +158,14 @@
<file>
<source>${basedir}/target/maven-shared-archive-resources/META-INF/LICENSE</source>
<outputDirectory>/</outputDirectory>
- <destName>LICENSE.txt</destName>
+ <destName>LICENSE</destName>
<fileMode>0644</fileMode>
<lineEnding>dos</lineEnding>
</file>
<file>
<source>${basedir}/target/maven-shared-archive-resources/META-INF/NOTICE</source>
<outputDirectory>/</outputDirectory>
- <destName>NOTICE.txt</destName>
+ <destName>NOTICE</destName>
<fileMode>0644</fileMode>
<lineEnding>dos</lineEnding>
</file>
Added:
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/org.ops4j.pax.logging.cfg
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/org.ops4j.pax.logging.cfg?rev=909149&view=auto
==============================================================================
---
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/org.ops4j.pax.logging.cfg
(added)
+++
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/org.ops4j.pax.logging.cfg
Thu Feb 11 21:08:48 2010
@@ -0,0 +1,33 @@
+################################################################################
+#
+# 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.
+#
+################################################################################
+
+# Root logger
+log4j.rootLogger=INFO, out, osgi:VmLogAppender
+
+# CONSOLE appender not used by default
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} | %-5.5p |
%-16.16t | %-32.32c{1} | %-32.32C %4L | %m%n
+
+# File appender
+log4j.appender.out=org.apache.log4j.FileAppender
+log4j.appender.out.layout=org.apache.log4j.PatternLayout
+log4j.appender.out.layout.ConversionPattern=%d{ABSOLUTE} | %-5.5p | %-16.16t |
%-32.32c{1} | %-32.32C %4L | %m%n
+log4j.appender.out.file=${karaf.base}/data/log/servicemix.log
+log4j.appender.out.append=true
\ No newline at end of file
