harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ndbe...@apache.org
Subject svn commit: r446488 [1/3] - in /incubator/harmony/enhanced/classlib/trunk/modules/instrument: ./ .settings/ META-INF/ make/ src/main/java/java/lang/instrument/ src/main/java/org/apache/harmony/instrument/internal/ src/main/native/instrument/shared/ src...
Date Fri, 15 Sep 2006 03:00:02 GMT
Author: ndbeyer
Date: Thu Sep 14 20:00:01 2006
New Revision: 446488

URL: http://svn.apache.org/viewvc?view=rev&rev=446488
Log:
Set eol-style = native for instrument module.

Modified:
    incubator/harmony/enhanced/classlib/trunk/modules/instrument/.classpath   (contents, props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/instrument/.project   (contents, props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/instrument/.settings/org.eclipse.jdt.core.prefs   (contents, props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/instrument/.settings/org.eclipse.jdt.ui.prefs   (contents, props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/instrument/META-INF/MANIFEST.MF   (contents, props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/instrument/build.xml   (contents, props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/instrument/make/hyproperties.xml   (contents, props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/instrument/make/patternset.txt   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/instrument/src/main/java/java/lang/instrument/ClassDefinition.java   (contents, props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/instrument/src/main/java/java/lang/instrument/ClassFileTransformer.java   (contents, props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/instrument/src/main/java/java/lang/instrument/IllegalClassFormatException.java   (contents, props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/instrument/src/main/java/java/lang/instrument/Instrumentation.java   (contents, props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/instrument/src/main/java/java/lang/instrument/UnmodifiableClassException.java   (contents, props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/instrument/src/main/java/org/apache/harmony/instrument/internal/InstrumentationImpl.java   (contents, props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/shared/inst_agt.c   (contents, props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/shared/instrument.c   (contents, props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/shared/instrument.h   (contents, props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/instrument/src/test/java/org/apache/harmony/tests/java/lang/instrument/AllTests.java   (contents, props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/instrument/src/test/java/org/apache/harmony/tests/java/lang/instrument/ClassDefinitionTest.java   (contents, props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/instrument/src/test/java/org/apache/harmony/tests/java/lang/instrument/IllegalClassFormatExceptionTest.java   (contents, props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/instrument/src/test/java/org/apache/harmony/tests/java/lang/instrument/InstrumentTest.java   (contents, props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/instrument/src/test/java/org/apache/harmony/tests/java/lang/instrument/TestMain.java   (contents, props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/instrument/src/test/java/org/apache/harmony/tests/java/lang/instrument/UnmodifiableClassExceptionTest.java   (contents, props changed)

Modified: incubator/harmony/enhanced/classlib/trunk/modules/instrument/.classpath
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/instrument/.classpath?view=diff&rev=446488&r1=446487&r2=446488
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/instrument/.classpath (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/instrument/.classpath Thu Sep 14 20:00:01 2006
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry kind="src" path="src/test/resources"/>
-	<classpathentry kind="src" path="src/test/java"/>
-	<classpathentry kind="var" path="JUNIT_HOME/junit.jar"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="src" path="src/test/resources"/>
+	<classpathentry kind="src" path="src/test/java"/>
+	<classpathentry kind="var" path="JUNIT_HOME/junit.jar"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/instrument/.classpath
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/harmony/enhanced/classlib/trunk/modules/instrument/.project
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/instrument/.project?view=diff&rev=446488&r1=446487&r2=446488
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/instrument/.project (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/instrument/.project Thu Sep 14 20:00:01 2006
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>instrument</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>instrument</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/instrument/.project
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/harmony/enhanced/classlib/trunk/modules/instrument/.settings/org.eclipse.jdt.core.prefs
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/instrument/.settings/org.eclipse.jdt.core.prefs?view=diff&rev=446488&r1=446487&r2=446488
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/instrument/.settings/org.eclipse.jdt.core.prefs (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/instrument/.settings/org.eclipse.jdt.core.prefs Thu Sep 14 20:00:01 2006
@@ -1,12 +1,12 @@
-#Mon Aug 28 19:35:19 BST 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+#Mon Aug 28 19:35:19 BST 2006
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/instrument/.settings/org.eclipse.jdt.core.prefs
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/harmony/enhanced/classlib/trunk/modules/instrument/.settings/org.eclipse.jdt.ui.prefs
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/instrument/.settings/org.eclipse.jdt.ui.prefs?view=diff&rev=446488&r1=446487&r2=446488
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/instrument/.settings/org.eclipse.jdt.ui.prefs (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/instrument/.settings/org.eclipse.jdt.ui.prefs Thu Sep 14 20:00:01 2006
@@ -1,3 +1,3 @@
-#Mon Aug 28 19:35:19 BST 2006
-eclipse.preferences.version=1
-internal.default.compliance=default
+#Mon Aug 28 19:35:19 BST 2006
+eclipse.preferences.version=1
+internal.default.compliance=default

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/instrument/.settings/org.eclipse.jdt.ui.prefs
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/harmony/enhanced/classlib/trunk/modules/instrument/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/instrument/META-INF/MANIFEST.MF?view=diff&rev=446488&r1=446487&r2=446488
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/instrument/META-INF/MANIFEST.MF (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/instrument/META-INF/MANIFEST.MF Thu Sep 14 20:00:01 2006
@@ -1,17 +1,17 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Harmony Instrument
-Bundle-SymbolicName: org.apache.harmony.instrument
-Bundle-Version: 1.0.0
-Bundle-ClassPath: .
-Eclipse-JREBundle: true
-Import-Package: java.io;resolution:=optional,
- java.lang,
- java.lang.reflect,
- java.nio,
- java.security,
- java.util,
- org.apache.harmony.kernel.vm,
- org.apache.harmony.testframework.serialization;hy_usage=test;resolution:=optional,
- tests.support;hy_usage=test;resolution:=optional
-Export-Package: java.lang.instrument
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Harmony Instrument
+Bundle-SymbolicName: org.apache.harmony.instrument
+Bundle-Version: 1.0.0
+Bundle-ClassPath: .
+Eclipse-JREBundle: true
+Import-Package: java.io;resolution:=optional,
+ java.lang,
+ java.lang.reflect,
+ java.nio,
+ java.security,
+ java.util,
+ org.apache.harmony.kernel.vm,
+ org.apache.harmony.testframework.serialization;hy_usage=test;resolution:=optional,
+ tests.support;hy_usage=test;resolution:=optional
+Export-Package: java.lang.instrument

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/instrument/META-INF/MANIFEST.MF
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/harmony/enhanced/classlib/trunk/modules/instrument/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/instrument/build.xml?view=diff&rev=446488&r1=446487&r2=446488
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/instrument/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/instrument/build.xml Thu Sep 14 20:00:01 2006
@@ -1,197 +1,197 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Copyright 2006 The Apache Software Foundation or its
-    licensors, as applicable.
-  
-    Licensed 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.
--->
-
-<project name="INSTRUMENT Build" default="build" basedir=".">
-    <description>Build for INSTRUMENT component</description>
-
-    <!-- import common properties -->
-    <import file="${basedir}/../../make/properties.xml" />
-
-    <!-- set global properties for this build. -->
-    <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
-
-    <fileset id="classes" dir="${hy.build}">
-        <includesfile name="${hy.instrument}/make/patternset.txt" />
-        <excludesfile name="${hy.hdk}/build/patternsets/luni-kernel.txt" />
-        <excludesfile name="${hy.hdk}/build/patternsets/security-kernel.txt" />
-    </fileset>
-    
-    <property name="iculib.zip" location="${depends.oss}/icu4c-3.4-harmony.zip" />
-
-    <target name="build" depends="compile.java, copy.resources, build.jar" />
-
-    <target name="test" depends="build, compile.tests, run.tests" />
-    
-    <target name="overlay-oss">
-    <mkdir dir="${hy.instrument.src.main.native}/icu4c/unicode" />
-    <unzip src="${iculib.zip}" dest="${hy.instrument.src.main.native}/icu4c/unicode" />
-    <chmod dir="${hy.instrument.src.main.native}/icu4c/unicode" perm="ugo+r" />
-    </target>
-    
-    <target name="clean-overlay-oss">
-    <delete dir="${hy.instrument.src.main.native}/icu4c" quiet="true" />
-    </target>
-    
-    <!-- Build native code -->
-    <target name="build.native" >
-    <make dir="${hy.instrument.src.main.native}/instrument/${hy.os}" />
-
-    <!-- Copy the built shared libs over to the jre/bin dir -->
-    <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
-        <fileset dir="${hy.instrument.src.main.native}/instrument">
-                <patternset includes="*${shlib.suffix}*" />
-            </fileset>
-        </copy>
-    </target>
-    
-    <!-- Clean natives -->
-    <target name="clean.native">
-    <make dir="${hy.instrument.src.main.native}/instrument/${hy.os}" target="clean" />
-    </target>
-
-    <target name="clean">
-        <delete failonerror="false">
-            <fileset refid="classes" />
-            <fileset dir="${hy.instrument.bin.test}" />
-        </delete>
-    </target>
-
-    <target name="compile.java">
-        <echo message="Compiling INSTRUMENT classes" />
-
-        <mkdir dir="${hy.build}" />
-
-        <javac sourcepath=""
-            srcdir="${hy.instrument.src.main.java}"
-            destdir="${hy.build}"
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.javac.source}" 
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
-
-            <bootclasspath>
-                <fileset dir="${hy.jdk}/jre/lib/boot">
-                    <include name="**/*.jar" />
-                </fileset>
-            </bootclasspath>
-        </javac>
-    </target>
-
-    <target name="copy.resources">
-        <mkdir dir="${hy.build}" />
-        <copy todir="${hy.build}" includeemptydirs="false">
-            <fileset dir="${hy.instrument.src.main.java}">
-                <exclude name="**/*.java" />
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="build.jar" depends="svn-info">
-        <jar destfile="${hy.jdk}/jre/lib/boot/instrument.jar"
-             manifest="${hy.instrument}/META-INF/MANIFEST.MF">
-            <fileset refid="classes" />
-            <manifest>
-                <attribute name="Implementation-Version" value="${svn.info}"/> 
-            </manifest>
-        </jar>
-    </target>
-
-    <target name="compile.tests" depends="copy.test.resources">
-        <echo message="Compiling INSTRUMENT tests" />
-
-        <mkdir dir="${hy.instrument.bin.test}" />
-
-        <javac srcdir="${hy.instrument.src.test.java}"
-            destdir="${hy.instrument.bin.test}"
-            sourcepath=""
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.javac.source}" 
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
-
-            <bootclasspath>
-                <fileset dir="${hy.jdk}/jre/lib/boot">
-                    <include name="**/*.jar" />
-                </fileset>
-            </bootclasspath>
-            <classpath location="${hy.hdk}/build/test/support.jar" />
-        </javac>
-    </target>
-
-    <target name="run.tests">
-
-        <mkdir dir="${hy.tests.reports}" />
-
-        <property name="test.jre.home" value="${hy.jdk}/jre" />
-
-        <junit fork="yes"
-            forkmode="once"
-            printsummary="withOutAndErr"
-            errorproperty="test.errors"
-            failureproperty="test.failures"
-            showoutput="on"
-            dir="${basedir}"
-            jvm="${test.jre.home}/bin/java">
-
-            <env key="JAVA_HOME" value="${test.jre.home}"/>
-
-            <classpath>
-                <pathelement path="${hy.instrument.bin.test}"/>
-            </classpath>
-            <classpath location="${hy.hdk}/build/test/support.jar" />
-
-            <formatter type="xml" />
-
-            <test name="${test.case}" todir="${hy.tests.reports}"
-                  if="test.case" />
-
-            <batchtest todir="${hy.tests.reports}" haltonfailure="no"
-                unless="test.case">
-
-                <fileset dir="${hy.instrument.src.test.java}">
-                    <include name="**/*Test.java" />
-                    <exclude name="org/apache/harmony/tests/java/lang/instrument/InstrumentTest.java" />
-                </fileset>
-            </batchtest>
-        </junit>
-        <antcall target="touch-failures-file" />
-        <antcall target="touch-errors-file" />
-    </target>
-
-    <target name="touch-failures-file" if="test.failures">
-        <echo file="${hy.tests.reports}/test.failures"
-            append="true">instrument${line.separator}</echo>
-    </target>
-
-    <target name="touch-errors-file" if="test.errors">
-        <echo file="${hy.tests.reports}/test.errors"
-            append="true">instrument${line.separator}</echo>
-    </target>
-
-    <target name="copy.test.resources">
-        <mkdir dir="${hy.instrument.bin.test}" />
-        <copy todir="${hy.instrument.bin.test}" includeemptydirs="false">
-            <fileset dir="${hy.instrument.src.test.resources}">
-                <exclude name="**/*.java" />
-            </fileset>
-        </copy>
-    </target>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright 2006 The Apache Software Foundation or its
+    licensors, as applicable.
+  
+    Licensed 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.
+-->
+
+<project name="INSTRUMENT Build" default="build" basedir=".">
+    <description>Build for INSTRUMENT component</description>
+
+    <!-- import common properties -->
+    <import file="${basedir}/../../make/properties.xml" />
+
+    <!-- set global properties for this build. -->
+    <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
+
+    <fileset id="classes" dir="${hy.build}">
+        <includesfile name="${hy.instrument}/make/patternset.txt" />
+        <excludesfile name="${hy.hdk}/build/patternsets/luni-kernel.txt" />
+        <excludesfile name="${hy.hdk}/build/patternsets/security-kernel.txt" />
+    </fileset>
+    
+    <property name="iculib.zip" location="${depends.oss}/icu4c-3.4-harmony.zip" />
+
+    <target name="build" depends="compile.java, copy.resources, build.jar" />
+
+    <target name="test" depends="build, compile.tests, run.tests" />
+    
+    <target name="overlay-oss">
+    <mkdir dir="${hy.instrument.src.main.native}/icu4c/unicode" />
+    <unzip src="${iculib.zip}" dest="${hy.instrument.src.main.native}/icu4c/unicode" />
+    <chmod dir="${hy.instrument.src.main.native}/icu4c/unicode" perm="ugo+r" />
+    </target>
+    
+    <target name="clean-overlay-oss">
+    <delete dir="${hy.instrument.src.main.native}/icu4c" quiet="true" />
+    </target>
+    
+    <!-- Build native code -->
+    <target name="build.native" >
+    <make dir="${hy.instrument.src.main.native}/instrument/${hy.os}" />
+
+    <!-- Copy the built shared libs over to the jre/bin dir -->
+    <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
+        <fileset dir="${hy.instrument.src.main.native}/instrument">
+                <patternset includes="*${shlib.suffix}*" />
+            </fileset>
+        </copy>
+    </target>
+    
+    <!-- Clean natives -->
+    <target name="clean.native">
+    <make dir="${hy.instrument.src.main.native}/instrument/${hy.os}" target="clean" />
+    </target>
+
+    <target name="clean">
+        <delete failonerror="false">
+            <fileset refid="classes" />
+            <fileset dir="${hy.instrument.bin.test}" />
+        </delete>
+    </target>
+
+    <target name="compile.java">
+        <echo message="Compiling INSTRUMENT classes" />
+
+        <mkdir dir="${hy.build}" />
+
+        <javac sourcepath=""
+            srcdir="${hy.instrument.src.main.java}"
+            destdir="${hy.build}"
+               compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               source="${hy.javac.source}" 
+               target="${hy.javac.target}"
+               debug="${hy.javac.debug}">
+
+            <bootclasspath>
+                <fileset dir="${hy.jdk}/jre/lib/boot">
+                    <include name="**/*.jar" />
+                </fileset>
+            </bootclasspath>
+        </javac>
+    </target>
+
+    <target name="copy.resources">
+        <mkdir dir="${hy.build}" />
+        <copy todir="${hy.build}" includeemptydirs="false">
+            <fileset dir="${hy.instrument.src.main.java}">
+                <exclude name="**/*.java" />
+            </fileset>
+        </copy>
+    </target>
+
+    <target name="build.jar" depends="svn-info">
+        <jar destfile="${hy.jdk}/jre/lib/boot/instrument.jar"
+             manifest="${hy.instrument}/META-INF/MANIFEST.MF">
+            <fileset refid="classes" />
+            <manifest>
+                <attribute name="Implementation-Version" value="${svn.info}"/> 
+            </manifest>
+        </jar>
+    </target>
+
+    <target name="compile.tests" depends="copy.test.resources">
+        <echo message="Compiling INSTRUMENT tests" />
+
+        <mkdir dir="${hy.instrument.bin.test}" />
+
+        <javac srcdir="${hy.instrument.src.test.java}"
+            destdir="${hy.instrument.bin.test}"
+            sourcepath=""
+               compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               source="${hy.javac.source}" 
+               target="${hy.javac.target}"
+               debug="${hy.javac.debug}">
+
+            <bootclasspath>
+                <fileset dir="${hy.jdk}/jre/lib/boot">
+                    <include name="**/*.jar" />
+                </fileset>
+            </bootclasspath>
+            <classpath location="${hy.hdk}/build/test/support.jar" />
+        </javac>
+    </target>
+
+    <target name="run.tests">
+
+        <mkdir dir="${hy.tests.reports}" />
+
+        <property name="test.jre.home" value="${hy.jdk}/jre" />
+
+        <junit fork="yes"
+            forkmode="once"
+            printsummary="withOutAndErr"
+            errorproperty="test.errors"
+            failureproperty="test.failures"
+            showoutput="on"
+            dir="${basedir}"
+            jvm="${test.jre.home}/bin/java">
+
+            <env key="JAVA_HOME" value="${test.jre.home}"/>
+
+            <classpath>
+                <pathelement path="${hy.instrument.bin.test}"/>
+            </classpath>
+            <classpath location="${hy.hdk}/build/test/support.jar" />
+
+            <formatter type="xml" />
+
+            <test name="${test.case}" todir="${hy.tests.reports}"
+                  if="test.case" />
+
+            <batchtest todir="${hy.tests.reports}" haltonfailure="no"
+                unless="test.case">
+
+                <fileset dir="${hy.instrument.src.test.java}">
+                    <include name="**/*Test.java" />
+                    <exclude name="org/apache/harmony/tests/java/lang/instrument/InstrumentTest.java" />
+                </fileset>
+            </batchtest>
+        </junit>
+        <antcall target="touch-failures-file" />
+        <antcall target="touch-errors-file" />
+    </target>
+
+    <target name="touch-failures-file" if="test.failures">
+        <echo file="${hy.tests.reports}/test.failures"
+            append="true">instrument${line.separator}</echo>
+    </target>
+
+    <target name="touch-errors-file" if="test.errors">
+        <echo file="${hy.tests.reports}/test.errors"
+            append="true">instrument${line.separator}</echo>
+    </target>
+
+    <target name="copy.test.resources">
+        <mkdir dir="${hy.instrument.bin.test}" />
+        <copy todir="${hy.instrument.bin.test}" includeemptydirs="false">
+            <fileset dir="${hy.instrument.src.test.resources}">
+                <exclude name="**/*.java" />
+            </fileset>
+        </copy>
+    </target>
+
+</project>

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/instrument/build.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/harmony/enhanced/classlib/trunk/modules/instrument/make/hyproperties.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/instrument/make/hyproperties.xml?view=diff&rev=446488&r1=446487&r2=446488
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/instrument/make/hyproperties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/instrument/make/hyproperties.xml Thu Sep 14 20:00:01 2006
@@ -1,47 +1,47 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Copyright 2006 The Apache Software Foundation or its licensors, as applicable.
-  
-    Licensed 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.
--->
-
-<hy>
-   <instrument location=".">
-      <src>
-         <main>
-            <java location="src/main/java" />
-            <resources location="src/main/resources" />
-            <native location="src/main/native" />
-         </main>
-         <test>
-            <java location="src/test/java" />
-            <resources location="src/test/resources" />
-         </test>
-         <natives location="src/natives" />
-      </src>
-      <bin>
-        <main location="bin/main" />
-        <test location="bin/test" />
-      </bin>
-      <packaging>
-      </packaging>
-   </instrument>
-
-   <hdk location="../../deploy" />
-   <jdk location="../../deploy/jdk" />
-   <build location="../../build/classes" />
-
-   <tests>
-      <reports location="../../build/test_report" />
-   </tests>
-</hy>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright 2006 The Apache Software Foundation or its licensors, as applicable.
+  
+    Licensed 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.
+-->
+
+<hy>
+   <instrument location=".">
+      <src>
+         <main>
+            <java location="src/main/java" />
+            <resources location="src/main/resources" />
+            <native location="src/main/native" />
+         </main>
+         <test>
+            <java location="src/test/java" />
+            <resources location="src/test/resources" />
+         </test>
+         <natives location="src/natives" />
+      </src>
+      <bin>
+        <main location="bin/main" />
+        <test location="bin/test" />
+      </bin>
+      <packaging>
+      </packaging>
+   </instrument>
+
+   <hdk location="../../deploy" />
+   <jdk location="../../deploy/jdk" />
+   <build location="../../build/classes" />
+
+   <tests>
+      <reports location="../../build/test_report" />
+   </tests>
+</hy>

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/instrument/make/hyproperties.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/instrument/make/patternset.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/harmony/enhanced/classlib/trunk/modules/instrument/src/main/java/java/lang/instrument/ClassDefinition.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/instrument/src/main/java/java/lang/instrument/ClassDefinition.java?view=diff&rev=446488&r1=446487&r2=446488
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/instrument/src/main/java/java/lang/instrument/ClassDefinition.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/instrument/src/main/java/java/lang/instrument/ClassDefinition.java Thu Sep 14 20:00:01 2006
@@ -1,80 +1,80 @@
-/* Copyright 2006 The Apache Software Foundation or its licensors, as applicable
- * 
- * Licensed 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.
- */
-
-package java.lang.instrument;
-
-import org.apache.harmony.instrument.internal.nls.Messages;
-
-/**
- * Wraps a {@link java.lang.Class} that is to be redefined together with the
- * byte array which constitutes the updated version of the class.
- * 
- */
-public final class ClassDefinition {
-
-    /**
-     * The <code>Class</code> object for the class that will be instrumented.
-     */
-    private Class<?> definitionClass;
-
-    /**
-     * The new version of the class file bytes for the class being instrumented.
-     */
-    private byte[] definitionClassFile;
-
-    /**
-     * Constructs a new instance of <code>ClassDefinition</code> with the
-     * supplied {@link Class} object and byte array representing the new class
-     * file bytes.
-     * 
-     * @param theClass
-     *            the <code>Class</code> object for the class to be redefined
-     * @param theClassFile
-     *            an array of bytes containing the updated version of the class
-     *            to be redefined.
-     * @throws NullPointerException
-     *             if either <code>theClass</code> or
-     *             <code>theClassFile</code> are <code>null</code>.
-     */
-    public ClassDefinition(Class<?> theClass, byte[] theClassFile) {
-        if (theClass == null) {
-            throw new NullPointerException(Messages.getString("instrument.1")); //$NON-NLS-1$
-        }
-        if (theClassFile == null) {
-            throw new NullPointerException(Messages.getString("instrument.2")); //$NON-NLS-1$
-        }
-        this.definitionClass = theClass;
-        this.definitionClassFile = theClassFile;
-    }
-
-    /**
-     * Returns the {@link Class} object for the class to be redefined.
-     * 
-     * @return the <code>Class</code> object
-     */
-    public Class<?> getDefinitionClass() {
-        return this.definitionClass;
-    }
-
-    /**
-     * Returns a reference to the byte array containing the re-engineered
-     * version of the class.
-     * 
-     * @return byte array containing the new version of the class
-     */
-    public byte[] getDefinitionClassFile() {
-        return this.definitionClassFile;
-    }
-}
+/* Copyright 2006 The Apache Software Foundation or its licensors, as applicable
+ * 
+ * Licensed 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.
+ */
+
+package java.lang.instrument;
+
+import org.apache.harmony.instrument.internal.nls.Messages;
+
+/**
+ * Wraps a {@link java.lang.Class} that is to be redefined together with the
+ * byte array which constitutes the updated version of the class.
+ * 
+ */
+public final class ClassDefinition {
+
+    /**
+     * The <code>Class</code> object for the class that will be instrumented.
+     */
+    private Class<?> definitionClass;
+
+    /**
+     * The new version of the class file bytes for the class being instrumented.
+     */
+    private byte[] definitionClassFile;
+
+    /**
+     * Constructs a new instance of <code>ClassDefinition</code> with the
+     * supplied {@link Class} object and byte array representing the new class
+     * file bytes.
+     * 
+     * @param theClass
+     *            the <code>Class</code> object for the class to be redefined
+     * @param theClassFile
+     *            an array of bytes containing the updated version of the class
+     *            to be redefined.
+     * @throws NullPointerException
+     *             if either <code>theClass</code> or
+     *             <code>theClassFile</code> are <code>null</code>.
+     */
+    public ClassDefinition(Class<?> theClass, byte[] theClassFile) {
+        if (theClass == null) {
+            throw new NullPointerException(Messages.getString("instrument.1")); //$NON-NLS-1$
+        }
+        if (theClassFile == null) {
+            throw new NullPointerException(Messages.getString("instrument.2")); //$NON-NLS-1$
+        }
+        this.definitionClass = theClass;
+        this.definitionClassFile = theClassFile;
+    }
+
+    /**
+     * Returns the {@link Class} object for the class to be redefined.
+     * 
+     * @return the <code>Class</code> object
+     */
+    public Class<?> getDefinitionClass() {
+        return this.definitionClass;
+    }
+
+    /**
+     * Returns a reference to the byte array containing the re-engineered
+     * version of the class.
+     * 
+     * @return byte array containing the new version of the class
+     */
+    public byte[] getDefinitionClassFile() {
+        return this.definitionClassFile;
+    }
+}

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/instrument/src/main/java/java/lang/instrument/ClassDefinition.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/harmony/enhanced/classlib/trunk/modules/instrument/src/main/java/java/lang/instrument/ClassFileTransformer.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/instrument/src/main/java/java/lang/instrument/ClassFileTransformer.java?view=diff&rev=446488&r1=446487&r2=446488
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/instrument/src/main/java/java/lang/instrument/ClassFileTransformer.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/instrument/src/main/java/java/lang/instrument/ClassFileTransformer.java Thu Sep 14 20:00:01 2006
@@ -1,100 +1,100 @@
-/* Copyright 2006 The Apache Software Foundation or its licensors, as applicable
- * 
- * Licensed 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.
- */
-
-package java.lang.instrument;
-
-import java.security.ProtectionDomain;
-
-/**
- * This interface must be implemented by types used to instrument classes as
- * they are loaded by a running VM. Implementations are registered by agents in
- * the {@link java.lang.instrument.Instrumentation#addTransformer} operation.
- * Once registered, a <code>ClassFileTransformer</code> has the opportunity to
- * instrument every class that is loaded or redefined by the VM provided that
- * the transformer does not have a dependency on that class.
- * <p>
- * Transformations of classes takes place just prior to them being defined by
- * the VM.
- * </p>
- * 
- */
-public interface ClassFileTransformer {
-
-    /**
-     * Receives a <code>byte</code> array containing the raw contents of a
-     * class for <i>possible</i> transformation into a new <code>byte</code>
-     * array which gets returned to the caller. It is left up to the
-     * implementation to decide what, if any, transformations are carried out
-     * and returned.
-     * <p>
-     * Requests for class transformations can occur in two situations.
-     * <ul>
-     * <li>the attempted defining of a class using
-     * {@link ClassLoader#defineClass(java.lang.String, byte[], int, int)}
-     * <li>the attempted re-defining of a previously defined class using
-     * {@link Instrumentation#redefineClasses(ClassDefinition[])}
-     * </ul>
-     * In both cases this operation will be called before the verification of
-     * the specified bytes in the <code>Class</code> file format. Each
-     * registered <code>ClassFileTransformer</code> instance will have this
-     * operation called on it. The order of the invocations matches the order in
-     * which the transformers were registered using the method
-     * {@link Instrumentation#addTransformer(ClassFileTransformer)}.
-     * </p>
-     * <p>
-     * Provided that the implementation of this method wishes to carry out a
-     * transformation, the return is a newly allocated <code>byte</code> array
-     * which contains <i>a copy of</i> the <code>classfileBuffer</code>
-     * argument plus the transformations to the array specific to the method
-     * implementation. If the transformer is written so as to pass on the
-     * opportunity to modify a given input then the return value should be
-     * <code>null</code>.
-     * </p>
-     * 
-     * @param loader
-     *            the <i>defining</i> <code>ClassLoader</code> for the
-     *            candidate class to be transformed.
-     * @param className
-     *            the fully qualified name of the candidate class to be
-     *            transformed in the <i>fully/qualified/Name</i> format.
-     * @param classBeingRedefined
-     *            if a class redefinition is in process then this argument will
-     *            be the <code>Class</code> object for the class. Otherwise,
-     *            if a class definition is in process, a <code>null</code>.
-     * @param protectionDomain
-     *            the security protection domain for the class being defined or
-     *            redefined.
-     * @param classfileBuffer
-     *            a <code>byte</code> array containing the class to be
-     *            transformed in <code>Class</code> file format.
-     *            <em>This argument
-     *            must not be modified</em>.
-     * @return if transformation occurs, a newly allocated <code>byte</code>
-     *         array containing the modified version of
-     *         <code>classfileBuffer</code>, otherwise <code>null</code>.
-     * @throws IllegalClassFormatException
-     *             if the <code>classfileBuffer</code> does not contain a
-     *             well-formed representation of a class in the
-     *             <code>Class</code> file format. Note that if an invocation
-     *             of this operation ends on an exception throw then (a) the
-     *             remaining transformers in the &quot;chain&quot; will still
-     *             have this method called, and (b) the class definition or
-     *             redefinition that was the catalyst for the transformation
-     *             opportunities will still be attempted.
-     */
-    public byte[] transform(ClassLoader loader, String className,
-            Class<?> classBeingRedefined, ProtectionDomain protectionDomain,
-            byte[] classfileBuffer) throws IllegalClassFormatException;
-}
+/* Copyright 2006 The Apache Software Foundation or its licensors, as applicable
+ * 
+ * Licensed 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.
+ */
+
+package java.lang.instrument;
+
+import java.security.ProtectionDomain;
+
+/**
+ * This interface must be implemented by types used to instrument classes as
+ * they are loaded by a running VM. Implementations are registered by agents in
+ * the {@link java.lang.instrument.Instrumentation#addTransformer} operation.
+ * Once registered, a <code>ClassFileTransformer</code> has the opportunity to
+ * instrument every class that is loaded or redefined by the VM provided that
+ * the transformer does not have a dependency on that class.
+ * <p>
+ * Transformations of classes takes place just prior to them being defined by
+ * the VM.
+ * </p>
+ * 
+ */
+public interface ClassFileTransformer {
+
+    /**
+     * Receives a <code>byte</code> array containing the raw contents of a
+     * class for <i>possible</i> transformation into a new <code>byte</code>
+     * array which gets returned to the caller. It is left up to the
+     * implementation to decide what, if any, transformations are carried out
+     * and returned.
+     * <p>
+     * Requests for class transformations can occur in two situations.
+     * <ul>
+     * <li>the attempted defining of a class using
+     * {@link ClassLoader#defineClass(java.lang.String, byte[], int, int)}
+     * <li>the attempted re-defining of a previously defined class using
+     * {@link Instrumentation#redefineClasses(ClassDefinition[])}
+     * </ul>
+     * In both cases this operation will be called before the verification of
+     * the specified bytes in the <code>Class</code> file format. Each
+     * registered <code>ClassFileTransformer</code> instance will have this
+     * operation called on it. The order of the invocations matches the order in
+     * which the transformers were registered using the method
+     * {@link Instrumentation#addTransformer(ClassFileTransformer)}.
+     * </p>
+     * <p>
+     * Provided that the implementation of this method wishes to carry out a
+     * transformation, the return is a newly allocated <code>byte</code> array
+     * which contains <i>a copy of</i> the <code>classfileBuffer</code>
+     * argument plus the transformations to the array specific to the method
+     * implementation. If the transformer is written so as to pass on the
+     * opportunity to modify a given input then the return value should be
+     * <code>null</code>.
+     * </p>
+     * 
+     * @param loader
+     *            the <i>defining</i> <code>ClassLoader</code> for the
+     *            candidate class to be transformed.
+     * @param className
+     *            the fully qualified name of the candidate class to be
+     *            transformed in the <i>fully/qualified/Name</i> format.
+     * @param classBeingRedefined
+     *            if a class redefinition is in process then this argument will
+     *            be the <code>Class</code> object for the class. Otherwise,
+     *            if a class definition is in process, a <code>null</code>.
+     * @param protectionDomain
+     *            the security protection domain for the class being defined or
+     *            redefined.
+     * @param classfileBuffer
+     *            a <code>byte</code> array containing the class to be
+     *            transformed in <code>Class</code> file format.
+     *            <em>This argument
+     *            must not be modified</em>.
+     * @return if transformation occurs, a newly allocated <code>byte</code>
+     *         array containing the modified version of
+     *         <code>classfileBuffer</code>, otherwise <code>null</code>.
+     * @throws IllegalClassFormatException
+     *             if the <code>classfileBuffer</code> does not contain a
+     *             well-formed representation of a class in the
+     *             <code>Class</code> file format. Note that if an invocation
+     *             of this operation ends on an exception throw then (a) the
+     *             remaining transformers in the &quot;chain&quot; will still
+     *             have this method called, and (b) the class definition or
+     *             redefinition that was the catalyst for the transformation
+     *             opportunities will still be attempted.
+     */
+    public byte[] transform(ClassLoader loader, String className,
+            Class<?> classBeingRedefined, ProtectionDomain protectionDomain,
+            byte[] classfileBuffer) throws IllegalClassFormatException;
+}

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/instrument/src/main/java/java/lang/instrument/ClassFileTransformer.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/harmony/enhanced/classlib/trunk/modules/instrument/src/main/java/java/lang/instrument/IllegalClassFormatException.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/instrument/src/main/java/java/lang/instrument/IllegalClassFormatException.java?view=diff&rev=446488&r1=446487&r2=446488
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/instrument/src/main/java/java/lang/instrument/IllegalClassFormatException.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/instrument/src/main/java/java/lang/instrument/IllegalClassFormatException.java Thu Sep 14 20:00:01 2006
@@ -1,48 +1,48 @@
-/* Copyright 2006 The Apache Software Foundation or its licensors, as applicable
- * 
- * Licensed 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.
- */
-
-package java.lang.instrument;
-
-/**
- * This exception may be thrown from implementations of the method
- * {@link java.lang.instrument.ClassFileTransformer#transform} when the class
- * file bytes supplied to it are found to be corrupted or otherwise in a format
- * which does not adhere to the expected Java class file format.
- * 
- */
-public class IllegalClassFormatException extends Exception {
-
-    private static final long serialVersionUID = -3841736710924794009L;
-
-    /**
-     * Constructs a new instance of <code>IllegalClassFormatException</code>
-     * with no explanatory message.
-     */
-    public IllegalClassFormatException() {
-        super();
-    }
-
-    /**
-     * Constructs a new instance of <code>IllegalClassFormatException</code>
-     * with the supplied message, <code>s</code>, for explanation.
-     * 
-     * @param s
-     *            a string containing information on why the exception is being
-     *            created.
-     */
-    public IllegalClassFormatException(String s) {
-        super(s);
-    }
+/* Copyright 2006 The Apache Software Foundation or its licensors, as applicable
+ * 
+ * Licensed 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.
+ */
+
+package java.lang.instrument;
+
+/**
+ * This exception may be thrown from implementations of the method
+ * {@link java.lang.instrument.ClassFileTransformer#transform} when the class
+ * file bytes supplied to it are found to be corrupted or otherwise in a format
+ * which does not adhere to the expected Java class file format.
+ * 
+ */
+public class IllegalClassFormatException extends Exception {
+
+    private static final long serialVersionUID = -3841736710924794009L;
+
+    /**
+     * Constructs a new instance of <code>IllegalClassFormatException</code>
+     * with no explanatory message.
+     */
+    public IllegalClassFormatException() {
+        super();
+    }
+
+    /**
+     * Constructs a new instance of <code>IllegalClassFormatException</code>
+     * with the supplied message, <code>s</code>, for explanation.
+     * 
+     * @param s
+     *            a string containing information on why the exception is being
+     *            created.
+     */
+    public IllegalClassFormatException(String s) {
+        super(s);
+    }
 }

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/instrument/src/main/java/java/lang/instrument/IllegalClassFormatException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/harmony/enhanced/classlib/trunk/modules/instrument/src/main/java/java/lang/instrument/Instrumentation.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/instrument/src/main/java/java/lang/instrument/Instrumentation.java?view=diff&rev=446488&r1=446487&r2=446488
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/instrument/src/main/java/java/lang/instrument/Instrumentation.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/instrument/src/main/java/java/lang/instrument/Instrumentation.java Thu Sep 14 20:00:01 2006
@@ -1,193 +1,193 @@
-/* Copyright 2006 The Apache Software Foundation or its licensors, as applicable
- * 
- * Licensed 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.
- */
-
-package java.lang.instrument;
-
-/**
- * Instances of this interface may be used by Java instrumentation agent code
- * for support in carrying out the runtime instrumentation of classes. Using
- * such an approach, classes may be enhanced with services such as profiling,
- * logging or tracing which were not included in the source of the original
- * class.
- * <p>
- * A concrete instance of this interface is made available as an input argument
- * to all Java instrumentation agents'
- * <code>premain(String agentArgs, Instrumentation inst)</code> method.
- * </p>
- * 
- */
-public interface Instrumentation {
-
-    /**
-     * Registers the supplied <code>transformer</code> argument with the VM.
-     * Any classes that are to be defined or re-defined (if supported) in the VM
-     * will then be offered to the transformer for it to carry out any byte code
-     * modifications. The exception to this scheme is if the class to be defined /
-     * re-defined is a dependency of the transformer.
-     * <p>
-     * This operation can be carried out multiple times on a concrete
-     * <code>Instrumentation</code>. The order of registration is important
-     * as it defines the order in which the transformers' transformation
-     * operation gets called.
-     * <p>
-     * <p>
-     * It is possible for any given instance of
-     * <code>ClassFileTransformer</code> to be registered more than once with
-     * this operation.
-     * 
-     * @param transformer
-     *            a class file transformer
-     * @throws NullPointerException
-     *             if <code>transformer</code> is <code>null</code>.
-     */
-    public void addTransformer(ClassFileTransformer transformer);
-
-    /**
-     * Returns an array of all of the classes that have been loaded into the VM.
-     * 
-     * @return an array of <code>Class</code> objects with each element
-     *         identifying a class that has been loaded into the VM.
-     */
-    public Class[] getAllLoadedClasses();
-
-    /**
-     * Returns an array of all of the classes for which <code>loader</code> is
-     * the <i>initiating</i> class loader.
-     * 
-     * @param loader
-     *            a class loader. In order to obtain the array of classes
-     *            initiated by the bootstrap class loader this argument should
-     *            be <code>null</code>.
-     * @return an array of <code>Class</code> objects with each element
-     *         identifying a class that has been initiated by the specified
-     *         class loader.
-     */
-    public Class[] getInitiatedClasses(ClassLoader loader);
-
-    /**
-     * Returns the number of bytes in memory required by this VM for the
-     * supplied object <code>objectToSize</code>. The returned value should
-     * be taken as an estimation only which is susceptible to change between
-     * separate launches of the VM.
-     * 
-     * @param objectToSize
-     *            any object
-     * @return an approximation of the number of bytes in memory taken up by
-     *         <code>objectToSize</code>.
-     * @throws NullPointerException
-     *             if the given object is null.
-     */
-    public long getObjectSize(Object objectToSize);
-
-    /**
-     * Returns a boolean indication of whether or not this VM supports the
-     * on-the-fly redefining of classes that have been already loaded.
-     * 
-     * @return <code>true</code> if class redefining is supported, otherwise
-     *         <code>false</code>.
-     */
-    public boolean isRedefineClassesSupported();
-
-    /**
-     * Receives an array of {@link ClassDefinition} instances and attempts to
-     * carry out on-the-fly redefining on each of the associated classes.
-     * Redefining in this manner may be used to update the following parts of an
-     * already loaded class:
-     * <ul>
-     * <li>attributes
-     * <li>constant pool
-     * <li>method implementations
-     * </ul>
-     * If any invocations of a redefined method are already active in the VM
-     * when this call is made then they will run to completion and be unaffected
-     * by the outcome of this method. Provided the method redefinition is
-     * successful, all subsequent calls on the method will run the new version.
-     * <br>
-     * Redefining a class may <em>not</em> be used to make changes to any
-     * other aspects of a previously loaded class such as its inheritance
-     * hierarchy, the names or signatures of any of its methods, the names of
-     * any fields, the values of any static variables etc.
-     * <p>
-     * If a class associated with a <code>ClassDefinition</code> is
-     * successfully redefined then there will be no resulting re-run of any of
-     * its initialization code. Similarly, any instances of the class that were
-     * created before the redefining will not be changed in any way. That is,
-     * they will remain in the VM as instances of the previous version of the
-     * class.
-     * </p>
-     * <p>
-     * Note that before the requested redefinitions are attempted, each
-     * {@link ClassFileTransformer} registered with the VM will be given the
-     * opportunity to carry out their own custom transformations of the new
-     * version of the class.
-     * </p>
-     * 
-     * @param definitions
-     *            an array of <code>ClassDefinition</code> objects wrapping
-     *            the details of the classes to be redefined. A zero-length
-     *            array value will not cause an error but, instead, will
-     *            silently do nothing.
-     * @throws ClassNotFoundException
-     *             if any of the classes specified in the contents of
-     *             <code>definitions</code> cannot be located.
-     * @throws UnmodifiableClassException
-     *             if any of the classes specified in the contents of
-     *             <code>definitions</code> cannot be modified.
-     * @throws UnsupportedOperationException
-     *             if this method is not supported in by the VM. May be checked
-     *             in advance by calling {@link #isRedefineClassesSupported()}.
-     * @throws ClassFormatError
-     *             if any of the <code>definitions</code> elements has been
-     *             created with a <code>byte</code> array containing a badly
-     *             formed class file.
-     * @throws NoClassDefFoundError
-     *             if there is disagreement between the name of a class to be
-     *             redefined and the name of the class from the corresponding
-     *             class file format byte array.
-     * @throws UnsupportedClassVersionError
-     *             if the version of any of the classes to be redefined is not
-     *             supported by the VM.
-     * @throws ClassCircularityError
-     *             if a circular dependency is detected among the classes to be
-     *             redefined.
-     * @throws LinkageError
-     *             if a linkage error situation is detected such that there is
-     *             an incompatability between dependent classes.
-     * @throws NullPointerException
-     *             if <code>definitions</code> or any of its elements are
-     *             found to be <code>null</code>.
-     * @see #isRedefineClassesSupported()
-     */
-    public void redefineClasses(ClassDefinition[] definitions)
-            throws ClassNotFoundException, UnmodifiableClassException;
-
-    /**
-     * Removes <i>the most recently added instance of</i> the
-     * <code>ClassFileTransformer</code> object from the VM's list of
-     * registered transformers. After this call completes, the specified
-     * <code>ClassFileTransformer</code> object will no longer have its
-     * <code>transform()<code> method automatically invoked when class definitions or
-     * redefinitions are attempted. 
-     * 
-     * @param transformer
-     *            a previously registered <code>ClassFileTransformer</code>.
-     * @return <code>true</code> if <code>transformer</code> was located in
-     *         the list of registered transformers and successfully removed.
-     *         Otherwise, <code>false</code>.
-     * @throws NullPointerException
-     *            if <code>transformer</code> is <code>null</code>.
-     */
-    public boolean removeTransformer(ClassFileTransformer transformer);
-}
+/* Copyright 2006 The Apache Software Foundation or its licensors, as applicable
+ * 
+ * Licensed 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.
+ */
+
+package java.lang.instrument;
+
+/**
+ * Instances of this interface may be used by Java instrumentation agent code
+ * for support in carrying out the runtime instrumentation of classes. Using
+ * such an approach, classes may be enhanced with services such as profiling,
+ * logging or tracing which were not included in the source of the original
+ * class.
+ * <p>
+ * A concrete instance of this interface is made available as an input argument
+ * to all Java instrumentation agents'
+ * <code>premain(String agentArgs, Instrumentation inst)</code> method.
+ * </p>
+ * 
+ */
+public interface Instrumentation {
+
+    /**
+     * Registers the supplied <code>transformer</code> argument with the VM.
+     * Any classes that are to be defined or re-defined (if supported) in the VM
+     * will then be offered to the transformer for it to carry out any byte code
+     * modifications. The exception to this scheme is if the class to be defined /
+     * re-defined is a dependency of the transformer.
+     * <p>
+     * This operation can be carried out multiple times on a concrete
+     * <code>Instrumentation</code>. The order of registration is important
+     * as it defines the order in which the transformers' transformation
+     * operation gets called.
+     * <p>
+     * <p>
+     * It is possible for any given instance of
+     * <code>ClassFileTransformer</code> to be registered more than once with
+     * this operation.
+     * 
+     * @param transformer
+     *            a class file transformer
+     * @throws NullPointerException
+     *             if <code>transformer</code> is <code>null</code>.
+     */
+    public void addTransformer(ClassFileTransformer transformer);
+
+    /**
+     * Returns an array of all of the classes that have been loaded into the VM.
+     * 
+     * @return an array of <code>Class</code> objects with each element
+     *         identifying a class that has been loaded into the VM.
+     */
+    public Class[] getAllLoadedClasses();
+
+    /**
+     * Returns an array of all of the classes for which <code>loader</code> is
+     * the <i>initiating</i> class loader.
+     * 
+     * @param loader
+     *            a class loader. In order to obtain the array of classes
+     *            initiated by the bootstrap class loader this argument should
+     *            be <code>null</code>.
+     * @return an array of <code>Class</code> objects with each element
+     *         identifying a class that has been initiated by the specified
+     *         class loader.
+     */
+    public Class[] getInitiatedClasses(ClassLoader loader);
+
+    /**
+     * Returns the number of bytes in memory required by this VM for the
+     * supplied object <code>objectToSize</code>. The returned value should
+     * be taken as an estimation only which is susceptible to change between
+     * separate launches of the VM.
+     * 
+     * @param objectToSize
+     *            any object
+     * @return an approximation of the number of bytes in memory taken up by
+     *         <code>objectToSize</code>.
+     * @throws NullPointerException
+     *             if the given object is null.
+     */
+    public long getObjectSize(Object objectToSize);
+
+    /**
+     * Returns a boolean indication of whether or not this VM supports the
+     * on-the-fly redefining of classes that have been already loaded.
+     * 
+     * @return <code>true</code> if class redefining is supported, otherwise
+     *         <code>false</code>.
+     */
+    public boolean isRedefineClassesSupported();
+
+    /**
+     * Receives an array of {@link ClassDefinition} instances and attempts to
+     * carry out on-the-fly redefining on each of the associated classes.
+     * Redefining in this manner may be used to update the following parts of an
+     * already loaded class:
+     * <ul>
+     * <li>attributes
+     * <li>constant pool
+     * <li>method implementations
+     * </ul>
+     * If any invocations of a redefined method are already active in the VM
+     * when this call is made then they will run to completion and be unaffected
+     * by the outcome of this method. Provided the method redefinition is
+     * successful, all subsequent calls on the method will run the new version.
+     * <br>
+     * Redefining a class may <em>not</em> be used to make changes to any
+     * other aspects of a previously loaded class such as its inheritance
+     * hierarchy, the names or signatures of any of its methods, the names of
+     * any fields, the values of any static variables etc.
+     * <p>
+     * If a class associated with a <code>ClassDefinition</code> is
+     * successfully redefined then there will be no resulting re-run of any of
+     * its initialization code. Similarly, any instances of the class that were
+     * created before the redefining will not be changed in any way. That is,
+     * they will remain in the VM as instances of the previous version of the
+     * class.
+     * </p>
+     * <p>
+     * Note that before the requested redefinitions are attempted, each
+     * {@link ClassFileTransformer} registered with the VM will be given the
+     * opportunity to carry out their own custom transformations of the new
+     * version of the class.
+     * </p>
+     * 
+     * @param definitions
+     *            an array of <code>ClassDefinition</code> objects wrapping
+     *            the details of the classes to be redefined. A zero-length
+     *            array value will not cause an error but, instead, will
+     *            silently do nothing.
+     * @throws ClassNotFoundException
+     *             if any of the classes specified in the contents of
+     *             <code>definitions</code> cannot be located.
+     * @throws UnmodifiableClassException
+     *             if any of the classes specified in the contents of
+     *             <code>definitions</code> cannot be modified.
+     * @throws UnsupportedOperationException
+     *             if this method is not supported in by the VM. May be checked
+     *             in advance by calling {@link #isRedefineClassesSupported()}.
+     * @throws ClassFormatError
+     *             if any of the <code>definitions</code> elements has been
+     *             created with a <code>byte</code> array containing a badly
+     *             formed class file.
+     * @throws NoClassDefFoundError
+     *             if there is disagreement between the name of a class to be
+     *             redefined and the name of the class from the corresponding
+     *             class file format byte array.
+     * @throws UnsupportedClassVersionError
+     *             if the version of any of the classes to be redefined is not
+     *             supported by the VM.
+     * @throws ClassCircularityError
+     *             if a circular dependency is detected among the classes to be
+     *             redefined.
+     * @throws LinkageError
+     *             if a linkage error situation is detected such that there is
+     *             an incompatability between dependent classes.
+     * @throws NullPointerException
+     *             if <code>definitions</code> or any of its elements are
+     *             found to be <code>null</code>.
+     * @see #isRedefineClassesSupported()
+     */
+    public void redefineClasses(ClassDefinition[] definitions)
+            throws ClassNotFoundException, UnmodifiableClassException;
+
+    /**
+     * Removes <i>the most recently added instance of</i> the
+     * <code>ClassFileTransformer</code> object from the VM's list of
+     * registered transformers. After this call completes, the specified
+     * <code>ClassFileTransformer</code> object will no longer have its
+     * <code>transform()<code> method automatically invoked when class definitions or
+     * redefinitions are attempted. 
+     * 
+     * @param transformer
+     *            a previously registered <code>ClassFileTransformer</code>.
+     * @return <code>true</code> if <code>transformer</code> was located in
+     *         the list of registered transformers and successfully removed.
+     *         Otherwise, <code>false</code>.
+     * @throws NullPointerException
+     *            if <code>transformer</code> is <code>null</code>.
+     */
+    public boolean removeTransformer(ClassFileTransformer transformer);
+}

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/instrument/src/main/java/java/lang/instrument/Instrumentation.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/harmony/enhanced/classlib/trunk/modules/instrument/src/main/java/java/lang/instrument/UnmodifiableClassException.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/instrument/src/main/java/java/lang/instrument/UnmodifiableClassException.java?view=diff&rev=446488&r1=446487&r2=446488
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/instrument/src/main/java/java/lang/instrument/UnmodifiableClassException.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/instrument/src/main/java/java/lang/instrument/UnmodifiableClassException.java Thu Sep 14 20:00:01 2006
@@ -1,49 +1,49 @@
-/* Copyright 2006 The Apache Software Foundation or its licensors, as applicable
- * 
- * Licensed 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.
- */
-
-package java.lang.instrument;
-
-/**
- * This exception may be thrown from implementations of the method
- * {@link java.lang.instrument.Instrumentation#redefineClasses} when one of the
- * desired class redefinition operations cannot be carried out. Such a situation
- * may arise if a redefinition attempts to alter the members of a class or its
- * inheritance hierarchy.
- * 
- */
-public class UnmodifiableClassException extends Exception {
-
-    private static final long serialVersionUID = 1716652643585309178L;
-
-    /**
-     * Constructs a new instance of <code>UnmodifiableClassException</code>
-     * with no explanatory message.
-     */
-    public UnmodifiableClassException() {
-        super();
-    }
-
-    /**
-     * Constructs a new instance of <code>UnmodifiableClassException</code>
-     * with the supplied message, <code>s</code>, for explanation.
-     * 
-     * @param s
-     *            a string containing information on why the exception is being
-     *            created.
-     */
-    public UnmodifiableClassException(String s) {
-        super(s);
-    }
-}
+/* Copyright 2006 The Apache Software Foundation or its licensors, as applicable
+ * 
+ * Licensed 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.
+ */
+
+package java.lang.instrument;
+
+/**
+ * This exception may be thrown from implementations of the method
+ * {@link java.lang.instrument.Instrumentation#redefineClasses} when one of the
+ * desired class redefinition operations cannot be carried out. Such a situation
+ * may arise if a redefinition attempts to alter the members of a class or its
+ * inheritance hierarchy.
+ * 
+ */
+public class UnmodifiableClassException extends Exception {
+
+    private static final long serialVersionUID = 1716652643585309178L;
+
+    /**
+     * Constructs a new instance of <code>UnmodifiableClassException</code>
+     * with no explanatory message.
+     */
+    public UnmodifiableClassException() {
+        super();
+    }
+
+    /**
+     * Constructs a new instance of <code>UnmodifiableClassException</code>
+     * with the supplied message, <code>s</code>, for explanation.
+     * 
+     * @param s
+     *            a string containing information on why the exception is being
+     *            created.
+     */
+    public UnmodifiableClassException(String s) {
+        super(s);
+    }
+}

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/instrument/src/main/java/java/lang/instrument/UnmodifiableClassException.java
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message