svn commit: rev 37220 - in incubator/beehive/trunk: controls/drt/controls/org/apache/beehive/controls/test/beaninfo controls/src/api/org/apache/beehive/controls/api controls/src/api/org/apache/beehive/controls/api/assembly controls/src/api/org/apache/beehive/controls/api/bean controls/src/api/org/apache/beehive/controls/api/context controls/src/api/org/apache/beehive/controls/api/events controls/src/api/org/apache/beehive/controls/api/packaging controls/src/api/org/apache/beehive/controls/api/properties controls/src/runtime/org/apache/beehive/controls/runtime/bean controls/src/runtime/org/apache/beehive/controls/runtime/generator controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt controls/src/runtime/org/apache/beehive/controls/runtime/packaging controls/src/runtime/org/apache/beehive/controls/runtime/servlet controls/test/src/controls/org/apache/beehive/controls/test/controls/context controls/test/src/controls/org/apache/beehive/controls/test/controls/property controls/test/src/units/org/apache/beehive/controls/test/java/contextevent controls/test/src/units/org/apache/beehive/controls/test/java/event controls/test/src/units/org/apache/beehive/controls/test/java/extension controls/test/src/units/org/apache/beehive/controls/test/java/property controls/test/tmp/controls/composition controls/test/tmp/units/java/composition controls/test/tools/mantis/src/org/apache/beehive/mantis controls/test/tools/mantis/src/org/apache/beehive/mantis/annotations/tch controls/test/tools/mantis/src/org/apache/beehive/mantis/test controls/test/tools/mantis/src/org/apache/beehive/mantis/utils controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/client controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/common controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/junit controls/test/tools/peanut/src/org/apache/beehive/peanut controls/test/tools/peanut/src/org/apache/beehive/peanut/junit controls/test/tools/peanut/src/org/apache/beehive/peanut/result controls/test/tools/peanut/src/org/apache/beehive/peanut/result/logger controls/test/tools/peanut/src/org/apache/beehive/peanut/util controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/stl controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/extension/process/listener controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/xml controls/test/webapps/controlsWeb/controls/org/apache/beehive/controls/test/controls/context controls/test/webapps/controlsWeb/controls/org/apache/beehive/controls/test/controls/event controls/test/webapps/controlsWeb/controls/org/apache/beehive/controls/test/controls/property netui/src/bootstrap/org/apache/beehive/netui/tools netui/src/bootstrap/org/apache/beehive/netui/tools/ant netui/src/bootstrap/org/apache/beehive/netui/tools/tld netui/src/bootstrap/org/apache/beehive/netui/tools/tldx netui/src/compiler/org/apache/beehive/netui/compiler netui/src/compiler/org/apache/beehive/netui/compiler/apt netui/src/compiler/org/apache/beehive/netui/compiler/genmodel netui/src/compiler/org/apache/beehive/netui/compiler/grammar netui/src/compiler/org/apache/beehive/netui/compiler/model netui/src/compiler/org/apache/beehive/netui/compiler/model/validation netui/src/pageflow/org/apache/beehive/netui/pageflow netui/src/pageflow/org/apache/beehive/netui/pageflow/annotations netui/src/pageflow/org/apache/beehive/netui/pageflow/config netui/src/pageflow/org/apache/beehive/netui/pageflow/faces netui/src/pageflow/org/apache/beehive/netui/pageflow/handler netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor netui/src/pageflow/org/apache/beehive/netui/pageflow/internal netui/src/pageflow/org/apache/beehive/netui/pageflow/util netui/src/pageflow/org/apache/beehive/netui/pageflow/validation netui/src/pageflow/org/apache/beehive/netui/script netui/src/pageflow/org/apache/beehive/netui/script/common netui/src/pageflow/org/apache/beehive/netui/script/el netui/src/pageflow/org/apache/beehive/netui/script/el/parser netui/src/pageflow/org/apache/beehive/netui/script/el/tokens netui/src/pageflow/org/apache/beehive/netui/script/el/util netui/src/scoping/org/apache/beehive/netui/pageflow/scoping netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/internal netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/impl netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util netui/src/tags-databinding/org/apache/beehive/netui/databinding/script/el netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/base netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/base/style netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/bundle netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/cellrepeater netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/cellrepeater/style netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/invoke netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/message netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/pageinput netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/pad netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/script netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/xml netui/src/tags-html/org/apache/beehive/netui/tags netui/src/tags-html/org/apache/beehive/netui/tags/html netui/src/tags-html/org/apache/beehive/netui/tags/naming netui/src/tags-html/org/apache/beehive/netui/tags/rendering netui/src/tags-html/org/apache/beehive/netui/tags/tree netui/src/tags-template/org/apache/beehive/netui/tags/template netui/src/tomcat-common/4x/org/apache/beehive/netui/tomcat netui/src/tomcat-server/4x/org/apache/beehive/netui/tomcat netui/src/tomcat-webapp/4x/org/apache/beehive/netui/tomcat netui/src/util/org/apache/beehive/netui/util netui/src/util/org/apache/beehive/netui/util/cache netui/src/util/org/apache/beehive/netui/util/classloader netui/src/util/org/apache/beehive/netui/util/config netui/src/util/org/apache/beehive/netui/util/exception netui/src/util/org/apache/beehive/netui/util/iterator netui/src/util/org/apache/beehive/netui/util/logging netui/src/util/org/apache/beehive/netui/util/tags netui/src/util/org/apache/beehive/netui/util/type netui/test/src/fauxServlet/org/apache/beehive/netui/test/servlet netui/test/src/junitTests/com/bea/netuix/servlets/script netui/test/src/junitTests/org/apache/beehive/netui/test/databinding/expression netui/test/src/junitTests/org/apache/beehive/netui/test/script netui/test/src/junitTests/org/apache/beehive/netui/test/script/el netui/test/src/junitTests/org/apache/beehive/netui/test/script/simpleaction netui/test/src/junitTests/org/apache/beehive/netui/test/tools netui/test/src/junitTests/org/apache/beehive/netui/test/util/config netui/test/src/junitTests/org/apache/beehive/netui/test/util/iterator netui/test/src/junitTests/org/apache/beehive/netui/test/util/type netui/test/src/junitTests/org/apache/beehive/netui/util/config netui/test/src/testBeans/org/apache/beehive/netui/test/beans netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/client netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/serverAdapter netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/state netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/config netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/util netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/xmlbeans netui/test/src/testRecorderQA/org/apache/beehive/netui/tools/testrecorder/qa netui/test/src/tools/org/apache/beehive/netui/tools/ant/junit netui/test/webapps/drt/coreWeb/WEB-INF/src/databinding netui/test/webapps/drt/coreWeb/WEB-INF/src/databinding/callMethod netui/test/webapps/drt/coreWeb/WEB-INF/src/databinding/type netui/test/webapps/drt/coreWeb/WEB-INF/src/formBean/test1 netui/test/webapps/drt/coreWeb/WEB-INF/src/formBean/test2 netui/test/webapps/drt/coreWeb/WEB-INF/src/interOp/test1 netui/test/webapps/drt/coreWeb/WEB-INF/src/miscJpf/test13 netui/test/webapps/drt/coreWeb/WEB-INF/src/mockportal netui/test/webapps/drt/coreWeb/WEB-INF/src/models netui/test/webapps/drt/coreWeb/WEB-INF/src/moduleConfigLocator netui/test/webapps/drt/coreWeb/WEB-INF/src/org/apache/beehive/netui/test/databinding/beans netui/test/webapps/drt/coreWeb/WEB-INF/src/qaUtil netui/test/webapps/drt/coreWeb/WEB-INF/src/shared netui/test/webapps/drt/coreWeb/WEB-INF/src/strutsMerge/test4 netui/test/webapps/drt/coreWeb/WEB-INF/src/strutsMerge/test7 netui/test/webapps/drt/coreWeb/WEB-INF/src/util netui/test/webapps/drt/coreWeb/databinding/controls/methodTest netui/test/webapps/drt/coreWeb/databinding/datagrid/controls netui/test/webapps/drt/coreWeb/miscJpf/bug21124 netui/test/webapps/drt/coreWeb/pageFlowCore/lifecycle netui/test/webapps/jsf/jsfWeb/WEB-INF/src/faces/facesSmoke netui/test/webapps/jsf/jsfWeb/backingControls netui/test/webapps/webappBuild-test/webappBuild-test/WEB-INF/src/org/acme/beans

[rich]

Author: rich
Date: Mon Aug 30 15:07:46 2004
New Revision: 37220

Modified:
   
incubator/beehive/trunk/controls/drt/controls/org/apache/beehive/controls/test/beaninfo/InfoTest.java
   
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/ControlException.java
   
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/assembly/DefaultControlAssembler.java
   
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/ControlBean.java
   
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/ControlChecker.java
   
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/ControlExtension.java
   
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/ControlImplementation.java
   
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/ControlInterface.java
   
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/DefaultControlChecker.java
   
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/Extensible.java
   
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/context/Context.java
   
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/context/ControlBeanContext.java
   
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/context/ControlHandle.java
   
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/context/ResourceContext.java
   
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/events/Client.java
   
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/events/EventHandler.java
   
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/events/EventSet.java
   
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/packaging/FeatureAttribute.java
   
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/packaging/FeatureInfo.java
   
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/packaging/ManifestAttribute.java
   
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/packaging/ManifestAttributes.java
   
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/packaging/PropertyInfo.java
   
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/properties/AnnotatedElementMap.java
   
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/properties/BaseMap.java
   
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/properties/BeanPropertyMap.java
   
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/properties/PropertyKey.java
   
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/properties/PropertyMap.java
   
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/properties/PropertySet.java
   
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/BeanListener.java
   
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ControlBean.java
   
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ControlBeanContext.java
   
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ControlContainerContext.java
   
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ControlInitializer.java
   
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/EventNotifier.java
   
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/InvokeListener.java
   
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/PropertySetProxy.java
   
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ResourceContextImpl.java
   
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/AptTask.java
   
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ClientField.java
   
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/CodeGenerationException.java
   
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/CodeGenerator.java
   
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ContextField.java
   
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ControlBean.java
   
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ControlEvent.java
   
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ControlEventHandler.java
   
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ControlEventSet.java
   
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ControlField.java
   
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ControlImpl.java
   
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ControlInitializer.java
   
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ControlInterface.java
   
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ControlOperation.java
   
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ControlProperty.java
   
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ControlPropertySet.java
   
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/EventAdaptor.java
   
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/EventField.java
   
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/GenClass.java
   
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/GenField.java
   
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/GenMethod.java
   
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/GeneratorOutput.java
   
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/IndentingWriter.java
   
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/SimpleFiler.java
   
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/VelocityGenerator.java
   
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/AptAnnotationHelper.java
   
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/AptClientField.java
   
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/AptContextField.java
   
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/AptControlField.java
   
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/AptControlImplementation.java
   
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/AptControlInterface.java
   
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/AptEvent.java
   
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/AptEventHandler.java
   
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/AptEventSet.java
   
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/AptFieldHelper.java
   
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/AptMethodHelper.java
   
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/AptOperation.java
   
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/AptProperty.java
   
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/AptPropertySet.java
   
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/packaging/ControlJarTask.java
   
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/servlet/ControlFilter.java
   
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/servlet/HttpRequestService.java
   
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/servlet/HttpResponseService.java
   
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/servlet/ServletBeanContext.java
   
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/servlet/ServletContextService.java
   
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/servlet/ServletRequestService.java
   
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/servlet/ServletResponseService.java
   
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/servlet/ServletServiceProvider.java
   
incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/context/ServiceGetter.java
   
incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/property/SingleProperty.java
   
incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/property/SingleProperty2.java
   
incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/contextevent/LifeCycleTest.java
   
incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/event/Event2Listener.java
   
incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/event/EventHandlerTest.java
   
incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/event/ListenerTest.java
   
incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/extension/SubControlTest.java
   
incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/property/ImplAccessTest.java
   
incubator/beehive/trunk/controls/test/tmp/controls/composition/InnerControlEventListener.java
   
incubator/beehive/trunk/controls/test/tmp/units/java/composition/DeclarativeTest.java
   
incubator/beehive/trunk/controls/test/tmp/units/java/composition/ProgrammaticTest.java
   
incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/mantis/AbstractMantisProcessor.java
   
incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/mantis/MantisFactory.java
   
incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/mantis/MantisTask.java
   
incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/mantis/TchProcessor.java
   
incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/mantis/annotations/tch/Desc.java
   
incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/mantis/annotations/tch/Freq.java
   
incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/mantis/annotations/tch/Misc.java
   
incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/mantis/annotations/tch/Status.java
   
incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/mantis/test/CheckinTest.java
   
incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/mantis/test/DetailedTest.java
   
incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/mantis/utils/FileTypes.java
   
incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/mantis/utils/MantisFileInfo.java
   
incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/mantis/utils/StreamCapture.java
   
incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/client/TestContext.java
   
incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/common/Report.java
   
incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/junit/AbortTestException.java
   
incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/junit/FailTestError.java
   
incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/junit/HtmlReportTestCase.java
   
incubator/beehive/trunk/controls/test/tools/peanut/src/org/apache/beehive/peanut/Debug.java
   
incubator/beehive/trunk/controls/test/tools/peanut/src/org/apache/beehive/peanut/TestSuiteCallTask.java
   
incubator/beehive/trunk/controls/test/tools/peanut/src/org/apache/beehive/peanut/TestSuiteTask.java
   
incubator/beehive/trunk/controls/test/tools/peanut/src/org/apache/beehive/peanut/TestTask.java
   
incubator/beehive/trunk/controls/test/tools/peanut/src/org/apache/beehive/peanut/junit/JUnitExecTask.java
   
incubator/beehive/trunk/controls/test/tools/peanut/src/org/apache/beehive/peanut/junit/JUnitRunner.java
   
incubator/beehive/trunk/controls/test/tools/peanut/src/org/apache/beehive/peanut/result/TestResult.java
   
incubator/beehive/trunk/controls/test/tools/peanut/src/org/apache/beehive/peanut/result/TestResultBean.java
   
incubator/beehive/trunk/controls/test/tools/peanut/src/org/apache/beehive/peanut/result/logger/Logger.java
   
incubator/beehive/trunk/controls/test/tools/peanut/src/org/apache/beehive/peanut/result/logger/ResultLogger.java
   
incubator/beehive/trunk/controls/test/tools/peanut/src/org/apache/beehive/peanut/result/logger/SimpleLogger.java
   
incubator/beehive/trunk/controls/test/tools/peanut/src/org/apache/beehive/peanut/util/PeanutUtils.java
   
incubator/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/ExtendedAntTask.java
   
incubator/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/JvmargTask.java
   
incubator/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/TestEntityModifier.java
   
incubator/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/TestRunner.java
   
incubator/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/TestSuiteCallTaskProvider.java
   
incubator/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/stl/ErrorMessageConstants.java
   
incubator/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/extension/process/listener/RemoteListenerMinimalConfigurationInfo.java
   
incubator/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/extension/process/listener/RemoteListenerXMLHandler.java
   
incubator/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/javatest.java
   
incubator/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/BlockUntilSocketOpen.java
   
incubator/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/xml/XMLWriter.java
   
incubator/beehive/trunk/controls/test/webapps/controlsWeb/controls/org/apache/beehive/controls/test/controls/context/ServiceGetter.java
   
incubator/beehive/trunk/controls/test/webapps/controlsWeb/controls/org/apache/beehive/controls/test/controls/event/Event2Listener.java
   
incubator/beehive/trunk/controls/test/webapps/controlsWeb/controls/org/apache/beehive/controls/test/controls/property/SingleProperty.java
   
incubator/beehive/trunk/controls/test/webapps/controlsWeb/controls/org/apache/beehive/controls/test/controls/property/SingleProperty2.java
   
incubator/beehive/trunk/netui/src/bootstrap/org/apache/beehive/netui/tools/NetUITldTagsHandler.java
   
incubator/beehive/trunk/netui/src/bootstrap/org/apache/beehive/netui/tools/ant/BuildModules.java
   
incubator/beehive/trunk/netui/src/bootstrap/org/apache/beehive/netui/tools/tld/JspTaglibSubTask.java
   
incubator/beehive/trunk/netui/src/bootstrap/org/apache/beehive/netui/tools/tldx/TldxConfigTagsHandler.java
   
incubator/beehive/trunk/netui/src/bootstrap/org/apache/beehive/netui/tools/tldx/TldxSubTask.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/AnnotationGrammar.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/AnnotationMemberType.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/BaseChecker.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/BaseGenerator.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/CompilerUtils.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/Diagnostics.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/FacesBackingChecker.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/FlowControllerChecker.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/FlowControllerGenerator.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/FlowControllerInfo.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/FormBeanChecker.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/JpfLanguageConstants.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/PageFlowChecker.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/PageFlowGenerator.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/RuntimeVersionChecker.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/SharedFlowChecker.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/SharedFlowGenerator.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/apt/BaseAnnotationProcessor.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/apt/FormBeanAnnotationProcessor.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/apt/FormBeanAnnotationProcessorFactory.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/apt/PageFlowAnnotationProcessor.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/apt/PageFlowAnnotationProcessorFactory.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/genmodel/DefaultValidatorRuleFactory.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/genmodel/GenActionModel.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/genmodel/GenActionOutputModel.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/genmodel/GenExceptionModel.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/genmodel/GenForwardModel.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/genmodel/GenMessageResourcesModel.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/genmodel/GenSharedFlowStrutsApp.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/genmodel/GenSimpleActionModel.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/genmodel/GenStrutsApp.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/genmodel/GenValidationModel.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/genmodel/ValidatorRuleFactory.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/AbsolutePathType.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ActionGrammar.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/BaseFlowControllerGrammar.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/BaseValidationRuleGrammar.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/CatchGrammar.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/CommandHandlerGrammar.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ControllerGrammar.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/EnumType.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ExceptionHandlerGrammar.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ExternalPathOrActionType.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ForwardGrammar.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/JavaIdentifierType.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/MemberFieldType.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/MemberMethodType.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/MessageKeyType.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/MessageResourcesGrammar.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/RaiseActionGrammar.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/SimpleActionGrammar.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/TypeNameType.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/UniqueValueType.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ValidXmlFileType.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ValidateCustomGrammar.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ValidateRangeGrammar.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ValidateTypeGrammar.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ValidateValidWhenGrammar.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ValidationBeanGrammar.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ValidationFieldGrammar.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ValidationLocaleRulesGrammar.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/WebappPathOrActionType.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/WebappPathType.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/WritableFieldType.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/AbstractForwardContainer.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/ActionModel.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/ActionOutputModel.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/ExceptionContainer.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/ExceptionModel.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/FormBeanModel.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/ForwardContainer.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/ForwardModel.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/MessageResourcesModel.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/NoWebInfDirectoryException.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/StrutsApp.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/StrutsElementSupport.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/validation/LocaleSet.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/validation/ValidatableEntity.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/validation/ValidatableField.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/validation/ValidationModel.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/validation/ValidatorConstants.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/validation/ValidatorRule.java
   
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/validation/ValidatorRuleRange.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ActionNotFoundException.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ActionResolver.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ActionResult.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/AutoRegisterActionServlet.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ControlFieldInitializationException.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/DynaFormData.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/DynamicSubappActionServlet.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/EmptyNestingStackException.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FacesBackingBean.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FacesBackingBeanFactory.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FlowController.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FlowControllerFactory.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FormData.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/Forward.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ForwardHandler.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/GlobalApp.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/IllegalActionOutputException.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/IllegalOutputFormException.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/IllegalOutputFormTypeException.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/IllegalPageInputException.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/IllegalRedirectOutputFormException.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/InfiniteReturnToActionException.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/LoginExpiredException.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/MismatchedActionOutputException.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/MismatchedPageInputException.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/MissingActionOutputException.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/MissingPageInputException.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/MultipartRequestUtils.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/NoCurrentPageFlowException.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/NoMatchingActionMethodException.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/NoPreviousActionException.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/NoPreviousPageException.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/NotLoggedInException.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowActionServlet.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowConstants.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowContextListener.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowController.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowException.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowFileFilter.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowJspFilter.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowManagedObject.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowManagedObjectException.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowRequestProcessor.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowStack.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowUtils.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PreviousActionInfo.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PreviousPageInfo.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ProcessPopulate.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/RequestParameterHandler.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/RequestVariables.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ServerAdapter.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/SharedFlowController.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/StrutsModule.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/StrutsModuleFactory.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/UnfulfilledRolesException.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/UnresolvableForwardException.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/Validatable.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/annotations/Jpf.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/config/PageFlowActionForward.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/config/PageFlowActionMapping.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/config/PageFlowControllerConfig.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/config/PageFlowExceptionConfig.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/faces/BackingClassMethodBinding.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/faces/BackingClassVariableResolver.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/faces/PageFlowApplication.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/faces/PageFlowApplicationFactory.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/faces/PageFlowViewHandler.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/handler/ExceptionsHandler.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/handler/ForwardRedirectHandler.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/handler/Handler.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/handler/LoginHandler.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/handler/ReloadableClassHandler.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/ActionInterceptor.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/ActionInterceptorChain.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/ActionInterceptorChainConfig.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/ActionInterceptorConfig.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/ActionInterceptorsConfig.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/InterceptorForward.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/OriginalForward.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/ActionResultImpl.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/AnyBeanActionForm.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/BindingUpdateError.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/CachedPageFlowInfo.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/ContextCache.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultExceptionsHandler.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultForwardRedirectHandler.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultHandler.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultLoginHandler.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultReloadableClassHandler.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultServerAdapter.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/FlowControllerAction.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/InternalConstants.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/InternalExpressionUtils.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/InternalUtils.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/JavaControlUtils.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/RequestValues.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/ResponseOutputException.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/ReturnToException.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/XmlBeanActionForm.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/DOMUtils.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/DefaultURLRewriter.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/PageflowTagUtils.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/TemplateHelper.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/URLRewriter.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/URLRewriterService.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/UrlTemplateDescriptor.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/validation/ValidatorRules.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/Expression.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionEngineFactory.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionEvaluationException.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionEvaluator.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionEvaluatorFactory.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionUpdateException.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/IllegalExpressionException.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/RuntimeExpressionException.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/AbstractScriptableMap.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/BundleContext.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/BundleMap.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/ContextFactory.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/DataAccessProviderBean.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/DataAccessProviderStack.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/IDataAccessProvider.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/ImplicitObjectBean.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/ImplicitObjectUtil.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/ScriptablePageInput.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/ExpressionEvaluatorImpl.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/ExpressionParseException.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/ExpressionTerm.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/LiteralTerm.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/NetUIReadVariableResolver.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/NetUIUpdateVariableResolver.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/NetUIVariableResolver.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/ParsedExpression.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/Term.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/NetUIELParser.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/NetUIELParserConstants.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/NetUIELParserTokenManager.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/ParseException.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/SimpleCharStream.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/Token.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/TokenMgrError.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/ArrayIndexToken.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/ContextToken.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/ExpressionToken.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/IdentifierToken.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/MapKeyToken.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/AbstractAttributeMap.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/ApplicationAttributeMap.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/BindingContext.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/PageContextAttributeMap.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/ParseUtils.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/RequestAttributeMap.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/RequestParameterMap.java
   
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/SessionAttributeMap.java
   
incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/ScopedRequest.java
   
incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/ScopedResponse.java
   
incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/ScopedServletUtils.java
   
incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/internal/AttributeContainer.java
   
incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/internal/ParseUtils.java
   
incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/internal/ScopedAttributeContainer.java
   
incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/internal/ScopedRequestDispatcher.java
   
incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/internal/ScopedRequestImpl.java
   
incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/internal/ScopedResponseImpl.java
   
incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/internal/ScopedServletConfig.java
   
incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/internal/ScopedSession.java
   
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/ColumnModel.java
   
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/DataGridModel.java
   
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/IFilter.java
   
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/ISort.java
   
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/PagerModel.java
   
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/StylePolicy.java
   
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl/AbstractHtmlColumnModel.java
   
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl/AnchorColumnModel.java
   
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl/DefaultFilter.java
   
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl/DefaultSort.java
   
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl/DefaultStylePolicy.java
   
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl/EmptyStylePolicy.java
   
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl/ImageColumnModel.java
   
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl/LiteralColumnModel.java
   
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/IPagerRenderer.java
   
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/TableRenderer.java
   
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/impl/AbstractPagerRenderer.java
   
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/impl/FirstPreviousNextLastPagerRenderer.java
   
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/impl/PreviousNextPagerRenderer.java
   
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/FilterService.java
   
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/IllegalFilterException.java
   
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/PagerService.java
   
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/SortService.java
   
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/JspUtil.java
   
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/PagedDataSet.java
   
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/script/el/BundleVariableResolver.java
   
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/script/el/ContainerVariableResolver.java
   
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/base/StructuredBaseTag.java
   
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/base/style/AbstractStyleBean.java
   
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/bundle/DeclareBundle.java
   
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/cellrepeater/CellRepeater.java
   
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/cellrepeater/style/CellRepeaterStyleBean.java
   
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractColumn.java
   
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractHtmlColumn.java
   
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AnchorColumn.java
   
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Caption.java
   
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Columns.java
   
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ConfigurePager.java
   
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/DataGrid.java
   
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Footer.java
   
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ImageColumn.java
   
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/LiteralColumn.java
   
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/RenderPager.java
   
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/invoke/AbstractCallMethod.java
   
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/invoke/CallMethod.java
   
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/invoke/CallPageFlow.java
   
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/invoke/MethodParameter.java
   
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/invoke/ObjectNotFoundException.java
   
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/message/Message.java
   
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/message/MessageArg.java
   
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/pageinput/DeclarePageInput.java
   
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/Repeater.java
   
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/RepeaterComponent.java
   
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/RepeaterFooter.java
   
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/RepeaterHeader.java
   
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/RepeaterItem.java
   
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/pad/Pad.java
   
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/pad/PadContext.java
   
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/script/GetData.java
   
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/xml/SerializeXML.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/AbstractClassicTag.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/AbstractPageError.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/DataSourceTag.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/EvalErrorInfo.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/HtmlUtils.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IAttributeConsumer.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IErrorCollector.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IErrorReporter.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IHtmlAccessable.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IHtmlAttrs.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IHtmlCore.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IHtmlEvents.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IHtmlI18n.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IHtmlIdWriter.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IScriptReporter.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/TagErrorInfo.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Anchor.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Attribute.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Base.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/BindingUpdateErrors.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Body.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Button.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/CheckBox.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/CheckBoxGroup.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/CheckBoxOption.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Content.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Error.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ErrorBaseTag.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Errors.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Exceptions.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FileUpload.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Form.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormatDate.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormatNumber.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormatString.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormatTag.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Formattable.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Hidden.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Html.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlBaseTag.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlConstants.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlDataSourceTag.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlDefaultableDataSourceTag.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlFocusBaseTag.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlGroupBaseTag.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlOptionsDataSourceTag.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Image.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ImageAnchor.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ImageButton.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/JavaScriptUtils.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Label.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/LabelBase.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Parameter.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ParameterMap.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RadioButtonGroup.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RadioButtonOption.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RewriteName.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RewriteURL.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ScriptContainer.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ScriptHeader.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Select.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/SelectOption.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Span.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/TextArea.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/TextBox.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/URLParams.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/naming/FormDataNameInterceptor.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/naming/IndexedNameInterceptor.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/naming/NameInterceptor.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/naming/PrefixNameInterceptor.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/AbstractAttributeState.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/AbstractHtmlState.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/AbstractTagState.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/AnchorTag.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/BaseTag.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/BodyTag.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/CaptionTag.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/ConstantRendering.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/DivTag.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/FormTag.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/HtmlTag.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/ImageTag.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputBooleanTag.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputFileTag.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputHiddenTag.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputImageTag.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputSubmitTag.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputTextTag.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/LabelTag.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/OptionTag.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/SelectTag.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/SpanTag.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TableTag.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TagHtmlBase.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TagRenderingBase.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TdTag.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TextAreaTag.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TrTag.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/AttributeRenderer.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/Tree.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeContent.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeElement.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeHelpers.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeHtmlAttribute.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeHtmlAttributeInfo.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeItem.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeLabel.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreePropertyOverride.java
   
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeRootElement.java
   
incubator/beehive/trunk/netui/src/tags-template/org/apache/beehive/netui/tags/template/Attribute.java
   
incubator/beehive/trunk/netui/src/tags-template/org/apache/beehive/netui/tags/template/DivPanel.java
   
incubator/beehive/trunk/netui/src/tags-template/org/apache/beehive/netui/tags/template/IncludeSection.java
   
incubator/beehive/trunk/netui/src/tags-template/org/apache/beehive/netui/tags/template/Section.java
   
incubator/beehive/trunk/netui/src/tags-template/org/apache/beehive/netui/tags/template/SetAttribute.java
   
incubator/beehive/trunk/netui/src/tags-template/org/apache/beehive/netui/tags/template/Template.java
   
incubator/beehive/trunk/netui/src/tags-template/org/apache/beehive/netui/tags/template/TemplateConstants.java
   
incubator/beehive/trunk/netui/src/tomcat-common/4x/org/apache/beehive/netui/tomcat/PageflowHelper.java
   
incubator/beehive/trunk/netui/src/tomcat-server/4x/org/apache/beehive/netui/tomcat/PageflowHelperImpl.java
   
incubator/beehive/trunk/netui/src/tomcat-server/4x/org/apache/beehive/netui/tomcat/PageflowValve.java
   
incubator/beehive/trunk/netui/src/tomcat-webapp/4x/org/apache/beehive/netui/tomcat/TomcatServerAdapter.java
   
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/Bundle.java
   
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/FileUtils.java
   
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/HtmlExceptionFormatter.java
   
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/ParamHelper.java
   
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/ServletUtils.java
   
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/TemplateHelper.java
   
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/cache/ClassLevelCache.java
   
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/cache/MethodCache.java
   
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/cache/PropertyCache.java
   
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/cache/ServletContextCache.java
   
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/classloader/BouncyClassLoader.java
   
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/ConfigInitializationException.java
   
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/ConfigUtil.java
   
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/exception/LocalizedIllegalArgumentException.java
   
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/exception/LocalizedIllegalStateException.java
   
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/exception/LocalizedUnsupportedOperationException.java
   
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/ArrayIterator.java
   
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/AtomicObjectIterator.java
   
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/EmptyIterator.java
   
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/EnumerationIterator.java
   
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/IteratorFactory.java
   
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/IteratorFactoryException.java
   
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/MapIterator.java
   
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/ResultSetIterator.java
   
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/logging/Logger.java
   
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/logging/StrutsLogFactory.java
   
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/logging/StrutsLogger.java
   
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/tags/GroupOption.java
   
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/BaseTypeConverter.java
   
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/DelegatingTypeConverter.java
   
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/TypeConversionException.java
   
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/TypeConverter.java
   
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/TypeConverterNotFoundException.java
   
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/TypeUtils.java
   
incubator/beehive/trunk/netui/test/src/fauxServlet/org/apache/beehive/netui/test/servlet/FauxPageContext.java
   
incubator/beehive/trunk/netui/test/src/fauxServlet/org/apache/beehive/netui/test/servlet/HttpServletRequestHandler.java
   
incubator/beehive/trunk/netui/test/src/fauxServlet/org/apache/beehive/netui/test/servlet/HttpServletResponseHandler.java
   
incubator/beehive/trunk/netui/test/src/fauxServlet/org/apache/beehive/netui/test/servlet/ServletFactory.java
   
incubator/beehive/trunk/netui/test/src/fauxServlet/org/apache/beehive/netui/test/servlet/ServletHandler.java
   
incubator/beehive/trunk/netui/test/src/junitTests/com/bea/netuix/servlets/script/PortalVariableResolver.java
   
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/databinding/expression/IndexedNameTest.java
   
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/AbstractExpressionTest.java
   
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/AccessTest.java
   
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/BundleScriptTest.java
   
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ExpressionTest.java
   
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ExpressionTestError.java
   
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ExpressionUpdateTest.java
   
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/PageInputTest.java
   
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ParsedExpressionTest.java
   
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ProcessPopulateTest.java
   
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELAccessTest.java
   
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELBundleScriptTest.java
   
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELCustomBindingContextTest.java
   
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELExpressionObjectTest.java
   
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELExpressionTest.java
   
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELExpressionUpdateTest.java
   
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELPageInputTest.java
   
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELParsedExpressionTest.java
   
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/simpleaction/InternalExpressionUtilsTest.java
   
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/tools/AssertHelper.java
   
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/ConfigTest.java
   
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/iterator/IteratorFactoryTest.java
   
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/type/TypeUtilsTest.java
   
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/util/config/ConfigUtil.java
   
incubator/beehive/trunk/netui/test/src/testBeans/org/apache/beehive/netui/test/beans/BarJavaBean.java
   
incubator/beehive/trunk/netui/test/src/testBeans/org/apache/beehive/netui/test/beans/ComplexTypeActionForm.java
   
incubator/beehive/trunk/netui/test/src/testBeans/org/apache/beehive/netui/test/beans/FooJavaBean.java
   
incubator/beehive/trunk/netui/test/src/testBeans/org/apache/beehive/netui/test/beans/IProduct.java
   
incubator/beehive/trunk/netui/test/src/testBeans/org/apache/beehive/netui/test/beans/Product.java
   
incubator/beehive/trunk/netui/test/src/testBeans/org/apache/beehive/netui/test/beans/SimpleTypeActionForm.java
   
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/client/MasterTestRecorderJUnitTest.java
   
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/client/PlaybackException.java
   
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/client/PlaybackExecutor.java
   
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/client/TestRecorderJUnitTest.java
   
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/AbstractDiffEngine.java
   
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/DefaultFilterData.java
   
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/DiffEngine.java
   
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/DiffEngineFactory.java
   
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/FilterData.java
   
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/LineDiffEngine.java
   
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/ResponseWrapper.java
   
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/TestRecorderFilter.java
   
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/TestRecorderServlet.java
   
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/serverAdapter/AbstractServerAdapter.java
   
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/serverAdapter/DefaultServerAdapter.java
   
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/serverAdapter/ServerAdapter.java
   
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/serverAdapter/ServerAdapterUtils.java
   
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/serverAdapter/WeblogicServerAdapter.java
   
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/state/PlaybackSession.java
   
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/state/PlaybackSessionImpl.java
   
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/state/RecordSession.java
   
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/state/RecordSessionImpl.java
   
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/state/Session.java
   
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/state/SessionFailedException.java
   
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/state/SessionImpl.java
   
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/state/State.java
   
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/Constants.java
   
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/DiffFailedException.java
   
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/Logger.java
   
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/NVPair.java
   
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/PlaybackSessionBean.java
   
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/RecordSessionBean.java
   
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/Reporter.java
   
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/RequestData.java
   
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/ResponseData.java
   
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/SessionBean.java
   
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/SessionXMLException.java
   
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/TestResults.java
   
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/Util.java
   
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/config/Categories.java
   
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/config/Category.java
   
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/config/Config.java
   
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/config/ConfigException.java
   
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/config/RuntimeConfigException.java
   
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/config/ServerConfig.java
   
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/config/ServerDefinition.java
   
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/config/TestDefinition.java
   
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/config/TestDefinitions.java
   
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/config/WebappConfig.java
   
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/config/WebappDefinition.java
   
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/config/Webapps.java
   
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/util/DateHelper.java
   
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/util/StringHelper.java
   
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/xmlbeans/XMLHelper.java
   
incubator/beehive/trunk/netui/test/src/testRecorderQA/org/apache/beehive/netui/tools/testrecorder/qa/PropertiesHelper.java
   
incubator/beehive/trunk/netui/test/src/testRecorderQA/org/apache/beehive/netui/tools/testrecorder/qa/SchemaTest.java
   
incubator/beehive/trunk/netui/test/src/testRecorderQA/org/apache/beehive/netui/tools/testrecorder/qa/SessionSchemaTest.java
   
incubator/beehive/trunk/netui/test/src/testRecorderQA/org/apache/beehive/netui/tools/testrecorder/qa/TRTestCase.java
   
incubator/beehive/trunk/netui/test/src/tools/org/apache/beehive/netui/tools/ant/junit/JUnitTask.java
   
incubator/beehive/trunk/netui/test/src/tools/org/apache/beehive/netui/tools/ant/junit/JUnitTestFilter.java
   
incubator/beehive/trunk/netui/test/src/tools/org/apache/beehive/netui/tools/ant/junit/JarClassLoader.java
   
