- Wikitty-commits - mailman.cloud.codelutin.com

r546 - trunk/wikitty-jdbc-impl
by sletellier＠users.nuiton.org Nov. 30, 2010

Nov. 30, 2010

Author: sletellier Date: 2010-11-30 18:22:39 +0100 (Tue, 30 Nov 2010) New Revision: 546 Url: http://nuiton.org/repositories/revision/wikitty/546 Log: Change postgres dependency to test scope Modified: trunk/wikitty-jdbc-impl/pom.xml Modified: trunk/wikitty-jdbc-impl/pom.xml =================================================================== --- trunk/wikitty-jdbc-impl/pom.xml 2010-11-30 17:05:35 UTC (rev 545) +++ trunk/wikitty-jdbc-impl/pom.xml 2010-11-30 17:22:39 UTC (rev 546) @@ -108,7 +108,7 @@ <dependency> <groupId>postgresql</groupId> <artifactId>postgresql</artifactId> - <scope>runtime</scope> + <scope>test</scope> </dependency> </dependencies>

1 0

r545 - in trunk/wikitty-jdbc-impl: . src/test/java/org/nuiton/wikitty/jdbc/test src/test/resources
by sletellier＠users.nuiton.org Nov. 30, 2010

Nov. 30, 2010

Author: sletellier Date: 2010-11-30 18:05:35 +0100 (Tue, 30 Nov 2010) New Revision: 545 Url: http://nuiton.org/repositories/revision/wikitty/545 Log: Test if wikitty with postgres database is working, allow to add other config Added: trunk/wikitty-jdbc-impl/src/test/resources/postrges-wikitty-config.properties Removed: trunk/wikitty-jdbc-impl/src/test/resources/wikitty-jdbc-config.properties Modified: trunk/wikitty-jdbc-impl/pom.xml trunk/wikitty-jdbc-impl/src/test/java/org/nuiton/wikitty/jdbc/test/StorageJDBCTest.java Modified: trunk/wikitty-jdbc-impl/pom.xml =================================================================== --- trunk/wikitty-jdbc-impl/pom.xml 2010-11-30 14:42:42 UTC (rev 544) +++ trunk/wikitty-jdbc-impl/pom.xml 2010-11-30 17:05:35 UTC (rev 545) @@ -71,6 +71,7 @@ <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> + <dependency> <groupId>commons-dbcp</groupId> <artifactId>commons-dbcp</artifactId> @@ -103,6 +104,13 @@ <groupId>com.h2database</groupId> <artifactId>h2</artifactId> </dependency> + + <dependency> + <groupId>postgresql</groupId> + <artifactId>postgresql</artifactId> + <scope>runtime</scope> + </dependency> + </dependencies>  Modified: trunk/wikitty-jdbc-impl/src/test/java/org/nuiton/wikitty/jdbc/test/StorageJDBCTest.java =================================================================== --- trunk/wikitty-jdbc-impl/src/test/java/org/nuiton/wikitty/jdbc/test/StorageJDBCTest.java 2010-11-30 14:42:42 UTC (rev 544) +++ trunk/wikitty-jdbc-impl/src/test/java/org/nuiton/wikitty/jdbc/test/StorageJDBCTest.java 2010-11-30 17:05:35 UTC (rev 545) @@ -25,10 +25,16 @@ package org.nuiton.wikitty.jdbc.test; +import org.junit.Assume; import org.junit.Before; +import org.nuiton.wikitty.WikittyConfig; +import org.nuiton.wikitty.jdbc.WikittyExtensionStorageJDBC; import org.nuiton.wikitty.jdbc.WikittyServiceJDBC; import org.nuiton.wikitty.conform.StorageTest; +import java.io.InputStream; +import java.util.Properties; + /** * * @author ruchaud, martel @@ -37,11 +43,75 @@ * Last update: $Date$ * by : $Author$ */ -public class StorageJDBCTest extends StorageTest { - +public abstract class StorageJDBCTest extends StorageTest { + @Before public void deleteAll() throws Exception { + String configFileName = getConfigFileName(); + + // If not null use secific config file + // else using H2 by default + if (configFileName != null) { + + // Be sure to not read other config files + InputStream input = WikittyConfig.class.getResourceAsStream(configFileName); + Properties options = new Properties(); + options.load(input); + WikittyConfig config = new WikittyConfig(options); + + try { + canConnectWithConfig(config); + } catch (Exception eee) { + if (log.isWarnEnabled()) { + log.warn("Failled to run test with config '" + configFileName + '"'); + } + if (log.isDebugEnabled()) { + log.debug("An error is occured : ", eee); + } + Assume.assumeNoException(eee); + } + + log.info("Using config file : " + configFileName); + ws = new WikittyServiceJDBC(config); + } + WikittyServiceJDBC service = ((WikittyServiceJDBC) ws); service.clear(null); } + + public void canConnectWithConfig(WikittyConfig config) throws Exception { + new WikittyExtensionStorageJDBC(config); + } + + public abstract String getConfigFileName(); + + /** + *@author sletellier + */ + public class H2StorageJDBCTest extends StorageJDBCTest { + + @Override + public String getConfigFileName() { + + // Use H2 by default + return null; + } + + } + + /** + * You must configure an postgres database and configure + * postgres-wikitty-config.properties to run this test + * <p> + * (see http://jdbc.postgresql.org/development/intro.html#Test+Suite) + * + * @author sletellier + */ + public class PostgresqlStorageJDBCTest extends StorageJDBCTest { + + @Override + public String getConfigFileName() { + return "/postrges-wikitty-config.properties"; + } + } } Added: trunk/wikitty-jdbc-impl/src/test/resources/postrges-wikitty-config.properties =================================================================== --- trunk/wikitty-jdbc-impl/src/test/resources/postrges-wikitty-config.properties (rev 0) +++ trunk/wikitty-jdbc-impl/src/test/resources/postrges-wikitty-config.properties 2010-11-30 17:05:35 UTC (rev 545) @@ -0,0 +1,9 @@ +wikitty.storage.jdbc.driver=org.postgresql.Driver +wikitty.storage.jdbc.host=jdbc:postgresql://localhost/test +wikitty.storage.jdbc.password=password +wikitty.storage.jdbc.login=test +wikitty.storage.jdbc.xadatasource=org.postgresql.xa.PGXADataSource +wikitty.storage.jdbc.xadatasource.org.postgresql.xa.PGXADataSource.serverName=localhost +wikitty.storage.jdbc.xadatasource.org.postgresql.xa.PGXADataSource.databaseName=test +wikitty.storage.jdbc.xadatasource.org.postgresql.xa.PGXADataSource.password=password +wikitty.storage.jdbc.xadatasource.org.postgresql.xa.PGXADataSource.user=test \ No newline at end of file Deleted: trunk/wikitty-jdbc-impl/src/test/resources/wikitty-jdbc-config.properties =================================================================== --- trunk/wikitty-jdbc-impl/src/test/resources/wikitty-jdbc-config.properties 2010-11-30 14:42:42 UTC (rev 544) +++ trunk/wikitty-jdbc-impl/src/test/resources/wikitty-jdbc-config.properties 2010-11-30 17:05:35 UTC (rev 545) @@ -1,35 +0,0 @@ -### -# #%L -# Wikitty :: wikitty-jdbc-impl -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2010 CodeLutin, Benjamin Poussin -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation, either version 3 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 Lesser Public License for more details. -# -# You should have received a copy of the GNU General Lesser Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/lgpl-3.0.html>. -# #L% -### -#Connection parameters for standard datasource -jdbc.con.driver=org.h2.Driver -jdbc.con.host=jdbc:h2:file:./target/data/data -jdbc.con.userName=sa -jdbc.con.password= - -#Connection parameters for xadatasource -jdbc.xadatasource=org.h2.jdbcx.JdbcDataSource -jdbc.xadatasource.org.h2.jdbcx.JdbcDataSource.URL=jdbc:h2:file:./target/data/data -jdbc.xadatasource.org.h2.jdbcx.JdbcDataSource.user=sa -jdbc.xadatasource.org.h2.jdbcx.JdbcDataSource.password=

