Merge pull request #2 from OpenAS2/dev

Fix windows execution

README.md

@@ -1 +1,2 @@
 # As2Server
+The OpenAS2 application enables you to transmit and receive AS2 messages with EDI-X12, EDIFACT, XML, or binary payloads between trading partners.

RELEASE-NOTES.txt

@@ -22,6 +22,9 @@ o Bouncy Castle Libraries:
 o Other libraries:
              upgrade to commons-logging version 1.2, dom4j version 1.6.1
              commons-lang3 version 3.4	javax.mail version 1.5.4 commons-logging version 1.2
+o Startup batch files:
+             fixed and enhanced batch files to automatically find JAVA for NIX based systems including OSX and Windows
+
 
 Historical list of changes: see the changes.txt file in the release package
 

Server/bin/start-openas2.bat

@@ -1,6 +1,60 @@
-rem Purpose:  runs the OpenAS2 application
-set JAVA_EXE=%java_home%/bin/java 
-rem    
-rem remove -Dorg.apache.commons.logging.Log=org.openas2.logging.Log if using another logging package
-rem
-"%JAVA_EXE%" -Xms32m -Xmx384m -Dorg.apache.commons.logging.Log=org.openas2.logging.Log  -cp .:../lib/activation.jar:../lib/mail.jar:../lib/bcprov-jdk14-125.jar:../lib/bcmail-jdk14-125.jar"../lib/commons-logging-1.1.1.jar:../lib/OpenAS2_20100816.jar org.openas2.app.OpenAS2Server ../config/config.xml
+@echo off
+rem Purpose:  runs the OpenAS2 application
+
+rem Setup the Java Virtual Machine
+if not "%JAVA%" == "" goto :Check_JAVA_END
+    if not "%JAVA_HOME%" == "" goto :TryJDKEnd
+        call :warn JAVA_HOME not set; results may vary
+:TryWOWJRE
+    FOR /F "usebackq tokens=3*" %%A IN (`REG QUERY "HKLM\Software\WOW6432NODE\JavaSoft\Java Runtime Environment" /s /v CurrentVersion ^| find "CurrentVersion"`) DO (
+       set JAVA_VERSION=%%A
+    )
+    FOR /F "usebackq tokens=3*" %%A IN (`REG QUERY "HKLM\Software\WOW6432NODE\JavaSoft\Java Runtime Environment\%JAVA_VERSION%" /s /v JavaHome ^| find "JavaHome"`) DO (
+       set JAVA_HOME=%%A %%B
+    )
+    if not exist "%JAVA_HOME%" goto :TryWOWJDK
+    goto TryJDKEnd
+:TryWOWJDK
+    FOR /F "usebackq tokens=3*" %%A IN (`REG QUERY "HKLM\Software\WOW6432NODE\JavaSoft\Java Development Kit" /s /v CurrentVersion  ^| find "CurrentVersion"`) DO (
+       set JAVA_VERSION=%%A
+    )
+    FOR /F "usebackq tokens=3*" %%A IN (`REG QUERY "HKLM\Software\WOW6432NODE\JavaSoft\Java Development Kit\%JAVA_VERSION%" /s /v JavaHome ^| find "JavaHome"`) DO (
+       set JAVA_HOME=%%A %%B
+    )
+    if not exist "%JAVA_HOME%" goto :TryJRE
+    goto TryJDKEnd
+:TryJRE
+    FOR /F "usebackq tokens=3*" %%A IN (`REG QUERY "HKLM\Software\JavaSoft\Java Runtime Environment" /s /v CurrentVersion  ^| find "CurrentVersion"`) DO (
+       set JAVA_VERSION=%%A
+    )
+    FOR /F "usebackq tokens=3*" %%A IN (`REG QUERY "HKLM\Software\JavaSoft\Java Runtime Environment\%JAVA_VERSION%" /s /v JavaHome ^| find "JavaHome"`) DO (
+       set JAVA_HOME=%%A %%B
+    )
+    if not exist "%JAVA_HOME%" goto :TryJDK
+    goto TryJDKEnd
+:TryJDK
+    FOR /F "usebackq tokens=3*" %%A IN (`REG QUERY "HKLM\Software\JavaSoft\Java Development Kit" /s /v CurrentVersion  ^| find "CurrentVersion"`) DO (
+       set JAVA_VERSION=%%A
+    )
+    FOR /F "usebackq tokens=3*" %%A IN (`REG QUERY "HKLM\Software\JavaSoft\Java Development Kit\%JAVA_VERSION%" /s /v JavaHome ^| find "JavaHome"`) DO (
+       set JAVA_HOME=%%A %%B
+    )
+    if not exist "%JAVA_HOME%" (
+       call :warn Unable to retrieve JAVA_HOME from Registry
+    )
+:TryJDKEnd
+    if not exist "%JAVA_HOME%" (
+        call :warn JAVA_HOME is not valid: "%JAVA_HOME%"
+        goto END
+    )
+    set JAVA=%JAVA_HOME%\bin\java
+:Check_JAVA_END
+
+rem    
+rem remove -Dorg.apache.commons.logging.Log=org.openas2.logging.Log if using another logging package
+rem
+"%JAVA%" -Xms32m -Xmx384m  -Dorg.apache.commons.logging.Log=org.openas2.logging.Log  -cp .;../lib/javax.mail.jar;../lib/bcpkix-jdk15on-152.jar;../lib/bcprov-jdk15on-152.jar;../lib/bcmail-jdk15on-152.jar;../lib/bcprov-jdk15on-152;../lib/commons-logging-1.2.jar;../lib/openas2-server.jar org.openas2.app.OpenAS2Server ../config/config.xml
+
+:warn
+:END
+

Server/build.xml

@@ -11,7 +11,7 @@
 	<property name="build.dir" location="${basedir}/build" />
 	<property name="lib.dir" location="${basedir}/lib" />
 	<property name="lib.jar" value="openas2-server.jar" />
-	<property name="help.filename" value="OpenAS2HowTo.html"/>
+	<property name="help.filename" value="OpenAS2HowTo.pdf"/>
 	<property name="help.file.src" location="../docs/${help.filename}"/>
 	<!-- Output, package -->
 	<property name="dist.dir" location="dist" />
@@ -65,7 +65,7 @@
 		<delete dir="${build.dir}" />
 		<!-- Create the distribution directory -->
 		<mkdir dir="${dist.dir}" />
-		<!--  Add the help HTML version to the distro -->
+		<!--  Add the help PDF version to the distro -->
         <copy file="${help.file.src}" todir="${basedir}"/>
 		<!-- Put everything in ${build} into the ${projectName}-${release.version}.zip file -->
 		<zip destfile="${dist.dir}/${projectName}-${release.version}.zip"