- Diswork-commits - mailman.cloud.codelutin.com

r137 - trunk
by echatellier＠users.nuiton.org May 15, 2014

May 15, 2014

Author: echatellier Date: 2014-05-15 11:29:15 +0200 (Thu, 15 May 2014) New Revision: 137 Url: http://forge.nuiton.org/projects/diswork/repository/revisions/137 Log: Update project (a little) to refresh site publish Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-05-15 09:18:11 UTC (rev 136) +++ trunk/pom.xml 2014-05-15 09:29:15 UTC (rev 137) @@ -221,4 +221,10 @@ <url>http://www.nuiton.org/projects/diswork/repository/trunk</url> </scm> + <distributionManagement> + <site> + <id>doc.${platform}</id> + <url>${our.site.repository}/${projectId}</url> + </site> + </distributionManagement> </project>

1 0

r136 - in trunk: . diswork-daemon diswork-fs diswork-fs/src/main/java/org/nuiton/diswork/fs diswork-fs/src/main/java/org/nuiton/diswork/fs/storage diswork-fs/src/main/resources diswork-fs/src/test/java/org/nuiton/diswork/fs diswork-fs/src/test/resources src/site src/site/rst src/site/rst/diswork-daemon src/site/rst/diswork-fs src/site/rst/user
by echatellier＠users.nuiton.org May 15, 2014

May 15, 2014