1 0

r544 - in trunk: src/site/en/rst src/site/rst wikitty-api/src/main/java/org/nuiton/wikitty wikitty-multistorage-impl/src/test/resources
by sletellier＠users.nuiton.org Nov. 30, 2010

Nov. 30, 2010

Author: sletellier Date: 2010-11-30 15:42:42 +0100 (Tue, 30 Nov 2010) New Revision: 544 Url: http://nuiton.org/repositories/revision/wikitty/544 Log: Remove old properties entries Removed: trunk/wikitty-multistorage-impl/src/test/resources/wikitty-jdbc-config.properties Modified: trunk/src/site/en/rst/hessian.rst trunk/src/site/rst/hessian.rst trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfig.java Modified: trunk/src/site/en/rst/hessian.rst =================================================================== --- trunk/src/site/en/rst/hessian.rst 2010-11-30 14:28:40 UTC (rev 543) +++ trunk/src/site/en/rst/hessian.rst 2010-11-30 14:42:42 UTC (rev 544) @@ -66,12 +66,6 @@ wikitty.hessian.usecache=true wikitty.service.cache.listenevents=true - # jdbc configuration - jdbc.con.driver=org.h2.Driver - jdbc.con.host=jdbc:h2:file:/var/lib/myapp/h2db - jdbc.con.userName=sa - jdbc.con.password= - # solr configuration solr.data.dir=/var/lib/myapp/solr Modified: trunk/src/site/rst/hessian.rst =================================================================== --- trunk/src/site/rst/hessian.rst 2010-11-30 14:28:40 UTC (rev 543) +++ trunk/src/site/rst/hessian.rst 2010-11-30 14:42:42 UTC (rev 544) @@ -68,12 +68,6 @@ wikitty.hessian.usecache=true wikitty.service.cache.listenevents=true - # jdbc configuration - jdbc.con.driver=org.h2.Driver - jdbc.con.host=jdbc:h2:file:/var/lib/myapp/h2db - jdbc.con.userName=sa - jdbc.con.password= - # solr configuration solr.data.dir=/var/lib/myapp/solr Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfig.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfig.java 2010-11-30 14:28:40 UTC (rev 543) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfig.java 2010-11-30 14:42:42 UTC (rev 544) @@ -87,7 +87,7 @@ /** * Create WikittyConfig and load particular configuration filename - * @param configFilename + * @param configFilename name of wikitty config file */ public WikittyConfig(String configFilename) { this(); @@ -96,7 +96,8 @@ /** * Create WikittyConfig and use props as default value - * @param props + * + * @param props as default value */ public WikittyConfig(Properties props) { this(); Deleted: trunk/wikitty-multistorage-impl/src/test/resources/wikitty-jdbc-config.properties =================================================================== --- trunk/wikitty-multistorage-impl/src/test/resources/wikitty-jdbc-config.properties 2010-11-30 14:28:40 UTC (rev 543) +++ trunk/wikitty-multistorage-impl/src/test/resources/wikitty-jdbc-config.properties 2010-11-30 14:42:42 UTC (rev 544) @@ -1,5 +0,0 @@ -#Connection parameters -jdbc.con.driver=org.h2.Driver -jdbc.con.host=jdbc:h2:${project.build.directory}/localdb/localdb -jdbc.con.userName=sa -jdbc.con.password=

