harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r961353 - in /harmony/enhanced/java/branches/java6: ./ classlib/ classlib/depends/libs/ classlib/make/ classlib/modules/activation/make/ classlib/modules/jaxb/make/ classlib/modules/jaxws/make/ classlib/modules/jws/make/ classlib/modules/or...
Date Wed, 07 Jul 2010 12:08:07 GMT
Author: hindessm
Date: Wed Jul  7 12:08:06 2010
New Revision: 961353

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

Added:
    harmony/enhanced/java/branches/java6/classlib/modules/portlib/src/main/native/thread/windows/lock386.c
      - copied unchanged from r961350, harmony/enhanced/java/trunk/classlib/modules/portlib/src/main/native/thread/windows/lock386.c
    harmony/enhanced/java/branches/java6/classlib/modules/portlib/src/main/native/thread/windows/windows.x86/locklbl.asm
      - copied unchanged from r961350, harmony/enhanced/java/trunk/classlib/modules/portlib/src/main/native/thread/windows/windows.x86/locklbl.asm
    harmony/enhanced/java/branches/java6/classlib/modules/portlib/src/main/native/thread/windows/windows.x86_64/locklbl.asm
      - copied unchanged from r961350, harmony/enhanced/java/trunk/classlib/modules/portlib/src/main/native/thread/windows/windows.x86_64/locklbl.asm
Removed:
    harmony/enhanced/java/branches/java6/classlib/modules/portlib/src/main/native/common/windows/lock386.c
    harmony/enhanced/java/branches/java6/classlib/modules/portlib/src/main/native/common/windows/windows.x86/locklbl.asm
    harmony/enhanced/java/branches/java6/classlib/modules/portlib/src/main/native/common/windows/windows.x86_64/locklbl.asm
Modified:
    harmony/enhanced/java/branches/java6/   (props changed)
    harmony/enhanced/java/branches/java6/classlib/   (props changed)
    harmony/enhanced/java/branches/java6/classlib/depends/libs/   (props changed)
    harmony/enhanced/java/branches/java6/classlib/make/depends-common.xml
    harmony/enhanced/java/branches/java6/classlib/make/depends.properties
    harmony/enhanced/java/branches/java6/classlib/modules/activation/make/depends.properties
    harmony/enhanced/java/branches/java6/classlib/modules/jaxb/make/depends.properties
    harmony/enhanced/java/branches/java6/classlib/modules/jaxws/make/depends.properties
    harmony/enhanced/java/branches/java6/classlib/modules/jws/make/depends.properties
    harmony/enhanced/java/branches/java6/classlib/modules/orb/make/depends.properties
    harmony/enhanced/java/branches/java6/classlib/modules/portlib/src/main/native/common/windows/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/portlib/src/main/native/thread/windows/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/sql/make/depends.properties
    harmony/enhanced/java/branches/java6/classlib/modules/stax/make/depends.properties
    harmony/enhanced/java/branches/java6/common_resources/make/depends.properties
    harmony/enhanced/java/branches/java6/common_resources/make/depends.xml
    harmony/enhanced/java/branches/java6/drlvm/   (props changed)
    harmony/enhanced/java/branches/java6/drlvm/make/depends.properties
    harmony/enhanced/java/branches/java6/jdktools/   (props changed)

Propchange: harmony/enhanced/java/branches/java6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul  7 12:08:06 2010
@@ -1,4 +1,4 @@
 /harmony/enhanced/java/branches/mrh:935751-941490
-/harmony/enhanced/java/trunk:929253-961242
+/harmony/enhanced/java/trunk:929253-961350
 /harmony/enhanced/trunk:476395-929252
 /incubator/harmony/enhanced/trunk:292550-476394

Propchange: harmony/enhanced/java/branches/java6/classlib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul  7 12:08:06 2010
@@ -1,7 +1,7 @@
 /harmony/enhanced/classlib/trunk:713674-735919,765923-926091,926318-926838
 /harmony/enhanced/classlib/trunk/working_classlib:884014-884286
 /harmony/enhanced/java/branches/mrh/classlib:935751-941490
-/harmony/enhanced/java/trunk/classlib:929253-961242
+/harmony/enhanced/java/trunk/classlib:929253-961350
 /harmony/enhanced/trunk/classlib:476395-929252
 /harmony/enhanced/trunk/working_classlib:476396-920147
 /incubator/harmony/enhanced/trunk/classlib:292550-476394

Propchange: harmony/enhanced/java/branches/java6/classlib/depends/libs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul  7 12:08:06 2010
@@ -1,4 +1,4 @@
 /harmony/enhanced/classlib/trunk/depends/libs:544451-926091
-/harmony/enhanced/java/trunk/classlib/depends/libs:929253-961242
+/harmony/enhanced/java/trunk/classlib/depends/libs:929253-961350
 /harmony/enhanced/trunk/classlib/depends/libs:476395-929252
 /incubator/harmony/enhanced/trunk/classlib/depends/libs:292550-476394

Modified: harmony/enhanced/java/branches/java6/classlib/make/depends-common.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/make/depends-common.xml?rev=961353&r1=961352&r2=961353&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/make/depends-common.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/make/depends-common.xml Wed Jul  7 12:08:06
2010
@@ -25,6 +25,9 @@
     where possible.
     </description>
 
+    <property name="maven2.base"
+              value="http://mirrors.ibiblio.org/pub/mirrors/maven2" />
+
     <loadproperties srcfile="${basedir}/make/depends.properties">
       <filterchain>
         <filterreader classname="org.apache.tools.ant.filters.ReplaceTokens">

Modified: harmony/enhanced/java/branches/java6/classlib/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/make/depends.properties?rev=961353&r1=961352&r2=961353&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/make/depends.properties (original)
+++ harmony/enhanced/java/branches/java6/classlib/make/depends.properties Wed Jul  7 12:08:06
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/java6/classlib/modules/activation/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/activation/make/depends.properties?rev=961353&r1=961352&r2=961353&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/activation/make/depends.properties
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/activation/make/depends.properties
Wed Jul  7 12:08:06 2010
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 depends.jars=${depends.dir}/jars
-geronimo.base=http://repo2.maven.org/maven2/org/apache/geronimo/specs
+geronimo.base=${maven2.base}/org/apache/geronimo/specs
 activation.base=${geronimo.base}/geronimo-activation_1.1_spec/1.0.2
 
 activation.version=1.1_spec-1.0.2

