- Jmexico-commits - mailman.cloud.codelutin.com

r68 - in trunk: . jmexico-editor jmexico-editor-demo jmexico-model
by maven-release＠users.forge.codelutin.com May 2, 2012

May 2, 2012

Author: maven-release Date: 2012-05-02 11:29:30 +0200 (Wed, 02 May 2012) New Revision: 68 Url: http://forge.codelutin.com/repositories/revision/jmexico/68 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/jmexico-editor-demo/pom.xml trunk/jmexico-editor/pom.xml trunk/jmexico-model/pom.xml trunk/pom.xml Modified: trunk/jmexico-editor/pom.xml =================================================================== --- trunk/jmexico-editor/pom.xml 2012-05-02 09:29:24 UTC (rev 67) +++ trunk/jmexico-editor/pom.xml 2012-05-02 09:29:30 UTC (rev 68) @@ -10,7 +10,7 @@ <parent> <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.5</version> + <version>0.6-SNAPSHOT</version> </parent> <groupId>fr.reseaumexico</groupId> Modified: trunk/jmexico-editor-demo/pom.xml =================================================================== --- trunk/jmexico-editor-demo/pom.xml 2012-05-02 09:29:24 UTC (rev 67) +++ trunk/jmexico-editor-demo/pom.xml 2012-05-02 09:29:30 UTC (rev 68) @@ -10,7 +10,7 @@ <parent> <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.5</version> + <version>0.6-SNAPSHOT</version> </parent> <groupId>fr.reseaumexico</groupId> Modified: trunk/jmexico-model/pom.xml =================================================================== --- trunk/jmexico-model/pom.xml 2012-05-02 09:29:24 UTC (rev 67) +++ trunk/jmexico-model/pom.xml 2012-05-02 09:29:30 UTC (rev 68) @@ -10,7 +10,7 @@ <parent> <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.5</version> + <version>0.6-SNAPSHOT</version> </parent> <groupId>fr.reseaumexico</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-05-02 09:29:24 UTC (rev 67) +++ trunk/pom.xml 2012-05-02 09:29:30 UTC (rev 68) @@ -16,7 +16,7 @@ <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.5</version> + <version>0.6-SNAPSHOT</version> <modules> <module>jmexico-model</module> @@ -181,11 +181,11 @@  <scm> - <connection>scm:svn:http://svn.forge.codelutin.com/svn/jmexico/tags/jmexico-0.5</connection> + <connection>scm:svn:http://svn.forge.codelutin.com/svn/jmexico/trunk</connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/jmexico/tags/jmexico-0.5 + scm:svn:http://svn.forge.codelutin.com/svn/jmexico/trunk </developerConnection> - <url>http://forge.codelutin.com/repositories/browse/jmexico/tags/jmexico-0.5</url> + <url>http://forge.codelutin.com/repositories/browse/jmexico/trunk</url> </scm> <distributionManagement>

1 0

r67 - tags
by maven-release＠users.forge.codelutin.com May 2, 2012

May 2, 2012

Author: maven-release Date: 2012-05-02 11:29:24 +0200 (Wed, 02 May 2012) New Revision: 67 Url: http://forge.codelutin.com/repositories/revision/jmexico/67 Log: [maven-release-plugin] copy for tag jmexico-0.5 Added: tags/jmexico-0.5/

1 0

r66 - in trunk: . jmexico-editor jmexico-editor-demo jmexico-model
by maven-release＠users.forge.codelutin.com May 2, 2012

May 2, 2012