incubator/beehive/trunk/netui/test/src/tools/org/apache/beehive/netui/tools/ant/junit/PropertyFileTestFilter.java
   
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/databinding/SimpleJavaBean.java
   
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/databinding/callMethod/CallMethodType.java
   
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/databinding/type/Person.java
   
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/formBean/test1/FormBeanTest1Form1.java
   
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/formBean/test1/Struts1.java
   
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/formBean/test1/Struts2.java
   
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/formBean/test2/FormBeanTest2Form1.java
   
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/formBean/test2/Struts1.java
   
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/formBean/test2/Struts2.java
   
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/formBean/test2/Struts3.java
   
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/formBean/test2/Struts4.java
   
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/interOp/test1/Struts1.java
   
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miscJpf/test13/LoadStruts.java
   
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miscJpf/test13/SubmitAction.java
   
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miscJpf/test13/SubmitForm.java
   
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/mockportal/MockPortalTag.java
   
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/mockportal/MockPortalUrlRewriter.java
   
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/mockportal/MockPortletTag.java
   
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/models/UserInfo.java
   
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/moduleConfigLocator/Locator1.java
   
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/moduleConfigLocator/Locator2.java
   
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/org/apache/beehive/netui/test/databinding/beans/b40682.java
   
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/qaUtil/PageLogger.java
   
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/shared/ClassA.java
   
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/shared/ClassB.java
   
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/shared/ClassC.java
   
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/shared/ClassD.java
   
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/shared/ClassE.java
   
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/shared/ClassF.java
   
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/shared/ClassG.java
   
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/shared/ClassH.java
   
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/shared/ClassI.java
   
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/shared/ClassJ.java
   
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/shared/ClassK.java
   
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/shared/FormA.java
   
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/shared/QaTrace.java
   
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/strutsMerge/test4/Form2.java
   
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/strutsMerge/test7/Form1.java
   
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/strutsMerge/test7/Struts1.java
   
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/util/SerializableTestClass.java
   
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/controls/methodTest/MethodTest.java
   
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/controls/PortfolioControl.java
   
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miscJpf/bug21124/Ctrl.java
   
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/lifecycle/TestControl.java
   
incubator/beehive/trunk/netui/test/webapps/jsf/jsfWeb/WEB-INF/src/faces/facesSmoke/ActionListen.java
   
incubator/beehive/trunk/netui/test/webapps/jsf/jsfWeb/WEB-INF/src/faces/facesSmoke/Backing.java
   
incubator/beehive/trunk/netui/test/webapps/jsf/jsfWeb/WEB-INF/src/faces/facesSmoke/CustomRenderBacking.java
   
incubator/beehive/trunk/netui/test/webapps/jsf/jsfWeb/WEB-INF/src/faces/facesSmoke/TestValidator.java
   
incubator/beehive/trunk/netui/test/webapps/jsf/jsfWeb/WEB-INF/src/faces/facesSmoke/ValueChangeListen.java
   
incubator/beehive/trunk/netui/test/webapps/jsf/jsfWeb/backingControls/TestControl.java
   
incubator/beehive/trunk/netui/test/webapps/webappBuild-test/webappBuild-test/WEB-INF/src/org/acme/beans/ProductBean.java
Log:
Fixed up the copyright headers to show 'Copyright 2004 The Apache Software 
Foundation.'.



Modified: 
incubator/beehive/trunk/controls/drt/controls/org/apache/beehive/controls/test/beaninfo/InfoTest.java
==============================================================================
--- 
incubator/beehive/trunk/controls/drt/controls/org/apache/beehive/controls/test/beaninfo/InfoTest.java
       (original)
+++ 
incubator/beehive/trunk/controls/drt/controls/org/apache/beehive/controls/test/beaninfo/InfoTest.java
       Mon Aug 30 15:07:46 2004
@@ -1,53 +1,53 @@
-package org.apache.beehive.controls.test.beaninfo;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Target;
-
-import org.apache.beehive.controls.api.bean.ControlInterface;
-import org.apache.beehive.controls.api.packaging.FeatureAttribute;
-import org.apache.beehive.controls.api.packaging.FeatureInfo;
-import org.apache.beehive.controls.api.packaging.PropertyInfo;
-import org.apache.beehive.controls.api.packaging.ManifestAttribute;
-import org.apache.beehive.controls.api.packaging.ManifestAttributes;
-import org.apache.beehive.controls.api.properties.PropertySet;
-
-/**
- * A simple test class that tests using JSR-175 annotations to inject BeanInfo 
attributes
- * for a Control type.
- */
[EMAIL PROTECTED]
-/* THE B51 VANILLA APT PROCESSOR BARFS ON THIS RIGHT NOW 
[EMAIL PROTECTED] (value={
-    @ManifestAttribute(name="Attribute1", value="Value1"),
-    @ManifestAttribute(name="Attribute2", value="Value2"),
-    @ManifestAttribute(name="Attribute3", value="Value3")
-}) */
[EMAIL PROTECTED](name="Attribute1", value="Value1")
[EMAIL PROTECTED](
-    name="InfoTest name", 
-    displayName="InfoTest display name"
-    /*
-    attributes=
-    {
-        @FeatureAttribute(name="fa1", value="fv1"),
-        @FeatureAttribute(name="fa2", value="fv2")
-    }
-    */
-)
-public interface InfoTest
-{
-    @PropertySet
-    @Retention(RetentionPolicy.RUNTIME) 
-    @Target( {ElementType.TYPE, ElementType.FIELD} )
-    public @interface TestProps
-    {
-        @PropertyInfo(bound=true, constrained=false)
-        @FeatureInfo(name="InfoTest prop1", displayName="InfoTest prop1")
-        public int prop1();
-
-        public boolean prop2();
-    }
-
-}
+package org.apache.beehive.controls.test.beaninfo;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+
+import org.apache.beehive.controls.api.bean.ControlInterface;
+import org.apache.beehive.controls.api.packaging.FeatureAttribute;
+import org.apache.beehive.controls.api.packaging.FeatureInfo;
+import org.apache.beehive.controls.api.packaging.PropertyInfo;
+import org.apache.beehive.controls.api.packaging.ManifestAttribute;
+import org.apache.beehive.controls.api.packaging.ManifestAttributes;
+import org.apache.beehive.controls.api.properties.PropertySet;
+
+/**
+ * A simple test class that tests using JSR-175 annotations to inject BeanInfo 
attributes
+ * for a Control type.
+ */
[EMAIL PROTECTED]
+/* THE B51 VANILLA APT PROCESSOR BARFS ON THIS RIGHT NOW 
[EMAIL PROTECTED] (value={
+    @ManifestAttribute(name="Attribute1", value="Value1"),
+    @ManifestAttribute(name="Attribute2", value="Value2"),
+    @ManifestAttribute(name="Attribute3", value="Value3")
+}) */
[EMAIL PROTECTED](name="Attribute1", value="Value1")
[EMAIL PROTECTED](
+    name="InfoTest name", 
+    displayName="InfoTest display name"
+    /*
+    attributes=
+    {
+        @FeatureAttribute(name="fa1", value="fv1"),
+        @FeatureAttribute(name="fa2", value="fv2")
+    }
+    */
+)
+public interface InfoTest
+{
+    @PropertySet
+    @Retention(RetentionPolicy.RUNTIME) 
+    @Target( {ElementType.TYPE, ElementType.FIELD} )
+    public @interface TestProps
+    {
+        @PropertyInfo(bound=true, constrained=false)
+        @FeatureInfo(name="InfoTest prop1", displayName="InfoTest prop1")
+        public int prop1();
+
+        public boolean prop2();
+    }
+
+}

Modified: 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/ControlException.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/ControlException.java
      (original)
+++ 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/ControlException.java
      Mon Aug 30 15:07:46 2004
@@ -1,7 +1,6 @@
 package org.apache.beehive.controls.api;
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/assembly/DefaultControlAssembler.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/assembly/DefaultControlAssembler.java
      (original)
+++ 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/assembly/DefaultControlAssembler.java
      Mon Aug 30 15:07:46 2004
@@ -1,7 +1,6 @@
 package org.apache.beehive.controls.api.assembly;
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/ControlBean.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/ControlBean.java
      (original)
+++ 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/ControlBean.java
      Mon Aug 30 15:07:46 2004
@@ -1,7 +1,6 @@
 package org.apache.beehive.controls.api.bean;
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/ControlChecker.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/ControlChecker.java
   (original)
+++ 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/ControlChecker.java
   Mon Aug 30 15:07:46 2004
@@ -1,7 +1,6 @@
 package org.apache.beehive.controls.api.bean;
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/ControlExtension.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/ControlExtension.java
 (original)
+++ 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/ControlExtension.java
 Mon Aug 30 15:07:46 2004
@@ -1,7 +1,6 @@
 package org.apache.beehive.controls.api.bean;
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/ControlImplementation.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/ControlImplementation.java
    (original)
+++ 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/ControlImplementation.java
    Mon Aug 30 15:07:46 2004
@@ -1,7 +1,6 @@
 package org.apache.beehive.controls.api.bean;
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/ControlInterface.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/ControlInterface.java
 (original)
+++ 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/ControlInterface.java
 Mon Aug 30 15:07:46 2004
@@ -1,7 +1,6 @@
 package org.apache.beehive.controls.api.bean;
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/DefaultControlChecker.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/DefaultControlChecker.java
    (original)
+++ 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/DefaultControlChecker.java
    Mon Aug 30 15:07:46 2004
@@ -1,7 +1,6 @@
 package org.apache.beehive.controls.api.bean;
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/Extensible.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/Extensible.java
       (original)
+++ 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/Extensible.java
       Mon Aug 30 15:07:46 2004
@@ -1,7 +1,6 @@
 package org.apache.beehive.controls.api.bean;
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/context/Context.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/context/Context.java
       (original)
+++ 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/context/Context.java
       Mon Aug 30 15:07:46 2004
@@ -1,7 +1,6 @@
 package org.apache.beehive.controls.api.context;
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/context/ControlBeanContext.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/context/ControlBeanContext.java
    (original)
+++ 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/context/ControlBeanContext.java
    Mon Aug 30 15:07:46 2004
@@ -1,7 +1,6 @@
 package org.apache.beehive.controls.api.context;
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/context/ControlHandle.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/context/ControlHandle.java
 (original)
+++ 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/context/ControlHandle.java
 Mon Aug 30 15:07:46 2004
@@ -1,47 +1,46 @@
-package org.apache.beehive.controls.api.context;
-/*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
- *
- * 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.
- *
- * $Header:$
- */
-
-import java.lang.reflect.InvocationTargetException;
-
-/**
- * The ControlHandle interface defines a reference object to a control 
instance that enables
- * control events to be fired on the control.  Control container 
implementations will provide
- * implementation of this interface that use container-specific dispatch 
mechanisms to locate
- * the appropriate control container instance when events are fired.
- */
-public interface ControlHandle
-{
-    /**
-     * Returns the controlID of the target control referenced by this handle
-     */
-    public String getControlID();
-
-    /**
-     * Invokes the named operation on the target control referenced by this 
handle.
-     */
-    public Object invokeOperation(String operationName, Object [] args) 
-                  throws InvocationTargetException;
-
-    /**
-     * Delivers the specified event to the target control referenced by this 
handle.
-     */
-    public Object sendEvent(String eventSet, String eventName, Object [] args) 
-                  throws InvocationTargetException;
-}
+package org.apache.beehive.controls.api.context;
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * 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.
+ *
+ * $Header:$
+ */
+
+import java.lang.reflect.InvocationTargetException;
+
+/**
+ * The ControlHandle interface defines a reference object to a control 
instance that enables
+ * control events to be fired on the control.  Control container 
implementations will provide
+ * implementation of this interface that use container-specific dispatch 
mechanisms to locate
+ * the appropriate control container instance when events are fired.
+ */
+public interface ControlHandle
+{
+    /**
+     * Returns the controlID of the target control referenced by this handle
+     */
+    public String getControlID();
+
+    /**
+     * Invokes the named operation on the target control referenced by this 
handle.
+     */
+    public Object invokeOperation(String operationName, Object [] args) 
+                  throws InvocationTargetException;
+
+    /**
+     * Delivers the specified event to the target control referenced by this 
handle.
+     */
+    public Object sendEvent(String eventSet, String eventName, Object [] args) 
+                  throws InvocationTargetException;
+}

Modified: 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/context/ResourceContext.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/context/ResourceContext.java
       (original)
+++ 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/context/ResourceContext.java
       Mon Aug 30 15:07:46 2004
@@ -1,7 +1,6 @@
 package org.apache.beehive.controls.api.context;
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/events/Client.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/events/Client.java
 (original)
+++ 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/events/Client.java
 Mon Aug 30 15:07:46 2004
@@ -1,7 +1,6 @@
 package org.apache.beehive.controls.api.events;
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/events/EventHandler.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/events/EventHandler.java
   (original)
+++ 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/events/EventHandler.java
   Mon Aug 30 15:07:46 2004
@@ -1,7 +1,6 @@
 package org.apache.beehive.controls.api.events;
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/events/EventSet.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/events/EventSet.java
       (original)
+++ 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/events/EventSet.java
       Mon Aug 30 15:07:46 2004
@@ -1,7 +1,6 @@
 package org.apache.beehive.controls.api.events;
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/packaging/FeatureAttribute.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/packaging/FeatureAttribute.java
    (original)
+++ 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/packaging/FeatureAttribute.java
    Mon Aug 30 15:07:46 2004
@@ -1,38 +1,37 @@
-package org.apache.beehive.controls.api.packaging;
-
-/*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
- *
- * 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.
- *
- * $Header:$
- */
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Target;
-
-/**
- * The FeatureAttribute annotation type defines a JSR-175 syntax for 
specifying JavaBean
- * FeatureDescriptor attributes associated with a Control.
- *
- * @see org.apache.beehive.controls.api.packaging.FeatureInfo 
- */
-public @interface FeatureAttribute
-{
-    /* Specifies the feature attribute name */
-    public String name();
-
-    /* Specifies the feature attribute value */
-    public String value();
-}
+package org.apache.beehive.controls.api.packaging;
+
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * 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.
+ *
+ * $Header:$
+ */
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+
+/**
+ * The FeatureAttribute annotation type defines a JSR-175 syntax for 
specifying JavaBean
+ * FeatureDescriptor attributes associated with a Control.
+ *
+ * @see org.apache.beehive.controls.api.packaging.FeatureInfo 
+ */
+public @interface FeatureAttribute
+{
+    /* Specifies the feature attribute name */
+    public String name();
+
+    /* Specifies the feature attribute value */
+    public String value();
+}

Modified: 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/packaging/FeatureInfo.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/packaging/FeatureInfo.java
 (original)
+++ 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/packaging/FeatureInfo.java
 Mon Aug 30 15:07:46 2004
@@ -1,45 +1,44 @@
-package org.apache.beehive.controls.api.packaging;
-
-/*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
- *
- * 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.
- *
- * $Header:$
- */
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Target;
-
-/**
- * The FeatureInfo annotation type defines a JSR-175 syntax for annotating a 
Control to
- * provide BeanInfo FeatureDescriptor information for the bean, its 
properties, methods,
- * or events.
- * <p>
- * The elements of FeatureInfo correspond 1-to-1 with the information exposed 
by the
- * <code>java.beans.FeatureDescriptor</code> class.
- * 
- * @see java.beans.FeatureDescriptor
- */
[EMAIL PROTECTED]({ElementType.TYPE, ElementType.METHOD})
-public @interface FeatureInfo
-{
-    public String displayName() default "";           // default: use 
reflection name
-    public String name() default "";                  // default: use 
reflection name
-    public String shortDescription() default "";
-    public boolean isExpert() default false;
-    public boolean isHidden() default false;
-    public boolean isPreferred() default false;
-    public FeatureAttribute [] attributes() default {};
-}
+package org.apache.beehive.controls.api.packaging;
+
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * 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.
+ *
+ * $Header:$
+ */
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+
+/**
+ * The FeatureInfo annotation type defines a JSR-175 syntax for annotating a 
Control to
+ * provide BeanInfo FeatureDescriptor information for the bean, its 
properties, methods,
+ * or events.
+ * <p>
+ * The elements of FeatureInfo correspond 1-to-1 with the information exposed 
by the
+ * <code>java.beans.FeatureDescriptor</code> class.
+ * 
+ * @see java.beans.FeatureDescriptor
+ */
[EMAIL PROTECTED]({ElementType.TYPE, ElementType.METHOD})
+public @interface FeatureInfo
+{
+    public String displayName() default "";           // default: use 
reflection name
+    public String name() default "";                  // default: use 
reflection name
+    public String shortDescription() default "";
+    public boolean isExpert() default false;
+    public boolean isHidden() default false;
+    public boolean isPreferred() default false;
+    public FeatureAttribute [] attributes() default {};
+}

Modified: 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/packaging/ManifestAttribute.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/packaging/ManifestAttribute.java
   (original)
+++ 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/packaging/ManifestAttribute.java
   Mon Aug 30 15:07:46 2004
@@ -1,39 +1,38 @@
-package org.apache.beehive.controls.api.packaging;
-
-/*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
- *
- * 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.
- *
- * $Header:$
- */
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Target;
-
-/**
- * The ManifestAttribute annotation type defines a JSR-175 syntax for 
specifying JAR
- * manifest attributes associated with a control type.   The Beehive Controls 
packaging
- * support will process these annotation during the construction of a JAR file 
that
- * contains Controls.
- */
[EMAIL PROTECTED]({ElementType.TYPE})
-public @interface ManifestAttribute
-{
-    /* Specifies the manifest attribute name */
-    public String name();
-
-    /* Specifies the manifest attribute value */
-    public String value();
-}
+package org.apache.beehive.controls.api.packaging;
+
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * 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.
+ *
+ * $Header:$
+ */
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+
+/**
+ * The ManifestAttribute annotation type defines a JSR-175 syntax for 
specifying JAR
+ * manifest attributes associated with a control type.   The Beehive Controls 
packaging
+ * support will process these annotation during the construction of a JAR file 
that
+ * contains Controls.
+ */
[EMAIL PROTECTED]({ElementType.TYPE})
+public @interface ManifestAttribute
+{
+    /* Specifies the manifest attribute name */
+    public String name();
+
+    /* Specifies the manifest attribute value */
+    public String value();
+}

Modified: 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/packaging/ManifestAttributes.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/packaging/ManifestAttributes.java
  (original)
+++ 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/packaging/ManifestAttributes.java
  Mon Aug 30 15:07:46 2004
@@ -1,36 +1,35 @@
-package org.apache.beehive.controls.api.packaging;
-
-/*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
- *
- * 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.
- *
- * $Header:$
- */
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Target;
-
-/**
- * The ManifestAttributes annotation type enables a set of manifest attributes 
attributes
- * to be defined for a given control type.
- * 
- * @see org.apache.beehive.controls.api.packaging.ManifestAttribute
- */
[EMAIL PROTECTED]({ElementType.TYPE})
-public @interface ManifestAttributes
-{
-    /* Specifies the set of ManifestAttribute annotation values */
-    public ManifestAttribute [] value();
-}
+package org.apache.beehive.controls.api.packaging;
+
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * 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.
+ *
+ * $Header:$
+ */
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+
+/**
+ * The ManifestAttributes annotation type enables a set of manifest attributes 
attributes
+ * to be defined for a given control type.
+ * 
+ * @see org.apache.beehive.controls.api.packaging.ManifestAttribute
+ */
[EMAIL PROTECTED]({ElementType.TYPE})
+public @interface ManifestAttributes
+{
+    /* Specifies the set of ManifestAttribute annotation values */
+    public ManifestAttribute [] value();
+}

Modified: 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/packaging/PropertyInfo.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/packaging/PropertyInfo.java
        (original)
+++ 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/packaging/PropertyInfo.java
        Mon Aug 30 15:07:46 2004
@@ -1,40 +1,39 @@
-package org.apache.beehive.controls.api.packaging;
-
-/*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
- *
- * 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.
- *
- * $Header:$
- */
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Target;
-
-/**
- * The PropertyInfo annotation type defines a JSR-175 syntax for annotating a 
Control 
- * property declaration to provide java.beans.PropertyDescriptor information.  
Generic
- * feature information is defined using the <code>FeatureInfo</code> 
annotation type
- * <p>
- * The elements of PropertyInfo correspond 1-to-1 with the information exposed 
by the
- * <code>java.beans.PropertyDescriptor</code> class.
- * 
- * @see java.beans.PropertyDescriptor
- */
[EMAIL PROTECTED]({ElementType.METHOD})   // appears on PropertySet method 
declaration (i.e. properties)
-public @interface PropertyInfo
-{
-    public boolean bound() default false;         // Sends PropertyChange 
events
-    public boolean constrained() default false;   // Sends VetoableChange 
events
-}
+package org.apache.beehive.controls.api.packaging;
+
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * 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.
+ *
+ * $Header:$
+ */
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+
+/**
+ * The PropertyInfo annotation type defines a JSR-175 syntax for annotating a 
Control 
+ * property declaration to provide java.beans.PropertyDescriptor information.  
Generic
+ * feature information is defined using the <code>FeatureInfo</code> 
annotation type
+ * <p>
+ * The elements of PropertyInfo correspond 1-to-1 with the information exposed 
by the
+ * <code>java.beans.PropertyDescriptor</code> class.
+ * 
+ * @see java.beans.PropertyDescriptor
+ */
[EMAIL PROTECTED]({ElementType.METHOD})   // appears on PropertySet method 
declaration (i.e. properties)
+public @interface PropertyInfo
+{
+    public boolean bound() default false;         // Sends PropertyChange 
events
+    public boolean constrained() default false;   // Sends VetoableChange 
events
+}

Modified: 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/properties/AnnotatedElementMap.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/properties/AnnotatedElementMap.java
        (original)
+++ 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/properties/AnnotatedElementMap.java
        Mon Aug 30 15:07:46 2004
@@ -1,7 +1,6 @@
 package org.apache.beehive.controls.api.properties;
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/properties/BaseMap.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/properties/BaseMap.java
    (original)
+++ 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/properties/BaseMap.java
    Mon Aug 30 15:07:46 2004
@@ -1,7 +1,6 @@
 package org.apache.beehive.controls.api.properties;
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/properties/BeanPropertyMap.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/properties/BeanPropertyMap.java
    (original)
+++ 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/properties/BeanPropertyMap.java
    Mon Aug 30 15:07:46 2004
@@ -1,7 +1,6 @@
 package org.apache.beehive.controls.api.properties;
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/properties/PropertyKey.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/properties/PropertyKey.java
        (original)
+++ 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/properties/PropertyKey.java
        Mon Aug 30 15:07:46 2004
@@ -1,7 +1,6 @@
 package org.apache.beehive.controls.api.properties;
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/properties/PropertyMap.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/properties/PropertyMap.java
        (original)
+++ 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/properties/PropertyMap.java
        Mon Aug 30 15:07:46 2004
@@ -1,7 +1,6 @@
 package org.apache.beehive.controls.api.properties;
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/properties/PropertySet.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/properties/PropertySet.java
        (original)
+++ 
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/properties/PropertySet.java
        Mon Aug 30 15:07:46 2004
@@ -1,7 +1,6 @@
 package org.apache.beehive.controls.api.properties;
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/BeanListener.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/BeanListener.java
     (original)
+++ 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/BeanListener.java
     Mon Aug 30 15:07:46 2004
@@ -1,7 +1,6 @@
 package org.apache.beehive.controls.runtime.bean;
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ControlBean.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ControlBean.java
      (original)
+++ 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ControlBean.java
      Mon Aug 30 15:07:46 2004
@@ -1,7 +1,6 @@
 package org.apache.beehive.controls.runtime.bean;
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ControlBeanContext.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ControlBeanContext.java
       (original)
+++ 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ControlBeanContext.java
       Mon Aug 30 15:07:46 2004
@@ -1,7 +1,6 @@
 package org.apache.beehive.controls.runtime.bean;
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ControlContainerContext.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ControlContainerContext.java
  (original)
+++ 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ControlContainerContext.java
  Mon Aug 30 15:07:46 2004
@@ -1,7 +1,6 @@
 package org.apache.beehive.controls.runtime.bean;
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ControlInitializer.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ControlInitializer.java
       (original)
+++ 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ControlInitializer.java
       Mon Aug 30 15:07:46 2004
@@ -1,7 +1,6 @@
 package org.apache.beehive.controls.runtime.bean;
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/EventNotifier.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/EventNotifier.java
    (original)
+++ 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/EventNotifier.java
    Mon Aug 30 15:07:46 2004
@@ -1,7 +1,6 @@
 package org.apache.beehive.controls.runtime.bean;
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/InvokeListener.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/InvokeListener.java
   (original)
+++ 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/InvokeListener.java
   Mon Aug 30 15:07:46 2004
@@ -1,7 +1,6 @@
 package org.apache.beehive.controls.runtime.bean;
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/PropertySetProxy.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/PropertySetProxy.java
 (original)
+++ 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/PropertySetProxy.java
 Mon Aug 30 15:07:46 2004
@@ -1,7 +1,6 @@
 package org.apache.beehive.controls.runtime.bean;
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ResourceContextImpl.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ResourceContextImpl.java
      (original)
+++ 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ResourceContextImpl.java
      Mon Aug 30 15:07:46 2004
@@ -1,7 +1,6 @@
 package org.apache.beehive.controls.runtime.bean;
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/AptTask.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/AptTask.java
     (original)
+++ 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/AptTask.java
     Mon Aug 30 15:07:46 2004
@@ -1,8 +1,7 @@
 package org.apache.beehive.controls.runtime.generator;
 
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ClientField.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ClientField.java
 (original)
+++ 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ClientField.java
 Mon Aug 30 15:07:46 2004
@@ -1,7 +1,6 @@
 package org.apache.beehive.controls.runtime.generator;
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/CodeGenerationException.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/CodeGenerationException.java
     (original)
+++ 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/CodeGenerationException.java
     Mon Aug 30 15:07:46 2004
@@ -1,8 +1,7 @@
 package org.apache.beehive.controls.runtime.generator;
 
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/CodeGenerator.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/CodeGenerator.java
       (original)
+++ 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/CodeGenerator.java
       Mon Aug 30 15:07:46 2004
@@ -1,8 +1,7 @@
 package org.apache.beehive.controls.runtime.generator;
 
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ContextField.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ContextField.java
        (original)
+++ 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ContextField.java
        Mon Aug 30 15:07:46 2004
@@ -1,7 +1,6 @@
 package org.apache.beehive.controls.runtime.generator;
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ControlBean.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ControlBean.java
 (original)
+++ 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ControlBean.java
 Mon Aug 30 15:07:46 2004
@@ -1,7 +1,6 @@
 package org.apache.beehive.controls.runtime.generator;
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ControlEvent.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ControlEvent.java
        (original)
+++ 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ControlEvent.java
        Mon Aug 30 15:07:46 2004
@@ -1,7 +1,6 @@
 package org.apache.beehive.controls.runtime.generator;
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ControlEventHandler.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ControlEventHandler.java
 (original)
+++ 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ControlEventHandler.java
 Mon Aug 30 15:07:46 2004
@@ -1,7 +1,6 @@
 package org.apache.beehive.controls.runtime.generator;
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ControlEventSet.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ControlEventSet.java
     (original)
+++ 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ControlEventSet.java
     Mon Aug 30 15:07:46 2004
@@ -1,7 +1,6 @@
 package org.apache.beehive.controls.runtime.generator;
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ControlField.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ControlField.java
        (original)
+++ 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ControlField.java
        Mon Aug 30 15:07:46 2004
@@ -1,7 +1,6 @@
 package org.apache.beehive.controls.runtime.generator;
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ControlImpl.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ControlImpl.java
 (original)
+++ 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ControlImpl.java
 Mon Aug 30 15:07:46 2004
@@ -1,7 +1,6 @@
 package org.apache.beehive.controls.runtime.generator;
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ControlInitializer.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ControlInitializer.java
  (original)
+++ 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ControlInitializer.java
  Mon Aug 30 15:07:46 2004
@@ -1,7 +1,6 @@
 package org.apache.beehive.controls.runtime.generator;
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ControlInterface.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ControlInterface.java
    (original)
+++ 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ControlInterface.java
    Mon Aug 30 15:07:46 2004
@@ -1,7 +1,6 @@
 package org.apache.beehive.controls.runtime.generator;
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ControlOperation.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ControlOperation.java
    (original)
+++ 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ControlOperation.java
    Mon Aug 30 15:07:46 2004
@@ -1,7 +1,6 @@
 package org.apache.beehive.controls.runtime.generator;
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ControlProperty.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ControlProperty.java
     (original)
+++ 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ControlProperty.java
     Mon Aug 30 15:07:46 2004
@@ -1,7 +1,6 @@
 package org.apache.beehive.controls.runtime.generator;
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ControlPropertySet.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ControlPropertySet.java
  (original)
+++ 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ControlPropertySet.java
  Mon Aug 30 15:07:46 2004
@@ -1,7 +1,6 @@
 package org.apache.beehive.controls.runtime.generator;
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/EventAdaptor.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/EventAdaptor.java
        (original)
+++ 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/EventAdaptor.java
        Mon Aug 30 15:07:46 2004
@@ -1,7 +1,6 @@
 package org.apache.beehive.controls.runtime.generator;
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/EventField.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/EventField.java
  (original)
+++ 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/EventField.java
  Mon Aug 30 15:07:46 2004
@@ -1,7 +1,6 @@
 package org.apache.beehive.controls.runtime.generator;
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/GenClass.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/GenClass.java
    (original)
+++ 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/GenClass.java
    Mon Aug 30 15:07:46 2004
@@ -1,7 +1,6 @@
 package org.apache.beehive.controls.runtime.generator;
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/GenField.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/GenField.java
    (original)
+++ 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/GenField.java
    Mon Aug 30 15:07:46 2004
@@ -1,7 +1,6 @@
 package org.apache.beehive.controls.runtime.generator;
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/GenMethod.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/GenMethod.java
   (original)
+++ 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/GenMethod.java
   Mon Aug 30 15:07:46 2004
@@ -1,7 +1,6 @@
 package org.apache.beehive.controls.runtime.generator;
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/GeneratorOutput.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/GeneratorOutput.java
     (original)
+++ 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/GeneratorOutput.java
     Mon Aug 30 15:07:46 2004
@@ -1,8 +1,7 @@
 package org.apache.beehive.controls.runtime.generator;
 
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/IndentingWriter.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/IndentingWriter.java
     (original)
+++ 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/IndentingWriter.java
     Mon Aug 30 15:07:46 2004
@@ -1,7 +1,6 @@
 package org.apache.beehive.controls.runtime.generator;
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/SimpleFiler.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/SimpleFiler.java
 (original)
+++ 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/SimpleFiler.java
 Mon Aug 30 15:07:46 2004
@@ -1,8 +1,7 @@
 package org.apache.beehive.controls.runtime.generator;
 
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/VelocityGenerator.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/VelocityGenerator.java
   (original)
+++ 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/VelocityGenerator.java
   Mon Aug 30 15:07:46 2004
@@ -1,8 +1,7 @@
 package org.apache.beehive.controls.runtime.generator;
 
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/AptAnnotationHelper.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/AptAnnotationHelper.java
     (original)
+++ 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/AptAnnotationHelper.java
     Mon Aug 30 15:07:46 2004
@@ -1,7 +1,6 @@
 package org.apache.beehive.controls.runtime.generator.apt;
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/AptClientField.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/AptClientField.java
  (original)
+++ 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/AptClientField.java
  Mon Aug 30 15:07:46 2004
@@ -1,7 +1,6 @@
 package org.apache.beehive.controls.runtime.generator.apt;
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/AptContextField.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/AptContextField.java
 (original)
+++ 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/AptContextField.java
 Mon Aug 30 15:07:46 2004
@@ -1,8 +1,7 @@
 package org.apache.beehive.controls.runtime.generator.apt;
 
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/AptControlField.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/AptControlField.java
 (original)
+++ 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/AptControlField.java
 Mon Aug 30 15:07:46 2004
@@ -1,7 +1,6 @@
 package org.apache.beehive.controls.runtime.generator.apt;
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/AptControlImplementation.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/AptControlImplementation.java
        (original)
+++ 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/AptControlImplementation.java
        Mon Aug 30 15:07:46 2004
@@ -1,7 +1,6 @@
 package org.apache.beehive.controls.runtime.generator.apt;
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/AptControlInterface.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/AptControlInterface.java
     (original)
+++ 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/AptControlInterface.java
     Mon Aug 30 15:07:46 2004
@@ -1,7 +1,6 @@
 package org.apache.beehive.controls.runtime.generator.apt;
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/AptEvent.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/AptEvent.java
        (original)
+++ 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/AptEvent.java
        Mon Aug 30 15:07:46 2004
@@ -1,7 +1,6 @@
 package org.apache.beehive.controls.runtime.generator.apt;
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/AptEventHandler.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/AptEventHandler.java
 (original)
+++ 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/AptEventHandler.java
 Mon Aug 30 15:07:46 2004
@@ -1,7 +1,6 @@
 package org.apache.beehive.controls.runtime.generator.apt;
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/AptEventSet.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/AptEventSet.java
     (original)
+++ 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/AptEventSet.java
     Mon Aug 30 15:07:46 2004
@@ -1,7 +1,6 @@
 package org.apache.beehive.controls.runtime.generator.apt;
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/AptFieldHelper.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/AptFieldHelper.java
  (original)
+++ 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/AptFieldHelper.java
  Mon Aug 30 15:07:46 2004
@@ -1,7 +1,6 @@
 package org.apache.beehive.controls.runtime.generator.apt;
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/AptMethodHelper.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/AptMethodHelper.java
 (original)
+++ 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/AptMethodHelper.java
 Mon Aug 30 15:07:46 2004
@@ -1,7 +1,6 @@
 package org.apache.beehive.controls.runtime.generator.apt;
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/AptOperation.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/AptOperation.java
    (original)
+++ 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/AptOperation.java
    Mon Aug 30 15:07:46 2004
@@ -1,7 +1,6 @@
 package org.apache.beehive.controls.runtime.generator.apt;
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/AptProperty.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/AptProperty.java
     (original)
+++ 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/AptProperty.java
     Mon Aug 30 15:07:46 2004
@@ -1,7 +1,6 @@
 package org.apache.beehive.controls.runtime.generator.apt;
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/AptPropertySet.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/AptPropertySet.java
  (original)
+++ 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/AptPropertySet.java
  Mon Aug 30 15:07:46 2004
@@ -1,7 +1,6 @@
 package org.apache.beehive.controls.runtime.generator.apt;
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/packaging/ControlJarTask.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/packaging/ControlJarTask.java
      (original)
+++ 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/packaging/ControlJarTask.java
      Mon Aug 30 15:07:46 2004
