March 2010 - Callao-commits - mailman.cloud.codelutin.com

r2704 - trunk
by tchemit＠users.chorem.org March 27, 2010

March 27, 2010

Author: tchemit Date: 2010-03-27 21:06:52 +0100 (Sat, 27 Mar 2010) New Revision: 2704 Log: Utilisation de mavenpom4redmine 2.0.7 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-03-12 20:15:35 UTC (rev 2703) +++ trunk/pom.xml 2010-03-27 20:06:52 UTC (rev 2704) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.0.6</version> + <version>2.0.7</version> </parent> <groupId>org.chorem</groupId>

1 0

r2703 - trunk
by tchemit＠users.chorem.org March 12, 2010

March 12, 2010

Author: tchemit Date: 2010-03-12 21:15:35 +0100 (Fri, 12 Mar 2010) New Revision: 2703 Log: Utilisation de mavenpom4redmine 2.0.6 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-03-10 13:33:37 UTC (rev 2702) +++ trunk/pom.xml 2010-03-12 20:15:35 UTC (rev 2703) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.0.5</version> + <version>2.0.6</version> </parent> <groupId>org.chorem</groupId>

1 0

r2702 - trunk
by tchemit＠users.chorem.org March 10, 2010

March 10, 2010

Author: tchemit Date: 2010-03-10 14:33:37 +0100 (Wed, 10 Mar 2010) New Revision: 2702 Log: use nuiton-utils 1.2 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-03-01 15:16:14 UTC (rev 2701) +++ trunk/pom.xml 2010-03-10 13:33:37 UTC (rev 2702) @@ -116,7 +116,7 @@ <maven.test.testFailureIgnore>true</maven.test.testFailureIgnore>  - <nuiton-utils.version>1.1.4</nuiton-utils.version> + <nuiton-utils.version>1.2</nuiton-utils.version> <topia.version>2.2.0</topia.version> <eugene.version>1.0.0</eugene.version>

1 0

r2701 - trunk/callao-service/src/main/java/org/chorem/callao/service/utils
by echatellier＠users.chorem.org March 1, 2010

March 1, 2010

