From: <st...@us...> - 2007-06-26 14:05:24
|
Revision: 4421 http://svn.sourceforge.net/smartfrog/?rev=4421&view=rev Author: steve_l Date: 2007-06-26 07:05:07 -0700 (Tue, 26 Jun 2007) Log Message: ----------- SFOS-200; deleting init-proxy targets Modified Paths: -------------- trunk/core/common.xml Modified: trunk/core/common.xml =================================================================== --- trunk/core/common.xml 2007-06-26 12:24:38 UTC (rev 4420) +++ trunk/core/common.xml 2007-06-26 14:05:07 UTC (rev 4421) @@ -184,6 +184,7 @@ <!--copy all proxy settings from the running JVM--> <propertyset id="proxy.settings"> <propertyref prefix="http."/> + <propertyref prefix="https."/> <propertyref prefix="socks."/> </propertyset> @@ -891,40 +892,6 @@ </target> <!-- ========================================================== --> - <!-- set up an HTTP proxy --> - <!-- there is a bit of a problem here for laptops whose proxy varies from - location to location; we are ignoring that for now. --> - <!-- ========================================================== --> - - <target name="init-web-proxy" if="http.proxy.host" depends="init"> - <property name="http.proxy.port" value="80" /> - <property name="http.proxy.user" value="" /> - <property name="http.proxy.password" value="" /> - <setproxy - proxyhost="${http.proxy.host}" - proxyport="${http.proxy.port}" - proxyuser="${http.proxy.user}" - proxypassword="${http.proxy.password}" - /> - </target> - - <!-- ========================================================== --> - <!-- set up a socks proxy --> - <!-- ========================================================== --> - <target name="init-socks-proxy" if="socks.proxy.host" depends="init"> - <property name="socks.proxy.port" value="1080" /> - <setproxy - socksproxyhost="${socks.proxy.host}" - socksproxyport="${socks.proxy.port}" - /> - </target> - - <!-- ========================================================== --> - <!-- conditionally initialise socks or web proxy, if configured --> - <!-- ========================================================== --> - <target name="init-proxy" depends="init-web-proxy,init-socks-proxy"/> - - <!-- ========================================================== --> <!-- location of testharness; create a relevant path --> <!-- ========================================================== --> @@ -1411,7 +1378,7 @@ </syspropertyset> <sysproperty key="org.smartfrog.codebase" value="${codebase}"/> <syspropertyset> - <propertyref prefix="runtime"/> + <propertyref prefix="runtime."/> </syspropertyset> </sf-junit> </presetdef> @@ -1598,7 +1565,7 @@ <!-- ========================================================== --> <!-- init all the maven2 support --> <!-- ========================================================== --> - <target name="m2-init" depends="init,init-proxy,declare-extended-smartfrog-tasks,load-versions"> + <target name="m2-init" depends="init,declare-extended-smartfrog-tasks,load-versions"> <!-- Maven2 stuff All components build into the org.smartfrog group, unless otherwise stated, but are their own artifacts. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |