[Remoterengine-commits] r192 - in pkg/RemoteREngine: . exec inst/java_src inst/java_src/lib inst/java_src/lib/licenses inst/java_src/lib/licenses/log4j inst/java_src/lib/licenses/slf4j
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Thu Oct 1 17:43:48 CEST 2009
Author: ian_long
Date: 2009-10-01 17:43:48 +0200 (Thu, 01 Oct 2009)
New Revision: 192
Added:
pkg/RemoteREngine/inst/java_src/lib/licenses/log4j/
pkg/RemoteREngine/inst/java_src/lib/licenses/log4j/LICENSE
pkg/RemoteREngine/inst/java_src/lib/licenses/slf4j/
pkg/RemoteREngine/inst/java_src/lib/licenses/slf4j/LICENSE.txt
pkg/RemoteREngine/inst/java_src/lib/log4j-1.2.15.jar
pkg/RemoteREngine/inst/java_src/lib/slf4j-api-1.5.8.jar
pkg/RemoteREngine/inst/java_src/lib/slf4j-log4j12-1.5.8.jar
pkg/RemoteREngine/inst/java_src/logging.xml
Modified:
pkg/RemoteREngine/DESCRIPTION
pkg/RemoteREngine/exec/remoterengine
pkg/RemoteREngine/inst/java_src/build.properties
pkg/RemoteREngine/inst/java_src/build.xml
Log:
Added logging through log4j via slf4j
Modified: pkg/RemoteREngine/DESCRIPTION
===================================================================
--- pkg/RemoteREngine/DESCRIPTION 2009-09-29 11:24:37 UTC (rev 191)
+++ pkg/RemoteREngine/DESCRIPTION 2009-10-01 15:43:48 UTC (rev 192)
@@ -1,7 +1,7 @@
Package: RemoteREngine
Type: Package
Title: RMI based REngine implementation
-Version: 0.0-5
+Version: 0.0-6
Date: 2009-09-29
Author: Romain Francois
Maintainer: Romain Francois <francoisromain at free.fr>
Modified: pkg/RemoteREngine/exec/remoterengine
===================================================================
--- pkg/RemoteREngine/exec/remoterengine 2009-09-29 11:24:37 UTC (rev 191)
+++ pkg/RemoteREngine/exec/remoterengine 2009-10-01 15:43:48 UTC (rev 192)
@@ -84,6 +84,9 @@
# {{{ classpath
CP <- paste(
system.file( "java", "RemoteREngine-server.jar", package = "RemoteREngine" ),
+ system.file( "java", "log4j-1.2.15.jar", package = "RemoteREngine" ),
+ system.file( "java", "slf4j-log4j12-1.5.8.jar", package = "RemoteREngine" ),
+ system.file( "java", "slf4j-api-1.5.8.jar", package = "RemoteREngine" ),
system.file( "java", "boot", package = "rJava" ),
system.file( "java", package = "rJava" ),
sep = SEP
@@ -104,7 +107,12 @@
# }}}
# {{{ codebase
-codebase <- paste( "file:", system.file( "java", "RemoteREngine-server.jar", package = "RemoteREngine" ), sep = "" )
+codebase <- paste(
+ paste( "file:", system.file( "java", "RemoteREngine-server.jar", package = "RemoteREngine" ), sep = "" ),
+ paste( "file:", system.file( "java", "log4j-1.2.15.jar", package = "RemoteREngine" ), sep = "" ),
+ paste( "file:", system.file( "java", "slf4j-log4j12-1.5.8.jar", package = "RemoteREngine" ), sep = "" ),
+ paste( "file:", system.file( "java", "slf4j-api-1.5.8.jar", package = "RemoteREngine" ), sep = "" ),
+ sep = " ")
# }}}
# {{{ command line args
Modified: pkg/RemoteREngine/inst/java_src/build.properties
===================================================================
--- pkg/RemoteREngine/inst/java_src/build.properties 2009-09-29 11:24:37 UTC (rev 191)
+++ pkg/RemoteREngine/inst/java_src/build.properties 2009-10-01 15:43:48 UTC (rev 192)
@@ -5,6 +5,7 @@
build.dir=build
javadoc.dir=../javadoc
jar.dir=../java
+lib.dir=lib
common.dir=build/common
common.dirs=build/common/
@@ -26,4 +27,6 @@
#jri.jar=lib/JRI.jar
rengine.jar=lib/REngine.jar
jriengine.jar=lib/JRIEngine.jar
+logging.jars=slf4j-api-1.5.8.jar,slf4j-log4j12-1.5.8.jar,log4j-1.2.15.jar
+logging.conf=logging.xml
Modified: pkg/RemoteREngine/inst/java_src/build.xml
===================================================================
--- pkg/RemoteREngine/inst/java_src/build.xml 2009-09-29 11:24:37 UTC (rev 191)
+++ pkg/RemoteREngine/inst/java_src/build.xml 2009-10-01 15:43:48 UTC (rev 192)
@@ -24,7 +24,9 @@
<!--{{{ Properties -->
<property file="./build.properties"/>
<!--}}} -->
-
+
+ <filelist id="loggingjars" dir="${lib.dir}" files="${logging.jars}"/>
+
<!--{{{ clean -->
<target name="clean">
<delete dir="build" />
@@ -50,6 +52,7 @@
<path id="common_classpath">
<pathelement location="lib/REngine.jar" />
+ <filelist refid="loggingjars" />
</path>
<target name="common" depends="init">
@@ -138,6 +141,7 @@
<pathelement location="${common.dir}" />
<pathelement location="${rengine.jar}" />
<pathelement location="${jriengine.jar}" />
+ <filelist refid="loggingjars" />
</path>
<target name="server" depends="common">
@@ -161,6 +165,7 @@
<path id="client_classpath">
<pathelement location="${common.dir}" />
<pathelement location="lib/REngine.jar" />
+ <filelist refid="loggingjars" />
</path>
<target name="client" depends="common,server">
@@ -192,6 +197,7 @@
<pathelement location="${client.dir}" />
<pathelement location="${rengine.jar}" />
<pathelement location="${jriengine.jar}" />
+ <filelist refid="loggingjars" />
</path>
@@ -213,6 +219,7 @@
<pathelement location="${common.dir}" />
<pathelement location="${server.dir}" />
<pathelement location="${client.dir}" />
+ <filelist refid="loggingjars" />
</path>
<target name="annotation-javac" depends="client">
@@ -242,6 +249,7 @@
<path id="annotation_factory_path">
<pathelement location="jars/RemoteREngine-annotationprocessor.jar" />
+ <filelist refid="loggingjars" />
</path>
<target name="annotation" depends="annotation-jar">
@@ -256,16 +264,17 @@
<!--}}}-->
<!--{{{ copy the manifest file and licenses -->
- <target name="do.copy" description="copy the manifest file and licenses">
+ <target name="do.copy" description="copy the manifest file, logging jars and licenses">
<mkdir dir="${common.dir}/licenses"/>
<copy todir="${common.dir}/licenses">
<fileset dir="lib/licenses">
<include name="**/*"/>
</fileset>
</copy>
- <copy todir="build">
+ <copy todir="${build.dir}">
<fileset dir=".">
<include name="MANIFEST.MF"/>
+ <include name="${logging.conf}" />
</fileset>
</copy>
<tstamp>
@@ -279,6 +288,10 @@
<replacefilter token="{build.os}" value="${os.name}-${os.version}" />
<replacefilter token="{vendor}" value="${vendor}" />
</replace>
+
+ <copy todir="${jar.dir}">
+ <filelist refid="loggingjars" />
+ </copy>
</target>
<!--}}}-->
@@ -291,6 +304,7 @@
<fileset dir="${common.dir}" />
<fileset dir="${stubs.dir}" />
<fileset file="build/services.xml" />
+ <fileset file="${logging.conf}" />
</jar>
<!-- server jar -->
@@ -302,6 +316,7 @@
<fileset dir="${common.dir}" />
<fileset dir="${stubs.dir}" />
<fileset file="build/services.xml" />
+ <fileset file="${logging.conf}" />
</jar>
</target>
Added: pkg/RemoteREngine/inst/java_src/lib/licenses/log4j/LICENSE
===================================================================
--- pkg/RemoteREngine/inst/java_src/lib/licenses/log4j/LICENSE (rev 0)
+++ pkg/RemoteREngine/inst/java_src/lib/licenses/log4j/LICENSE 2009-10-01 15:43:48 UTC (rev 192)
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright 1999-2005 The Apache Software Foundation
+
+ Licensed 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.
Added: pkg/RemoteREngine/inst/java_src/lib/licenses/slf4j/LICENSE.txt
===================================================================
--- pkg/RemoteREngine/inst/java_src/lib/licenses/slf4j/LICENSE.txt (rev 0)
+++ pkg/RemoteREngine/inst/java_src/lib/licenses/slf4j/LICENSE.txt 2009-10-01 15:43:48 UTC (rev 192)
@@ -0,0 +1,24 @@
+Copyright (c) 2004-2008 QOS.ch
+All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+
Property changes on: pkg/RemoteREngine/inst/java_src/lib/licenses/slf4j/LICENSE.txt
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: pkg/RemoteREngine/inst/java_src/lib/log4j-1.2.15.jar
===================================================================
(Binary files differ)
Property changes on: pkg/RemoteREngine/inst/java_src/lib/log4j-1.2.15.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: pkg/RemoteREngine/inst/java_src/lib/slf4j-api-1.5.8.jar
===================================================================
(Binary files differ)
Property changes on: pkg/RemoteREngine/inst/java_src/lib/slf4j-api-1.5.8.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: pkg/RemoteREngine/inst/java_src/lib/slf4j-log4j12-1.5.8.jar
===================================================================
(Binary files differ)
Property changes on: pkg/RemoteREngine/inst/java_src/lib/slf4j-log4j12-1.5.8.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: pkg/RemoteREngine/inst/java_src/logging.xml
===================================================================
--- pkg/RemoteREngine/inst/java_src/logging.xml (rev 0)
+++ pkg/RemoteREngine/inst/java_src/logging.xml 2009-10-01 15:43:48 UTC (rev 192)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+ <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+ <param name="Target" value="System.out"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%-5p %c{1} - %m%n"/>
+ </layout>
+ </appender>
+ <appender name="FILE_APPENDER" class="org.apache.log4j.RollingFileAppender">
+ <param name="File" value="remoterengine.log" />
+ <param name="Append" value="true" />
+ <param name="MaxFileSize" value="300kb" />
+ <param name="MaxBackupIndex" value="3" />
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d %-5p [%t] %C{2} (%L) - %m%n"/>
+ </layout>
+ </appender>
+
+<!--
+ <logger name="org.rosuda.REngine.remote">
+ <level value="debug"/>
+ <appender-ref ref="FILE_APPENDER" />
+ </logger>
+-->
+ <root>
+ <priority value ="info" />
+ <appender-ref ref="FILE_APPENDER" />
+<!--
+ <appender-ref ref="CONSOLE" />
+-->
+ </root>
+
+</log4j:configuration>
\ No newline at end of file
Property changes on: pkg/RemoteREngine/inst/java_src/logging.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
More information about the Remoterengine-commits
mailing list