October 2010 - Nuiton-j2r-commits - mailman.cloud.codelutin.com

r234 - in trunk: . src/test/java/org/nuiton/j2r
by jcouteau＠users.nuiton.org 18 Oct '10

18 Oct '10

Author: jcouteau Date: 2010-10-18 10:58:12 +0200 (Mon, 18 Oct 2010) New Revision: 234 Url: http://nuiton.org/repositories/revision/nuiton-j2r/234 Log: Tests are now skipped when no R environment found Modified: trunk/pom.xml trunk/src/test/java/org/nuiton/j2r/DataframeTest.java trunk/src/test/java/org/nuiton/j2r/JNITest.java trunk/src/test/java/org/nuiton/j2r/ListTest.java trunk/src/test/java/org/nuiton/j2r/NetTest.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-17 01:38:29 UTC (rev 233) +++ trunk/pom.xml 2010-10-18 08:58:12 UTC (rev 234) @@ -101,12 +101,14 @@ <version>0.8-4</version> <scope>compile</scope> </dependency> + <dependency> <groupId>org.nuiton.thirdparty</groupId> <artifactId>REngine</artifactId> <version>${rengine.version}</version> <scope>compile</scope> </dependency> + <dependency> <groupId>org.nuiton.thirdparty</groupId> <artifactId>Rserve</artifactId> @@ -145,9 +147,6 @@ <rengine.version>0.6-1</rengine.version> -  - <maven.test.failure.ignore>true</maven.test.failure.ignore> -   Modified: trunk/src/test/java/org/nuiton/j2r/DataframeTest.java =================================================================== --- trunk/src/test/java/org/nuiton/j2r/DataframeTest.java 2010-10-17 01:38:29 UTC (rev 233) +++ trunk/src/test/java/org/nuiton/j2r/DataframeTest.java 2010-10-18 08:58:12 UTC (rev 234) @@ -35,6 +35,7 @@ import org.apache.commons.logging.LogFactory; import org.junit.After; import org.junit.Assert; +import org.junit.Assume; import org.junit.Before; import org.junit.Test; import org.nuiton.j2r.types.RDataFrame; @@ -47,16 +48,20 @@ @Before public void setUp() throws Exception { - LutinTimer init = new LutinTimer(); - init.startTiming(); if (engine == null) { - engine = new RProxy(); + try { + engine = new RProxy(); + } catch (RException eee){ + Assume.assumeTrue(false); + } } } @After public void tearDown() throws Exception { - engine.terminate(); + if (engine != null){ + engine.terminate(); + } } @Test Modified: trunk/src/test/java/org/nuiton/j2r/JNITest.java =================================================================== --- trunk/src/test/java/org/nuiton/j2r/JNITest.java 2010-10-17 01:38:29 UTC (rev 233) +++ trunk/src/test/java/org/nuiton/j2r/JNITest.java 2010-10-18 08:58:12 UTC (rev 234) @@ -39,12 +39,12 @@ import org.apache.commons.logging.LogFactory; import org.junit.After; import org.junit.Assert; +import org.junit.Assume; import org.junit.Before; import org.junit.Test; import org.nuiton.j2r.jni.RJniEngine; import org.nuiton.j2r.types.RDataFrame; import org.nuiton.j2r.types.RList; -import org.rosuda.JRI.Rengine; import java.io.File; @@ -63,16 +63,24 @@ savedRType = System.getProperty("R.type", ""); System.setProperty("R.type", "jni"); if (engine == null) { - engine = new RProxy(); + try { + engine = new RProxy(); + } catch (RException eee){ + Assume.assumeTrue(false); + } } if (log.isInfoEnabled()) { log.info("jni init: " + init.endTiming() + "ms"); } + + Assume.assumeTrue(engine instanceof RJniEngine); } @After public void tearDown() throws Exception { - engine.terminate(); + if (engine !=null){ + engine.terminate(); + } System.setProperty("R.type", savedRType); } Modified: trunk/src/test/java/org/nuiton/j2r/ListTest.java =================================================================== --- trunk/src/test/java/org/nuiton/j2r/ListTest.java 2010-10-17 01:38:29 UTC (rev 233) +++ trunk/src/test/java/org/nuiton/j2r/ListTest.java 2010-10-18 08:58:12 UTC (rev 234) @@ -29,6 +29,7 @@ import org.apache.commons.logging.LogFactory; import org.junit.After; import org.junit.Assert; +import org.junit.Assume; import org.junit.Before; import org.junit.Test; import org.nuiton.j2r.types.RList; @@ -48,16 +49,20 @@ @Before public void setUp() throws Exception { - LutinTimer init = new LutinTimer(); - init.startTiming(); if (engine == null) { - engine = new RProxy(); + try { + engine = new RProxy(); + } catch (RException eee) { + Assume.assumeTrue(false); + } } } @After public void tearDown() throws Exception { - engine.terminate(); + if (engine != null) { + engine.terminate(); + } } @Test Modified: trunk/src/test/java/org/nuiton/j2r/NetTest.java =================================================================== --- trunk/src/test/java/org/nuiton/j2r/NetTest.java 2010-10-17 01:38:29 UTC (rev 233) +++ trunk/src/test/java/org/nuiton/j2r/NetTest.java 2010-10-18 08:58:12 UTC (rev 234) @@ -49,10 +49,13 @@ import org.apache.commons.logging.LogFactory; import org.junit.After; import org.junit.Assert; +import org.junit.Assume; import org.junit.Before; import org.junit.Test; +import org.nuiton.j2r.net.RNetEngine; import org.nuiton.j2r.types.RDataFrame; import org.nuiton.j2r.types.RList; +import org.rosuda.REngine.Rserve.RserveException; public class NetTest { @@ -67,16 +70,23 @@ savedRType = System.getProperty("R.type", ""); System.setProperty("R.type", "net://:6311"); if (engine == null) { - engine = new RProxy(); + try { + engine = new RProxy(); + if (log.isInfoEnabled()) { + log.info("net init: " + init.endTiming() + "ms"); + } + } catch (RException eee){ + Assume.assumeTrue(false); + } } - if (log.isInfoEnabled()) { - log.info("net init: " + init.endTiming() + "ms"); - } + Assume.assumeTrue(engine instanceof RNetEngine); } @After public void tearDown() throws Exception { - engine.terminate(); + if (engine != null){ + engine.terminate(); + } System.setProperty("R.type", savedRType); }

