harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r920152 - in /harmony/enhanced: branches/java6/ branches/java6/debian/ branches/java6/debian/patches/ classlib/branches/java6/ common_resources/trunk/ drlvm/trunk/ jdktools/branches/java6/
Date Sun, 07 Mar 2010 23:22:33 GMT
Author: hindessm
Date: Sun Mar  7 23:22:32 2010
New Revision: 920152

URL: http://svn.apache.org/viewvc?rev=920152&view=rev
Log:
Merging changes from federated trunk@920147 to java6 branch.

Added:
    harmony/enhanced/branches/java6/rat.excludes   (props changed)
      - copied unchanged from r920147, harmony/enhanced/trunk/rat.excludes
Modified:
    harmony/enhanced/branches/java6/   (props changed)
    harmony/enhanced/branches/java6/LICENSE   (props changed)
    harmony/enhanced/branches/java6/NOTICE   (contents, props changed)
    harmony/enhanced/branches/java6/README   (props changed)
    harmony/enhanced/branches/java6/build.xml   (contents, props changed)
    harmony/enhanced/branches/java6/debian/   (props changed)
    harmony/enhanced/branches/java6/debian/harmony-6.0-drlvm.postinst
    harmony/enhanced/branches/java6/debian/harmony-6.0-drlvm.prerm
    harmony/enhanced/branches/java6/debian/harmony-6.0-jdk.postinst
    harmony/enhanced/branches/java6/debian/harmony-6.0-jdk.prerm
    harmony/enhanced/branches/java6/debian/harmony-6.0-jre.postinst
    harmony/enhanced/branches/java6/debian/harmony-6.0-jre.prerm
    harmony/enhanced/branches/java6/debian/patches/   (props changed)
    harmony/enhanced/classlib/branches/java6/   (props changed)
    harmony/enhanced/common_resources/trunk/   (props changed)
    harmony/enhanced/drlvm/trunk/   (props changed)
    harmony/enhanced/jdktools/branches/java6/   (props changed)

Propchange: harmony/enhanced/branches/java6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Mar  7 23:22:32 2010
@@ -1 +1 @@
-/harmony/enhanced/trunk:810871-912354
+/harmony/enhanced/trunk:810871-912354,912355-920147*

Propchange: harmony/enhanced/branches/java6/LICENSE
------------------------------------------------------------------------------
    svn:mergeinfo = /harmony/enhanced/trunk/LICENSE:810871-920147

Modified: harmony/enhanced/branches/java6/NOTICE
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/NOTICE?rev=920152&r1=920151&r2=920152&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/NOTICE (original)
+++ harmony/enhanced/branches/java6/NOTICE Sun Mar  7 23:22:32 2010
@@ -1,5 +1,5 @@
 Apache Harmony
-Copyright 2006, 2009 The Apache Software Foundation.
+Copyright 2006, 2010 The Apache Software Foundation.
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

Propchange: harmony/enhanced/branches/java6/NOTICE
------------------------------------------------------------------------------
    svn:mergeinfo = /harmony/enhanced/trunk/NOTICE:810871-920147

Propchange: harmony/enhanced/branches/java6/README
------------------------------------------------------------------------------
    svn:mergeinfo = /harmony/enhanced/trunk/README:810871-920147

Modified: harmony/enhanced/branches/java6/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/build.xml?rev=920152&r1=920151&r2=920152&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/build.xml (original)
+++ harmony/enhanced/branches/java6/build.xml Sun Mar  7 23:22:32 2010
@@ -105,6 +105,24 @@
                  bundle-src-tgz,
                  bundle-src-zip" />
 
