Author: hindessm
Date: Wed Jul  7 12:34:31 2010
New Revision: 961358

URL: http://svn.apache.org/viewvc?rev=961358&view=rev
Log:
Merged changes from trunk@961350.

Modified:
    harmony/enhanced/java/branches/mrh/   (props changed)
    harmony/enhanced/java/branches/mrh/classlib/   (props changed)
    harmony/enhanced/java/branches/mrh/classlib/make/depends.properties
    harmony/enhanced/java/branches/mrh/classlib/modules/orb/make/depends.properties
    harmony/enhanced/java/branches/mrh/classlib/modules/sql/make/depends.properties
    harmony/enhanced/java/branches/mrh/common_resources/   (props changed)
    harmony/enhanced/java/branches/mrh/common_resources/make/depends.properties
    harmony/enhanced/java/branches/mrh/common_resources/make/depends.xml
    harmony/enhanced/java/branches/mrh/drlvm/   (props changed)
    harmony/enhanced/java/branches/mrh/drlvm/make/depends.properties

Propchange: harmony/enhanced/java/branches/mrh/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul  7 12:34:31 2010
@@ -1,2 +1,2 @@
 /harmony/enhanced/java/branches/mrh:935751
-/harmony/enhanced/java/trunk:935751-961314
+/harmony/enhanced/java/trunk:935751-961350

Propchange: harmony/enhanced/java/branches/mrh/classlib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul  7 12:34:31 2010
@@ -1,4 +1,4 @@
 /harmony/enhanced/classlib/trunk:926318-926838
 /harmony/enhanced/java/branches/mrh/classlib:935751
-/harmony/enhanced/java/trunk/classlib:935751-961314
+/harmony/enhanced/java/trunk/classlib:935751-961350
 /harmony/enhanced/trunk/classlib:476395-926317

Modified: harmony/enhanced/java/branches/mrh/classlib/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/make/depends.properties?rev=961358&r1=961357&r2=961358&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/make/depends.properties (original)
+++ harmony/enhanced/java/branches/mrh/classlib/make/depends.properties Wed Jul  7 12:34:31 2010
@@ -19,7 +19,6 @@ depends.oss=${depends.dir}/oss
 depends.libs=${depends.dir}/libs/${hy.platform}
 depends.files=${depends.dir}/files
 depends.manifests=${depends.dir}/manifests
-maven2.base=http://repo1.maven.org/maven2
 
 xalan.dir=${depends.jars}/xalan-j_2.7.0
 xalan.orig.jar=${xalan.dir}/xalan.orig.jar

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/orb/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/orb/make/depends.properties?rev=961358&r1=961357&r2=961358&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/orb/make/depends.properties (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/orb/make/depends.properties Wed Jul  7 12:34:31 2010
@@ -14,7 +14,6 @@
 # limitations under the License.
 
 depends.jars=${depends.dir}/jars
-maven2.base=http://repo1.maven.org/maven2
 yoko.base=${maven2.base}/org/apache/yoko
 
 yoko.version=1.0

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/sql/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/sql/make/depends.properties?rev=961358&r1=961357&r2=961358&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/sql/make/depends.properties (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/sql/make/depends.properties Wed Jul  7 12:34:31 2010
@@ -14,7 +14,6 @@
 # limitations under the License.
 
 depends.jars=${depends.dir}/jars
-maven2.base=http://repo1.maven.org/maven2
 derby.dir=${depends.jars}/derby-10.3.1.4
 derby.jar=${derby.dir}/derby.jar
 derby.url=${maven2.base}/org/apache/derby/derby/10.3.1.4/derby-10.3.1.4.jar

Propchange: harmony/enhanced/java/branches/mrh/common_resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul  7 12:34:31 2010
@@ -1,4 +1,4 @@
 /harmony/enhanced/java/branches/mrh/common_resources:935751
-/harmony/enhanced/java/trunk/common_resources:935751-961314
+/harmony/enhanced/java/trunk/common_resources:935751-961350
 /harmony/enhanced/trunk/common_resources:476395-921782
 /incubator/harmony/enhanced/trunk/common_resources:292550-476394

Modified: harmony/enhanced/java/branches/mrh/common_resources/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/common_resources/make/depends.properties?rev=961358&r1=961357&r2=961358&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/common_resources/make/depends.properties (original)
+++ harmony/enhanced/java/branches/mrh/common_resources/make/depends.properties Wed Jul  7 12:34:31 2010
@@ -16,7 +16,6 @@
 depends.jars=${depends.dir}/jars
 depends.oss=${depends.dir}/oss
 
-maven2.base=http://repo1.maven.org/maven2
 depends.url=http://svn.apache.org/repos/asf/harmony/standard/depends
 eclipse.base=http://download.eclipse.org/eclipse/downloads/drops
 harmony.standard.base=http://svn.apache.org/repos/asf/harmony/standard/depends

Modified: harmony/enhanced/java/branches/mrh/common_resources/make/depends.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/common_resources/make/depends.xml?rev=961358&r1=961357&r2=961358&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/common_resources/make/depends.xml (original)
+++ harmony/enhanced/java/branches/mrh/common_resources/make/depends.xml Wed Jul  7 12:34:31 2010
@@ -23,6 +23,9 @@
     
     <dirname property="ed.basedir" file="${ant.file.external-deps}"/>
     <import file="${ed.basedir}/properties.xml"/>
+
+    <property name="maven2.base"
+              value="http://mirrors.ibiblio.org/pub/mirrors/maven2" />
     
     <loadproperties srcfile="${ed.basedir}/depends.properties">
       <filterchain>

Propchange: harmony/enhanced/java/branches/mrh/drlvm/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul  7 12:34:31 2010
@@ -1,5 +1,5 @@
 /harmony/enhanced/java/branches/mrh/drlvm:935751
-/harmony/enhanced/java/trunk/drlvm:935751-961314
+/harmony/enhanced/java/trunk/drlvm:935751-961350
 /harmony/enhanced/trunk/drlvm:476395-926313
 /harmony/enhanced/trunk/working_vm:476396-920147
 /incubator/harmony/enhanced/trunk/working_vm:423974-476394

Modified: harmony/enhanced/java/branches/mrh/drlvm/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/make/depends.properties?rev=961358&r1=961357&r2=961358&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/make/depends.properties (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/make/depends.properties Wed Jul  7 12:34:31 2010
@@ -15,7 +15,7 @@
 
 # ANother Tool for Language Recognition v2.7.5. generics parser dependency
 antlr=${depends.jars}/antlr-2.7.5/antlr-2.7.5.jar
-antlr.url=http://repo2.maven.org/maven2/antlr/antlr/2.7.5/antlr-2.7.5.jar
+antlr.url=${maven2.base}/antlr/antlr/2.7.5/antlr-2.7.5.jar
 antlr.md5=6d57df718efd2a03981c309ce3330a1f
 
 # org.vmmagic unboxed package. Used to enable address arithmetic in Java