1 0

r543 - in trunk/wikitty-hessian-server/src: main/java/org/nuiton/wikitty/hessian test/java
by sletellier＠users.nuiton.org Nov. 30, 2010

Nov. 30, 2010

Author: sletellier Date: 2010-11-30 15:28:40 +0100 (Tue, 30 Nov 2010) New Revision: 543 Url: http://nuiton.org/repositories/revision/wikitty/543 Log: Clean code Modified: trunk/wikitty-hessian-server/src/main/java/org/nuiton/wikitty/hessian/WikittyServiceHessianDelegator.java trunk/wikitty-hessian-server/src/test/java/HessianTest.java Modified: trunk/wikitty-hessian-server/src/main/java/org/nuiton/wikitty/hessian/WikittyServiceHessianDelegator.java =================================================================== --- trunk/wikitty-hessian-server/src/main/java/org/nuiton/wikitty/hessian/WikittyServiceHessianDelegator.java 2010-11-30 09:10:44 UTC (rev 542) +++ trunk/wikitty-hessian-server/src/main/java/org/nuiton/wikitty/hessian/WikittyServiceHessianDelegator.java 2010-11-30 14:28:40 UTC (rev 543) @@ -25,7 +25,6 @@ package org.nuiton.wikitty.hessian; -import com.caucho.hessian.server.HessianServlet; import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.WikittyException; import org.nuiton.wikitty.WikittyService; Modified: trunk/wikitty-hessian-server/src/test/java/HessianTest.java =================================================================== --- trunk/wikitty-hessian-server/src/test/java/HessianTest.java 2010-11-30 09:10:44 UTC (rev 542) +++ trunk/wikitty-hessian-server/src/test/java/HessianTest.java 2010-11-30 14:28:40 UTC (rev 543) @@ -49,9 +49,9 @@ os.close(); byte[] bytes = buffer.toByteArray(); - Hessian2Input is = new Hessian2Input(new ByteArrayInputStream(bytes)); - BigDecimal newObject = (BigDecimal) is.readObject(); - is.close(); + Hessian2Input is = new Hessian2Input(new ByteArrayInputStream(bytes)); + BigDecimal newObject = (BigDecimal) is.readObject(); + is.close(); Assert.assertEquals(object, newObject); }

1 0

r542 - trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc
by sletellier＠users.nuiton.org Nov. 30, 2010

Nov. 30, 2010

Author: sletellier Date: 2010-11-30 10:10:44 +0100 (Tue, 30 Nov 2010) New Revision: 542 Url: http://nuiton.org/repositories/revision/wikitty/542 Log: Don't log password Modified: trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyJDBCUtil.java Modified: trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyJDBCUtil.java =================================================================== --- trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyJDBCUtil.java 2010-11-30 09:04:02 UTC (rev 541) +++ trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyJDBCUtil.java 2010-11-30 09:10:44 UTC (rev 542) @@ -280,7 +280,7 @@ String msg = String.format( "Can't connect to database %s %s with login %s", - driver, host, username, password); + driver, host, username); log.error(msg, eee); throw new WikittyException(msg, eee);

1 0

r541 - trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc
by sletellier＠users.nuiton.org Nov. 30, 2010

Nov. 30, 2010

Author: sletellier Date: 2010-11-30 10:04:02 +0100 (Tue, 30 Nov 2010) New Revision: 541 Url: http://nuiton.org/repositories/revision/wikitty/541 Log: Don't log password Modified: trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyJDBCUtil.java Modified: trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyJDBCUtil.java =================================================================== --- trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyJDBCUtil.java 2010-11-28 20:20:07 UTC (rev 540) +++ trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyJDBCUtil.java 2010-11-30 09:04:02 UTC (rev 541) @@ -279,7 +279,7 @@ } catch(Exception eee) { String msg = String.format( - "Can't connect to database %s %s with login %s and password %s", + "Can't connect to database %s %s with login %s", driver, host, username, password); log.error(msg, eee);

1 0

r540 - trunk
by tchemit＠users.nuiton.org Nov. 28, 2010

Nov. 28, 2010

Author: tchemit Date: 2010-11-28 21:20:07 +0100 (Sun, 28 Nov 2010) New Revision: 540 Url: http://nuiton.org/repositories/revision/wikitty/540 Log: use last dev version of eugene Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-28 02:00:59 UTC (rev 539) +++ trunk/pom.xml 2010-11-28 20:20:07 UTC (rev 540) @@ -521,7 +521,7 @@ <projectId>wikitty</projectId>  - <eugeneVersion>2.2.1-SNAPSHOT</eugeneVersion> + <eugeneVersion>2.3-SNAPSHOT</eugeneVersion> <nuitonUtilsVersion>1.5.2-SNAPSHOT</nuitonUtilsVersion> <nuitonI18nVersion>2.0</nuitonI18nVersion> <processPluginVersion>1.0.3</processPluginVersion>

1 0

r539 - trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator
by tchemit＠users.nuiton.org Nov. 28, 2010

Nov. 28, 2010

Author: tchemit Date: 2010-11-28 03:00:59 +0100 (Sun, 28 Nov 2010) New Revision: 539 Url: http://nuiton.org/repositories/revision/wikitty/539 Log: WARNING: the Purifier still does not work on inheritance : breaks some build... must fix copy of classes in eugene I think + review the WikityAbstractGenerator which is very far too complex for my taste (I know colors and tastes... --> It does not work :)) Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyMetaTransformer.java Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyMetaTransformer.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyMetaTransformer.java 2010-11-28 01:56:48 UTC (rev 538) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyMetaTransformer.java 2010-11-28 02:00:59 UTC (rev 539) @@ -65,7 +65,9 @@ // WikittyHelperGenerator.class // ); - setTransformerTypes(WikittyPurifierTransformer.class); + //FIXME tchemit 2010-11-28 : still does not work with superclass inheritance, will not generate operation in Abstract classes + +// setTransformerTypes(WikittyPurifierTransformer.class); setTemplateTypes( WikittyContractGenerator.class, WikittyAbstractGenerator.class,

1 0

r538 - trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator
by tchemit＠users.nuiton.org Nov. 28, 2010

Nov. 28, 2010

Author: tchemit Date: 2010-11-28 02:56:48 +0100 (Sun, 28 Nov 2010) New Revision: 538 Url: http://nuiton.org/repositories/revision/wikitty/538 Log: does not use any longer previousTransformer Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java 2010-11-28 01:53:24 UTC (rev 537) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java 2010-11-28 01:56:48 UTC (rev 538) @@ -28,7 +28,6 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.eugene.Transformer; import org.nuiton.eugene.java.ObjectModelTransformerToJava; import org.nuiton.eugene.models.object.ObjectModel; import org.nuiton.eugene.models.object.ObjectModelAttribute; @@ -75,10 +74,10 @@ * later when generating toString() */ protected Map<String, String> attributeToGetterName = new HashMap<String, String>(); - @Override - protected Transformer<ObjectModel, ObjectModel> initPreviousTransformer() { - return new WikittyPurifierTransformer(); - } +// @Override +// protected Transformer<ObjectModel, ObjectModel> initPreviousTransformer() { +// return new WikittyPurifierTransformer(); +// } protected List<ObjectModelClass> entitiesWithInheritedOperations = new ArrayList<ObjectModelClass>();

1 0

r537 - trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator
by tchemit＠users.nuiton.org Nov. 28, 2010

Nov. 28, 2010

Author: tchemit Date: 2010-11-28 02:53:24 +0100 (Sun, 28 Nov 2010) New Revision: 537 Url: http://nuiton.org/repositories/revision/wikitty/537 Log: change log level Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyPurifierTransformer.java Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyPurifierTransformer.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyPurifierTransformer.java 2010-11-27 16:02:36 UTC (rev 536) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyPurifierTransformer.java 2010-11-28 01:53:24 UTC (rev 537) @@ -154,8 +154,8 @@ @Override public void transformFromModel(ObjectModel model) { for (ObjectModelClass clazz : model.getClasses()) { - if (isVerbose()) { - log.info("Will clone " + clazz.getQualifiedName()); + if (log.isDebugEnabled()) { + log.debug("Will clone " + clazz.getQualifiedName()); } ObjectModelClass clone = cloneClass(clazz, true); if (WikittyTransformerUtil.isBusinessEntity(clazz)) {

1 0