+    <target name="rat" depends="setup,copy-src">
+        <fail
+             message="Set rat.home property to directory containing rat build">
+            <condition><not><available file="${rat.home}" /></not></condition>
+        </fail>
+        <typedef resource="org/apache/rat/anttasks/antlib.xml"
+                 uri="antlib:org.apache.rat.anttasks">
+            <classpath path="${rat.home}/apache-rat-tasks/target/apache-rat-tasks-0.7-SNAPSHOT.jar"
/>
+            <classpath path="${rat.home}/apache-rat-core/target/apache-rat-core-0.7-SNAPSHOT.jar"
/>
+            <classpath path="${rat.home}/apache-rat/target/apache-rat-0.7-SNAPSHOT.jar"
/>
+        </typedef>
+        <delete file="target/rat.report.txt" />
+        <rat:report xmlns:rat="antlib:org.apache.rat.anttasks"
+                    reportFile="target/rat.report.txt" >
+            <fileset dir="target/src" excludesfile="rat.excludes" />
+        </rat:report>
+    </target>
+
     <!-- ============================================================== -->
     <!--     populates the source directories, working_classlib,
              working_vm, working_jdktools, and common_resources         -->

Propchange: harmony/enhanced/branches/java6/build.xml
------------------------------------------------------------------------------
    svn:mergeinfo = /harmony/enhanced/trunk/build.xml:810871-920147

Propchange: harmony/enhanced/branches/java6/debian/
------------------------------------------------------------------------------
    svn:mergeinfo = /harmony/enhanced/trunk/debian:810871-920147

Modified: harmony/enhanced/branches/java6/debian/harmony-6.0-drlvm.postinst
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/debian/harmony-6.0-drlvm.postinst?rev=920152&r1=920151&r2=920152&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/debian/harmony-6.0-drlvm.postinst (original)
+++ harmony/enhanced/branches/java6/debian/harmony-6.0-drlvm.postinst Sun Mar  7 23:22:32
2010
@@ -1,4 +1,20 @@
 #!/bin/sh
+
+#  Licensed to the Apache Software Foundation (ASF) under one or more
+#  contributor license agreements.  See the NOTICE file distributed with
+#  this work for additional information regarding copyright ownership.
+#  The ASF licenses this file to You under the Apache License, Version 2.0
+#  (the "License"); you may not use this file except in compliance with
+#  the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
 # postinst script for harmony-6.0-jdk
 #
 # see: dh_installdeb(1)

Modified: harmony/enhanced/branches/java6/debian/harmony-6.0-drlvm.prerm
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/debian/harmony-6.0-drlvm.prerm?rev=920152&r1=920151&r2=920152&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/debian/harmony-6.0-drlvm.prerm (original)
+++ harmony/enhanced/branches/java6/debian/harmony-6.0-drlvm.prerm Sun Mar  7 23:22:32 2010
@@ -1,4 +1,20 @@
 #!/bin/sh
+
+#  Licensed to the Apache Software Foundation (ASF) under one or more
+#  contributor license agreements.  See the NOTICE file distributed with
+#  this work for additional information regarding copyright ownership.
+#  The ASF licenses this file to You under the Apache License, Version 2.0
+#  (the "License"); you may not use this file except in compliance with
+#  the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
 # prerm script for harmony-6.0-jdk
 #
 # see: dh_installdeb(1)

Modified: harmony/enhanced/branches/java6/debian/harmony-6.0-jdk.postinst
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/debian/harmony-6.0-jdk.postinst?rev=920152&r1=920151&r2=920152&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/debian/harmony-6.0-jdk.postinst (original)
+++ harmony/enhanced/branches/java6/debian/harmony-6.0-jdk.postinst Sun Mar  7 23:22:32 2010
@@ -1,4 +1,20 @@
 #!/bin/sh
+
+#  Licensed to the Apache Software Foundation (ASF) under one or more
+#  contributor license agreements.  See the NOTICE file distributed with
+#  this work for additional information regarding copyright ownership.
+#  The ASF licenses this file to You under the Apache License, Version 2.0
+#  (the "License"); you may not use this file except in compliance with
+#  the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
 # postinst script for harmony-6.0-jdk
 #
 # see: dh_installdeb(1)

Modified: harmony/enhanced/branches/java6/debian/harmony-6.0-jdk.prerm
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/debian/harmony-6.0-jdk.prerm?rev=920152&r1=920151&r2=920152&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/debian/harmony-6.0-jdk.prerm (original)
+++ harmony/enhanced/branches/java6/debian/harmony-6.0-jdk.prerm Sun Mar  7 23:22:32 2010
@@ -1,4 +1,20 @@
 #!/bin/sh
+
+#  Licensed to the Apache Software Foundation (ASF) under one or more
+#  contributor license agreements.  See the NOTICE file distributed with
+#  this work for additional information regarding copyright ownership.
+#  The ASF licenses this file to You under the Apache License, Version 2.0
+#  (the "License"); you may not use this file except in compliance with
+#  the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
 # prerm script for harmony-6.0-jdk
 #
 # see: dh_installdeb(1)

Modified: harmony/enhanced/branches/java6/debian/harmony-6.0-jre.postinst
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/debian/harmony-6.0-jre.postinst?rev=920152&r1=920151&r2=920152&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/debian/harmony-6.0-jre.postinst (original)
+++ harmony/enhanced/branches/java6/debian/harmony-6.0-jre.postinst Sun Mar  7 23:22:32 2010
@@ -1,4 +1,20 @@
 #!/bin/sh
+
+#  Licensed to the Apache Software Foundation (ASF) under one or more
+#  contributor license agreements.  See the NOTICE file distributed with
+#  this work for additional information regarding copyright ownership.
+#  The ASF licenses this file to You under the Apache License, Version 2.0
+#  (the "License"); you may not use this file except in compliance with
+#  the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
 # postinst script for harmony-6.0-jre
 #
 # see: dh_installdeb(1)

Modified: harmony/enhanced/branches/java6/debian/harmony-6.0-jre.prerm
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/debian/harmony-6.0-jre.prerm?rev=920152&r1=920151&r2=920152&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/debian/harmony-6.0-jre.prerm (original)
+++ harmony/enhanced/branches/java6/debian/harmony-6.0-jre.prerm Sun Mar  7 23:22:32 2010
@@ -1,4 +1,20 @@
 #!/bin/sh
+
+#  Licensed to the Apache Software Foundation (ASF) under one or more
+#  contributor license agreements.  See the NOTICE file distributed with
+#  this work for additional information regarding copyright ownership.
+#  The ASF licenses this file to You under the Apache License, Version 2.0
+#  (the "License"); you may not use this file except in compliance with
+#  the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
 # prerm script for harmony-6.0-jre
 #
 # see: dh_installdeb(1)

Propchange: harmony/enhanced/branches/java6/debian/patches/
            ('svn:mergeinfo' removed)

Propchange: harmony/enhanced/branches/java6/rat.excludes
------------------------------------------------------------------------------
    svn:mergeinfo = /harmony/enhanced/trunk/rat.excludes:476396-920147

Propchange: harmony/enhanced/classlib/branches/java6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Mar  7 23:22:32 2010
@@ -1,2 +1,4 @@
 /harmony/enhanced/classlib/trunk:713674-735919,765923-915706
 /harmony/enhanced/classlib/trunk/working_classlib:884014-884286
+/harmony/enhanced/trunk/working_classlib:476396-920147
+/incubator/harmony/enhanced/trunk/working_classlib:423974-476394

Propchange: harmony/enhanced/common_resources/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Mar  7 23:22:32 2010
@@ -0,0 +1,2 @@
+/harmony/enhanced/trunk/common_resources:476396-920147
+/incubator/harmony/enhanced/trunk/common_resources:423974-476394

Propchange: harmony/enhanced/drlvm/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Mar  7 23:22:32 2010
@@ -0,0 +1,2 @@
+/harmony/enhanced/trunk/working_vm:476396-920147
+/incubator/harmony/enhanced/trunk/working_vm:423974-476394

Propchange: harmony/enhanced/jdktools/branches/java6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Mar  7 23:22:32 2010
@@ -1 +1,3 @@
 /harmony/enhanced/jdktools/trunk:630107-917031
+/harmony/enhanced/trunk/working_jdktools:476396-920147
+/incubator/harmony/enhanced/trunk/working_jdktools:423974-476394



Mime
View raw message