Index: make/build-java.xml =================================================================== --- make/build-java.xml.orig 2006-03-20 18:40:50.000000000 +0000 +++ make/build-java.xml 2006-03-20 20:51:47.000000000 +0000 @@ -92,6 +92,13 @@ excludesfile="${components.patternsets}/kernel.txt" /> + + + + + + @@ -249,6 +257,9 @@ + + + Index: make/build-test.xml =================================================================== --- make/build-test.xml.orig 2006-03-20 18:40:50.000000000 +0000 +++ make/build-test.xml 2006-03-20 21:11:29.000000000 +0000 @@ -43,7 +43,7 @@ + depends="clean, compile-support, test-luni, test-archive, test-text, test-nio, test-xnet, test-nio_char, test-jndi, test-sql, test-prefs, test-beans, gen-report"> @@ -131,6 +131,13 @@ + + + + + + + Index: make/patternsets/beans.txt =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ make/patternsets/beans.txt 2006-03-20 20:49:47.000000000 +0000 @@ -0,0 +1,18 @@ +# 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. + +java/applet/**/* +java/awt/**/* +java/beans/**/* +org/apache/harmony/beans/**/* Index: modules/beans/META-INF/MANIFEST.MF =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ modules/beans/META-INF/MANIFEST.MF 2006-03-20 20:45:20.000000000 +0000 @@ -0,0 +1,16 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Harmony Beans +Bundle-SymbolicName: org.apache.harmony.beans +Bundle-Version: 1.0.0 +Bundle-ClassPath: . +Eclipse-JREBundle: true +Import-Package: java.lang, + java.util, + java.net, + java.io, + java.lang.reflect, + java.security, + org.xml.sax, + org.xml.sax.helpers +Export-Package: java.beans, java.beans.beancontext Index: modules/beans/make/common/build.xml =================================================================== --- modules/beans/make/common/build.xml.orig 2006-03-20 20:31:28.000000000 +0000 +++ modules/beans/make/common/build.xml 2006-03-20 21:06:09.000000000 +0000 @@ -91,12 +91,16 @@ - - - - - - + + + + + + + + + + Index: modules/beans/src/test/java/java/beans/beancontext/BeanContextServicesSupportTest.java =================================================================== --- modules/beans/src/test/java/java/beans/beancontext/BeanContextServicesSupportTest.java.orig 2006-03-20 20:30:29.000000000 +0000 +++ modules/beans/src/test/java/java/beans/beancontext/BeanContextServicesSupportTest.java 2006-03-20 20:49:30.000000000 +0000 @@ -20,7 +20,9 @@ */ package java.beans.beancontext; +import java.beans.beancontext.BeanContextServices; import java.beans.beancontext.BeanContextServicesSupport; +import java.beans.beancontext.BeanContextServiceProvider; import junit.framework.Test; import junit.framework.TestCase; Index: modules/beans/src/test/java/java/beans/beancontext/BeanContextSupportTest.java =================================================================== --- modules/beans/src/test/java/java/beans/beancontext/BeanContextSupportTest.java.orig 2006-03-20 20:30:39.000000000 +0000 +++ modules/beans/src/test/java/java/beans/beancontext/BeanContextSupportTest.java 2006-03-20 20:49:30.000000000 +0000 @@ -21,6 +21,8 @@ package java.beans.beancontext; import java.beans.beancontext.BeanContextSupport; +import java.beans.beancontext.BeanContextMembershipEvent; +import java.beans.beancontext.BeanContextMembershipListener; import junit.framework.Test; import junit.framework.TestCase; Index: modules/beans/src/test/java/org/apache/harmony/tests/beans/BeanDescriptorTest.java =================================================================== --- modules/beans/src/test/java/org/apache/harmony/tests/beans/BeanDescriptorTest.java.orig 2006-03-20 20:31:04.000000000 +0000 +++ modules/beans/src/test/java/org/apache/harmony/tests/beans/BeanDescriptorTest.java 2006-03-20 20:49:30.000000000 +0000 @@ -18,12 +18,13 @@ * @author Maxim V. Berkultsev * @version $Revision: 1.1.6.3 $ */ -package java.beans; +package org.apache.harmony.tests.beans; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; import junit.textui.TestRunner; +import java.beans.BeanDescriptor; /** * The test checks the class java.beans.BeanDescriptor Index: modules/beans/src/test/java/org/apache/harmony/tests/beans/BeansTest.java =================================================================== --- modules/beans/src/test/java/org/apache/harmony/tests/beans/BeansTest.java.orig 2006-03-20 20:31:04.000000000 +0000 +++ modules/beans/src/test/java/org/apache/harmony/tests/beans/BeansTest.java 2006-03-20 20:49:30.000000000 +0000 @@ -18,13 +18,11 @@ * @author Maxim V. Berkultsev * @version $Revision: 1.3.6.4 $ */ -package java.beans; +package org.apache.harmony.tests.beans; -import java.beans.auxiliary.SampleBean; -import java.io.FileOutputStream; +import org.apache.harmony.tests.beans.auxiliary.SampleBean; +import java.beans.Beans; import java.io.IOException; -import java.io.ObjectOutputStream; -import java.io.OutputStream; import junit.framework.Test; import junit.framework.TestCase; @@ -58,7 +56,7 @@ * using specific classloader for class loading */ public void testLoadBySpecificClassLoader() { - String beanName = "java.beans.auxiliary.SampleBean"; + String beanName = "org.apache.harmony.tests.beans.auxiliary.SampleBean"; try { ClassLoader cls = createSpecificClassLoader(); @@ -81,7 +79,7 @@ * using default classloader for class loading */ public void testLoadByDefaultClassLoader() { - String beanName = "java.beans.auxiliary.SampleBean"; + String beanName = "org.apache.harmony.tests.beans.auxiliary.SampleBean"; try { Object bean = Beans.instantiate(null, beanName); Index: modules/beans/src/test/java/org/apache/harmony/tests/beans/EventHandlerTest.java =================================================================== --- modules/beans/src/test/java/org/apache/harmony/tests/beans/EventHandlerTest.java.orig 2006-03-20 20:31:04.000000000 +0000 +++ modules/beans/src/test/java/org/apache/harmony/tests/beans/EventHandlerTest.java 2006-03-20 20:49:30.000000000 +0000 @@ -18,7 +18,7 @@ * @author Maxim V. Berkultsev * @version $Revision: 1.4.6.4 $ */ -package java.beans; +package org.apache.harmony.tests.beans; import junit.framework.Test; import junit.framework.TestCase; @@ -28,9 +28,9 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.beans.EventHandler; -import java.beans.auxiliary.InvocationObject; -import java.beans.auxiliary.SampleEvent; -import java.beans.auxiliary.SampleListener; +import org.apache.harmony.tests.beans.auxiliary.InvocationObject; +import org.apache.harmony.tests.beans.auxiliary.SampleEvent; +import org.apache.harmony.tests.beans.auxiliary.SampleListener; import java.lang.reflect.Method; /** Index: modules/beans/src/test/java/org/apache/harmony/tests/beans/EventSetDescriptorTest.java =================================================================== --- modules/beans/src/test/java/org/apache/harmony/tests/beans/EventSetDescriptorTest.java.orig 2006-03-20 20:31:04.000000000 +0000 +++ modules/beans/src/test/java/org/apache/harmony/tests/beans/EventSetDescriptorTest.java 2006-03-20 20:49:30.000000000 +0000 @@ -18,7 +18,7 @@ * @author Maxim V. Berkultsev * @version $Revision: 1.2.6.3 $ */ -package java.beans; +package org.apache.harmony.tests.beans; import junit.framework.Test; import junit.framework.TestCase; @@ -26,8 +26,8 @@ import junit.textui.TestRunner; import java.beans.EventSetDescriptor; -import java.beans.auxiliary.OtherBean; -import java.beans.auxiliary.SampleListener; +import org.apache.harmony.tests.beans.auxiliary.OtherBean; +import org.apache.harmony.tests.beans.auxiliary.SampleListener; /** * The test checks the class java.beans.EventSetDescriptor Index: modules/beans/src/test/java/org/apache/harmony/tests/beans/ExpressionTest.java =================================================================== --- modules/beans/src/test/java/org/apache/harmony/tests/beans/ExpressionTest.java.orig 2006-03-20 20:31:04.000000000 +0000 +++ modules/beans/src/test/java/org/apache/harmony/tests/beans/ExpressionTest.java 2006-03-20 20:49:30.000000000 +0000 @@ -18,7 +18,7 @@ * @author Maxim V. Berkultsev * @version $Revision: 1.2.6.3 $ */ -package java.beans; +package org.apache.harmony.tests.beans; import java.beans.Expression; @@ -27,7 +27,7 @@ import junit.framework.TestSuite; import junit.textui.TestRunner; -import java.beans.auxiliary.SampleBean; +import org.apache.harmony.tests.beans.auxiliary.SampleBean; /** * The test checks the class java.beans.Expression Index: modules/beans/src/test/java/org/apache/harmony/tests/beans/IntrospectorTest.java =================================================================== --- modules/beans/src/test/java/org/apache/harmony/tests/beans/IntrospectorTest.java.orig 2006-03-20 20:31:04.000000000 +0000 +++ modules/beans/src/test/java/org/apache/harmony/tests/beans/IntrospectorTest.java 2006-03-20 20:49:30.000000000 +0000 @@ -18,7 +18,7 @@ * @author Maxim V. Berkultsev * @version $Revision: 1.14.6.3 $ */ -package java.beans; +package org.apache.harmony.tests.beans; import junit.framework.Test; import junit.framework.TestCase; @@ -26,12 +26,18 @@ import junit.textui.TestRunner; import java.beans.Introspector; -import java.beans.auxiliary.ChildBean; -import java.beans.auxiliary.GrannyBean; -import java.beans.auxiliary.MisprintBean; -import java.beans.auxiliary.OtherBean; -import java.beans.auxiliary.SampleBean; -import java.beans.auxiliary.StandardBean2; +import java.beans.BeanInfo; +import java.beans.BeanDescriptor; +import java.beans.EventSetDescriptor; +import java.beans.MethodDescriptor; +import java.beans.PropertyDescriptor; +import java.beans.IntrospectionException; +import org.apache.harmony.tests.beans.auxiliary.ChildBean; +import org.apache.harmony.tests.beans.auxiliary.GrannyBean; +import org.apache.harmony.tests.beans.auxiliary.MisprintBean; +import org.apache.harmony.tests.beans.auxiliary.OtherBean; +import org.apache.harmony.tests.beans.auxiliary.SampleBean; +import org.apache.harmony.tests.beans.auxiliary.StandardBean2; import java.lang.reflect.Method; import java.util.TooManyListenersException; Index: modules/beans/src/test/java/org/apache/harmony/tests/beans/PropertyChangeSupportTest.java =================================================================== --- modules/beans/src/test/java/org/apache/harmony/tests/beans/PropertyChangeSupportTest.java.orig 2006-03-20 20:31:04.000000000 +0000 +++ modules/beans/src/test/java/org/apache/harmony/tests/beans/PropertyChangeSupportTest.java 2006-03-20 20:49:30.000000000 +0000 @@ -18,7 +18,7 @@ * @author Maxim V. Berkultsev * @version $Revision: 1.2.6.3 $ */ -package java.beans; +package org.apache.harmony.tests.beans; import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; @@ -33,8 +33,8 @@ import junit.framework.TestSuite; import junit.textui.TestRunner; -import java.beans.auxiliary.SerializablePropertyChangeListener; -import java.beans.auxiliary.NonSerializablePropertyChangeListener; +import org.apache.harmony.tests.beans.auxiliary.SerializablePropertyChangeListener; +import org.apache.harmony.tests.beans.auxiliary.NonSerializablePropertyChangeListener; /** * The test checks the class java.beans.PropertyChangeSupport Index: modules/beans/src/test/java/org/apache/harmony/tests/beans/PropertyEditorManagerTest.java =================================================================== --- modules/beans/src/test/java/org/apache/harmony/tests/beans/PropertyEditorManagerTest.java.orig 2006-03-20 20:31:04.000000000 +0000 +++ modules/beans/src/test/java/org/apache/harmony/tests/beans/PropertyEditorManagerTest.java 2006-03-20 20:49:30.000000000 +0000 @@ -18,19 +18,20 @@ * @author Maxim V. Berkultsev * @version $Revision: 1.4.6.3 $ */ -package java.beans; +package org.apache.harmony.tests.beans; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; import junit.textui.TestRunner; +import java.beans.PropertyEditor; import java.beans.PropertyEditorManager; -import java.beans.auxiliary.AnotherSampleProperty; -import java.beans.auxiliary.OtherEditor; -import java.beans.auxiliary.SampleProperty; -import java.beans.auxiliary.SamplePropertyEditor; -import java.beans.editors.AnotherSamplePropertyEditor; +import org.apache.harmony.tests.beans.auxiliary.AnotherSampleProperty; +import org.apache.harmony.tests.beans.auxiliary.OtherEditor; +import org.apache.harmony.tests.beans.auxiliary.SampleProperty; +import org.apache.harmony.tests.beans.auxiliary.SamplePropertyEditor; +import org.apache.harmony.tests.beans.editors.AnotherSamplePropertyEditor; /** * The test checks the class java.beans.PropertyEditorManager @@ -88,7 +89,7 @@ */ public void testFindEditorByDefaultLocation() { PropertyEditorManager.setEditorSearchPath( - new String[] {"java.beans.editors"}); + new String[] {"org.apache.harmony.tests.beans.editors"}); PropertyEditor pe = PropertyEditorManager.findEditor( AnotherSampleProperty.class); if(pe == null) { Index: modules/beans/src/test/java/org/apache/harmony/tests/beans/SimpleBeanInfoTest.java =================================================================== --- modules/beans/src/test/java/org/apache/harmony/tests/beans/SimpleBeanInfoTest.java.orig 2006-03-20 20:31:04.000000000 +0000 +++ modules/beans/src/test/java/org/apache/harmony/tests/beans/SimpleBeanInfoTest.java 2006-03-20 20:49:30.000000000 +0000 @@ -18,10 +18,11 @@ * @author Maxim V. Berkultsev * @version $Revision: 1.2.6.3 $ */ -package java.beans; +package org.apache.harmony.tests.beans; import java.awt.Image; +import java.beans.SimpleBeanInfo; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; Index: modules/beans/src/test/java/org/apache/harmony/tests/beans/StatementTest.java =================================================================== --- modules/beans/src/test/java/org/apache/harmony/tests/beans/StatementTest.java.orig 2006-03-20 20:31:04.000000000 +0000 +++ modules/beans/src/test/java/org/apache/harmony/tests/beans/StatementTest.java 2006-03-20 20:49:30.000000000 +0000 @@ -18,10 +18,10 @@ * @author Maxim V. Berkultsev * @version $Revision: 1.4.6.3 $ */ -package java.beans; +package org.apache.harmony.tests.beans; import java.beans.Statement; -import java.beans.auxiliary.SampleException; +import org.apache.harmony.tests.beans.auxiliary.SampleException; import junit.framework.Test; import junit.framework.TestCase; Index: modules/beans/src/test/java/org/apache/harmony/tests/beans/VetoableChangeSupportTest.java =================================================================== --- modules/beans/src/test/java/org/apache/harmony/tests/beans/VetoableChangeSupportTest.java.orig 2006-03-20 20:31:04.000000000 +0000 +++ modules/beans/src/test/java/org/apache/harmony/tests/beans/VetoableChangeSupportTest.java 2006-03-20 20:49:30.000000000 +0000 @@ -18,13 +18,16 @@ * @author Maxim V. Berkultsev * @version $Revision: 1.2.6.3 $ */ -package java.beans; +package org.apache.harmony.tests.beans; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; import junit.textui.TestRunner; +import java.beans.PropertyChangeEvent; +import java.beans.VetoableChangeListener; +import java.beans.VetoableChangeListenerProxy; import java.beans.VetoableChangeSupport; /** Index: modules/beans/src/test/java/org/apache/harmony/tests/beans/XMLDecoderTest.java =================================================================== --- modules/beans/src/test/java/org/apache/harmony/tests/beans/XMLDecoderTest.java.orig 2006-03-20 20:31:04.000000000 +0000 +++ modules/beans/src/test/java/org/apache/harmony/tests/beans/XMLDecoderTest.java 2006-03-20 20:49:30.000000000 +0000 @@ -18,7 +18,7 @@ * @author Maxim V. Berkultsev * @version $Revision: 1.3.6.3 $ */ -package java.beans; +package org.apache.harmony.tests.beans; import junit.framework.Test; import junit.framework.TestCase; Index: modules/beans/src/test/java/org/apache/harmony/tests/beans/XMLEncoderTest.java =================================================================== --- modules/beans/src/test/java/org/apache/harmony/tests/beans/XMLEncoderTest.java.orig 2006-03-20 20:31:04.000000000 +0000 +++ modules/beans/src/test/java/org/apache/harmony/tests/beans/XMLEncoderTest.java 2006-03-20 20:49:30.000000000 +0000 @@ -18,17 +18,21 @@ * @author Maxim V. Berkultsev * @version $Revision: 1.5.6.3 $ */ -package java.beans; +package org.apache.harmony.tests.beans; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; import junit.textui.TestRunner; +import java.beans.Encoder; +import java.beans.ExceptionListener; +import java.beans.Expression; +import java.beans.DefaultPersistenceDelegate; import java.beans.XMLEncoder; -import java.beans.auxiliary.AType; -import java.beans.auxiliary.StandardBean; +import org.apache.harmony.tests.beans.auxiliary.AType; +import org.apache.harmony.tests.beans.auxiliary.StandardBean; /** * The test checks the class java.beans.XMLEncoder Index: modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/AType.java =================================================================== --- modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/AType.java.orig 2006-03-20 20:31:04.000000000 +0000 +++ modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/AType.java 2006-03-20 20:49:30.000000000 +0000 @@ -18,7 +18,7 @@ * @author Maxim V. Berkultsev * @version $Revision: 1.1.6.3 $ */ -package java.beans.auxiliary; +package org.apache.harmony.tests.beans.auxiliary; /** * @author Maxim V. Berkultsev Index: modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/AnotherSampleProperty.java =================================================================== --- modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/AnotherSampleProperty.java.orig 2006-03-20 20:31:04.000000000 +0000 +++ modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/AnotherSampleProperty.java 2006-03-20 20:49:30.000000000 +0000 @@ -18,7 +18,7 @@ * @author Maxim V. Berkultsev * @version $Revision: 1.2.6.2 $ */ -package java.beans.auxiliary; +package org.apache.harmony.tests.beans.auxiliary; /** * @author Maxim V. Berkultsev Index: modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/ChildBean.java =================================================================== --- modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/ChildBean.java.orig 2006-03-20 20:31:04.000000000 +0000 +++ modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/ChildBean.java 2006-03-20 20:49:30.000000000 +0000 @@ -18,7 +18,7 @@ * @author Maxim V. Berkultsev * @version $Revision: 1.2.6.2 $ */ -package java.beans.auxiliary; +package org.apache.harmony.tests.beans.auxiliary; /** * @author Maxim V. Berkultsev Index: modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/ChildBeanBeanInfo.java =================================================================== --- modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/ChildBeanBeanInfo.java.orig 2006-03-20 20:31:04.000000000 +0000 +++ modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/ChildBeanBeanInfo.java 2006-03-20 20:49:30.000000000 +0000 @@ -18,7 +18,7 @@ * @author Maxim V. Berkultsev * @version $Revision: 1.2.6.3 $ */ -package java.beans.auxiliary; +package org.apache.harmony.tests.beans.auxiliary; import java.beans.IntrospectionException; import java.beans.PropertyDescriptor; Index: modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/GrannyBean.java =================================================================== --- modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/GrannyBean.java.orig 2006-03-20 20:31:04.000000000 +0000 +++ modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/GrannyBean.java 2006-03-20 20:49:30.000000000 +0000 @@ -18,7 +18,7 @@ * @author Maxim V. Berkultsev * @version $Revision: 1.2.6.3 $ */ -package java.beans.auxiliary; +package org.apache.harmony.tests.beans.auxiliary; /** * @author Maxim V. Berkultsev Index: modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/GrannyBeanBeanInfo.java =================================================================== --- modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/GrannyBeanBeanInfo.java.orig 2006-03-20 20:31:04.000000000 +0000 +++ modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/GrannyBeanBeanInfo.java 2006-03-20 20:49:30.000000000 +0000 @@ -18,7 +18,7 @@ * @author Maxim V. Berkultsev * @version $Revision: 1.2.6.3 $ */ -package java.beans.auxiliary; +package org.apache.harmony.tests.beans.auxiliary; import java.beans.IntrospectionException; import java.beans.PropertyDescriptor; Index: modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/InvocationObject.java =================================================================== --- modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/InvocationObject.java.orig 2006-03-20 20:31:04.000000000 +0000 +++ modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/InvocationObject.java 2006-03-20 20:49:30.000000000 +0000 @@ -18,9 +18,9 @@ * @author Maxim V. Berkultsev * @version $Revision: 1.3.6.3 $ */ -package java.beans.auxiliary; +package org.apache.harmony.tests.beans.auxiliary; -import java.beans.EventHandlerTest; +import org.apache.harmony.tests.beans.EventHandlerTest; /** * @author Maxim V. Berkultsev Index: modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/MisprintBean.java =================================================================== --- modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/MisprintBean.java.orig 2006-03-20 20:31:04.000000000 +0000 +++ modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/MisprintBean.java 2006-03-20 20:49:30.000000000 +0000 @@ -18,7 +18,7 @@ * @author Maxim V. Berkultsev * @version $Revision: 1.2.6.3 $ */ -package java.beans.auxiliary; +package org.apache.harmony.tests.beans.auxiliary; /** * @author Maxim V. Berkultsev Index: modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/MisprintEvent.java =================================================================== --- modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/MisprintEvent.java.orig 2006-03-20 20:31:04.000000000 +0000 +++ modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/MisprintEvent.java 2006-03-20 20:49:30.000000000 +0000 @@ -18,7 +18,7 @@ * @author Maxim V. Berkultsev * @version $Revision: 1.2.6.3 $ */ -package java.beans.auxiliary; +package org.apache.harmony.tests.beans.auxiliary; import java.util.EventObject; Index: modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/MisprintListenerr.java =================================================================== --- modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/MisprintListenerr.java.orig 2006-03-20 20:31:04.000000000 +0000 +++ modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/MisprintListenerr.java 2006-03-20 20:49:30.000000000 +0000 @@ -18,7 +18,7 @@ * @author Maxim V. Berkultsev * @version $Revision: 1.2.6.3 $ */ -package java.beans.auxiliary; +package org.apache.harmony.tests.beans.auxiliary; import java.util.EventListener; Index: modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/NonSerializablePropertyChangeListener.java =================================================================== --- modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/NonSerializablePropertyChangeListener.java.orig 2006-03-20 20:31:04.000000000 +0000 +++ modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/NonSerializablePropertyChangeListener.java 2006-03-20 20:49:30.000000000 +0000 @@ -18,7 +18,7 @@ * @author Maxim V. Berkultsev * @version $Revision: 1.2.6.3 $ */ -package java.beans.auxiliary; +package org.apache.harmony.tests.beans.auxiliary; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; Index: modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/OtherBean.java =================================================================== --- modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/OtherBean.java.orig 2006-03-20 20:31:04.000000000 +0000 +++ modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/OtherBean.java 2006-03-20 20:49:30.000000000 +0000 @@ -18,7 +18,7 @@ * @author Maxim V. Berkultsev * @version $Revision: 1.2.6.3 $ */ -package java.beans.auxiliary; +package org.apache.harmony.tests.beans.auxiliary; /** * @author Maxim V. Berkultsev Index: modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/OtherEditor.java =================================================================== --- modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/OtherEditor.java.orig 2006-03-20 20:31:04.000000000 +0000 +++ modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/OtherEditor.java 2006-03-20 20:49:30.000000000 +0000 @@ -18,7 +18,7 @@ * @author Maxim V. Berkultsev * @version $Revision: 1.2.6.2 $ */ -package java.beans.auxiliary; +package org.apache.harmony.tests.beans.auxiliary; import java.beans.PropertyEditorSupport; Index: modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/ParentBean.java =================================================================== --- modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/ParentBean.java.orig 2006-03-20 20:31:04.000000000 +0000 +++ modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/ParentBean.java 2006-03-20 20:49:30.000000000 +0000 @@ -18,7 +18,7 @@ * @author Maxim V. Berkultsev * @version $Revision: 1.2.6.2 $ */ -package java.beans.auxiliary; +package org.apache.harmony.tests.beans.auxiliary; /** * @author Maxim V. Berkultsev Index: modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/ParentBeanBeanInfo.java =================================================================== --- modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/ParentBeanBeanInfo.java.orig 2006-03-20 20:31:04.000000000 +0000 +++ modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/ParentBeanBeanInfo.java 2006-03-20 20:49:30.000000000 +0000 @@ -18,7 +18,7 @@ * @author Maxim V. Berkultsev * @version $Revision: 1.2.6.3 $ */ -package java.beans.auxiliary; +package org.apache.harmony.tests.beans.auxiliary; import java.beans.IntrospectionException; import java.beans.PropertyDescriptor; Index: modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/SampleBean.java =================================================================== --- modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/SampleBean.java.orig 2006-03-20 20:31:04.000000000 +0000 +++ modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/SampleBean.java 2006-03-20 20:49:30.000000000 +0000 @@ -18,7 +18,7 @@ * @author Maxim V. Berkultsev * @version $Revision: 1.3.6.3 $ */ -package java.beans.auxiliary; +package org.apache.harmony.tests.beans.auxiliary; import java.util.Iterator; import java.util.TooManyListenersException; Index: modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/SampleEvent.java =================================================================== --- modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/SampleEvent.java.orig 2006-03-20 20:31:04.000000000 +0000 +++ modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/SampleEvent.java 2006-03-20 20:49:30.000000000 +0000 @@ -18,7 +18,7 @@ * @author Maxim V. Berkultsev * @version $Revision: 1.3.6.3 $ */ -package java.beans.auxiliary; +package org.apache.harmony.tests.beans.auxiliary; import java.util.EventObject; Index: modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/SampleException.java =================================================================== --- modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/SampleException.java.orig 2006-03-20 20:31:04.000000000 +0000 +++ modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/SampleException.java 2006-03-20 20:49:30.000000000 +0000 @@ -18,7 +18,7 @@ * @author Maxim V. Berkultsev * @version $Revision: 1.2.6.3 $ */ -package java.beans.auxiliary; +package org.apache.harmony.tests.beans.auxiliary; /** * @author Maxim V. Berkultsev Index: modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/SampleListener.java =================================================================== --- modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/SampleListener.java.orig 2006-03-20 20:31:04.000000000 +0000 +++ modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/SampleListener.java 2006-03-20 20:49:30.000000000 +0000 @@ -18,7 +18,7 @@ * @author Maxim V. Berkultsev * @version $Revision: 1.2.6.3 $ */ -package java.beans.auxiliary; +package org.apache.harmony.tests.beans.auxiliary; /** * @author Maxim V. Berkultsev Index: modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/SampleProperty.java =================================================================== --- modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/SampleProperty.java.orig 2006-03-20 20:31:04.000000000 +0000 +++ modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/SampleProperty.java 2006-03-20 20:49:30.000000000 +0000 @@ -18,7 +18,7 @@ * @author Maxim V. Berkultsev * @version $Revision: 1.2.6.2 $ */ -package java.beans.auxiliary; +package org.apache.harmony.tests.beans.auxiliary; /** * @author Maxim V. Berkultsev Index: modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/SamplePropertyEditor.java =================================================================== --- modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/SamplePropertyEditor.java.orig 2006-03-20 20:31:04.000000000 +0000 +++ modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/SamplePropertyEditor.java 2006-03-20 20:49:30.000000000 +0000 @@ -18,7 +18,7 @@ * @author Maxim V. Berkultsev * @version $Revision: 1.2.6.2 $ */ -package java.beans.auxiliary; +package org.apache.harmony.tests.beans.auxiliary; import java.beans.PropertyEditorSupport; Index: modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/SerializableBean.java =================================================================== --- modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/SerializableBean.java.orig 2006-03-20 20:31:04.000000000 +0000 +++ modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/SerializableBean.java 2006-03-20 20:49:30.000000000 +0000 @@ -18,7 +18,7 @@ * @author Maxim V. Berkultsev * @version $Revision: 1.3.6.3 $ */ -package java.beans.auxiliary; +package org.apache.harmony.tests.beans.auxiliary; import java.io.Serializable; Index: modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/SerializablePropertyChangeListener.java =================================================================== --- modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/SerializablePropertyChangeListener.java.orig 2006-03-20 20:31:04.000000000 +0000 +++ modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/SerializablePropertyChangeListener.java 2006-03-20 20:49:30.000000000 +0000 @@ -18,7 +18,7 @@ * @author Maxim V. Berkultsev * @version $Revision: 1.2.6.3 $ */ -package java.beans.auxiliary; +package org.apache.harmony.tests.beans.auxiliary; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; Index: modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/StandardBean.java =================================================================== --- modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/StandardBean.java.orig 2006-03-20 20:31:04.000000000 +0000 +++ modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/StandardBean.java 2006-03-20 20:49:30.000000000 +0000 @@ -18,7 +18,7 @@ * @author Maxim V. Berkultsev * @version $Revision: 1.2.6.3 $ */ -package java.beans.auxiliary; +package org.apache.harmony.tests.beans.auxiliary; /** * @author Maxim V. Berkultsev Index: modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/StandardBean2.java =================================================================== --- modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/StandardBean2.java.orig 2006-03-20 20:31:04.000000000 +0000 +++ modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/StandardBean2.java 2006-03-20 20:49:30.000000000 +0000 @@ -18,7 +18,7 @@ * @author Maxim V. Berkultsev * @version $Revision: 1.2.6.2 $ */ -package java.beans.auxiliary; +package org.apache.harmony.tests.beans.auxiliary; /** * @author Maxim V. Berkultsev Index: modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/StandardBean2BeanInfo.java =================================================================== --- modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/StandardBean2BeanInfo.java.orig 2006-03-20 20:31:04.000000000 +0000 +++ modules/beans/src/test/java/org/apache/harmony/tests/beans/auxiliary/StandardBean2BeanInfo.java 2006-03-20 20:49:30.000000000 +0000 @@ -18,7 +18,7 @@ * @author Maxim V. Berkultsev * @version $Revision: 1.2.6.3 $ */ -package java.beans.auxiliary; +package org.apache.harmony.tests.beans.auxiliary; import java.beans.BeanInfo; import java.beans.SimpleBeanInfo; Index: modules/beans/src/test/java/org/apache/harmony/tests/beans/beancontext/BeanContextChildSupportTest.java =================================================================== --- modules/beans/src/test/java/org/apache/harmony/tests/beans/beancontext/BeanContextChildSupportTest.java.orig 2006-03-20 20:31:04.000000000 +0000 +++ modules/beans/src/test/java/org/apache/harmony/tests/beans/beancontext/BeanContextChildSupportTest.java 2006-03-20 20:49:30.000000000 +0000 @@ -18,9 +18,10 @@ * @author Sergey A. Krivenko * @version $Revision: 1.2.4.2 $ */ -package java.beans.beancontext; +package org.apache.harmony.tests.beans.beancontext; import java.beans.beancontext.BeanContextChildSupport; +import java.beans.beancontext.BeanContextSupport; import junit.framework.Test; import junit.framework.TestCase; Index: modules/beans/src/test/java/org/apache/harmony/tests/beans/editors/AnotherSamplePropertyEditor.java =================================================================== --- modules/beans/src/test/java/org/apache/harmony/tests/beans/editors/AnotherSamplePropertyEditor.java.orig 2006-03-20 20:31:04.000000000 +0000 +++ modules/beans/src/test/java/org/apache/harmony/tests/beans/editors/AnotherSamplePropertyEditor.java 2006-03-20 20:49:30.000000000 +0000 @@ -18,7 +18,7 @@ * @author Maxim V. Berkultsev * @version $Revision: 1.2.6.2 $ */ -package java.beans.editors; +package org.apache.harmony.tests.beans.editors; import java.beans.PropertyEditorSupport; Index: modules/beans/src/test/java/org/apache/harmony/tests/beans/infos/SampleBeanBeanInfo.java =================================================================== --- modules/beans/src/test/java/org/apache/harmony/tests/beans/infos/SampleBeanBeanInfo.java.orig 2006-03-20 20:31:04.000000000 +0000 +++ modules/beans/src/test/java/org/apache/harmony/tests/beans/infos/SampleBeanBeanInfo.java 2006-03-20 20:49:30.000000000 +0000 @@ -18,11 +18,11 @@ * @author Maxim V. Berkultsev * @version $Revision: 1.2.6.3 $ */ -package java.beans.infos; +package org.apache.harmony.tests.beans.infos; import java.beans.MethodDescriptor; import java.beans.SimpleBeanInfo; -import java.beans.auxiliary.SampleBean; +import org.apache.harmony.tests.beans.auxiliary.SampleBean; /** * @author Maxim V. Berkultsev Index: modules/beans/src/main/java/java/applet/Applet.java =================================================================== --- modules/beans/src/main/java/java/applet/Applet.java.orig 2006-03-20 20:29:04.000000000 +0000 +++ modules/beans/src/main/java/java/applet/Applet.java 2006-03-20 20:58:11.000000000 +0000 @@ -30,4 +30,8 @@ public void init() { } + + public String getParameter(String s) { + return null; + } }