commit 3eef09089326c920b7334bb8d9c850d530649e82
from: leo <leo@cfe0c456-10be-db11-86f0-00e081619514>
date: Fri Jan 30 12:01:44 2009 UTC

finally fixed the maven build to create a single, executable jar file

commit - 1ed4adbef9f60384ca707c5c09274a1683b33697
commit + 3eef09089326c920b7334bb8d9c850d530649e82
blob - 8333fd209f021cf40ec5a8eef14bedef0b57b5ef
blob + 4cd79236b62600c067647b4c2f9a3f82ca3ccfa3
--- modules/server/moxo-server.iml
+++ modules/server/moxo-server.iml
@@ -14,6 +14,7 @@
     <orderEntry type="library" exported="" name="Maven: org.mortbay.jetty:jetty:6.1.1" level="project" />
     <orderEntry type="library" exported="" name="Maven: org.mortbay.jetty:jetty-util:6.1.1" level="project" />
     <orderEntry type="library" exported="" name="Maven: org.mortbay.jetty:servlet-api-2.5:6.1.1" level="project" />
+    <orderEntry type="library" exported="" name="Maven: org.slf4j:slf4j-jcl:1.0.1" level="project" />
     <orderEntry type="module" module-name="webdav" exported="" />
     <orderEntry type="library" exported="" name="Maven: commons-vfs:commons-vfs:1.0" level="project" />
     <orderEntry type="library" exported="" name="Maven: commons-logging:commons-logging:1.0.4" level="project" />
blob - /dev/null
blob + 2195f21f9d5c5d210a641edd6928dff35738cd70 (mode 644)
--- /dev/null
+++ modules/server/assembly.xml
@@ -0,0 +1,73 @@
+<!--
+  ~ Copyright 2009 Matthias L. Jugel.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~        http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<assembly>
+  <id>runtime</id>
+  <formats>
+    <format>jar</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <dependencySets>
+    <dependencySet>
+      <outputDirectory/>
+      <unpack>true</unpack>
+      <includes>
+        <include>com.thinkberg:moxoapp</include>
+      </includes>
+      <unpackOptions>
+        <includes>
+          <include>commons-logging.properties</include>
+          <include>simplelog.properties</include>
+          <include>jetty.xml</include>
+          <include>**/Main.class</include>
+        </includes>
+        <!--<excludes>-->
+        <!--<exclude>**/MoxoJettyRunner.class</exclude>-->
+        <!--</excludes>-->
+      </unpackOptions>
+    </dependencySet>
+    <dependencySet>
+      <outputDirectory/>
+      <unpack>false</unpack>
+      <includes>
+        <include>com.thinkberg:moxoapp</include>
+      </includes>
+    </dependencySet>
+    <dependencySet>
+      <outputDirectory/>
+      <unpack>false</unpack>
+      <includes>
+        <include>com.thinkberg:webdav</include>
+      </includes>
+    </dependencySet>
+    <dependencySet>
+      <outputDirectory/>
+      <unpack>false</unpack>
+      <includes>
+        <include>com.thinkberg:vfs.s3</include>
+      </includes>
+    </dependencySet>
+    <dependencySet>
+      <outputDirectory/>
+      <unpack>false</unpack>
+      <scope>runtime</scope>
+      <excludes>
+        <exclude>com.thinkberg:moxoapp</exclude>
+        <exclude>com.thinkberg:webdav</exclude>
+        <exclude>com.thinkberg:vfs.s3</exclude>
+      </excludes>
+    </dependencySet>
+  </dependencySets>
+</assembly>
blob - 476dfe8db6dc10c84d565ecc644ec9683126cfdd
blob + 1f8f8040810c0128bd3be48b9d195e331754acd9
--- modules/server/pom.xml
+++ modules/server/pom.xml
@@ -1,106 +1,76 @@
 <?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">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>com.thinkberg</groupId>
-    <artifactId>moxo-server</artifactId>
-    <name>Moxo Server</name>
-    <version>1.0</version>
-    <dependencies>
-        <dependency>
-            <groupId>org.mortbay.jetty</groupId>
-            <artifactId>jetty</artifactId>
-            <version>6.1.1</version>
-        </dependency>
-        <dependency>
-            <groupId>com.thinkberg</groupId>
-            <artifactId>webdav</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>com.thinkberg</groupId>
-            <artifactId>vfs.s3</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
-    </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <verbose>true</verbose>
-                    <fork>true</fork>
-                    <source>1.5</source>
-                    <target>1.5</target>
-                </configuration>
-            </plugin>
-
-            <!--
-              mvn test
-              Documentation: http://maven.apache.org/plugins/maven-surefire-plugin/
-            -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <includes>
-                        <include>**/MoxoTest.java</include>
-                    </includes>
-                </configuration>
-            </plugin>
-
-            <!--
-              jar
-              mvn package
-              Documentation: http://maven.apache.org/plugins/maven-jar-plugin/
-            -->
-            <!--<plugin>-->
-            <!--<groupId>org.apache.maven.plugins</groupId>-->
-            <!--<artifactId>maven-jar-plugin</artifactId>-->
-            <!--<executions>-->
-            <!--<execution>-->
-            <!--<phase>package</phase>-->
-            <!--<goals>-->
-            <!--<goal>jar</goal>-->
-            <!--</goals>-->
-            <!--<configuration>-->
-            <!--<classifier>client</classifier>-->
-            <!--<includes>-->
-            <!--<include>**/client/*</include>-->
-            <!--<include>**/servlet/*</include>-->
-            <!--<include>barcode-client.properties</include>-->
-            <!--<include>log4j.properties</include>-->
-            <!--<include>images/*</include>-->
-            <!--<include>templates/*</include>-->
-            <!--</includes>-->
-            <!--</configuration>-->
-            <!--</execution>-->
-            <!--</executions>-->
-            <!--</plugin>-->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                        <configuration>
-                            <archive>
-                                <manifest>
-                                    <mainClass>com.thinkberg.moxo.Main</mainClass>
-                                    <addClasspath>true</addClasspath>
-                                </manifest>
-                            </archive>
-                            <includes>
-                                <include>**/moxo/*</include>
-                            </includes>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.thinkberg</groupId>
+  <artifactId>moxoapp</artifactId>
+  <name>thinkberg.com Moxo Application Runtime</name>
+  <version>1.0</version>
+  <dependencies>
+    <dependency>
+      <groupId>org.mortbay.jetty</groupId>
+      <artifactId>jetty</artifactId>
+      <version>6.1.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-jcl</artifactId>
+      <version>1.0.1</version>
+    </dependency>
+    <dependency>
+      <groupId>com.thinkberg</groupId>
+      <artifactId>webdav</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>com.thinkberg</groupId>
+      <artifactId>vfs.s3</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <verbose>true</verbose>
+          <fork>true</fork>
+          <source>1.5</source>
+          <target>1.5</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <includes>
+            <include>**/MoxoTest.java</include>
+          </includes>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifest>
+              <mainClass>com.thinkberg.moxo.Main</mainClass>
+              <addClasspath/>
+            </manifest>
+          </archive>
+          <descriptors>
+            <descriptor>assembly.xml</descriptor>
+          </descriptors>
+        </configuration>
+        <executions>
+          <execution>
+            <id>make-assembly</id>
+            <phase>package</phase>
+            <goals>
+              <goal>attached</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>
\ No newline at end of file
blob - 834ca79e40db93587eb89c07798c51befb4cdbe8
blob + 4be0edeea76445ec783f106b56d917333c4fbfb4
--- modules/server/src/main/java/com/thinkberg/moxo/Main.java
+++ modules/server/src/main/java/com/thinkberg/moxo/Main.java
@@ -72,7 +72,6 @@ public class Main {
   private static URL[] initClassPath() {
     List<URL> urlArray = new ArrayList<URL>();
     InputStream manifestIn = null;
-    InputStream jarIn = null;
     try {
       manifestIn = location.openStream();
       JarInputStream launcherJarIs = new JarInputStream(manifestIn);
@@ -90,6 +89,7 @@ public class Main {
             }
           } catch (IOException e) {
             System.err.println("ignored '" + jarEntry.getName() + "'");
+            System.err.println(e.getMessage());
           }
         }
       }
@@ -101,13 +101,9 @@ public class Main {
       try {
         manifestIn.close();
       } catch (Throwable ignore) {
+        ignore.printStackTrace();
         // ignore errors
       }
-      try {
-        jarIn.close();
-      } catch (Throwable ignore) {
-        // ignore errors
-      }
     }
     return urlArray.toArray(new URL[urlArray.size()]);
   }
@@ -146,7 +142,8 @@ public class Main {
    * @throws IOException if the extraction was not possible
    */
   private static URL extract(URL resource) throws IOException {
-    File f = File.createTempFile("launcher_", ".jar");
+    String name = new File(resource.getFile()).getName();
+    File f = File.createTempFile("launcher_" + name + "_", ".jar");
     f.deleteOnExit();
     if (f.getParentFile() != null) {
       f.getParentFile().mkdirs();
blob - 71c406fc4d38c233930be39548d9d3767b2a5d3b
blob + 8877d853702759a51eb8b1bbc30f40e0f7a75d28
--- modules/server/src/main/resources/jetty.xml
+++ modules/server/src/main/resources/jetty.xml
@@ -12,50 +12,51 @@
 
 <Configure id="Server" class="org.mortbay.jetty.Server">
 
-    <!-- =========================================================== -->
-    <!-- Server Thread Pool                                          -->
-    <!-- =========================================================== -->
-    <Set name="ThreadPool">
-        <!-- Default bounded blocking threadpool
-        -->
-        <New class="org.mortbay.thread.BoundedThreadPool">
-            <Set name="minThreads">10</Set>
-            <Set name="lowThreads">50</Set>
-            <Set name="maxThreads">250</Set>
-        </New>
+  <!-- =========================================================== -->
+  <!-- Server Thread Pool                                          -->
+  <!-- =========================================================== -->
+  <Set name="ThreadPool">
+    <!-- Default bounded blocking threadpool
+    -->
+    <New class="org.mortbay.thread.BoundedThreadPool">
+      <Set name="minThreads">10</Set>
+      <Set name="lowThreads">50</Set>
+      <Set name="maxThreads">250</Set>
+    </New>
 
-        <!-- Optional Java 5 bounded threadpool with job queue
-        <New class="org.mortbay.thread.concurrent.ThreadPool">
-          <Arg type="int">0</Arg>
-          <Set name="corePoolSize">10</Set>
-          <Set name="maximumPoolSize">250</Set>
-        </New>
-        -->
-    </Set>
+    <!-- Optional Java 5 bounded threadpool with job queue
+    <New class="org.mortbay.thread.concurrent.ThreadPool">
+      <Arg type="int">0</Arg>
+      <Set name="corePoolSize">10</Set>
+      <Set name="maximumPoolSize">250</Set>
+    </New>
+    -->
+  </Set>
 
 
-    <!-- =========================================================== -->
-    <!-- Set connectors                                              -->
-    <!-- =========================================================== -->
-    <!-- One of each type!                                           -->
-    <!-- =========================================================== -->
+  <!-- =========================================================== -->
+  <!-- Set connectors                                              -->
+  <!-- =========================================================== -->
+  <!-- One of each type!                                           -->
+  <!-- =========================================================== -->
 
-    <!-- Use this connector for many frequently idle connections
-         and for threadless continuations.
-    -->
-    <Call name="addConnector">
-        <Arg>
-            <New class="org.mortbay.jetty.nio.SelectChannelConnector">
-                <Set name="port">
-                    <SystemProperty name="jetty.port" default="8080"/>
-                </Set>
-                <Set name="maxIdleTime">30000</Set>
-                <Set name="Acceptors">2</Set>
-                <Set name="confidentialPort">8443</Set>
-            </New>
-        </Arg>
-    </Call>
+  <!-- Use this connector for many frequently idle connections
+       and for threadless continuations.
+  -->
+  <Call name="addConnector">
+    <Arg>
+      <New class="org.mortbay.jetty.nio.SelectChannelConnector">
+        <Set name="port">
+          <SystemProperty name="jetty.port" default="8080"/>
+        </Set>
+        <Set name="maxIdleTime">30000</Set>
+        <Set name="Acceptors">2</Set>
+        <Set name="confidentialPort">8443</Set>
+      </New>
+    </Arg>
+  </Call>
 
+  <!--
     <Call name="addConnector">
         <Arg>
             <New class="org.mortbay.jetty.security.SslSocketConnector">
@@ -71,136 +72,137 @@
             </New>
         </Arg>
     </Call>
+  -->
 
-    <!-- Use this connector if NIO is not available.
-    <Call name="addConnector">
-      <Arg>
-          <New class="org.mortbay.jetty.bio.SocketConnector">
-            <Set name="port">8081</Set>
-            <Set name="maxIdleTime">50000</Set>
-            <Set name="lowResourceMaxIdleTime">1500</Set>
-          </New>
-      </Arg>
-    </Call>
-    -->
-
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    <!-- To add a HTTPS SSL listener                                     -->
-    <!-- see jetty-ssl.xml to add an ssl connector. use                  -->
-    <!-- java -jar start.jar etc/jetty.xml etc/jetty-ssl.xml             -->
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <!-- =========================================================== -->
-    <!-- Set up global session ID manager                            -->
-    <!-- =========================================================== -->
-    <!--
-    <Set name="sessionIdManager">
-      <New class="org.mortbay.jetty.servlet.HashSessionIdManager">
-        <Set name="workerName">node1</Set>
-      </New>
-    </Set>
-    -->
-
-    <!-- =========================================================== -->
-    <!-- Set handler Collection Structure                            -->
-    <!-- =========================================================== -->
-    <Set name="handler">
-        <New id="Handlers" class="org.mortbay.jetty.handler.HandlerCollection">
-            <Set name="handlers">
-                <Array type="org.mortbay.jetty.Handler">
-                    <Item>
-                        <New id="Contexts" class="org.mortbay.jetty.handler.ContextHandlerCollection"/>
-                    </Item>
-                    <Item>
-                        <New id="DefaultHandler" class="org.mortbay.jetty.handler.DefaultHandler"/>
-                    </Item>
-                    <Item>
-                        <New id="RequestLog" class="org.mortbay.jetty.handler.RequestLogHandler"/>
-                    </Item>
-                </Array>
-            </Set>
+  <!-- Use this connector if NIO is not available.
+  <Call name="addConnector">
+    <Arg>
+        <New class="org.mortbay.jetty.bio.SocketConnector">
+          <Set name="port">8081</Set>
+          <Set name="maxIdleTime">50000</Set>
+          <Set name="lowResourceMaxIdleTime">1500</Set>
         </New>
-    </Set>
+    </Arg>
+  </Call>
+  -->
 
-    <!-- Set the handler for our web dav servlet -->
-    <Set name="handler">
-        <New id="WebDAVServletContext" class="org.mortbay.jetty.servlet.Context">
-            <Set name="contextPath">/</Set>
-            <Set name="resourceBase">
-                <SystemProperty name="jetty.docroot" default="."/>
-            </Set>
-            <Call name="addServlet">
-                <Arg>com.thinkberg.webdav.servlet.MoxoWebDAVServlet</Arg>
-                <Arg>/*</Arg>
-                <Call name="setInitParameter">
-                    <Arg>vfs.uri</Arg>
-                    <Arg>ram:/</Arg>
-                </Call>
-                <Call name="setInitParameter">
-                    <Arg>vfs.auth.domain</Arg>
-                    <Arg></Arg>
-                </Call>
-                <Call name="setInitParameter">
-                    <Arg>vfs.auth.user</Arg>
-                    <Arg>theuser</Arg>
-                </Call>
-                <Call name="setInitParameter">
-                    <Arg>vfs.auth.password</Arg>
-                    <Arg>thepassword</Arg>
-                </Call>
-            </Call>
+  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+  <!-- To add a HTTPS SSL listener                                     -->
+  <!-- see jetty-ssl.xml to add an ssl connector. use                  -->
+  <!-- java -jar start.jar etc/jetty.xml etc/jetty-ssl.xml             -->
+  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
-        </New>
-    </Set>
+  <!-- =========================================================== -->
+  <!-- Set up global session ID manager                            -->
+  <!-- =========================================================== -->
+  <!--
+  <Set name="sessionIdManager">
+    <New class="org.mortbay.jetty.servlet.HashSessionIdManager">
+      <Set name="workerName">node1</Set>
+    </New>
+  </Set>
+  -->
 
-
-    <!-- =========================================================== -->
-    <!-- Configure Authentication Realms                             -->
-    <!-- Realms may be configured for the entire server here, or     -->
-    <!-- they can be configured for a specific web app in a context  -->
-    <!-- configuration (see $(jetty.home)/contexts/test.xml for an   -->
-    <!-- example).                                                   -->
-    <!-- =========================================================== -->
-    <Set name="UserRealms">
-        <Array type="org.mortbay.jetty.security.UserRealm">
-            <!--
-                  <Item>
-                    <New class="org.mortbay.jetty.security.HashUserRealm">
-                      <Set name="name">Test Realm</Set>
-                      <Set name="config"><SystemProperty name="jetty.home" default="."/>/etc/realm.properties</Set>
-                    </New>
-                  </Item>
-            -->
+  <!-- =========================================================== -->
+  <!-- Set handler Collection Structure                            -->
+  <!-- =========================================================== -->
+  <Set name="handler">
+    <New id="Handlers" class="org.mortbay.jetty.handler.HandlerCollection">
+      <Set name="handlers">
+        <Array type="org.mortbay.jetty.Handler">
+          <Item>
+            <New id="Contexts" class="org.mortbay.jetty.handler.ContextHandlerCollection"/>
+          </Item>
+          <Item>
+            <New id="DefaultHandler" class="org.mortbay.jetty.handler.DefaultHandler"/>
+          </Item>
+          <Item>
+            <New id="RequestLog" class="org.mortbay.jetty.handler.RequestLogHandler"/>
+          </Item>
         </Array>
+      </Set>
+    </New>
+  </Set>
+
+  <!-- Set the handler for our web dav servlet -->
+  <Set name="handler">
+    <New id="WebDAVServletContext" class="org.mortbay.jetty.servlet.Context">
+      <Set name="contextPath">/</Set>
+      <Set name="resourceBase">
+        <SystemProperty name="jetty.docroot" default="."/>
+      </Set>
+      <Call name="addServlet">
+        <Arg>com.thinkberg.webdav.servlet.MoxoWebDAVServlet</Arg>
+        <Arg>/*</Arg>
+        <Call name="setInitParameter">
+          <Arg>vfs.uri</Arg>
+          <Arg>ram:/</Arg>
+        </Call>
+        <Call name="setInitParameter">
+          <Arg>vfs.auth.domain</Arg>
+          <Arg></Arg>
+        </Call>
+        <Call name="setInitParameter">
+          <Arg>vfs.auth.user</Arg>
+          <Arg>theuser</Arg>
+        </Call>
+        <Call name="setInitParameter">
+          <Arg>vfs.auth.password</Arg>
+          <Arg>thepassword</Arg>
+        </Call>
+      </Call>
+
+    </New>
+  </Set>
+
+
+  <!-- =========================================================== -->
+  <!-- Configure Authentication Realms                             -->
+  <!-- Realms may be configured for the entire server here, or     -->
+  <!-- they can be configured for a specific web app in a context  -->
+  <!-- configuration (see $(jetty.home)/contexts/test.xml for an   -->
+  <!-- example).                                                   -->
+  <!-- =========================================================== -->
+  <Set name="UserRealms">
+    <Array type="org.mortbay.jetty.security.UserRealm">
+      <!--
+            <Item>
+              <New class="org.mortbay.jetty.security.HashUserRealm">
+                <Set name="name">Test Realm</Set>
+                <Set name="config"><SystemProperty name="jetty.home" default="."/>/etc/realm.properties</Set>
+              </New>
+            </Item>
+      -->
+    </Array>
+  </Set>
+
+  <!-- =========================================================== -->
+  <!-- Configure Request Log                                       -->
+  <!-- Request logs  may be configured for the entire server here, -->
+  <!-- or they can be configured for a specific web app in a       -->
+  <!-- contexts configuration (see $(jetty.home)/contexts/test.xml -->
+  <!-- for an example).                                            -->
+  <!-- =========================================================== -->
+  <Ref id="RequestLog">
+    <Set name="requestLog">
+      <New id="RequestLogImpl" class="org.mortbay.jetty.NCSARequestLog">
+        <Arg>
+          <SystemProperty name="jetty.logs" default="./logs"/>
+          /yyyy_mm_dd.request.log
+        </Arg>
+        <Set name="retainDays">90</Set>
+        <Set name="append">true</Set>
+        <Set name="extended">false</Set>
+        <Set name="LogTimeZone">GMT</Set>
+      </New>
     </Set>
+  </Ref>
 
-    <!-- =========================================================== -->
-    <!-- Configure Request Log                                       -->
-    <!-- Request logs  may be configured for the entire server here, -->
-    <!-- or they can be configured for a specific web app in a       -->
-    <!-- contexts configuration (see $(jetty.home)/contexts/test.xml -->
-    <!-- for an example).                                            -->
-    <!-- =========================================================== -->
-    <Ref id="RequestLog">
-        <Set name="requestLog">
-            <New id="RequestLogImpl" class="org.mortbay.jetty.NCSARequestLog">
-                <Arg>
-                    <SystemProperty name="jetty.logs" default="./logs"/>
-                    /yyyy_mm_dd.request.log
-                </Arg>
-                <Set name="retainDays">90</Set>
-                <Set name="append">true</Set>
-                <Set name="extended">false</Set>
-                <Set name="LogTimeZone">GMT</Set>
-            </New>
-        </Set>
-    </Ref>
+  <!-- =========================================================== -->
+  <!-- extra options                                               -->
+  <!-- =========================================================== -->
+  <Set name="stopAtShutdown">true</Set>
+  <!-- ensure/prevent Server: header being sent to browsers        -->
+  <Set name="sendServerVersion">true</Set>
 
-    <!-- =========================================================== -->
-    <!-- extra options                                               -->
-    <!-- =========================================================== -->
-    <Set name="stopAtShutdown">true</Set>
-    <!-- ensure/prevent Server: header being sent to browsers        -->
-    <Set name="sendServerVersion">true</Set>
-
 </Configure>
blob - 06d0ba45d0947de8c84d470d4bc1a1fd74c4346a
blob + 836c822c538c46e4eee02b1509ecd545c5f5f851
--- modules/server/src/main/resources/simplelog.properties
+++ modules/server/src/main/resources/simplelog.properties
@@ -15,5 +15,6 @@
 #
 
 org.apache.commons.logging.simplelog.defaultlog=error
+org.apache.commons.logging.simplelog.org.mortbay=info
 org.apache.commons.logging.simplelog.log.com.thinkberg.vfs.s3=info
 org.apache.commons.logging.simplelog.log.com.thinkberg.webdav=info
\ No newline at end of file
blob - ab1a74fa06b6c50787d3d4de5596e04bba672562
blob + 769733b58ec53dab17fa9f9fedac2afdec2fbceb
--- modules/webdav/pom.xml
+++ modules/webdav/pom.xml
@@ -17,73 +17,73 @@
 
 <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>
-    <groupId>com.thinkberg</groupId>
-    <artifactId>webdav</artifactId>
-    <version>1.0-SNAPSHOT</version>
-    <name>thinkberg.com WebDAV</name>
-    <dependencies>
-        <dependency>
-            <groupId>commons-vfs</groupId>
-            <artifactId>commons-vfs</artifactId>
-            <version>1.0</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-httpclient</groupId>
-            <artifactId>commons-httpclient</artifactId>
-            <version>3.0.1</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-            <version>3.2.1</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>dom4j</groupId>
-            <artifactId>dom4j</artifactId>
-            <version>1.6.1</version>
-        </dependency>
-        <dependency>
-            <groupId>jaxen</groupId>
-            <artifactId>jaxen</artifactId>
-            <version>1.1.1</version>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.5</version>
-        </dependency>
-    </dependencies>
-    <build>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <verbose>true</verbose>
-                    <fork>true</fork>
-                    <source>1.5</source>
-                    <target>1.5</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <includes>
-                        <include>**/tests/*.java</include>
-                    </includes>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.thinkberg</groupId>
+  <artifactId>webdav</artifactId>
+  <version>1.0-SNAPSHOT</version>
+  <name>thinkberg.com WebDAV library</name>
+  <dependencies>
+    <dependency>
+      <groupId>commons-vfs</groupId>
+      <artifactId>commons-vfs</artifactId>
+      <version>1.0</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-httpclient</groupId>
+      <artifactId>commons-httpclient</artifactId>
+      <version>3.0.1</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
+      <version>3.2.1</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+      <version>1.3</version>
+    </dependency>
+    <dependency>
+      <groupId>dom4j</groupId>
+      <artifactId>dom4j</artifactId>
+      <version>1.6.1</version>
+    </dependency>
+    <dependency>
+      <groupId>jaxen</groupId>
+      <artifactId>jaxen</artifactId>
+      <version>1.1.1</version>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.5</version>
+    </dependency>
+  </dependencies>
+  <build>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+      </resource>
+    </resources>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <verbose>true</verbose>
+          <fork>true</fork>
+          <source>1.5</source>
+          <target>1.5</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <includes>
+            <include>**/tests/*.java</include>
+          </includes>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
\ No newline at end of file
blob - 237a07f14ed3f027d0c028c8de202d7d4345d9c3
blob + 4e70a7fdd56320debcab9a16d079e8fd4023aa32
--- pom.xml
+++ pom.xml
@@ -1,15 +1,15 @@
 <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>
-    <groupId>com.thinkberg</groupId>
-    <artifactId>moxo</artifactId>
-    <packaging>pom</packaging>
-    <version>1.0-SNAPSHOT</version>
-    <name>Moxo S3 DAV Proxy</name>
-    <modules>
-        <module>modules/server</module>
-        <module>modules/webdav</module>
-        <module>modules/vfs.s3</module>
-    </modules>
-    <url>http://thinkberg.com</url>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.thinkberg</groupId>
+  <artifactId>moxo</artifactId>
+  <packaging>pom</packaging>
+  <version>1.0-SNAPSHOT</version>
+  <name>thinkberg.com Moxo S3 DAV Project</name>
+  <modules>
+    <module>modules/server</module>
+    <module>modules/webdav</module>
+    <module>modules/vfs.s3</module>
+  </modules>
+  <url>http://thinkberg.com</url>
 </project>