Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

M dist/mcp-test/src/test/java/immosearch/ImmoSearchTest.java

Browse Source 
- Be more resiliant to changes in what the server sends back via ajax

M dist/netbeans/build.xml
M dist/netbeans/webclient.properties
M webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/WrapperFactoryImpl.java

  Added copyProxySettingsIfNecessary() to copy the proxy settings from
  the java system properties into the firefox properties format
  documented at
  http://developer.mozilla.org/en/docs/Mozilla_Embedding_FAQ:How_do_I...#How_do_I_set_the_network_proxy.3F


git-svn-id: svn://10.0.0.236/trunk@233489 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
edburns%acm.org
2007-08-31 15:05:19 +00:00
parent 5e5a04451b
commit 4fbcc9b1f2
4 changed files with 157 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
mozilla/java/dist/netbeans/build.xml vendored
View File

@@ -216,6 +216,9 @@ ${so.prefix}xul.${so.extension}.
<target name="run" depends="-init-check">
<property name="debug.jvm.args" value="" />
<property name="http.proxyHost" value="" />
<property name="http.proxyPort" value="" />
<property name="http.nonProxyHosts" value="" />
<property name="test.browser.url"
value="${basedir}/../2_0_alpha_9.html" />
@@ -226,6 +229,9 @@ ${so.prefix}xul.${so.extension}.
<env key="NSPR_LOG_FILE" file="${basedir}/${build.dir}/${nspr.log.filename}" />
<jvmarg value="-Dbuild.test.results.dir=${basedir}${FILE_PATH_SEP}${build.test.results.dir}" />
<jvmarg value="-DBROWSER_BIN_DIR=${browser.bin.dir}"/>
<jvmarg value="-Dhttp.proxyHost=${http.proxyHost}" />
<jvmarg value="-Dhttp.proxyPort=${http.proxyPort}" />
<jvmarg value="-Dhttp.nonProxyHosts=${http.nonProxyHosts}" />
<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}" />
@@ -276,6 +282,9 @@ ${so.prefix}xul.${so.extension}.
<target name="-init-macrodef-junit">
<property name="debug.jvm.args" value="" />
<property name="http.proxyHost" value="" />
<property name="http.proxyPort" value="" />
<property name="http.nonProxyHosts" value="" />
<macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
<attribute name="includes" default="**/*Test.java"/>
@@ -288,6 +297,9 @@ ${so.prefix}xul.${so.extension}.
<env key="NSPR_LOG_FILE" file="${basedir}/${build.dir}/${nspr.log.filename}" />
<jvmarg value="-Dbuild.test.results.dir=${basedir}${FILE_PATH_SEP}${build.test.results.dir}" />
<jvmarg value="-DBROWSER_BIN_DIR=${browser.bin.dir}"/>
<jvmarg value="-Dhttp.proxyHost=${http.proxyHost}" />
<jvmarg value="-Dhttp.proxyPort=${http.proxyPort}" />
<jvmarg value="-Dhttp.nonProxyHosts=${http.nonProxyHosts}" />
<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}" />
@@ -312,6 +324,10 @@ ${so.prefix}xul.${so.extension}.
</target>
<target name="-init-macrodef-debug">
<property name="http.proxyHost" value="" />
<property name="http.proxyPort" value="" />
<property name="http.nonProxyHosts" value="" />
<macrodef name="debug" uri="http://www.netbeans.org/ns/j2se-project/3">
<attribute name="classname" default="${main.class}"/>
<attribute name="classpath" default="${debug.classpath}"/>
@@ -327,6 +343,9 @@ ${so.prefix}xul.${so.extension}.
<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 value="-Dhttp.proxyHost=${http.proxyHost}" />
<jvmarg value="-Dhttp.proxyPort=${http.proxyPort}" />
<jvmarg value="-Dhttp.nonProxyHosts=${http.nonProxyHosts}" />
<jvmarg line="-Djava.util.logging.config.file=${basedir}${FILE_PATH_SEP}logging.properties"/>
<jvmarg line="-Djava.library.path=${browser.bin.dir}" />
<jvmarg line="${run.jvmargs}"/>