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

r316 - trunk/wikitty-api
by echatellier＠users.nuiton.org 16 Sep '10

16 Sep '10

Author: echatellier Date: 2010-09-16 11:12:53 +0200 (Thu, 16 Sep 2010) New Revision: 316 Url: http://nuiton.org/repositories/revision/wikitty/316 Log: Update jgroups and hibernate Modified: trunk/wikitty-api/pom.xml Modified: trunk/wikitty-api/pom.xml =================================================================== --- trunk/wikitty-api/pom.xml 2010-09-16 09:10:24 UTC (rev 315) +++ trunk/wikitty-api/pom.xml 2010-09-16 09:12:53 UTC (rev 316) @@ -89,7 +89,7 @@  <dependency> - <groupId>jgroups</groupId> + <groupId>org.jgroups</groupId> <artifactId>jgroups</artifactId> </dependency>

1 0

r315 - trunk
by echatellier＠users.nuiton.org 16 Sep '10

16 Sep '10

Author: echatellier Date: 2010-09-16 11:10:24 +0200 (Thu, 16 Sep 2010) New Revision: 315 Url: http://nuiton.org/repositories/revision/wikitty/315 Log: Update jgroups and hibernate Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-09-16 08:36:55 UTC (rev 314) +++ trunk/pom.xml 2010-09-16 09:10:24 UTC (rev 315) @@ -175,9 +175,9 @@  <dependency> - <groupId>jgroups</groupId> + <groupId>org.jgroups</groupId> <artifactId>jgroups</artifactId> - <version>2.9.0.GA</version> + <version>2.10.0.GA</version> <scope>compile</scope> </dependency> @@ -277,7 +277,7 @@ <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-entitymanager</artifactId> - <version>3.5.1-Final</version> + <version>3.5.6-Final</version> </dependency> <dependency> <groupId>org.hibernate</groupId>

1 0

r314 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty
by echatellier＠users.nuiton.org 16 Sep '10

16 Sep '10

Author: echatellier Date: 2010-09-16 10:36:55 +0200 (Thu, 16 Sep 2010) New Revision: 314 Url: http://nuiton.org/repositories/revision/wikitty/314 Log: #868 : Add recursive deleteTree method to delete all tree branche Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceDelegator.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceNotifier.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceSecurity.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java 2010-09-15 12:22:45 UTC (rev 313) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java 2010-09-16 08:36:55 UTC (rev 314) @@ -416,6 +416,17 @@ return result; } + /** + * Delete specified tree node and all sub nodes. + * + * @param treeNodeId tree node id to delete + * @return {@true} if at least one node has been deleted + */ + public List<String> deleteTree(String treeNodeId) { + List<String> result = wikittyService.deleteTree(securityToken, treeNodeId); + return result; + } + public <E extends BusinessEntity> Map.Entry<E, Integer> restoreNode( Class<E> clazz, String wikittyId, Criteria filter) { Entry<E, Integer> result = restoreNode(clazz, wikittyId, filter, false); Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java 2010-09-15 12:22:45 UTC (rev 313) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java 2010-09-16 08:36:55 UTC (rev 314) @@ -437,6 +437,15 @@ public Tree restoreTree(String securityToken, String wikittyId); /** + * Delete specified tree node and all sub nodes. + * + * @param securityToken security token + * @param treeNodeId tree node id to delete + * @return delete wikitty ids + */ + public List<String> deleteTree(String securityToken, String treeNodeId); + + /** * Retrieve wikitty node with count. Wikitty reference by wikittyId MUST * include the 'Node' extension. * Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java 2010-09-15 12:22:45 UTC (rev 313) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java 2010-09-16 08:36:55 UTC (rev 314) @@ -527,6 +527,17 @@ // FIXME lookup in cache, and put in cache return ws.restoreTree(securityToken, wikittyId); } + + /** + * just wrap service method + * + * @param wikittyId + * @return + */ + @Override + public List<String> deleteTree(String securityToken, String wikittyId) { + return ws.deleteTree(securityToken, wikittyId); + } /** * Overriden to update wikitty and put it in cache Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceDelegator.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceDelegator.java 2010-09-15 12:22:45 UTC (rev 313) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceDelegator.java 2010-09-16 08:36:55 UTC (rev 314) @@ -247,6 +247,11 @@ public Tree restoreTree(String securityToken, String wikittyId) { return delegate.restoreTree(securityToken, wikittyId); } + + @Override + public List<String> deleteTree(String securityToken, String wikittyId) { + return delegate.deleteTree(securityToken, wikittyId); + } @Override public Entry<TreeNode, Integer> restoreNode(String securityToken, Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java 2010-09-15 12:22:45 UTC (rev 313) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java 2010-09-16 08:36:55 UTC (rev 314) @@ -796,6 +796,62 @@ } @Override + public List<String> deleteTree(String securityToken, String thesaurusId) { + List<String> deletedIds = null; + WikittyTransaction transaction = new WikittyTransaction(); + try { + transaction.begin(); + + deletedIds = deleteTree(securityToken, transaction, thesaurusId); + + transaction.commit(); + } catch (Exception eee) { + transaction.rollback(); + throw new WikittyException(eee); + } + + return deletedIds; + } + + /** + * Delete specified treenode and sub treenode. + * + * @param securityToken security token + * @param transaction transaction + * @param treeNodeId thesaurusId to delete + * @return all id of delete nodes + */ + public List<String> deleteTree(String securityToken, WikittyTransaction transaction, String treeNodeId) { + List<String> allTreeNodeId = getRecursiveTreeNodeId(securityToken, transaction, treeNodeId); + delete(securityToken, transaction, allTreeNodeId); + return allTreeNodeId; + } + + /** + * Get recursive id of tree node children of {@code treeNodeId}. + * + * @param securityToken security token + * @param transaction transaction + * @param treeNodeId tree node id + * @return all id of {@code treeNodeId}'s children + */ + protected List<String> getRecursiveTreeNodeId(String securityToken, WikittyTransaction transaction, String treeNodeId) { + + Search search = Search.query(); + search = search.eq(TreeNode.FQ_FIELD_TREENODE_PARENT, treeNodeId); + Criteria criteria = search.criteria(); + + PagedResult<String> childTreeNodeIds = findAllByCriteria(securityToken, transaction, criteria); + List<String> treeNodeIds = new ArrayList<String>(); + for (String childTreeNodeId : childTreeNodeIds.getAll()) { + treeNodeIds.add(childTreeNodeId); + List<String> subTreeNodeIds = getRecursiveTreeNodeId(securityToken, transaction, childTreeNodeId); + treeNodeIds.addAll(subTreeNodeIds); + } + return treeNodeIds; + } + + @Override public Map.Entry<TreeNode, Integer> restoreNode(String securityToken, String wikittyId, Criteria filter) { WikittyTransaction transaction = new WikittyTransaction(); Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceNotifier.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceNotifier.java 2010-09-15 12:22:45 UTC (rev 313) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceNotifier.java 2010-09-16 08:36:55 UTC (rev 314) @@ -403,6 +403,14 @@ } @Override + public List<String> deleteTree(String securityToken, String wikittyId) { + // no notification + List<String> result = ws.deleteTree(securityToken, wikittyId); + fireRemoveWikitty(result.toArray(new String[result.size()])); + return result; + } + + @Override public Entry<TreeNode, Integer> restoreNode(String securityToken, String wikittyId, Criteria filter) { // no notification Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceSecurity.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceSecurity.java 2010-09-15 12:22:45 UTC (rev 313) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceSecurity.java 2010-09-16 08:36:55 UTC (rev 314) @@ -467,6 +467,12 @@ } @Override + public List<String> deleteTree(String securityToken, String wikittyId) { + // FIXME poussin 20100607 check security + return ws.deleteTree(securityToken, wikittyId); + } + + @Override public Entry<TreeNode, Integer> restoreNode( String securityToken, String wikittyId, Criteria filter) { // FIXME poussin 20100607 check security

1 0

r313 - trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc
by echatellier＠users.nuiton.org 15 Sep '10

15 Sep '10

Author: echatellier Date: 2010-09-15 14:22:45 +0200 (Wed, 15 Sep 2010) New Revision: 313 Url: http://nuiton.org/repositories/revision/wikitty/313 Log: Fix properties names starting with xa resources class name key 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-09-15 11:32:41 UTC (rev 312) +++ trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyJDBCUtil.java 2010-09-15 12:22:45 UTC (rev 313) @@ -21,7 +21,6 @@ import java.io.InputStream; import java.net.URL; import java.sql.Connection; -import java.sql.DriverManager; import java.sql.PreparedStatement; import java.sql.SQLException; import java.sql.Types; @@ -255,17 +254,16 @@ // Inject properties in xadatasource for(Entry<Object, Object> properties : conf.entrySet()) { - String propertyName = ((String) properties.getKey()) - .replaceFirst(JDBC_XADATASOURCE + "." + xaDataSourceClassName + ".", ""); - - if(!propertyName.equals(JDBC_XADATASOURCE)) { + String propertyName = (String) properties.getKey(); + if (propertyName.startsWith(JDBC_XADATASOURCE + "." + xaDataSourceClassName + ".")) { + propertyName = propertyName.replaceFirst(JDBC_XADATASOURCE + "." + xaDataSourceClassName + ".", ""); if(fields.contains(propertyName)) { String propertyValue = (String) properties.getValue(); BeanUtils.setProperty(xaDataSource, propertyName, propertyValue); } else { log.warn("Invalid property " + propertyName + " for XADatasource " + Arrays.toString(fields.toArray())); } - } + } } dataSource.setXaDataSourceInstance(xaDataSource); } else {

1 0

r312 - trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc
by echatellier＠users.nuiton.org 15 Sep '10

15 Sep '10

Author: echatellier Date: 2010-09-15 13:32:41 +0200 (Wed, 15 Sep 2010) New Revision: 312 Url: http://nuiton.org/repositories/revision/wikitty/312 Log: Fix NPE when trying to load non existing wikity config properties file 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-09-15 10:14:23 UTC (rev 311) +++ trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyJDBCUtil.java 2010-09-15 11:32:41 UTC (rev 312) @@ -39,6 +39,7 @@ import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.dbcp.managed.BasicManagedDataSource; +import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.wikitty.WikittyException; @@ -157,13 +158,17 @@ /** - * Loads the properties in the jdbc.properties file. + * Loads the properties in the {@code wikitty-jdbc-config.properties} file. * + * @param properties custom properties to override default configuration * @return the properties for the connection and the queries */ public static synchronized Properties loadProperties(Properties properties) { Properties queryConfig = new Properties(); Properties databaseConfig = new Properties(queryConfig); + + InputStream streamQuery = null; + InputStream streamConfig = null; try { // FIXME poussin 20100112 perhaps used nuitonutil.ApplicationConfig @@ -173,10 +178,13 @@ ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader(); url = contextClassLoader.getResource("wikitty-jdbc-query.properties"); } - log.info("Reading resource from: " + url); - InputStream stream = url.openStream(); - queryConfig.load(stream); - stream.close(); + + if (log.isInfoEnabled()) { + log.info("Reading resource from: " + url); + } + // url can't be null + streamQuery = url.openStream(); + queryConfig.load(streamQuery); // config url = ClassLoader.getSystemResource("wikitty-jdbc-config.properties"); @@ -184,19 +192,32 @@ ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader(); url = contextClassLoader.getResource("wikitty-jdbc-config.properties"); } - log.info("Reading resource from: " + url); - stream = url.openStream(); - databaseConfig.load(stream); - stream.close(); + + if (url == null) { + if (log.isInfoEnabled()) { + log.info("No wikitty-jdbc-config.properties file found in classpath (skip default configuration loading)"); + } + } + else { + if (log.isInfoEnabled()) { + log.info("Reading resource from: " + url); + } + streamConfig = url.openStream(); + databaseConfig.load(streamConfig); + } // extra config if (properties != null) { databaseConfig.putAll(properties); } - } catch(IOException eee) { + } catch (IOException eee) { throw new WikittyException("Unable to load property file", eee); } + finally { + IOUtils.closeQuietly(streamQuery); + IOUtils.closeQuietly(streamConfig); + } return databaseConfig; }

1 0

r311 - in trunk: . wikitty-api/src/main/java/org/nuiton/wikitty wikitty-api/src/test/java/org/nuiton/wikitty/conform wikitty-jdbc-impl wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc wikitty-jdbc-impl/src/main/resources wikitty-jdbc-impl/src/test/resources
by jruchaud＠users.nuiton.org 15 Sep '10

15 Sep '10