@@ -1,158 +1,157 @@
-package org.apache.beehive.controls.runtime.packaging;
-
-/*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
- *
- * 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.
- *
- * $Header:$
- */
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStreamReader;
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.taskdefs.Jar;
-import org.apache.tools.ant.taskdefs.Manifest;
-import org.apache.tools.ant.taskdefs.ManifestException;
-import org.apache.tools.ant.types.Resource;
-import org.apache.tools.ant.types.FileSet;
-import org.apache.tools.ant.util.FileUtils;
-import org.apache.tools.zip.ZipOutputStream;
-
-/**
- * The ControlTask class extends the standard ant Jar task to perform
- * additional processing for JAR files that contain Beehive Controls.
- */
-public class ControlJarTask extends Jar
-{
-    private static FileUtils fileUtils = FileUtils.newFileUtils();
-
-    /**
-     * Step #1: Wrap the implementation of Zip.grabResources.  This method 
identifies the
-     * set of resources to be stored in the JAR file.   For each added/updated 
resource,
-     * the overrided method will look for an associated .manifest file that any
-     * JAR manifest data to add/update in the JAR manifest.
-     */
-    protected Resource[][] grabResources(FileSet[] filesets) 
-    {
-        //
-        // Get the list of resources being added/updated by calling 
Zip.grabResources
-        //
-        Resource [][] resources = super.grabResources(filesets);
-
-        //
-        // Iterate through the resources for each input FileSet, looking for 
an associated
-        // manifest file.
-        //
-        for (int i = 0; i < filesets.length; i++)
-        {
-            if (resources[i].length == 0)
-                continue;
-
-            File base = filesets[i].getDir(getProject());
-            Resource [] setResources = resources[i];
-
-            for (int j = 0; j < setResources.length; j++)
-            {
-                File manifestFile = 
-                    fileUtils.resolveFile(base, setResources[j].getName() + 
".manifest");
-                if (manifestFile.exists())
-                    manifestFiles.add(manifestFile);
-            }
-        }
-
-        return resources;
-    }
-
-    /**
-     * Step #2: Override Jar.initZipOutputStream to inject manifest sections.  
This is done
-     * by treating them as if they were 'inline' entries, from a <jar> task 
perspective.
-     */
-    protected void initZipOutputStream(ZipOutputStream zOut) throws 
IOException, BuildException 
-    {
-        if (manifestFiles.size() != 0)
-        {
-            //
-            // Create a default (empty) manifest
-            //
-            Manifest mergeManifest = Manifest.getDefaultManifest();
-
-            //
-            // Iterate through each found manifest file, merging its contents 
into the
-            // merge manifest
-            //
-            for (File manifestFile : manifestFiles)
-            {
-                FileInputStream fis = null;
-                try
-                {
-                    fis = new FileInputStream(manifestFile);
-                    Manifest resourceManifest = new Manifest(new 
InputStreamReader(fis));
-                    mergeManifest.merge(resourceManifest);
-                }
-                catch (IOException ioe)
-                {
-                    throw new BuildException("Unable to read manifest file:" + 
manifestFile, ioe);
-                }
-                catch (ManifestException me)
-                {
-                    throw new BuildException("Unable to process manifest file: 
"+ manifestFile, me);
-                }
-                finally 
-                {
-                    if (fis != null) fis.close();
-                }
-            }
-
-            //
-            // Set the merge manifest as the 'configured' manifest.   This 
will treat its
-            // contents as if they had been included inline with the <jar> 
task, with
-            // similar precedence rules.
-            //
-            try
-            {
-                addConfiguredManifest(mergeManifest);
-            }
-            catch (ManifestException me)
-            {
-                throw new BuildException("Unable to add new manifest entries:" 
+ me);
-            }
-        }
-
-        super.initZipOutputStream(zOut);
-    }
-
-    protected void addToManifest(Manifest jarManifest, List<File> mergeList)
-    {
-    }
-
-    /**
-     * Reset the manifest file list to be empty
-     */
-    protected void cleanUp()
-    {
-        manifestFiles = new Vector<File>();
-    }
-
-    /**
-     * Contains the set of manifest entries to merge into the JAR manifest
-     */
-    private List<File> manifestFiles = new Vector<File>();
-}
+package org.apache.beehive.controls.runtime.packaging;
+
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * 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.
+ *
+ * $Header:$
+ */
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStreamReader;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+import java.util.Vector;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.taskdefs.Jar;
+import org.apache.tools.ant.taskdefs.Manifest;
+import org.apache.tools.ant.taskdefs.ManifestException;
+import org.apache.tools.ant.types.Resource;
+import org.apache.tools.ant.types.FileSet;
+import org.apache.tools.ant.util.FileUtils;
+import org.apache.tools.zip.ZipOutputStream;
+
+/**
+ * The ControlTask class extends the standard ant Jar task to perform
+ * additional processing for JAR files that contain Beehive Controls.
+ */
+public class ControlJarTask extends Jar
+{
+    private static FileUtils fileUtils = FileUtils.newFileUtils();
+
+    /**
+     * Step #1: Wrap the implementation of Zip.grabResources.  This method 
identifies the
+     * set of resources to be stored in the JAR file.   For each added/updated 
resource,
+     * the overrided method will look for an associated .manifest file that any
+     * JAR manifest data to add/update in the JAR manifest.
+     */
+    protected Resource[][] grabResources(FileSet[] filesets) 
+    {
+        //
+        // Get the list of resources being added/updated by calling 
Zip.grabResources
+        //
+        Resource [][] resources = super.grabResources(filesets);
+
+        //
+        // Iterate through the resources for each input FileSet, looking for 
an associated
+        // manifest file.
+        //
+        for (int i = 0; i < filesets.length; i++)
+        {
+            if (resources[i].length == 0)
+                continue;
+
+            File base = filesets[i].getDir(getProject());
+            Resource [] setResources = resources[i];
+
+            for (int j = 0; j < setResources.length; j++)
+            {
+                File manifestFile = 
+                    fileUtils.resolveFile(base, setResources[j].getName() + 
".manifest");
+                if (manifestFile.exists())
+                    manifestFiles.add(manifestFile);
+            }
+        }
+
+        return resources;
+    }
+
+    /**
+     * Step #2: Override Jar.initZipOutputStream to inject manifest sections.  
This is done
+     * by treating them as if they were 'inline' entries, from a <jar> task 
perspective.
+     */
+    protected void initZipOutputStream(ZipOutputStream zOut) throws 
IOException, BuildException 
+    {
+        if (manifestFiles.size() != 0)
+        {
+            //
+            // Create a default (empty) manifest
+            //
+            Manifest mergeManifest = Manifest.getDefaultManifest();
+
+            //
+            // Iterate through each found manifest file, merging its contents 
into the
+            // merge manifest
+            //
+            for (File manifestFile : manifestFiles)
+            {
+                FileInputStream fis = null;
+                try
+                {
+                    fis = new FileInputStream(manifestFile);
+                    Manifest resourceManifest = new Manifest(new 
InputStreamReader(fis));
+                    mergeManifest.merge(resourceManifest);
+                }
+                catch (IOException ioe)
+                {
+                    throw new BuildException("Unable to read manifest file:" + 
manifestFile, ioe);
+                }
+                catch (ManifestException me)
+                {
+                    throw new BuildException("Unable to process manifest file: 
"+ manifestFile, me);
+                }
+                finally 
+                {
+                    if (fis != null) fis.close();
+                }
+            }
+
+            //
+            // Set the merge manifest as the 'configured' manifest.   This 
will treat its
+            // contents as if they had been included inline with the <jar> 
task, with
+            // similar precedence rules.
+            //
+            try
+            {
+                addConfiguredManifest(mergeManifest);
+            }
+            catch (ManifestException me)
+            {
+                throw new BuildException("Unable to add new manifest entries:" 
+ me);
+            }
+        }
+
+        super.initZipOutputStream(zOut);
+    }
+
+    protected void addToManifest(Manifest jarManifest, List<File> mergeList)
+    {
+    }
+
+    /**
+     * Reset the manifest file list to be empty
+     */
+    protected void cleanUp()
+    {
+        manifestFiles = new Vector<File>();
+    }
+
+    /**
+     * Contains the set of manifest entries to merge into the JAR manifest
+     */
+    private List<File> manifestFiles = new Vector<File>();
+}

Modified: 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/servlet/ControlFilter.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/servlet/ControlFilter.java
 (original)
+++ 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/servlet/ControlFilter.java
 Mon Aug 30 15:07:46 2004
@@ -1,7 +1,6 @@
 package org.apache.beehive.controls.runtime.servlet;
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/servlet/HttpRequestService.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/servlet/HttpRequestService.java
    (original)
+++ 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/servlet/HttpRequestService.java
    Mon Aug 30 15:07:46 2004
@@ -1,7 +1,6 @@
 package org.apache.beehive.controls.runtime.servlet;
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/servlet/HttpResponseService.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/servlet/HttpResponseService.java
   (original)
+++ 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/servlet/HttpResponseService.java
   Mon Aug 30 15:07:46 2004
@@ -1,7 +1,6 @@
 package org.apache.beehive.controls.runtime.servlet;
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/servlet/ServletBeanContext.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/servlet/ServletBeanContext.java
    (original)
+++ 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/servlet/ServletBeanContext.java
    Mon Aug 30 15:07:46 2004
@@ -1,7 +1,6 @@
 package org.apache.beehive.controls.runtime.servlet;
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/servlet/ServletContextService.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/servlet/ServletContextService.java
 (original)
+++ 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/servlet/ServletContextService.java
 Mon Aug 30 15:07:46 2004
@@ -1,7 +1,6 @@
 package org.apache.beehive.controls.runtime.servlet;
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/servlet/ServletRequestService.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/servlet/ServletRequestService.java
 (original)
+++ 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/servlet/ServletRequestService.java
 Mon Aug 30 15:07:46 2004
@@ -1,7 +1,6 @@
 package org.apache.beehive.controls.runtime.servlet;
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/servlet/ServletResponseService.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/servlet/ServletResponseService.java
        (original)
+++ 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/servlet/ServletResponseService.java
        Mon Aug 30 15:07:46 2004
@@ -1,7 +1,6 @@
 package org.apache.beehive.controls.runtime.servlet;
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/servlet/ServletServiceProvider.java
==============================================================================
--- 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/servlet/ServletServiceProvider.java
        (original)
+++ 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/servlet/ServletServiceProvider.java
        Mon Aug 30 15:07:46 2004
@@ -1,7 +1,6 @@
 package org.apache.beehive.controls.runtime.servlet;
 /*
- * B E A   S Y S T E M S
- * Copyright 2001-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/context/ServiceGetter.java
==============================================================================
--- 
incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/context/ServiceGetter.java
     (original)
+++ 
incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/context/ServiceGetter.java
     Mon Aug 30 15:07:46 2004
@@ -10,4 +10,4 @@
 public interface ServiceGetter
 {
        public String getService(Class theService, Object selector);
-}
\ No newline at end of file
+}

Modified: 
incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/property/SingleProperty.java
==============================================================================
--- 
incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/property/SingleProperty.java
   (original)
+++ 
incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/property/SingleProperty.java
   Mon Aug 30 15:07:46 2004
@@ -21,4 +21,4 @@
     }
 
        public String sayHello();
-}
\ No newline at end of file
+}

Modified: 
incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/property/SingleProperty2.java
==============================================================================
--- 
incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/property/SingleProperty2.java
  (original)
+++ 
incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/property/SingleProperty2.java
  Mon Aug 30 15:07:46 2004
@@ -21,4 +21,4 @@
     }
 
        public String sayHello();
-}
\ No newline at end of file
+}

Modified: 
incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/contextevent/LifeCycleTest.java
==============================================================================
--- 
incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/contextevent/LifeCycleTest.java
       (original)
+++ 
incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/contextevent/LifeCycleTest.java
       Mon Aug 30 15:07:46 2004
@@ -72,4 +72,4 @@
 
     }
 
-}
\ No newline at end of file
+}

Modified: 
incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/event/Event2Listener.java
==============================================================================
--- 
incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/event/Event2Listener.java
     (original)
+++ 
incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/event/Event2Listener.java
     Mon Aug 30 15:07:46 2004
@@ -42,4 +42,4 @@
 
                return 
method1Result+method2Result+overloadMethod1+overloadMethod2;
        }
-}
\ No newline at end of file
+}

Modified: 
incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/event/EventHandlerTest.java
==============================================================================
--- 
incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/event/EventHandlerTest.java
   (original)
+++ 
incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/event/EventHandlerTest.java
   Mon Aug 30 15:07:46 2004
@@ -90,4 +90,4 @@
                }
     }
 
-}
\ No newline at end of file
+}

Modified: 
incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/event/ListenerTest.java
==============================================================================
--- 
incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/event/ListenerTest.java
       (original)
+++ 
incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/event/ListenerTest.java
       Mon Aug 30 15:07:46 2004
@@ -117,4 +117,4 @@
                }
     }
 
-}
\ No newline at end of file
+}

Modified: 
incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/extension/SubControlTest.java
==============================================================================
--- 
incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/extension/SubControlTest.java
 (original)
+++ 
incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/extension/SubControlTest.java
 Mon Aug 30 15:07:46 2004
@@ -401,4 +401,4 @@
                //to be implemented depending on development status
     }
 
-}
\ No newline at end of file
+}

Modified: 
incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/property/ImplAccessTest.java
==============================================================================
--- 
incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/property/ImplAccessTest.java
  (original)
+++ 
incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/property/ImplAccessTest.java
  Mon Aug 30 15:07:46 2004
@@ -62,4 +62,4 @@
                Assert.assertEquals("Hello",s);
     }
 
-}
\ No newline at end of file
+}

Modified: 
incubator/beehive/trunk/controls/test/tmp/controls/composition/InnerControlEventListener.java
==============================================================================
--- 
incubator/beehive/trunk/controls/test/tmp/controls/composition/InnerControlEventListener.java
       (original)
+++ 
incubator/beehive/trunk/controls/test/tmp/controls/composition/InnerControlEventListener.java
       Mon Aug 30 15:07:46 2004
@@ -69,4 +69,4 @@
 
                return result;
        }
-}
\ No newline at end of file
+}

Modified: 
incubator/beehive/trunk/controls/test/tmp/units/java/composition/DeclarativeTest.java
==============================================================================
--- 
incubator/beehive/trunk/controls/test/tmp/units/java/composition/DeclarativeTest.java
       (original)
+++ 
incubator/beehive/trunk/controls/test/tmp/units/java/composition/DeclarativeTest.java
       Mon Aug 30 15:07:46 2004
@@ -121,4 +121,4 @@
                
Assert.assertEquals("0",outerControl.testEventListenerByDeclare());
     }
 
-}
\ No newline at end of file
+}

Modified: 
incubator/beehive/trunk/controls/test/tmp/units/java/composition/ProgrammaticTest.java
==============================================================================
--- 
incubator/beehive/trunk/controls/test/tmp/units/java/composition/ProgrammaticTest.java
      (original)
+++ 
incubator/beehive/trunk/controls/test/tmp/units/java/composition/ProgrammaticTest.java
      Mon Aug 30 15:07:46 2004
@@ -129,4 +129,4 @@
     }
 
 
-}
\ No newline at end of file
+}

Modified: 
incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/mantis/AbstractMantisProcessor.java
==============================================================================
--- 
incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/mantis/AbstractMantisProcessor.java
       (original)
+++ 
incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/mantis/AbstractMantisProcessor.java
       Mon Aug 30 15:07:46 2004
@@ -1,74 +1,74 @@
-package org.apache.beehive.mantis;
-
-// mirror apis
-import com.sun.mirror.apt.AnnotationProcessor;
-import com.sun.mirror.apt.AnnotationProcessorEnvironment;
-import com.sun.mirror.apt.Filer;
-import com.sun.mirror.declaration.PackageDeclaration;
-import com.sun.mirror.declaration.AnnotationTypeDeclaration;
-import com.sun.mirror.declaration.AnnotationTypeElementDeclaration;
-import com.sun.mirror.declaration.AnnotationValue;
-import com.sun.mirror.declaration.TypeDeclaration;
-import com.sun.mirror.declaration.ClassDeclaration;
-import com.sun.mirror.declaration.MethodDeclaration;
-import com.sun.mirror.declaration.AnnotationMirror;
-
-// java utils
-import java.io.PrintWriter;
-import java.io.IOException;
-import java.io.File;
-import java.util.Map;
-import java.util.Iterator;
-import java.util.Set;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.ArrayList;
-
-// mantis annotations
-//import org.apache.beehive.mantis.annotations.*;
-
-import org.apache.beehive.mantis.utils.FileTypes;
-import org.apache.beehive.mantis.utils.MantisFileInfo;
-
-// tch schema types
-//import org.apache.xmlbeans.XmlAnySimpleType;
-//import org.apache.xmlbeans.XmlAnySimpleType.Factory;
-//import noNamespace.ProjectDocument.*;
-//import noNamespace.*;
-
-public abstract class AbstractMantisProcessor implements AnnotationProcessor
-{
-  private HashSet<MantisFileInfo> _fileinfos;
-  protected Set<AnnotationTypeDeclaration> _atds;
-  protected AnnotationProcessorEnvironment _env;
-  protected String _srctree;
-  protected String _classtree;
-
-  abstract public void process();
-
-  public void init(Set<AnnotationTypeDeclaration> p_atds,
-                   AnnotationProcessorEnvironment p_env)
-  {
-    this._atds = p_atds;
-    this._env = p_env;
-    _fileinfos = new HashSet<MantisFileInfo>();
-
-    // initialize the file gen dir strings
-    Map<String,String> opts = _env.getOptions();
-    _srctree = opts.get("-s");
-    _classtree = opts.get("-d");
-  }
-
-  protected void registerFile(String url, String creatingClassname, FileTypes 
type)
-  {
-    MantisFileInfo finfo = new MantisFileInfo(url,
-                                              creatingClassname,
-                                              type);
-    _fileinfos.add(finfo);
-  } 
-
-  public HashSet<MantisFileInfo> getFileInfo()
-  {
-    return _fileinfos;
-  }
-}
+package org.apache.beehive.mantis;
+
+// mirror apis
+import com.sun.mirror.apt.AnnotationProcessor;
+import com.sun.mirror.apt.AnnotationProcessorEnvironment;
+import com.sun.mirror.apt.Filer;
+import com.sun.mirror.declaration.PackageDeclaration;
+import com.sun.mirror.declaration.AnnotationTypeDeclaration;
+import com.sun.mirror.declaration.AnnotationTypeElementDeclaration;
+import com.sun.mirror.declaration.AnnotationValue;
+import com.sun.mirror.declaration.TypeDeclaration;
+import com.sun.mirror.declaration.ClassDeclaration;
+import com.sun.mirror.declaration.MethodDeclaration;
+import com.sun.mirror.declaration.AnnotationMirror;
+
+// java utils
+import java.io.PrintWriter;
+import java.io.IOException;
+import java.io.File;
+import java.util.Map;
+import java.util.Iterator;
+import java.util.Set;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.ArrayList;
+
+// mantis annotations
+//import org.apache.beehive.mantis.annotations.*;
+
+import org.apache.beehive.mantis.utils.FileTypes;
+import org.apache.beehive.mantis.utils.MantisFileInfo;
+
+// tch schema types
+//import org.apache.xmlbeans.XmlAnySimpleType;
+//import org.apache.xmlbeans.XmlAnySimpleType.Factory;
+//import noNamespace.ProjectDocument.*;
+//import noNamespace.*;
+
+public abstract class AbstractMantisProcessor implements AnnotationProcessor
+{
+  private HashSet<MantisFileInfo> _fileinfos;
+  protected Set<AnnotationTypeDeclaration> _atds;
+  protected AnnotationProcessorEnvironment _env;
+  protected String _srctree;
+  protected String _classtree;
+
+  abstract public void process();
+
+  public void init(Set<AnnotationTypeDeclaration> p_atds,
+                   AnnotationProcessorEnvironment p_env)
+  {
+    this._atds = p_atds;
+    this._env = p_env;
+    _fileinfos = new HashSet<MantisFileInfo>();
+
+    // initialize the file gen dir strings
+    Map<String,String> opts = _env.getOptions();
+    _srctree = opts.get("-s");
+    _classtree = opts.get("-d");
+  }
+
+  protected void registerFile(String url, String creatingClassname, FileTypes 
type)
+  {
+    MantisFileInfo finfo = new MantisFileInfo(url,
+                                              creatingClassname,
+                                              type);
+    _fileinfos.add(finfo);
+  } 
+
+  public HashSet<MantisFileInfo> getFileInfo()
+  {
+    return _fileinfos;
+  }
+}

Modified: 
incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/mantis/MantisFactory.java
==============================================================================
--- 
incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/mantis/MantisFactory.java
 (original)
+++ 
incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/mantis/MantisFactory.java
 Mon Aug 30 15:07:46 2004
@@ -1,211 +1,211 @@
-package org.apache.beehive.mantis;
-
-import com.sun.mirror.apt.*;
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.type.*;
-import com.sun.mirror.util.*;
-
-import java.io.FileReader;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.lang.StringBuffer;
-import java.lang.ClassNotFoundException;
-import java.lang.InstantiationException;
-import java.lang.IllegalAccessException;
-import java.util.Collection;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.Iterator;
-import static java.util.Collections.*;
-
-
-public class MantisFactory implements AnnotationProcessorFactory
-{
-  // map of annotation package to processor name
-  private HashMap<String,String> _processorMap;
-
-  // claim that all annotations are handled by this factory
-  // at runtime the mantis config is loaded in getProcessorFor()
-  private static final Collection<String> _supportedAnnotations
-    = unmodifiableCollection(Arrays.asList("*"));
-
-  // options passed to apt at runtime
-  private Map<String,String> _options;
-
-  // options that are supported
-  private final Collection<String> _supportedOptions;
-
-
-  public MantisFactory()
-  {
-    this._supportedOptions = initSupportedOptions();
-  }
-
-
-  public Collection<String> supportedAnnotationTypes(){return 
_supportedAnnotations;}
-
-  public Collection<String> supportedOptions(){return _supportedOptions;}
-
-  public AnnotationProcessor getProcessorFor(Set<AnnotationTypeDeclaration> 
p_atds,
-                                             AnnotationProcessorEnvironment 
p_env)
-  {    
-    // parse the command line args
-    // TODO: when apt gives proper key=value pairs, chage to fit.
-    // TODO: for now, everything is in the key
-    String configurl = null;
-    String processorName = null;
-    Set<String> keys = p_env.getOptions().keySet();
-    Iterator it = keys.iterator();
-    while(it.hasNext())
-    {
-      String curr = (String) it.next();
-      String[] val = curr.split("=");
-      if(val[0].equalsIgnoreCase("-Aprocessor"))
-        processorName = val[1];
-      else if(val[0].equalsIgnoreCase("-Aconfig"))
-        configurl = val[1];
-    }
-    it = null;
-
-    // initiialize the configuration
-    initProcessorMap(configurl);
-
-    // initialize the processor(s)
-    // if no command line override - return a composite 
-    // of all processors that map the the annotations present
-    HashSet<AnnotationProcessor> processors = new 
HashSet<AnnotationProcessor>();    
-    if(null == processorName)
-    {
-
-      // first loop through the annotation types and collect the
-      // set of unique annotation package names
-      it = p_atds.iterator();
-      HashSet<String> annotationPackages = new HashSet<String>();
-      while(it.hasNext())
-      {
-        AnnotationTypeDeclaration atd = (AnnotationTypeDeclaration)it.next();
-        annotationPackages.add(atd.getPackage().getQualifiedName());
-      }
-      it = null;
-
-      // loop through the unique annotation package names
-      // and initialize a uniqe set of processor names
-      // (processors may register for more than one annotation pkg)
-      HashSet<String> activeProcessors = new HashSet<String>();
-      for(String pkg : annotationPackages)
-      {
-        if(_processorMap.containsKey(pkg))
-        {
-          activeProcessors.add(_processorMap.get(pkg));
-        }
-        else
-          System.out.println("WARNING: no processor for annotation package 
"+pkg);
-      }
-
-      // loop through the unique processor names
-      // and instantiate them
-      for(String procname : activeProcessors)
-      {
-        // reflectivly new up the processor
-        processors.add(instantiateProcessor(procname,p_atds,p_env));
-      }
-    }
-    else
-    {
-      // processor override provided - just new up this one
-      processors.add(instantiateProcessor(processorName,p_atds,p_env));
-    }
-
-    System.out.println("config="+configurl);
-               if(processors.contains(null))
-                       System.out.println("ERROR: unable to instantiate and 
initialize processor(s)");
-               else
-       System.out.println("num processor(s) initialized="+processors.size());
-    
-    // create a composite of processors to return
-    AnnotationProcessors util = new AnnotationProcessors();
-    return util.getCompositeAnnotationProcessor(processors);
-  }
-
-  private Collection<String> initSupportedOptions()
-  {
-    HashSet<String> supportedOpts = new HashSet<String>();
-    supportedOpts.add("-Aconfig");
-    supportedOpts.add("-Aprocessor");
-    return supportedOpts;
-  }
-
-  private void initProcessorMap(String configurl)
-  {
-
-    try
-    {
-      FileReader reader = new FileReader(configurl);
-      int c;
-      StringBuffer buff = new StringBuffer();
-      while( (c=reader.read()) != -1)
-      {
-        buff.append((char)c);
-      }
-      String[] values = 
buff.toString().split(System.getProperty("line.separator"));
-
-      _processorMap = new HashMap<String,String>();
-      for(int i=0; i<values.length; i++)
-      {
-        // if the line is commented out - skip it
-        if(values[i].startsWith("#"))
-           continue;
-        String[] val = values[i].split("=");
-        if(_processorMap.containsKey(val[0]))
-           System.out.println("WARNING: duplicate mappings for annotation 
package: "+val[0]);
-        _processorMap.put(val[0],val[1]);
-      }
-    }
-    catch(FileNotFoundException fnfe)
-    {
-      fnfe.printStackTrace();
-    }
-    catch(IOException ioe)
-    {
-      ioe.printStackTrace();
-    }
-  }
-
-  private AnnotationProcessor instantiateProcessor(String p_procname,
-                                                   
Set<AnnotationTypeDeclaration> p_atds,
-                                                   
AnnotationProcessorEnvironment p_env)
-  {
-    // instantiate the specified processors
-    try
-    {
-                       System.out.println("INFO: ready to instantiate 
processor class: "+p_procname);
-                       // FIX: in win32 a ClassNotFoundException would be 
thrown w/out a call to trim()
-      Class definition = Class.forName(p_procname.trim());
-      AbstractMantisProcessor proc = (AbstractMantisProcessor) 
definition.newInstance();
-                       //System.out.println("INFO: successfully instantiated 
processor class: "+p_procname);
-                       //System.out.println("INFO: ready to initialize 
processor class: "+p_procname);
-      proc.init(p_atds,p_env);
-                       System.out.println("INFO: successfully instantiated and 
initialized processor class: "+p_procname);
-      return (AnnotationProcessor) proc;
-    }
-    catch(ClassNotFoundException cnfe)
-    {
-      cnfe.printStackTrace();
-      return null;
-    }
-    catch(InstantiationException ie)
-    {
-      ie.printStackTrace();
-      return null;
-    }
-    catch(IllegalAccessException iae)
-    {
-      iae.printStackTrace();
-      return null;
-    }
-  }
- 
-}
+package org.apache.beehive.mantis;
+
+import com.sun.mirror.apt.*;
+import com.sun.mirror.declaration.*;
+import com.sun.mirror.type.*;
+import com.sun.mirror.util.*;
+
+import java.io.FileReader;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.lang.StringBuffer;
+import java.lang.ClassNotFoundException;
+import java.lang.InstantiationException;
+import java.lang.IllegalAccessException;
+import java.util.Collection;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.Iterator;
+import static java.util.Collections.*;
+
+
+public class MantisFactory implements AnnotationProcessorFactory
+{
+  // map of annotation package to processor name
+  private HashMap<String,String> _processorMap;
+
+  // claim that all annotations are handled by this factory
+  // at runtime the mantis config is loaded in getProcessorFor()
+  private static final Collection<String> _supportedAnnotations
+    = unmodifiableCollection(Arrays.asList("*"));
+
+  // options passed to apt at runtime
+  private Map<String,String> _options;
+
+  // options that are supported
+  private final Collection<String> _supportedOptions;
+
+
+  public MantisFactory()
+  {
+    this._supportedOptions = initSupportedOptions();
+  }
+
+
+  public Collection<String> supportedAnnotationTypes(){return 
_supportedAnnotations;}
+
+  public Collection<String> supportedOptions(){return _supportedOptions;}
+
+  public AnnotationProcessor getProcessorFor(Set<AnnotationTypeDeclaration> 
p_atds,
+                                             AnnotationProcessorEnvironment 
p_env)
+  {    
+    // parse the command line args
+    // TODO: when apt gives proper key=value pairs, chage to fit.
+    // TODO: for now, everything is in the key
+    String configurl = null;
+    String processorName = null;
+    Set<String> keys = p_env.getOptions().keySet();
+    Iterator it = keys.iterator();
+    while(it.hasNext())
+    {
+      String curr = (String) it.next();
+      String[] val = curr.split("=");
+      if(val[0].equalsIgnoreCase("-Aprocessor"))
+        processorName = val[1];
+      else if(val[0].equalsIgnoreCase("-Aconfig"))
+        configurl = val[1];
+    }
+    it = null;
+
+    // initiialize the configuration
+    initProcessorMap(configurl);
+
+    // initialize the processor(s)
+    // if no command line override - return a composite 
+    // of all processors that map the the annotations present
+    HashSet<AnnotationProcessor> processors = new 
HashSet<AnnotationProcessor>();    
+    if(null == processorName)
+    {
+
+      // first loop through the annotation types and collect the
+      // set of unique annotation package names
+      it = p_atds.iterator();
+      HashSet<String> annotationPackages = new HashSet<String>();
+      while(it.hasNext())
+      {
+        AnnotationTypeDeclaration atd = (AnnotationTypeDeclaration)it.next();
+        annotationPackages.add(atd.getPackage().getQualifiedName());
+      }
+      it = null;
+
+      // loop through the unique annotation package names
+      // and initialize a uniqe set of processor names
+      // (processors may register for more than one annotation pkg)
+      HashSet<String> activeProcessors = new HashSet<String>();
+      for(String pkg : annotationPackages)
+      {
+        if(_processorMap.containsKey(pkg))
+        {
+          activeProcessors.add(_processorMap.get(pkg));
+        }
+        else
+          System.out.println("WARNING: no processor for annotation package 
"+pkg);
+      }
+
+      // loop through the unique processor names
+      // and instantiate them
+      for(String procname : activeProcessors)
+      {
+        // reflectivly new up the processor
+        processors.add(instantiateProcessor(procname,p_atds,p_env));
+      }
+    }
+    else
+    {
+      // processor override provided - just new up this one
+      processors.add(instantiateProcessor(processorName,p_atds,p_env));
+    }
+
+    System.out.println("config="+configurl);
+               if(processors.contains(null))
+                       System.out.println("ERROR: unable to instantiate and 
initialize processor(s)");
+               else
+       System.out.println("num processor(s) initialized="+processors.size());
+    
+    // create a composite of processors to return
+    AnnotationProcessors util = new AnnotationProcessors();
+    return util.getCompositeAnnotationProcessor(processors);
+  }
+
+  private Collection<String> initSupportedOptions()
+  {
+    HashSet<String> supportedOpts = new HashSet<String>();
+    supportedOpts.add("-Aconfig");
+    supportedOpts.add("-Aprocessor");
+    return supportedOpts;
+  }
+
+  private void initProcessorMap(String configurl)
+  {
+
+    try
+    {
+      FileReader reader = new FileReader(configurl);
+      int c;
+      StringBuffer buff = new StringBuffer();
+      while( (c=reader.read()) != -1)
+      {
+        buff.append((char)c);
+      }
+      String[] values = 
buff.toString().split(System.getProperty("line.separator"));
+
+      _processorMap = new HashMap<String,String>();
+      for(int i=0; i<values.length; i++)
+      {
+        // if the line is commented out - skip it
+        if(values[i].startsWith("#"))
+           continue;
+        String[] val = values[i].split("=");
+        if(_processorMap.containsKey(val[0]))
+           System.out.println("WARNING: duplicate mappings for annotation 
package: "+val[0]);
+        _processorMap.put(val[0],val[1]);
+      }
+    }
+    catch(FileNotFoundException fnfe)
+    {
+      fnfe.printStackTrace();
+    }
+    catch(IOException ioe)
+    {
+      ioe.printStackTrace();
+    }
+  }
+
+  private AnnotationProcessor instantiateProcessor(String p_procname,
+                                                   
Set<AnnotationTypeDeclaration> p_atds,
+                                                   
AnnotationProcessorEnvironment p_env)
+  {
+    // instantiate the specified processors
+    try
+    {
+                       System.out.println("INFO: ready to instantiate 
processor class: "+p_procname);
+                       // FIX: in win32 a ClassNotFoundException would be 
thrown w/out a call to trim()
+      Class definition = Class.forName(p_procname.trim());
+      AbstractMantisProcessor proc = (AbstractMantisProcessor) 
definition.newInstance();
+                       //System.out.println("INFO: successfully instantiated 
processor class: "+p_procname);
+                       //System.out.println("INFO: ready to initialize 
processor class: "+p_procname);
+      proc.init(p_atds,p_env);
+                       System.out.println("INFO: successfully instantiated and 
initialized processor class: "+p_procname);
+      return (AnnotationProcessor) proc;
+    }
+    catch(ClassNotFoundException cnfe)
+    {
+      cnfe.printStackTrace();
+      return null;
+    }
+    catch(InstantiationException ie)
+    {
+      ie.printStackTrace();
+      return null;
+    }
+    catch(IllegalAccessException iae)
+    {
+      iae.printStackTrace();
+      return null;
+    }
+  }
+ 
+}

Modified: 
incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/mantis/MantisTask.java
==============================================================================
--- 
incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/mantis/MantisTask.java
    (original)
+++ 
incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/mantis/MantisTask.java
    Mon Aug 30 15:07:46 2004
@@ -1,172 +1,172 @@
-package org.apache.beehive.mantis;
-
-import java.io.File;
-import java.io.FileWriter;
-import java.io.InputStream;
-import java.io.IOException;
-
-import org.apache.tools.ant.taskdefs.MatchingTask;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.DirectoryScanner;
-
-import org.apache.beehive.mantis.utils.StreamCapture;
-
-public class MantisTask extends MatchingTask
-{
-  private final String P = System.getProperty("file.separator");
-
-  // required attributes
-  private String _srcdir = null;
-  private String _srcgen = null;
-  private String _bingen = null;
-  private String _classpath = null;
-  private String _config = null;
-  private String _aptcommand = null;
-  // optional attributes
-  private boolean _compile = false;
-  private String _processor = null;
-  private int _timeout = 5000;
-  // use _srcgen if not provided
-  private String _logdir = null;
-
-  // setters for attributes
-  public void setSrcdir(String p_srcdir)
-  {
-    _srcdir = p_srcdir;
-    fileset.setDir(new File(_srcdir));
-  }
-
-  public void setSrcgen(String p_srcgen)
-  {
-    _srcgen = p_srcgen;
-  }
-
-  public void setBingen(String p_bingen)
-  {
-    _bingen = p_bingen;
-  }
-
-  public void setClasspath(String p_classpath)
-  {
-    _classpath = p_classpath;
-  }
-
-  public void setConfig(String p_config)
-  {
-    _config = p_config;
-  }
-
-  public void setAptcommand(String p_aptcommand)
-  {
-    _aptcommand = p_aptcommand;
-  }
-
-  public void setCompile(boolean p_compile)
-  {
-    _compile = p_compile;
-  }
-
-  public void setProcessor(String p_processor)
-  {
-    _processor = p_processor;
-  }
-
-  public void setLogdir(String p_logdir)
-  {
-    _logdir = p_logdir;
-  }
-
-  public void setTimeout(int p_timeout)
-  {
-    _timeout = p_timeout;
-  }
-
-  public void execute() throws BuildException
-  {
-    // create the file of all files to process
-    // this will allow processing on win32 given it's
-    // limitation on command-line length
-    File fSrcgen = new File(_srcgen);
-    fSrcgen.mkdirs();
-    DirectoryScanner scanner = getDirectoryScanner(new File(_srcdir));
-    String[] files = scanner.getIncludedFiles();
-    String filename = _srcgen+P+"files.txt";
-    try
-    {
-      FileWriter writer = new FileWriter(new File(filename));
-      for(int i=0; i<files.length; i++)
-      {
-        writer.write(_srcdir+P+files[i]);
-        if(i != files.length)
-          writer.write("\n");
-      }
-      writer.flush();
-      writer.close();
-    }
-    catch(IOException ioe)
-    {
-      ioe.printStackTrace();
-      System.out.println("ERROR: IOException caught trying to create file 
listing file");
-      return;
-    }
-
-    // create the command line to call
-    StringBuffer cmd = new StringBuffer();
-    cmd.append(_aptcommand+" ");
-    if(!_compile)
-      cmd.append(" -nocompile ");
-    cmd.append("-classpath "+_classpath+" ");
-    cmd.append("-s "+_srcgen+" ");
-    if(null != _bingen)
-      cmd.append("-d "+_bingen+" ");
-    cmd.append("-factory org.apache.beehive.mantis.MantisFactory ");
-    cmd.append("-Aconfig="+_config+" ");
-    if(null != _processor)
-      cmd.append("-Aprocessor="+_processor+" ");
-    cmd.append("@"+filename+" ");
-
-    System.out.println("running command:\n"+cmd.toString());
-
-    // capture mantis stderr/stdout to log file
-    // while executing the command line apt call
-    try
-    {
-      Process p = Runtime.getRuntime().exec(cmd.toString());
-      logStreams(p);
-      System.out.println("RETURN: "+p.exitValue());
-    }
-    catch(IOException ioe)
-    {
-      ioe.printStackTrace();
-      System.out.println("ERROR: IOException during apt execution");
-    }
-    catch(InterruptedException ie)
-    {
-      ie.printStackTrace();
-      System.out.println("ERROR: InterruptedException during apt execution");
-    }
-  }
-
-  private void logStreams(Process p_proc) throws 
IOException,InterruptedException
-  {
-    // ensure log dir exists
-    if(null == _logdir)
-      _logdir = _srcgen;
-    else
-    {
-      File fLogdir = new File(_logdir);
-      fLogdir.mkdirs();
-    }
-
-    // capture stderr and stdout to log files
-    StreamCapture stderr = new StreamCapture(p_proc.getErrorStream(),"file", 
_logdir+P+"mantis.err");
-    StreamCapture stdout = new StreamCapture(p_proc.getInputStream(),"file", 
_logdir+P+"mantis.out");
-    stderr.start();
-    stdout.start();
-
-    // wait up to 5 seconds for proc to finish
-    stderr.join(_timeout);
-    stdout.join(_timeout);
-  }
-
-}
+package org.apache.beehive.mantis;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.InputStream;
+import java.io.IOException;
+
+import org.apache.tools.ant.taskdefs.MatchingTask;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.DirectoryScanner;
+
+import org.apache.beehive.mantis.utils.StreamCapture;
+
+public class MantisTask extends MatchingTask
+{
+  private final String P = System.getProperty("file.separator");
+
+  // required attributes
+  private String _srcdir = null;
+  private String _srcgen = null;
+  private String _bingen = null;
+  private String _classpath = null;
+  private String _config = null;
+  private String _aptcommand = null;
+  // optional attributes
+  private boolean _compile = false;
+  private String _processor = null;
+  private int _timeout = 5000;
+  // use _srcgen if not provided
+  private String _logdir = null;
+
+  // setters for attributes
+  public void setSrcdir(String p_srcdir)
+  {
+    _srcdir = p_srcdir;
+    fileset.setDir(new File(_srcdir));
+  }
+
+  public void setSrcgen(String p_srcgen)
+  {
+    _srcgen = p_srcgen;
+  }
+
+  public void setBingen(String p_bingen)
+  {
+    _bingen = p_bingen;
+  }
+
+  public void setClasspath(String p_classpath)
+  {
+    _classpath = p_classpath;
+  }
+
+  public void setConfig(String p_config)
+  {
+    _config = p_config;
+  }
+
+  public void setAptcommand(String p_aptcommand)
+  {
+    _aptcommand = p_aptcommand;
+  }
+
+  public void setCompile(boolean p_compile)
+  {
+    _compile = p_compile;
+  }
+
+  public void setProcessor(String p_processor)
+  {
+    _processor = p_processor;
+  }
+
+  public void setLogdir(String p_logdir)
+  {
+    _logdir = p_logdir;
+  }
+
+  public void setTimeout(int p_timeout)
+  {
+    _timeout = p_timeout;
+  }
+
+  public void execute() throws BuildException
+  {
+    // create the file of all files to process
+    // this will allow processing on win32 given it's
+    // limitation on command-line length
+    File fSrcgen = new File(_srcgen);
+    fSrcgen.mkdirs();
+    DirectoryScanner scanner = getDirectoryScanner(new File(_srcdir));
+    String[] files = scanner.getIncludedFiles();
+    String filename = _srcgen+P+"files.txt";
+    try
+    {
+      FileWriter writer = new FileWriter(new File(filename));
+      for(int i=0; i<files.length; i++)
+      {
+        writer.write(_srcdir+P+files[i]);
+        if(i != files.length)
+          writer.write("\n");
+      }
+      writer.flush();
+      writer.close();
+    }
+    catch(IOException ioe)
+    {
+      ioe.printStackTrace();
+      System.out.println("ERROR: IOException caught trying to create file 
listing file");
+      return;
+    }
+
+    // create the command line to call
+    StringBuffer cmd = new StringBuffer();
+    cmd.append(_aptcommand+" ");
+    if(!_compile)
+      cmd.append(" -nocompile ");
+    cmd.append("-classpath "+_classpath+" ");
+    cmd.append("-s "+_srcgen+" ");
+    if(null != _bingen)
+      cmd.append("-d "+_bingen+" ");
+    cmd.append("-factory org.apache.beehive.mantis.MantisFactory ");
+    cmd.append("-Aconfig="+_config+" ");
+    if(null != _processor)
+      cmd.append("-Aprocessor="+_processor+" ");
+    cmd.append("@"+filename+" ");
+
+    System.out.println("running command:\n"+cmd.toString());
+
+    // capture mantis stderr/stdout to log file
+    // while executing the command line apt call
+    try
+    {
+      Process p = Runtime.getRuntime().exec(cmd.toString());
+      logStreams(p);
+      System.out.println("RETURN: "+p.exitValue());
+    }
+    catch(IOException ioe)
+    {
+      ioe.printStackTrace();
+      System.out.println("ERROR: IOException during apt execution");
+    }
+    catch(InterruptedException ie)
+    {
+      ie.printStackTrace();
+      System.out.println("ERROR: InterruptedException during apt execution");
+    }
+  }
+
+  private void logStreams(Process p_proc) throws 
IOException,InterruptedException
+  {
+    // ensure log dir exists
+    if(null == _logdir)
+      _logdir = _srcgen;
+    else
+    {
+      File fLogdir = new File(_logdir);
+      fLogdir.mkdirs();
+    }
+
+    // capture stderr and stdout to log files
+    StreamCapture stderr = new StreamCapture(p_proc.getErrorStream(),"file", 
_logdir+P+"mantis.err");
+    StreamCapture stdout = new StreamCapture(p_proc.getInputStream(),"file", 
_logdir+P+"mantis.out");
+    stderr.start();
+    stdout.start();
+
+    // wait up to 5 seconds for proc to finish
+    stderr.join(_timeout);
+    stdout.join(_timeout);
+  }
+
+}

Modified: 
incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/mantis/TchProcessor.java
==============================================================================
--- 
incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/mantis/TchProcessor.java
  (original)
+++ 
incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/mantis/TchProcessor.java
  Mon Aug 30 15:07:46 2004
@@ -1,277 +1,277 @@
-package org.apache.beehive.mantis;
-
-// mirror apis
-import com.sun.mirror.apt.AnnotationProcessor;
-import com.sun.mirror.apt.AnnotationProcessorEnvironment;
-import com.sun.mirror.apt.Filer;
-import com.sun.mirror.declaration.PackageDeclaration;
-import com.sun.mirror.declaration.AnnotationTypeDeclaration;
-import com.sun.mirror.declaration.AnnotationTypeElementDeclaration;
-import com.sun.mirror.declaration.AnnotationValue;
-import com.sun.mirror.declaration.TypeDeclaration;
-import com.sun.mirror.declaration.ClassDeclaration;
-import com.sun.mirror.declaration.MethodDeclaration;
-import com.sun.mirror.declaration.AnnotationMirror;
-
-// java utils
-import java.io.PrintWriter;
-import java.io.IOException;
-import java.io.File;
-import java.util.Map;
-import java.util.Iterator;
-import java.util.Set;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.ArrayList;
-
-// mantis annotations
-import org.apache.beehive.mantis.annotations.tch.*;
-import org.apache.beehive.mantis.utils.FileTypes;
-import org.apache.beehive.mantis.utils.MantisFileInfo;
-
-// tch schema types
-import org.apache.xmlbeans.XmlAnySimpleType;
-import org.apache.xmlbeans.XmlAnySimpleType.Factory;
-import noNamespace.ProjectDocument.*;
-import noNamespace.*;
-
-public class TchProcessor extends AbstractMantisProcessor
-{
-  protected HashSet<PackageDeclaration> _pkgdecls;
-  private Filer _filer;
-
-  public void init(Set<AnnotationTypeDeclaration> p_atds,
-                   AnnotationProcessorEnvironment p_env)
-  {
-    super.init(p_atds,p_env);
-    this._pkgdecls = new HashSet();
-    this._filer = _env.getFiler();
-
-    // init the package list
-    Collection<TypeDeclaration> tdecls = 
-      _env.getSpecifiedTypeDeclarations();
-    for(TypeDeclaration tdecl : tdecls)
-    {
-      _pkgdecls.add(tdecl.getPackage());
-    }
-  }
-
-  public void process()
-  {
-    // creates an xml file for each package
-    for(PackageDeclaration pkg : _pkgdecls)
-    {
-      processPackage(pkg);
-    }
-
-    // create the root xml file
-    createRootTCH();
-
-    // print out some info about the files created during this process
-    System.out.println("created "+getFileInfo().size()+" files:");
-    for(MantisFileInfo mfi : getFileInfo())
-    {
-      System.out.println(mfi.getUrl());
-      System.out.println(mfi.getCreatingClassname());
-      if(mfi.getFileType() == FileTypes.AUX)
-        System.out.println("AUX");
-      else if(mfi.getFileType() == FileTypes.SRC)
-        System.out.println("SRC");
-      else if(mfi.getFileType() == FileTypes.BIN)
-        System.out.println("BIN");
-      System.out.println();
-    }
-
-  }
-
-  // process a package
-  private void processPackage(PackageDeclaration p_pkgdecl)
-  {
-    // create a new project document (one per package)
-    ProjectDocument pdoc = ProjectDocument.Factory.newInstance();
-    Project project = pdoc.addNewProject();
-    project.setName("tch");
-    project.setDefault("suite");
-
-    // create and init the test suite
-    TargetType target = project.addNewTarget();
-    target.setName("suite");
-    TestSuiteType suite = target.addNewTestSuite();
-    // the . char is illegal for a test name in tch
-    suite.setTestunit(p_pkgdecl.getQualifiedName().replace('.','-'));
-
-    // add the suite-level metadata
-    TestMetadataType sMeta = suite.addNewTestMetadata();
-    sMeta.setDescription("mantis-generated test suite file");
-    
-
-    // loop through the classes in this package allowing them to 
-    // add test cases to the test suite
-    Collection<ClassDeclaration> classdecls = p_pkgdecl.getClasses();
-    for(ClassDeclaration classdecl : classdecls )
-    {
-      processClass(classdecl, suite);
-    }
-
-    // create the tch xml file for this package
-    PrintWriter pw = null;
-    try
-    {
-      String filename = p_pkgdecl.getQualifiedName().replace('.','-')+".xml";
-      pw = _filer.createTextFile(Filer.Location.SOURCE_TREE,
-                                 "",
-                                 new File(filename),
-                                 null);
-      pw.print(pdoc.toString());
-      registerFile("file://"+_srctree+"/"+filename,
-                   this.getClass().getName(),
-                   FileTypes.AUX);
-    }
-    catch(IOException ioe)
-    {
-      ioe.printStackTrace();
-    }
-    finally
-    {
-      if(null != pw)
-      {
-        pw.flush();
-        pw.close();
-      }
-    }
-
-  }
-
-  private void processClass(ClassDeclaration p_cdecl, TestSuiteType p_suite)
-  {
-    // get the class-level annotation values
-    Freq cfreq = (Freq) p_cdecl.getAnnotation(Freq.class);
-    Status cstatus = (Status) p_cdecl.getAnnotation(Status.class);
-    Desc cdesc = (Desc) p_cdecl.getAnnotation(Desc.class);
-    Misc cmisc = (Misc) p_cdecl.getAnnotation(Misc.class);
-
-    // loop through the methods
-    Collection<? extends MethodDeclaration> methods = p_cdecl.getMethods();
-    Iterator mit = methods.iterator();
-    while(mit.hasNext())
-    {
-      MethodDeclaration methDecl = (MethodDeclaration) mit.next();
-      processMethod(methDecl, p_suite, cfreq, cstatus, cdesc, cmisc);
-    }
-
-  }
-
-  private void processMethod(MethodDeclaration p_methdecl, 
-                             TestSuiteType suite,
-                             Freq p_cfreq,
-                             Status p_cstatus,
-                             Desc p_cdesc,
-                             Misc p_cmisc)
-  {
-    // only process methods that start with 'test' (junit)
-    // TODO: may need to add more logic for different tch runners
-    if(! p_methdecl.getSimpleName().startsWith("test"))
-      return;
-
-    // add the test to the suite
-    TestType test = suite.addNewTest();
-    
test.setName(p_methdecl.getDeclaringType().getSimpleName()+"-"+p_methdecl.getSimpleName());
-    JavatestType junit = test.addNewJunit();
-    junit.setTestclass(p_methdecl.getDeclaringType().getQualifiedName());
-    junit.setMethodnames(p_methdecl.getSimpleName());
-    
-    // get the annotaions on the methods
-    Freq mfreq = (Freq) p_methdecl.getAnnotation(Freq.class);
-    Status mstatus = (Status) p_methdecl.getAnnotation(Status.class);
-    Desc mdesc = (Desc) p_methdecl.getAnnotation(Desc.class);
-    Misc mmisc = (Misc) p_methdecl.getAnnotation(Misc.class);
-
-    // if not present on the method use the class-level value
-    if(null == mfreq) mfreq = p_cfreq;
-    if(null == mstatus) mstatus = p_cstatus;
-    if(null == mdesc) mdesc = p_cdesc;
-    if(null == mmisc) mmisc = p_cmisc;
-
-    // add metadata to the test
-    // leave out if null
-    TestMetadataType sMeta = test.addNewTestMetadata();
-    if(null != mfreq)
-    {
-      sMeta.setFreq(createStringArrayList(mfreq.value()));
-    }
-
-    if(null != mstatus)
-    {
-      sMeta.setStatus(createStringArrayList(mstatus.value()));
-    }
-
-    if(null != mdesc)
-      sMeta.setDescription(mdesc.value());
-
-    if(null != mmisc)
-      sMeta.setMisc(mmisc.value());
-  }
-
-  private void createRootTCH()
-  {
-    // create the root xmlbean
-    ProjectDocument pdoc = ProjectDocument.Factory.newInstance();
-    Project project = pdoc.addNewProject();
-    project.setName("tch");
-    project.setDefault("suite");
-
-    // create and init the test suite
-    TargetType target = project.addNewTarget();
-    target.setName("suite");
-    TestSuiteType suite = target.addNewTestSuite();
-    // the . char is illegal for a test name in tch
-    suite.setTestunit("root");
-
-    // add a call to each package's test suite
-    for(PackageDeclaration pkgdecl : _pkgdecls)
-    {
-      XmlAnySimpleType testfile = XmlAnySimpleType.Factory.newInstance();
-      
testfile.setStringValue(pkgdecl.getQualifiedName().replace('.','-')+".xml");
-      TestSuiteCallType call = suite.addNewTestSuiteCall();
-      call.setTestfile(testfile);
-    }
-
-    // create the file on disk
-    PrintWriter pw = null;
-    try
-    {
-      String filename = "root.xml";
-      pw = _filer.createTextFile(Filer.Location.SOURCE_TREE,
-                                 "",
-                                 new File(filename),
-                                 null);
-      pw.print(pdoc.toString());
-      registerFile("file://"+_srctree+"/"+filename,
-                   this.getClass().getName(),
-                   FileTypes.AUX);
-    }
-    catch(IOException ioe)
-    {
-      ioe.printStackTrace();
-    }
-    finally
-    {
-      if(null != pw)
-      {
-        pw.flush();
-        pw.close();
-      }
-    }
-  }
-
-  private ArrayList<String> createStringArrayList(String p_input)
-  {
-    String[] values = p_input.split(" ");
-    ArrayList<String> result = new ArrayList<String>();
-    for(int i=0; i<values.length; i++)
-    {
-      result.add(values[i]);
-    }
-    return result;
-  }
-}
+package org.apache.beehive.mantis;
+
+// mirror apis
+import com.sun.mirror.apt.AnnotationProcessor;
+import com.sun.mirror.apt.AnnotationProcessorEnvironment;
+import com.sun.mirror.apt.Filer;
+import com.sun.mirror.declaration.PackageDeclaration;
+import com.sun.mirror.declaration.AnnotationTypeDeclaration;
+import com.sun.mirror.declaration.AnnotationTypeElementDeclaration;
+import com.sun.mirror.declaration.AnnotationValue;
+import com.sun.mirror.declaration.TypeDeclaration;
+import com.sun.mirror.declaration.ClassDeclaration;
+import com.sun.mirror.declaration.MethodDeclaration;
+import com.sun.mirror.declaration.AnnotationMirror;
+
+// java utils
+import java.io.PrintWriter;
+import java.io.IOException;
+import java.io.File;
+import java.util.Map;
+import java.util.Iterator;
+import java.util.Set;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.ArrayList;
+
+// mantis annotations
+import org.apache.beehive.mantis.annotations.tch.*;
+import org.apache.beehive.mantis.utils.FileTypes;
+import org.apache.beehive.mantis.utils.MantisFileInfo;
+
+// tch schema types
+import org.apache.xmlbeans.XmlAnySimpleType;
+import org.apache.xmlbeans.XmlAnySimpleType.Factory;
+import noNamespace.ProjectDocument.*;
+import noNamespace.*;
+
+public class TchProcessor extends AbstractMantisProcessor
+{
+  protected HashSet<PackageDeclaration> _pkgdecls;
+  private Filer _filer;
+
+  public void init(Set<AnnotationTypeDeclaration> p_atds,
+                   AnnotationProcessorEnvironment p_env)
+  {
+    super.init(p_atds,p_env);
+    this._pkgdecls = new HashSet();
+    this._filer = _env.getFiler();
+
+    // init the package list
+    Collection<TypeDeclaration> tdecls = 
+      _env.getSpecifiedTypeDeclarations();
+    for(TypeDeclaration tdecl : tdecls)
+    {
+      _pkgdecls.add(tdecl.getPackage());
+    }
+  }
+
+  public void process()
+  {
+    // creates an xml file for each package
+    for(PackageDeclaration pkg : _pkgdecls)
+    {
+      processPackage(pkg);
+    }
+
+    // create the root xml file
+    createRootTCH();
+
+    // print out some info about the files created during this process
+    System.out.println("created "+getFileInfo().size()+" files:");
+    for(MantisFileInfo mfi : getFileInfo())
+    {
+      System.out.println(mfi.getUrl());
+      System.out.println(mfi.getCreatingClassname());
+      if(mfi.getFileType() == FileTypes.AUX)
+        System.out.println("AUX");
+      else if(mfi.getFileType() == FileTypes.SRC)
+        System.out.println("SRC");
+      else if(mfi.getFileType() == FileTypes.BIN)
+        System.out.println("BIN");
+      System.out.println();
+    }
+
+  }
+
+  // process a package
+  private void processPackage(PackageDeclaration p_pkgdecl)
+  {
+    // create a new project document (one per package)
+    ProjectDocument pdoc = ProjectDocument.Factory.newInstance();
+    Project project = pdoc.addNewProject();
+    project.setName("tch");
+    project.setDefault("suite");
+
+    // create and init the test suite
+    TargetType target = project.addNewTarget();
+    target.setName("suite");
+    TestSuiteType suite = target.addNewTestSuite();
+    // the . char is illegal for a test name in tch
+    suite.setTestunit(p_pkgdecl.getQualifiedName().replace('.','-'));
+
+    // add the suite-level metadata
+    TestMetadataType sMeta = suite.addNewTestMetadata();
+    sMeta.setDescription("mantis-generated test suite file");
+    
+
+    // loop through the classes in this package allowing them to 
+    // add test cases to the test suite
+    Collection<ClassDeclaration> classdecls = p_pkgdecl.getClasses();
+    for(ClassDeclaration classdecl : classdecls )
+    {
+      processClass(classdecl, suite);
+    }
+
+    // create the tch xml file for this package
+    PrintWriter pw = null;
+    try
+    {
+      String filename = p_pkgdecl.getQualifiedName().replace('.','-')+".xml";
+      pw = _filer.createTextFile(Filer.Location.SOURCE_TREE,
+                                 "",
+                                 new File(filename),
+                                 null);
+      pw.print(pdoc.toString());
+      registerFile("file://"+_srctree+"/"+filename,
+                   this.getClass().getName(),
+                   FileTypes.AUX);
+    }
+    catch(IOException ioe)
+    {
+      ioe.printStackTrace();
+    }
+    finally
+    {
+      if(null != pw)
+      {
+        pw.flush();
+        pw.close();
+      }
+    }
+
+  }
+
+  private void processClass(ClassDeclaration p_cdecl, TestSuiteType p_suite)
+  {
+    // get the class-level annotation values
+    Freq cfreq = (Freq) p_cdecl.getAnnotation(Freq.class);
+    Status cstatus = (Status) p_cdecl.getAnnotation(Status.class);
+    Desc cdesc = (Desc) p_cdecl.getAnnotation(Desc.class);
+    Misc cmisc = (Misc) p_cdecl.getAnnotation(Misc.class);
+
+    // loop through the methods
+    Collection<? extends MethodDeclaration> methods = p_cdecl.getMethods();
+    Iterator mit = methods.iterator();
+    while(mit.hasNext())
+    {
+      MethodDeclaration methDecl = (MethodDeclaration) mit.next();
+      processMethod(methDecl, p_suite, cfreq, cstatus, cdesc, cmisc);
+    }
+
+  }
+
+  private void processMethod(MethodDeclaration p_methdecl, 
+                             TestSuiteType suite,
+                             Freq p_cfreq,
+                             Status p_cstatus,
+                             Desc p_cdesc,
+                             Misc p_cmisc)
+  {
+    // only process methods that start with 'test' (junit)
+    // TODO: may need to add more logic for different tch runners
+    if(! p_methdecl.getSimpleName().startsWith("test"))
+      return;
+
+    // add the test to the suite
+    TestType test = suite.addNewTest();
+    
test.setName(p_methdecl.getDeclaringType().getSimpleName()+"-"+p_methdecl.getSimpleName());
+    JavatestType junit = test.addNewJunit();
+    junit.setTestclass(p_methdecl.getDeclaringType().getQualifiedName());
+    junit.setMethodnames(p_methdecl.getSimpleName());
+    
+    // get the annotaions on the methods
+    Freq mfreq = (Freq) p_methdecl.getAnnotation(Freq.class);
+    Status mstatus = (Status) p_methdecl.getAnnotation(Status.class);
+    Desc mdesc = (Desc) p_methdecl.getAnnotation(Desc.class);
+    Misc mmisc = (Misc) p_methdecl.getAnnotation(Misc.class);
+
+    // if not present on the method use the class-level value
+    if(null == mfreq) mfreq = p_cfreq;
+    if(null == mstatus) mstatus = p_cstatus;
+    if(null == mdesc) mdesc = p_cdesc;
+    if(null == mmisc) mmisc = p_cmisc;
+
+    // add metadata to the test
+    // leave out if null
+    TestMetadataType sMeta = test.addNewTestMetadata();
+    if(null != mfreq)
+    {
+      sMeta.setFreq(createStringArrayList(mfreq.value()));
+    }
+
+    if(null != mstatus)
+    {
+      sMeta.setStatus(createStringArrayList(mstatus.value()));
+    }
+
+    if(null != mdesc)
+      sMeta.setDescription(mdesc.value());
+
+    if(null != mmisc)
+      sMeta.setMisc(mmisc.value());
+  }
+
+  private void createRootTCH()
+  {
+    // create the root xmlbean
+    ProjectDocument pdoc = ProjectDocument.Factory.newInstance();
+    Project project = pdoc.addNewProject();
+    project.setName("tch");
+    project.setDefault("suite");
+
+    // create and init the test suite
+    TargetType target = project.addNewTarget();
+    target.setName("suite");
+    TestSuiteType suite = target.addNewTestSuite();
+    // the . char is illegal for a test name in tch
+    suite.setTestunit("root");
+
+    // add a call to each package's test suite
+    for(PackageDeclaration pkgdecl : _pkgdecls)
+    {
+      XmlAnySimpleType testfile = XmlAnySimpleType.Factory.newInstance();
+      
testfile.setStringValue(pkgdecl.getQualifiedName().replace('.','-')+".xml");
+      TestSuiteCallType call = suite.addNewTestSuiteCall();
+      call.setTestfile(testfile);
+    }
+
+    // create the file on disk
+    PrintWriter pw = null;
+    try
+    {
+      String filename = "root.xml";
+      pw = _filer.createTextFile(Filer.Location.SOURCE_TREE,
+                                 "",
+                                 new File(filename),
+                                 null);
+      pw.print(pdoc.toString());
+      registerFile("file://"+_srctree+"/"+filename,
+                   this.getClass().getName(),
+                   FileTypes.AUX);
+    }
+    catch(IOException ioe)
+    {
+      ioe.printStackTrace();
+    }
+    finally
+    {
+      if(null != pw)
+      {
+        pw.flush();
+        pw.close();
+      }
+    }
+  }
+
+  private ArrayList<String> createStringArrayList(String p_input)
+  {
+    String[] values = p_input.split(" ");
+    ArrayList<String> result = new ArrayList<String>();
+    for(int i=0; i<values.length; i++)
+    {
+      result.add(values[i]);
+    }
+    return result;
+  }
+}

Modified: 
incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/mantis/annotations/tch/Desc.java
==============================================================================
--- 
incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/mantis/annotations/tch/Desc.java
  (original)
+++ 
incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/mantis/annotations/tch/Desc.java
  Mon Aug 30 15:07:46 2004
@@ -1,6 +1,6 @@
-package org.apache.beehive.mantis.annotations.tch;
-
-public @interface Desc
-{
-  String value();
-}
+package org.apache.beehive.mantis.annotations.tch;
+
+public @interface Desc
+{
+  String value();
+}

Modified: 
incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/mantis/annotations/tch/Freq.java
==============================================================================
--- 
incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/mantis/annotations/tch/Freq.java
  (original)
+++ 
incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/mantis/annotations/tch/Freq.java
  Mon Aug 30 15:07:46 2004
@@ -1,6 +1,6 @@
-package org.apache.beehive.mantis.annotations.tch;
-
-public @interface Freq
-{
-       String value() default "detailed"; 
-}
+package org.apache.beehive.mantis.annotations.tch;
+
+public @interface Freq
+{
+       String value() default "detailed"; 
+}

Modified: 
incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/mantis/annotations/tch/Misc.java
==============================================================================
--- 
incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/mantis/annotations/tch/Misc.java
  (original)
+++ 
incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/mantis/annotations/tch/Misc.java
  Mon Aug 30 15:07:46 2004
@@ -1,6 +1,6 @@
-package org.apache.beehive.mantis.annotations.tch;
-
-public @interface Misc
-{
-  String value();
-}
+package org.apache.beehive.mantis.annotations.tch;
+
+public @interface Misc
+{
+  String value();
+}

Modified: 
incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/mantis/annotations/tch/Status.java
==============================================================================
--- 
incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/mantis/annotations/tch/Status.java
        (original)
+++ 
incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/mantis/annotations/tch/Status.java
        Mon Aug 30 15:07:46 2004
@@ -1,6 +1,6 @@
-package org.apache.beehive.mantis.annotations.tch;
-
-public @interface Status
-{
-  String value() default "active";
-}
+package org.apache.beehive.mantis.annotations.tch;
+
+public @interface Status
+{
+  String value() default "active";
+}

Modified: 
incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/mantis/test/CheckinTest.java
==============================================================================
--- 
incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/mantis/test/CheckinTest.java
      (original)
+++ 
incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/mantis/test/CheckinTest.java
      Mon Aug 30 15:07:46 2004
@@ -1,35 +1,35 @@
-package org.apache.beehive.mantis.test;
-
-import junit.framework.TestCase;
-import org.apache.beehive.mantis.annotations.tch.*;
-
-
[EMAIL PROTECTED]("checkin")
[EMAIL PROTECTED]("active")
[EMAIL PROTECTED]("a class desc")
[EMAIL PROTECTED]("a class misc")
-public class CheckinTest extends TestCase
-{
-       public CheckinTest(String name) throws Exception
-       {
-               super(name);
-       }
-
-  @Freq("detailed")
-  @Status("inactive")
-  @Desc("a method desc")
-  @Misc("a method misc")
-       public void testPass() throws Exception
-       {
-       }
-
-       public void testFail() throws Exception
-       {
-    assertTrue(false);
-       }
-
-  public void notATest() throws Exception
-  {
-  }
-
-}
+package org.apache.beehive.mantis.test;
+
+import junit.framework.TestCase;
+import org.apache.beehive.mantis.annotations.tch.*;
+
+
[EMAIL PROTECTED]("checkin")
[EMAIL PROTECTED]("active")
[EMAIL PROTECTED]("a class desc")
[EMAIL PROTECTED]("a class misc")
+public class CheckinTest extends TestCase
+{
+       public CheckinTest(String name) throws Exception
+       {
+               super(name);
+       }
+
+  @Freq("detailed")
+  @Status("inactive")
+  @Desc("a method desc")
+  @Misc("a method misc")
+       public void testPass() throws Exception
+       {
+       }
+
+       public void testFail() throws Exception
+       {
+    assertTrue(false);
+       }
+
+  public void notATest() throws Exception
+  {
+  }
+
+}

Modified: 
incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/mantis/test/DetailedTest.java
==============================================================================
--- 
incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/mantis/test/DetailedTest.java
     (original)
+++ 
incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/mantis/test/DetailedTest.java
     Mon Aug 30 15:07:46 2004
@@ -1,31 +1,31 @@
-package org.apache.beehive.mantis.test;
-
-import junit.framework.TestCase;
-import org.apache.beehive.mantis.annotations.tch.*;
-
-
-public class DetailedTest extends TestCase
-{
-       public DetailedTest(String name) throws Exception
-       {
-               super(name);
-       }
-
-  @Freq("detailed")
-  @Status("active")
-  @Desc("a method desc")
-  @Misc("a method misc")
-       public void testPass() throws Exception
-       {
-       }
-
-       public void testFail() throws Exception
-       {
-               assertTrue(false);
-       }
-
-  public void notATest() throws Exception
-  {
-  }
-
-}
+package org.apache.beehive.mantis.test;
+
+import junit.framework.TestCase;
+import org.apache.beehive.mantis.annotations.tch.*;
+
+
+public class DetailedTest extends TestCase
+{
+       public DetailedTest(String name) throws Exception
+       {
+               super(name);
+       }
+
+  @Freq("detailed")
+  @Status("active")
+  @Desc("a method desc")
+  @Misc("a method misc")
+       public void testPass() throws Exception
+       {
+       }
+
+       public void testFail() throws Exception
+       {
+               assertTrue(false);
+       }
+
+  public void notATest() throws Exception
+  {
+  }
+
+}

Modified: 
incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/mantis/utils/FileTypes.java
==============================================================================
--- 
incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/mantis/utils/FileTypes.java
       (original)
+++ 
incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/mantis/utils/FileTypes.java
       Mon Aug 30 15:07:46 2004
@@ -1,3 +1,3 @@
-package org.apache.beehive.mantis.utils;
-
-public enum FileTypes {SRC,BIN,AUX};
+package org.apache.beehive.mantis.utils;
+
+public enum FileTypes {SRC,BIN,AUX};

Modified: 
incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/mantis/utils/MantisFileInfo.java
==============================================================================
--- 
incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/mantis/utils/MantisFileInfo.java
  (original)
+++ 
incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/mantis/utils/MantisFileInfo.java
  Mon Aug 30 15:07:46 2004
@@ -1,22 +1,22 @@
-package org.apache.beehive.mantis.utils;
-
-public class MantisFileInfo
-{
-  private final String _url;
-  private final String _creatingClassname;
-  private final FileTypes _type;
-
-  public MantisFileInfo(String url, 
-                        String classname, 
-                        FileTypes type)
-  {
-    this._url = url;
-    this._creatingClassname = classname;
-    this._type = type;
-  }
-
-  public String getUrl(){return _url;}
-  public String getCreatingClassname(){return _creatingClassname;}
-  public FileTypes getFileType(){return _type;}
-
-}
+package org.apache.beehive.mantis.utils;
+
+public class MantisFileInfo
+{
+  private final String _url;
+  private final String _creatingClassname;
+  private final FileTypes _type;
+
+  public MantisFileInfo(String url, 
+                        String classname, 
+                        FileTypes type)
+  {
+    this._url = url;
+    this._creatingClassname = classname;
+    this._type = type;
+  }
+
+  public String getUrl(){return _url;}
+  public String getCreatingClassname(){return _creatingClassname;}
+  public FileTypes getFileType(){return _type;}
+
+}

Modified: 
incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/mantis/utils/StreamCapture.java
==============================================================================
--- 
incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/mantis/utils/StreamCapture.java
   (original)
+++ 
incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/mantis/utils/StreamCapture.java
   Mon Aug 30 15:07:46 2004
@@ -1,100 +1,100 @@
-package org.apache.beehive.mantis.utils;
-
-import java.io.*;
-import java.lang.StringBuffer;
-
-/**
- * A utility for reading from an InputStream
- */
-public class StreamCapture extends Thread {
-    private InputStream is;
-    private String type;
-    private String filename;
-    private String bufferContents = "";   
-
-    /**
-     * 
-     * @param is InputStream to read from
-     * @param type An identifier for this stream capture (valid values: 
stderr, stdout)
-     */
-    public StreamCapture(InputStream is, String type)
-    {
-        this.is = is;
-        this.type = type;
-    }
-
-    /**
-     * 
-     * @param is InputStream to read from
-     * @param type An identifier for this stream capture (valid values: 
stderr, stdout, file)
-     * @param file If given, the data is saved to this file vs. an in-memory 
string.
-     */
-    public StreamCapture(InputStream is, String type, String file)
-    {
-        this.is = is;
-        this.type = type;
-        this.filename = file;
-    }
-
-
-    /**
-     * @return The buffer contents as a string
-     */
-    public String getString()
-    {
-        return bufferContents;
-    }
-
-
-    /**
-     * Read the InputStream supplied and put into 
-     * a string which is accessed via getString() or 
-     * a file is type==file and a filename is given.
-     */
-    public void run()
-    {
-        // if type == "file" save the contents to a file
-        if(type.equalsIgnoreCase("file"))
-        {
-          try
-          {
-            InputStreamReader isr = new InputStreamReader(is);
-            BufferedReader br = new BufferedReader(isr);
-            String line = null;
-            FileWriter fw = new FileWriter(filename);
-            BufferedWriter bw = new BufferedWriter(fw);
-            while( (line = br.readLine()) != null )
-            {
-              bw.write(line);
-              bw.newLine();
-              bw.flush();
-            }
-            bw.flush();
-            bw.close();            
-          }
-          catch (IOException ioe)
-          {
-              ioe.printStackTrace();
-          }          
-        }
-        else
-        {        
-          try
-          {
-              InputStreamReader isr = new InputStreamReader(is);
-              BufferedReader br = new BufferedReader(isr);
-              StringBuffer sb = new StringBuffer();         
-              String line = null;
-              while ((line = br.readLine()) != null)
-              {
-                  sb.append(line);
-              }
-              bufferContents = sb.toString();
-          }
-          catch (IOException ioe)
-          {
-              ioe.printStackTrace();
-          }
-        }  
-    }
-}
+package org.apache.beehive.mantis.utils;
+
+import java.io.*;
+import java.lang.StringBuffer;
+
+/**
+ * A utility for reading from an InputStream
+ */
+public class StreamCapture extends Thread {
+    private InputStream is;
+    private String type;
+    private String filename;
+    private String bufferContents = "";   
+
+    /**
+     * 
+     * @param is InputStream to read from
+     * @param type An identifier for this stream capture (valid values: 
stderr, stdout)
+     */
+    public StreamCapture(InputStream is, String type)
+    {
+        this.is = is;
+        this.type = type;
+    }
+
+    /**
+     * 
+     * @param is InputStream to read from
+     * @param type An identifier for this stream capture (valid values: 
stderr, stdout, file)
+     * @param file If given, the data is saved to this file vs. an in-memory 
string.
+     */
+    public StreamCapture(InputStream is, String type, String file)
+    {
+        this.is = is;
+        this.type = type;
+        this.filename = file;
+    }
+
+
+    /**
+     * @return The buffer contents as a string
+     */
+    public String getString()
+    {
+        return bufferContents;
+    }
+
+
+    /**
+     * Read the InputStream supplied and put into 
+     * a string which is accessed via getString() or 
+     * a file is type==file and a filename is given.
+     */
+    public void run()
+    {
+        // if type == "file" save the contents to a file
+        if(type.equalsIgnoreCase("file"))
+        {
+          try
+          {
+            InputStreamReader isr = new InputStreamReader(is);
+            BufferedReader br = new BufferedReader(isr);
+            String line = null;
+            FileWriter fw = new FileWriter(filename);
+            BufferedWriter bw = new BufferedWriter(fw);
+            while( (line = br.readLine()) != null )
+            {
+              bw.write(line);
+              bw.newLine();
+              bw.flush();
+            }
+            bw.flush();
+            bw.close();            
+          }
+          catch (IOException ioe)
+          {
+              ioe.printStackTrace();
+          }          
+        }
+        else
+        {        
+          try
+          {
+              InputStreamReader isr = new InputStreamReader(is);
+              BufferedReader br = new BufferedReader(isr);
+              StringBuffer sb = new StringBuffer();         
+              String line = null;
+              while ((line = br.readLine()) != null)
+              {
+                  sb.append(line);
+              }
+              bufferContents = sb.toString();
+          }
+          catch (IOException ioe)
+          {
+              ioe.printStackTrace();
+          }
+        }  
+    }
+}

Modified: 
incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/client/TestContext.java
==============================================================================
--- 
incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/client/TestContext.java
 (original)
+++ 
incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/client/TestContext.java
 Mon Aug 30 15:07:46 2004
@@ -1,51 +1,51 @@
-package org.apache.beehive.test.tools.milton.client;
-
-import java.util.Properties;
-
-/**
- * A (static) set of Properties describing the test environment.
- */
-public class TestContext
-{
-    private static final Properties _properties =
-        (Properties)System.getProperties().clone();
-
-    private TestContext()
-    {
-    }
-
-    public static String getProperty(String key)
-    {
-        return _properties.getProperty(key);
-    }
-
-    public static String getProperty(String key, String defaultValue)
-    {
-        return _properties.getProperty(key, defaultValue);
-    }
-
-    public static int getPropertyAsInt(String key, String defaultValue)
-    {
-        String prop = _properties.getProperty(key, defaultValue);
-        if (prop == null)
-            return -1;
-
-        try {
-            return Integer.parseInt(prop);
-        }
-        catch (NumberFormatException e) {
-            return -1;
-        }
-    }
-
-    public static void setProperty(String key, String value)
-    {
-        _properties.setProperty(key, value);
-    }
-
-    public static void setProperty(String key, int value)
-    {
-        _properties.setProperty(key, String.valueOf(value));
-    }
-
-}
+package org.apache.beehive.test.tools.milton.client;
+
+import java.util.Properties;
+
+/**
+ * A (static) set of Properties describing the test environment.
+ */
+public class TestContext
+{
+    private static final Properties _properties =
+        (Properties)System.getProperties().clone();
+
+    private TestContext()
+    {
+    }
+
+    public static String getProperty(String key)
+    {
+        return _properties.getProperty(key);
+    }
+
+    public static String getProperty(String key, String defaultValue)
+    {
+        return _properties.getProperty(key, defaultValue);
+    }
+
+    public static int getPropertyAsInt(String key, String defaultValue)
+    {
+        String prop = _properties.getProperty(key, defaultValue);
+        if (prop == null)
+            return -1;
+
+        try {
+            return Integer.parseInt(prop);
+        }
+        catch (NumberFormatException e) {
+            return -1;
+        }
+    }
+
+    public static void setProperty(String key, String value)
+    {
+        _properties.setProperty(key, value);
+    }
+
+    public static void setProperty(String key, int value)
+    {
+        _properties.setProperty(key, String.valueOf(value));
+    }
+
+}

Modified: 
incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/common/Report.java
==============================================================================
--- 
incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/common/Report.java
      (original)
+++ 
incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/common/Report.java
      Mon Aug 30 15:07:46 2004
@@ -1,125 +1,125 @@
-package org.apache.beehive.test.tools.milton.common;
-
-import java.io.PrintStream;
-import java.io.ByteArrayOutputStream;
-
-/**   
-* Report class used for storing the results of a test.  This object is
-* referenced by testResults.jsp (or custom report page) which can displays
-* the results stored in the Result object.
-*/
-public class Report implements java.io.Serializable
-{
-    static final long serialVersionUID = 1L;
-        
-    public static final String PASS = "PASS";
-    public static final String FAIL = "FAIL";
-    public static final String ABORT = "ABORT";
-    
-    // For PageFlow action annotations
-    public static final String KEY = "milton";
-    public static final String RESULTS = "miltonResults";
-    public static final String RESULTSJSP = 
"/resources/milton/jsp/miltonResults.jsp";
-
-    // For JSP and client side parsing of results
-    public static final String RESULT_TABLE_ID = "milton.results.table";
-    public static final String STATUS_ID = "milton.status";
-    public static final String MESSAGE_ID = "milton.message";
-    public static final String EXCEPTION_ID = "milton.exception";
-
-    private String status;
-    private String message;
-    private String exceptionStack;
-
-    public Report()
-    {
-        this(Report.FAIL);
-    }
-
-    public Report(String p_status)
-    {
-        this(p_status, "", null);
-    }
-
-    public Report(boolean p_status)
-    {
-        this(p_status == true ? Report.PASS : Report.FAIL);
-    }
-    public Report(String p_status, String p_message)
-    {
-        this(p_status, p_message, null);
-    }
-
-    public Report(String p_status, String p_message, Throwable p_stack)
-    {
-        setStatus(p_status);
-        setMessage(p_message);
-        setExceptionStack(p_stack);
-    }            
-        
-    public String getStatus() 
-    {
-        return this.status;
-    }
-
-    public boolean getStatusAsBoolean()
-    {
-        return this.status == Report.PASS ? true : false;
-    }
-        
-    public String getMessage()
-    {
-        return this.message;
-    }
-        
-    public String getExceptionStack()
-    {
-        return this.exceptionStack;
-    }
-        
-    public void setStatus(String p_status)
-    {
-        if (null == p_status)
-            throw new IllegalArgumentException("Cannot set status to null");
-
-        if (! Report.PASS.equals(p_status) && 
-            ! Report.FAIL.equals(p_status) &&
-            ! Report.ABORT.equals(p_status))
-            throw new IllegalArgumentException("Invalid Status: " + p_status +
-                                               " Valid Status: 
PASS|FAIL|ABORT");
-        this.status = p_status;
-    }
-        
-    public void setStatus(boolean p_status)
-    {
-        setStatus(p_status == true ? Report.PASS : Report.FAIL);
-    }
-        
-    public void setMessage(String p_message)
-    {
-        this.message = p_message == null ? "" : p_message;
-    }
-        
-    public void addMessage(String p_message)
-    {
-        this.message += "[( " + p_message + " )]";
-    }
-        
-    public void setExceptionStack(Throwable e)
-    {
-        if (null == e) {
-            this.exceptionStack = "";
-        }
-        else {
-            ByteArrayOutputStream ostr = new ByteArrayOutputStream();
-            e.printStackTrace(new PrintStream(ostr));
-          
-            setExceptionStack(ostr.toString());
-        }
-    }
-    
-    public void setExceptionStack(String es)
-    {
-        this.exceptionStack = es;
-    }
-}
+package org.apache.beehive.test.tools.milton.common;
+
+import java.io.PrintStream;
+import java.io.ByteArrayOutputStream;
+
+/**   
+* Report class used for storing the results of a test.  This object is
+* referenced by testResults.jsp (or custom report page) which can displays
+* the results stored in the Result object.
+*/
+public class Report implements java.io.Serializable
+{
+    static final long serialVersionUID = 1L;
+        
+    public static final String PASS = "PASS";
+    public static final String FAIL = "FAIL";
+    public static final String ABORT = "ABORT";
+    
+    // For PageFlow action annotations
+    public static final String KEY = "milton";
+    public static final String RESULTS = "miltonResults";
+    public static final String RESULTSJSP = 
"/resources/milton/jsp/miltonResults.jsp";
+
+    // For JSP and client side parsing of results
+    public static final String RESULT_TABLE_ID = "milton.results.table";
+    public static final String STATUS_ID = "milton.status";
+    public static final String MESSAGE_ID = "milton.message";
+    public static final String EXCEPTION_ID = "milton.exception";
+
+    private String status;
+    private String message;
+    private String exceptionStack;
+
+    public Report()
+    {
+        this(Report.FAIL);
+    }
+
+    public Report(String p_status)
+    {
+        this(p_status, "", null);
+    }
+
+    public Report(boolean p_status)
+    {
+        this(p_status == true ? Report.PASS : Report.FAIL);
+    }
+    public Report(String p_status, String p_message)
+    {
+        this(p_status, p_message, null);
+    }
+
+    public Report(String p_status, String p_message, Throwable p_stack)
+    {
+        setStatus(p_status);
+        setMessage(p_message);
+        setExceptionStack(p_stack);
+    }            
+        
+    public String getStatus() 
+    {
+        return this.status;
+    }
+
+    public boolean getStatusAsBoolean()
+    {
+        return this.status == Report.PASS ? true : false;
+    }
+        
+    public String getMessage()
+    {
+        return this.message;
+    }
+        
+    public String getExceptionStack()
+    {
+        return this.exceptionStack;
+    }
+        
+    public void setStatus(String p_status)
+    {
+        if (null == p_status)
+            throw new IllegalArgumentException("Cannot set status to null");
+
+        if (! Report.PASS.equals(p_status) && 
+            ! Report.FAIL.equals(p_status) &&
+            ! Report.ABORT.equals(p_status))
+            throw new IllegalArgumentException("Invalid Status: " + p_status +
+                                               " Valid Status: 
PASS|FAIL|ABORT");
+        this.status = p_status;
+    }
+        
+    public void setStatus(boolean p_status)
+    {
+        setStatus(p_status == true ? Report.PASS : Report.FAIL);
+    }
+        
+    public void setMessage(String p_message)
+    {
+        this.message = p_message == null ? "" : p_message;
+    }
+        
+    public void addMessage(String p_message)
+    {
+        this.message += "[( " + p_message + " )]";
+    }
+        
+    public void setExceptionStack(Throwable e)
+    {
+        if (null == e) {
+            this.exceptionStack = "";
+        }
+        else {
+            ByteArrayOutputStream ostr = new ByteArrayOutputStream();
+            e.printStackTrace(new PrintStream(ostr));
+          
+            setExceptionStack(ostr.toString());
+        }
+    }
+    
+    public void setExceptionStack(String es)
+    {
+        this.exceptionStack = es;
+    }
+}

Modified: 
incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/junit/AbortTestException.java
==============================================================================
--- 
incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/junit/AbortTestException.java
   (original)
+++ 
incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/junit/AbortTestException.java
   Mon Aug 30 15:07:46 2004
@@ -1,17 +1,17 @@
-package org.apache.beehive.test.tools.milton.junit;
-       
-
-public class AbortTestException extends RuntimeException
-{
-    public AbortTestException() {
-        super();
-    }
-
-    public AbortTestException(String msg) {
-        super(msg);
-    }
-
-    public AbortTestException(String msg, Throwable cause) {
-        super(msg, cause);
-    }
-}
+package org.apache.beehive.test.tools.milton.junit;
+       
+
+public class AbortTestException extends RuntimeException
+{
+    public AbortTestException() {
+        super();
+    }
+
+    public AbortTestException(String msg) {
+        super(msg);
+    }
+
+    public AbortTestException(String msg, Throwable cause) {
+        super(msg, cause);
+    }
+}

Modified: 
incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/junit/FailTestError.java
==============================================================================
--- 
incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/junit/FailTestError.java
        (original)
+++ 
incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/junit/FailTestError.java
        Mon Aug 30 15:07:46 2004
@@ -1,12 +1,12 @@
-package org.apache.beehive.test.tools.milton.junit;
-
-public class FailTestError extends junit.framework.AssertionFailedError
-{
-    public FailTestError() {
-        super();
-    }
-
-    public FailTestError(String msg) {
-        super(msg);
-    }
-}
+package org.apache.beehive.test.tools.milton.junit;
+
+public class FailTestError extends junit.framework.AssertionFailedError
+{
+    public FailTestError() {
+        super();
+    }
+
+    public FailTestError(String msg) {
+        super(msg);
+    }
+}

Modified: 
incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/junit/HtmlReportTestCase.java
==============================================================================
--- 
incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/junit/HtmlReportTestCase.java
   (original)
+++ 
incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/junit/HtmlReportTestCase.java
   Mon Aug 30 15:07:46 2004
@@ -1,221 +1,221 @@
-package org.apache.beehive.test.tools.milton.junit;
-
-import junit.framework.TestCase;
-
-import com.meterware.httpunit.WebLink;
-import com.meterware.httpunit.WebResponse;
-import com.meterware.httpunit.WebRequest;
-import com.meterware.httpunit.WebTable;
-import com.meterware.httpunit.TableCell;
-import com.meterware.httpunit.WebConversation;
-
-import org.apache.beehive.test.tools.milton.junit.AbortTestException;
-import org.apache.beehive.test.tools.milton.junit.FailTestError;
-import org.apache.beehive.test.tools.milton.client.TestContext;
-import org.apache.beehive.test.tools.milton.common.Report;
-
-
-public class HtmlReportTestCase extends TestCase
-{
-    private static final String HTTP_PREFIX = "http://";;
-    private static final String HTTPS_PREFIX = "https://";;
-
-    private String urlPrefix = null;
-
-    public HtmlReportTestCase(String name)
-    {
-        super(name);
-
-        String hostName = TestContext.getProperty("TEST_HOSTNAME");
-        String hostNamePort = TestContext.getProperty("TEST_HOSTNAME_PORT");
-
-        if (null == hostName || hostName.equals("")) {
-            hostName = TestContext.getProperty("HOSTNAME");
-            if (null == hostName || hostName.equals(""))
-                hostName = "localhost";
-        }
-
-        if (null != hostNamePort)
-            hostName += ":" + hostNamePort;
-
-        this.urlPrefix = HTTP_PREFIX + hostName;
-    }
-
-    public String getUrlPrefix()
-    {
-        return this.urlPrefix;
-    }
-
-    public void setUrlPrefix(String p_urlPrefix)
-    {
-        if (null == p_urlPrefix)
-            throw new IllegalArgumentException("Cannot set null URI PRefix");
-
-        if (! p_urlPrefix.startsWith(HTTP_PREFIX) || 
-            ! p_urlPrefix.startsWith(HTTPS_PREFIX)) {
-            throw new IllegalArgumentException("URL Prefix must have a valid " 
+
-                                               "protocol: " + HTTP_PREFIX + 
-                                               " or " + HTTPS_PREFIX + ": " +
-                                               p_urlPrefix);
-        }
-
-        this.urlPrefix = p_urlPrefix;
-    }
-
-    public void assertReport(String p_url)
-        throws Exception
-    {
-        assertReport(new WebConversation(), p_url);
-    }
-
-    public void assertReport(String p_url, String p_link)
-        throws Exception
-    {
-        assertReport(new WebConversation(), p_url, p_link);
-    }
-
-    public void assertReport(WebConversation p_wc, String p_url) 
-        throws Exception
-    {
-        assertReport(p_wc, p_url, (String)null);
-    }
-
-    public void assertReport(WebConversation p_wc, String p_url, String p_link)
-        throws Exception
-    { 
-        String url = null;
-        WebResponse wr = null;
-
-        if (null == p_wc || null == p_url)
-            throw new IllegalArgumentException("WebConversation and URL " + 
-                                               "cannot be null");
-
-        // find out if user has passed an entire url complete with protocol
-        // or if we need to prepend this.urlPrefix
-        if (p_url.startsWith(HTTP_PREFIX) || p_url.startsWith(HTTPS_PREFIX))
-            url = p_url;
-        else {
-            if (p_url.startsWith("/"))
-                url = getUrlPrefix() + p_url;
-            else
-                url = getUrlPrefix() + "/" + p_url;
-        }
-    
-        try {
-            wr = p_wc.getResponse(url);
-        }
-        catch(java.net.MalformedURLException mue) {
-            throw new AbortTestException("Error getting WebResponse", mue);
-        }
-        catch(java.io.IOException ioe) {
-            throw new AbortTestException("Error getting WebResponse", ioe);
-        }
-        catch(org.xml.sax.SAXException saxe) {
-            throw new AbortTestException("Error getting WebResponse", saxe);
-        }
-
-        if (null != p_link) {
-            clickLink(wr, p_link);
-            assertReport(p_wc.getCurrentPage());
-        }
-        else {
-            assertReport(wr);
-        }
-    }    
-
-    public void assertReport(WebRequest p_wr)
-        throws Exception
-    {
-        assertReport(new WebConversation(), p_wr);
-    }
-
-    public void assertReport(WebConversation wc, WebRequest wr)
-        throws Exception
-    {
-        assertReport(wc.getResponse(wr));
-    }
-
-    public void assertReport(WebResponse p_wr)
-        throws Exception
-    {
-
-        if (null == p_wr)
-            throw new AbortTestException("WebResponse cannot be null");
-
-        if (p_wr.getResponseCode() != 200)
-            throw new AbortTestException("Bad HTTP Response Code: " +
-                                         p_wr.getResponseCode());
-
-        String status = null;
-        String message = null;
-        String exception = null;
-
-        WebTable wt = p_wr.getTableWithID(Report.RESULT_TABLE_ID);
-
-        if (null == wt)
-            throw new AbortTestException("Table not found: \n" + 
-                                         p_wr.getText());
-
-        TableCell statusCell = wt.getTableCellWithID(Report.STATUS_ID);
-        TableCell messageCell = wt.getTableCellWithID(Report.MESSAGE_ID);
-        TableCell exceptionCell = wt.getTableCellWithID(Report.EXCEPTION_ID);
-
-        if (null != statusCell)
-            status = statusCell.asText().trim();
-
-        if (null != messageCell)
-            message = messageCell.asText().trim();
-
-        if (null != exceptionCell)
-            exception = exceptionCell.asText().trim();
-        
-        // Print Messages && Exceptions
-        if (null != message && ! message.equals(""))
-            System.out.println("Message: " + message);
-
-        if (null != exception && ! exception.equals(""))
-            System.out.println("Exception: " + exception);
-
-        // Check the status and report accordingly
-        if (null == status || status.equals(""))
-            throw new AbortTestException("No Status Found!");
-
-        // If it does not PASS, check for other valid statuses or ABORT
-        if (! status.equals(Report.PASS)) {
-
-            if (status.equals(Report.ABORT))
-                throw new AbortTestException("Abort Status Detected: \n" +
-                                             p_wr.getText());
-            else if (status.equals(Report.FAIL))
-                throw new FailTestError("Failure Status Detected: \n" +
-                                        p_wr.getText());
-            else
-                throw new AbortTestException("Invalid Status Was Found: \n" +
-                                             p_wr.getText());
-        }
-    }
-
-    private void clickLink (WebResponse p_wr, String p_link)
-    {
-        WebLink webLink = null;
-
-        try {
-            webLink = p_wr.getLinkWith(p_link);
-            webLink.click();
-        }
-        catch (NullPointerException npe) {
-            throw new AbortTestException("Link '" + p_link + "' not found in " 
+
-                                         p_wr.getURL(), npe);
-        }
-        catch(java.io.IOException ioe) {
-            throw new AbortTestException("Error clicking link: " +
-                                         p_link, ioe);
-        }
-        catch(org.xml.sax.SAXException saxe) {
-            throw new AbortTestException("Error clicking link: " + 
-                                         p_link, saxe);
-        }
-
-    }
-}
-
+package org.apache.beehive.test.tools.milton.junit;
+
+import junit.framework.TestCase;
+
+import com.meterware.httpunit.WebLink;
+import com.meterware.httpunit.WebResponse;
+import com.meterware.httpunit.WebRequest;
+import com.meterware.httpunit.WebTable;
+import com.meterware.httpunit.TableCell;
+import com.meterware.httpunit.WebConversation;
+
+import org.apache.beehive.test.tools.milton.junit.AbortTestException;
+import org.apache.beehive.test.tools.milton.junit.FailTestError;
+import org.apache.beehive.test.tools.milton.client.TestContext;
+import org.apache.beehive.test.tools.milton.common.Report;
+
+
+public class HtmlReportTestCase extends TestCase
+{
+    private static final String HTTP_PREFIX = "http://";;
+    private static final String HTTPS_PREFIX = "https://";;
+
+    private String urlPrefix = null;
+
+    public HtmlReportTestCase(String name)
+    {
+        super(name);
+
+        String hostName = TestContext.getProperty("TEST_HOSTNAME");
+        String hostNamePort = TestContext.getProperty("TEST_HOSTNAME_PORT");
+
+        if (null == hostName || hostName.equals("")) {
+            hostName = TestContext.getProperty("HOSTNAME");
+            if (null == hostName || hostName.equals(""))
+                hostName = "localhost";
+        }
+
+        if (null != hostNamePort)
+            hostName += ":" + hostNamePort;
+
+        this.urlPrefix = HTTP_PREFIX + hostName;
+    }
+
+    public String getUrlPrefix()
+    {
+        return this.urlPrefix;
+    }
+
+    public void setUrlPrefix(String p_urlPrefix)
+    {
+        if (null == p_urlPrefix)
+            throw new IllegalArgumentException("Cannot set null URI PRefix");
+
+        if (! p_urlPrefix.startsWith(HTTP_PREFIX) || 
+            ! p_urlPrefix.startsWith(HTTPS_PREFIX)) {
+            throw new IllegalArgumentException("URL Prefix must have a valid " 
+
+                                               "protocol: " + HTTP_PREFIX + 
+                                               " or " + HTTPS_PREFIX + ": " +
+                                               p_urlPrefix);
+        }
+
+        this.urlPrefix = p_urlPrefix;
+    }
+
+    public void assertReport(String p_url)
+        throws Exception
+    {
+        assertReport(new WebConversation(), p_url);
+    }
+
+    public void assertReport(String p_url, String p_link)
+        throws Exception
+    {
+        assertReport(new WebConversation(), p_url, p_link);
+    }
+
+    public void assertReport(WebConversation p_wc, String p_url) 
+        throws Exception
+    {
+        assertReport(p_wc, p_url, (String)null);
+    }
+
+    public void assertReport(WebConversation p_wc, String p_url, String p_link)
+        throws Exception
+    { 
+        String url = null;
+        WebResponse wr = null;
+
+        if (null == p_wc || null == p_url)
+            throw new IllegalArgumentException("WebConversation and URL " + 
+                                               "cannot be null");
+
+        // find out if user has passed an entire url complete with protocol
+        // or if we need to prepend this.urlPrefix
+        if (p_url.startsWith(HTTP_PREFIX) || p_url.startsWith(HTTPS_PREFIX))
+            url = p_url;
+        else {
+            if (p_url.startsWith("/"))
+                url = getUrlPrefix() + p_url;
+            else
+                url = getUrlPrefix() + "/" + p_url;
+        }
+    
+        try {
+            wr = p_wc.getResponse(url);
+        }
+        catch(java.net.MalformedURLException mue) {
+            throw new AbortTestException("Error getting WebResponse", mue);
+        }
+        catch(java.io.IOException ioe) {
+            throw new AbortTestException("Error getting WebResponse", ioe);
+        }
+        catch(org.xml.sax.SAXException saxe) {
+            throw new AbortTestException("Error getting WebResponse", saxe);
+        }
+
+        if (null != p_link) {
+            clickLink(wr, p_link);
+            assertReport(p_wc.getCurrentPage());
+        }
+        else {
+            assertReport(wr);
+        }
+    }    
+
+    public void assertReport(WebRequest p_wr)
+        throws Exception
+    {
+        assertReport(new WebConversation(), p_wr);
+    }
+
+    public void assertReport(WebConversation wc, WebRequest wr)
+        throws Exception
+    {
+        assertReport(wc.getResponse(wr));
+    }
+
+    public void assertReport(WebResponse p_wr)
+        throws Exception
+    {
+
+        if (null == p_wr)
+            throw new AbortTestException("WebResponse cannot be null");
+
+        if (p_wr.getResponseCode() != 200)
+            throw new AbortTestException("Bad HTTP Response Code: " +
+                                         p_wr.getResponseCode());
+
+        String status = null;
+        String message = null;
+        String exception = null;
+
+        WebTable wt = p_wr.getTableWithID(Report.RESULT_TABLE_ID);
+
+        if (null == wt)
+            throw new AbortTestException("Table not found: \n" + 
+                                         p_wr.getText());
+
+        TableCell statusCell = wt.getTableCellWithID(Report.STATUS_ID);
+        TableCell messageCell = wt.getTableCellWithID(Report.MESSAGE_ID);
+        TableCell exceptionCell = wt.getTableCellWithID(Report.EXCEPTION_ID);
+
+        if (null != statusCell)
+            status = statusCell.asText().trim();
+
+        if (null != messageCell)
+            message = messageCell.asText().trim();
+
+        if (null != exceptionCell)
+            exception = exceptionCell.asText().trim();
+        
+        // Print Messages && Exceptions
+        if (null != message && ! message.equals(""))
+            System.out.println("Message: " + message);
+
+        if (null != exception && ! exception.equals(""))
+            System.out.println("Exception: " + exception);
+
+        // Check the status and report accordingly
+        if (null == status || status.equals(""))
+            throw new AbortTestException("No Status Found!");
+
+        // If it does not PASS, check for other valid statuses or ABORT
+        if (! status.equals(Report.PASS)) {
+
+            if (status.equals(Report.ABORT))
+                throw new AbortTestException("Abort Status Detected: \n" +
+                                             p_wr.getText());
+            else if (status.equals(Report.FAIL))
+                throw new FailTestError("Failure Status Detected: \n" +
+                                        p_wr.getText());
+            else
+                throw new AbortTestException("Invalid Status Was Found: \n" +
+                                             p_wr.getText());
+        }
+    }
+
+    private void clickLink (WebResponse p_wr, String p_link)
+    {
+        WebLink webLink = null;
+
+        try {
+            webLink = p_wr.getLinkWith(p_link);
+            webLink.click();
+        }
+        catch (NullPointerException npe) {
+            throw new AbortTestException("Link '" + p_link + "' not found in " 
+
+                                         p_wr.getURL(), npe);
+        }
+        catch(java.io.IOException ioe) {
+            throw new AbortTestException("Error clicking link: " +
+                                         p_link, ioe);
+        }
+        catch(org.xml.sax.SAXException saxe) {
+            throw new AbortTestException("Error clicking link: " + 
+                                         p_link, saxe);
+        }
+
+    }
+}
+

Modified: 
incubator/beehive/trunk/controls/test/tools/peanut/src/org/apache/beehive/peanut/Debug.java
==============================================================================
--- 
incubator/beehive/trunk/controls/test/tools/peanut/src/org/apache/beehive/peanut/Debug.java
 (original)
+++ 
incubator/beehive/trunk/controls/test/tools/peanut/src/org/apache/beehive/peanut/Debug.java
 Mon Aug 30 15:07:46 2004
@@ -20,4 +20,4 @@
   {
     log(s, MSG_DEBUG);
   }
-}
\ No newline at end of file
+}

Modified: 
incubator/beehive/trunk/controls/test/tools/peanut/src/org/apache/beehive/peanut/TestSuiteCallTask.java
==============================================================================
--- 
incubator/beehive/trunk/controls/test/tools/peanut/src/org/apache/beehive/peanut/TestSuiteCallTask.java
     (original)
+++ 
incubator/beehive/trunk/controls/test/tools/peanut/src/org/apache/beehive/peanut/TestSuiteCallTask.java
     Mon Aug 30 15:07:46 2004
@@ -101,4 +101,4 @@
         return cmdl.createClasspath(getProject()).createPath();
     }
      */
-}
\ No newline at end of file
+}