Author: echatellier Date: 2014-05-15 11:18:11 +0200 (Thu, 15 May 2014) New Revision: 136 Url: http://forge.nuiton.org/projects/diswork/repository/revisions/136 Log: Update project (a little) to refresh site publish Modified: trunk/LICENSE.txt trunk/diswork-daemon/LICENSE.txt trunk/diswork-fs/LICENSE.txt trunk/diswork-fs/src/main/java/org/nuiton/diswork/fs/DisworkAlreadyExistsException.java trunk/diswork-fs/src/main/java/org/nuiton/diswork/fs/DisworkFileSystem.java trunk/diswork-fs/src/main/java/org/nuiton/diswork/fs/DisworkFileSystemConfig.java trunk/diswork-fs/src/main/java/org/nuiton/diswork/fs/storage/Storage.java trunk/diswork-fs/src/main/resources/tester.properties trunk/diswork-fs/src/test/java/org/nuiton/diswork/fs/AbstractDisworkFileSystemTest.java trunk/diswork-fs/src/test/resources/log4j.properties trunk/pom.xml trunk/src/site/rst/devel-draft-0.2.rst trunk/src/site/rst/diswork-daemon/devel.rst trunk/src/site/rst/diswork-daemon/draft.rst trunk/src/site/rst/diswork-fs/devel.rst trunk/src/site/rst/diswork-fs/history.rst trunk/src/site/rst/index.rst trunk/src/site/rst/user/how_to_use.rst trunk/src/site/site_en.xml Modified: trunk/LICENSE.txt =================================================================== --- trunk/LICENSE.txt 2010-11-21 14:31:17 UTC (rev 135) +++ trunk/LICENSE.txt 2014-05-15 09:18:11 UTC (rev 136) @@ -10,7 +10,7 @@ the terms and conditions of version 3 of the GNU General Public License, supplemented by the additional permissions listed below. - 0. Additional Definitions. + 0. Additional Definitions. As used herein, "this License" refers to version 3 of the GNU Lesser General Public License, and the "GNU GPL" refers to version 3 of the GNU @@ -111,7 +111,7 @@ a copy of the Library already present on the user's computer system, and (b) will operate properly with a modified version of the Library that is interface-compatible with the Linked - Version. + Version. e) Provide Installation Information, but only if you would otherwise be required to provide such information under section 6 of the @@ -163,4 +163,3 @@ apply, that proxy's public statement of acceptance of any version is permanent authorization for you to choose that version for the Library. - Modified: trunk/diswork-daemon/LICENSE.txt =================================================================== --- trunk/diswork-daemon/LICENSE.txt 2010-11-21 14:31:17 UTC (rev 135) +++ trunk/diswork-daemon/LICENSE.txt 2014-05-15 09:18:11 UTC (rev 136) @@ -10,7 +10,7 @@ the terms and conditions of version 3 of the GNU General Public License, supplemented by the additional permissions listed below. - 0. Additional Definitions. + 0. Additional Definitions. As used herein, "this License" refers to version 3 of the GNU Lesser General Public License, and the "GNU GPL" refers to version 3 of the GNU @@ -111,7 +111,7 @@ a copy of the Library already present on the user's computer system, and (b) will operate properly with a modified version of the Library that is interface-compatible with the Linked - Version. + Version. e) Provide Installation Information, but only if you would otherwise be required to provide such information under section 6 of the @@ -163,4 +163,3 @@ apply, that proxy's public statement of acceptance of any version is permanent authorization for you to choose that version for the Library. - Modified: trunk/diswork-fs/LICENSE.txt =================================================================== --- trunk/diswork-fs/LICENSE.txt 2010-11-21 14:31:17 UTC (rev 135) +++ trunk/diswork-fs/LICENSE.txt 2014-05-15 09:18:11 UTC (rev 136) @@ -10,7 +10,7 @@ the terms and conditions of version 3 of the GNU General Public License, supplemented by the additional permissions listed below. - 0. Additional Definitions. + 0. Additional Definitions. As used herein, "this License" refers to version 3 of the GNU Lesser General Public License, and the "GNU GPL" refers to version 3 of the GNU @@ -111,7 +111,7 @@ a copy of the Library already present on the user's computer system, and (b) will operate properly with a modified version of the Library that is interface-compatible with the Linked - Version. + Version. e) Provide Installation Information, but only if you would otherwise be required to provide such information under section 6 of the @@ -163,4 +163,3 @@ apply, that proxy's public statement of acceptance of any version is permanent authorization for you to choose that version for the Library. - Modified: trunk/diswork-fs/src/main/java/org/nuiton/diswork/fs/DisworkAlreadyExistsException.java =================================================================== --- trunk/diswork-fs/src/main/java/org/nuiton/diswork/fs/DisworkAlreadyExistsException.java 2010-11-21 14:31:17 UTC (rev 135) +++ trunk/diswork-fs/src/main/java/org/nuiton/diswork/fs/DisworkAlreadyExistsException.java 2014-05-15 09:18:11 UTC (rev 136) @@ -1,5 +1,27 @@ package org.nuiton.diswork.fs; +/* + * #%L + * Diswork File-System + * %% + * Copyright (C) 2010 - 2014 CodeLutin + * %% + * 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% + */ + /** thrown when if path lead to something that already exists */ public class DisworkAlreadyExistsException extends DisworkFileSystemException { Modified: trunk/diswork-fs/src/main/java/org/nuiton/diswork/fs/DisworkFileSystem.java =================================================================== --- trunk/diswork-fs/src/main/java/org/nuiton/diswork/fs/DisworkFileSystem.java 2010-11-21 14:31:17 UTC (rev 135) +++ trunk/diswork-fs/src/main/java/org/nuiton/diswork/fs/DisworkFileSystem.java 2014-05-15 09:18:11 UTC (rev 136) @@ -87,7 +87,7 @@ protected static final int LOCK_WAIT = 10 * 1000; // ten seconds /** default constructor (uses default configuration parameters) - * @throws IOException caused by network issue + * @throws DisworkFileSystemException caused by network issue */ public DisworkFileSystem() throws DisworkFileSystemException { this(new DisworkFileSystemConfig()); @@ -96,7 +96,7 @@ /** constructor allowing to provide another configuration to use * * @param config the configuration - * @throws IOException caused by network issue + * @throws DisworkFileSystemException caused by network issue */ public DisworkFileSystem(DisworkFileSystemConfig config) throws DisworkFileSystemException { @@ -109,7 +109,7 @@ * or {@link #createSymbolicLink(String, String)} has been done before. * @param path a path in the virtual FS * @return true is something (a link, a file, or a directory) exists at path - * @throws IOException + * @throws DisworkFileSystemException */ public boolean exists(String path) throws DisworkFileSystemException { checkPathSyntax(path); @@ -124,7 +124,7 @@ * @param path the path to the file to read * @return an InputStream on the file * @throws FileNotFoundException if no file exists at this path - * @throws IOException if path exists but is a directory + * @throws DisworkFileSystemException if path exists but is a directory */ public InputStream read(String path) throws DisworkFileSystemException, FileNotFoundException { @@ -158,7 +158,7 @@ * write a file on the file system at a given place * @param path * @param source - * @throws IOException if file already exists + * @throws DisworkFileSystemException if file already exists * @throws ConcurrentModificationException if file is already being written */ public void write(String path, InputStream source) @@ -248,7 +248,7 @@ /** * creates a new empty directory * @param path the absolute path (ending by the name) of the directory - * @throws IOException if parent path is not correct + * @throws DisworkFileSystemException if parent path is not correct */ public void createDirectory(String path) throws DisworkFileSystemException { checkPathSyntax(path); @@ -777,7 +777,7 @@ * @param current * @param content * @return null if path is not valid or the entry corresponding to path - * @throws IOException + * @throws DisworkFileSystemException */ protected String walk(String path, String current, String content) throws DisworkFileSystemException { Modified: trunk/diswork-fs/src/main/java/org/nuiton/diswork/fs/DisworkFileSystemConfig.java =================================================================== --- trunk/diswork-fs/src/main/java/org/nuiton/diswork/fs/DisworkFileSystemConfig.java 2010-11-21 14:31:17 UTC (rev 135) +++ trunk/diswork-fs/src/main/java/org/nuiton/diswork/fs/DisworkFileSystemConfig.java 2014-05-15 09:18:11 UTC (rev 136) @@ -78,7 +78,6 @@ * returns the IP on the local machine. Trying to get an public IP or a LAN * IP or the loopback IP if there is no other interface * @return - * @throws UnknownHostException */ public static String getLocalIp() { InetAddress result = null; Modified: trunk/diswork-fs/src/main/java/org/nuiton/diswork/fs/storage/Storage.java =================================================================== --- trunk/diswork-fs/src/main/java/org/nuiton/diswork/fs/storage/Storage.java 2010-11-21 14:31:17 UTC (rev 135) +++ trunk/diswork-fs/src/main/java/org/nuiton/diswork/fs/storage/Storage.java 2014-05-15 09:18:11 UTC (rev 136) @@ -162,9 +162,9 @@ /** * * @param config an instance of - * @param null at normal use. Will set map according to the content of + * @param map null at normal use. Will set map according to the content of * config - * @throws IOException if network fail + * @throws DisworkFileSystemException if network fail */ public Storage(DisworkFileSystemConfig config, DisworkMap map) throws DisworkFileSystemException { @@ -210,7 +210,7 @@ /** * @return the content (entries) of the root directory - * @throws IOException + * @throws DisworkFileSystemException */ public String getRootDirectory() throws DisworkFileSystemException { String result = getDirectory(EntryUtil.ROOT_DIRECTORY); @@ -222,7 +222,7 @@ /** * @param id an id of a directory * @return a the entries of the directory - * @throws IOException + * @throws DisworkFileSystemException */ public String getDirectory(String id) throws DisworkFileSystemException { InputStream in = get(id); Modified: trunk/diswork-fs/src/main/resources/tester.properties =================================================================== --- trunk/diswork-fs/src/main/resources/tester.properties 2010-11-21 14:31:17 UTC (rev 135) +++ trunk/diswork-fs/src/main/resources/tester.properties 2014-05-15 09:18:11 UTC (rev 136) @@ -1,3 +1,24 @@ +### +# #%L +# Diswork File-System +# %% +# Copyright (C) 2010 - 2014 CodeLutin +# %% +# 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% +### # IP where the coordinator will execute tester.server=127.0.0.1 Modified: trunk/diswork-fs/src/test/java/org/nuiton/diswork/fs/AbstractDisworkFileSystemTest.java =================================================================== --- trunk/diswork-fs/src/test/java/org/nuiton/diswork/fs/AbstractDisworkFileSystemTest.java 2010-11-21 14:31:17 UTC (rev 135) +++ trunk/diswork-fs/src/test/java/org/nuiton/diswork/fs/AbstractDisworkFileSystemTest.java 2014-05-15 09:18:11 UTC (rev 136) @@ -71,7 +71,7 @@ /** * This setUp creates in a temp directory a file of size - * {@link randomFileSize} (fulfilling it with random bytes) + * {@link #randomFileSize} (fulfilling it with random bytes) * This file can be found at {@link #randomFilePath} * At the end of the method {@link #fileSystem} is ready to be used * @throws Exception @@ -146,7 +146,7 @@ } /** - * tests {@link org.nuiton.diswork.fs.storage.Storage#SplitBlocksInputStream} + * tests {@code org.nuiton.diswork.fs.storage.Storage.SplitBlocksInputStream} * by storing a "-1" byte, can be buggy due to the use of read() */ @Test Modified: trunk/diswork-fs/src/test/resources/log4j.properties =================================================================== --- trunk/diswork-fs/src/test/resources/log4j.properties 2010-11-21 14:31:17 UTC (rev 135) +++ trunk/diswork-fs/src/test/resources/log4j.properties 2014-05-15 09:18:11 UTC (rev 136) @@ -1,3 +1,24 @@ +### +# #%L +# Diswork File-System +# %% +# Copyright (C) 2010 - 2014 CodeLutin +# %% +# 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% +### # Global logging configuration log4j.rootLogger=WARN, stdout # Console output... Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-21 14:31:17 UTC (rev 135) +++ trunk/pom.xml 2014-05-15 09:18:11 UTC (rev 136) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.4.1</version> + <version>5.0.6</version> </parent> <artifactId>diswork</artifactId> @@ -216,11 +216,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/diswork/trunk</connection> - <developerConnection> - scm:svn:http://svn.nuiton.org/svn/diswork/trunk - </developerConnection> - <url>http://www.nuiton.org/repositories/browse/diswork/trunk</url> + <connection>scm:svn:https://svn.nuiton.org/diswork/trunk</connection> + <developerConnection>scm:svn:https://svn.nuiton.org/diswork/trunk</developerConnection> + <url>http://www.nuiton.org/projects/diswork/repository/trunk</url> </scm> </project> Modified: trunk/src/site/rst/devel-draft-0.2.rst =================================================================== --- trunk/src/site/rst/devel-draft-0.2.rst 2010-11-21 14:31:17 UTC (rev 135) +++ trunk/src/site/rst/devel-draft-0.2.rst 2014-05-15 09:18:11 UTC (rev 136) @@ -1,3 +1,25 @@ +.. - +.. * #%L +.. * Diswork +.. * %% +.. * Copyright (C) 2010 - 2014 CodeLutin +.. * %% +.. * 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% +.. - + ======================== Draft pour Diswork v 0.2 ======================== Modified: trunk/src/site/rst/diswork-daemon/devel.rst =================================================================== --- trunk/src/site/rst/diswork-daemon/devel.rst 2010-11-21 14:31:17 UTC (rev 135) +++ trunk/src/site/rst/diswork-daemon/devel.rst 2014-05-15 09:18:11 UTC (rev 136) @@ -1,3 +1,25 @@ +.. - +.. * #%L +.. * Diswork +.. * %% +.. * Copyright (C) 2010 - 2014 CodeLutin +.. * %% +.. * 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% +.. - + ======================== How Diswork Daemon works ======================== Modified: trunk/src/site/rst/diswork-daemon/draft.rst =================================================================== --- trunk/src/site/rst/diswork-daemon/draft.rst 2010-11-21 14:31:17 UTC (rev 135) +++ trunk/src/site/rst/diswork-daemon/draft.rst 2014-05-15 09:18:11 UTC (rev 136) @@ -1,3 +1,25 @@ +.. - +.. * #%L +.. * Diswork +.. * %% +.. * Copyright (C) 2010 - 2014 CodeLutin +.. * %% +.. * 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% +.. - + Diswork first draft (fin mars 2010) =================================== Modified: trunk/src/site/rst/diswork-fs/devel.rst =================================================================== --- trunk/src/site/rst/diswork-fs/devel.rst 2010-11-21 14:31:17 UTC (rev 135) +++ trunk/src/site/rst/diswork-fs/devel.rst 2014-05-15 09:18:11 UTC (rev 136) @@ -1,3 +1,25 @@ +.. - +.. * #%L +.. * Diswork +.. * %% +.. * Copyright (C) 2010 - 2014 CodeLutin +.. * %% +.. * 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% +.. - + ============================= How Diswork File System works ============================= Modified: trunk/src/site/rst/diswork-fs/history.rst =================================================================== --- trunk/src/site/rst/diswork-fs/history.rst 2010-11-21 14:31:17 UTC (rev 135) +++ trunk/src/site/rst/diswork-fs/history.rst 2014-05-15 09:18:11 UTC (rev 136) @@ -1,3 +1,25 @@ +.. - +.. * #%L +.. * Diswork +.. * %% +.. * Copyright (C) 2010 - 2014 CodeLutin +.. * %% +.. * 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% +.. - + ========== Historique ========== Modified: trunk/src/site/rst/index.rst =================================================================== --- trunk/src/site/rst/index.rst 2010-11-21 14:31:17 UTC (rev 135) +++ trunk/src/site/rst/index.rst 2014-05-15 09:18:11 UTC (rev 136) @@ -1,3 +1,25 @@ +.. - +.. * #%L +.. * Diswork +.. * %% +.. * Copyright (C) 2010 - 2014 CodeLutin +.. * %% +.. * 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% +.. - + Presentation ============ Modified: trunk/src/site/rst/user/how_to_use.rst =================================================================== --- trunk/src/site/rst/user/how_to_use.rst 2010-11-21 14:31:17 UTC (rev 135) +++ trunk/src/site/rst/user/how_to_use.rst 2014-05-15 09:18:11 UTC (rev 136) @@ -1,3 +1,25 @@ +.. - +.. * #%L +.. * Diswork +.. * %% +.. * Copyright (C) 2010 - 2014 CodeLutin +.. * %% +.. * 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% +.. - + ================== How to use Diswork ================== Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2010-11-21 14:31:17 UTC (rev 135) +++ trunk/src/site/site_en.xml 2014-05-15 09:18:11 UTC (rev 136) @@ -1,6 +1,47 @@ <?xml version="1.0" encoding="UTF-8"?> + + <project name="${project.name}"> + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>1.3.1</version> + </skin> + + <custom> + <fluidoSkin> + <topBarEnabled>false</topBarEnabled> + <googleSearch/> + <sideBarEnabled>true</sideBarEnabled> + <searchEnabled>true</searchEnabled> + <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> + </fluidoSkin> + </custom> + + <publishDate position="right"/> + <version position="right"/> + <bannerLeft> <name>${project.name}</name> <href>index.html</href> @@ -8,7 +49,7 @@ <poweredBy> <logo href="http://maven.apache.org" name="Maven" img="images/logos/maven-feather.png"/> - <logo href="http://jrst.labs.libre-entreprise.org" name="JRst" img="images/jrst-logo.png"/> + <logo href="http://doc.nuiton.org/jrst/" name="JRst" img="images/jrst-logo.png"/> <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" img="images/restructuredtext-logo.png"/> </poweredBy>

1 0

r135 - trunk
by tchemit＠users.nuiton.org Nov. 21, 2010

Nov. 21, 2010

Author: tchemit Date: 2010-11-21 15:31:17 +0100 (Sun, 21 Nov 2010) New Revision: 135 Url: http://nuiton.org/repositories/revision/diswork/135 Log: Update mavenpom4redmine to 2.4.1. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-29 11:52:51 UTC (rev 134) +++ trunk/pom.xml 2010-11-21 14:31:17 UTC (rev 135) @@ -1,7 +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/xsd/maven-4.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> @@ -12,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.4</version> + <version>2.4.1</version> </parent> <artifactId>diswork</artifactId>

1 0

r134 - in trunk: . diswork-daemon diswork-daemon/src/main/java/org/nuiton/diswork/daemon diswork-fs
by tchemit＠users.nuiton.org Oct. 29, 2010

Oct. 29, 2010

Author: tchemit Date: 2010-10-29 13:52:51 +0200 (Fri, 29 Oct 2010) New Revision: 134 Url: http://nuiton.org/repositories/revision/diswork/134 Log: fix dependencies + fix a strange exception ? about JDOM ? Modified: trunk/diswork-daemon/pom.xml trunk/diswork-daemon/src/main/java/org/nuiton/diswork/daemon/JobDescription.java trunk/diswork-fs/pom.xml trunk/pom.xml Modified: trunk/diswork-daemon/pom.xml =================================================================== --- trunk/diswork-daemon/pom.xml 2010-10-29 08:30:07 UTC (rev 133) +++ trunk/diswork-daemon/pom.xml 2010-10-29 11:52:51 UTC (rev 134) @@ -1,5 +1,6 @@ -<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/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.nuiton</groupId> @@ -18,15 +19,12 @@ <artifactId>diswork-fs</artifactId> <version>${project.version}</version> </dependency> + <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </dependency> - <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> </dependency> @@ -53,18 +51,22 @@ <dependency> <groupId>org.mortbay.jetty</groupId> <artifactId>jsp-2.1-jetty</artifactId> - <version>6.1.24</version> </dependency> + <dependency> + <groupId>jdom</groupId> + <artifactId>jdom</artifactId> + </dependency>  <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> <scope>test</scope> </dependency> </dependencies> - <build> - </build> - </project> \ No newline at end of file Modified: trunk/diswork-daemon/src/main/java/org/nuiton/diswork/daemon/JobDescription.java =================================================================== --- trunk/diswork-daemon/src/main/java/org/nuiton/diswork/daemon/JobDescription.java 2010-10-29 08:30:07 UTC (rev 133) +++ trunk/diswork-daemon/src/main/java/org/nuiton/diswork/daemon/JobDescription.java 2010-10-29 11:52:51 UTC (rev 134) @@ -265,24 +265,23 @@ public static JobDescription parseJSDL(String jsdl) throws BadJobException { // TODO 20100616 bleny correctly set dependency to JDOM in pom.xml JobDescription result = new JobDescription(); - try { SAXBuilder builder = new SAXBuilder(); Document document = builder.build(IOUtils.toInputStream(jsdl)); Element jobDefinition = document.getRootElement(); - + // namespaces Namespace jsdlNamespace = jobDefinition.getNamespace("jsdl"); Namespace jsdlPosixNamespace = jobDefinition.getNamespace("jsdl-posix"); Namespace disworkNamespace = jobDefinition.getNamespace("diswork"); - + // main element Element jobDescription = jobDefinition.getChild("JobDescription", jsdlNamespace); // job identification Element jobIdentification = jobDescription.getChild - ("JobIdentification", jsdlNamespace); + ("JobIdentification", jsdlNamespace); Element jobName = jobIdentification.getChild("JobName", jsdlNamespace); result.setJobName(jobName.getText()); @@ -294,7 +293,7 @@ jsdlNamespace); if (applicationName != null) { Element applicationVersion = application.getChild - ("ApplicationVersion", jsdlNamespace); + ("ApplicationVersion", jsdlNamespace); result.setApplication(applicationName.getText(), applicationVersion.getText()); } @@ -319,7 +318,7 @@ // staging List<Element> dataStagings = jobDescription.getChildren - ("DataStaging", jsdlNamespace); + ("DataStaging", jsdlNamespace); for (Element dataStaging : dataStagings) { Attribute type = dataStaging.getAttribute("type", disworkNamespace); @@ -339,13 +338,17 @@ result.addOutput(fileName.getText()); } } + } catch (MalformedURLException e) { + log.error("malformed URL", e); + throw new BadJobException("malformed URL", e); + } catch (IOException e) { + log.error("can't read malformed JSDL file", e); + throw new BadJobException("can't read malformed JSDL file", e); } catch (JDOMException e) { log.error("can't read malformed JSDL file", e); - throw new BadJobException("can't read malformed JSDL file", e); - } catch (MalformedURLException e) { - log.error("malformed URL", e); - throw new BadJobException("malformed URL", e); - } + throw new BadJobException("can't read malformed JSDL file", e); + } + return result; } Modified: trunk/diswork-fs/pom.xml =================================================================== --- trunk/diswork-fs/pom.xml 2010-10-29 08:30:07 UTC (rev 133) +++ trunk/diswork-fs/pom.xml 2010-10-29 11:52:51 UTC (rev 134) @@ -20,6 +20,7 @@ <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>commons-io</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-29 08:30:07 UTC (rev 133) +++ trunk/pom.xml 2010-10-29 11:52:51 UTC (rev 134) @@ -1,5 +1,7 @@ <?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/xsd/maven-4.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> @@ -23,7 +25,7 @@ <dependencyManagement> <dependencies> - <dependency> +   - <dependency> +  <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> @@ -95,16 +97,25 @@ <artifactId>jetty</artifactId> <version>6.1.9</version> </dependency> + <dependency> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jsp-2.1-jetty</artifactId> + <version>6.1.24</version> + </dependency> + <dependency> + <groupId>jdom</groupId> + <artifactId>jdom</artifactId> + <version>1.1</version> + </dependency> -  - <dependency> +  </dependencies> </dependencyManagement>  @@ -193,7 +204,7 @@ <dependency> <groupId>org.nuiton.jrst</groupId> <artifactId>doxia-module-jrst</artifactId> - <version>${jrst.version}</version> + <version>${jrstPluginVersion}</version> </dependency> </dependencies> </plugin> @@ -208,7 +219,9 @@  <scm> <connection>scm:svn:http://svn.nuiton.org/svn/diswork/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/diswork/trunk</developerConnection> + <developerConnection> + scm:svn:http://svn.nuiton.org/svn/diswork/trunk + </developerConnection> <url>http://www.nuiton.org/repositories/browse/diswork/trunk</url> </scm>

1 0

r133 - trunk
by tchemit＠users.nuiton.org Oct. 29, 2010

Oct. 29, 2010

Author: tchemit Date: 2010-10-29 10:30:07 +0200 (Fri, 29 Oct 2010) New Revision: 133 Url: http://nuiton.org/repositories/revision/diswork/133 Log: Update mavenpom4redmine to 2.4. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-26 15:01:54 UTC (rev 132) +++ trunk/pom.xml 2010-10-29 08:30:07 UTC (rev 133) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.3.2</version> + <version>2.4</version> </parent> <artifactId>diswork</artifactId>

1 0

r132 - trunk/diswork-daemon
by tchemit＠users.nuiton.org Oct. 26, 2010

Oct. 26, 2010

Author: tchemit Date: 2010-10-26 17:01:54 +0200 (Tue, 26 Oct 2010) New Revision: 132 Url: http://nuiton.org/repositories/revision/diswork/132 Log: add svn:ignore Modified: trunk/diswork-daemon/ Property changes on: trunk/diswork-daemon ___________________________________________________________________ Modified: svn:ignore - target .classpath .settings .project diswork-daemon.iml + target .classpath .settings .project *.ipr *.iws *.iml

1 0

r131 - in trunk/diswork-fs: . src/test/java/org/nuiton/diswork/fs src/test/java/org/nuiton/diswork/fs/storage
by tchemit＠users.nuiton.org Oct. 26, 2010

Oct. 26, 2010

Author: tchemit Date: 2010-10-26 16:21:07 +0200 (Tue, 26 Oct 2010) New Revision: 131 Url: http://nuiton.org/repositories/revision/diswork/131 Log: pass some test to it (there very, but very long :)) Added: trunk/diswork-fs/src/test/java/org/nuiton/diswork/fs/DisworkFileSystemKademliaIT.java trunk/diswork-fs/src/test/java/org/nuiton/diswork/fs/storage/KademliaDisworkMapIT.java Removed: trunk/diswork-fs/src/test/java/org/nuiton/diswork/fs/DisworkFileSystemKademliaTest.java trunk/diswork-fs/src/test/java/org/nuiton/diswork/fs/storage/KademliaDisworkMapTest.java Modified: trunk/diswork-fs/pom.xml Modified: trunk/diswork-fs/pom.xml =================================================================== --- trunk/diswork-fs/pom.xml 2010-10-17 01:39:03 UTC (rev 130) +++ trunk/diswork-fs/pom.xml 2010-10-26 14:21:07 UTC (rev 131) @@ -65,4 +65,36 @@ </plugins> </build> + <profiles> + <profile> + <id>run-its</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <executions> + <execution> + <id>integration-tests</id> + <phase>integration-test</phase> + <goals> + <goal>test</goal> + </goals> + <configuration> + <includes> + <include>**/*IT.java</include> + </includes> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> \ No newline at end of file Copied: trunk/diswork-fs/src/test/java/org/nuiton/diswork/fs/DisworkFileSystemKademliaIT.java (from rev 130, trunk/diswork-fs/src/test/java/org/nuiton/diswork/fs/DisworkFileSystemKademliaTest.java) =================================================================== --- trunk/diswork-fs/src/test/java/org/nuiton/diswork/fs/DisworkFileSystemKademliaIT.java (rev 0) +++ trunk/diswork-fs/src/test/java/org/nuiton/diswork/fs/DisworkFileSystemKademliaIT.java 2010-10-26 14:21:07 UTC (rev 131) @@ -0,0 +1,123 @@ +/* + * #%L + * Diswork File-System + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 CodeLutin + * %% + * 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% + */ +package org.nuiton.diswork.fs; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + +import java.io.FileInputStream; +import java.io.InputStream; +import java.util.ConcurrentModificationException; + +import org.apache.commons.io.IOUtils; +import org.junit.Before; +import org.junit.Test; + +public class DisworkFileSystemKademliaIT extends AbstractDisworkFileSystemTest { + + protected Integer bootstrapPort; + + /** + * this code executed after {@link AbstractDisworkFileSystemTest#setUp()} + * @throws Exception + */ + @Before + public void setUpFileSystem() throws Exception { + // finally, initiate the fileSystem + DisworkFileSystemConfig disworkConfig1 = new DisworkFileSystemConfig(); + disworkConfig1.setMapType("kademlia"); + bootstrapPort = disworkConfig1.getUsedPort(); + fileSystem = new DisworkFileSystem(disworkConfig1); + } + + + @Test + public void testMultipleNodes1() throws Exception { + DisworkFileSystemConfig disworkConfig = new DisworkFileSystemConfig(bootstrapPort); + disworkConfig.setMapType("kademlia"); + DisworkFileSystem fileSystem2 = new DisworkFileSystem(disworkConfig); + + fileSystem.write("/file", new FileInputStream(randomFilePath)); + assertTrue(fileSystem2.exists("/file")); + } + + @Test + public void testMultipleNodes2() throws Exception { + DisworkFileSystemConfig disworkConfig = new DisworkFileSystemConfig(bootstrapPort); + disworkConfig.setMapType("kademlia"); + DisworkFileSystem fileSystem2 = new DisworkFileSystem(disworkConfig); + + InputStream source = null; + try { + source = new FileInputStream(randomFilePath); + fileSystem.write("/my_file", source); + } finally { + IOUtils.closeQuietly(source); + } + + assertTrue(fileSystem.exists("/my_file")); + assertTrue(fileSystem2.exists("/my_file")); + assertEquals(1, fileSystem2.readDirectory("/").size()); + + // now, the checks. We read the original file and the result of + // a read() and then compare it byte-to-byte + + InputStream readResult = null; + try { + source = new FileInputStream(randomFilePath); + readResult = fileSystem2.read("/my_file"); + + assertEquals(randomFileSize, source.available()); + assertEquals(randomFileSize, readResult.available()); + + assertTrue(IOUtils.contentEquals(source, readResult)); + /* + byte[] sourceAsBytes = IOUtils.toByteArray(source); + byte[] readResultAsBytes = IOUtils.toByteArray(readResult); + + assertArrayEquals(sourceAsBytes, readResultAsBytes); + */ + } finally { + IOUtils.closeQuietly(source); + IOUtils.closeQuietly(readResult); + } + + } + + @Test + public void testMultipleNodes3() throws Exception { + DisworkFileSystemConfig disworkConfig = new DisworkFileSystemConfig(bootstrapPort); + disworkConfig.setMapType("kademlia"); + DisworkFileSystem fileSystem2 = new DisworkFileSystem(disworkConfig); + + fileSystem.createDirectory("/mydir"); + try { + fileSystem2.createDirectory("/myseconddir"); + } catch (ConcurrentModificationException e) { + fail(); + } + } +} Deleted: trunk/diswork-fs/src/test/java/org/nuiton/diswork/fs/DisworkFileSystemKademliaTest.java =================================================================== --- trunk/diswork-fs/src/test/java/org/nuiton/diswork/fs/DisworkFileSystemKademliaTest.java 2010-10-17 01:39:03 UTC (rev 130) +++ trunk/diswork-fs/src/test/java/org/nuiton/diswork/fs/DisworkFileSystemKademliaTest.java 2010-10-26 14:21:07 UTC (rev 131) @@ -1,123 +0,0 @@ -/* - * #%L - * Diswork File-System - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2010 CodeLutin - * %% - * 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% - */ -package org.nuiton.diswork.fs; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - -import java.io.FileInputStream; -import java.io.InputStream; -import java.util.ConcurrentModificationException; - -import org.apache.commons.io.IOUtils; -import org.junit.Before; -import org.junit.Test; - -public class DisworkFileSystemKademliaTest extends AbstractDisworkFileSystemTest { - - protected Integer bootstrapPort; - - /** - * this code executed after {@link AbstractDisworkFileSystemTest#setUp()} - * @throws Exception - */ - @Before - public void setUpFileSystem() throws Exception { - // finally, initiate the fileSystem - DisworkFileSystemConfig disworkConfig1 = new DisworkFileSystemConfig(); - disworkConfig1.setMapType("kademlia"); - bootstrapPort = disworkConfig1.getUsedPort(); - fileSystem = new DisworkFileSystem(disworkConfig1); - } - - - @Test - public void testMultipleNodes1() throws Exception { - DisworkFileSystemConfig disworkConfig = new DisworkFileSystemConfig(bootstrapPort); - disworkConfig.setMapType("kademlia"); - DisworkFileSystem fileSystem2 = new DisworkFileSystem(disworkConfig); - - fileSystem.write("/file", new FileInputStream(randomFilePath)); - assertTrue(fileSystem2.exists("/file")); - } - - @Test - public void testMultipleNodes2() throws Exception { - DisworkFileSystemConfig disworkConfig = new DisworkFileSystemConfig(bootstrapPort); - disworkConfig.setMapType("kademlia"); - DisworkFileSystem fileSystem2 = new DisworkFileSystem(disworkConfig); - - InputStream source = null; - try { - source = new FileInputStream(randomFilePath); - fileSystem.write("/my_file", source); - } finally { - IOUtils.closeQuietly(source); - } - - assertTrue(fileSystem.exists("/my_file")); - assertTrue(fileSystem2.exists("/my_file")); - assertEquals(1, fileSystem2.readDirectory("/").size()); - - // now, the checks. We read the original file and the result of - // a read() and then compare it byte-to-byte - - InputStream readResult = null; - try { - source = new FileInputStream(randomFilePath); - readResult = fileSystem2.read("/my_file"); - - assertEquals(randomFileSize, source.available()); - assertEquals(randomFileSize, readResult.available()); - - assertTrue(IOUtils.contentEquals(source, readResult)); - /* - byte[] sourceAsBytes = IOUtils.toByteArray(source); - byte[] readResultAsBytes = IOUtils.toByteArray(readResult); - - assertArrayEquals(sourceAsBytes, readResultAsBytes); - */ - } finally { - IOUtils.closeQuietly(source); - IOUtils.closeQuietly(readResult); - } - - } - - @Test - public void testMultipleNodes3() throws Exception { - DisworkFileSystemConfig disworkConfig = new DisworkFileSystemConfig(bootstrapPort); - disworkConfig.setMapType("kademlia"); - DisworkFileSystem fileSystem2 = new DisworkFileSystem(disworkConfig); - - fileSystem.createDirectory("/mydir"); - try { - fileSystem2.createDirectory("/myseconddir"); - } catch (ConcurrentModificationException e) { - fail(); - } - } -} Copied: trunk/diswork-fs/src/test/java/org/nuiton/diswork/fs/storage/KademliaDisworkMapIT.java (from rev 130, trunk/diswork-fs/src/test/java/org/nuiton/diswork/fs/storage/KademliaDisworkMapTest.java) =================================================================== --- trunk/diswork-fs/src/test/java/org/nuiton/diswork/fs/storage/KademliaDisworkMapIT.java (rev 0) +++ trunk/diswork-fs/src/test/java/org/nuiton/diswork/fs/storage/KademliaDisworkMapIT.java 2010-10-26 14:21:07 UTC (rev 131) @@ -0,0 +1,110 @@ +/* + * #%L + * Diswork File-System + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 CodeLutin + * %% + * 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% + */ +package org.nuiton.diswork.fs.storage; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import org.junit.Before; +import org.junit.Test; +import org.nuiton.diswork.fs.DisworkFileSystemConfig; +import org.nuiton.diswork.fs.DisworkFileSystemException; +import org.planx.xmlstore.routing.Identifier; + +public class KademliaDisworkMapIT extends AbstractDisworkMapTest { + + @Before + public void setUp() throws Exception { + DisworkFileSystemConfig config1 = new DisworkFileSystemConfig(); + map1 = new KademliaDisworkMap(config1); + + DisworkFileSystemConfig config2 = new DisworkFileSystemConfig(config1.getUsedPort()); + map2 = new KademliaDisworkMap(config2); + } + + /** + * this tests the key generation algorithm, it has different properties to + * check : + * * two call with same param should return same key + * * two call with different parameter should return different keys + * * a call should never return null + */ + @Test + public void testStringToIdentifier() { + + List<String> paths = new ArrayList<String>(); + + // a set will remove doubloons + Set<Identifier> keys = new HashSet<Identifier>(); + + paths.add("/"); + paths.add("/dir"); + paths.add("/dir/dir"); + paths.add("/a_directory_with_a_long_name_may_lead_to_the_raise_of_an_" + + "exception"); + paths.add("1111111111111111111111111111111111111111111111111111111111"); + paths.add("1111111111111111111111111111111111111111111111111111111112"); + + for (String path : paths) { + Identifier key = KademliaDisworkMap.stringToIdentifier(path); + assertNotNull(key); + + // keys should be equals (depend only from path, not random factor) + Identifier otherKey = KademliaDisworkMap.stringToIdentifier(path); + assertEquals(key, otherKey); + + keys.add(key); + } + + // check differents paths have different keys + // if keys set is too small, there are collisions + assertEquals(paths.size(), keys.size()); + } + + /** + * Tests that an exception is raised when attempting to connect using + * a bad bootstrap + * @throws Exception + */ + @Test + public void testBadBootrap() throws Exception { + DisworkFileSystemConfig config1 = new DisworkFileSystemConfig(); + config1.setBootstrapIp("microsoft.com"); + config1.setBootstrapPort(80); + try { + new KademliaDisworkMap(config1); + fail(); + } catch (DisworkFileSystemException e) { + assertTrue(true); + } + } +} Deleted: trunk/diswork-fs/src/test/java/org/nuiton/diswork/fs/storage/KademliaDisworkMapTest.java =================================================================== --- trunk/diswork-fs/src/test/java/org/nuiton/diswork/fs/storage/KademliaDisworkMapTest.java 2010-10-17 01:39:03 UTC (rev 130) +++ trunk/diswork-fs/src/test/java/org/nuiton/diswork/fs/storage/KademliaDisworkMapTest.java 2010-10-26 14:21:07 UTC (rev 131) @@ -1,110 +0,0 @@ -/* - * #%L - * Diswork File-System - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2010 CodeLutin - * %% - * 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% - */ -package org.nuiton.diswork.fs.storage; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import org.junit.Before; -import org.junit.Test; -import org.nuiton.diswork.fs.DisworkFileSystemConfig; -import org.nuiton.diswork.fs.DisworkFileSystemException; -import org.planx.xmlstore.routing.Identifier; - -public class KademliaDisworkMapTest extends AbstractDisworkMapTest { - - @Before - public void setUp() throws Exception { - DisworkFileSystemConfig config1 = new DisworkFileSystemConfig(); - map1 = new KademliaDisworkMap(config1); - - DisworkFileSystemConfig config2 = new DisworkFileSystemConfig(config1.getUsedPort()); - map2 = new KademliaDisworkMap(config2); - } - - /** - * this tests the key generation algorithm, it has different properties to - * check : - * * two call with same param should return same key - * * two call with different parameter should return different keys - * * a call should never return null - */ - @Test - public void testStringToIdentifier() { - - List<String> paths = new ArrayList<String>(); - - // a set will remove doubloons - Set<Identifier> keys = new HashSet<Identifier>(); - - paths.add("/"); - paths.add("/dir"); - paths.add("/dir/dir"); - paths.add("/a_directory_with_a_long_name_may_lead_to_the_raise_of_an_" - + "exception"); - paths.add("1111111111111111111111111111111111111111111111111111111111"); - paths.add("1111111111111111111111111111111111111111111111111111111112"); - - for (String path : paths) { - Identifier key = KademliaDisworkMap.stringToIdentifier(path); - assertNotNull(key); - - // keys should be equals (depend only from path, not random factor) - Identifier otherKey = KademliaDisworkMap.stringToIdentifier(path); - assertEquals(key, otherKey); - - keys.add(key); - } - - // check differents paths have different keys - // if keys set is too small, there are collisions - assertEquals(paths.size(), keys.size()); - } - - /** - * Tests that an exception is raised when attempting to connect using - * a bad bootstrap - * @throws Exception - */ - @Test - public void testBadBootrap() throws Exception { - DisworkFileSystemConfig config1 = new DisworkFileSystemConfig(); - config1.setBootstrapIp("microsoft.com"); - config1.setBootstrapPort(80); - try { - new KademliaDisworkMap(config1); - fail(); - } catch (DisworkFileSystemException e) { - assertTrue(true); - } - } -}

1 0

r130 - trunk
by tchemit＠users.nuiton.org Oct. 17, 2010

Oct. 17, 2010

Author: tchemit Date: 2010-10-17 03:39:03 +0200 (Sun, 17 Oct 2010) New Revision: 130 Url: http://nuiton.org/repositories/revision/diswork/130 Log: Update mavenpom4redmine to 2.3.2. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-08 23:51:29 UTC (rev 129) +++ trunk/pom.xml 2010-10-17 01:39:03 UTC (rev 130) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.3.1</version> + <version>2.3.2</version> </parent> <artifactId>diswork</artifactId>

1 0

r129 - trunk
by tchemit＠users.nuiton.org Oct. 8, 2010

Oct. 8, 2010

Author: tchemit Date: 2010-10-09 01:51:29 +0200 (Sat, 09 Oct 2010) New Revision: 129 Url: http://nuiton.org/repositories/revision/diswork/129 Log: Update mavenpom4redmine to 2.3.1. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-03 15:54:21 UTC (rev 128) +++ trunk/pom.xml 2010-10-08 23:51:29 UTC (rev 129) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.3</version> + <version>2.3.1</version> </parent> <artifactId>diswork</artifactId>

1 0

r128 - trunk
by tchemit＠users.nuiton.org Oct. 3, 2010

Oct. 3, 2010

Author: tchemit Date: 2010-10-03 17:54:21 +0200 (Sun, 03 Oct 2010) New Revision: 128 Url: http://nuiton.org/repositories/revision/diswork/128 Log: Update mavenpom4redmine to 2.3. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-09-29 08:10:24 UTC (rev 127) +++ trunk/pom.xml 2010-10-03 15:54:21 UTC (rev 128) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.2.6</version> + <version>2.3</version> </parent> <artifactId>diswork</artifactId>

1 0