From 8bb426c80642ce9e7d3824abe5ec919db2d21c08 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Sun, 6 Feb 2011 11:31:06 +0100
Subject: [PATCH] added missing docroot directory

---
 .../src/main/assembly/scm-server-jsw.xml      | 35 ++++++++++------
 scm-server/src/main/docroot/index.html        | 40 +++++++++++++++++++
 2 files changed, 62 insertions(+), 13 deletions(-)
 create mode 100644 scm-server/src/main/docroot/index.html

diff --git a/scm-server/src/main/assembly/scm-server-jsw.xml b/scm-server/src/main/assembly/scm-server-jsw.xml
index 18fd5354e6..0270453e24 100644
--- a/scm-server/src/main/assembly/scm-server-jsw.xml
+++ b/scm-server/src/main/assembly/scm-server-jsw.xml
@@ -55,32 +55,53 @@
   <includeBaseDirectory>true</includeBaseDirectory>
   
   <fileSets>
+
     <fileSet>
       <directory>target/appassembler/jsw/scm-server/bin</directory>
       <filtered>false</filtered>
       <outputDirectory>bin</outputDirectory>
       <directoryMode>0755</directoryMode>
     </fileSet>
+
     <fileSet>
       <directory>target/appassembler/jsw/scm-server/conf</directory>
       <filtered>true</filtered>
       <outputDirectory>conf</outputDirectory>
     </fileSet>
+
     <fileSet>
       <directory>target/appassembler/jsw/scm-server/lib</directory>
       <filtered>false</filtered>
       <outputDirectory>lib</outputDirectory>
     </fileSet>
+
     <fileSet>
       <directory>target/appassembler/jsw/scm-server/libexec</directory>
       <filtered>false</filtered>
       <outputDirectory>libexec</outputDirectory>
     </fileSet>
+
     <fileSet>
       <directory>target/appassembler/jsw/scm-server/webapp</directory>
       <filtered>false</filtered>
       <outputDirectory>webapp</outputDirectory>
     </fileSet>
+
+    <fileSet>
+      <directory>src/main/docroot</directory>
+      <filtered>false</filtered>
+      <outputDirectory>webapp/docroot</outputDirectory>
+    </fileSet>
+
+    <fileSet>
+      <directory>src/main/conf</directory>
+      <filtered>true</filtered>
+      <includes>
+        <include>*</include>
+      </includes>
+      <outputDirectory>conf</outputDirectory>
+    </fileSet>
+
     <fileSet>
       <directory>target</directory>
       <filtered>false</filtered>
@@ -89,19 +110,7 @@
       </excludes>
       <outputDirectory>logs</outputDirectory>
     </fileSet>
+    
   </fileSets>
-
-  <files>
-    <file>
-      <source>src/main/conf/app-info.xml</source>
-      <filtered>true</filtered>
-      <outputDirectory>conf</outputDirectory>
-    </file>
-    <file>
-      <source>src/main/conf/server-config.xml</source>
-      <filtered>true</filtered>
-      <outputDirectory>conf</outputDirectory>
-    </file>
-  </files>
   
 </assembly>
\ No newline at end of file
diff --git a/scm-server/src/main/docroot/index.html b/scm-server/src/main/docroot/index.html
new file mode 100644
index 0000000000..1e1e91d956
--- /dev/null
+++ b/scm-server/src/main/docroot/index.html
@@ -0,0 +1,40 @@
+<!--*
+Copyright (c) 2010, Sebastian Sdorra
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+3. Neither the name of SCM-Manager; nor the names of its
+   contributors may be used to endorse or promote products derived from this
+   software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+http://bitbucket.org/sdorra/scm-manager
+
+-->
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+  <head>
+    <title>SCM-Server</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <meta http-equiv="refresh" content="0;url=/scm">
+  </head>
+  <body>
+  </body>
+</html>