Modified: 
incubator/beehive/trunk/controls/test/tools/peanut/src/org/apache/beehive/peanut/TestSuiteTask.java
==============================================================================
--- 
incubator/beehive/trunk/controls/test/tools/peanut/src/org/apache/beehive/peanut/TestSuiteTask.java
 (original)
+++ 
incubator/beehive/trunk/controls/test/tools/peanut/src/org/apache/beehive/peanut/TestSuiteTask.java
 Mon Aug 30 15:07:46 2004
@@ -62,4 +62,4 @@
     }
   }
 
-}
\ No newline at end of file
+}

Modified: 
incubator/beehive/trunk/controls/test/tools/peanut/src/org/apache/beehive/peanut/TestTask.java
==============================================================================
--- 
incubator/beehive/trunk/controls/test/tools/peanut/src/org/apache/beehive/peanut/TestTask.java
      (original)
+++ 
incubator/beehive/trunk/controls/test/tools/peanut/src/org/apache/beehive/peanut/TestTask.java
      Mon Aug 30 15:07:46 2004
@@ -106,4 +106,4 @@
     }
     
   }
-}
\ No newline at end of file
+}

Modified: 
incubator/beehive/trunk/controls/test/tools/peanut/src/org/apache/beehive/peanut/junit/JUnitExecTask.java
==============================================================================
--- 
incubator/beehive/trunk/controls/test/tools/peanut/src/org/apache/beehive/peanut/junit/JUnitExecTask.java
   (original)