Author: echatellier Date: 2010-03-01 16:16:14 +0100 (Mon, 01 Mar 2010) New Revision: 2701 Modified: trunk/callao-service/src/main/java/org/chorem/callao/service/utils/ContextCallao.java Log: Private c'est maaaaall Modified: trunk/callao-service/src/main/java/org/chorem/callao/service/utils/ContextCallao.java =================================================================== --- trunk/callao-service/src/main/java/org/chorem/callao/service/utils/ContextCallao.java 2010-03-01 15:08:50 UTC (rev 2700) +++ trunk/callao-service/src/main/java/org/chorem/callao/service/utils/ContextCallao.java 2010-03-01 15:16:14 UTC (rev 2701) @@ -38,17 +38,17 @@ /** * Instance de la classe (patron singleton) */ - private static ContextCallao instance = null; + protected static ContextCallao instance = null; /** * Fichier pour la configuration de la base de donnees. */ - private Properties configurationFile; + protected Properties configurationFile; /** * Construit le context global. */ - private ContextCallao() { + protected ContextCallao() { super(ContextCallao.class); } @@ -66,6 +66,8 @@ * Methode qui doit etre appelee pour chaque acces a la base de donnees. * Si le chargement de la configuration n'est pas deja effectuee, alors * il appelle la methode ContextCallao pour instancier rootcontext. + * + * @return current callao context instance */ public static ContextCallao getInstance() { if (instance == null) {

1 0

r2700 - trunk/callao-service/src/main/java/org/chorem/callao/service/utils
by echatellier＠users.chorem.org March 1, 2010

March 1, 2010

Author: echatellier Date: 2010-03-01 16:08:50 +0100 (Mon, 01 Mar 2010) New Revision: 2700 Modified: trunk/callao-service/src/main/java/org/chorem/callao/service/utils/ContextCallao.java Log: Renommage d'un attribut "configuration file" Modified: trunk/callao-service/src/main/java/org/chorem/callao/service/utils/ContextCallao.java =================================================================== --- trunk/callao-service/src/main/java/org/chorem/callao/service/utils/ContextCallao.java 2010-03-01 14:18:13 UTC (rev 2699) +++ trunk/callao-service/src/main/java/org/chorem/callao/service/utils/ContextCallao.java 2010-03-01 15:08:50 UTC (rev 2700) @@ -24,7 +24,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.TopiaContext; import org.nuiton.topia.ContextUtil; /** @@ -35,14 +34,16 @@ /** log */ private static final Log log = LogFactory.getLog(ContextCallao.class); + /** * Instance de la classe (patron singleton) */ private static ContextCallao instance = null; + /** * Fichier pour la configuration de la base de donnees. */ - private Properties FichierConfig; + private Properties configurationFile; /** * Construit le context global. @@ -57,8 +58,8 @@ @Override protected Properties loadProperties() throws IOException, URISyntaxException { - FichierConfig = FileConfigLoader.LoadFile("Callao_bdd.properties"); - return FichierConfig; + configurationFile = FileConfigLoader.LoadFile("Callao_bdd.properties"); + return configurationFile; } /**

1 0

r2699 - trunk
by echatellier＠users.chorem.org March 1, 2010

March 1, 2010

Author: echatellier Date: 2010-03-01 15:18:13 +0100 (Mon, 01 Mar 2010) New Revision: 2699 Modified: trunk/pom.xml Log: Update pom xsd location, update to commons-lang-2.5 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-03-01 14:18:11 UTC (rev 2698) +++ trunk/pom.xml 2010-03-01 14:18:13 UTC (rev 2699) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<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"> +<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/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -29,7 +29,7 @@ <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> - <version>2.3</version> + <version>2.5</version> <scope>compile</scope> </dependency> @@ -116,7 +116,7 @@ <maven.test.testFailureIgnore>true</maven.test.testFailureIgnore>  - <nuiton-utils.version>1.1.2</nuiton-utils.version> + <nuiton-utils.version>1.1.4</nuiton-utils.version> <topia.version>2.2.0</topia.version> <eugene.version>1.0.0</eugene.version>

1 0

r2698 - in trunk: callao-entity callao-service
by echatellier＠users.chorem.org March 1, 2010

March 1, 2010

Author: echatellier Date: 2010-03-01 15:18:11 +0100 (Mon, 01 Mar 2010) New Revision: 2698 Modified: trunk/callao-entity/pom.xml trunk/callao-service/pom.xml Log: Update pom xsd location, update to commons-lang-2.5 Modified: trunk/callao-entity/pom.xml =================================================================== --- trunk/callao-entity/pom.xml 2010-03-01 09:48:07 UTC (rev 2697) +++ trunk/callao-entity/pom.xml 2010-03-01 14:18:11 UTC (rev 2698) @@ -1,4 +1,4 @@ -<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"> +<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/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> Modified: trunk/callao-service/pom.xml =================================================================== --- trunk/callao-service/pom.xml 2010-03-01 09:48:07 UTC (rev 2697) +++ trunk/callao-service/pom.xml 2010-03-01 14:18:11 UTC (rev 2698) @@ -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"> +<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/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion>

1 0

r2697 - trunk
by echatellier＠users.chorem.org March 1, 2010

March 1, 2010

Author: echatellier Date: 2010-03-01 10:48:07 +0100 (Mon, 01 Mar 2010) New Revision: 2697 Modified: trunk/pom.xml Log: Update h2 to 1.2 asap. Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-02-21 10:30:57 UTC (rev 2696) +++ trunk/pom.xml 2010-03-01 09:48:07 UTC (rev 2697) @@ -71,7 +71,8 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.1.113</version> +  + <version>1.2.128</version> </dependency> <dependency>

1 0