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

r188 - trunk
by jcouteau＠users.nuiton.org 29 Jan '10

29 Jan '10

Author: jcouteau Date: 2010-01-29 16:35:10 +0100 (Fri, 29 Jan 2010) New Revision: 188 Modified: trunk/pom.xml Log: Update Rserve REngine and JRI versions Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-28 09:33:08 UTC (rev 187) +++ trunk/pom.xml 2010-01-29 15:35:10 UTC (rev 188) @@ -27,7 +27,7 @@ <dependency> <groupId>org.nuiton.thirdparty</groupId> <artifactId>JRI</artifactId> - <version>0.8-0</version> + <version>0.8-2</version> <scope>compile</scope> </dependency> <dependency> @@ -72,7 +72,7 @@ <properties> - <rengine.version>0.6-0</rengine.version> + <rengine.version>0.6-1</rengine.version>  <maven.test.testFailureIgnore>true</maven.test.testFailureIgnore>

1 0

r187 - trunk
by tchemit＠users.nuiton.org 28 Jan '10

28 Jan '10

Author: tchemit Date: 2010-01-28 10:33:08 +0100 (Thu, 28 Jan 2010) New Revision: 187 Modified: trunk/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-28 09:33:06 UTC (rev 186) +++ trunk/pom.xml 2010-01-28 09:33:08 UTC (rev 187) @@ -14,7 +14,7 @@ </parent> <artifactId>nuiton-j2r</artifactId> - <version>1.0.1</version> + <version>1.0.2-SNAPSHOT</version> <dependencies> @@ -106,9 +106,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-j2r/tags/nuiton-j2r-1.0.1</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-j2r/tags/nuiton-j2r-1.0.1</developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-j2r/tags/nuiton-j2r-1.0.1</url> + <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-j2r/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-j2r/trunk</developerConnection> + <url>http://www.nuiton.org/repositories/browse/nuiton-j2r/trunk</url> </scm> <profiles>

1 0

r186 - in tags: . nuiton-j2r-1.0.1
by tchemit＠users.nuiton.org 28 Jan '10

28 Jan '10

Author: tchemit Date: 2010-01-28 10:33:06 +0100 (Thu, 28 Jan 2010) New Revision: 186 Added: tags/nuiton-j2r-1.0.1/ Log: [maven-scm] copy for tag nuiton-j2r-1.0.1 Property changes on: tags/nuiton-j2r-1.0.1 ___________________________________________________________________ Added: svn:ignore + target .classpath .project .settings *.iml *.ipr Added: svn:mergeinfo +

1 0

r185 - trunk
by tchemit＠users.nuiton.org 28 Jan '10

28 Jan '10

Author: tchemit Date: 2010-01-28 10:33:04 +0100 (Thu, 28 Jan 2010) New Revision: 185 Modified: trunk/pom.xml Log: [maven-release-plugin] prepare release nuiton-j2r-1.0.1 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-28 09:31:32 UTC (rev 184) +++ trunk/pom.xml 2010-01-28 09:33:04 UTC (rev 185) @@ -14,7 +14,7 @@ </parent> <artifactId>nuiton-j2r</artifactId> - <version>1.0.1-SNAPSHOT</version> + <version>1.0.1</version> <dependencies> @@ -106,9 +106,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-j2r/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-j2r/trunk</developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-j2r/trunk</url> + <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-j2r/tags/nuiton-j2r-1.0.1</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-j2r/tags/nuiton-j2r-1.0.1</developerConnection> + <url>http://www.nuiton.org/repositories/browse/nuiton-j2r/tags/nuiton-j2r-1.0.1</url> </scm> <profiles>

1 0

r184 - trunk
by tchemit＠users.nuiton.org 28 Jan '10

28 Jan '10

Author: tchemit Date: 2010-01-28 10:31:32 +0100 (Thu, 28 Jan 2010) New Revision: 184 Modified: trunk/pom.xml Log: remove defaultGoal from default build (it hurts when using defaultGoal in profiles) Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-26 21:07:32 UTC (rev 183) +++ trunk/pom.xml 2010-01-28 09:31:32 UTC (rev 184) @@ -86,7 +86,6 @@ </properties> <build> - <defaultGoal>install</defaultGoal> <pluginManagement> <plugins>

1 0

r183 - trunk
by tchemit＠users.nuiton.org 26 Jan '10

26 Jan '10

Author: tchemit Date: 2010-01-26 22:07:32 +0100 (Tue, 26 Jan 2010) New Revision: 183 Modified: trunk/pom.xml Log: Utilisation de mavenpom4redmine 2.0.4 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-26 09:27:32 UTC (rev 182) +++ trunk/pom.xml 2010-01-26 21:07:32 UTC (rev 183) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.0.3</version> + <version>2.0.4</version> </parent> <artifactId>nuiton-j2r</artifactId>

1 0

r182 - in trunk/src: main/java/org/nuiton/j2r test/java/org/nuiton/j2r
by jcouteau＠users.nuiton.org 26 Jan '10

26 Jan '10