+++ 
incubator/beehive/trunk/controls/test/tools/peanut/src/org/apache/beehive/peanut/junit/JUnitExecTask.java
   Mon Aug 30 15:07:46 2004
@@ -188,4 +188,4 @@
       e.printStackTrace();
     }
   }
-}
\ No newline at end of file
+}

Modified: 
incubator/beehive/trunk/controls/test/tools/peanut/src/org/apache/beehive/peanut/junit/JUnitRunner.java
==============================================================================
--- 
incubator/beehive/trunk/controls/test/tools/peanut/src/org/apache/beehive/peanut/junit/JUnitRunner.java
     (original)
+++ 
incubator/beehive/trunk/controls/test/tools/peanut/src/org/apache/beehive/peanut/junit/JUnitRunner.java
     Mon Aug 30 15:07:46 2004
@@ -335,4 +335,4 @@
       failedTests = new HashSet();
     return failedTests;
   }
-}
\ No newline at end of file
+}

Modified: 
incubator/beehive/trunk/controls/test/tools/peanut/src/org/apache/beehive/peanut/result/TestResult.java
==============================================================================
--- 
incubator/beehive/trunk/controls/test/tools/peanut/src/org/apache/beehive/peanut/result/TestResult.java
     (original)
+++ 
incubator/beehive/trunk/controls/test/tools/peanut/src/org/apache/beehive/peanut/result/TestResult.java
     Mon Aug 30 15:07:46 2004
@@ -101,4 +101,4 @@
   //public String getFailureReplicationAntFile();
 
  // public int getDebugLevel();
-}
\ No newline at end of file
+}

Modified: 
incubator/beehive/trunk/controls/test/tools/peanut/src/org/apache/beehive/peanut/result/TestResultBean.java
==============================================================================
--- 
incubator/beehive/trunk/controls/test/tools/peanut/src/org/apache/beehive/peanut/result/TestResultBean.java
 (original)
+++ 
incubator/beehive/trunk/controls/test/tools/peanut/src/org/apache/beehive/peanut/result/TestResultBean.java
 Mon Aug 30 15:07:46 2004
@@ -18,4 +18,4 @@
   /** sets the Throwable contained in it */
   public void setThrowable(Throwable thr);
   
-}
\ No newline at end of file
+}

Modified: 
incubator/beehive/trunk/controls/test/tools/peanut/src/org/apache/beehive/peanut/result/logger/Logger.java
==============================================================================
--- 
incubator/beehive/trunk/controls/test/tools/peanut/src/org/apache/beehive/peanut/result/logger/Logger.java
  (original)
+++ 
incubator/beehive/trunk/controls/test/tools/peanut/src/org/apache/beehive/peanut/result/logger/Logger.java
  Mon Aug 30 15:07:46 2004
@@ -85,4 +85,4 @@
     System.out.println("");
     System.out.println("------------------------------------");
   }
-}
\ No newline at end of file
+}

Modified: 
incubator/beehive/trunk/controls/test/tools/peanut/src/org/apache/beehive/peanut/result/logger/ResultLogger.java
==============================================================================
--- 
incubator/beehive/trunk/controls/test/tools/peanut/src/org/apache/beehive/peanut/result/logger/ResultLogger.java
    (original)
+++ 
incubator/beehive/trunk/controls/test/tools/peanut/src/org/apache/beehive/peanut/result/logger/ResultLogger.java
    Mon Aug 30 15:07:46 2004
@@ -170,4 +170,4 @@
     logger.log("#INTERNAL: " + message);
   }
  
-}
\ No newline at end of file
+}

Modified: 
incubator/beehive/trunk/controls/test/tools/peanut/src/org/apache/beehive/peanut/result/logger/SimpleLogger.java
==============================================================================
--- 
incubator/beehive/trunk/controls/test/tools/peanut/src/org/apache/beehive/peanut/result/logger/SimpleLogger.java
    (original)
+++ 
incubator/beehive/trunk/controls/test/tools/peanut/src/org/apache/beehive/peanut/result/logger/SimpleLogger.java
    Mon Aug 30 15:07:46 2004
@@ -3,4 +3,4 @@
 public class SimpleLogger extends Logger
 {
   
-}
\ No newline at end of file
+}

Modified: 
incubator/beehive/trunk/controls/test/tools/peanut/src/org/apache/beehive/peanut/util/PeanutUtils.java
==============================================================================
--- 
incubator/beehive/trunk/controls/test/tools/peanut/src/org/apache/beehive/peanut/util/PeanutUtils.java
      (original)
+++ 
incubator/beehive/trunk/controls/test/tools/peanut/src/org/apache/beehive/peanut/util/PeanutUtils.java
      Mon Aug 30 15:07:46 2004
@@ -117,4 +117,4 @@
   
   
   
-}
\ No newline at end of file
+}

Modified: 
incubator/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/ExtendedAntTask.java
==============================================================================
--- 
incubator/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/ExtendedAntTask.java
        (original)
+++ 
incubator/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/ExtendedAntTask.java
        Mon Aug 30 15:07:46 2004
@@ -17,4 +17,4 @@
   
   // our extensions
   public CallingChain getCallingChain();
-}
\ No newline at end of file
+}

Modified: 
incubator/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/JvmargTask.java
==============================================================================
--- 
incubator/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/JvmargTask.java
     (original)
+++ 
incubator/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/JvmargTask.java
     Mon Aug 30 15:07:46 2004
@@ -56,4 +56,4 @@
     }
   }
 
-}
\ No newline at end of file
+}

Modified: 
incubator/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/TestEntityModifier.java
==============================================================================
--- 
incubator/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/TestEntityModifier.java
     (original)
+++ 
incubator/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/TestEntityModifier.java
     Mon Aug 30 15:07:46 2004
@@ -5,4 +5,4 @@
 public interface TestEntityModifier
 {
   public String getValue();
-}
\ No newline at end of file
+}

Modified: 
incubator/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/TestRunner.java
==============================================================================
--- 
incubator/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/TestRunner.java
     (original)
+++ 
incubator/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/TestRunner.java
     Mon Aug 30 15:07:46 2004
@@ -171,4 +171,4 @@
       System.out.println(name + "\n\n");
     }
   }
-}
\ No newline at end of file
+}

Modified: 
incubator/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/TestSuiteCallTaskProvider.java
==============================================================================
--- 
incubator/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/TestSuiteCallTaskProvider.java
      (original)
+++ 
incubator/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/TestSuiteCallTaskProvider.java
      Mon Aug 30 15:07:46 2004
@@ -24,4 +24,4 @@
       return task.getParentCallIfNoEntryPoint();
     }
   }
-}
\ No newline at end of file
+}

Modified: 
incubator/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/stl/ErrorMessageConstants.java
==============================================================================
--- 
incubator/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/stl/ErrorMessageConstants.java
      (original)
+++ 
incubator/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/stl/ErrorMessageConstants.java
      Mon Aug 30 15:07:46 2004
@@ -31,4 +31,4 @@
   static final int VALIDATION_ERROR = 350;
   static final String FILE = "file", ERROR_MESSAGE = "error-message";
 
-}
\ No newline at end of file
+}

Modified: 
incubator/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/extension/process/listener/RemoteListenerMinimalConfigurationInfo.java
==============================================================================
--- 
incubator/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/extension/process/listener/RemoteListenerMinimalConfigurationInfo.java
   (original)
+++ 
incubator/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/extension/process/listener/RemoteListenerMinimalConfigurationInfo.java
   Mon Aug 30 15:07:46 2004
@@ -227,4 +227,4 @@
   {
     throw new BuildException("cloneWithOverride unsupported in 
RemoteListenerMinimalConfigurationInfo");
   }
-}
\ No newline at end of file
+}

Modified: 
incubator/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/extension/process/listener/RemoteListenerXMLHandler.java
==============================================================================
--- 
incubator/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/extension/process/listener/RemoteListenerXMLHandler.java
 (original)
+++ 
incubator/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/extension/process/listener/RemoteListenerXMLHandler.java
 Mon Aug 30 15:07:46 2004
@@ -87,4 +87,4 @@
       
     return minConfInfo;
   }
-}
\ No newline at end of file
+}

Modified: 
incubator/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/javatest.java
==============================================================================
--- 
incubator/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/javatest.java
    (original)
+++ 
incubator/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/javatest.java
    Mon Aug 30 15:07:46 2004
@@ -13,4 +13,4 @@
     
org.apache.beehive.test.tools.tch.extension.exectask.javatest.Main.main(args);
   }
   
-}
\ No newline at end of file
+}

Modified: 
incubator/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/BlockUntilSocketOpen.java
==============================================================================
--- 
incubator/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/BlockUntilSocketOpen.java
   (original)
+++ 
incubator/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/BlockUntilSocketOpen.java
   Mon Aug 30 15:07:46 2004
@@ -72,4 +72,4 @@
       return false;
     }
   }
-}
\ No newline at end of file
+}

Modified: 
incubator/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/xml/XMLWriter.java
==============================================================================
--- 
incubator/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/xml/XMLWriter.java
  (original)
+++ 
incubator/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/xml/XMLWriter.java
  Mon Aug 30 15:07:46 2004
@@ -86,4 +86,4 @@
    * Closes all XML elements that have been added, and not yet closed.
    */
   public abstract void closeAll();