Author: maven-release Date: 2012-05-02 11:29:16 +0200 (Wed, 02 May 2012) New Revision: 66 Url: http://forge.codelutin.com/repositories/revision/jmexico/66 Log: [maven-release-plugin] prepare release jmexico-0.5 Modified: trunk/jmexico-editor-demo/pom.xml trunk/jmexico-editor/pom.xml trunk/jmexico-model/pom.xml trunk/pom.xml Modified: trunk/jmexico-editor/pom.xml =================================================================== --- trunk/jmexico-editor/pom.xml 2012-04-30 12:06:54 UTC (rev 65) +++ trunk/jmexico-editor/pom.xml 2012-05-02 09:29:16 UTC (rev 66) @@ -10,7 +10,7 @@ <parent> <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.5-SNAPSHOT</version> + <version>0.5</version> </parent> <groupId>fr.reseaumexico</groupId> Modified: trunk/jmexico-editor-demo/pom.xml =================================================================== --- trunk/jmexico-editor-demo/pom.xml 2012-04-30 12:06:54 UTC (rev 65) +++ trunk/jmexico-editor-demo/pom.xml 2012-05-02 09:29:16 UTC (rev 66) @@ -10,7 +10,7 @@ <parent> <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.5-SNAPSHOT</version> + <version>0.5</version> </parent> <groupId>fr.reseaumexico</groupId> Modified: trunk/jmexico-model/pom.xml =================================================================== --- trunk/jmexico-model/pom.xml 2012-04-30 12:06:54 UTC (rev 65) +++ trunk/jmexico-model/pom.xml 2012-05-02 09:29:16 UTC (rev 66) @@ -10,7 +10,7 @@ <parent> <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.5-SNAPSHOT</version> + <version>0.5</version> </parent> <groupId>fr.reseaumexico</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-04-30 12:06:54 UTC (rev 65) +++ trunk/pom.xml 2012-05-02 09:29:16 UTC (rev 66) @@ -16,7 +16,7 @@ <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.5-SNAPSHOT</version> + <version>0.5</version> <modules> <module>jmexico-model</module> @@ -181,11 +181,11 @@  <scm> - <connection>scm:svn:http://svn.forge.codelutin.com/svn/jmexico/trunk</connection> + <connection>scm:svn:http://svn.forge.codelutin.com/svn/jmexico/tags/jmexico-0.5</connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/jmexico/trunk + scm:svn:http://svn.forge.codelutin.com/svn/jmexico/tags/jmexico-0.5 </developerConnection> - <url>http://forge.codelutin.com/repositories/browse/jmexico/trunk</url> + <url>http://forge.codelutin.com/repositories/browse/jmexico/tags/jmexico-0.5</url> </scm> <distributionManagement>

1 0

r65 - in trunk: jmexico-editor/src/main/java/fr/reseaumexico/editor jmexico-model/src/main/java/fr/reseaumexico/model/parser
by sletellier＠users.forge.codelutin.com April 30, 2012

April 30, 2012

Author: sletellier Date: 2012-04-30 14:06:54 +0200 (Mon, 30 Apr 2012) New Revision: 65 Url: http://forge.codelutin.com/repositories/revision/jmexico/65 Log: fixes #1187 : Keep order on factor values Modified: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditorHandler.java trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/InputDesignParser.java Modified: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditorHandler.java =================================================================== --- trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditorHandler.java 2012-04-30 12:06:24 UTC (rev 64) +++ trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignEditorHandler.java 2012-04-30 12:06:54 UTC (rev 65) @@ -89,7 +89,7 @@ // create all empty factor values Collection<Factor> factors = inputDesign.getExperimentDesign().getFactor(); - Map<Factor, Object> factorValues = Maps.newHashMap(); + Map<Factor, Object> factorValues = Maps.newLinkedHashMap(); for (Factor factor : factors) { factorValues.put(factor, null); } Modified: trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/InputDesignParser.java =================================================================== --- trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/InputDesignParser.java 2012-04-30 12:06:24 UTC (rev 64) +++ trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/InputDesignParser.java 2012-04-30 12:06:54 UTC (rev 65) @@ -127,7 +127,7 @@ if (parser.nextTag() == XmlPullParser.START_TAG && parserEqual(parser, SCENARIO_FACTOR_VALUES)) { - Map<Factor, Object> factorValues = Maps.newHashMap(); + Map<Factor, Object> factorValues = Maps.newLinkedHashMap(); while (!(parser.getEventType() == XmlPullParser.END_TAG && parserEqual(parser, SCENARIO))) {

1 0

r64 - trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser
by sletellier＠users.forge.codelutin.com April 30, 2012

April 30, 2012

Author: sletellier Date: 2012-04-30 14:06:24 +0200 (Mon, 30 Apr 2012) New Revision: 64 Url: http://forge.codelutin.com/repositories/revision/jmexico/64 Log: fixes #1186 : ExperimentDesignParser dont parse name of factors Modified: trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/ExperimentDesignParser.java Modified: trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/ExperimentDesignParser.java =================================================================== --- trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/ExperimentDesignParser.java 2012-03-29 16:05:40 UTC (rev 63) +++ trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/ExperimentDesignParser.java 2012-04-30 12:06:24 UTC (rev 64) @@ -140,6 +140,10 @@ String id = parser.getAttributeValue(null, FACTOR_ID); factor.setId(id); + // parse name + String name = parser.getAttributeValue(null, FACTOR_NAME); + factor.setName(name); + // while all child attributes is not parsed while (!(parser.getEventType() == XmlPullParser.END_TAG && parserEqual(parser, FACTOR))) {

