M build.xml

A non-ide/README
A non-ide/build.properties.sample
A non-ide/build.xml
A non-ide/logging.properties
A non-ide/project.properties

- Add non-ide build file.

java/dist/build.xml

@@ -30,7 +30,13 @@
 
   <property name="Name" value="webclient"/>
   <property name="name" value="webclient"/>
-  <property name="version" value="2_0_a5"/>
+  <property name="major.version" value="2" />
+  <property name="minor.version" value="0" />
+  <property name="release.version" value="a5" />
+  <property name="release.version.full" value="alpha_5" />
+  <property name="version" 
+            value="${major.version}_${minor.version}_${release.version}"/>
+  <property name="full.version" value="${major.version}_${minor.version}_${release.version.full}"/>
 
 <!-- ************ Per user local properties ******************************* -->
 
@@ -205,6 +211,11 @@
     <copy todir="${dist.home}/netbeans">
       <fileset dir="${basedir}/netbeans" />
     </copy>
+    <copy todir="${dist.home}/non-ide">
+      <fileset dir="${basedir}/non-ide" />
+    </copy>
+    <copy file="${mozdocdir}/webclient/release-notes/${full.version}.html" todir="${dist.home}" />
+    <copy file="${mozdocdir}/webclient/release-notes/${full.version}-detail.html" todir="${dist.home}" />
   </target>
 
   <target name="build.javadocs" depends="prepare,uptodate"

java/dist/non-ide/README

@@ -0,0 +1,2 @@
+Copy build.properties.sample to build.properties.  Edit the junit.jar
+and browser.bin.dir properties to be valid on your system.

java/dist/non-ide/build.properties.sample

@@ -0,0 +1,9 @@
+bin.artifacts.pattern=${so.prefix}webclient.${so.extension},${so.prefix}javadomjni.${so.extension},components/${so.prefix}javadom.${so.extension}
+#debug.jvm.args=-Xdebug -Xrunjdwp:transport=dt_shmem,address=jdbconn,server=y,suspend=y
+
+# Begin Editable Properties
+
+junit.jar=C:\\PROGRA~1\\netbeans-5.5\\ide7\\ant\\lib\\junit-3.8.1.jar 
+
+#Make this point to the bin directory of your XULRUNNER installation
+browser.bin.dir=C:\\Projects\\chaff\\webclient-alpha-5\\xulrunner

java/dist/non-ide/build.xml

@@ -0,0 +1,288 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="webclient" default="default" basedir=".">
+    <description>Non-IDE build file for Webclient project.</description>
+
+  <property file="project.properties" />
+
+
+  <target name="default" 
+          description="Compile, if necessary, and execute the test browser.">
+    <antcall target="prepare" />
+    <antcall target="-do-compile" />
+    <antcall target="run" />
+
+  </target>
+
+  <target name="test" 
+         description="Compile, if necessary, and execute the automated tests.">
+    <antcall target="prepare" />
+    <antcall target="-do-compile-test" />
+    <antcall target="run.test" />
+
+  </target>
+
+
+    <target name="clean" depends="prepare">
+        <delete>
+            <fileset dir="${browser.bin.dir}" 
+                     includes="${bin.artifacts.pattern}"/>
+        </delete>
+        <delete dir="${build.dir}" />
+    </target>
+
+  <target name="check.sources">
+        <condition property="have.tests">
+            <or>
+                <available file="${test.src.dir}"/>
+            </or>
+        </condition>
+        <condition property="have.sources">
+            <or>
+                <available file="${src.dir}"/>
+            </or>
+        </condition>
+   </target>
+
+  <target name="prepare" depends="verify.preconditions,copy.binaries,copy.test.data">
+
+
+  </target>
+
+  <target name="verify.preconditions">
+        <condition property="so.prefix" value="">
+            <and>
+                <os family="windows" />
+            </and>
+        </condition>
+
+        <condition property="so.prefix" value="lib">
+            <and>
+                <os family="unix" />
+            </and>
+        </condition>
+
+        <condition property="so.extension" value="dll">
+            <and>
+                <os family="windows" />
+            </and>
+        </condition>
+
+        <condition property="so.extension" value="so">
+            <and>
+                <os family="unix" />
+            </and>
+        </condition>
+
+        <condition property="platform" value="win32">
+            <and>
+                <os family="windows" />
+            </and>
+        </condition>
+
+        <condition property="platform" value="unix">
+            <and>
+                <os family="unix" />
+            </and>
+        </condition>
+        
+        <condition property="platform" value="mac">
+            <and>
+                <os family="mac" />
+            </and>
+        </condition>
+        
+        <condition property="build.unix.classes">
+            <and>
+                <isset property="platform" />
+                <equals arg1="${platform}" arg2="unix" />
+            </and>
+        </condition>
+
+        <condition property="build.win32.classes">
+            <and>
+                <isset property="platform" />
+                <equals arg1="${platform}" arg2="win32" />
+            </and>
+        </condition>
+        
+        <condition property="build.mac.classes">
+            <and>
+                <isset property="platform" />
+                <equals arg1="${platform}" arg2="mac" />
+            </and>
+        </condition>
+        
+        <condition property="PATH_SEP" value=";">
+            <and>
+                <os family="windows" />
+            </and>
+        </condition>
+
+        <condition property="PATH_SEP" value=":">
+            <and>
+                <os family="unix" />
+            </and>
+        </condition>
+
+        <condition property="FILE_PATH_SEP" value="\">
+            <and>
+                <os family="windows" />
+            </and>
+        </condition>
+
+        <condition property="FILE_PATH_SEP" value="/">
+            <and>
+                <os family="unix" />
+            </and>
+        </condition>
+
+        <property file="build.properties" />
+
+        <condition property="preconditions.met">
+            <and>
+                <available file="${browser.bin.dir}/${so.prefix}xul.${so.extension}" />
+            </and>
+        </condition>
+
+        <uptodate property="do.copy.binaries">
+            <srcfiles dir="${basedir}/../bin" includes="**/*.*" />
+            <mapper type="identity" to="${browser.bin.dir}/**/*.*" />
+        </uptodate>
+        
+                <fail unless="preconditions.met">
+                    
+Conditions for compilation have not been met.
+Have you verified that the property browser.bin.dir has been set
+to the binary directory of the host browser in the webclient.properties
+file?  The current value of this property is:
+${browser.bin.dir} and this directory must contain the file
+${so.prefix}xul.${so.extension}.
+    </fail>
+    <mkdir dir="${build.classes.dir}"/>
+    <mkdir dir="${build.test.classes.dir}"/>
+
+  </target>
+
+  <target name="copy.binaries" if="do.copy.binaries">
+      <copy todir="${browser.bin.dir}">
+          <fileset dir="${basedir}/../bin" />
+      </copy>
+  </target>
+
+  <target name="copy.test.data">
+      <copy todir="${build.test.results.dir}">
+          <fileset dir="${basedir}/../test/automated/src/main/resources" />
+      </copy>
+  </target>
+
+    <target name="-init-macrodef-javac">
+        <macrodef name="webclient.javac">
+            <attribute name="srcdir" default="${src.dir}"/>
+            <attribute name="destdir" default="${build.classes.dir}"/>
+            <attribute name="classpath" default="${javac.classpath}"/>
+            <attribute name="debug" default="${javac.debug}"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <javac srcdir="@{srcdir}" destdir="@{destdir}" debug="@{debug}" deprecation="${javac.deprecation}" source="${javac.source}" target="${javac.target}" includeantruntime="false">
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                    <compilerarg line="${javac.compilerargs}"/>
+                    <customize/>
+
+                    <patternset>
+                        <exclude name="**/*Win32*.java" if="build.unix.classes"/>
+                        <exclude name="**/*Cocoa*.java" if="build.unix.classes"/>
+                    </patternset>
+
+                    <patternset>
+                        <exclude name="**/*Gtk*.java" if="build.win32.classes"/>
+                        <exclude name="**/*Cocoa*.java" if="build.win32.classes"/>
+                    </patternset>
+
+                    <patternset>
+                        <exclude name="**/*Gtk*.java" if="build.mac.classes"/>
+                        <exclude name="**/*Win32*.java" if="build.mac.classes"/>
+                    </patternset>
+                    
+                </javac>
+            </sequential>
+        </macrodef>
+    </target>
+    
+    <target name="-init-macrodef-junit">
+        <property name="debug.jvm.args" value="" />
+
+        <macrodef name="webclient.junit">
+            <attribute name="includes" default="**/*Test.java"/>
+            <sequential>
+                <junit showoutput="true" fork="true" dir="${basedir}" failureproperty="tests.failed" errorproperty="tests.failed">
+                    <jvmarg value="-DNSPR_LOG_MODULES=webclient:4,webclientstub:4,pluglets:4"/>
+                    <jvmarg value="-DNSPR_LOG_FILE=${basedir}${FILE_PATH_SEP}${build.dir}${FILE_PATH_SEP}webclient.log"/>
+                    <jvmarg value="-Dbuild.test.results.dir=${basedir}${FILE_PATH_SEP}${build.test.results.dir}" />
+                    <jvmarg value="-DBROWSER_BIN_DIR=${browser.bin.dir}"/>
+                    <jvmarg line="${debug.jvm.args}"/>
+                    <jvmarg line="-Djava.util.logging.config.file=${basedir}${FILE_PATH_SEP}logging.properties"/>
+                    <jvmarg line="-Djava.library.path=${browser.bin.dir}" />
+                    
+                    <batchtest todir="${build.test.results.dir}">
+                        <fileset dir="${test.src.dir}" includes="@{includes}"/>
+                    </batchtest>
+                    <classpath>
+                        <path path="${run.test.classpath}"/>
+                    </classpath>
+                    <syspropertyset>
+                        <propertyref prefix="test-sys-prop."/>
+                        <mapper type="glob" from="test-sys-prop.*" to="*"/>
+                    </syspropertyset>
+                    <formatter type="brief" usefile="false"/>
+                    <formatter type="xml"/>
+                    <jvmarg line="${run.jvmargs}"/>
+                </junit>
+            </sequential>
+        </macrodef>
+    </target>
+
+    <target name="-do-compile" depends="check.sources,-init-macrodef-javac"
+            if="have.sources">
+        <webclient.javac/>
+        <copy todir="${build.classes.dir}">
+            <fileset dir="${src.dir}" excludes="${build.classes.excludes}"/>
+        </copy>
+    </target>
+
+    <target name="-do-compile-test" if="have.tests" depends="check.sources,prepare,-init-macrodef-javac">
+        <webclient.javac srcdir="${test.src.dir}" destdir="${build.test.classes.dir}" debug="true" classpath="${javac.test.classpath}"/>
+        <copy todir="${build.test.classes.dir}">
+            <fileset dir="${test.src.dir}" excludes="**/*.java"/>
+        </copy>
+    </target>
+
+
+    <target name="run" depends="prepare">
+
+        <property name="debug.jvm.args" value="" />
+        
+        <java classname="org.mozilla.webclient.test.TestBrowser" fork="true">
+            <jvmarg value="-DNSPR_LOG_MODULES=webclient:4,webclientstub:4,pluglets:4"/>
+            <jvmarg value="-DNSPR_LOG_FILE=${basedir}${FILE_PATH_SEP}${build.dir}${FILE_PATH_SEP}webclient.log"/>
+            <jvmarg value="-Dbuild.test.results.dir=${basedir}${FILE_PATH_SEP}${build.test.results.dir}" />
+            <jvmarg value="-DBROWSER_BIN_DIR=${browser.bin.dir}"/>
+            <jvmarg line="${debug.jvm.args}"/>
+            <jvmarg line="-Djava.util.logging.config.file=${basedir}${FILE_PATH_SEP}logging.properties"/>
+            <jvmarg line="-Djava.library.path=${browser.bin.dir}" />
+
+                    <classpath>
+                        <path path="${run.test.classpath}"/>
+                    </classpath>
+
+        </java>
+    </target>
+
+    <target name="run.test" depends="prepare,-init-macrodef-junit">
+       <webclient.junit />
+    </target>
+
+
+    
+</project>

java/dist/non-ide/logging.properties

@@ -0,0 +1,12 @@
+handlers= java.util.logging.FileHandler
+
+.level=INFO
+
+
+java.util.logging.FileHandler.pattern = %h/moz-java-log.xml
+java.util.logging.FileHandler.limit = 50000
+java.util.logging.FileHandler.append = true
+java.util.logging.FileHandler.formatter = java.util.logging.XMLFormatter
+
+org.mozilla.webclient.level=INFO
+

java/dist/non-ide/project.properties

@@ -0,0 +1,61 @@
+application.args=
+build.classes.dir=${build.dir}/classes
+build.classes.excludes=**/*.java,**/*.form
+# This directory is removed when the project is cleaned:
+build.dir=build
+build.generated.dir=${build.dir}/generated
+# Only compile against the classpath explicitly listed here:
+build.sysclasspath=ignore
+build.test.classes.dir=${build.dir}/test/classes
+build.test.results.dir=${build.dir}/test/results
+debug.classpath=\
+    ${run.classpath}
+debug.test.classpath=\
+    ${run.test.classpath}
+# This directory is removed when the project is cleaned:
+dist.dir=dist
+dist.jar=${dist.dir}/webclient.jar
+dist.javadoc.dir=${dist.dir}/javadoc
+file.reference.main-java=../test/manual/src/main/java
+file.reference.main-java-1=../test/automated/src/main/java
+file.reference.webclient-2_0_a5.jar=../lib/webclient-2_0_a5.jar
+jar.compress=false
+javac.classpath=\
+    ${file.reference.webclient-2_0_a5.jar}
+# Space-separated list of extra javac options
+javac.compilerargs=
+javac.deprecation=false
+javac.debug=true
+javac.source=1.5
+javac.target=1.5
+javac.test.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}:\
+    ${junit.jar}
+javadoc.additionalparam=
+javadoc.author=false
+javadoc.encoding=
+javadoc.noindex=false
+javadoc.nonavbar=false
+javadoc.notree=false
+javadoc.private=false
+javadoc.splitindex=true
+javadoc.use=true
+javadoc.version=false
+javadoc.windowtitle=
+main.class=org.mozilla.webclient.test.TestBrowser
+manifest.file=manifest.mf
+meta.inf.dir=${src.dir}/META-INF
+platform.active=default_platform
+run.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}
+# Space-separated list of JVM arguments used when running the project
+# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
+# or test-sys-prop.name=value to set system properties for unit tests):
+run.jvmargs=
+run.test.classpath=\
+    ${javac.test.classpath}:\
+    ${build.test.classes.dir}
+src.dir=${file.reference.main-java}
+test.src.dir=${file.reference.main-java-1}