-}
\ No newline at end of file
+}

Modified: 
incubator/beehive/trunk/controls/test/webapps/controlsWeb/controls/org/apache/beehive/controls/test/controls/context/ServiceGetter.java
==============================================================================
--- 
incubator/beehive/trunk/controls/test/webapps/controlsWeb/controls/org/apache/beehive/controls/test/controls/context/ServiceGetter.java
     (original)
+++ 
incubator/beehive/trunk/controls/test/webapps/controlsWeb/controls/org/apache/beehive/controls/test/controls/context/ServiceGetter.java
     Mon Aug 30 15:07:46 2004
@@ -10,4 +10,4 @@
 public interface ServiceGetter
 {
        public String getService(Class theService, Object selector);
-}
\ No newline at end of file
+}

Modified: 
incubator/beehive/trunk/controls/test/webapps/controlsWeb/controls/org/apache/beehive/controls/test/controls/event/Event2Listener.java
==============================================================================
--- 
incubator/beehive/trunk/controls/test/webapps/controlsWeb/controls/org/apache/beehive/controls/test/controls/event/Event2Listener.java
      (original)
+++ 
incubator/beehive/trunk/controls/test/webapps/controlsWeb/controls/org/apache/beehive/controls/test/controls/event/Event2Listener.java
      Mon Aug 30 15:07:46 2004
@@ -41,4 +41,4 @@
 
                return 
method1Result+method2Result+overloadMethod1+overloadMethod2;
        }
-}
\ No newline at end of file
+}

Modified: 
incubator/beehive/trunk/controls/test/webapps/controlsWeb/controls/org/apache/beehive/controls/test/controls/property/SingleProperty.java
==============================================================================
--- 
incubator/beehive/trunk/controls/test/webapps/controlsWeb/controls/org/apache/beehive/controls/test/controls/property/SingleProperty.java
   (original)
+++ 
incubator/beehive/trunk/controls/test/webapps/controlsWeb/controls/org/apache/beehive/controls/test/controls/property/SingleProperty.java
   Mon Aug 30 15:07:46 2004
@@ -21,4 +21,4 @@
     }
 
        public String sayHello();
-}
\ No newline at end of file
+}

Modified: 
incubator/beehive/trunk/controls/test/webapps/controlsWeb/controls/org/apache/beehive/controls/test/controls/property/SingleProperty2.java
==============================================================================
--- 
incubator/beehive/trunk/controls/test/webapps/controlsWeb/controls/org/apache/beehive/controls/test/controls/property/SingleProperty2.java
  (original)
+++ 
incubator/beehive/trunk/controls/test/webapps/controlsWeb/controls/org/apache/beehive/controls/test/controls/property/SingleProperty2.java
  Mon Aug 30 15:07:46 2004
@@ -21,4 +21,4 @@
     }
 
        public String sayHello();
-}
\ No newline at end of file
+}

Modified: 
incubator/beehive/trunk/netui/src/bootstrap/org/apache/beehive/netui/tools/NetUITldTagsHandler.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/bootstrap/org/apache/beehive/netui/tools/NetUITldTagsHandler.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/bootstrap/org/apache/beehive/netui/tools/NetUITldTagsHandler.java
 Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/bootstrap/org/apache/beehive/netui/tools/ant/BuildModules.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/bootstrap/org/apache/beehive/netui/tools/ant/BuildModules.java
    (original)
+++ 
incubator/beehive/trunk/netui/src/bootstrap/org/apache/beehive/netui/tools/ant/BuildModules.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/bootstrap/org/apache/beehive/netui/tools/tld/JspTaglibSubTask.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/bootstrap/org/apache/beehive/netui/tools/tld/JspTaglibSubTask.java
        (original)
+++ 
incubator/beehive/trunk/netui/src/bootstrap/org/apache/beehive/netui/tools/tld/JspTaglibSubTask.java
        Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/bootstrap/org/apache/beehive/netui/tools/tldx/TldxConfigTagsHandler.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/bootstrap/org/apache/beehive/netui/tools/tldx/TldxConfigTagsHandler.java
  (original)
+++ 
incubator/beehive/trunk/netui/src/bootstrap/org/apache/beehive/netui/tools/tldx/TldxConfigTagsHandler.java
  Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/bootstrap/org/apache/beehive/netui/tools/tldx/TldxSubTask.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/bootstrap/org/apache/beehive/netui/tools/tldx/TldxSubTask.java
    (original)