1 0

r233 - trunk
by tchemit＠users.nuiton.org 17 Oct '10

17 Oct '10

Author: tchemit Date: 2010-10-17 03:38:29 +0200 (Sun, 17 Oct 2010) New Revision: 233 Url: http://nuiton.org/repositories/revision/nuiton-j2r/233 Log: Update mavenpom4redmineAndCentral to 2.3.2. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-15 09:29:53 UTC (rev 232) +++ trunk/pom.xml 2010-10-17 01:38:29 UTC (rev 233) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.3.1</version> + <version>2.3.2</version> </parent> <artifactId>nuiton-j2r</artifactId>

1 0

r232 - trunk/src/main/java/org/nuiton/j2r/jni
by echatellier＠users.nuiton.org 15 Oct '10

15 Oct '10

Author: echatellier Date: 2010-10-15 11:29:53 +0200 (Fri, 15 Oct 2010) New Revision: 232 Url: http://nuiton.org/repositories/revision/nuiton-j2r/232 Log: Remove comment about system property Modified: trunk/src/main/java/org/nuiton/j2r/jni/RJniEngine.java Modified: trunk/src/main/java/org/nuiton/j2r/jni/RJniEngine.java =================================================================== --- trunk/src/main/java/org/nuiton/j2r/jni/RJniEngine.java 2010-10-08 23:50:43 UTC (rev 231) +++ trunk/src/main/java/org/nuiton/j2r/jni/RJniEngine.java 2010-10-15 09:29:53 UTC (rev 232) @@ -80,7 +80,7 @@ String[] args = {"--no-save"}; //Set the property so that rJava does not make a System.exit(1) - //System.setProperty("jri.ignore.ule", "yes"); + System.setProperty("jri.ignore.ule", "yes"); //jriLoaded is false is rJava did not find jri library if (!Rengine.jriLoaded) {

1 0

r231 - trunk
by tchemit＠users.nuiton.org 08 Oct '10

08 Oct '10

Author: tchemit Date: 2010-10-09 01:50:43 +0200 (Sat, 09 Oct 2010) New Revision: 231 Url: http://nuiton.org/repositories/revision/nuiton-j2r/231 Log: Update mavenpom4redmineAndCentral to 2.3.1. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-03 15:52:31 UTC (rev 230) +++ trunk/pom.xml 2010-10-08 23:50:43 UTC (rev 231) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.3</version> + <version>2.3.1</version> </parent> <artifactId>nuiton-j2r</artifactId>