1 0

r63 - trunk/jmexico-editor-demo
by maven-release＠users.forge.codelutin.com March 29, 2012

March 29, 2012

Author: maven-release Date: 2012-03-29 18:05:40 +0200 (Thu, 29 Mar 2012) New Revision: 63 Url: http://forge.codelutin.com/repositories/revision/jmexico/63 Log: fix webstart plugin coordinates Modified: trunk/jmexico-editor-demo/pom.xml Modified: trunk/jmexico-editor-demo/pom.xml =================================================================== --- trunk/jmexico-editor-demo/pom.xml 2012-03-29 15:54:43 UTC (rev 62) +++ trunk/jmexico-editor-demo/pom.xml 2012-03-29 16:05:40 UTC (rev 63) @@ -298,7 +298,7 @@ <reporting> <plugins> <plugin> - <groupId>org.codehaus.mojo.webstart</groupId> + <groupId>org.codehaus.mojo</groupId> <artifactId>webstart-maven-plugin</artifactId> <version>${webstartPluginVersion}</version> </plugin>

1 0

r62 - tags/jmexico-0.4/jmexico-editor-demo
by maven-release＠users.forge.codelutin.com March 29, 2012

March 29, 2012

Author: maven-release Date: 2012-03-29 17:54:43 +0200 (Thu, 29 Mar 2012) New Revision: 62 Url: http://forge.codelutin.com/repositories/revision/jmexico/62 Log: fix webstart plugin coordinates Modified: tags/jmexico-0.4/jmexico-editor-demo/pom.xml Modified: tags/jmexico-0.4/jmexico-editor-demo/pom.xml =================================================================== --- tags/jmexico-0.4/jmexico-editor-demo/pom.xml 2012-03-29 15:42:01 UTC (rev 61) +++ tags/jmexico-0.4/jmexico-editor-demo/pom.xml 2012-03-29 15:54:43 UTC (rev 62) @@ -298,7 +298,7 @@ <reporting> <plugins> <plugin> - <groupId>org.codehaus.mojo.webstart</groupId> + <groupId>org.codehaus.mojo</groupId> <artifactId>webstart-maven-plugin</artifactId> <version>${webstartPluginVersion}</version> </plugin>

1 0

r61 - in trunk: . jmexico-editor jmexico-editor-demo jmexico-model
by maven-release＠users.forge.codelutin.com March 29, 2012

March 29, 2012

Author: maven-release Date: 2012-03-29 17:42:01 +0200 (Thu, 29 Mar 2012) New Revision: 61 Url: http://forge.codelutin.com/repositories/revision/jmexico/61 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/jmexico-editor-demo/pom.xml trunk/jmexico-editor/pom.xml trunk/jmexico-model/pom.xml trunk/pom.xml Modified: trunk/jmexico-editor/pom.xml =================================================================== --- trunk/jmexico-editor/pom.xml 2012-03-29 15:41:55 UTC (rev 60) +++ trunk/jmexico-editor/pom.xml 2012-03-29 15:42:01 UTC (rev 61) @@ -10,7 +10,7 @@ <parent> <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.4</version> + <version>0.5-SNAPSHOT</version> </parent> <groupId>fr.reseaumexico</groupId> Modified: trunk/jmexico-editor-demo/pom.xml =================================================================== --- trunk/jmexico-editor-demo/pom.xml 2012-03-29 15:41:55 UTC (rev 60) +++ trunk/jmexico-editor-demo/pom.xml 2012-03-29 15:42:01 UTC (rev 61) @@ -10,7 +10,7 @@ <parent> <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.4</version> + <version>0.5-SNAPSHOT</version> </parent> <groupId>fr.reseaumexico</groupId> Modified: trunk/jmexico-model/pom.xml =================================================================== --- trunk/jmexico-model/pom.xml 2012-03-29 15:41:55 UTC (rev 60) +++ trunk/jmexico-model/pom.xml 2012-03-29 15:42:01 UTC (rev 61) @@ -10,7 +10,7 @@ <parent> <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.4</version> + <version>0.5-SNAPSHOT</version> </parent> <groupId>fr.reseaumexico</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-03-29 15:41:55 UTC (rev 60) +++ trunk/pom.xml 2012-03-29 15:42:01 UTC (rev 61) @@ -16,7 +16,7 @@ <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.4</version> + <version>0.5-SNAPSHOT</version> <modules> <module>jmexico-model</module> @@ -181,11 +181,11 @@  <scm> - <connection>scm:svn:http://svn.forge.codelutin.com/svn/jmexico/tags/jmexico-0.4</connection> + <connection>scm:svn:http://svn.forge.codelutin.com/svn/jmexico/trunk</connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/jmexico/tags/jmexico-0.4 + scm:svn:http://svn.forge.codelutin.com/svn/jmexico/trunk </developerConnection> - <url>http://forge.codelutin.com/repositories/browse/jmexico/tags/jmexico-0.4</url> + <url>http://forge.codelutin.com/repositories/browse/jmexico/trunk</url> </scm> <distributionManagement>