Author: jruchaud Date: 2010-09-15 12:14:23 +0200 (Wed, 15 Sep 2010) New Revision: 311 Url: http://nuiton.org/repositories/revision/wikitty/311 Log: Replace deprecated xapool by commons-dbcp Added: trunk/wikitty-jdbc-impl/src/test/resources/wikitty-jdbc-config.properties Removed: trunk/wikitty-jdbc-impl/src/main/resources/wikitty-jdbc-config.properties trunk/wikitty-jdbc-impl/src/test/resources/jdbc.properties Modified: trunk/pom.xml trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyTransaction.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/StorageTest.java trunk/wikitty-jdbc-impl/pom.xml trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyExtensionStorageJDBC.java trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyJDBCUtil.java trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-09-14 13:43:22 UTC (rev 310) +++ trunk/pom.xml 2010-09-15 10:14:23 UTC (rev 311) @@ -68,6 +68,20 @@ </dependency> <dependency> + <groupId>commons-dbcp</groupId> + <artifactId>commons-dbcp</artifactId> + <version>1.4</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <version>1.8.3</version> + <scope>compile</scope> + </dependency> + + <dependency> <groupId>org.nuiton.eugene</groupId> <artifactId>eugene</artifactId> <version>${eugene.version}</version> @@ -76,7 +90,7 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.2.140</version> + <version>1.2.142</version> <scope>test</scope> </dependency> @@ -168,13 +182,6 @@ </dependency> <dependency> - <groupId>com.experlog</groupId> - <artifactId>xapool</artifactId> - <version>1.5.0</version> - </dependency> - - - <dependency> <groupId>org.zkoss.zk</groupId> <artifactId>zk</artifactId> <version>${zk.version}</version> Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyTransaction.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyTransaction.java 2010-09-14 13:43:22 UTC (rev 310) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyTransaction.java 2010-09-15 10:14:23 UTC (rev 311) @@ -69,7 +69,6 @@ } public void commit() { - UserTransaction userTransaction = getUserTransaction(); try { if (log.isDebugEnabled()) { Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/StorageTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/StorageTest.java 2010-09-14 13:43:22 UTC (rev 310) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/StorageTest.java 2010-09-15 10:14:23 UTC (rev 311) @@ -24,7 +24,6 @@ import org.junit.Test; import org.nuiton.wikitty.Criteria; import org.nuiton.wikitty.Label; -import org.nuiton.wikitty.LabelHelper; import org.nuiton.wikitty.PagedResult; import org.nuiton.wikitty.Tree; import org.nuiton.wikitty.TreeNode; Modified: trunk/wikitty-jdbc-impl/pom.xml =================================================================== --- trunk/wikitty-jdbc-impl/pom.xml 2010-09-14 13:43:22 UTC (rev 310) +++ trunk/wikitty-jdbc-impl/pom.xml 2010-09-15 10:14:23 UTC (rev 311) @@ -70,6 +70,14 @@ <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> + <dependency> + <groupId>commons-dbcp</groupId> + <artifactId>commons-dbcp</artifactId> + </dependency> + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + </dependency> <dependency> <groupId>log4j</groupId> @@ -79,10 +87,6 @@ <groupId>com.h2database</groupId> <artifactId>h2</artifactId> </dependency> - <dependency> - <groupId>com.experlog</groupId> - <artifactId>xapool</artifactId> - </dependency> </dependencies>  Modified: trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyExtensionStorageJDBC.java =================================================================== --- trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyExtensionStorageJDBC.java 2010-09-14 13:43:22 UTC (rev 310) +++ trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyExtensionStorageJDBC.java 2010-09-15 10:14:23 UTC (rev 311) @@ -23,7 +23,6 @@ import static org.nuiton.wikitty.jdbc.WikittyJDBCUtil.COL_REQUIRES; import static org.nuiton.wikitty.jdbc.WikittyJDBCUtil.COL_TAGVALUES; import static org.nuiton.wikitty.jdbc.WikittyJDBCUtil.COL_VERSION; -import static org.nuiton.wikitty.jdbc.WikittyJDBCUtil.JDBC_DRIVER; import static org.nuiton.wikitty.jdbc.WikittyJDBCUtil.QUERY_CLEAR_EXTENSION; import static org.nuiton.wikitty.jdbc.WikittyJDBCUtil.QUERY_CREATION_EXTENSION_ADMIN_TEST; import static org.nuiton.wikitty.jdbc.WikittyJDBCUtil.QUERY_CREATION_EXTENSION_ADMIN; @@ -94,17 +93,6 @@ public WikittyExtensionStorageJDBC(Properties properties) { conf = loadProperties(properties); - - //check if JDBC_DRIVER ca be loaded - try { - Class.forName(conf.getProperty(JDBC_DRIVER)); - } catch (ClassNotFoundException eee) { - if (log.isFatalEnabled()) { - log.fatal("Couldn't find the driver!"); - } - throw new WikittyException(eee); - } - Connection connectionTest = getJDBCConnection(conf); try { // If test of existance work, no exception and do nothing @@ -116,7 +104,7 @@ if (log.isInfoEnabled()) { log.info("try to create extension database"); } - Connection connection = getJDBCConnection(conf); + Connection connection = getConnection(conf); try { Statement statement = connection.createStatement(); statement.execute(conf.getProperty(QUERY_CREATION_EXTENSION_ADMIN)); 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-09-14 13:43:22 UTC (rev 310) +++ trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyJDBCUtil.java 2010-09-15 10:14:23 UTC (rev 311) @@ -25,16 +25,22 @@ import java.sql.PreparedStatement; import java.sql.SQLException; import java.sql.Types; +import java.util.Arrays; import java.util.Date; -import java.util.Hashtable; +import java.util.HashMap; +import java.util.Map; +import java.util.Map.Entry; import java.util.Properties; +import java.util.Set; +import javax.sql.XADataSource; import javax.transaction.TransactionManager; +import org.apache.commons.beanutils.BeanMap; +import org.apache.commons.beanutils.BeanUtils; +import org.apache.commons.dbcp.managed.BasicManagedDataSource; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.enhydra.jdbc.pool.StandardXAPoolDataSource; -import org.enhydra.jdbc.standard.StandardXADataSource; import org.nuiton.wikitty.WikittyException; /** @@ -130,13 +136,15 @@ "jdbc.queries.insert.extension.data"; /** JDBC JDBC_DRIVER property name */ - static final public String JDBC_DRIVER = "jdbc.con.driver"; + static protected String JDBC_DRIVER = "jdbc.con.driver"; /** JDBC_HOST property name */ static protected String JDBC_HOST = "jdbc.con.host"; - /** user name property name */ + /** JDBC_USER_NAME property name */ static protected String JDBC_USER_NAME = "jdbc.con.userName"; /** JDBC_PASSWORD property name */ static protected String JDBC_PASSWORD = "jdbc.con.password"; + /** JDBC_XADATASOURCE property name */ + static protected String JDBC_XADATASOURCE = "jdbc.xadatasource"; /** admin table name */ static protected String TABLE_WIKITTY_ADMIN = "wikitty_admin"; @@ -193,8 +201,8 @@ return databaseConfig; } - private static Hashtable<String, StandardXAPoolDataSource> dataSources = - new Hashtable<String, StandardXAPoolDataSource>(); + private static Map<String, BasicManagedDataSource> dataSources = + new HashMap<String, BasicManagedDataSource>(); /** * Get a new connection instance (i.e. it opens a new transaction) plug on @@ -211,31 +219,71 @@ conf.getProperty(JDBC_PASSWORD), conf.getProperty(JDBC_HOST)); if (!dataSources.containsKey(jdbcUrl)) { - log.info("Creating PoolDataSource for: " + jdbcUrl); - StandardXADataSource dataSource = new StandardXADataSource(); - dataSource.setDriverName(conf.getProperty(JDBC_DRIVER)); + log.info("Creating BasicManagedDataSource for: " + jdbcUrl); + + // Create datasource + BasicManagedDataSource dataSource = new BasicManagedDataSource(); + + // if xadatasource + String xaDataSourceClassName = conf.getProperty(JDBC_XADATASOURCE); + if(xaDataSourceClassName != null) { + XADataSource xaDataSource = (XADataSource) Class.forName(xaDataSourceClassName).newInstance(); + + BeanMap beanMap = new BeanMap(xaDataSource); + Set<String> fields = beanMap.keySet(); + + // Inject properties in xadatasource + for(Entry<Object, Object> properties : conf.entrySet()) { + String propertyName = ((String) properties.getKey()) + .replaceFirst(JDBC_XADATASOURCE + "." + xaDataSourceClassName + ".", ""); + + if(!propertyName.equals(JDBC_XADATASOURCE)) { + if(fields.contains(propertyName)) { + String propertyValue = (String) properties.getValue(); + BeanUtils.setProperty(xaDataSource, propertyName, propertyValue); + } else { + log.warn("Invalid property " + propertyName + " for XADatasource " + Arrays.toString(fields.toArray())); + } + } + } + dataSource.setXaDataSourceInstance(xaDataSource); + } else { + log.warn("No xadatasource is used, data integrity is not guarantee"); + } + + // else standard datasource + dataSource.setDriverClassName(conf.getProperty(JDBC_DRIVER)); dataSource.setUrl(conf.getProperty(JDBC_HOST)); - dataSource.setUser(conf.getProperty(JDBC_USER_NAME)); + dataSource.setUsername(conf.getProperty(JDBC_USER_NAME)); dataSource.setPassword(conf.getProperty(JDBC_PASSWORD)); dataSource.setTransactionManager(transactionManager); - - StandardXAPoolDataSource poolDataSource = new StandardXAPoolDataSource(dataSource); - poolDataSource.setUser(conf.getProperty(JDBC_USER_NAME)); - poolDataSource.setPassword(conf.getProperty(JDBC_PASSWORD)); - poolDataSource.setTransactionManager(transactionManager); - dataSources.put(jdbcUrl, poolDataSource); + + dataSources.put(jdbcUrl, dataSource); } - StandardXAPoolDataSource poolDataSource = dataSources.get(jdbcUrl); - Connection connection = poolDataSource.getConnection(); + BasicManagedDataSource dataSource = dataSources.get(jdbcUrl); + Connection connection = dataSource.getConnection(); return connection; - } catch(SQLException eee) { + } catch(Exception eee) { throw new WikittyException(eee); } } /** + * Closes a connection. + * + * @param connection the connection to close + */ + public static void closeQuietly(Connection connection) { + try { + connection.close(); + } catch (SQLException e) { + log.error("SQLException while closing connection", e); + } + } + + /** * Get a new connection instance (i.e. it opens a new transaction). * * @return a new Connection (db transaction) @@ -243,8 +291,7 @@ */ public static synchronized Connection getJDBCConnection(Properties conf) { try { - Connection connection = DriverManager.getConnection(conf.getProperty(JDBC_HOST), - conf.getProperty(JDBC_USER_NAME), conf.getProperty(JDBC_PASSWORD)); + Connection connection = getConnection(conf); connection.setAutoCommit(false); return connection; } catch(SQLException eee) { @@ -252,14 +299,6 @@ } } - public static void closeQuietly(Connection connection) { - try { - connection.close(); - } catch (SQLException e) { - log.error("SQLException while closing connection", e); - } - } - /** * Closes a connection (i.e. transaction) and commit data. * Modified: trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java =================================================================== --- trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java 2010-09-14 13:43:22 UTC (rev 310) +++ trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java 2010-09-15 10:14:23 UTC (rev 311) @@ -25,7 +25,6 @@ import static org.nuiton.wikitty.jdbc.WikittyJDBCUtil.COL_NUMBER_VALUE; import static org.nuiton.wikitty.jdbc.WikittyJDBCUtil.COL_TEXT_VALUE; import static org.nuiton.wikitty.jdbc.WikittyJDBCUtil.COL_VERSION; -import static org.nuiton.wikitty.jdbc.WikittyJDBCUtil.JDBC_DRIVER; import static org.nuiton.wikitty.jdbc.WikittyJDBCUtil.QUERY_CLEAR_WIKITTY; import static org.nuiton.wikitty.jdbc.WikittyJDBCUtil.QUERY_CREATION_WIKITTY_ADMIN; import static org.nuiton.wikitty.jdbc.WikittyJDBCUtil.QUERY_CREATION_WIKITTY_ADMIN_TEST; @@ -106,20 +105,9 @@ } public WikittyStorageJDBC(WikittyExtensionStorage extensionStorage, Properties properties) { - conf = loadProperties(properties); - this.extensionStorage = extensionStorage; - //check if JDBC_DRIVER ca be loaded - try { - Class.forName(conf.getProperty(JDBC_DRIVER)); - } catch (ClassNotFoundException eee) { - if (log.isFatalEnabled()) { - log.fatal("Couldn't find the driver!"); - eee.printStackTrace(); - } - throw new WikittyException(eee); - } - + + conf = loadProperties(properties); Connection connectionTest = getJDBCConnection(conf); try { // If test of existance work, no exception and do nothing @@ -131,7 +119,7 @@ if (log.isInfoEnabled()) { log.info("try to create wikitty database"); } - Connection connection = getJDBCConnection(conf); + Connection connection = getConnection(conf); try { Statement statement = connection.createStatement(); statement.execute(conf.getProperty(QUERY_CREATION_WIKITTY_ADMIN)); Deleted: trunk/wikitty-jdbc-impl/src/main/resources/wikitty-jdbc-config.properties =================================================================== --- trunk/wikitty-jdbc-impl/src/main/resources/wikitty-jdbc-config.properties 2010-09-14 13:43:22 UTC (rev 310) +++ trunk/wikitty-jdbc-impl/src/main/resources/wikitty-jdbc-config.properties 2010-09-15 10:14:23 UTC (rev 311) @@ -1,5 +0,0 @@ -#Connection parameters -jdbc.con.driver=org.h2.Driver -jdbc.con.host=jdbc:h2:file:./target/data/data -jdbc.con.userName=sa -jdbc.con.password= Deleted: trunk/wikitty-jdbc-impl/src/test/resources/jdbc.properties =================================================================== --- trunk/wikitty-jdbc-impl/src/test/resources/jdbc.properties 2010-09-14 13:43:22 UTC (rev 310) +++ trunk/wikitty-jdbc-impl/src/test/resources/jdbc.properties 2010-09-15 10:14:23 UTC (rev 311) @@ -1,71 +0,0 @@ -#Connection parameters -jdbc.con.driver=org.h2.Driver -jdbc.con.host=jdbc:h2:~/wikitty -jdbc.con.userName=sa -jdbc.con.password= - -#table extension_admin creation query -jdbc.queries.creation.extension.admin=CREATE TABLE IF NOT EXISTS extension_admin (\ -id text NOT NULL,\ -name text NOT NULL,\ -version varchar(8) NOT NULL);\ -ALTER TABLE extension_admin ADD PRIMARY KEY (id); - -#table extension_data creation query -jdbc.queries.creation.extension.data=CREATE TABLE IF NOT EXISTS extension_data (\ -fieldName text NOT NULL,\ -fieldType text NOT NULL,\ -id text NOT NULL);\ -ALTER TABLE extension_data ADD PRIMARY KEY (id,fieldName);\ -ALTER TABLE extension_data ADD FOREIGN KEY (id) REFERENCES extension_admin (id); - -#table wikitty_admin creation query -jdbc.queries.creation.wikitty.admin=CREATE TABLE IF NOT EXISTS wikitty_admin (\ -id varchar(64) NOT NULL,\ -version varchar(8) NOT NULL,\ -extension_list text NOT NULL,\ -deletionDate dateTime DEFAULT NULL);\ -ALTER TABLE wikitty_admin ADD PRIMARY KEY (id); - -#table wikitty_data creation query -jdbc.queries.creation.wikitty.data=CREATE TABLE IF NOT EXISTS wikitty_data (\ -fieldName text NOT NULL,\ -numberValue numeric,\ -dateValue datetime,\ -textValue text,\ -booleanValue boolean,\ -id varchar(64) NOT NULL);\ -ALTER TABLE wikitty_data ADD PRIMARY KEY (id,fieldName);\ -ALTER TABLE wikitty_data ADD FOREIGN KEY (id) REFERENCES wikitty_admin (id); - -#basic selection query without where clause -jdbc.queries.select=SELECT %s FROM %s; -#basic selection query with where clause -jdbc.queries.select.where=SELECT %s FROM %s WHERE %s = %s; -#not deleted data selection query with where clause -jdbc.queries.select.where.notdeleted=SELECT %s FROM %s WHERE %s = %s AND deletionDate IS NULL; - -#tables emptying query -jdbc.queries.delete.all=DELETE FROM extension_data; DELETE FROM extension_admin;\ -DELETE FROM wikitty_data; DELETE FROM wikitty_admin; -#wikitty deletion in the admin table query -jdbc.queries.delete.wikitty.admin=UPDATE wikitty_admin SET deletionDate = NOW()\ -WHERE id = '%s'; -#wikitty deletion in the data table query -jdbc.queries.delete.wikitty.data=DELETE FROM wikitty_data WHERE id = '%s'; - -#wikitty insertion in the admin table query -jdbc.queries.insert.wikitty.admin=INSERT INTO wikitty_admin\ -(id, version, extension_list) VALUES ('%s', '%s', '%s'); -#wikitty update in the admin table query -jdbc.queries.update.wikitty.admin=UPDATE wikitty_admin\ -SET version = '%s', extension_list = '%s' WHERE id = '%s'; -#wikitty insertion in the data table query -jdbc.queries.insert.wikitty.data=INSERT INTO wikitty_data\ -(id, fieldName, %s) VALUES ('%s', '%s.%s', %s); -#extension insertion in the admin table query -jdbc.queries.insert.extension.admin=INSERT INTO extension_admin\ -(id, name, version) VALUES ('%s', '%s', '%s'); -#extension insertion in the data table query -jdbc.queries.insert.extension.data=INSERT INTO extension_data\ -(id, fieldName, fieldType) VALUES ('%s', '%s', '%s'); \ No newline at end of file Copied: trunk/wikitty-jdbc-impl/src/test/resources/wikitty-jdbc-config.properties (from rev 284, trunk/wikitty-jdbc-impl/src/main/resources/wikitty-jdbc-config.properties) =================================================================== --- trunk/wikitty-jdbc-impl/src/test/resources/wikitty-jdbc-config.properties (rev 0) +++ trunk/wikitty-jdbc-impl/src/test/resources/wikitty-jdbc-config.properties 2010-09-15 10:14:23 UTC (rev 311) @@ -0,0 +1,11 @@ +#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

r310 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty
by echatellier＠users.nuiton.org 14 Sep '10

14 Sep '10

Author: echatellier Date: 2010-09-14 15:43:22 +0200 (Tue, 14 Sep 2010) New Revision: 310 Url: http://nuiton.org/repositories/revision/wikitty/310 Log: Fix doc, interfaces and javadoc Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyImpl.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyImpl.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyImpl.java 2010-09-14 09:46:16 UTC (rev 309) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyImpl.java 2010-09-14 13:43:22 UTC (rev 310) @@ -19,7 +19,6 @@ import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; -import java.io.Serializable; import java.math.BigDecimal; import java.util.AbstractList; import java.util.AbstractSet; @@ -35,14 +34,15 @@ import java.util.Set; /** - * + * Wikitty implementation. + * * @author poussin * @version $Revision$ * * Last update: $Date$ * by : $Author$ */ -public class WikittyImpl implements Serializable, Wikitty, Cloneable { +public class WikittyImpl implements Wikitty { /** serialVersionUID. */ private static final long serialVersionUID = 4910886672760691052L; @@ -107,8 +107,8 @@ return propertyChange; } - /* (non-Javadoc) - * @see org.nuiton.wikitty.IWikitty#addPropertyChangeListener(java.beans.PropertyChangeListener) + /* + * @see org.nuiton.wikitty.Wikitty#addPropertyChangeListener(java.beans.PropertyChangeListener) */ @Override public synchronized void addPropertyChangeListener( @@ -117,8 +117,8 @@ } - /* (non-Javadoc) - * @see org.nuiton.wikitty.IWikitty#removePropertyChangeListener(java.beans.PropertyChangeListener) + /* + * @see org.nuiton.wikitty.Wikitty#removePropertyChangeListener(java.beans.PropertyChangeListener) */ @Override public synchronized void removePropertyChangeListener( @@ -127,8 +127,8 @@ } - /* (non-Javadoc) - * @see org.nuiton.wikitty.IWikitty#addPropertyChangeListener(java.lang.String, java.beans.PropertyChangeListener) + /* + * @see org.nuiton.wikitty.Wikitty#addPropertyChangeListener(java.lang.String, java.beans.PropertyChangeListener) */ @Override public synchronized void addPropertyChangeListener(String propertyName, @@ -137,8 +137,8 @@ } - /* (non-Javadoc) - * @see org.nuiton.wikitty.IWikitty#removePropertyChangeListener(java.lang.String, java.beans.PropertyChangeListener) + /* + * @see org.nuiton.wikitty.Wikitty#removePropertyChangeListener(java.lang.String, java.beans.PropertyChangeListener) */ @Override public synchronized void removePropertyChangeListener(String propertyName, @@ -146,16 +146,16 @@ getPropertyChangeSupport().removePropertyChangeListener(propertyName, listener); } - /* (non-Javadoc) - * @see org.nuiton.wikitty.IWikitty#getId() + /* + * @see org.nuiton.wikitty.Wikitty#getId() */ @Override public String getId() { return id; } - /* (non-Javadoc) - * @see org.nuiton.wikitty.IWikitty#isDeleted() + /* + * @see org.nuiton.wikitty.Wikitty#isDeleted() */ @Override public boolean isDeleted() { @@ -163,16 +163,16 @@ return result; } - /* (non-Javadoc) - * @see org.nuiton.wikitty.IWikitty#getDeleteDate() + /* + * @see org.nuiton.wikitty.Wikitty#getDeleteDate() */ @Override public Date getDeleteDate() { return deleteDate; } - /* (non-Javadoc) - * @see org.nuiton.wikitty.IWikitty#setDeleteDate(java.util.Date) + /* + * @see org.nuiton.wikitty.Wikitty#setDeleteDate(java.util.Date) */ @Override public void setDeleteDate(Date delete) { @@ -180,7 +180,8 @@ } /** - * mark field as dirty + * Mark field as dirty. + * * @param ext * @param fieldName */ @@ -192,8 +193,8 @@ getPropertyChangeSupport().firePropertyChange(key, oldValue, newValue); } - /* (non-Javadoc) - * @see org.nuiton.wikitty.IWikitty#addExtension(org.nuiton.wikitty.WikittyExtension) + /* + * @see org.nuiton.wikitty.Wikitty#addExtension(org.nuiton.wikitty.WikittyExtension) */ @Override public void addExtension(WikittyExtension ext) { @@ -208,8 +209,8 @@ extensions.put(ext.name, ext); } - /* (non-Javadoc) - * @see org.nuiton.wikitty.IWikitty#addExtension(java.util.List) + /* + * @see org.nuiton.wikitty.Wikitty#addExtension(java.util.List) */ @Override public void addExtension(List<WikittyExtension> exts) { @@ -218,16 +219,16 @@ } } - /* (non-Javadoc) - * @see org.nuiton.wikitty.IWikitty#hasExtension(java.lang.String) + /* + * @see org.nuiton.wikitty.Wikitty#hasExtension(java.lang.String) */ @Override public boolean hasExtension(String extName) { return extensions.containsKey(extName); } - /* (non-Javadoc) - * @see org.nuiton.wikitty.IWikitty#hasField(java.lang.String, java.lang.String) + /* + * @see org.nuiton.wikitty.Wikitty#hasField(java.lang.String, java.lang.String) */ @Override public boolean hasField(String extName, String fieldName) { @@ -239,8 +240,8 @@ return result; } - /* (non-Javadoc) - * @see org.nuiton.wikitty.IWikitty#getExtension(java.lang.String) + /* + * @see org.nuiton.wikitty.Wikitty#getExtension(java.lang.String) */ @Override public WikittyExtension getExtension(String ext) { @@ -248,8 +249,8 @@ return result; } - /* (non-Javadoc) - * @see org.nuiton.wikitty.IWikitty#getExtensionNames() + /* + * @see org.nuiton.wikitty.Wikitty#getExtensionNames() */ @Override public Collection<String> getExtensionNames() { @@ -257,8 +258,8 @@ return result; } - /* (non-Javadoc) - * @see org.nuiton.wikitty.IWikitty#getExtensions() + /* + * @see org.nuiton.wikitty.Wikitty#getExtensions() */ @Override public Collection<WikittyExtension> getExtensions() { @@ -266,8 +267,8 @@ return result; } - /* (non-Javadoc) - * @see org.nuiton.wikitty.IWikitty#getExtensionDependencies(java.lang.String, boolean) + /* + * @see org.nuiton.wikitty.Wikitty#getExtensionDependencies(java.lang.String, boolean) */ @Override public Collection<WikittyExtension> getExtensionDependencies(String ext, boolean recursively) { @@ -287,8 +288,8 @@ return result; } - /* (non-Javadoc) - * @see org.nuiton.wikitty.IWikitty#getFieldType(java.lang.String) + /* + * @see org.nuiton.wikitty.Wikitty#getFieldType(java.lang.String) */ @Override public FieldType getFieldType(String fqfieldName) { @@ -320,8 +321,8 @@ } } - /* (non-Javadoc) - * @see org.nuiton.wikitty.IWikitty#setField(java.lang.String, java.lang.String, java.lang.Object) + /* + * @see org.nuiton.wikitty.Wikitty#setField(java.lang.String, java.lang.String, java.lang.Object) */ @Override public void setField(String ext, String fieldName, Object value) { @@ -350,8 +351,8 @@ setFieldDirty(ext, fieldName, oldValue, validValue); } - /* (non-Javadoc) - * @see org.nuiton.wikitty.IWikitty#getFieldAsObject(java.lang.String, java.lang.String) + /* + * @see org.nuiton.wikitty.Wikitty#getFieldAsObject(java.lang.String, java.lang.String) */ @Override public Object getFieldAsObject(String ext, String fieldName) { @@ -365,8 +366,8 @@ return result; } - /* (non-Javadoc) - * @see org.nuiton.wikitty.IWikitty#getFieldAsBoolean(java.lang.String, java.lang.String) + /* + * @see org.nuiton.wikitty.Wikitty#getFieldAsBoolean(java.lang.String, java.lang.String) */ @Override public boolean getFieldAsBoolean(String ext, String fieldName) { @@ -381,8 +382,8 @@ } } - /* (non-Javadoc) - * @see org.nuiton.wikitty.IWikitty#getFieldAsBigDecimal(java.lang.String, java.lang.String) + /* + * @see org.nuiton.wikitty.Wikitty#getFieldAsBigDecimal(java.lang.String, java.lang.String) */ @Override public BigDecimal getFieldAsBigDecimal(String ext, String fieldName) { @@ -397,8 +398,8 @@ } } - /* (non-Javadoc) - * @see org.nuiton.wikitty.IWikitty#getFieldAsInt(java.lang.String, java.lang.String) + /* + * @see org.nuiton.wikitty.Wikitty#getFieldAsInt(java.lang.String, java.lang.String) */ @Override public int getFieldAsInt(String ext, String fieldName) { @@ -413,8 +414,8 @@ } } - /* (non-Javadoc) - * @see org.nuiton.wikitty.IWikitty#getFieldAsLong(java.lang.String, java.lang.String) + /* + * @see org.nuiton.wikitty.Wikitty#getFieldAsLong(java.lang.String, java.lang.String) */ @Override public long getFieldAsLong(String ext, String fieldName) { @@ -429,8 +430,8 @@ } } - /* (non-Javadoc) - * @see org.nuiton.wikitty.IWikitty#getFieldAsFloat(java.lang.String, java.lang.String) + /* + * @see org.nuiton.wikitty.Wikitty#getFieldAsFloat(java.lang.String, java.lang.String) */ @Override public float getFieldAsFloat(String ext, String fieldName) { @@ -445,8 +446,8 @@ } } - /* (non-Javadoc) - * @see org.nuiton.wikitty.IWikitty#getFieldAsDouble(java.lang.String, java.lang.String) + /* + * @see org.nuiton.wikitty.Wikitty#getFieldAsDouble(java.lang.String, java.lang.String) */ @Override public double getFieldAsDouble(String ext, String fieldName) { @@ -461,8 +462,8 @@ } } - /* (non-Javadoc) - * @see org.nuiton.wikitty.IWikitty#getFieldAsString(java.lang.String, java.lang.String) + /* + * @see org.nuiton.wikitty.Wikitty#getFieldAsString(java.lang.String, java.lang.String) */ @Override public String getFieldAsString(String ext, String fieldName) { @@ -477,8 +478,8 @@ } } - /* (non-Javadoc) - * @see org.nuiton.wikitty.IWikitty#getFieldAsDate(java.lang.String, java.lang.String) + /* + * @see org.nuiton.wikitty.Wikitty#getFieldAsDate(java.lang.String, java.lang.String) */ @Override public Date getFieldAsDate(String ext, String fieldName) { @@ -493,8 +494,8 @@ } } - /* (non-Javadoc) - * @see org.nuiton.wikitty.IWikitty#getFieldAsWikitty(java.lang.String, java.lang.String) + /* + * @see org.nuiton.wikitty.Wikitty#getFieldAsWikitty(java.lang.String, java.lang.String) */ @Override public String getFieldAsWikitty(String ext, String fieldName) { @@ -503,8 +504,8 @@ return result; } - /* (non-Javadoc) - * @see org.nuiton.wikitty.IWikitty#getFieldAsList(java.lang.String, java.lang.String, java.lang.Class) + /* + * @see org.nuiton.wikitty.Wikitty#getFieldAsList(java.lang.String, java.lang.String, java.lang.Class) */ @Override public <E> List<E> getFieldAsList(String ext, String fieldName, final Class<E> clazz) { @@ -530,8 +531,8 @@ } } - /* (non-Javadoc) - * @see org.nuiton.wikitty.IWikitty#getFieldAsSet(java.lang.String, java.lang.String, java.lang.Class) + /* + * @see org.nuiton.wikitty.Wikitty#getFieldAsSet(java.lang.String, java.lang.String, java.lang.Class) */ @Override public <E> Set<E> getFieldAsSet(String ext, String fieldName, final Class<E> clazz) { @@ -573,8 +574,8 @@ } } - /* (non-Javadoc) - * @see org.nuiton.wikitty.IWikitty#addToField(java.lang.String, java.lang.String, java.lang.Object) + /* + * @see org.nuiton.wikitty.Wikitty#addToField(java.lang.String, java.lang.String, java.lang.Object) */ @Override public void addToField(String ext, String fieldName, Object value) { @@ -623,8 +624,8 @@ } } - /* (non-Javadoc) - * @see org.nuiton.wikitty.IWikitty#removeFromField(java.lang.String, java.lang.String, java.lang.Object) + /* + * @see org.nuiton.wikitty.Wikitty#removeFromField(java.lang.String, java.lang.String, java.lang.Object) */ @Override public void removeFromField(String ext, String fieldName, Object value) { @@ -652,8 +653,8 @@ } } - /* (non-Javadoc) - * @see org.nuiton.wikitty.IWikitty#clearField(java.lang.String, java.lang.String) + /* + * @see org.nuiton.wikitty.Wikitty#clearField(java.lang.String, java.lang.String) */ @Override public void clearField(String ext, String fieldName) { @@ -695,48 +696,48 @@ } } - /* (non-Javadoc) - * @see org.nuiton.wikitty.IWikitty#fieldNames() + /* + * @see org.nuiton.wikitty.Wikitty#fieldNames() */ @Override public Set<String> fieldNames() { return fieldValue.keySet(); } - /* (non-Javadoc) - * @see org.nuiton.wikitty.IWikitty#getFqField(java.lang.String) + /* + * @see org.nuiton.wikitty.Wikitty#getFqField(java.lang.String) */ @Override public Object getFqField(String fqFieldName) { return fieldValue.get(fqFieldName); } - /* (non-Javadoc) - * @see org.nuiton.wikitty.IWikitty#getVersion() + /* + * @see org.nuiton.wikitty.Wikitty#getVersion() */ @Override public String getVersion() { return version; } - /* (non-Javadoc) - * @see org.nuiton.wikitty.IWikitty#setVersion(java.lang.String) + /* + * @see org.nuiton.wikitty.Wikitty#setVersion(java.lang.String) */ @Override public void setVersion(String version) { this.version = version; } - /* (non-Javadoc) - * @see org.nuiton.wikitty.IWikitty#clearDirty() + /* + * @see org.nuiton.wikitty.Wikitty#clearDirty() */ @Override public void clearDirty() { fieldDirty.clear(); } - /* (non-Javadoc) - * @see org.nuiton.wikitty.IWikitty#setFqField(java.lang.String, java.lang.Object) + /* + * @see org.nuiton.wikitty.Wikitty#setFqField(java.lang.String, java.lang.Object) */ @Override public void setFqField(String fieldName, Object value) { @@ -745,8 +746,8 @@ fieldValue.put(fieldName, validValue); } - /* (non-Javadoc) - * @see org.nuiton.wikitty.IWikitty#isEmpty() + /* + * @see org.nuiton.wikitty.Wikitty#isEmpty() */ @Override public boolean isEmpty() {