Author: jcouteau Date: 2010-01-26 10:27:32 +0100 (Tue, 26 Jan 2010) New Revision: 182 Modified: trunk/src/main/java/org/nuiton/j2r/RProxy.java trunk/src/test/java/org/nuiton/j2r/JNITest.java Log: Add better management of Windows filesystem Modified: trunk/src/main/java/org/nuiton/j2r/RProxy.java =================================================================== --- trunk/src/main/java/org/nuiton/j2r/RProxy.java 2010-01-24 23:36:28 UTC (rev 181) +++ trunk/src/main/java/org/nuiton/j2r/RProxy.java 2010-01-26 09:27:32 UTC (rev 182) @@ -267,7 +267,7 @@ "occured during the initialization."); return; } - engine.voidEval("setwd(\"" + directory.getAbsolutePath() + "\")"); + engine.setwd(directory); } /** Modified: trunk/src/test/java/org/nuiton/j2r/JNITest.java =================================================================== --- trunk/src/test/java/org/nuiton/j2r/JNITest.java 2010-01-24 23:36:28 UTC (rev 181) +++ trunk/src/test/java/org/nuiton/j2r/JNITest.java 2010-01-26 09:27:32 UTC (rev 182) @@ -199,11 +199,24 @@ }*/ @Test public void testWorkingDirectory() throws Exception { + + //test linux paths File workingDirectory = new File("/tmp"); engine.setwd(workingDirectory); File testWorkingDirectory = engine.getwd(); Assert.assertEquals(workingDirectory.getAbsolutePath(), testWorkingDirectory.getAbsolutePath()); + + //test windows paths + File tempFile = File.createTempFile("test","", new File(System.getProperty("java.io.tmpdir"))); + tempFile.delete(); + tempFile.mkdirs(); + workingDirectory = new File(System.getProperty("java.io.tmpdir") + + "\\" + tempFile.getName()); + engine.setwd(workingDirectory); + testWorkingDirectory = engine.getwd(); + Assert.assertEquals(tempFile.getAbsolutePath(), + testWorkingDirectory.getAbsolutePath()); } @Test @@ -214,7 +227,7 @@ engine.remove("a"); engine.loadRData(workingdir); Double testDouble = (Double) engine.eval("a"); - Double compareTo = new Double(5.0); + Double compareTo = 5.0; Assert.assertEquals(compareTo, testDouble); } @@ -230,7 +243,7 @@ engine.remove("a"); engine.dget("a", "testDputDgetfile"); Double testDouble = (Double) engine.eval("a"); - Double compareTo = new Double(5.0); + Double compareTo = 5.0; Assert.assertEquals(compareTo, testDouble); //test method using absolute path @@ -241,7 +254,7 @@ engine.remove("a"); engine.dget("a", testingFile); Double testDouble2 = (Double) engine.eval("a"); - Double compareTo2 = new Double(6.0); + Double compareTo2 = 6.0; Assert.assertEquals(compareTo2, testDouble2); File testWorkingDirectory = engine.getwd(); Assert.assertEquals(workingdir.getAbsolutePath(), @@ -251,7 +264,7 @@ @Test public void testRemove() throws Exception { engine.voidEval("a<-6.0"); - Assert.assertEquals(new Double(6.0), engine.eval("a")); + Assert.assertEquals(6.0, engine.eval("a")); try { engine.remove("a"); engine.eval("a"); @@ -269,7 +282,7 @@ engine.voidEval("a<-5.0"); engine.remove("b"); engine.mv("a", "b"); - Assert.assertEquals(new Double(5.0), engine.eval("b")); + Assert.assertEquals(5.0, engine.eval("b")); Assert.assertFalse((Boolean) engine.eval("exists(\"a\")")); } @@ -300,11 +313,11 @@ engine.voidEval("e<-5.0"); engine.voidEval("f<-5.0"); engine.commit(); - Assert.assertEquals(new Double(10.0), engine.eval("a")); - Assert.assertEquals(new Double(5.0), engine.eval("b")); - Assert.assertEquals(new Double(5.0), engine.eval("d")); - Assert.assertEquals(new Double(5.0), engine.eval("e")); - Assert.assertEquals(new Double(5.0), engine.eval("f")); + Assert.assertEquals(10.0, engine.eval("a")); + Assert.assertEquals(5.0, engine.eval("b")); + Assert.assertEquals(5.0, engine.eval("d")); + Assert.assertEquals(5.0, engine.eval("e")); + Assert.assertEquals(5.0, engine.eval("f")); } @Test

1 0

r181 - trunk
by tchemit＠users.nuiton.org 24 Jan '10

24 Jan '10

Author: tchemit Date: 2010-01-25 00:36:28 +0100 (Mon, 25 Jan 2010) New Revision: 181 Modified: trunk/pom.xml Log: Utilisation de mavenpom4redmine 2.0.3 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-19 17:34:19 UTC (rev 180) +++ trunk/pom.xml 2010-01-24 23:36:28 UTC (rev 181) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.0.2</version> + <version>2.0.3</version> </parent> <artifactId>nuiton-j2r</artifactId>

1 0

r180 - trunk
by tchemit＠users.nuiton.org 19 Jan '10

19 Jan '10

Author: tchemit Date: 2010-01-19 18:34:19 +0100 (Tue, 19 Jan 2010) New Revision: 180 Modified: trunk/pom.xml Log: Utilisation de mavenpom4redmine 2.0.2 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-17 20:15:03 UTC (rev 179) +++ trunk/pom.xml 2010-01-19 17:34:19 UTC (rev 180) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.0.1</version> + <version>2.0.2</version> </parent> <artifactId>nuiton-j2r</artifactId>

1 0

r179 - trunk
by tchemit＠users.nuiton.org 17 Jan '10

17 Jan '10

Author: tchemit Date: 2010-01-17 21:15:03 +0100 (Sun, 17 Jan 2010) New Revision: 179 Modified: trunk/pom.xml Log: Utilisation de mavenpom4redmine 2.0.1 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-12 08:57:00 UTC (rev 178) +++ trunk/pom.xml 2010-01-17 20:15:03 UTC (rev 179) @@ -1,5 +1,5 @@ -<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"> +<?xml version="1.0"?> +<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"> <modelVersion>4.0.0</modelVersion> @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0.1</version> </parent> <artifactId>nuiton-j2r</artifactId> @@ -152,4 +152,4 @@ </profile> </profiles> -</project> \ No newline at end of file +</project>

1 0