1 0

r60 - tags/jmexico-0.4
by maven-release＠users.forge.codelutin.com March 29, 2012

March 29, 2012

Author: maven-release Date: 2012-03-29 17:41:55 +0200 (Thu, 29 Mar 2012) New Revision: 60 Url: http://forge.codelutin.com/repositories/revision/jmexico/60 Log: [maven-release-plugin] copy for tag jmexico-0.4 Added: tags/jmexico-0.4/trunk/

1 0

r59 - in trunk: . jmexico-editor jmexico-editor-demo jmexico-model
by maven-release＠users.forge.codelutin.com March 29, 2012

March 29, 2012

Author: maven-release Date: 2012-03-29 17:41:48 +0200 (Thu, 29 Mar 2012) New Revision: 59 Url: http://forge.codelutin.com/repositories/revision/jmexico/59 Log: [maven-release-plugin] prepare release jmexico-0.4 Modified: trunk/jmexico-editor-demo/pom.xml trunk/jmexico-editor/pom.xml trunk/jmexico-model/pom.xml trunk/pom.xml Modified: trunk/jmexico-editor/pom.xml =================================================================== --- trunk/jmexico-editor/pom.xml 2012-03-29 15:37:19 UTC (rev 58) +++ trunk/jmexico-editor/pom.xml 2012-03-29 15:41:48 UTC (rev 59) @@ -10,7 +10,7 @@ <parent> <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.4-SNAPSHOT</version> + <version>0.4</version> </parent> <groupId>fr.reseaumexico</groupId> Modified: trunk/jmexico-editor-demo/pom.xml =================================================================== --- trunk/jmexico-editor-demo/pom.xml 2012-03-29 15:37:19 UTC (rev 58) +++ trunk/jmexico-editor-demo/pom.xml 2012-03-29 15:41:48 UTC (rev 59) @@ -10,7 +10,7 @@ <parent> <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.4-SNAPSHOT</version> + <version>0.4</version> </parent> <groupId>fr.reseaumexico</groupId> Modified: trunk/jmexico-model/pom.xml =================================================================== --- trunk/jmexico-model/pom.xml 2012-03-29 15:37:19 UTC (rev 58) +++ trunk/jmexico-model/pom.xml 2012-03-29 15:41:48 UTC (rev 59) @@ -10,7 +10,7 @@ <parent> <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.4-SNAPSHOT</version> + <version>0.4</version> </parent> <groupId>fr.reseaumexico</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-03-29 15:37:19 UTC (rev 58) +++ trunk/pom.xml 2012-03-29 15:41:48 UTC (rev 59) @@ -16,7 +16,7 @@ <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.4-SNAPSHOT</version> + <version>0.4</version> <modules> <module>jmexico-model</module> @@ -181,11 +181,11 @@  <scm> - <connection>scm:svn:http://svn.forge.codelutin.com/svn/jmexico/trunk</connection> + <connection>scm:svn:http://svn.forge.codelutin.com/svn/jmexico/tags/jmexico-0.4</connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/jmexico/trunk + scm:svn:http://svn.forge.codelutin.com/svn/jmexico/tags/jmexico-0.4 </developerConnection> - <url>http://forge.codelutin.com/repositories/browse/jmexico/trunk</url> + <url>http://forge.codelutin.com/repositories/browse/jmexico/tags/jmexico-0.4</url> </scm> <distributionManagement>

1 0