Restored missing Windows distrib files lost during the refactor

diff --git a/.classpath b/.classpath
index 69989e6cc7f4c4d2d0f463b220a204659feb9847..3cee78853e46fdc1be336f729dbf808e075d7cf2 100644 (file)
--- 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 9734473c11df618d2405227f92ed3ae895c27f81..97ade86037e815c9a839052ac8473d84e7111f4f 100644 (file)
--- 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 2cb2777bc9d23f7f1c0ce3fd7beaf54c724d1df7..4c922069836cf66f43ea7a5e67d34ab4a45ab9c7 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -214,8 +214,10 @@
                                <include name="LICENSE" />\r
                                <include name="NOTICE" />\r
                        </fileset>\r
-                       <!-- Distrib files -->\r
+                       <!-- Windows distrib files -->\r
                        <zipfileset dir="${project.distrib.dir}/win" />\r
+                       <!-- Gitblit Authority data -->\r
+                       <zipfileset dir="${project.distrib.dir}/data/certs" prefix="data/certs" />\r
                        <!-- include all dependencies -->\r
                        <dependencies prefix="ext" />\r
                </mx:zip>\r
@@ -227,8 +229,10 @@
                                <include name="LICENSE" />\r
                                <include name="NOTICE" />\r
                        </fileset>\r
-                       <!-- Distrib files -->\r
+                       <!-- Linux/OSX distrib files -->\r
                        <tarfileset dir="${project.distrib.dir}/linux" filemode="755" />\r
+                       <!-- Gitblit Authority data -->\r
+                       <zipfileset dir="${project.distrib.dir}/data/certs" prefix="data/certs" />\r
                        <!-- include all dependencies -->\r
                        <dependencies prefix="ext" />\r
                </mx:tar>               \r
@@ -518,11 +522,8 @@
                                <include name="users.conf" />\r
                                <include name="gitblit.properties" />\r
                        </zipfileset>\r
-                       <zipfileset dir="${project.distrib.dir}/data/certs" prefix="data/certs">\r
-                               <include name="authority.conf" />\r
-                               <include name="mail.tmpl" />\r
-                               <include name="instructions.tmpl" />\r
-                       </zipfileset>\r
+                       <!-- Gitblit Authority data -->\r
+                       <zipfileset dir="${project.distrib.dir}/data/certs" prefix="data/certs" />\r
                        <!-- include "authority" tagged dependencies -->\r
                        <dependencies prefix="ext" tag="authority" />\r
                </mx:zip>\r

diff --git a/gitblit.iml b/gitblit.iml
index 51cc7e24959a0604b7c4a182574e489f01f0710c..0fe7fe922cbc2aff1bc31909c0be158317bc7686 100644 (file)
--- 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 (file)
index 0000000..b867810
Binary files /dev/null and b/src/main/distrib/win/amd64/gitblit.exe differ

diff --git a/src/main/distrib/win/gitblitw.exe b/src/main/distrib/win/gitblitw.exe
new file mode 100644 (file)
index 0000000..dde1279
Binary files /dev/null and b/src/main/distrib/win/gitblitw.exe differ

diff --git a/src/main/distrib/win/ia64/gitblit.exe b/src/main/distrib/win/ia64/gitblit.exe
new file mode 100644 (file)
index 0000000..784f3c4
Binary files /dev/null and b/src/main/distrib/win/ia64/gitblit.exe differ

diff --git a/src/main/distrib/win/x86/gitblit.exe b/src/main/distrib/win/x86/gitblit.exe
new file mode 100644 (file)
index 0000000..75079fa
Binary files /dev/null and b/src/main/distrib/win/x86/gitblit.exe differ