1 0

r230 - trunk
by tchemit＠users.nuiton.org 03 Oct '10

03 Oct '10

Author: tchemit Date: 2010-10-03 17:52:31 +0200 (Sun, 03 Oct 2010) New Revision: 230 Url: http://nuiton.org/repositories/revision/nuiton-j2r/230 Log: Update mavenpom4redmineAndCentral to 2.3. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-03 10:58:19 UTC (rev 229) +++ trunk/pom.xml 2010-10-03 15:52:31 UTC (rev 230) @@ -33,8 +33,8 @@ <parent> <groupId>org.nuiton</groupId> - <artifactId>mavenpom4redmine</artifactId> - <version>2.2.6</version> + <artifactId>mavenpom4redmineAndCentral</artifactId> + <version>2.3</version> </parent> <artifactId>nuiton-j2r</artifactId> @@ -222,51 +222,6 @@ </build> </profile> - - <profile> - <id>central-safe</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - - <properties> - -  - <release.repository>${nuiton.central.release.repository}</release.repository> - - </properties> - - <build> - <defaultGoal>validate</defaultGoal> - <plugins> - <plugin> - <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> - <executions> - <execution> - <id>check-central-safe</id> - <inherited>true</inherited> - <goals> - <goal>check-auto-container</goal> - </goals> - <configuration> - <addMavenCentral>true</addMavenCentral> - <failIfNotSafe>true</failIfNotSafe> - <repositories> - <nuiton-central-releases> - http://nexus.nuiton.org/nexus/content/repositories/nuiton-central-releases - </nuiton-central-releases> - </repositories> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> </profiles>

1 0

r228 - trunk
by jcouteau＠users.nuiton.org 03 Oct '10

03 Oct '10

Author: jcouteau Date: 2010-10-02 15:54:51 +0200 (Sat, 02 Oct 2010) New Revision: 228 Url: http://nuiton.org/repositories/revision/nuiton-j2r/228 Log: Add developpers to pom Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-09-29 08:11:05 UTC (rev 227) +++ trunk/pom.xml 2010-10-02 13:54:51 UTC (rev 228) @@ -40,6 +40,52 @@ <artifactId>nuiton-j2r</artifactId> <version>1.0.2-SNAPSHOT</version> + <developers> + <developer> + <id>jchemit</id> + <name>Tony Chemit</name> + <email>chemit(a)codelutin.com</email> + <organization>CodeLutin</organization> + <roles> + <role>developer</role> + </roles> + <timezone>+2</timezone> + </developer> + + <developer> + <id>jcouteau</id> + <name>Jean Couteau</name> + <email>couteau(a)codelutin.com</email> + <organization>CodeLutin</organization> + <roles> + <role>developer, technical writer</role> + </roles> + <timezone>+2</timezone> + </developer> + + <developer> + <id>echatellier</id> + <name>Eric Chatellier</name> + <email>chatellier(a)codelutin.com</email> + <organization>CodeLutin</organization> + <roles> + <role>developer</role> + </roles> + <timezone>+2</timezone> + </developer> + + <developer> + <id>athimel</id> + <name>Arnaud Thimel</name> + <email>thimel(a)codelutin.com</email> + <organization>CodeLutin</organization> + <roles> + <role>developer</role> + </roles> + <timezone>+2</timezone> + </developer> + </developers> + <dependencies> <dependency>

3 4

r229 - trunk
by tchemit＠users.nuiton.org 03 Oct '10

03 Oct '10

Author: tchemit Date: 2010-10-03 12:58:19 +0200 (Sun, 03 Oct 2010) New Revision: 229 Url: http://nuiton.org/repositories/revision/nuiton-j2r/229 Log: fix developer section Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-02 13:54:51 UTC (rev 228) +++ trunk/pom.xml 2010-10-03 10:58:19 UTC (rev 229) @@ -42,7 +42,7 @@ <developers> <developer> - <id>jchemit</id> + <id>tchemit</id> <name>Tony Chemit</name> <email>chemit(a)codelutin.com</email> <organization>CodeLutin</organization> @@ -58,7 +58,8 @@ <email>couteau(a)codelutin.com</email> <organization>CodeLutin</organization> <roles> - <role>developer, technical writer</role> + <role>developer</role> + <role>technical writer</role> </roles> <timezone>+2</timezone> </developer>

1 0