Modified: harmony/enhanced/java/branches/java6/classlib/modules/jaxb/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/jaxb/make/depends.properties?rev=961353&r1=961352&r2=961353&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/jaxb/make/depends.properties (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/jaxb/make/depends.properties Wed
Jul  7 12:08:06 2010
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 depends.jars=${depends.dir}/jars
-geronimo.base=http://repo2.maven.org/maven2/org/apache/geronimo/specs
+geronimo.base=${maven2.base}/org/apache/geronimo/specs
 jaxb.base=${geronimo.base}/geronimo-jaxb_2.1_spec/1.0
 
 jaxb.version=2.1_spec-1.0

Modified: harmony/enhanced/java/branches/java6/classlib/modules/jaxws/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/jaxws/make/depends.properties?rev=961353&r1=961352&r2=961353&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/jaxws/make/depends.properties (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/jaxws/make/depends.properties Wed
Jul  7 12:08:06 2010
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 depends.jars=${depends.dir}/jars
-geronimo.base=http://repo2.maven.org/maven2/org/apache/geronimo/specs
+geronimo.base=${maven2.base}/org/apache/geronimo/specs
 jaxws.base=${geronimo.base}/geronimo-jaxws_2.1_spec/1.0
 
 jaxws.version=2.1_spec-1.0

Modified: harmony/enhanced/java/branches/java6/classlib/modules/jws/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/jws/make/depends.properties?rev=961353&r1=961352&r2=961353&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/jws/make/depends.properties (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/jws/make/depends.properties Wed
Jul  7 12:08:06 2010
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 depends.jars=${depends.dir}/jars
-geronimo.base=http://repo2.maven.org/maven2/org/apache/geronimo/specs
+geronimo.base=${maven2.base}/org/apache/geronimo/specs
 jws.base=${geronimo.base}/geronimo-ws-metadata_2.0_spec/1.1.2
 
 jws.version=2.0_spec-1.1.2

Modified: harmony/enhanced/java/branches/java6/classlib/modules/orb/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/orb/make/depends.properties?rev=961353&r1=961352&r2=961353&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/orb/make/depends.properties (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/orb/make/depends.properties Wed
Jul  7 12:08:06 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/java6/classlib/modules/portlib/src/main/native/common/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/portlib/src/main/native/common/windows/makefile?rev=961353&r1=961352&r2=961353&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/portlib/src/main/native/common/windows/makefile
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/portlib/src/main/native/common/windows/makefile
Wed Jul  7 12:08:06 2010
@@ -24,7 +24,6 @@ LIBNAME=$(LIBPATH)hycommon.lib
 BUILDFILES = \
 	$(SHAREDSUB)libglob.obj $(SHAREDSUB)iohelp.obj \
 	$(SHAREDSUB)exceptions.obj $(SHAREDSUB)strhelp.obj \
-	$(HY_PLATFORM)\locklbl.obj lock386.obj \
 	$(SHAREDSUB)utf8decode.obj $(SHAREDSUB)utf8encode.obj
 MDLLIBFILES =
 

Modified: harmony/enhanced/java/branches/java6/classlib/modules/portlib/src/main/native/thread/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/portlib/src/main/native/thread/windows/makefile?rev=961353&r1=961352&r2=961353&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/portlib/src/main/native/thread/windows/makefile
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/portlib/src/main/native/thread/windows/makefile
Wed Jul  7 12:08:06 2010
@@ -26,7 +26,7 @@ LIBNAME=$(LIBPATH)$(LIBBASE).lib
 BUILDFILES = \
   $(SHAREDSUB)thread_copyright.obj $(HY_PLATFORM)\thrhelp.obj $(HY_PLATFORM)\thrspinlock.obj
\
   $(SHAREDSUB)hythread.obj $(SHAREDSUB)hythreadinspect.obj $(SHAREDSUB)rwmutex.obj thrdsup.obj
\
-  $(SHAREDSUB)thrprof.obj
+  $(SHAREDSUB)thrprof.obj $(HY_PLATFORM)\locklbl.obj lock386.obj
 
 # TOFIX $(LIBBASE).def should be a dependency on all libs
 VIRTFILES = $(LIBBASE).res

Modified: harmony/enhanced/java/branches/java6/classlib/modules/sql/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/sql/make/depends.properties?rev=961353&r1=961352&r2=961353&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/sql/make/depends.properties (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/sql/make/depends.properties Wed
Jul  7 12:08:06 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

Modified: harmony/enhanced/java/branches/java6/classlib/modules/stax/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/stax/make/depends.properties?rev=961353&r1=961352&r2=961353&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/stax/make/depends.properties (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/stax/make/depends.properties Wed
Jul  7 12:08:06 2010
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 depends.jars=${depends.dir}/jars
-geronimo.base=http://repo2.maven.org/maven2/org/apache/geronimo/specs
+geronimo.base=${maven2.base}/org/apache/geronimo/specs
 stax.base=${geronimo.base}/geronimo-stax-api_1.0_spec/1.0.1
 
 stax.version=1.0_spec-1.0.1

Modified: harmony/enhanced/java/branches/java6/common_resources/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/common_resources/make/depends.properties?rev=961353&r1=961352&r2=961353&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/common_resources/make/depends.properties (original)
+++ harmony/enhanced/java/branches/java6/common_resources/make/depends.properties Wed Jul
 7 12:08:06 2010
@@ -16,7 +16,6 @@
 depends.jars=${base.dep.dir}/jars
 depends.oss=${base.dep.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/java6/common_resources/make/depends.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/common_resources/make/depends.xml?rev=961353&r1=961352&r2=961353&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/common_resources/make/depends.xml (original)
+++ harmony/enhanced/java/branches/java6/common_resources/make/depends.xml Wed Jul  7 12:08:06
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/java6/drlvm/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul  7 12:08:06 2010
@@ -1,5 +1,5 @@
 /harmony/enhanced/java/branches/mrh/drlvm:935751-941490
-/harmony/enhanced/java/trunk/drlvm:929253-961242
+/harmony/enhanced/java/trunk/drlvm:929253-961350
 /harmony/enhanced/trunk/drlvm:476395-929252
 /harmony/enhanced/trunk/working_vm:476396-920147
 /incubator/harmony/enhanced/trunk/drlvm:292550-476394

Modified: harmony/enhanced/java/branches/java6/drlvm/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/drlvm/make/depends.properties?rev=961353&r1=961352&r2=961353&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/drlvm/make/depends.properties (original)
+++ harmony/enhanced/java/branches/java6/drlvm/make/depends.properties Wed Jul  7 12:08:06
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

Propchange: harmony/enhanced/java/branches/java6/jdktools/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul  7 12:08:06 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools:929253-961242
+/harmony/enhanced/java/trunk/jdktools:929253-961350
 /harmony/enhanced/jdktools/trunk:630107-925933
 /harmony/enhanced/trunk/jdktools:476395-929252
 /harmony/enhanced/trunk/working_jdktools:476396-920147



Mime
View raw message