Author: bleny Date: 2010-06-07 18:24:46 +0200 (Mon, 07 Jun 2010) New Revision: 65 Url: http://nuiton.org/repositories/revision/diswork/65 Log: creation module diswork daemon, code style Added: trunk/diswork-daemon/ trunk/diswork-daemon/LICENSE.txt trunk/diswork-daemon/README.txt trunk/diswork-daemon/changelog.txt trunk/diswork-daemon/pom.xml trunk/diswork-daemon/src/ trunk/diswork-daemon/src/main/ trunk/diswork-daemon/src/main/java/ trunk/diswork-daemon/src/test/ trunk/diswork-daemon/src/test/java/ trunk/src/site/rst/diswork-daemon/ trunk/src/site/rst/diswork-daemon/how_it_works.rst Modified: trunk/diswork-fs/src/main/java/org/nuiton/disworkfs/storage/Storage.java trunk/pom.xml trunk/src/site/site_en.xml Added: trunk/diswork-daemon/LICENSE.txt =================================================================== --- trunk/diswork-daemon/LICENSE.txt (rev 0) +++ trunk/diswork-daemon/LICENSE.txt 2010-06-07 16:24:46 UTC (rev 65) @@ -0,0 +1,166 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 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 +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + 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. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. + Added: trunk/diswork-daemon/pom.xml =================================================================== --- trunk/diswork-daemon/pom.xml (rev 0) +++ trunk/diswork-daemon/pom.xml 2010-06-07 16:24:46 UTC (rev 65) @@ -0,0 +1,49 @@ +<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> + <artifactId>diswork</artifactId> + <version>0.0.1-SNAPSHOT</version> + </parent> + + <groupId>org.nuiton.diswork</groupId> + <artifactId>diswork-daemon</artifactId> + + <packaging>jar</packaging> + <name>Diswork daemon</name> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <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> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> + + <!-- test --> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + + <build> + </build> + +</project> \ No newline at end of file Modified: trunk/diswork-fs/src/main/java/org/nuiton/disworkfs/storage/Storage.java =================================================================== --- trunk/diswork-fs/src/main/java/org/nuiton/disworkfs/storage/Storage.java 2010-06-07 15:48:17 UTC (rev 64) +++ trunk/diswork-fs/src/main/java/org/nuiton/disworkfs/storage/Storage.java 2010-06-07 16:24:46 UTC (rev 65) @@ -102,8 +102,10 @@ if (blockIdsIndex < blockIds.length) { // closing previously opened stream IOUtils.closeQuietly(currentBlock); - currentBlock = new ByteArrayInputStream(map.get(blockIds[blockIdsIndex])); - log.debug("new current block (size = " + currentBlock.available() + ")"); + currentBlock = new ByteArrayInputStream( + map.get(blockIds[blockIdsIndex])); + log.debug("new current block (size = " + + currentBlock.available() + ")"); } else { return -1; } @@ -128,10 +130,11 @@ String metaBlock = EntryUtil.bytesToString(bytes); blockIds = EntryUtil.getBlockIdsFromMetaBlock(metaBlock); blockIdsIndex = -1; - numberOfAvailableBytes = EntryUtil.getTotalSizeFromMetaBlock(metaBlock); + numberOfAvailableBytes = + EntryUtil.getTotalSizeFromMetaBlock(metaBlock); log.debug("initializing stream with meta block \"" + metaBlock - + "\" (" + blockIds.length + " blocks, " + numberOfAvailableBytes - + " bytes)"); + + "\" (" + blockIds.length + " blocks, " + + numberOfAvailableBytes + " bytes)"); } } @@ -335,7 +338,8 @@ unLock(key); } else { - throw new ConcurrentModificationException("key " + key + " is locked"); + throw new ConcurrentModificationException("key " + key + + " is locked"); } } @@ -385,7 +389,9 @@ Boolean result = null; // if there was no lock or if current lock is mine - if (lock == null || (EntryUtil.getOwnerFromLock(lock).equals(ownerId))) { + if (lock == null || + (EntryUtil.getOwnerFromLock(lock).equals(ownerId))) { + // file is not locked, we have took the lock result = true; } else { @@ -430,7 +436,8 @@ if (obsoleteMetaBlock != null) { String[] obsoleteBlocksIds = EntryUtil.getBlockIdsFromMetaBlock(obsoleteMetaBlock); - log.info("removing " + obsoleteBlocksIds.length + " old blocks"); + log.info("removing " + obsoleteBlocksIds.length + + " old blocks"); for (String obsoleteBlockId : obsoleteBlocksIds) { removeKey(obsoleteBlockId); } Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-07 15:48:17 UTC (rev 64) +++ trunk/pom.xml 2010-06-07 16:24:46 UTC (rev 65) @@ -19,6 +19,7 @@ <modules> <module>diswork-fs</module> + <module>diswork-daemon</module> </modules> <dependencyManagement> Added: trunk/src/site/rst/diswork-daemon/how_it_works.rst =================================================================== --- trunk/src/site/rst/diswork-daemon/how_it_works.rst (rev 0) +++ trunk/src/site/rst/diswork-daemon/how_it_works.rst 2010-06-07 16:24:46 UTC (rev 65) @@ -0,0 +1,4 @@ +How Diswork Daemon works +======================== + +Diswork Daemon uses Diswork File System. \ No newline at end of file Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2010-06-07 15:48:17 UTC (rev 64) +++ trunk/src/site/site_en.xml 2010-06-07 16:24:46 UTC (rev 65) @@ -27,6 +27,10 @@ <item href="devel/draft.html" name="First draft"/> </menu> + <menu name="diswork daemon"> + <item href="diswork-fs/how_it_works.html" name="How it works"/> + </menu> + <menu name="diswork FS"> <item href="diswork-fs/history.html" name="Install"/> <item href="diswork-fs/how_it_works.html" name="How it works"/>