1 0

r309 - in trunk/wikitty-api/src: main/java/org/nuiton/wikitty test/java/org/nuiton/wikitty/api test/java/org/nuiton/wikitty/memory
by echatellier＠users.nuiton.org 14 Sep '10

14 Sep '10

Author: echatellier Date: 2010-09-14 11:46:16 +0200 (Tue, 14 Sep 2010) New Revision: 309 Url: http://nuiton.org/repositories/revision/wikitty/309 Log: Add check about invalid extension name Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyExtension.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/CommonTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/memory/InMemoryStorageTest.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyExtension.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyExtension.java 2010-09-14 08:32:49 UTC (rev 308) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyExtension.java 2010-09-14 09:46:16 UTC (rev 309) @@ -89,21 +89,15 @@ } public WikittyExtension(String name) { - if (name == null) { - throw new IllegalArgumentException("Name must not be null"); - } - this.name = name; + setName(name); } public WikittyExtension(String name, String version, String requires, LinkedHashMap<String, FieldType> fields) { - if (name == null) { - throw new IllegalArgumentException("Name must not be null"); - } if (version == null) { throw new IllegalArgumentException("Version must not be null"); } - this.name = name; + setName(name); this.version = WikittyUtil.normalizeVersion(version); this.requires = requires; if (fields != null) { @@ -206,6 +200,26 @@ return name; } + /** + * Set extension name. + * + * Check for invalid extension name (non alphanumeric characters). + * + * @param name name + */ + public void setName(String name) { + + // check alphanumeric characters + if (name == null) { + throw new IllegalArgumentException("Name must not be null"); + } + if (!name.matches("\\w+")) { + throw new IllegalArgumentException("Name contains non alphanumeric characters"); + } + + this.name = name; + } + public String getVersion() { return version; } Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/CommonTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/CommonTest.java 2010-09-14 08:32:49 UTC (rev 308) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/CommonTest.java 2010-09-14 09:46:16 UTC (rev 309) @@ -119,7 +119,32 @@ } } - + + /** + * Test qu'une extension ne peut pas avoir de caracteres non alphanumeriques. + */ + @Test(expected=IllegalArgumentException.class) + public void testWikittyExtensionBadName() { + new WikittyExtension("invalid name", "1", null, null ); + } + + /** + * Test qu'une extension ne peut pas avoir de caracteres non alphanumeriques. + */ + @Test(expected=IllegalArgumentException.class) + public void testWikittyExtensionBadName2() { + WikittyExtension ext = new WikittyExtension(); + ext.setName("été"); + } + + /** + * Test qu'une extension ne peut pas avoir de caracteres non alphanumeriques. + */ + @Test(expected=IllegalArgumentException.class) + public void testWikittyExtensionBadName3() { + new WikittyExtension("test,test"); + } + @Test public void testWikittyExtensionCorrectFieldName() throws Exception { ExtensionFactory.create("correctExtension", "1") Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/memory/InMemoryStorageTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/memory/InMemoryStorageTest.java 2010-09-14 08:32:49 UTC (rev 308) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/memory/InMemoryStorageTest.java 2010-09-14 09:46:16 UTC (rev 309) @@ -86,11 +86,11 @@ public void testRequire() throws Exception { WikittyExtension extension = new WikittyExtension("Extension", "1", null, WikittyUtil.buildFieldMapExtension("String value")); - WikittyExtension extension1 = new WikittyExtension("Extension 1", "1", "Extension", + WikittyExtension extension1 = new WikittyExtension("Extension1", "1", "Extension", WikittyUtil.buildFieldMapExtension("String value")); - WikittyExtension extension11 = new WikittyExtension("Extension 11", "1", "Extension 1", + WikittyExtension extension11 = new WikittyExtension("Extension11", "1", "Extension1", WikittyUtil.buildFieldMapExtension("String value")); - WikittyExtension extension2 = new WikittyExtension("Extension 2", "1", "Extension", + WikittyExtension extension2 = new WikittyExtension("Extension2", "1", "Extension", WikittyUtil.buildFieldMapExtension("String value")); Wikitty wikitty = createWikitty("Extension.value = 123", @@ -102,10 +102,10 @@ result = wikitty.getExtensionDependencies("Extension", false); assertEquals(2, result.size()); - result = wikitty.getExtensionDependencies("Extension 1", true); + result = wikitty.getExtensionDependencies("Extension1", true); assertEquals(1, result.size()); - result = wikitty.getExtensionDependencies("Extension 2", true); + result = wikitty.getExtensionDependencies("Extension2", true); assertEquals(0, result.size()); } }

