Author: bleny Date: 2010-06-07 17:48:17 +0200 (Mon, 07 Jun 2010) New Revision: 64 Url: http://nuiton.org/repositories/revision/diswork/64 Log: maj pom Modified: trunk/diswork-fs/pom.xml trunk/diswork-fs/src/main/java/org/nuiton/disworkfs/DisworkFileSystemConfig.java trunk/pom.xml Modified: trunk/diswork-fs/pom.xml =================================================================== --- trunk/diswork-fs/pom.xml 2010-06-07 14:19:26 UTC (rev 63) +++ trunk/diswork-fs/pom.xml 2010-06-07 15:48:17 UTC (rev 64) @@ -38,11 +38,11 @@ <artifactId>PeerUnit</artifactId> </dependency> <dependency> - <groupId>org.planx.xmlstore</groupId> - <artifactId>xmlstore</artifactId> + <groupId>org.planx</groupId> + <artifactId>koala-xmlstore</artifactId> </dependency> - + <!-- test --> <dependency> <groupId>junit</groupId> @@ -50,7 +50,7 @@ <scope>test</scope> </dependency> </dependencies> - + <build> <plugins> <plugin> @@ -65,5 +65,5 @@ </plugin> </plugins> </build> - + </project> \ No newline at end of file Modified: trunk/diswork-fs/src/main/java/org/nuiton/disworkfs/DisworkFileSystemConfig.java =================================================================== --- trunk/diswork-fs/src/main/java/org/nuiton/disworkfs/DisworkFileSystemConfig.java 2010-06-07 14:19:26 UTC (rev 63) +++ trunk/diswork-fs/src/main/java/org/nuiton/disworkfs/DisworkFileSystemConfig.java 2010-06-07 15:48:17 UTC (rev 64) @@ -29,6 +29,8 @@ import java.net.Socket; import java.net.UnknownHostException; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.nuiton.util.ApplicationConfig; /** @@ -59,6 +61,9 @@ */ public class DisworkFileSystemConfig extends ApplicationConfig { + private static final Log log = + LogFactory.getLog(DisworkFileSystemConfig.class); + protected static Integer port = 19000; /** @@ -84,7 +89,7 @@ result = temp.getLocalAddress(); temp.close(); } catch (IOException e) { - // TODO 20100602 bleny do something ? + log.warn("can't get external IP address"); } } return result.getHostAddress(); @@ -100,11 +105,6 @@ public int getBlockSize() { return getOptionAsInt("diswork.fs.blocks_size"); } - - @Deprecated - public boolean useInMemoryMap() { - return "inmemory".equals(getOption("diswork.fs.map_type")); - } public Integer getUsedPort() { return getOptionAsInt("diswork.fs.use_port"); Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-07 14:19:26 UTC (rev 63) +++ trunk/pom.xml 2010-06-07 15:48:17 UTC (rev 64) @@ -79,8 +79,8 @@ <version>2.1</version> </dependency> <dependency> - <groupId>org.planx.xmlstore</groupId> - <artifactId>xmlstore</artifactId> + <groupId>org.planx</groupId> + <artifactId>koala-xmlstore</artifactId> <version>0.4.12</version> </dependency> <dependency>