+++ 
incubator/beehive/trunk/netui/src/bootstrap/org/apache/beehive/netui/tools/tldx/TldxSubTask.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/AnnotationGrammar.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/AnnotationGrammar.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/AnnotationGrammar.java
 Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/AnnotationMemberType.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/AnnotationMemberType.java
      (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/AnnotationMemberType.java
      Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/BaseChecker.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/BaseChecker.java
       (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/BaseChecker.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/BaseGenerator.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/BaseGenerator.java
     (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/BaseGenerator.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/CompilerUtils.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/CompilerUtils.java
     (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/CompilerUtils.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/Diagnostics.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/Diagnostics.java
       (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/Diagnostics.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/FacesBackingChecker.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/FacesBackingChecker.java
       (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/FacesBackingChecker.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
-* B E A   S Y S T E M S
-* Copyright 2002-2004  BEA Systems, Inc.
+* Copyright 2004 The Apache Software Foundation.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/FlowControllerChecker.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/FlowControllerChecker.java
     (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/FlowControllerChecker.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/FlowControllerGenerator.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/FlowControllerGenerator.java
   (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/FlowControllerGenerator.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/FlowControllerInfo.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/FlowControllerInfo.java
        (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/FlowControllerInfo.java
        Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/FormBeanChecker.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/FormBeanChecker.java
   (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/FormBeanChecker.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/JpfLanguageConstants.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/JpfLanguageConstants.java
      (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/JpfLanguageConstants.java
      Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/PageFlowChecker.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/PageFlowChecker.java
   (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/PageFlowChecker.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/PageFlowGenerator.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/PageFlowGenerator.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/PageFlowGenerator.java
 Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/RuntimeVersionChecker.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/RuntimeVersionChecker.java
     (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/RuntimeVersionChecker.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/SharedFlowChecker.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/SharedFlowChecker.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/SharedFlowChecker.java
 Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/SharedFlowGenerator.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/SharedFlowGenerator.java
       (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/SharedFlowGenerator.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/apt/BaseAnnotationProcessor.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/apt/BaseAnnotationProcessor.java
       (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/apt/BaseAnnotationProcessor.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/apt/FormBeanAnnotationProcessor.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/apt/FormBeanAnnotationProcessor.java
   (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/apt/FormBeanAnnotationProcessor.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/apt/FormBeanAnnotationProcessorFactory.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/apt/FormBeanAnnotationProcessorFactory.java
    (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/apt/FormBeanAnnotationProcessorFactory.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/apt/PageFlowAnnotationProcessor.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/apt/PageFlowAnnotationProcessor.java
   (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/apt/PageFlowAnnotationProcessor.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/apt/PageFlowAnnotationProcessorFactory.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/apt/PageFlowAnnotationProcessorFactory.java
    (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/apt/PageFlowAnnotationProcessorFactory.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/genmodel/DefaultValidatorRuleFactory.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/genmodel/DefaultValidatorRuleFactory.java
      (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/genmodel/DefaultValidatorRuleFactory.java
      Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/genmodel/GenActionModel.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/genmodel/GenActionModel.java
   (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/genmodel/GenActionModel.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/genmodel/GenActionOutputModel.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/genmodel/GenActionOutputModel.java
     (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/genmodel/GenActionOutputModel.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/genmodel/GenExceptionModel.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/genmodel/GenExceptionModel.java
        (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/genmodel/GenExceptionModel.java
        Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/genmodel/GenForwardModel.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/genmodel/GenForwardModel.java
  (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/genmodel/GenForwardModel.java
  Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/genmodel/GenMessageResourcesModel.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/genmodel/GenMessageResourcesModel.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/genmodel/GenMessageResourcesModel.java
 Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/genmodel/GenSharedFlowStrutsApp.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/genmodel/GenSharedFlowStrutsApp.java
   (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/genmodel/GenSharedFlowStrutsApp.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/genmodel/GenSimpleActionModel.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/genmodel/GenSimpleActionModel.java
     (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/genmodel/GenSimpleActionModel.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/genmodel/GenStrutsApp.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/genmodel/GenStrutsApp.java
     (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/genmodel/GenStrutsApp.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/genmodel/GenValidationModel.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/genmodel/GenValidationModel.java
       (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/genmodel/GenValidationModel.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/genmodel/ValidatorRuleFactory.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/genmodel/ValidatorRuleFactory.java
     (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/genmodel/ValidatorRuleFactory.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/AbsolutePathType.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/AbsolutePathType.java
  (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/AbsolutePathType.java
  Mon Aug 30 15:07:46 2004
@@ -1,46 +1,45 @@
-/**
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
- *
- * 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.
- *
- * $Header:$
- */
-package org.apache.beehive.netui.compiler.grammar;
-
-import org.apache.beehive.netui.compiler.AnnotationMemberType;
-import org.apache.beehive.netui.compiler.AnnotationGrammar;
-import org.apache.beehive.netui.compiler.CompilerUtils;
-import com.sun.mirror.declaration.AnnotationTypeElementDeclaration;
-import com.sun.mirror.declaration.AnnotationValue;
-import com.sun.mirror.declaration.AnnotationMirror;
-import com.sun.mirror.declaration.MemberDeclaration;
-
-public class AbsolutePathType extends AnnotationMemberType {
-
-    public AbsolutePathType( String requiredRuntimeVersion, AnnotationGrammar 
parentGrammar )
-    {
-        super( requiredRuntimeVersion, parentGrammar);
-    }
-
-    protected Object onCheck(AnnotationTypeElementDeclaration valueDecl, 
AnnotationValue member, AnnotationMirror parentAnnotation, MemberDeclaration 
classMember)
-    {
-        String path = CompilerUtils.getString(parentAnnotation, PATH_ATTR, 
false);
-        if ( ! path.startsWith("/") )
-        {
-            addError(member, 
"error.absolute-path-required-for-external-redirect");
-        }
-
-        return null;
-    }
-}
+/**
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * 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.
+ *
+ * $Header:$
+ */
+package org.apache.beehive.netui.compiler.grammar;
+
+import org.apache.beehive.netui.compiler.AnnotationMemberType;
+import org.apache.beehive.netui.compiler.AnnotationGrammar;
+import org.apache.beehive.netui.compiler.CompilerUtils;
+import com.sun.mirror.declaration.AnnotationTypeElementDeclaration;
+import com.sun.mirror.declaration.AnnotationValue;
+import com.sun.mirror.declaration.AnnotationMirror;
+import com.sun.mirror.declaration.MemberDeclaration;
+
+public class AbsolutePathType extends AnnotationMemberType {
+
+    public AbsolutePathType( String requiredRuntimeVersion, AnnotationGrammar 
parentGrammar )
+    {
+        super( requiredRuntimeVersion, parentGrammar);
+    }
+
+    protected Object onCheck(AnnotationTypeElementDeclaration valueDecl, 
AnnotationValue member, AnnotationMirror parentAnnotation, MemberDeclaration 
classMember)
+    {
+        String path = CompilerUtils.getString(parentAnnotation, PATH_ATTR, 
false);
+        if ( ! path.startsWith("/") )
+        {
+            addError(member, 
"error.absolute-path-required-for-external-redirect");
+        }
+
+        return null;
+    }
+}

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ActionGrammar.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ActionGrammar.java
     (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ActionGrammar.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/BaseFlowControllerGrammar.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/BaseFlowControllerGrammar.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/BaseFlowControllerGrammar.java
 Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/BaseValidationRuleGrammar.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/BaseValidationRuleGrammar.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/BaseValidationRuleGrammar.java
 Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
-* B E A   S Y S T E M S
-* Copyright 2002-2004  BEA Systems, Inc.
+* Copyright 2004 The Apache Software Foundation.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/CatchGrammar.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/CatchGrammar.java
      (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/CatchGrammar.java
      Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/CommandHandlerGrammar.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/CommandHandlerGrammar.java
     (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/CommandHandlerGrammar.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ControllerGrammar.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ControllerGrammar.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ControllerGrammar.java
 Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/EnumType.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/EnumType.java
  (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/EnumType.java
  Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ExceptionHandlerGrammar.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ExceptionHandlerGrammar.java
   (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ExceptionHandlerGrammar.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ExternalPathOrActionType.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ExternalPathOrActionType.java
  (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ExternalPathOrActionType.java
  Mon Aug 30 15:07:46 2004
@@ -1,47 +1,46 @@
-/*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
- *
- * 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.
- *
- * $Header:$
- */
-package org.apache.beehive.netui.compiler.grammar;
-
-import org.apache.beehive.netui.compiler.AnnotationGrammar;
-import org.apache.beehive.netui.compiler.FlowControllerInfo;
-import org.apache.beehive.netui.compiler.CompilerUtils;
-import com.sun.mirror.declaration.AnnotationTypeElementDeclaration;
-import com.sun.mirror.declaration.AnnotationValue;
-import com.sun.mirror.declaration.AnnotationMirror;
-import com.sun.mirror.declaration.MemberDeclaration;
-
-public class ExternalPathOrActionType extends WebappPathOrActionType
-{
-    public ExternalPathOrActionType( boolean pathMustBeRelative, String 
requiredRuntimeVersion,
-                                   AnnotationGrammar parentGrammar, 
FlowControllerInfo fcInfo )
-    {
-        super( pathMustBeRelative, requiredRuntimeVersion, parentGrammar, 
fcInfo );
-    }
-
-    protected Object onCheck( AnnotationTypeElementDeclaration valueDecl, 
AnnotationValue value,
-                              AnnotationMirror parentAnnotation, 
MemberDeclaration classMember )
-    {
-        // if we have an external redirect just bail
-        if (CompilerUtils.getBoolean(parentAnnotation, EXTERNAL_REDIRECT_ATTR, 
false))
-        {
-            return null;
-        }
-        return super.onCheck( valueDecl, value, parentAnnotation, classMember 
);
-    }
-}
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * 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.
+ *
+ * $Header:$
+ */
+package org.apache.beehive.netui.compiler.grammar;
+
+import org.apache.beehive.netui.compiler.AnnotationGrammar;
+import org.apache.beehive.netui.compiler.FlowControllerInfo;
+import org.apache.beehive.netui.compiler.CompilerUtils;
+import com.sun.mirror.declaration.AnnotationTypeElementDeclaration;
+import com.sun.mirror.declaration.AnnotationValue;
+import com.sun.mirror.declaration.AnnotationMirror;
+import com.sun.mirror.declaration.MemberDeclaration;
+
+public class ExternalPathOrActionType extends WebappPathOrActionType
+{
+    public ExternalPathOrActionType( boolean pathMustBeRelative, String 
requiredRuntimeVersion,
+                                   AnnotationGrammar parentGrammar, 
FlowControllerInfo fcInfo )
+    {
+        super( pathMustBeRelative, requiredRuntimeVersion, parentGrammar, 
fcInfo );
+    }
+
+    protected Object onCheck( AnnotationTypeElementDeclaration valueDecl, 
AnnotationValue value,
+                              AnnotationMirror parentAnnotation, 
MemberDeclaration classMember )
+    {
+        // if we have an external redirect just bail
+        if (CompilerUtils.getBoolean(parentAnnotation, EXTERNAL_REDIRECT_ATTR, 
false))
+        {
+            return null;
+        }
+        return super.onCheck( valueDecl, value, parentAnnotation, classMember 
);
+    }
+}

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ForwardGrammar.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ForwardGrammar.java
    (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ForwardGrammar.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/JavaIdentifierType.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/JavaIdentifierType.java
        (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/JavaIdentifierType.java
        Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/MemberFieldType.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/MemberFieldType.java
   (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/MemberFieldType.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/MemberMethodType.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/MemberMethodType.java
  (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/MemberMethodType.java
  Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/MessageKeyType.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/MessageKeyType.java
    (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/MessageKeyType.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
-* B E A   S Y S T E M S
-* Copyright 2002-2004  BEA Systems, Inc.
+* Copyright 2004 The Apache Software Foundation.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -65,4 +64,4 @@
         
         return null;
     }
-}
\ No newline at end of file
+}

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/MessageResourcesGrammar.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/MessageResourcesGrammar.java
   (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/MessageResourcesGrammar.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/RaiseActionGrammar.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/RaiseActionGrammar.java
        (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/RaiseActionGrammar.java
        Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/SimpleActionGrammar.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/SimpleActionGrammar.java
       (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/SimpleActionGrammar.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
-* B E A   S Y S T E M S
-* Copyright 2002-2004  BEA Systems, Inc.
+* Copyright 2004 The Apache Software Foundation.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/TypeNameType.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/TypeNameType.java
      (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/TypeNameType.java
      Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/UniqueValueType.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/UniqueValueType.java
   (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/UniqueValueType.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ValidXmlFileType.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ValidXmlFileType.java
  (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ValidXmlFileType.java
  Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ValidateCustomGrammar.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ValidateCustomGrammar.java
     (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ValidateCustomGrammar.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ValidateRangeGrammar.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ValidateRangeGrammar.java
      (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ValidateRangeGrammar.java
      Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ValidateTypeGrammar.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ValidateTypeGrammar.java
       (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ValidateTypeGrammar.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
-* B E A   S Y S T E M S
-* Copyright 2002-2004  BEA Systems, Inc.
+* Copyright 2004 The Apache Software Foundation.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ValidateValidWhenGrammar.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ValidateValidWhenGrammar.java
  (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ValidateValidWhenGrammar.java
  Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ValidationBeanGrammar.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ValidationBeanGrammar.java
     (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ValidationBeanGrammar.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ValidationFieldGrammar.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ValidationFieldGrammar.java
    (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ValidationFieldGrammar.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ValidationLocaleRulesGrammar.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ValidationLocaleRulesGrammar.java
      (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ValidationLocaleRulesGrammar.java
      Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/WebappPathOrActionType.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/WebappPathOrActionType.java
    (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/WebappPathOrActionType.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/WebappPathType.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/WebappPathType.java
    (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/WebappPathType.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/WritableFieldType.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/WritableFieldType.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/WritableFieldType.java
 Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/AbstractForwardContainer.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/AbstractForwardContainer.java
    (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/AbstractForwardContainer.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/ActionModel.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/ActionModel.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/ActionModel.java
 Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/ActionOutputModel.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/ActionOutputModel.java
   (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/ActionOutputModel.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/ExceptionContainer.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/ExceptionContainer.java
  (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/ExceptionContainer.java
  Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/ExceptionModel.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/ExceptionModel.java
      (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/ExceptionModel.java
      Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/FormBeanModel.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/FormBeanModel.java
       (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/FormBeanModel.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/ForwardContainer.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/ForwardContainer.java
    (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/ForwardContainer.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/ForwardModel.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/ForwardModel.java
        (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/ForwardModel.java
        Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/MessageResourcesModel.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/MessageResourcesModel.java
       (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/MessageResourcesModel.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/NoWebInfDirectoryException.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/NoWebInfDirectoryException.java
  (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/NoWebInfDirectoryException.java
  Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/StrutsApp.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/StrutsApp.java
   (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/StrutsApp.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/StrutsElementSupport.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/StrutsElementSupport.java
        (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/StrutsElementSupport.java
        Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/validation/LocaleSet.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/validation/LocaleSet.java
        (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/validation/LocaleSet.java
        Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/validation/ValidatableEntity.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/validation/ValidatableEntity.java
        (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/validation/ValidatableEntity.java
        Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/validation/ValidatableField.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/validation/ValidatableField.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/validation/ValidatableField.java
 Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/validation/ValidationModel.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/validation/ValidationModel.java
  (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/validation/ValidationModel.java
  Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/validation/ValidatorConstants.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/validation/ValidatorConstants.java
       (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/validation/ValidatorConstants.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/validation/ValidatorRule.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/validation/ValidatorRule.java
    (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/validation/ValidatorRule.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/validation/ValidatorRuleRange.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/validation/ValidatorRuleRange.java
       (original)
+++ 
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/model/validation/ValidatorRuleRange.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ActionNotFoundException.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ActionNotFoundException.java
   (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ActionNotFoundException.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ActionResolver.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ActionResolver.java
    (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ActionResolver.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ActionResult.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ActionResult.java
      (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ActionResult.java
      Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/AutoRegisterActionServlet.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/AutoRegisterActionServlet.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/AutoRegisterActionServlet.java
 Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ControlFieldInitializationException.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ControlFieldInitializationException.java
       (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ControlFieldInitializationException.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/DynaFormData.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/DynaFormData.java
      (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/DynaFormData.java
      Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/DynamicSubappActionServlet.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/DynamicSubappActionServlet.java
        (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/DynamicSubappActionServlet.java
        Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/EmptyNestingStackException.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/EmptyNestingStackException.java
        (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/EmptyNestingStackException.java
        Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FacesBackingBean.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FacesBackingBean.java
  (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FacesBackingBean.java
  Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FacesBackingBeanFactory.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FacesBackingBeanFactory.java
   (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FacesBackingBeanFactory.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FlowController.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FlowController.java
    (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FlowController.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FlowControllerFactory.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FlowControllerFactory.java
     (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FlowControllerFactory.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FormData.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FormData.java
  (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FormData.java
  Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/Forward.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/Forward.java
   (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/Forward.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ForwardHandler.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ForwardHandler.java
    (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ForwardHandler.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/GlobalApp.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/GlobalApp.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/GlobalApp.java
 Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/IllegalActionOutputException.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/IllegalActionOutputException.java
      (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/IllegalActionOutputException.java
      Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/IllegalOutputFormException.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/IllegalOutputFormException.java
        (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/IllegalOutputFormException.java
        Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/IllegalOutputFormTypeException.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/IllegalOutputFormTypeException.java
    (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/IllegalOutputFormTypeException.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/IllegalPageInputException.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/IllegalPageInputException.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/IllegalPageInputException.java
 Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/IllegalRedirectOutputFormException.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/IllegalRedirectOutputFormException.java
        (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/IllegalRedirectOutputFormException.java
        Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/InfiniteReturnToActionException.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/InfiniteReturnToActionException.java
   (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/InfiniteReturnToActionException.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/LoginExpiredException.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/LoginExpiredException.java
     (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/LoginExpiredException.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/MismatchedActionOutputException.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/MismatchedActionOutputException.java
   (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/MismatchedActionOutputException.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/MismatchedPageInputException.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/MismatchedPageInputException.java
      (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/MismatchedPageInputException.java
      Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/MissingActionOutputException.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/MissingActionOutputException.java
      (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/MissingActionOutputException.java
      Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/MissingPageInputException.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/MissingPageInputException.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/MissingPageInputException.java
 Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/MultipartRequestUtils.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/MultipartRequestUtils.java
     (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/MultipartRequestUtils.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/NoCurrentPageFlowException.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/NoCurrentPageFlowException.java
        (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/NoCurrentPageFlowException.java
        Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/NoMatchingActionMethodException.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/NoMatchingActionMethodException.java
   (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/NoMatchingActionMethodException.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/NoPreviousActionException.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/NoPreviousActionException.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/NoPreviousActionException.java
 Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/NoPreviousPageException.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/NoPreviousPageException.java
   (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/NoPreviousPageException.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/NotLoggedInException.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/NotLoggedInException.java
      (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/NotLoggedInException.java
      Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowActionServlet.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowActionServlet.java
     (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowActionServlet.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowConstants.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowConstants.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowConstants.java
 Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowContextListener.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowContextListener.java
   (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowContextListener.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowController.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowController.java
        (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowController.java
        Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowException.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowException.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowException.java
 Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowFileFilter.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowFileFilter.java
        (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowFileFilter.java
        Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowJspFilter.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowJspFilter.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowJspFilter.java
 Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowManagedObject.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowManagedObject.java
     (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowManagedObject.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowManagedObjectException.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowManagedObjectException.java
    (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowManagedObjectException.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowRequestProcessor.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowRequestProcessor.java
  (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowRequestProcessor.java
  Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowStack.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowStack.java
     (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowStack.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowUtils.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowUtils.java
     (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowUtils.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PreviousActionInfo.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PreviousActionInfo.java
        (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PreviousActionInfo.java
        Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PreviousPageInfo.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PreviousPageInfo.java
  (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PreviousPageInfo.java
  Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ProcessPopulate.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ProcessPopulate.java
   (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ProcessPopulate.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/RequestParameterHandler.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/RequestParameterHandler.java
   (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/RequestParameterHandler.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/RequestVariables.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/RequestVariables.java
  (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/RequestVariables.java
  Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ServerAdapter.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ServerAdapter.java
     (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ServerAdapter.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/SharedFlowController.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/SharedFlowController.java
      (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/SharedFlowController.java
      Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
-* B E A   S Y S T E M S
-* Copyright 2002-2004  BEA Systems, Inc.
+* Copyright 2004 The Apache Software Foundation.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/StrutsModule.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/StrutsModule.java
      (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/StrutsModule.java
      Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/StrutsModuleFactory.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/StrutsModuleFactory.java
       (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/StrutsModuleFactory.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/UnfulfilledRolesException.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/UnfulfilledRolesException.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/UnfulfilledRolesException.java
 Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/UnresolvableForwardException.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/UnresolvableForwardException.java
      (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/UnresolvableForwardException.java
      Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/Validatable.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/Validatable.java
       (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/Validatable.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/annotations/Jpf.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/annotations/Jpf.java
   (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/annotations/Jpf.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/config/PageFlowActionForward.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/config/PageFlowActionForward.java
      (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/config/PageFlowActionForward.java
      Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/config/PageFlowActionMapping.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/config/PageFlowActionMapping.java
      (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/config/PageFlowActionMapping.java
      Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/config/PageFlowControllerConfig.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/config/PageFlowControllerConfig.java
   (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/config/PageFlowControllerConfig.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/config/PageFlowExceptionConfig.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/config/PageFlowExceptionConfig.java
    (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/config/PageFlowExceptionConfig.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/faces/BackingClassMethodBinding.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/faces/BackingClassMethodBinding.java
   (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/faces/BackingClassMethodBinding.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/faces/BackingClassVariableResolver.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/faces/BackingClassVariableResolver.java
        (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/faces/BackingClassVariableResolver.java
        Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/faces/PageFlowApplication.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/faces/PageFlowApplication.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/faces/PageFlowApplication.java
 Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/faces/PageFlowApplicationFactory.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/faces/PageFlowApplicationFactory.java
  (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/faces/PageFlowApplicationFactory.java
  Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/faces/PageFlowViewHandler.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/faces/PageFlowViewHandler.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/faces/PageFlowViewHandler.java
 Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/handler/ExceptionsHandler.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/handler/ExceptionsHandler.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/handler/ExceptionsHandler.java
 Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/handler/ForwardRedirectHandler.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/handler/ForwardRedirectHandler.java
    (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/handler/ForwardRedirectHandler.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/handler/Handler.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/handler/Handler.java
   (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/handler/Handler.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/handler/LoginHandler.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/handler/LoginHandler.java
      (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/handler/LoginHandler.java
      Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/handler/ReloadableClassHandler.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/handler/ReloadableClassHandler.java
    (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/handler/ReloadableClassHandler.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/ActionInterceptor.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/ActionInterceptor.java
     (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/ActionInterceptor.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/ActionInterceptorChain.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/ActionInterceptorChain.java
        (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/ActionInterceptorChain.java
        Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/ActionInterceptorChainConfig.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/ActionInterceptorChainConfig.java
  (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/ActionInterceptorChainConfig.java
  Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/ActionInterceptorConfig.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/ActionInterceptorConfig.java
       (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/ActionInterceptorConfig.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/ActionInterceptorsConfig.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/ActionInterceptorsConfig.java
      (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/ActionInterceptorsConfig.java
      Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/InterceptorForward.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/InterceptorForward.java
    (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/InterceptorForward.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/OriginalForward.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/OriginalForward.java
       (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/OriginalForward.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/ActionResultImpl.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/ActionResultImpl.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/ActionResultImpl.java
 Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/AnyBeanActionForm.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/AnyBeanActionForm.java
        (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/AnyBeanActionForm.java
        Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/BindingUpdateError.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/BindingUpdateError.java
       (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/BindingUpdateError.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/CachedPageFlowInfo.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/CachedPageFlowInfo.java
       (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/CachedPageFlowInfo.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/ContextCache.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/ContextCache.java
     (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/ContextCache.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultExceptionsHandler.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultExceptionsHandler.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultExceptionsHandler.java
 Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultForwardRedirectHandler.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultForwardRedirectHandler.java
    (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultForwardRedirectHandler.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultHandler.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultHandler.java
   (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultHandler.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultLoginHandler.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultLoginHandler.java
      (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultLoginHandler.java
      Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultReloadableClassHandler.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultReloadableClassHandler.java
    (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultReloadableClassHandler.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultServerAdapter.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultServerAdapter.java
     (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultServerAdapter.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/FlowControllerAction.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/FlowControllerAction.java
     (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/FlowControllerAction.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/InternalConstants.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/InternalConstants.java
        (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/InternalConstants.java
        Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/InternalExpressionUtils.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/InternalExpressionUtils.java
  (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/InternalExpressionUtils.java
  Mon Aug 30 15:07:46 2004
@@ -1,301 +1,300 @@
-/*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
- *
- * 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.
- *
- * $Header:$
- */
-package org.apache.beehive.netui.pageflow.internal;
-
-import java.util.Map;
-import java.util.Enumeration;
-import java.util.HashMap;
-
-import javax.servlet.ServletContext;
-import javax.servlet.jsp.el.ExpressionEvaluator;
-import javax.servlet.jsp.el.VariableResolver;
-import javax.servlet.jsp.el.ELException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.Cookie;
-
-import org.apache.beehive.netui.util.logging.Logger;
-import org.apache.commons.el.ExpressionEvaluatorImpl;
-import org.apache.commons.el.EnumeratedMap;
-
-/**
- * Internal class used to evaluate simple action expressions.
- * 
- * todo: need to merge this down into the expression language registration 
infrastructure
- * todo: need to provdie an ImplicitObjectFactory that will create Maps for 
requestScope, sessionScope, etc.
- */
-public class InternalExpressionUtils
-{
-    private static final Logger _logger = 
Logger.getInstance(InternalExpressionUtils.class);
-
-    public static final boolean evaluateCondition(String expression,
-                                                  Object actionForm,
-                                                  HttpServletRequest request, 
-                                                  ServletContext 
servletContext)
-        throws ELException
-    {
-        return ((Boolean)evaluate(expression, Boolean.class, actionForm, 
request, servletContext)).booleanValue();
-    }
-
-    public static final String evaluateMessage(String expression, 
-                                                Object actionForm,
-                                                HttpServletRequest request, 
-                                                ServletContext servletContext)
-        throws ELException
-    {
-        return (String)evaluate(expression, String.class, actionForm, request, 
servletContext);
-    }
-
-    /* do not construct */
-    private InternalExpressionUtils() {}
-
-    private static final Object evaluate(String expression, Class 
expectedType, Object actionForm, HttpServletRequest request, ServletContext 
servletContext)
-        throws ELException
-    {
-        // todo: can this be static / final?
-        ExpressionEvaluator ee = getExpressionEvaluator();
-        return ee.evaluate(expression, expectedType, 
getVariableResolver(actionForm, request, servletContext), null);
-    }
-
-    private static final ExpressionEvaluator getExpressionEvaluator()
-    {
-        return new ExpressionEvaluatorImpl();
-    }
-
-    private static final VariableResolver getVariableResolver(Object 
actionForm, HttpServletRequest request, ServletContext servletContext)
-    {
-        return new SimpleActionVariableResolver(actionForm, request, 
servletContext);
-    }
-
-    private static class SimpleActionVariableResolver
-        implements VariableResolver
-    {
-        private Object _actionForm = null;
-        private HttpServletRequest _request = null;
-        private ServletContext _servletContext = null;
-
-        private SimpleActionVariableResolver(Object actionForm, 
HttpServletRequest request, ServletContext servletContext)
-        {
-            _actionForm = actionForm;
-            _request = request;
-            _servletContext = servletContext;
-        }
-
-        public Object resolveVariable(String name)
-        {
-            // requestScope, sessionScope, applicationScope, param, 
paramValues, header, headerValues, cookie, initParam, <default>
-            if(name.equals("actionForm"))
-                return _actionForm;
-            else if(name.equals("requestScope"))
-                return buildRequestScopeMap(_request);
-            else if(name.equals("sessionScope"))
-                return buildSessionScopeMap(_request);
-            else if(name.equals("applicationScope"))
-                return buildServletContextMap(_servletContext);
-            else if(name.equals("param"))
-                return buildParamMap(_request);
-            else if(name.equals("paramValues"))
-                return buildParamsMap(_request);
-            else if(name.equals("header"))
-                return buildHeaderMap(_request);
-            else if(name.equals("headerValues"))
-                return buildHeadersMap(_request);
-            else if(name.equals("cookie"))
-                return buildCookieMap(_request);
-            else if(name.equals("initParam"))
-                return buildInitParamMap(_servletContext);
-            // chain up the request > session (if exists) > application
-            // note, this should handle pageFlow, globalApp, sharedFlow, and 
bundle if they're in the request
-            // attribute map already
-            else if(_request.getAttribute(name) != null)
-                return _request.getAttribute(name);
-            else if(_request.getSession(false) != null && 
_request.getSession(false).getAttribute(name) != null)
-                return _request.getSession(false).getAttribute(name);
-            else return _servletContext.getAttribute(name);
-        }
-
-        private static final Map buildCookieMap(HttpServletRequest 
httpServletRequest)
-        {
-            HttpServletRequest servletRequest = httpServletRequest;
-            Map<String, Cookie> cookieMap = new HashMap<String, Cookie>();
-            Cookie[] cookies = servletRequest.getCookies();
-            for(int i = 0; i < cookies.length; i++)
-            {
-                if(!cookieMap.containsKey(cookies[i].getName()))
-                    cookieMap.put(cookies[i].getName(), cookies[i]);
-            }
-            return cookieMap;
-        }
-
-        private static final Map buildHeadersMap(HttpServletRequest 
httpServletRequest)
-        {
-            final HttpServletRequest _servletRequest = httpServletRequest;
-            return new EnumeratedMap()
-            {
-                public Enumeration enumerateKeys()
-                {
-                    return _servletRequest.getHeaderNames();
-                }
-
-                public Object getValue(Object key)
-                {
-                    return (key instanceof String ? 
_servletRequest.getHeaders((String)key) : null);
-                }
-
-                public boolean isMutable() {return false;}
-            };
-        }
-
-        private static final Map buildHeaderMap(HttpServletRequest 
httpServletRequest)
-        {
-            final HttpServletRequest _servletRequest = httpServletRequest;
-            return new EnumeratedMap()
-            {
-                public Enumeration enumerateKeys()
-                {
-                    return _servletRequest.getHeaderNames();
-                }
-
-                public Object getValue(Object key)
-                {
-                    return (key instanceof String ? 
_servletRequest.getHeader((String)key) : null);
-                }
-
-                public boolean isMutable() {return false;}
-            };
-        }
-
-        private static final Map buildInitParamMap(ServletContext 
servletContext)
-        {
-            final ServletContext _servletContext = servletContext;
-            return new EnumeratedMap()
-            {
-                public Enumeration enumerateKeys()
-                {
-                    return _servletContext.getInitParameterNames();
-                }
-
-                public Object getValue(Object key)
-                {
-                    return (key instanceof String ? 
_servletContext.getInitParameter((String)key) : null);
-                }
-
-                public boolean isMutable() {return false;}
-            };
-        }
-
-        private static final Map buildParamsMap(HttpServletRequest 
servletRequest)
-        {
-            final HttpServletRequest _servletRequest = servletRequest;
-            return new EnumeratedMap()
-            {
-                public Enumeration enumerateKeys()
-                {
-                    return _servletRequest.getParameterNames();
-                }
-
-                public Object getValue(Object key)
-                {
-                    return (key instanceof String ? 
_servletRequest.getParameterValues((String)key) : null);
-                }
-
-                public boolean isMutable() {return false;}
-            };
-        }
-
-        private static final Map buildParamMap(HttpServletRequest 
servletRequest)
-        {
-            final HttpServletRequest _servletRequest = servletRequest;
-            return new EnumeratedMap()
-            {
-                public Enumeration enumerateKeys()
-                {
-                    return _servletRequest.getParameterNames();
-                }
-
-                public Object getValue(Object key)
-                {
-                    return (key instanceof String ? 
_servletRequest.getParameter((String)key) : null);
-                }
-
-                public boolean isMutable() {return false;}
-            };
-        }
-
-        private static final Map buildRequestScopeMap(HttpServletRequest 
servletRequest)
-        {
-            final HttpServletRequest _servletRequest = servletRequest;
-            return new EnumeratedMap()
-            {
-                public Enumeration enumerateKeys()
-                {
-                    return _servletRequest.getAttributeNames();
-                }
-
-                public Object getValue(Object key)
-                {
-                    return (key instanceof String ? 
_servletRequest.getAttribute((String)key) : null);
-                }
-
-                public boolean isMutable() {return false;}
-            };
-        }
-
-        private static final Map buildSessionScopeMap(HttpServletRequest 
servletRequest)
-        {
-            if(servletRequest.getSession(false) == null)
-                return null;
-
-            final HttpSession _session = servletRequest.getSession(false);
-            return new EnumeratedMap()
-            {
-                public Enumeration enumerateKeys()
-                {
-                    return _session.getAttributeNames();
-                }
-
-                public Object getValue(Object key)
-                {
-                    return (key instanceof String ? 
_session.getAttribute((String)key) : null);
-                }
-
-                public boolean isMutable() {return false;}
-            };
-        }
-
-        private static final Map buildServletContextMap(ServletContext 
servletContext)
-        {
-            final ServletContext _servletContext = servletContext;
-            return new EnumeratedMap()
-            {
-                public Enumeration enumerateKeys()
-                {
-                    return _servletContext.getAttributeNames();
-                }
-
-                public Object getValue(Object key)
-                {
-                    return (key instanceof String ? 
_servletContext.getAttribute((String)key) : null);
-                }
-
-                public boolean isMutable() {return false;}
-            };
-        }
-    }
-}
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * 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.
+ *
+ * $Header:$
+ */
+package org.apache.beehive.netui.pageflow.internal;
+
+import java.util.Map;
+import java.util.Enumeration;
+import java.util.HashMap;
+
+import javax.servlet.ServletContext;
+import javax.servlet.jsp.el.ExpressionEvaluator;
+import javax.servlet.jsp.el.VariableResolver;
+import javax.servlet.jsp.el.ELException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+import javax.servlet.http.Cookie;
+
+import org.apache.beehive.netui.util.logging.Logger;
+import org.apache.commons.el.ExpressionEvaluatorImpl;
+import org.apache.commons.el.EnumeratedMap;
+
+/**
+ * Internal class used to evaluate simple action expressions.
+ * 
+ * todo: need to merge this down into the expression language registration 
infrastructure
+ * todo: need to provdie an ImplicitObjectFactory that will create Maps for 
requestScope, sessionScope, etc.
+ */
+public class InternalExpressionUtils
+{
+    private static final Logger _logger = 
Logger.getInstance(InternalExpressionUtils.class);
+
+    public static final boolean evaluateCondition(String expression,
+                                                  Object actionForm,
+                                                  HttpServletRequest request, 
+                                                  ServletContext 
servletContext)
+        throws ELException
+    {
+        return ((Boolean)evaluate(expression, Boolean.class, actionForm, 
request, servletContext)).booleanValue();
+    }
+
+    public static final String evaluateMessage(String expression, 
+                                                Object actionForm,
+                                                HttpServletRequest request, 
+                                                ServletContext servletContext)
+        throws ELException
+    {
+        return (String)evaluate(expression, String.class, actionForm, request, 
servletContext);
+    }
+
+    /* do not construct */
+    private InternalExpressionUtils() {}
+
+    private static final Object evaluate(String expression, Class 
expectedType, Object actionForm, HttpServletRequest request, ServletContext 
servletContext)
+        throws ELException
+    {
+        // todo: can this be static / final?
+        ExpressionEvaluator ee = getExpressionEvaluator();
+        return ee.evaluate(expression, expectedType, 
getVariableResolver(actionForm, request, servletContext), null);
+    }
+
+    private static final ExpressionEvaluator getExpressionEvaluator()
+    {
+        return new ExpressionEvaluatorImpl();
+    }
+
+    private static final VariableResolver getVariableResolver(Object 
actionForm, HttpServletRequest request, ServletContext servletContext)
+    {
+        return new SimpleActionVariableResolver(actionForm, request, 
servletContext);
+    }
+
+    private static class SimpleActionVariableResolver
+        implements VariableResolver
+    {
+        private Object _actionForm = null;
+        private HttpServletRequest _request = null;
+        private ServletContext _servletContext = null;
+
+        private SimpleActionVariableResolver(Object actionForm, 
HttpServletRequest request, ServletContext servletContext)
+        {
+            _actionForm = actionForm;
+            _request = request;
+            _servletContext = servletContext;
+        }
+
+        public Object resolveVariable(String name)
+        {
+            // requestScope, sessionScope, applicationScope, param, 
paramValues, header, headerValues, cookie, initParam, <default>
+            if(name.equals("actionForm"))
+                return _actionForm;
+            else if(name.equals("requestScope"))
+                return buildRequestScopeMap(_request);
+            else if(name.equals("sessionScope"))
+                return buildSessionScopeMap(_request);
+            else if(name.equals("applicationScope"))
+                return buildServletContextMap(_servletContext);
+            else if(name.equals("param"))
+                return buildParamMap(_request);
+            else if(name.equals("paramValues"))
+                return buildParamsMap(_request);
+            else if(name.equals("header"))
+                return buildHeaderMap(_request);
+            else if(name.equals("headerValues"))
+                return buildHeadersMap(_request);
+            else if(name.equals("cookie"))
+                return buildCookieMap(_request);
+            else if(name.equals("initParam"))
+                return buildInitParamMap(_servletContext);
+            // chain up the request > session (if exists) > application
+            // note, this should handle pageFlow, globalApp, sharedFlow, and 
bundle if they're in the request
+            // attribute map already
+            else if(_request.getAttribute(name) != null)
+                return _request.getAttribute(name);
+            else if(_request.getSession(false) != null && 
_request.getSession(false).getAttribute(name) != null)
+                return _request.getSession(false).getAttribute(name);
+            else return _servletContext.getAttribute(name);
+        }
+
+        private static final Map buildCookieMap(HttpServletRequest 
httpServletRequest)
+        {
+            HttpServletRequest servletRequest = httpServletRequest;
+            Map<String, Cookie> cookieMap = new HashMap<String, Cookie>();
+            Cookie[] cookies = servletRequest.getCookies();
+            for(int i = 0; i < cookies.length; i++)
+            {
+                if(!cookieMap.containsKey(cookies[i].getName()))
+                    cookieMap.put(cookies[i].getName(), cookies[i]);
+            }
+            return cookieMap;
+        }
+
+        private static final Map buildHeadersMap(HttpServletRequest 
httpServletRequest)
+        {
+            final HttpServletRequest _servletRequest = httpServletRequest;
+            return new EnumeratedMap()
+            {
+                public Enumeration enumerateKeys()
+                {
+                    return _servletRequest.getHeaderNames();
+                }
+
+                public Object getValue(Object key)
+                {
+                    return (key instanceof String ? 
_servletRequest.getHeaders((String)key) : null);
+                }
+
+                public boolean isMutable() {return false;}
+            };
+        }
+
+        private static final Map buildHeaderMap(HttpServletRequest 
httpServletRequest)
+        {
+            final HttpServletRequest _servletRequest = httpServletRequest;
+            return new EnumeratedMap()
+            {
+                public Enumeration enumerateKeys()
+                {
+                    return _servletRequest.getHeaderNames();
+                }
+
+                public Object getValue(Object key)
+                {
+                    return (key instanceof String ? 
_servletRequest.getHeader((String)key) : null);
+                }
+
+                public boolean isMutable() {return false;}
+            };
+        }
+
+        private static final Map buildInitParamMap(ServletContext 
servletContext)
+        {
+            final ServletContext _servletContext = servletContext;
+            return new EnumeratedMap()
+            {
+                public Enumeration enumerateKeys()
+                {
+                    return _servletContext.getInitParameterNames();
+                }
+
+                public Object getValue(Object key)
+                {
+                    return (key instanceof String ? 
_servletContext.getInitParameter((String)key) : null);
+                }
+
+                public boolean isMutable() {return false;}
+            };
+        }
+
+        private static final Map buildParamsMap(HttpServletRequest 
servletRequest)
+        {
+            final HttpServletRequest _servletRequest = servletRequest;
+            return new EnumeratedMap()
+            {
+                public Enumeration enumerateKeys()
+                {
+                    return _servletRequest.getParameterNames();
+                }
+
+                public Object getValue(Object key)
+                {
+                    return (key instanceof String ? 
_servletRequest.getParameterValues((String)key) : null);
+                }
+
+                public boolean isMutable() {return false;}
+            };
+        }
+
+        private static final Map buildParamMap(HttpServletRequest 
servletRequest)
+        {
+            final HttpServletRequest _servletRequest = servletRequest;
+            return new EnumeratedMap()
+            {
+                public Enumeration enumerateKeys()
+                {
+                    return _servletRequest.getParameterNames();
+                }
+
+                public Object getValue(Object key)
+                {
+                    return (key instanceof String ? 
_servletRequest.getParameter((String)key) : null);
+                }
+
+                public boolean isMutable() {return false;}
+            };
+        }
+
+        private static final Map buildRequestScopeMap(HttpServletRequest 
servletRequest)
+        {
+            final HttpServletRequest _servletRequest = servletRequest;
+            return new EnumeratedMap()
+            {
+                public Enumeration enumerateKeys()
+                {
+                    return _servletRequest.getAttributeNames();
+                }
+
+                public Object getValue(Object key)
+                {
+                    return (key instanceof String ? 
_servletRequest.getAttribute((String)key) : null);
+                }
+
+                public boolean isMutable() {return false;}
+            };
+        }
+
+        private static final Map buildSessionScopeMap(HttpServletRequest 
servletRequest)
+        {
+            if(servletRequest.getSession(false) == null)
+                return null;
+
+            final HttpSession _session = servletRequest.getSession(false);
+            return new EnumeratedMap()
+            {
+                public Enumeration enumerateKeys()
+                {
+                    return _session.getAttributeNames();
+                }
+
+                public Object getValue(Object key)
+                {
+                    return (key instanceof String ? 
_session.getAttribute((String)key) : null);
+                }
+
+                public boolean isMutable() {return false;}
+            };
+        }
+
+        private static final Map buildServletContextMap(ServletContext 
servletContext)
+        {
+            final ServletContext _servletContext = servletContext;
+            return new EnumeratedMap()
+            {
+                public Enumeration enumerateKeys()
+                {
+                    return _servletContext.getAttributeNames();
+                }
+
+                public Object getValue(Object key)
+                {
+                    return (key instanceof String ? 
_servletContext.getAttribute((String)key) : null);
+                }
+
+                public boolean isMutable() {return false;}
+            };
+        }
+    }
+}

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/InternalUtils.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/InternalUtils.java
    (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/InternalUtils.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/JavaControlUtils.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/JavaControlUtils.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/JavaControlUtils.java
 Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/RequestValues.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/RequestValues.java
    (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/RequestValues.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/ResponseOutputException.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/ResponseOutputException.java
  (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/ResponseOutputException.java
  Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/ReturnToException.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/ReturnToException.java
        (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/ReturnToException.java
        Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/XmlBeanActionForm.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/XmlBeanActionForm.java
        (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/XmlBeanActionForm.java
        Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/DOMUtils.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/DOMUtils.java
     (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/DOMUtils.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/DefaultURLRewriter.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/DefaultURLRewriter.java
   (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/DefaultURLRewriter.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/PageflowTagUtils.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/PageflowTagUtils.java
     (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/PageflowTagUtils.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/TemplateHelper.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/TemplateHelper.java
       (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/TemplateHelper.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/URLRewriter.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/URLRewriter.java
  (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/URLRewriter.java
  Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/URLRewriterService.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/URLRewriterService.java
   (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/URLRewriterService.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/UrlTemplateDescriptor.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/UrlTemplateDescriptor.java
        (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/UrlTemplateDescriptor.java
        Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/validation/ValidatorRules.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/validation/ValidatorRules.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/validation/ValidatorRules.java
 Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/Expression.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/Expression.java
  (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/Expression.java
  Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionEngineFactory.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionEngineFactory.java
     (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionEngineFactory.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionEvaluationException.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionEvaluationException.java
       (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionEvaluationException.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionEvaluator.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionEvaluator.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionEvaluator.java
 Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionEvaluatorFactory.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionEvaluatorFactory.java
  (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionEvaluatorFactory.java
  Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionUpdateException.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionUpdateException.java
   (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionUpdateException.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/IllegalExpressionException.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/IllegalExpressionException.java
  (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/IllegalExpressionException.java
  Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/RuntimeExpressionException.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/RuntimeExpressionException.java
  (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/RuntimeExpressionException.java
  Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/AbstractScriptableMap.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/AbstractScriptableMap.java
        (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/AbstractScriptableMap.java
        Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/BundleContext.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/BundleContext.java
        (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/BundleContext.java
        Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/BundleMap.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/BundleMap.java
    (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/BundleMap.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/ContextFactory.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/ContextFactory.java
       (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/ContextFactory.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/DataAccessProviderBean.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/DataAccessProviderBean.java
       (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/DataAccessProviderBean.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/DataAccessProviderStack.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/DataAccessProviderStack.java
      (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/DataAccessProviderStack.java
      Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -97,4 +96,4 @@
         _stack.push(bean);
     }
 
-}
\ No newline at end of file
+}

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/IDataAccessProvider.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/IDataAccessProvider.java
  (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/IDataAccessProvider.java
  Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/ImplicitObjectBean.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/ImplicitObjectBean.java
   (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/ImplicitObjectBean.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/ImplicitObjectUtil.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/ImplicitObjectUtil.java
   (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/ImplicitObjectUtil.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/ScriptablePageInput.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/ScriptablePageInput.java
  (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/ScriptablePageInput.java
  Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/ExpressionEvaluatorImpl.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/ExpressionEvaluatorImpl.java
  (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/ExpressionEvaluatorImpl.java
  Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/ExpressionParseException.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/ExpressionParseException.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/ExpressionParseException.java
 Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/ExpressionTerm.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/ExpressionTerm.java
   (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/ExpressionTerm.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/LiteralTerm.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/LiteralTerm.java
      (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/LiteralTerm.java
      Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/NetUIReadVariableResolver.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/NetUIReadVariableResolver.java
        (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/NetUIReadVariableResolver.java
        Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/NetUIUpdateVariableResolver.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/NetUIUpdateVariableResolver.java
      (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/NetUIUpdateVariableResolver.java
      Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/NetUIVariableResolver.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/NetUIVariableResolver.java
    (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/NetUIVariableResolver.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/ParsedExpression.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/ParsedExpression.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/ParsedExpression.java
 Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/Term.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/Term.java
     (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/Term.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/NetUIELParser.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/NetUIELParser.java
     (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/NetUIELParser.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/NetUIELParserConstants.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/NetUIELParserConstants.java
    (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/NetUIELParserConstants.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/NetUIELParserTokenManager.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/NetUIELParserTokenManager.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/NetUIELParserTokenManager.java
 Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/ParseException.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/ParseException.java
    (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/ParseException.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/SimpleCharStream.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/SimpleCharStream.java
  (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/SimpleCharStream.java
  Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/Token.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/Token.java
     (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/Token.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/TokenMgrError.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/TokenMgrError.java
     (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/parser/TokenMgrError.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/ArrayIndexToken.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/ArrayIndexToken.java
   (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/ArrayIndexToken.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/ContextToken.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/ContextToken.java
      (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/ContextToken.java
      Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/ExpressionToken.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/ExpressionToken.java
   (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/ExpressionToken.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/IdentifierToken.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/IdentifierToken.java
   (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/IdentifierToken.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/MapKeyToken.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/MapKeyToken.java
       (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/MapKeyToken.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/AbstractAttributeMap.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/AbstractAttributeMap.java
        (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/AbstractAttributeMap.java
        Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/ApplicationAttributeMap.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/ApplicationAttributeMap.java
     (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/ApplicationAttributeMap.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/BindingContext.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/BindingContext.java
      (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/BindingContext.java
      Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/PageContextAttributeMap.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/PageContextAttributeMap.java
     (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/PageContextAttributeMap.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/ParseUtils.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/ParseUtils.java
  (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/ParseUtils.java
  Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/RequestAttributeMap.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/RequestAttributeMap.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/RequestAttributeMap.java
 Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/RequestParameterMap.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/RequestParameterMap.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/RequestParameterMap.java
 Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/SessionAttributeMap.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/SessionAttributeMap.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/SessionAttributeMap.java
 Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/ScopedRequest.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/ScopedRequest.java
      (original)
+++ 
incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/ScopedRequest.java
      Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/ScopedResponse.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/ScopedResponse.java
     (original)
+++ 
incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/ScopedResponse.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/ScopedServletUtils.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/ScopedServletUtils.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/ScopedServletUtils.java
 Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/internal/AttributeContainer.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/internal/AttributeContainer.java
        (original)
+++ 
incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/internal/AttributeContainer.java
        Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/internal/ParseUtils.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/internal/ParseUtils.java
        (original)
+++ 
incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/internal/ParseUtils.java
        Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/internal/ScopedAttributeContainer.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/internal/ScopedAttributeContainer.java
  (original)
+++ 
incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/internal/ScopedAttributeContainer.java
  Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/internal/ScopedRequestDispatcher.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/internal/ScopedRequestDispatcher.java
   (original)
+++ 
incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/internal/ScopedRequestDispatcher.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/internal/ScopedRequestImpl.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/internal/ScopedRequestImpl.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/internal/ScopedRequestImpl.java
 Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/internal/ScopedResponseImpl.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/internal/ScopedResponseImpl.java
        (original)
+++ 
incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/internal/ScopedResponseImpl.java
        Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/internal/ScopedServletConfig.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/internal/ScopedServletConfig.java
       (original)
+++ 
incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/internal/ScopedServletConfig.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/internal/ScopedSession.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/internal/ScopedSession.java
     (original)
+++ 
incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/internal/ScopedSession.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/ColumnModel.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/ColumnModel.java
     (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/ColumnModel.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/DataGridModel.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/DataGridModel.java
   (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/DataGridModel.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/IFilter.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/IFilter.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/IFilter.java
 Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/ISort.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/ISort.java
   (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/ISort.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/PagerModel.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/PagerModel.java
      (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/PagerModel.java
      Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/StylePolicy.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/StylePolicy.java
     (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/StylePolicy.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl/AbstractHtmlColumnModel.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl/AbstractHtmlColumnModel.java
    (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl/AbstractHtmlColumnModel.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -150,4 +149,4 @@
         }
         tsh.registerAttribute(AbstractHtmlState.ATTR_GENERAL, name, value);
     }
-}
\ No newline at end of file
+}

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl/AnchorColumnModel.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl/AnchorColumnModel.java
  (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl/AnchorColumnModel.java
  Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl/DefaultFilter.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl/DefaultFilter.java
      (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl/DefaultFilter.java
      Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl/DefaultSort.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl/DefaultSort.java
        (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl/DefaultSort.java
        Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl/DefaultStylePolicy.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl/DefaultStylePolicy.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl/DefaultStylePolicy.java
 Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl/EmptyStylePolicy.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl/EmptyStylePolicy.java
   (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl/EmptyStylePolicy.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl/ImageColumnModel.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl/ImageColumnModel.java
   (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl/ImageColumnModel.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl/LiteralColumnModel.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl/LiteralColumnModel.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl/LiteralColumnModel.java
 Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -53,4 +52,4 @@
     {
         return _state;
     }
-}
\ No newline at end of file
+}

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/IPagerRenderer.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/IPagerRenderer.java
      (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/IPagerRenderer.java
      Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/TableRenderer.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/TableRenderer.java
       (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/TableRenderer.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/impl/AbstractPagerRenderer.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/impl/AbstractPagerRenderer.java
  (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/impl/AbstractPagerRenderer.java
  Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -119,4 +118,4 @@
         buf.append("Last");
     }
 
-}
\ No newline at end of file
+}

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/impl/FirstPreviousNextLastPagerRenderer.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/impl/FirstPreviousNextLastPagerRenderer.java
     (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/impl/FirstPreviousNextLastPagerRenderer.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -77,4 +76,4 @@
 
         return buf.toString();
     }
-}
\ No newline at end of file
+}

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/impl/PreviousNextPagerRenderer.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/impl/PreviousNextPagerRenderer.java
      (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/impl/PreviousNextPagerRenderer.java
      Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -72,4 +71,4 @@
 
         return buf.toString();
     }
-}
\ No newline at end of file
+}

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/FilterService.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/FilterService.java
        (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/FilterService.java
        Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/IllegalFilterException.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/IllegalFilterException.java
       (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/IllegalFilterException.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/PagerService.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/PagerService.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/PagerService.java
 Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/SortService.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/SortService.java
  (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/SortService.java
  Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/JspUtil.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/JspUtil.java
  (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/JspUtil.java
  Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -141,4 +140,4 @@
         String url = PageflowTagUtils.computeURL(pageContext, null, href, 
null, null, params, location, true);
         return url;
     }
-}
\ No newline at end of file
+}

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/PagedDataSet.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/PagedDataSet.java
     (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/PagedDataSet.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/script/el/BundleVariableResolver.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/script/el/BundleVariableResolver.java
       (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/script/el/BundleVariableResolver.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/script/el/ContainerVariableResolver.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/script/el/ContainerVariableResolver.java
    (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/script/el/ContainerVariableResolver.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/base/StructuredBaseTag.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/base/StructuredBaseTag.java
    (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/base/StructuredBaseTag.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/base/style/AbstractStyleBean.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/base/style/AbstractStyleBean.java
      (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/base/style/AbstractStyleBean.java
      Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/bundle/DeclareBundle.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/bundle/DeclareBundle.java
      (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/bundle/DeclareBundle.java
      Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/cellrepeater/CellRepeater.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/cellrepeater/CellRepeater.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/cellrepeater/CellRepeater.java
 Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/cellrepeater/style/CellRepeaterStyleBean.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/cellrepeater/style/CellRepeaterStyleBean.java
  (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/cellrepeater/style/CellRepeaterStyleBean.java
  Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractColumn.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractColumn.java
   (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractColumn.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractHtmlColumn.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractHtmlColumn.java
       (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractHtmlColumn.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -271,4 +270,4 @@
             this.facet = facet;
         }
     }
-}
\ No newline at end of file
+}

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AnchorColumn.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AnchorColumn.java
     (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AnchorColumn.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Caption.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Caption.java
  (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Caption.java
  Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Columns.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Columns.java
  (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Columns.java
  Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ConfigurePager.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ConfigurePager.java
   (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ConfigurePager.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -123,4 +122,4 @@
 
         return;
     }
-}
\ No newline at end of file
+}

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/DataGrid.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/DataGrid.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/DataGrid.java
 Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Footer.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Footer.java
   (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Footer.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ImageColumn.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ImageColumn.java
      (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ImageColumn.java
      Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/LiteralColumn.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/LiteralColumn.java
    (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/LiteralColumn.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/RenderPager.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/RenderPager.java
      (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/RenderPager.java
      Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -53,4 +52,4 @@
 
         return;
     }
-}
\ No newline at end of file
+}

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/invoke/AbstractCallMethod.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/invoke/AbstractCallMethod.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/invoke/AbstractCallMethod.java
 Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/invoke/CallMethod.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/invoke/CallMethod.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/invoke/CallMethod.java
 Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/invoke/CallPageFlow.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/invoke/CallPageFlow.java
       (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/invoke/CallPageFlow.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/invoke/MethodParameter.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/invoke/MethodParameter.java
    (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/invoke/MethodParameter.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/invoke/ObjectNotFoundException.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/invoke/ObjectNotFoundException.java
    (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/invoke/ObjectNotFoundException.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/message/Message.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/message/Message.java
   (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/message/Message.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/message/MessageArg.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/message/MessageArg.java
        (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/message/MessageArg.java
        Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/pageinput/DeclarePageInput.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/pageinput/DeclarePageInput.java
        (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/pageinput/DeclarePageInput.java
        Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/Repeater.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/Repeater.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/Repeater.java
 Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/RepeaterComponent.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/RepeaterComponent.java
        (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/RepeaterComponent.java
        Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/RepeaterFooter.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/RepeaterFooter.java
   (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/RepeaterFooter.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/RepeaterHeader.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/RepeaterHeader.java
   (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/RepeaterHeader.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/RepeaterItem.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/RepeaterItem.java
     (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/RepeaterItem.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/pad/Pad.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/pad/Pad.java
  (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/pad/Pad.java
  Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/pad/PadContext.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/pad/PadContext.java
   (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/pad/PadContext.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/script/GetData.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/script/GetData.java
    (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/script/GetData.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/xml/SerializeXML.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/xml/SerializeXML.java
  (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/xml/SerializeXML.java
  Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/AbstractClassicTag.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/AbstractClassicTag.java
   (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/AbstractClassicTag.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/AbstractPageError.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/AbstractPageError.java
    (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/AbstractPageError.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/DataSourceTag.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/DataSourceTag.java
        (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/DataSourceTag.java
        Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/EvalErrorInfo.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/EvalErrorInfo.java
        (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/EvalErrorInfo.java
        Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/HtmlUtils.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/HtmlUtils.java
    (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/HtmlUtils.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IAttributeConsumer.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IAttributeConsumer.java
   (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IAttributeConsumer.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IErrorCollector.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IErrorCollector.java
      (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IErrorCollector.java
      Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IErrorReporter.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IErrorReporter.java
       (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IErrorReporter.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IHtmlAccessable.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IHtmlAccessable.java
      (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IHtmlAccessable.java
      Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IHtmlAttrs.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IHtmlAttrs.java
   (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IHtmlAttrs.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IHtmlCore.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IHtmlCore.java
    (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IHtmlCore.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IHtmlEvents.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IHtmlEvents.java
  (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IHtmlEvents.java
  Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IHtmlI18n.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IHtmlI18n.java
    (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IHtmlI18n.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IHtmlIdWriter.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IHtmlIdWriter.java
        (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IHtmlIdWriter.java
        Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IScriptReporter.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IScriptReporter.java
      (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IScriptReporter.java
      Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/TagErrorInfo.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/TagErrorInfo.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/TagErrorInfo.java
 Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Anchor.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Anchor.java
  (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Anchor.java
  Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Attribute.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Attribute.java
       (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Attribute.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Base.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Base.java
    (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Base.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/BindingUpdateErrors.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/BindingUpdateErrors.java
     (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/BindingUpdateErrors.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Body.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Body.java
    (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Body.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Button.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Button.java
  (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Button.java
  Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/CheckBox.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/CheckBox.java
        (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/CheckBox.java
        Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/CheckBoxGroup.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/CheckBoxGroup.java
   (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/CheckBoxGroup.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/CheckBoxOption.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/CheckBoxOption.java
  (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/CheckBoxOption.java
  Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Content.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Content.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Content.java
 Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Error.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Error.java
   (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Error.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ErrorBaseTag.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ErrorBaseTag.java
    (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ErrorBaseTag.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Errors.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Errors.java
  (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Errors.java
  Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Exceptions.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Exceptions.java
      (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Exceptions.java
      Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FileUpload.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FileUpload.java
      (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FileUpload.java
      Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Form.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Form.java
    (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Form.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormatDate.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormatDate.java
      (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormatDate.java
      Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormatNumber.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormatNumber.java
    (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormatNumber.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormatString.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormatString.java
    (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormatString.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormatTag.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormatTag.java
       (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormatTag.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Formattable.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Formattable.java
     (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Formattable.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Hidden.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Hidden.java
  (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Hidden.java
  Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Html.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Html.java
    (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Html.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlBaseTag.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlBaseTag.java
     (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlBaseTag.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlConstants.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlConstants.java
   (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlConstants.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlDataSourceTag.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlDataSourceTag.java
       (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlDataSourceTag.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlDefaultableDataSourceTag.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlDefaultableDataSourceTag.java
    (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlDefaultableDataSourceTag.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlFocusBaseTag.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlFocusBaseTag.java
        (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlFocusBaseTag.java
        Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlGroupBaseTag.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlGroupBaseTag.java
        (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlGroupBaseTag.java
        Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlOptionsDataSourceTag.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlOptionsDataSourceTag.java
        (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlOptionsDataSourceTag.java
        Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Image.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Image.java
   (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Image.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ImageAnchor.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ImageAnchor.java
     (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ImageAnchor.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ImageButton.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ImageButton.java
     (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ImageButton.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/JavaScriptUtils.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/JavaScriptUtils.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/JavaScriptUtils.java
 Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Label.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Label.java
   (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Label.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/LabelBase.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/LabelBase.java
       (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/LabelBase.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Parameter.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Parameter.java
       (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Parameter.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ParameterMap.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ParameterMap.java
    (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ParameterMap.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RadioButtonGroup.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RadioButtonGroup.java
        (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RadioButtonGroup.java
        Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RadioButtonOption.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RadioButtonOption.java
       (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RadioButtonOption.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RewriteName.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RewriteName.java
     (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RewriteName.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RewriteURL.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RewriteURL.java
      (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RewriteURL.java
      Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ScriptContainer.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ScriptContainer.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ScriptContainer.java
 Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ScriptHeader.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ScriptHeader.java
    (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ScriptHeader.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Select.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Select.java
  (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Select.java
  Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/SelectOption.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/SelectOption.java
    (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/SelectOption.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Span.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Span.java
    (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Span.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/TextArea.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/TextArea.java
        (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/TextArea.java
        Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/TextBox.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/TextBox.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/TextBox.java
 Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/URLParams.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/URLParams.java
       (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/URLParams.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/naming/FormDataNameInterceptor.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/naming/FormDataNameInterceptor.java
       (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/naming/FormDataNameInterceptor.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/naming/IndexedNameInterceptor.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/naming/IndexedNameInterceptor.java
        (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/naming/IndexedNameInterceptor.java
        Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/naming/NameInterceptor.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/naming/NameInterceptor.java
       (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/naming/NameInterceptor.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/naming/PrefixNameInterceptor.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/naming/PrefixNameInterceptor.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/naming/PrefixNameInterceptor.java
 Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/AbstractAttributeState.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/AbstractAttributeState.java
     (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/AbstractAttributeState.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/AbstractHtmlState.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/AbstractHtmlState.java
  (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/AbstractHtmlState.java
  Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/AbstractTagState.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/AbstractTagState.java
   (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/AbstractTagState.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/AnchorTag.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/AnchorTag.java
  (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/AnchorTag.java
  Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/BaseTag.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/BaseTag.java
    (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/BaseTag.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/BodyTag.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/BodyTag.java
    (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/BodyTag.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/CaptionTag.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/CaptionTag.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/CaptionTag.java
 Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/ConstantRendering.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/ConstantRendering.java
  (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/ConstantRendering.java
  Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/DivTag.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/DivTag.java
     (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/DivTag.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/FormTag.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/FormTag.java
    (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/FormTag.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/HtmlTag.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/HtmlTag.java
    (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/HtmlTag.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/ImageTag.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/ImageTag.java
   (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/ImageTag.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputBooleanTag.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputBooleanTag.java
    (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputBooleanTag.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputFileTag.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputFileTag.java
       (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputFileTag.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputHiddenTag.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputHiddenTag.java
     (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputHiddenTag.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputImageTag.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputImageTag.java
      (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputImageTag.java
      Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputSubmitTag.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputSubmitTag.java
     (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputSubmitTag.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputTextTag.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputTextTag.java
       (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputTextTag.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/LabelTag.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/LabelTag.java
   (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/LabelTag.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/OptionTag.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/OptionTag.java
  (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/OptionTag.java
  Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/SelectTag.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/SelectTag.java
  (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/SelectTag.java
  Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/SpanTag.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/SpanTag.java
    (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/SpanTag.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TableTag.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TableTag.java
   (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TableTag.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TagHtmlBase.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TagHtmlBase.java
        (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TagHtmlBase.java
        Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TagRenderingBase.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TagRenderingBase.java
   (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TagRenderingBase.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TdTag.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TdTag.java
      (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TdTag.java
      Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TextAreaTag.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TextAreaTag.java
        (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TextAreaTag.java
        Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TrTag.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TrTag.java
      (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TrTag.java
      Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/AttributeRenderer.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/AttributeRenderer.java
       (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/AttributeRenderer.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2004-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/Tree.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/Tree.java
    (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/Tree.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2004-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeContent.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeContent.java
     (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeContent.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2004-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeElement.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeElement.java
     (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeElement.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2004-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeHelpers.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeHelpers.java
     (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeHelpers.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2004-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeHtmlAttribute.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeHtmlAttribute.java
       (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeHtmlAttribute.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2004-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeHtmlAttributeInfo.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeHtmlAttributeInfo.java
   (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeHtmlAttributeInfo.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeItem.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeItem.java
        (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeItem.java
        Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2004-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeLabel.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeLabel.java
       (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeLabel.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2004-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreePropertyOverride.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreePropertyOverride.java
    (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreePropertyOverride.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2004-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeRootElement.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeRootElement.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeRootElement.java
 Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2004-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-template/org/apache/beehive/netui/tags/template/Attribute.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-template/org/apache/beehive/netui/tags/template/Attribute.java
       (original)
+++ 
incubator/beehive/trunk/netui/src/tags-template/org/apache/beehive/netui/tags/template/Attribute.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-template/org/apache/beehive/netui/tags/template/DivPanel.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-template/org/apache/beehive/netui/tags/template/DivPanel.java
        (original)
+++ 
incubator/beehive/trunk/netui/src/tags-template/org/apache/beehive/netui/tags/template/DivPanel.java
        Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-template/org/apache/beehive/netui/tags/template/IncludeSection.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-template/org/apache/beehive/netui/tags/template/IncludeSection.java
  (original)
+++ 
incubator/beehive/trunk/netui/src/tags-template/org/apache/beehive/netui/tags/template/IncludeSection.java
  Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-template/org/apache/beehive/netui/tags/template/Section.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-template/org/apache/beehive/netui/tags/template/Section.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/tags-template/org/apache/beehive/netui/tags/template/Section.java
 Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-template/org/apache/beehive/netui/tags/template/SetAttribute.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-template/org/apache/beehive/netui/tags/template/SetAttribute.java
    (original)
+++ 
incubator/beehive/trunk/netui/src/tags-template/org/apache/beehive/netui/tags/template/SetAttribute.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-template/org/apache/beehive/netui/tags/template/Template.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-template/org/apache/beehive/netui/tags/template/Template.java
        (original)
+++ 
incubator/beehive/trunk/netui/src/tags-template/org/apache/beehive/netui/tags/template/Template.java
        Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tags-template/org/apache/beehive/netui/tags/template/TemplateConstants.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-template/org/apache/beehive/netui/tags/template/TemplateConstants.java
       (original)
+++ 
incubator/beehive/trunk/netui/src/tags-template/org/apache/beehive/netui/tags/template/TemplateConstants.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tomcat-common/4x/org/apache/beehive/netui/tomcat/PageflowHelper.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tomcat-common/4x/org/apache/beehive/netui/tomcat/PageflowHelper.java
      (original)
+++ 
incubator/beehive/trunk/netui/src/tomcat-common/4x/org/apache/beehive/netui/tomcat/PageflowHelper.java
      Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tomcat-server/4x/org/apache/beehive/netui/tomcat/PageflowHelperImpl.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tomcat-server/4x/org/apache/beehive/netui/tomcat/PageflowHelperImpl.java
  (original)
+++ 
incubator/beehive/trunk/netui/src/tomcat-server/4x/org/apache/beehive/netui/tomcat/PageflowHelperImpl.java
  Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tomcat-server/4x/org/apache/beehive/netui/tomcat/PageflowValve.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tomcat-server/4x/org/apache/beehive/netui/tomcat/PageflowValve.java
       (original)
+++ 
incubator/beehive/trunk/netui/src/tomcat-server/4x/org/apache/beehive/netui/tomcat/PageflowValve.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/tomcat-webapp/4x/org/apache/beehive/netui/tomcat/TomcatServerAdapter.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tomcat-webapp/4x/org/apache/beehive/netui/tomcat/TomcatServerAdapter.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/tomcat-webapp/4x/org/apache/beehive/netui/tomcat/TomcatServerAdapter.java
 Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/Bundle.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/Bundle.java
    (original)
+++ 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/Bundle.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/FileUtils.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/FileUtils.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/FileUtils.java
 Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/HtmlExceptionFormatter.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/HtmlExceptionFormatter.java
    (original)
+++ 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/HtmlExceptionFormatter.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/ParamHelper.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/ParamHelper.java
       (original)
+++ 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/ParamHelper.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/ServletUtils.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/ServletUtils.java
      (original)
+++ 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/ServletUtils.java
      Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/TemplateHelper.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/TemplateHelper.java
    (original)
+++ 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/TemplateHelper.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/cache/ClassLevelCache.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/cache/ClassLevelCache.java
     (original)
+++ 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/cache/ClassLevelCache.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/cache/MethodCache.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/cache/MethodCache.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/cache/MethodCache.java
 Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/cache/PropertyCache.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/cache/PropertyCache.java
       (original)
+++ 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/cache/PropertyCache.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/cache/ServletContextCache.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/cache/ServletContextCache.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/cache/ServletContextCache.java
 Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/classloader/BouncyClassLoader.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/classloader/BouncyClassLoader.java
     (original)
+++ 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/classloader/BouncyClassLoader.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/ConfigInitializationException.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/ConfigInitializationException.java
      (original)
+++ 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/ConfigInitializationException.java
      Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/ConfigUtil.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/ConfigUtil.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/ConfigUtil.java
 Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/exception/LocalizedIllegalArgumentException.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/exception/LocalizedIllegalArgumentException.java
       (original)
+++ 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/exception/LocalizedIllegalArgumentException.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/exception/LocalizedIllegalStateException.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/exception/LocalizedIllegalStateException.java
  (original)
+++ 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/exception/LocalizedIllegalStateException.java
  Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/exception/LocalizedUnsupportedOperationException.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/exception/LocalizedUnsupportedOperationException.java
  (original)
+++ 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/exception/LocalizedUnsupportedOperationException.java
  Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/ArrayIterator.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/ArrayIterator.java
    (original)
+++ 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/ArrayIterator.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/AtomicObjectIterator.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/AtomicObjectIterator.java
     (original)
+++ 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/AtomicObjectIterator.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/EmptyIterator.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/EmptyIterator.java
    (original)
+++ 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/EmptyIterator.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/EnumerationIterator.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/EnumerationIterator.java
      (original)
+++ 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/EnumerationIterator.java
      Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/IteratorFactory.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/IteratorFactory.java
  (original)
+++ 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/IteratorFactory.java
  Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/IteratorFactoryException.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/IteratorFactoryException.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/IteratorFactoryException.java
 Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/MapIterator.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/MapIterator.java
      (original)
+++ 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/MapIterator.java
      Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/ResultSetIterator.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/ResultSetIterator.java
        (original)
+++ 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/ResultSetIterator.java
        Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/logging/Logger.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/logging/Logger.java
    (original)
+++ 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/logging/Logger.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/logging/StrutsLogFactory.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/logging/StrutsLogFactory.java
  (original)
+++ 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/logging/StrutsLogFactory.java
  Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/logging/StrutsLogger.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/logging/StrutsLogger.java
      (original)
+++ 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/logging/StrutsLogger.java
      Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/tags/GroupOption.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/tags/GroupOption.java
  (original)
+++ 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/tags/GroupOption.java
  Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/BaseTypeConverter.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/BaseTypeConverter.java
    (original)
+++ 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/BaseTypeConverter.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -48,4 +47,4 @@
     {
         return value;
     }
-}
\ No newline at end of file
+}

Modified: 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/DelegatingTypeConverter.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/DelegatingTypeConverter.java
      (original)
+++ 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/DelegatingTypeConverter.java
      Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -51,4 +50,4 @@
     {
         return _converter.convertToObject(value);
     }
-}
\ No newline at end of file
+}

Modified: 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/TypeConversionException.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/TypeConversionException.java
      (original)
+++ 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/TypeConversionException.java
      Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/TypeConverter.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/TypeConverter.java
        (original)
+++ 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/TypeConverter.java
        Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/TypeConverterNotFoundException.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/TypeConverterNotFoundException.java
       (original)
+++ 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/TypeConverterNotFoundException.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/TypeUtils.java
==============================================================================
--- 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/TypeUtils.java
    (original)
+++ 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/TypeUtils.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/fauxServlet/org/apache/beehive/netui/test/servlet/FauxPageContext.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/fauxServlet/org/apache/beehive/netui/test/servlet/FauxPageContext.java
       (original)
+++ 
incubator/beehive/trunk/netui/test/src/fauxServlet/org/apache/beehive/netui/test/servlet/FauxPageContext.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/fauxServlet/org/apache/beehive/netui/test/servlet/HttpServletRequestHandler.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/fauxServlet/org/apache/beehive/netui/test/servlet/HttpServletRequestHandler.java
     (original)
+++ 
incubator/beehive/trunk/netui/test/src/fauxServlet/org/apache/beehive/netui/test/servlet/HttpServletRequestHandler.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/fauxServlet/org/apache/beehive/netui/test/servlet/HttpServletResponseHandler.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/fauxServlet/org/apache/beehive/netui/test/servlet/HttpServletResponseHandler.java
    (original)
+++ 
incubator/beehive/trunk/netui/test/src/fauxServlet/org/apache/beehive/netui/test/servlet/HttpServletResponseHandler.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/fauxServlet/org/apache/beehive/netui/test/servlet/ServletFactory.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/fauxServlet/org/apache/beehive/netui/test/servlet/ServletFactory.java
        (original)
+++ 
incubator/beehive/trunk/netui/test/src/fauxServlet/org/apache/beehive/netui/test/servlet/ServletFactory.java
        Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/fauxServlet/org/apache/beehive/netui/test/servlet/ServletHandler.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/fauxServlet/org/apache/beehive/netui/test/servlet/ServletHandler.java
        (original)
+++ 
incubator/beehive/trunk/netui/test/src/fauxServlet/org/apache/beehive/netui/test/servlet/ServletHandler.java
        Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/junitTests/com/bea/netuix/servlets/script/PortalVariableResolver.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/junitTests/com/bea/netuix/servlets/script/PortalVariableResolver.java
        (original)
+++ 
incubator/beehive/trunk/netui/test/src/junitTests/com/bea/netuix/servlets/script/PortalVariableResolver.java
        Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/databinding/expression/IndexedNameTest.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/databinding/expression/IndexedNameTest.java
 (original)
+++ 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/databinding/expression/IndexedNameTest.java
 Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/AbstractExpressionTest.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/AbstractExpressionTest.java
  (original)
+++ 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/AbstractExpressionTest.java
  Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/AccessTest.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/AccessTest.java
      (original)
+++ 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/AccessTest.java
      Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/BundleScriptTest.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/BundleScriptTest.java
        (original)
+++ 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/BundleScriptTest.java
        Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ExpressionTest.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ExpressionTest.java
  (original)
+++ 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ExpressionTest.java
  Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ExpressionTestError.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ExpressionTestError.java
     (original)
+++ 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ExpressionTestError.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ExpressionUpdateTest.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ExpressionUpdateTest.java
    (original)
+++ 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ExpressionUpdateTest.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/PageInputTest.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/PageInputTest.java
   (original)
+++ 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/PageInputTest.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ParsedExpressionTest.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ParsedExpressionTest.java
    (original)
+++ 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ParsedExpressionTest.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ProcessPopulateTest.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ProcessPopulateTest.java
     (original)
+++ 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ProcessPopulateTest.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELAccessTest.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELAccessTest.java
    (original)
+++ 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELAccessTest.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELBundleScriptTest.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELBundleScriptTest.java
      (original)
+++ 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELBundleScriptTest.java
      Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELCustomBindingContextTest.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELCustomBindingContextTest.java
      (original)
+++ 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELCustomBindingContextTest.java
      Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELExpressionObjectTest.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELExpressionObjectTest.java
  (original)
+++ 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELExpressionObjectTest.java
  Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELExpressionTest.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELExpressionTest.java
        (original)
+++ 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELExpressionTest.java
        Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELExpressionUpdateTest.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELExpressionUpdateTest.java
  (original)
+++ 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELExpressionUpdateTest.java
  Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELPageInputTest.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELPageInputTest.java
 (original)
+++ 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELPageInputTest.java
 Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELParsedExpressionTest.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELParsedExpressionTest.java
  (original)
+++ 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELParsedExpressionTest.java
  Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/simpleaction/InternalExpressionUtilsTest.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/simpleaction/InternalExpressionUtilsTest.java
        (original)
+++ 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/simpleaction/InternalExpressionUtilsTest.java
        Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -122,4 +121,4 @@
     {
         junit.textui.TestRunner.run(suite());
     }
-}
\ No newline at end of file
+}

Modified: 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/tools/AssertHelper.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/tools/AssertHelper.java
     (original)
+++ 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/tools/AssertHelper.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/ConfigTest.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/ConfigTest.java
 (original)
+++ 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/ConfigTest.java
 Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/iterator/IteratorFactoryTest.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/iterator/IteratorFactoryTest.java
      (original)
+++ 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/iterator/IteratorFactoryTest.java
      Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/type/TypeUtilsTest.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/type/TypeUtilsTest.java
        (original)
+++ 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/type/TypeUtilsTest.java
        Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/util/config/ConfigUtil.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/util/config/ConfigUtil.java
      (original)
+++ 
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/util/config/ConfigUtil.java
      Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/testBeans/org/apache/beehive/netui/test/beans/BarJavaBean.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/testBeans/org/apache/beehive/netui/test/beans/BarJavaBean.java
       (original)
+++ 
incubator/beehive/trunk/netui/test/src/testBeans/org/apache/beehive/netui/test/beans/BarJavaBean.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/testBeans/org/apache/beehive/netui/test/beans/ComplexTypeActionForm.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/testBeans/org/apache/beehive/netui/test/beans/ComplexTypeActionForm.java
     (original)
+++ 
incubator/beehive/trunk/netui/test/src/testBeans/org/apache/beehive/netui/test/beans/ComplexTypeActionForm.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/testBeans/org/apache/beehive/netui/test/beans/FooJavaBean.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/testBeans/org/apache/beehive/netui/test/beans/FooJavaBean.java
       (original)
+++ 
incubator/beehive/trunk/netui/test/src/testBeans/org/apache/beehive/netui/test/beans/FooJavaBean.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/testBeans/org/apache/beehive/netui/test/beans/IProduct.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/testBeans/org/apache/beehive/netui/test/beans/IProduct.java
  (original)
+++ 
incubator/beehive/trunk/netui/test/src/testBeans/org/apache/beehive/netui/test/beans/IProduct.java
  Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/testBeans/org/apache/beehive/netui/test/beans/Product.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/testBeans/org/apache/beehive/netui/test/beans/Product.java
   (original)
+++ 
incubator/beehive/trunk/netui/test/src/testBeans/org/apache/beehive/netui/test/beans/Product.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/testBeans/org/apache/beehive/netui/test/beans/SimpleTypeActionForm.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/testBeans/org/apache/beehive/netui/test/beans/SimpleTypeActionForm.java
      (original)
+++ 
incubator/beehive/trunk/netui/test/src/testBeans/org/apache/beehive/netui/test/beans/SimpleTypeActionForm.java
      Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/client/MasterTestRecorderJUnitTest.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/client/MasterTestRecorderJUnitTest.java
     (original)
+++ 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/client/MasterTestRecorderJUnitTest.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/client/PlaybackException.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/client/PlaybackException.java
       (original)
+++ 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/client/PlaybackException.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/client/PlaybackExecutor.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/client/PlaybackExecutor.java
        (original)
+++ 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/client/PlaybackExecutor.java
        Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/client/TestRecorderJUnitTest.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/client/TestRecorderJUnitTest.java
   (original)
+++ 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/client/TestRecorderJUnitTest.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/AbstractDiffEngine.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/AbstractDiffEngine.java
      (original)
+++ 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/AbstractDiffEngine.java
      Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/DefaultFilterData.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/DefaultFilterData.java
       (original)
+++ 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/DefaultFilterData.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/DiffEngine.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/DiffEngine.java
      (original)
+++ 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/DiffEngine.java
      Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/DiffEngineFactory.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/DiffEngineFactory.java
       (original)
+++ 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/DiffEngineFactory.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/FilterData.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/FilterData.java
      (original)
+++ 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/FilterData.java
      Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/LineDiffEngine.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/LineDiffEngine.java
  (original)
+++ 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/LineDiffEngine.java
  Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/ResponseWrapper.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/ResponseWrapper.java
 (original)
+++ 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/ResponseWrapper.java
 Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/TestRecorderFilter.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/TestRecorderFilter.java
      (original)
+++ 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/TestRecorderFilter.java
      Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/TestRecorderServlet.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/TestRecorderServlet.java
     (original)
+++ 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/TestRecorderServlet.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/serverAdapter/AbstractServerAdapter.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/serverAdapter/AbstractServerAdapter.java
     (original)
+++ 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/serverAdapter/AbstractServerAdapter.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/serverAdapter/DefaultServerAdapter.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/serverAdapter/DefaultServerAdapter.java
      (original)
+++ 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/serverAdapter/DefaultServerAdapter.java
      Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/serverAdapter/ServerAdapter.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/serverAdapter/ServerAdapter.java
     (original)
+++ 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/serverAdapter/ServerAdapter.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/serverAdapter/ServerAdapterUtils.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/serverAdapter/ServerAdapterUtils.java
        (original)
+++ 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/serverAdapter/ServerAdapterUtils.java
        Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/serverAdapter/WeblogicServerAdapter.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/serverAdapter/WeblogicServerAdapter.java
     (original)
+++ 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/serverAdapter/WeblogicServerAdapter.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/state/PlaybackSession.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/state/PlaybackSession.java
   (original)
+++ 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/state/PlaybackSession.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/state/PlaybackSessionImpl.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/state/PlaybackSessionImpl.java
       (original)
+++ 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/state/PlaybackSessionImpl.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/state/RecordSession.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/state/RecordSession.java
     (original)
+++ 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/state/RecordSession.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/state/RecordSessionImpl.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/state/RecordSessionImpl.java
 (original)
+++ 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/state/RecordSessionImpl.java
 Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/state/Session.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/state/Session.java
   (original)
+++ 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/state/Session.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/state/SessionFailedException.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/state/SessionFailedException.java
    (original)
+++ 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/state/SessionFailedException.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/state/SessionImpl.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/state/SessionImpl.java
       (original)
+++ 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/state/SessionImpl.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/state/State.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/state/State.java
     (original)
+++ 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/server/state/State.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/Constants.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/Constants.java
       (original)
+++ 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/Constants.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/DiffFailedException.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/DiffFailedException.java
     (original)
+++ 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/DiffFailedException.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/Logger.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/Logger.java
  (original)
+++ 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/Logger.java
  Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/NVPair.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/NVPair.java
  (original)
+++ 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/NVPair.java
  Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -63,4 +62,4 @@
     public String toString () {
         return "name( " + name + " ), value( " + value + " )";
     }
-}
\ No newline at end of file
+}

Modified: 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/PlaybackSessionBean.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/PlaybackSessionBean.java
     (original)
+++ 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/PlaybackSessionBean.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/RecordSessionBean.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/RecordSessionBean.java
       (original)
+++ 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/RecordSessionBean.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/Reporter.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/Reporter.java
        (original)
+++ 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/Reporter.java
        Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/RequestData.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/RequestData.java
     (original)
+++ 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/RequestData.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/ResponseData.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/ResponseData.java
    (original)
+++ 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/ResponseData.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/SessionBean.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/SessionBean.java
     (original)
+++ 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/SessionBean.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/SessionXMLException.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/SessionXMLException.java
     (original)
+++ 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/SessionXMLException.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/TestResults.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/TestResults.java
     (original)
+++ 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/TestResults.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/Util.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/Util.java
    (original)
+++ 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/Util.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/config/Categories.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/config/Categories.java
       (original)
+++ 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/config/Categories.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/config/Category.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/config/Category.java
 (original)
+++ 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/config/Category.java
 Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/config/Config.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/config/Config.java
   (original)
+++ 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/config/Config.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/config/ConfigException.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/config/ConfigException.java
  (original)
+++ 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/config/ConfigException.java
  Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/config/RuntimeConfigException.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/config/RuntimeConfigException.java
   (original)
+++ 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/config/RuntimeConfigException.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/config/ServerConfig.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/config/ServerConfig.java
     (original)
+++ 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/config/ServerConfig.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/config/ServerDefinition.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/config/ServerDefinition.java
 (original)
+++ 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/config/ServerDefinition.java
 Mon Aug 30 15:07:46 2004
@@ -1,119 +1,118 @@
-/*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
- *
- * 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.
- *
- * $Header:$
- */
-
-package org.apache.beehive.netui.tools.testrecorder.shared.config;
-
-import org.apache.beehive.netui.tools.testrecorder.shared.util.StringHelper;
-
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-
-/**
- * Client side object that defines server access info.
- * <p/>
- * User: ozzy
- */
-public class ServerDefinition {
-
-    private String name;
-    private String hostname;
-    private int port;
-    private List webappList;
-    private Map webappMap;
-    private Map testDefMap;
-    private List testDefList;
-
-    public ServerDefinition( String name, String hostname, int port ) {
-        this.name = name;
-        this.hostname = hostname;
-        this.port = port;
-        webappList = new ArrayList();
-        webappMap = new HashMap();
-        testDefMap = new HashMap();
-        testDefList = new ArrayList();
-    }
-
-    public void addWebapp( WebappDefinition webapp ) {
-        webappList.add( webapp );
-        webappMap.put( webapp.getName(), webapp );
-    }
-
-    public WebappDefinition getWebapp( String webappName ) {
-        return (WebappDefinition) webappMap.get( webappName );
-    }
-
-    public WebappDefinition[] getWebapps() {
-        return (WebappDefinition[]) webappList.toArray( new 
WebappDefinition[webappList.size()] );
-    }
-
-    public int getWebappCount() {
-        return webappList.size();
-    }
-
-    public void addTestDefinitions( WebappDefinition webapp, TestDefinitions 
tests ) {
-        testDefMap.put( webapp, tests );
-        testDefList.add( tests );
-    }
-
-    public TestDefinitions getTestDefinitions( String webappName ) throws 
ConfigException {
-        WebappDefinition webapp = getWebapp( webappName );
-        if ( webapp == null ) {
-            throw new ConfigException( "No webapp exists for webapp with name( 
" + webappName );
-        }
-        return getTestDefinitions( webapp );
-    }
-
-    public TestDefinitions getTestDefinitions( WebappDefinition webapp ) {
-        return (TestDefinitions) testDefMap.get( webapp );
-    }
-
-    public TestDefinitions[] getTestDefinitions() {
-        return (TestDefinitions[]) testDefList.toArray( new 
TestDefinitions[testDefList.size()] );
-    }
-
-    public int getTestDefinitionsCount() {
-        return testDefList.size();
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public String getHostname() {
-        return hostname;
-    }
-
-    public int getPort() {
-        return port;
-    }
-
-    public String toString() {
-        StringBuffer sb = new StringBuffer( 48 );
-        sb.append( "[ " );
-        sb.append( "name( " + getName() + " )" );
-        sb.append( ", hostname( " + getHostname() + " )" );
-        sb.append( ", port( " + getPort() + " )" );
-        sb.append( ", webappList( " + StringHelper.toString( webappList, "\n", 
"\n\t" ) + " )" );
-        sb.append( " ]" );
-        return sb.toString();
-    }
-
-}
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * 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.
+ *
+ * $Header:$
+ */
+
+package org.apache.beehive.netui.tools.testrecorder.shared.config;
+
+import org.apache.beehive.netui.tools.testrecorder.shared.util.StringHelper;
+
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+
+/**
+ * Client side object that defines server access info.
+ * <p/>
+ * User: ozzy
+ */
+public class ServerDefinition {
+
+    private String name;
+    private String hostname;
+    private int port;
+    private List webappList;
+    private Map webappMap;
+    private Map testDefMap;
+    private List testDefList;
+
+    public ServerDefinition( String name, String hostname, int port ) {
+        this.name = name;
+        this.hostname = hostname;
+        this.port = port;
+        webappList = new ArrayList();
+        webappMap = new HashMap();
+        testDefMap = new HashMap();
+        testDefList = new ArrayList();
+    }
+
+    public void addWebapp( WebappDefinition webapp ) {
+        webappList.add( webapp );
+        webappMap.put( webapp.getName(), webapp );
+    }
+
+    public WebappDefinition getWebapp( String webappName ) {
+        return (WebappDefinition) webappMap.get( webappName );
+    }
+
+    public WebappDefinition[] getWebapps() {
+        return (WebappDefinition[]) webappList.toArray( new 
WebappDefinition[webappList.size()] );
+    }
+
+    public int getWebappCount() {
+        return webappList.size();
+    }
+
+    public void addTestDefinitions( WebappDefinition webapp, TestDefinitions 
tests ) {
+        testDefMap.put( webapp, tests );
+        testDefList.add( tests );
+    }
+
+    public TestDefinitions getTestDefinitions( String webappName ) throws 
ConfigException {
+        WebappDefinition webapp = getWebapp( webappName );
+        if ( webapp == null ) {
+            throw new ConfigException( "No webapp exists for webapp with name( 
" + webappName );
+        }
+        return getTestDefinitions( webapp );
+    }
+
+    public TestDefinitions getTestDefinitions( WebappDefinition webapp ) {
+        return (TestDefinitions) testDefMap.get( webapp );
+    }
+
+    public TestDefinitions[] getTestDefinitions() {
+        return (TestDefinitions[]) testDefList.toArray( new 
TestDefinitions[testDefList.size()] );
+    }
+
+    public int getTestDefinitionsCount() {
+        return testDefList.size();
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getHostname() {
+        return hostname;
+    }
+
+    public int getPort() {
+        return port;
+    }
+
+    public String toString() {
+        StringBuffer sb = new StringBuffer( 48 );
+        sb.append( "[ " );
+        sb.append( "name( " + getName() + " )" );
+        sb.append( ", hostname( " + getHostname() + " )" );
+        sb.append( ", port( " + getPort() + " )" );
+        sb.append( ", webappList( " + StringHelper.toString( webappList, "\n", 
"\n\t" ) + " )" );
+        sb.append( " ]" );
+        return sb.toString();
+    }
+
+}

Modified: 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/config/TestDefinition.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/config/TestDefinition.java
   (original)
+++ 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/config/TestDefinition.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/config/TestDefinitions.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/config/TestDefinitions.java
  (original)
+++ 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/config/TestDefinitions.java
  Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/config/WebappConfig.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/config/WebappConfig.java
     (original)
+++ 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/config/WebappConfig.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/config/WebappDefinition.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/config/WebappDefinition.java
 (original)
+++ 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/config/WebappDefinition.java
 Mon Aug 30 15:07:46 2004
@@ -1,75 +1,74 @@
-/*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
- *
- * 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.
- *
- * $Header:$
- */
-
-package org.apache.beehive.netui.tools.testrecorder.shared.config;
-
-import org.apache.beehive.netui.tools.testrecorder.shared.util.StringHelper;
-import org.apache.beehive.netui.tools.testrecorder.shared.Logger;
-
-import java.io.File;
-
-/**
- * Client side object defining webapp access.
- * User: ozzy
- */
-public class WebappDefinition {
-
-    private static final Logger log = Logger.getInstance( 
WebappDefinition.class );
-
-    private String name;
-    private String description;
-    // includes leading slash
-    private String contextRoot;
-    private String servletUri;
-
-    public WebappDefinition( String name, String description, String 
contextRoot, String servletUri) {
-        this.name = name;
-        this.description = description;
-        this.contextRoot = contextRoot;
-        this.servletUri = contextRoot + "/" + servletUri;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public String getContextRoot() {
-        return contextRoot;
-    }
-
-    public String getServletUri() {
-        return servletUri;
-    }
-
-    public String toString() {
-        StringBuffer sb = new StringBuffer( 256 );
-        sb.append( "[ " );
-        sb.append( "name( " + getName() + " )" );
-        sb.append( ", description( " + getDescription() + " )" );
-        sb.append( ", contextRoot( " + getContextRoot() + " )" );
-        sb.append( ", servletURI( " + getServletUri() + " )" );
-        sb.append( " ]" );
-        return sb.toString();
-    }
-
-}
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * 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.
+ *
+ * $Header:$
+ */
+
+package org.apache.beehive.netui.tools.testrecorder.shared.config;
+
+import org.apache.beehive.netui.tools.testrecorder.shared.util.StringHelper;
+import org.apache.beehive.netui.tools.testrecorder.shared.Logger;
+
+import java.io.File;
+
+/**
+ * Client side object defining webapp access.
+ * User: ozzy
+ */
+public class WebappDefinition {
+
+    private static final Logger log = Logger.getInstance( 
WebappDefinition.class );
+
+    private String name;
+    private String description;
+    // includes leading slash
+    private String contextRoot;
+    private String servletUri;
+
+    public WebappDefinition( String name, String description, String 
contextRoot, String servletUri) {
+        this.name = name;
+        this.description = description;
+        this.contextRoot = contextRoot;
+        this.servletUri = contextRoot + "/" + servletUri;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public String getContextRoot() {
+        return contextRoot;
+    }
+
+    public String getServletUri() {
+        return servletUri;
+    }
+
+    public String toString() {
+        StringBuffer sb = new StringBuffer( 256 );
+        sb.append( "[ " );
+        sb.append( "name( " + getName() + " )" );
+        sb.append( ", description( " + getDescription() + " )" );
+        sb.append( ", contextRoot( " + getContextRoot() + " )" );
+        sb.append( ", servletURI( " + getServletUri() + " )" );
+        sb.append( " ]" );
+        return sb.toString();
+    }
+
+}

Modified: 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/config/Webapps.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/config/Webapps.java
  (original)
+++ 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/config/Webapps.java
  Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/util/DateHelper.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/util/DateHelper.java
 (original)
+++ 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/util/DateHelper.java
 Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/util/StringHelper.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/util/StringHelper.java
       (original)
+++ 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/util/StringHelper.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/xmlbeans/XMLHelper.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/xmlbeans/XMLHelper.java
      (original)
+++ 
incubator/beehive/trunk/netui/test/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/xmlbeans/XMLHelper.java
      Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/testRecorderQA/org/apache/beehive/netui/tools/testrecorder/qa/PropertiesHelper.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/testRecorderQA/org/apache/beehive/netui/tools/testrecorder/qa/PropertiesHelper.java
  (original)
+++ 
incubator/beehive/trunk/netui/test/src/testRecorderQA/org/apache/beehive/netui/tools/testrecorder/qa/PropertiesHelper.java
  Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/testRecorderQA/org/apache/beehive/netui/tools/testrecorder/qa/SchemaTest.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/testRecorderQA/org/apache/beehive/netui/tools/testrecorder/qa/SchemaTest.java
        (original)
+++ 
incubator/beehive/trunk/netui/test/src/testRecorderQA/org/apache/beehive/netui/tools/testrecorder/qa/SchemaTest.java
        Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/testRecorderQA/org/apache/beehive/netui/tools/testrecorder/qa/SessionSchemaTest.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/testRecorderQA/org/apache/beehive/netui/tools/testrecorder/qa/SessionSchemaTest.java
 (original)
+++ 
incubator/beehive/trunk/netui/test/src/testRecorderQA/org/apache/beehive/netui/tools/testrecorder/qa/SessionSchemaTest.java
 Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/testRecorderQA/org/apache/beehive/netui/tools/testrecorder/qa/TRTestCase.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/testRecorderQA/org/apache/beehive/netui/tools/testrecorder/qa/TRTestCase.java
        (original)
+++ 
incubator/beehive/trunk/netui/test/src/testRecorderQA/org/apache/beehive/netui/tools/testrecorder/qa/TRTestCase.java
        Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/tools/org/apache/beehive/netui/tools/ant/junit/JUnitTask.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/tools/org/apache/beehive/netui/tools/ant/junit/JUnitTask.java
        (original)
+++ 
incubator/beehive/trunk/netui/test/src/tools/org/apache/beehive/netui/tools/ant/junit/JUnitTask.java
        Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/tools/org/apache/beehive/netui/tools/ant/junit/JUnitTestFilter.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/tools/org/apache/beehive/netui/tools/ant/junit/JUnitTestFilter.java
  (original)
+++ 
incubator/beehive/trunk/netui/test/src/tools/org/apache/beehive/netui/tools/ant/junit/JUnitTestFilter.java
  Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/tools/org/apache/beehive/netui/tools/ant/junit/JarClassLoader.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/tools/org/apache/beehive/netui/tools/ant/junit/JarClassLoader.java
   (original)
+++ 
incubator/beehive/trunk/netui/test/src/tools/org/apache/beehive/netui/tools/ant/junit/JarClassLoader.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/src/tools/org/apache/beehive/netui/tools/ant/junit/PropertyFileTestFilter.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/src/tools/org/apache/beehive/netui/tools/ant/junit/PropertyFileTestFilter.java
   (original)
+++ 
incubator/beehive/trunk/netui/test/src/tools/org/apache/beehive/netui/tools/ant/junit/PropertyFileTestFilter.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/databinding/SimpleJavaBean.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/databinding/SimpleJavaBean.java
  (original)
+++ 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/databinding/SimpleJavaBean.java
  Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/databinding/callMethod/CallMethodType.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/databinding/callMethod/CallMethodType.java
       (original)
+++ 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/databinding/callMethod/CallMethodType.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/databinding/type/Person.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/databinding/type/Person.java
     (original)
+++ 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/databinding/type/Person.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/formBean/test1/FormBeanTest1Form1.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/formBean/test1/FormBeanTest1Form1.java
   (original)
+++ 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/formBean/test1/FormBeanTest1Form1.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/formBean/test1/Struts1.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/formBean/test1/Struts1.java
      (original)
+++ 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/formBean/test1/Struts1.java
      Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/formBean/test1/Struts2.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/formBean/test1/Struts2.java
      (original)
+++ 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/formBean/test1/Struts2.java
      Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/formBean/test2/FormBeanTest2Form1.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/formBean/test2/FormBeanTest2Form1.java
   (original)
+++ 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/formBean/test2/FormBeanTest2Form1.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/formBean/test2/Struts1.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/formBean/test2/Struts1.java
      (original)
+++ 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/formBean/test2/Struts1.java
      Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/formBean/test2/Struts2.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/formBean/test2/Struts2.java
      (original)
+++ 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/formBean/test2/Struts2.java
      Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/formBean/test2/Struts3.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/formBean/test2/Struts3.java
      (original)
+++ 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/formBean/test2/Struts3.java
      Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/formBean/test2/Struts4.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/formBean/test2/Struts4.java
      (original)
+++ 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/formBean/test2/Struts4.java
      Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/interOp/test1/Struts1.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/interOp/test1/Struts1.java
       (original)
+++ 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/interOp/test1/Struts1.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miscJpf/test13/LoadStruts.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miscJpf/test13/LoadStruts.java
   (original)
+++ 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miscJpf/test13/LoadStruts.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miscJpf/test13/SubmitAction.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miscJpf/test13/SubmitAction.java
 (original)
+++ 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miscJpf/test13/SubmitAction.java
 Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miscJpf/test13/SubmitForm.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miscJpf/test13/SubmitForm.java
   (original)
+++ 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miscJpf/test13/SubmitForm.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/mockportal/MockPortalTag.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/mockportal/MockPortalTag.java
    (original)
+++ 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/mockportal/MockPortalTag.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/mockportal/MockPortalUrlRewriter.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/mockportal/MockPortalUrlRewriter.java
    (original)
+++ 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/mockportal/MockPortalUrlRewriter.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/mockportal/MockPortletTag.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/mockportal/MockPortletTag.java
   (original)
+++ 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/mockportal/MockPortletTag.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/models/UserInfo.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/models/UserInfo.java
     (original)
+++ 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/models/UserInfo.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/moduleConfigLocator/Locator1.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/moduleConfigLocator/Locator1.java
        (original)
+++ 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/moduleConfigLocator/Locator1.java
        Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/moduleConfigLocator/Locator2.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/moduleConfigLocator/Locator2.java
        (original)
+++ 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/moduleConfigLocator/Locator2.java
        Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/org/apache/beehive/netui/test/databinding/beans/b40682.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/org/apache/beehive/netui/test/databinding/beans/b40682.java
      (original)
+++ 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/org/apache/beehive/netui/test/databinding/beans/b40682.java
      Mon Aug 30 15:07:46 2004
@@ -90,4 +90,4 @@
         }
     }
 
-}
\ No newline at end of file
+}

Modified: 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/qaUtil/PageLogger.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/qaUtil/PageLogger.java
   (original)
+++ 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/qaUtil/PageLogger.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/shared/ClassA.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/shared/ClassA.java
       (original)
+++ 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/shared/ClassA.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/shared/ClassB.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/shared/ClassB.java
       (original)
+++ 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/shared/ClassB.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/shared/ClassC.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/shared/ClassC.java
       (original)
+++ 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/shared/ClassC.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/shared/ClassD.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/shared/ClassD.java
       (original)
+++ 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/shared/ClassD.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/shared/ClassE.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/shared/ClassE.java
       (original)
+++ 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/shared/ClassE.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/shared/ClassF.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/shared/ClassF.java
       (original)
+++ 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/shared/ClassF.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/shared/ClassG.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/shared/ClassG.java
       (original)
+++ 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/shared/ClassG.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/shared/ClassH.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/shared/ClassH.java
       (original)
+++ 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/shared/ClassH.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/shared/ClassI.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/shared/ClassI.java
       (original)
+++ 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/shared/ClassI.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/shared/ClassJ.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/shared/ClassJ.java
       (original)
+++ 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/shared/ClassJ.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/shared/ClassK.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/shared/ClassK.java
       (original)
+++ 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/shared/ClassK.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/shared/FormA.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/shared/FormA.java
        (original)
+++ 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/shared/FormA.java
        Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/shared/QaTrace.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/shared/QaTrace.java
      (original)
+++ 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/shared/QaTrace.java
      Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/strutsMerge/test4/Form2.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/strutsMerge/test4/Form2.java
     (original)
+++ 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/strutsMerge/test4/Form2.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/strutsMerge/test7/Form1.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/strutsMerge/test7/Form1.java
     (original)
+++ 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/strutsMerge/test7/Form1.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/strutsMerge/test7/Struts1.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/strutsMerge/test7/Struts1.java
   (original)
+++ 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/strutsMerge/test7/Struts1.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/util/SerializableTestClass.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/util/SerializableTestClass.java
  (original)
+++ 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/util/SerializableTestClass.java
  Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/controls/methodTest/MethodTest.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/controls/methodTest/MethodTest.java
      (original)
+++ 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/controls/methodTest/MethodTest.java
      Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/controls/PortfolioControl.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/controls/PortfolioControl.java
  (original)
+++ 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/controls/PortfolioControl.java
  Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,4 +24,4 @@
 public interface PortfolioControl
 {
     public Portfolio getPortfolio();
-}
\ No newline at end of file
+}

Modified: 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miscJpf/bug21124/Ctrl.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miscJpf/bug21124/Ctrl.java
   (original)
+++ 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miscJpf/bug21124/Ctrl.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/lifecycle/TestControl.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/lifecycle/TestControl.java
      (original)
+++ 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/lifecycle/TestControl.java
      Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/webapps/jsf/jsfWeb/WEB-INF/src/faces/facesSmoke/ActionListen.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/jsf/jsfWeb/WEB-INF/src/faces/facesSmoke/ActionListen.java
        (original)
+++ 
incubator/beehive/trunk/netui/test/webapps/jsf/jsfWeb/WEB-INF/src/faces/facesSmoke/ActionListen.java
        Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/webapps/jsf/jsfWeb/WEB-INF/src/faces/facesSmoke/Backing.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/jsf/jsfWeb/WEB-INF/src/faces/facesSmoke/Backing.java
     (original)
+++ 
incubator/beehive/trunk/netui/test/webapps/jsf/jsfWeb/WEB-INF/src/faces/facesSmoke/Backing.java
     Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/webapps/jsf/jsfWeb/WEB-INF/src/faces/facesSmoke/CustomRenderBacking.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/jsf/jsfWeb/WEB-INF/src/faces/facesSmoke/CustomRenderBacking.java
 (original)
+++ 
incubator/beehive/trunk/netui/test/webapps/jsf/jsfWeb/WEB-INF/src/faces/facesSmoke/CustomRenderBacking.java
 Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/webapps/jsf/jsfWeb/WEB-INF/src/faces/facesSmoke/TestValidator.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/jsf/jsfWeb/WEB-INF/src/faces/facesSmoke/TestValidator.java
       (original)
+++ 
incubator/beehive/trunk/netui/test/webapps/jsf/jsfWeb/WEB-INF/src/faces/facesSmoke/TestValidator.java
       Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/webapps/jsf/jsfWeb/WEB-INF/src/faces/facesSmoke/ValueChangeListen.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/jsf/jsfWeb/WEB-INF/src/faces/facesSmoke/ValueChangeListen.java
   (original)
+++ 
incubator/beehive/trunk/netui/test/webapps/jsf/jsfWeb/WEB-INF/src/faces/facesSmoke/ValueChangeListen.java
   Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/webapps/jsf/jsfWeb/backingControls/TestControl.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/jsf/jsfWeb/backingControls/TestControl.java
      (original)
+++ 
incubator/beehive/trunk/netui/test/webapps/jsf/jsfWeb/backingControls/TestControl.java
      Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: 
incubator/beehive/trunk/netui/test/webapps/webappBuild-test/webappBuild-test/WEB-INF/src/org/acme/beans/ProductBean.java
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/webappBuild-test/webappBuild-test/WEB-INF/src/org/acme/beans/ProductBean.java
    (original)
+++ 
incubator/beehive/trunk/netui/test/webapps/webappBuild-test/webappBuild-test/WEB-INF/src/org/acme/beans/ProductBean.java
    Mon Aug 30 15:07:46 2004
@@ -1,6 +1,5 @@
 /*
- * B E A   S Y S T E M S
- * Copyright 2002-2004  BEA Systems, Inc.
+ * Copyright 2004 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.