1 0

r308 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty
by echatellier＠users.nuiton.org 14 Sep '10

14 Sep '10

Author: echatellier Date: 2010-09-14 10:32:49 +0200 (Tue, 14 Sep 2010) New Revision: 308 Url: http://nuiton.org/repositories/revision/wikitty/308 Log: Fix wrong cut&paste code Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java 2010-09-13 12:41:28 UTC (rev 307) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java 2010-09-14 08:32:49 UTC (rev 308) @@ -567,7 +567,7 @@ * @return the corresponding object, exception if no such object found. */ public WikittyExtension restoreExtension(String extensionId) { - WikittyExtension extension = wikittyService.restoreExtensionLastVersion(securityToken, extensionId); + WikittyExtension extension = wikittyService.restoreExtension(securityToken, extensionId); return extension; }

1 0

r307 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty
by echatellier＠users.nuiton.org 13 Sep '10

13 Sep '10

Author: echatellier Date: 2010-09-13 14:41:28 +0200 (Mon, 13 Sep 2010) New Revision: 307 Url: http://nuiton.org/repositories/revision/wikitty/307 Log: Add constructor with service Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java 2010-09-13 12:01:45 UTC (rev 306) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java 2010-09-13 12:41:28 UTC (rev 307) @@ -55,6 +55,23 @@ */ protected String securityToken; + /** + * Empty constructor (uninitialized wikittyService). + */ + public WikittyProxy() { + + } + + /** + * Constructor with wikittyService. + * + * @param wikittyService wikitty service + */ + public WikittyProxy(WikittyService wikittyService) { + this(); + this.wikittyService = wikittyService; + } + public String login(String login, String password) { String result = wikittyService.login(login, password); setSecurityToken(result);

1 0