Author: thimel Date: 2006-08-23 16:14:42 +0000 (Wed, 23 Aug 2006) New Revision: 1 Added: .build Lutin utilities library.launch .classpath .cvsignore .project .settings/ .settings/org.eclipse.jdt.core.prefs LICENSE.txt pom.xml profiles.xml site/ site/site.xml src/ src/java/ src/java/org/ src/java/org/codelutin/ src/java/org/codelutin/j2r/ src/java/org/codelutin/j2r/REngine.java src/java/org/codelutin/j2r/RException.java src/java/org/codelutin/j2r/RProxy.java src/java/org/codelutin/j2r/jni/ src/java/org/codelutin/j2r/jni/RJniEngine.java src/java/org/codelutin/j2r/net/ src/java/org/codelutin/j2r/net/RNetEngine.java src/resources/ src/resources/libjri.so src/resources/log4j.properties src/test/ src/test/org/ src/test/org/codelutin/ src/test/org/codelutin/j2r/ src/test/org/codelutin/j2r/JNITest.java src/test/org/codelutin/j2r/NetTest.java target/ target/classes/ target/classes/libjri.so target/classes/log4j.properties target/classes/org/ target/classes/org/codelutin/ target/classes/org/codelutin/j2r/ target/classes/org/codelutin/j2r/REngine.class target/classes/org/codelutin/j2r/RException.class target/classes/org/codelutin/j2r/RProxy.class target/classes/org/codelutin/j2r/jni/ target/classes/org/codelutin/j2r/jni/RJniEngine.class target/classes/org/codelutin/j2r/net/ target/classes/org/codelutin/j2r/net/RNetEngine.class target/test-classes/ target/test-classes/org/ target/test-classes/org/codelutin/ target/test-classes/org/codelutin/j2r/ target/test-classes/org/codelutin/j2r/JNITest.class target/test-classes/org/codelutin/j2r/NetTest.class Log: Ajout initial sur le repository Added: .build Lutin utilities library.launch =================================================================== --- .build Lutin utilities library.launch 2006-08-22 17:21:04 UTC (rev 0) +++ .build Lutin utilities library.launch 2006-08-23 16:14:42 UTC (rev 1) @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<launchConfiguration type="org.eclipse.ui.externaltools.ProgramLaunchConfigurationType"> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="jar"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_REFRESH_SCOPE" value="${project}"/> +<stringAttribute key="org.eclipse.debug.ui.target_debug_perspective" value="perspective_default"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/Lutin utilities library}"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="/opt/maven/bin/maven"/> +<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/> +<stringAttribute key="org.eclipse.debug.ui.target_run_perspective" value="perspective_default"/> +</launchConfiguration> Added: .classpath =================================================================== --- .classpath 2006-08-22 17:21:04 UTC (rev 0) +++ .classpath 2006-08-23 16:14:42 UTC (rev 1) @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="src/java"/> + <classpathentry kind="src" path="src/resources"/> + <classpathentry output="target/test-classes" kind="src" path="src/test"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="var" path="M2_REPO/logkit/logkit/1.0.1/logkit-1.0.1.jar"/> + <classpathentry kind="var" path="M2_REPO/externallib/JRI/0.2-4/JRI-0.2-4-cl.jar"/> + <classpathentry kind="var" path="M2_REPO/avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.jar"/> + <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar"/> + <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/> + <classpathentry kind="var" path="M2_REPO/externallib/JRclient/RE817/JRclient-RE817.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar"/> + <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.12/log4j-1.2.12.jar"/> + <classpathentry kind="output" path="target/classes"/> +</classpath> Added: .cvsignore =================================================================== --- .cvsignore 2006-08-22 17:21:04 UTC (rev 0) +++ .cvsignore 2006-08-23 16:14:42 UTC (rev 1) @@ -0,0 +1,3 @@ +maven.log +target +velocity.log Added: .project =================================================================== --- .project 2006-08-22 17:21:04 UTC (rev 0) +++ .project 2006-08-23 16:14:42 UTC (rev 1) @@ -0,0 +1,15 @@ +<projectDescription> + <name>lutinj2r</name> + <comment>Librairie permettant d'utiliser R en Java, que ce soit par +le Network ou en JNI.</comment> + <projects/> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments/> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> \ No newline at end of file Added: .settings/org.eclipse.jdt.core.prefs =================================================================== --- .settings/org.eclipse.jdt.core.prefs 2006-08-22 17:21:04 UTC (rev 0) +++ .settings/org.eclipse.jdt.core.prefs 2006-08-23 16:14:42 UTC (rev 1) @@ -0,0 +1,5 @@ +#Wed Aug 23 15:47:28 CEST 2006 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 Added: LICENSE.txt =================================================================== --- LICENSE.txt 2006-08-22 17:21:04 UTC (rev 0) +++ LICENSE.txt 2006-08-23 16:14:42 UTC (rev 1) @@ -0,0 +1,280 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS Added: pom.xml =================================================================== --- pom.xml 2006-08-22 17:21:04 UTC (rev 0) +++ pom.xml 2006-08-23 16:14:42 UTC (rev 1) @@ -0,0 +1,59 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <!--The version of maven's project object model--> + <modelVersion>4.0.0</modelVersion> + + <!--lutinproject.xml--> + <parent> + <groupId>lutinlib</groupId> + <artifactId>lutinproject</artifactId> + <version>2.0</version> + </parent> + + <!--A unique name for this project--> + <artifactId>lutinj2r</artifactId> + <name>Lutin Java-2-R library</name> + + <!--ejb, jar, war...--> + <packaging>jar</packaging> + + <!--Version--> + <version>0.1</version> + + <!--Description--> + <description> + Librairie permettant d'utiliser R en Java, que ce soit par +le Network ou en JNI. + </description> + <inceptionYear>2006</inceptionYear> + + <!--Tracking--> + <issueManagement> + <url>http://labs.libre-entreprise.org/tracker/?group_id=109</url> + </issueManagement> + + <!--Librairies--> + <dependencies> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>externallib</groupId> + <artifactId>JRclient</artifactId> + <version>RE817</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>externallib</groupId> + <artifactId>JRI</artifactId> + <version>0.2-4</version> + <scope>compile</scope> + </dependency> + </dependencies> + +</project> Added: profiles.xml =================================================================== --- profiles.xml 2006-08-22 17:21:04 UTC (rev 0) +++ profiles.xml 2006-08-23 16:14:42 UTC (rev 1) @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<settings> + <profiles> + <profile> + <id>project</id> + + <activation> + <activeByDefault>true</activeByDefault> + </activation> + + <properties> + <!--Source base dir--> + <maven.src.dir>${basedir}/src</maven.src.dir> + + <!--Test--> + <maven.test.skip>true</maven.test.skip> + + <!--Compile with ?--> + <maven.compile.source>1.5</maven.compile.source> + <maven.compile.target>1.5</maven.compile.target> + + <!--Main class in JAR --> + <maven.jar.main.class>org.codelutin.j2r.RProxy</maven.jar.main.class> + </properties> + </profile> + </profiles> +</settings> Added: site/site.xml =================================================================== --- site/site.xml 2006-08-22 17:21:04 UTC (rev 0) +++ site/site.xml 2006-08-23 16:14:42 UTC (rev 1) @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<project name="LutinJ2R"> + + <bannerLeft> + <name>LutinJ2R</name> + </bannerLeft> + + <bannerRight> + <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> + <href>http://www.codelutin.com</href> + </bannerRight> + + <body> + <links> + <item name="Labs" href="http://labs.libre-entreprise.org/"/> + <item name="Code Lutin" href="http://www.codelutin.com/"/> + </links> + + ${reports} + + <menu name="Utilisateur"> + <item href="http://lutinbuilder.labs.libre-entreprise.org/maven2/lutinlib/lutinutil/" name="Téléchargement"/> + </menu> + + <menu name="Developpeur"> + <item name="Todo" href="Todo.html"/> + </menu> + + </body> +</project> Added: src/java/org/codelutin/j2r/REngine.java =================================================================== --- src/java/org/codelutin/j2r/REngine.java 2006-08-22 17:21:04 UTC (rev 0) +++ src/java/org/codelutin/j2r/REngine.java 2006-08-23 16:14:42 UTC (rev 1) @@ -0,0 +1,51 @@ +/* *##% +* Copyright (C) 2002, 2003, 2004, 2005, 2006 Code Lutin, +* Cedric Pineau, Benjamin Poussin, Arnaud Thimel +* +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +*##%*/ + +/* * +* RInterface.java +* +* Created: 21 aout 2006 +* +* @author Arnaud Thimel <thimel@codelutin.com> +* @version $Revision: $ +* +* Mise a jour: $Date: $ +* par : $Author: $ +*/ + +package org.codelutin.j2r; + +/** + * + */ +public interface REngine { + + public boolean init(); + + /** + * Delegue a R le traitement passe en parametre. + * @param expr l'expression a evaluer + * @return La valeur renvoyee par la commande + */ + public Object eval(String expr) throws RException; + + public void terminate() throws RException; + +} //RJniEngine Added: src/java/org/codelutin/j2r/RException.java =================================================================== --- src/java/org/codelutin/j2r/RException.java 2006-08-22 17:21:04 UTC (rev 0) +++ src/java/org/codelutin/j2r/RException.java 2006-08-23 16:14:42 UTC (rev 1) @@ -0,0 +1,73 @@ +/* *##% +* Copyright (C) 2002, 2003, 2004, 2005, 2006 Code Lutin, +* Cedric Pineau, Benjamin Poussin, Arnaud Thimel +* +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +*##%*/ + +/* * +* RException.java +* +* Created: 22 ao�t 06 +* +* @author Arnaud Thimel <thimel@codelutin.com> +* @version $Revision: $ +* +* Mise a jour: $Date: $ +* par : $Author: $ +*/ + +package org.codelutin.j2r; + +/** + * Exception levee lorsqu'une erreur est intervenue pendant la communication + * avec R (quelque soit le mode de communication). + */ +public class RException extends Exception { + + /** + * Constructeur de l'exception. + */ + public RException() { + super(); + } + + /** + * Constructeur de l'exception. + * @param message texte decrivant l'exception + */ + public RException(String message) { + super(message); + } + + /** + * Constructeur de l'exception. + * @param cause l'instance de Throwable qui a declenche cette exception + */ + public RException(Throwable cause) { + super(cause); + } + + /** + * Constructeur de l'exception. + * @param message texte decrivant l'exception + * @param cause l'instance de Throwable qui a declenche cette exception + */ + public RException(String message, Throwable cause) { + super(message, cause); + } + +} //RException Added: src/java/org/codelutin/j2r/RProxy.java =================================================================== --- src/java/org/codelutin/j2r/RProxy.java 2006-08-22 17:21:04 UTC (rev 0) +++ src/java/org/codelutin/j2r/RProxy.java 2006-08-23 16:14:42 UTC (rev 1) @@ -0,0 +1,138 @@ +/* *##% +* Copyright (C) 2002, 2003, 2004, 2005, 2006 Code Lutin, +* Cedric Pineau, Benjamin Poussin, Arnaud Thimel +* +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +*##%*/ + +/* * +* RProxy.java +* +* Created: 21 aout 2006 +* +* @author Arnaud Thimel <thimel@codelutin.com> +* @version $Revision: $ +* +* Mise a jour: $Date: $ +* par : $Author: $ +*/ + +package org.codelutin.j2r; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.codelutin.j2r.jni.RJniEngine; +import org.codelutin.j2r.net.RNetEngine; + +/** + * + */ +public class RProxy implements REngine { + + private Log log = LogFactory.getLog(RProxy.class); + + private REngine engine; + + public RProxy() { + init(); + } + + private boolean init(String RType) { + boolean initSucceded = false; + if ("net".equalsIgnoreCase(RType)) { + initSucceded = initOnNet(); + if (!initSucceded) { + if (log.isErrorEnabled()) { + log.error("Initialization of R with Network failed, trying JNI"); + } + initSucceded = initOnJNI(); + } + } else if ("jni".equalsIgnoreCase(RType)) { + initSucceded = initOnJNI(); + if (!initSucceded) { + if (log.isErrorEnabled()) { + log.error("Initialization of R over JNI failed, trying with Network"); + } + initSucceded = initOnNet(); + } + } else if (log.isErrorEnabled()) { + log.error("Invalid type specified : " + RType); + } + return initSucceded; + } + + private boolean initOnJNI() { + if (log.isInfoEnabled()) { + log.info("Trying to initialize the R Proxy over JNI"); + } + RJniEngine newEngine = new RJniEngine(); + if (newEngine.init()) { + engine = newEngine; + return true; + } + return false; + } + + private boolean initOnNet() { + if (log.isInfoEnabled()) { + log.info("Trying to initialize the R Proxy with Network"); + } + RNetEngine newEngine = new RNetEngine(); + if (newEngine.init()) { + engine = newEngine; + return true; + } + return false; + } + + /* (non-Javadoc) + * @see org.codelutin.R.REngine#eval(java.lang.String) + */ + public Object eval(String expr) throws RException { + if (engine == null) { + log.fatal("The R Proxy is not initialized. An error probably " + + "occured during the initialization."); + return null; + } + return engine.eval(expr); + } + + public boolean init() { + String RType = System.getProperty("R.type"); + if (RType == null || "".equals(RType)) { + log.warn("No R type specified.\nusage:\n\tjava -DR.type=net ...\n" + + "or\n\tjava -DR.type=jni ...\n\nConsidering network type"); + RType = "net"; + } + if (!init(RType)) { + if (log.isFatalEnabled()) { + log.fatal("The initializaing of R failed."); + } + return false; + } + return true; + } + + public void terminate() throws RException { + if (engine == null) { + log.fatal("The R Proxy is not initialized. An error probably " + + "occured during the initialization."); + } else { + engine.terminate(); + } + } + +} //RProxy Added: src/java/org/codelutin/j2r/jni/RJniEngine.java =================================================================== --- src/java/org/codelutin/j2r/jni/RJniEngine.java 2006-08-22 17:21:04 UTC (rev 0) +++ src/java/org/codelutin/j2r/jni/RJniEngine.java 2006-08-23 16:14:42 UTC (rev 1) @@ -0,0 +1,122 @@ +/* *##% + * Copyright (C) 2002, 2003, 2004, 2005, 2006 Code Lutin, + * Cedric Pineau, Benjamin Poussin, Arnaud Thimel + * + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *##%*/ + +/* * + * RJniEngine.java + * + * Created: 22 aout 2006 + * + * @author Arnaud Thimel <thimel@codelutin.com> + * @version $Revision: $ + * + * Mise a jour: $Date: $ + * par : $Author: $ + */ + +package org.codelutin.j2r.jni; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.codelutin.j2r.REngine; +import org.codelutin.j2r.RException; +import org.rosuda.JRI.REXP; +import org.rosuda.JRI.Rengine; + +/** + * + */ +public class RJniEngine implements REngine { + + private Log log = LogFactory.getLog(RJniEngine.class); + + private Rengine engine; + + /* (non-Javadoc) + * @see org.codelutin.j2r.REngine#init() + */ + public boolean init() { + String[] args = { "--no-save" }; + engine = new Rengine(args, false, null); + if (!engine.waitForR()) { + if (log.isErrorEnabled()) { + log.error("Cannot load the R engine"); + } + return false; + } + return true; + } + + /* + * (non-Javadoc) + * + * @see org.codelutin.R.REngine#eval(java.lang.String) + */ + public Object eval(String expr) throws RException { + REXP result = null; + try { + result = engine.eval(expr); + } catch (Exception eee) { + throw new RException("Unable to evaluate the R expression " + + "over JNI", eee); + } + return convertResult(result); + } + + private Object convertResult(REXP rexp) { + if (log.isDebugEnabled()) { + log.debug("Converting : " + rexp.toString()); + } + int type = rexp.xt; + Object result = null; + switch (type) { + case REXP.XT_STR: + result = rexp.asString(); + break; + case REXP.XT_DOUBLEARRAY: + result = rexp.asDoubleArray(); + double[] doublearray = (double[]) result; + if (doublearray.length == 1) { + result = doublearray[0]; + } + break; + case REXP.XT_INTARRAY: + result = rexp.asIntArray(); + int[] intarray = (int[]) result; + if (intarray.length == 1) { + result = intarray[0]; + } + break; + default: + log.error("Unknown return type [" + type + "] " + + "on : " + rexp.toString()); + } + return result; + } + + /* (non-Javadoc) + * @see org.codelutin.j2r.REngine#terminate() + */ + public void terminate() { + if (engine.isAlive()) { + engine.end(); + } + } + +} // RJniEngine Added: src/java/org/codelutin/j2r/net/RNetEngine.java =================================================================== --- src/java/org/codelutin/j2r/net/RNetEngine.java 2006-08-22 17:21:04 UTC (rev 0) +++ src/java/org/codelutin/j2r/net/RNetEngine.java 2006-08-23 16:14:42 UTC (rev 1) @@ -0,0 +1,131 @@ +/* *##% +* Copyright (C) 2002, 2003, 2004, 2005, 2006 Code Lutin, +* Cedric Pineau, Benjamin Poussin, Arnaud Thimel +* +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +*##%*/ + +/* * +* RNetEngine.java +* +* Created: 22 ao�t 06 +* +* @author Arnaud Thimel <thimel@codelutin.com> +* @version $Revision: $ +* +* Mise a jour: $Date: $ +* par : $Author: $ +*/ + +package org.codelutin.j2r.net; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.codelutin.j2r.REngine; +import org.codelutin.j2r.RException; +import org.rosuda.JRclient.REXP; +import org.rosuda.JRclient.RSrvException; +import org.rosuda.JRclient.Rconnection; + +/** + * + */ +public class RNetEngine implements REngine { + + private Log log = LogFactory.getLog(RNetEngine.class); + + private Rconnection conn; + + public boolean init() { + return init("127.0.0.1"); + } + + public boolean init(String host) { + return init(host, 6311); + } + + public boolean init(String host, int port) { + try { + conn = new Rconnection(host, port); + } catch (RSrvException e) { + e.printStackTrace(); + } + return true; + } + + /* (non-Javadoc) + * @see org.codelutin.R.REngine#eval(java.lang.String) + */ + public Object eval(String expr) throws RException { + REXP result = null; + try { + result = conn.eval(expr); + } catch (RSrvException e) { + throw new RException("An error occured during the eval method", e); + } + return convertResult(result); + } + + private Object convertResult(REXP rexp) { + if (log.isDebugEnabled()) { + log.debug("Converting : " + rexp.toString()); + } + int type = rexp.getType(); + Object result = null; + switch (type) { + case REXP.XT_BOOL: + result = rexp.asBool().isTRUE(); + break; + case REXP.XT_STR: + result = rexp.asString(); + break; + case REXP.XT_DOUBLE: + result = rexp.asDouble(); + break; + case REXP.XT_INT: + result = rexp.asInt(); + break; + case REXP.XT_ARRAY_DOUBLE: + result = rexp.asDoubleArray(); + double[] doublearray = (double[])result; + if (doublearray.length == 1) { + result = doublearray[0]; + } + break; + case REXP.XT_ARRAY_INT: + result = rexp.asIntArray(); + int[] intarray = (int[])result; + if (intarray.length == 1) { + result = intarray[0]; + } + break; + default: + log.error("Unknown return type [" + type + "] " + + "on : " + rexp.toString()); + } + return result; + } + + /* (non-Javadoc) + * @see org.codelutin.j2r.REngine#terminate() + */ + public void terminate() throws RException { + if (conn.isConnected()) { + conn.close(); + } + } + +} //RNetEngine Added: src/resources/libjri.so =================================================================== (Binary files differ) Property changes on: src/resources/libjri.so ___________________________________________________________________ Name: svn:executable + Name: svn:mime-type + application/octet-stream Added: src/resources/log4j.properties =================================================================== --- src/resources/log4j.properties 2006-08-22 17:21:04 UTC (rev 0) +++ src/resources/log4j.properties 2006-08-23 16:14:42 UTC (rev 1) @@ -0,0 +1,8 @@ +# Global logging configuration +log4j.rootLogger=INFO, stdout +# Console output... +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n +# package level +log4j.logger.org.codelutin.j2r=INFO Added: src/test/org/codelutin/j2r/JNITest.java =================================================================== --- src/test/org/codelutin/j2r/JNITest.java 2006-08-22 17:21:04 UTC (rev 0) +++ src/test/org/codelutin/j2r/JNITest.java 2006-08-23 16:14:42 UTC (rev 1) @@ -0,0 +1,68 @@ +/* *##% +* Copyright (C) 2002, 2003, 2004, 2005, 2006 Code Lutin, +* Cedric Pineau, Benjamin Poussin, Arnaud Thimel +* +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +*##%*/ + +/* * +* NetTest.java +* +* Created: 23 août 06 +* +* @author Arnaud Thimel <thimel@codelutin.com> +* @version $Revision: $ +* +* Mise a jour: $Date: $ +* par : $Author: $ +*/ + +package org.codelutin.j2r; + +import junit.framework.TestCase; + +public class JNITest extends TestCase { + + private REngine engine; + + @Override + protected void setUp() throws Exception { + System.setProperty("R.type", "jni"); + if (engine == null) { + engine = new RProxy(); + } + } + + @Override + protected void tearDown() throws Exception { + engine.terminate(); + } + + public void testDouble() throws Exception { + assertEquals(5.0, engine.eval("5.0")); + } + + public void testIntArray() throws Exception { + Object result = engine.eval("5:10"); + assertEquals(int[].class, result.getClass()); + int[] intArray = (int[])result; + assertEquals(6, intArray.length); + for (int i=5; i<11; i++) { + assertEquals(i, intArray[i-5]); + } + } + +} //NetTest Added: src/test/org/codelutin/j2r/NetTest.java =================================================================== --- src/test/org/codelutin/j2r/NetTest.java 2006-08-22 17:21:04 UTC (rev 0) +++ src/test/org/codelutin/j2r/NetTest.java 2006-08-23 16:14:42 UTC (rev 1) @@ -0,0 +1,63 @@ +/* *##% +* Copyright (C) 2002, 2003, 2004, 2005, 2006 Code Lutin, +* Cedric Pineau, Benjamin Poussin, Arnaud Thimel +* +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +*##%*/ + +/* * +* NetTest.java +* +* Created: 23 août 06 +* +* @author Arnaud Thimel <thimel@codelutin.com> +* @version $Revision: $ +* +* Mise a jour: $Date: $ +* par : $Author: $ +*/ + +package org.codelutin.j2r; + +import junit.framework.TestCase; + +public class NetTest extends TestCase { + + private REngine engine; + + @Override + protected void setUp() throws Exception { + System.setProperty("R.type", "net"); + if (engine == null) { + engine = new RProxy(); + } + } + + public void testDouble() throws Exception { + assertEquals(5.0, engine.eval("5.0")); + } + + public void testIntArray() throws Exception { + Object result = engine.eval("5:10"); + assertEquals(int[].class, result.getClass()); + int[] intArray = (int[])result; + assertEquals(6, intArray.length); + for (int i=5; i<11; i++) { + assertEquals(i, intArray[i-5]); + } + } + +} //NetTest Added: target/classes/libjri.so =================================================================== (Binary files differ) Property changes on: target/classes/libjri.so ___________________________________________________________________ Name: svn:executable + Name: svn:mime-type + application/octet-stream Added: target/classes/log4j.properties =================================================================== --- target/classes/log4j.properties 2006-08-22 17:21:04 UTC (rev 0) +++ target/classes/log4j.properties 2006-08-23 16:14:42 UTC (rev 1) @@ -0,0 +1,8 @@ +# Global logging configuration +log4j.rootLogger=INFO, stdout +# Console output... +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n +# package level +log4j.logger.org.codelutin.j2r=INFO Added: target/classes/org/codelutin/j2r/REngine.class =================================================================== (Binary files differ) Property changes on: target/classes/org/codelutin/j2r/REngine.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: target/classes/org/codelutin/j2r/RException.class =================================================================== (Binary files differ) Property changes on: target/classes/org/codelutin/j2r/RException.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: target/classes/org/codelutin/j2r/RProxy.class =================================================================== (Binary files differ) Property changes on: target/classes/org/codelutin/j2r/RProxy.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: target/classes/org/codelutin/j2r/jni/RJniEngine.class =================================================================== (Binary files differ) Property changes on: target/classes/org/codelutin/j2r/jni/RJniEngine.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: target/classes/org/codelutin/j2r/net/RNetEngine.class =================================================================== (Binary files differ) Property changes on: target/classes/org/codelutin/j2r/net/RNetEngine.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: target/test-classes/org/codelutin/j2r/JNITest.class =================================================================== (Binary files differ) Property changes on: target/test-classes/org/codelutin/j2r/JNITest.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: target/test-classes/org/codelutin/j2r/NetTest.class =================================================================== (Binary files differ) Property changes on: target/test-classes/org/codelutin/j2r/NetTest.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream