Restored missing Windows distrib files lost during the refactor

8 files changed, 8 insertions, 32 deletions

diff --git a/.classpath b/.classpath
index 69989e6c..3cee7885 100644
--- a/.classpath
+++ b/.classpath
@@ -36,8 +36,6 @@
 	<classpathentry kind="lib" path="ext/jcalendar-1.3.2.jar" />
 	<classpathentry kind="lib" path="ext/commons-compress-1.4.1.jar" sourcepath="ext/src/commons-compress-1.4.1.jar" />
 	<classpathentry kind="lib" path="ext/xz-1.0.jar" sourcepath="ext/src/xz-1.0.jar" />
-	<classpathentry kind="lib" path="ext/commons-daemon-1.0.14.jar" sourcepath="ext/src/commons-daemon-1.0.14.jar" />
-	<classpathentry kind="lib" path="ext/commons-daemon-1.0.14-bin-windows.zip" />
 	<classpathentry kind="lib" path="ext/junit-4.11.jar" sourcepath="ext/src/junit-4.11.jar" />
 	<classpathentry kind="lib" path="ext/hamcrest-core-1.3.jar" sourcepath="ext/src/hamcrest-core-1.3.jar" />
 	<classpathentry kind="lib" path="ext/selenium-java-2.28.0.jar" sourcepath="ext/src/selenium-java-2.28.0.jar" />
diff --git a/build.moxie b/build.moxie
index 9734473c..97ade860 100644
--- a/build.moxie
+++ b/build.moxie
@@ -147,9 +147,6 @@ dependencies:
 - compile 'org.apache.ivy:ivy:2.2.0' :war
 - compile 'com.toedter:jcalendar:1.3.2' :authority
 - compile 'org.apache.commons:commons-compress:1.4.1' :war
-# Commons Daemon is for launching services
-- provided 'commons-daemon:commons-daemon:1.0.14'
-- provided 'commons-daemon:commons-daemon:1.0.14:bin-windows:zip'
 - test 'junit'
 # Dependencies for Selenium web page testing
 - test 'org.seleniumhq.selenium:selenium-java:${selenium.version}' @jar
diff --git a/build.xml b/build.xml
index 2cb2777b..4c922069 100644
--- a/build.xml
+++ b/build.xml
@@ -214,8 +214,10 @@
 				<include name="LICENSE" />

 				<include name="NOTICE" />

 			</fileset>

-			<!-- Distrib files -->

+			<!-- Windows distrib files -->

 			<zipfileset dir="${project.distrib.dir}/win" />

+			<!-- Gitblit Authority data -->

+			<zipfileset dir="${project.distrib.dir}/data/certs" prefix="data/certs" />

 			<!-- include all dependencies -->

 			<dependencies prefix="ext" />

 		</mx:zip>

@@ -227,8 +229,10 @@
 				<include name="LICENSE" />

 				<include name="NOTICE" />

 			</fileset>

-			<!-- Distrib files -->

+			<!-- Linux/OSX distrib files -->

 			<tarfileset dir="${project.distrib.dir}/linux" filemode="755" />

+			<!-- Gitblit Authority data -->

+			<zipfileset dir="${project.distrib.dir}/data/certs" prefix="data/certs" />

 			<!-- include all dependencies -->

 			<dependencies prefix="ext" />

 		</mx:tar>		

@@ -518,11 +522,8 @@
 				<include name="users.conf" />

 				<include name="gitblit.properties" />

 			</zipfileset>

-			<zipfileset dir="${project.distrib.dir}/data/certs" prefix="data/certs">

-				<include name="authority.conf" />

-				<include name="mail.tmpl" />

-				<include name="instructions.tmpl" />

-			</zipfileset>

+			<!-- Gitblit Authority data -->

+			<zipfileset dir="${project.distrib.dir}/data/certs" prefix="data/certs" />

 			<!-- include "authority" tagged dependencies -->

 			<dependencies prefix="ext" tag="authority" />

 		</mx:zip>

diff --git a/gitblit.iml b/gitblit.iml
index 51cc7e24..0fe7fe92 100644
--- a/gitblit.iml
+++ b/gitblit.iml
@@ -369,26 +369,6 @@
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library" scope="PROVIDED">
-      <library name="commons-daemon-1.0.14.jar">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/ext/commons-daemon-1.0.14.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/ext/src/commons-daemon-1.0.14.jar!/" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" scope="PROVIDED">
-      <library name="commons-daemon-1.0.14-bin-windows.zip">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/ext/commons-daemon-1.0.14-bin-windows.zip!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
     <orderEntry type="module-library" scope="TEST">
       <library name="junit-4.11.jar">
         <CLASSES>
diff --git a/src/main/distrib/win/amd64/gitblit.exe b/src/main/distrib/win/amd64/gitblit.exe
new file mode 100644
index 00000000..b867810d
--- /dev/null
+++ b/src/main/distrib/win/amd64/gitblit.exe
diff --git a/src/main/distrib/win/gitblitw.exe b/src/main/distrib/win/gitblitw.exe
new file mode 100644
index 00000000..dde1279c
--- /dev/null
+++ b/src/main/distrib/win/gitblitw.exe
diff --git a/src/main/distrib/win/ia64/gitblit.exe b/src/main/distrib/win/ia64/gitblit.exe
new file mode 100644
index 00000000..784f3c45
--- /dev/null
+++ b/src/main/distrib/win/ia64/gitblit.exe
diff --git a/src/main/distrib/win/x86/gitblit.exe b/src/main/distrib/win/x86/gitblit.exe
new file mode 100644
index 00000000..75079faf
--- /dev/null
+++ b/src/main/distrib/win/x86/gitblit.exe