Author: rich
Date: Mon Apr 11 23:42:11 2005
New Revision: 161025
URL: http://svn.apache.org/viewcvs?view=rev&rev=161025
Log:
Removed the use of Java5 features within NetUI code, and changed it to compile
with source/target="1.4". Also got a preliminary version of the Page Flow
compiler running under JDK1.4.
tests passed: drt in trunk, and bvt under netui (WinXP)
BB: self (linux)
Added:
incubator/beehive/trunk/netui/external/xdoclet/xjavadoc-1.1.jar (with
props)
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/AnnotationToXML.java
(with props)
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/typesystem/declaration/AnnotationInstance.java
- copied, changed from r159330,
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/typesystem/declaration/AnnotationMirror.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/typesystem/type/TypeInstance.java
- copied, changed from r159330,
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/typesystem/type/TypeMirror.java
incubator/beehive/trunk/netui/src/compiler-core/schema/processed-annotations/
incubator/beehive/trunk/netui/src/compiler-core/schema/processed-annotations/config.xsdconfig
(with props)
incubator/beehive/trunk/netui/src/compiler-core/schema/processed-annotations/processed-annotations.xsd
(with props)
incubator/beehive/trunk/netui/src/compiler-xdoclet/org/apache/beehive/netui/compiler/xdoclet/tools/
- copied from r159967,
incubator/beehive/trunk/netui/src/compiler-xdoclet/org/apache/beehive/netui/tasks/
incubator/beehive/trunk/netui/src/compiler-xdoclet/org/apache/beehive/netui/compiler/xdoclet/tools/AnnotationsToXDoclet.java
(with props)
incubator/beehive/trunk/netui/src/compiler-xdoclet/org/apache/beehive/netui/compiler/xdoclet/tools/AnnotationsToXDocletTask.java
(with props)
incubator/beehive/trunk/netui/src/compiler-xdoclet/org/apache/beehive/netui/compiler/xdoclet/tools/SourceCopy.java
- copied, changed from r161013,
incubator/beehive/trunk/netui/src/compiler-xdoclet/org/apache/beehive/netui/tasks/SourceCopy.java
incubator/beehive/trunk/netui/src/compiler-xdoclet/org/apache/beehive/netui/compiler/xdoclet/typesystem/impl/declaration/AnnotationInstanceImpl.java
- copied, changed from r159330,
incubator/beehive/trunk/netui/src/compiler-xdoclet/org/apache/beehive/netui/compiler/xdoclet/typesystem/impl/declaration/AnnotationMirrorImpl.java
incubator/beehive/trunk/netui/src/compiler-xdoclet/org/apache/beehive/netui/compiler/xdoclet/typesystem/impl/type/TypeInstanceImpl.java
- copied, changed from r159330,
incubator/beehive/trunk/netui/src/compiler-xdoclet/org/apache/beehive/netui/compiler/xdoclet/typesystem/impl/type/TypeMirrorImpl.java
incubator/beehive/trunk/netui/src/compiler-xdoclet/pageflow-webapp-build-xdoclet.xml
- copied, changed from r160182,
incubator/beehive/trunk/netui/src/compiler-xdoclet/pageflow-webapp-build.xml
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/typesystem/impl/declaration/AnnotationInstanceImpl.java
- copied, changed from r159330,
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/typesystem/impl/declaration/AnnotationMirrorImpl.java
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/typesystem/impl/type/TypeInstanceImpl.java
- copied, changed from r159330,
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/typesystem/impl/type/TypeMirrorImpl.java
incubator/beehive/trunk/netui/src/pageflow-jdk14/
incubator/beehive/trunk/netui/src/pageflow-jdk14/build.xml (with props)
incubator/beehive/trunk/netui/src/pageflow-jdk14/org/
incubator/beehive/trunk/netui/src/pageflow-jdk14/org/apache/
incubator/beehive/trunk/netui/src/pageflow-jdk14/org/apache/beehive/
incubator/beehive/trunk/netui/src/pageflow-jdk14/org/apache/beehive/netui/
incubator/beehive/trunk/netui/src/pageflow-jdk14/org/apache/beehive/netui/pageflow/
incubator/beehive/trunk/netui/src/pageflow-jdk14/org/apache/beehive/netui/pageflow/internal/
incubator/beehive/trunk/netui/src/pageflow-jdk14/org/apache/beehive/netui/pageflow/internal/JavaControlUtils.java
(with props)
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/AnnotationReader.java
(with props)
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/RuntimeAnnotationReader.java
(with props)
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urls/URLType.java
(with props)
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/internal/
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/internal/concurrent/
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/internal/concurrent/CondVar.java
(with props)
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/internal/concurrent/Condition.java
(with props)
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/internal/concurrent/FIFOWaitQueue.java
(with props)
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/internal/concurrent/InternalConcurrentHashMap.java
(with props)
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/internal/concurrent/Lock.java
(with props)
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/internal/concurrent/NanoTimer.java
(with props)
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/internal/concurrent/README.txt
(with props)
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/internal/concurrent/ReentrantLock.java
(with props)
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/internal/concurrent/TimeUnit.java
(with props)
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/internal/concurrent/Utils.java
(with props)
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/internal/concurrent/WaitQueue.java
(with props)
incubator/beehive/trunk/netui/test/webapps/drt/bvt-jdk14.xml (with props)
Removed:
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/typesystem/declaration/AnnotationMirror.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/typesystem/type/TypeMirror.java
incubator/beehive/trunk/netui/src/compiler-xdoclet/org/apache/beehive/netui/compiler/xdoclet/typesystem/impl/declaration/AnnotationMirrorImpl.java
incubator/beehive/trunk/netui/src/compiler-xdoclet/org/apache/beehive/netui/compiler/xdoclet/typesystem/impl/type/TypeMirrorImpl.java
incubator/beehive/trunk/netui/src/compiler-xdoclet/org/apache/beehive/netui/tasks/
incubator/beehive/trunk/netui/src/compiler-xdoclet/pageflow-webapp-build.properties
incubator/beehive/trunk/netui/src/compiler-xdoclet/pageflow-webapp-build.xml
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/typesystem/impl/declaration/AnnotationMirrorImpl.java
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/typesystem/impl/type/TypeMirrorImpl.java
Modified:
incubator/beehive/trunk/beehive-imports.xml
incubator/beehive/trunk/external/beehive-antext/beehive-antext.jar
incubator/beehive/trunk/external/beehive-antext/build.xml
incubator/beehive/trunk/netui/ant/netui.properties
incubator/beehive/trunk/netui/ant/xmlBean.xml
incubator/beehive/trunk/netui/src/bootstrap/build.xml
incubator/beehive/trunk/netui/src/compiler-core/build.xml
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/AnnotationGrammar.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/AnnotationMemberType.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/BaseChecker.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/CompilerUtils.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/Diagnostics.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/FacesBackingGenerator.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/FlowControllerChecker.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/FlowControllerGenerator.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/FlowControllerInfo.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/FormBeanChecker.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/JpfLanguageConstants.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/MergedControllerAnnotation.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/PageFlowChecker.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/RuntimeVersionChecker.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/SharedFlowChecker.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/diagnostics.properties
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/genmodel/DefaultValidatorRuleFactory.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/genmodel/GenActionModel.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/genmodel/GenActionOutputModel.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/genmodel/GenExceptionModel.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/genmodel/GenForwardModel.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/genmodel/GenMessageBundleModel.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/genmodel/GenSimpleActionModel.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/genmodel/GenStrutsApp.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/genmodel/GenValidationModel.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/genmodel/ValidatorRuleFactory.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/AbsolutePathType.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ActionGrammar.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/BaseValidationRuleGrammar.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/BundleNameType.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/CatchGrammar.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/DelegatingType.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/EnumType.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ExceptionHandlerGrammar.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ExternalPathOrActionType.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ForwardGrammar.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ForwardToExternalPathType.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/JavaIdentifierType.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/LocaleRulesGrammar.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/MemberFieldType.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/MemberMethodType.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/MessageBundleGrammar.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/MessageKeyType.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/RaiseActionGrammar.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/RolesAllowedType.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/SharedFlowRefGrammar.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/SimpleActionGrammar.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/TilesDefinitionsConfigsType.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/TypeNameType.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/UniqueValueType.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidActionType.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidatablePropertyGrammar.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidateRangeGrammar.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidateRequiredGrammar.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidateTypeGrammar.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidationMessageArgsGrammar.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/WebappPathOrActionType.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/WebappPathType.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/WritableFieldType.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/model/ActionModel.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/model/StrutsApp.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/model/validation/ValidatableField.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/processor/PageFlowAnnotationProcessor.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/processor/SilentDiagnostics.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/typesystem/declaration/Declaration.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/typesystem/declaration/FieldDeclaration.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/typesystem/declaration/MethodDeclaration.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/typesystem/declaration/ParameterDeclaration.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/typesystem/type/ArrayType.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/typesystem/type/DeclaredType.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/typesystem/type/PrimitiveType.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/typesystem/type/ReferenceType.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/typesystem/type/VoidType.java
incubator/beehive/trunk/netui/src/compiler-xdoclet/build.xml
incubator/beehive/trunk/netui/src/compiler-xdoclet/org/apache/beehive/netui/compiler/xdoclet/typesystem/impl/WrapperFactory.java
incubator/beehive/trunk/netui/src/compiler-xdoclet/org/apache/beehive/netui/compiler/xdoclet/typesystem/impl/declaration/AnnotationTypeDeclarationImpl.java
incubator/beehive/trunk/netui/src/compiler-xdoclet/org/apache/beehive/netui/compiler/xdoclet/typesystem/impl/declaration/AnnotationTypeElementDeclarationImpl.java
incubator/beehive/trunk/netui/src/compiler-xdoclet/org/apache/beehive/netui/compiler/xdoclet/typesystem/impl/declaration/ClassDeclarationImpl.java
incubator/beehive/trunk/netui/src/compiler-xdoclet/org/apache/beehive/netui/compiler/xdoclet/typesystem/impl/declaration/DeclarationImpl.java
incubator/beehive/trunk/netui/src/compiler-xdoclet/org/apache/beehive/netui/compiler/xdoclet/typesystem/impl/declaration/FieldDeclarationImpl.java
incubator/beehive/trunk/netui/src/compiler-xdoclet/org/apache/beehive/netui/compiler/xdoclet/typesystem/impl/declaration/MethodDeclarationImpl.java
incubator/beehive/trunk/netui/src/compiler-xdoclet/org/apache/beehive/netui/compiler/xdoclet/typesystem/impl/declaration/ParameterDeclarationImpl.java
incubator/beehive/trunk/netui/src/compiler-xdoclet/org/apache/beehive/netui/compiler/xdoclet/typesystem/impl/declaration/TypeDeclarationImpl.java
incubator/beehive/trunk/netui/src/compiler-xdoclet/org/apache/beehive/netui/compiler/xdoclet/typesystem/impl/env/AnnotationProcessorEnvironmentImpl.java
incubator/beehive/trunk/netui/src/compiler-xdoclet/org/apache/beehive/netui/compiler/xdoclet/typesystem/impl/env/SourcePositionImpl.java
incubator/beehive/trunk/netui/src/compiler-xdoclet/org/apache/beehive/netui/compiler/xdoclet/typesystem/impl/type/ArrayTypeImpl.java
incubator/beehive/trunk/netui/src/compiler-xdoclet/org/apache/beehive/netui/compiler/xdoclet/typesystem/impl/type/DeclaredTypeImpl.java
incubator/beehive/trunk/netui/src/compiler-xdoclet/org/apache/beehive/netui/compiler/xdoclet/typesystem/impl/type/PrimitiveTypeImpl.java
incubator/beehive/trunk/netui/src/compiler-xdoclet/org/apache/beehive/netui/compiler/xdoclet/typesystem/impl/type/ReferenceTypeImpl.java
incubator/beehive/trunk/netui/src/compiler-xdoclet/org/apache/beehive/netui/compiler/xdoclet/typesystem/impl/type/VoidTypeImpl.java
incubator/beehive/trunk/netui/src/compiler-xdoclet/org/apache/beehive/netui/xdoclet/NetuiDocletTask.java
incubator/beehive/trunk/netui/src/compiler-xdoclet/org/apache/beehive/netui/xdoclet/XDocletCompilerUtils.java
incubator/beehive/trunk/netui/src/compiler/build.xml
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/typesystem/impl/WrapperFactory.java
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/typesystem/impl/declaration/DeclarationImpl.java
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/typesystem/impl/declaration/FieldDeclarationImpl.java
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/typesystem/impl/declaration/MethodDeclarationImpl.java
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/typesystem/impl/declaration/ParameterDeclarationImpl.java
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/typesystem/impl/type/ArrayTypeImpl.java
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/typesystem/impl/type/DeclaredTypeImpl.java
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/typesystem/impl/type/PrimitiveTypeImpl.java
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/typesystem/impl/type/ReferenceTypeImpl.java
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/typesystem/impl/type/VoidTypeImpl.java
incubator/beehive/trunk/netui/src/pageflow/build.xml
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/AutoRegisterActionServlet.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/DefaultServletContainerAdapter.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ExpressionMessage.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/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/PageFlowActionServlet.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/PageFlowFacesFilter.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/PageFlowPageFilter.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/ProcessPopulate.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/SecurityProtocol.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ServletContainerAdapter.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/config/PageFlowActionFormBean.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/faces/internal/BackingClassMethodBinding.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/handler/HandlerConfig.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/InterceptorChain.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/InterceptorConfig.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/InterceptorContext.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/Interceptors.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/action/ActionInterceptorContext.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/action/SimpleActionInterceptor.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/action/internal/ActionInterceptors.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/request/RequestInterceptorContext.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/CachedFacesBackingInfo.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/CachedSharedFlowRefInfo.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultActionForwardHandler.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/DefaultReloadableClassHandler.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultURLRewriter.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/FacesBackingBeanFactory.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/LegacySettings.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/PageFlowExceptionHandler.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/PageFlowRequestWrapper.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/PageFlowServiceProvider.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/requeststate/NameService.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/OldURLRewriterWrapper.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/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/xmlhttprequest/XmlHttpRequestServlet.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/ImplicitObjectUtil.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/ParsedExpression.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/ParseUtils.java
incubator/beehive/trunk/netui/src/scoping/build.xml
incubator/beehive/trunk/netui/src/tags-databinding/build.xml
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/DataGridConfig.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/DataGridStateFactory.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/filter/FilterModel.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/filter/FilterOperationHint.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/filter/FilterTypeHint.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/pager/PagerModel.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/CellModel.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/DataGridTagModel.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/PagerRenderer.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/StyleModel.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/sort/SortDirection.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/sort/SortModel.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/config/DefaultDataGridConfig.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/config/DefaultDataGridStateCodec.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/config/DefaultDataGridURLBuilder.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/SortedCellDecorator.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/pager/FirstPreviousNextLastPagerRenderer.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/pager/PreviousNextPagerRenderer.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/sql/SQLSupport.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/util/JspFunctions.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/cellrepeater/CellRepeater.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractCell.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractHtmlTableCell.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/Header.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/HeaderCell.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Rows.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/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/pad/PadContext.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/xml/SerializeXML.java
incubator/beehive/trunk/netui/src/tags-html/build.xml
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/AbstractSimpleTag.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/ErrorHandling.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/html/AnchorBase.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/Button.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/ConfigurePopup.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/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/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/Hidden.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/PopupSupport.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/RewriteURL.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/TextBox.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/internal/PageFlowTagUtils.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/internal/ReturnActionViewRenderer.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/CoreScriptFeature.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/IScriptReporter.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptContainer.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptPlacement.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptRequestState.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/StringBuilderRenderAppender.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TBodyTag.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TFootTag.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/THeadTag.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/tree/ServletTreeRenderer.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/TreeCRI.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeRenderer.java
incubator/beehive/trunk/netui/src/tags-template/build.xml
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/testRecorder/build.xml
incubator/beehive/trunk/netui/src/tomcat-webapp/5x/org/apache/beehive/netui/tomcat/TomcatServletContainerAdapter.java
incubator/beehive/trunk/netui/src/util/build.xml
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urls/FreezableMutableURI.java
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urls/MutableURI.java
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urls/URLRewriter.java
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urls/URLRewriterService.java
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urltemplates/URLTemplate.java
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urltemplates/URLTemplateDescriptor.java
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urltemplates/URLTemplates.java
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urltemplates/URLTemplatesFactory.java
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/DiscoveryUtils.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/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/classloader/BouncyClassLoader.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/type/TypeUtils.java
incubator/beehive/trunk/netui/test/src/junitTests/build.xml
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/core/urls/MutableURITest.java
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/core/urltemplates/URLTemplateTest.java
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/core/urltemplates/URLTemplatesTest.java
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/DataGridTestUtil.java
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/DefaultSortTest.java
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/FilterCodecTest.java
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/FilterModelTest.java
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/FilterURLTest.java
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/PagerCodecTest.java
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/PagerModelTest.java
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/PagerRendererTest.java
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/SQLSupportTest.java
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/SortCodecTest.java
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/SortModelTest.java
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/servlet/ServletHandler.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/iterator/ResultSetTestSupport.java
incubator/beehive/trunk/netui/test/src/testRecorderQA/build.xml
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/actionInterceptors/BaseInterceptor.java
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/actionInterceptors/interruptChain/Controller.jpf
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/exceptionMessages/Controller.jpf
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/handlePageException/Controller.jpf
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/handlers/Controller.jpf
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/pageFlowUtils/validation.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/preventDoubleSubmit/Controller.jpf
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/tiles/Controller.jpf
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/updateFormFromNested/Controller.jpf
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/inheritance/super1/Super1.jpf
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfPageInput/PageInputController.jpf
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/encoding/Controller.jpf
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/template/xhtml/Controller.jpf
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tiles/pf/Controller.jpf
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tiles/pf/nested/Controller.jpf
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/addExpressionMessages/Controller.jpf
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/argExpressions/Controller.jpf
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/custom/Controller.jpf
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/declarativeValidation/Controller.jpf
Modified: incubator/beehive/trunk/beehive-imports.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/beehive-imports.xml?view=diff&r1=161024&r2=161025
==============================================================================
--- incubator/beehive/trunk/beehive-imports.xml (original)
+++ incubator/beehive/trunk/beehive-imports.xml Mon Apr 11 23:42:11 2005
@@ -286,6 +286,7 @@
<macrodef name="build-xbean">
<attribute name="schemaDir"/>
<attribute name="classgenDir"/>
+ <attribute name="source" default="1.5"/>
<attribute name="xbeanBuildClasspathRef"
default="xbean.dependency.path"/>
<sequential>
<property name="curr.classpath" refid="@{xbeanBuildClasspathRef}"/>
@@ -299,6 +300,7 @@
schema="@{schemaDir}"
classgendir="@{classgenDir}"
failonerror="true"
+ source="@{source}"
classpathref="@{xbeanBuildClasspathRef}"/>
</sequential>
</macrodef>
@@ -313,14 +315,15 @@
<!--
======================================================================== -->
<!-- Verify JDK version
-->
<!--
======================================================================== -->
+ <property name="required.jdk.version" value="1.5"/>
<condition property="jdk.version.okay">
- <contains string="${java.version}" substring="1.5"/>
+ <contains string="${java.version}"
substring="${required.jdk.version}"/>
</condition>
<fail unless="jdk.version.okay">
Newer JDK required.
-Building the project requires JDK 1.5.
+Building the project requires JDK ${required.jdk.version}
You are currently using the following JDK:
@@ -332,7 +335,7 @@
http://java.sun.com/
-If you have JDK 1.5 installed on your system, you may need to
+If you have JDK ${required.jdk.version} installed on your system, you may need
to
adjust your JAVA_HOME environment variable.
</fail>
Modified: incubator/beehive/trunk/external/beehive-antext/beehive-antext.jar
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/external/beehive-antext/beehive-antext.jar?view=diff&r1=161024&r2=161025
==============================================================================
Binary files - no diff available.
Modified: incubator/beehive/trunk/external/beehive-antext/build.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/external/beehive-antext/build.xml?view=diff&r1=161024&r2=161025
==============================================================================
--- incubator/beehive/trunk/external/beehive-antext/build.xml (original)
+++ incubator/beehive/trunk/external/beehive-antext/build.xml Mon Apr 11
23:42:11 2005
@@ -16,7 +16,8 @@
failonerror="true"
verbose="false"
deprecation="true"
- classpathref="build.classpath" />
+ classpathref="build.classpath"
+ source="1.4" />
<jar basedir="${build.dir}" destfile="${beehive-antext.jar}"/>
</target>
Modified: incubator/beehive/trunk/netui/ant/netui.properties
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/ant/netui.properties?view=diff&r1=161024&r2=161025
==============================================================================
--- incubator/beehive/trunk/netui/ant/netui.properties (original)
+++ incubator/beehive/trunk/netui/ant/netui.properties Mon Apr 11 23:42:11 2005
@@ -38,6 +38,12 @@
catalina.5x.jar=${tomcat.lib.dir}/5x/catalina.jar
coyote.5x.jar=${tomcat.lib.dir}/5x/tomcat-coyote.jar
+#
+# XDoclet properties. These JARs are used by the Page Flow XDoclet compiler
(compiler-xdoclet module)
+#
+xdoclet.jar=${external.dir}/xdoclet/xdoclet-1.2b4.jar
+xjavadoc.jar=${external.dir}/xdoclet/xjavadoc-1.1.jar
+
#
---------------------------------------------------------------------------------
#
# NetUI build artifact JAR and resource names
@@ -77,7 +83,8 @@
compile.debug=true
compile.deprecation=off
compile.optimize=off
-compile.source=1.5
+compile.source=1.4
+compile.target=1.4
# runtime and compiler versions
pageflow.version.runtime=3
Modified: incubator/beehive/trunk/netui/ant/xmlBean.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/ant/xmlBean.xml?view=diff&r1=161024&r2=161025
==============================================================================
--- incubator/beehive/trunk/netui/ant/xmlBean.xml (original)
+++ incubator/beehive/trunk/netui/ant/xmlBean.xml Mon Apr 11 23:42:11 2005
@@ -26,7 +26,7 @@
</target>
<target name="xbean_schema_compiler" unless="xbean.uptodate">
- <build-xbean schemaDir="${xsd.root.dir}"
classgenDir="${class.output.dir}"/>
+ <build-xbean schemaDir="${xsd.root.dir}"
classgenDir="${class.output.dir}" source="1.4"/>
</target>
</project>
Added: incubator/beehive/trunk/netui/external/xdoclet/xjavadoc-1.1.jar
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/external/xdoclet/xjavadoc-1.1.jar?view=auto&rev=161025
==============================================================================
Binary file - no diff available.
Propchange: incubator/beehive/trunk/netui/external/xdoclet/xjavadoc-1.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: incubator/beehive/trunk/netui/src/bootstrap/build.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/bootstrap/build.xml?view=diff&r1=161024&r2=161025
==============================================================================
--- incubator/beehive/trunk/netui/src/bootstrap/build.xml (original)
+++ incubator/beehive/trunk/netui/src/bootstrap/build.xml Mon Apr 11 23:42:11
2005
@@ -29,7 +29,8 @@
debug="${compile.debug}"
deprecation="${compile.deprecation}"
optimize="${compile.optimize}"
- source="${compile.source}">
+ source="${compile.source}"
+ target="${compile.target}">
<include name="**/*.java"/>
</javac>
Modified: incubator/beehive/trunk/netui/src/compiler-core/build.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler-core/build.xml?view=diff&r1=161024&r2=161025
==============================================================================
--- incubator/beehive/trunk/netui/src/compiler-core/build.xml (original)
+++ incubator/beehive/trunk/netui/src/compiler-core/build.xml Mon Apr 11
23:42:11 2005
@@ -29,8 +29,8 @@
debug="${compile.debug}"
deprecation="${compile.deprecation}"
optimize="${compile.optimize}"
- source="1.4"
- target="1.4">
+ source="${compile.source}"
+ target="${compile.target}">
<include name="**/*.java"/>
</javac>
@@ -56,6 +56,14 @@
<property name="class.output.dir" value="${module.classes.dir}"/>
<property name="xbean.inputs"
value="${module.dir}/schema/struts-validator/*.xsd*"/>
<property name="xbean.output"
value="${module.classes.dir}/org/apache/beehive/netui/compiler/model/schema/validator11/ValidatorDocument.class"/>
+ </ant>
+
+ <!-- run the XMLBean compiler for the processed-annotations schema -->
+ <ant antfile="${netui.ant.dir}/xmlBean.xml">
+ <property name="xsd.root.dir"
value="${module.dir}/schema/processed-annotations"/>
+ <property name="class.output.dir" value="${module.classes.dir}"/>
+ <property name="xbean.inputs"
value="${module.dir}/schema/processed-annotations/*.xsd*"/>
+ <property name="xbean.output"
value="${module.classes.dir}/org/apache/beehive/netui/compiler/schema/annotations/ProcessedAnnotationsDocument.class"/>
</ant>
</target>
Modified:
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/AnnotationGrammar.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/AnnotationGrammar.java?view=diff&r1=161024&r2=161025
==============================================================================
---
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/AnnotationGrammar.java
(original)
+++
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/AnnotationGrammar.java
Mon Apr 11 23:42:11 2005
@@ -17,7 +17,7 @@
*/
package org.apache.beehive.netui.compiler;
-import
org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationMirror;
+import
org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationInstance;
import
org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationTypeElementDeclaration;
import
org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationValue;
import org.apache.beehive.netui.compiler.typesystem.declaration.Declaration;
@@ -75,13 +75,13 @@
return _diagnostics;
}
- public final Object check( AnnotationMirror annotation, AnnotationMirror[]
parentAnnotations,
+ public final Object check( AnnotationInstance annotation,
AnnotationInstance[] parentAnnotations,
MemberDeclaration classMember )
{
return check( annotation, parentAnnotations, classMember, -1 );
}
- public final Object check( AnnotationMirror annotation, AnnotationMirror[]
parentAnnotations,
+ public final Object check( AnnotationInstance annotation,
AnnotationInstance[] parentAnnotations,
MemberDeclaration classMember, int
annotationArrayIndex )
{
if ( ! beginCheck( annotation, parentAnnotations, classMember ) )
return null;
@@ -90,9 +90,9 @@
HashSet wasPresent = new HashSet();
HashMap checkResults = new HashMap();
- if ( parentAnnotations == null ) parentAnnotations = new
AnnotationMirror[0];
+ if ( parentAnnotations == null ) parentAnnotations = new
AnnotationInstance[0];
int oldLen = parentAnnotations.length;
- AnnotationMirror[] parentsIncludingMe = new AnnotationMirror[oldLen +
1];
+ AnnotationInstance[] parentsIncludingMe = new
AnnotationInstance[oldLen + 1];
System.arraycopy( parentAnnotations, 0, parentsIncludingMe, 0, oldLen
);
parentsIncludingMe[oldLen] = annotation;
@@ -114,7 +114,7 @@
if ( childGrammar != null ) // it will be non-null unless
there are other, more basic, errors
{
Object result =
- childGrammar.check( ( AnnotationMirror )
value.getValue(), parentsIncludingMe, classMember );
+ childGrammar.check( ( AnnotationInstance )
value.getValue(), parentsIncludingMe, classMember );
if ( result != null )
{
@@ -132,7 +132,7 @@
for ( int j = 0; j < annotations.size(); ++j )
{
- AnnotationMirror ann = ( AnnotationMirror )
annotations.get( j );
+ AnnotationInstance ann = ( AnnotationInstance )
annotations.get( j );
arrayGrammar.check( ann, parentsIncludingMe,
classMember, j );
}
}
@@ -153,7 +153,7 @@
return endCheck( annotation, parentAnnotations, classMember,
wasPresent, checkResults );
}
- public final boolean beginCheck( AnnotationMirror annotation,
AnnotationMirror[] parentAnnotations,
+ public final boolean beginCheck( AnnotationInstance annotation,
AnnotationInstance[] parentAnnotations,
MemberDeclaration classMember )
{
//
@@ -219,27 +219,27 @@
getDiagnostics().addError( element, key, new Object[]{ arg1, arg2,
arg3 } );
}
- protected void addError( AnnotationMirror element, String key )
+ protected void addError( AnnotationInstance element, String key )
{
getDiagnostics().addError( element, key, null );
}
- protected void addError( AnnotationMirror element, String key, Object[]
args )
+ protected void addError( AnnotationInstance element, String key, Object[]
args )
{
getDiagnostics().addErrorArrayArgs( element, key, args );
}
- protected void addError( AnnotationMirror element, String key, Object arg1
)
+ protected void addError( AnnotationInstance element, String key, Object
arg1 )
{
getDiagnostics().addError( element, key, new Object[]{ arg1 } );
}
- protected void addError( AnnotationMirror element, String key, Object
arg1, Object arg2 )
+ protected void addError( AnnotationInstance element, String key, Object
arg1, Object arg2 )
{
getDiagnostics().addError( element, key, new Object[]{ arg1, arg2 } );
}
- protected void addError( AnnotationMirror element, String key, Object
arg1, Object arg2, Object arg3 )
+ protected void addError( AnnotationInstance element, String key, Object
arg1, Object arg2, Object arg3 )
{
getDiagnostics().addError( element, key, new Object[]{ arg1, arg2,
arg3 } );
}
@@ -294,27 +294,27 @@
getDiagnostics().addWarning( element, key, new Object[]{ arg1, arg2,
arg3 } );
}
- protected void addWarning( AnnotationMirror element, String key )
+ protected void addWarning( AnnotationInstance element, String key )
{
getDiagnostics().addWarning( element, key, null );
}
- protected void addWarning( AnnotationMirror element, String key, Object[]
args )
+ protected void addWarning( AnnotationInstance element, String key,
Object[] args )
{
getDiagnostics().addWarningArrayArgs( element, key, args );
}
- protected void addWarning( AnnotationMirror element, String key, Object
arg1 )
+ protected void addWarning( AnnotationInstance element, String key, Object
arg1 )
{
getDiagnostics().addWarning( element, key, new Object[]{ arg1 } );
}
- protected void addWarning( AnnotationMirror element, String key, Object
arg1, Object arg2 )
+ protected void addWarning( AnnotationInstance element, String key, Object
arg1, Object arg2 )
{
getDiagnostics().addWarning( element, key, new Object[]{ arg1, arg2 }
);
}
- protected void addWarning( AnnotationMirror element, String key, Object
arg1, Object arg2, Object arg3 )
+ protected void addWarning( AnnotationInstance element, String key, Object
arg1, Object arg2, Object arg3 )
{
getDiagnostics().addWarning( element, key, new Object[]{ arg1, arg2,
arg3 } );
}
@@ -322,7 +322,7 @@
/**
* @return a result (any Object) that will be passed back to the parent
checker. May be null</code>.
*/
- public final Object endCheck( AnnotationMirror annotation,
AnnotationMirror[] parentAnnotations,
+ public final Object endCheck( AnnotationInstance annotation,
AnnotationInstance[] parentAnnotations,
MemberDeclaration classMember, Set
wasPresent, Map checkResults )
{
//
@@ -410,7 +410,7 @@
return onEndCheck( annotation, parentAnnotations, classMember,
checkResults ); // for derived classes
}
- protected boolean onBeginCheck( AnnotationMirror annotation,
AnnotationMirror[] parentAnnotations,
+ protected boolean onBeginCheck( AnnotationInstance annotation,
AnnotationInstance[] parentAnnotations,
MemberDeclaration classMember )
{
return true;
@@ -420,14 +420,14 @@
* @param checkResults map of member-name (String) -> result-from-checking
(Object)
* @return a result (any Object) that will be passed back to the parent
checker. May be null</code>.
*/
- protected Object onEndCheck( AnnotationMirror annotation,
AnnotationMirror[] parentAnnotations,
+ protected Object onEndCheck( AnnotationInstance annotation,
AnnotationInstance[] parentAnnotations,
MemberDeclaration classMember, Map
checkResults )
{
return null;
}
protected void onCheckMember( AnnotationTypeElementDeclaration memberDecl,
AnnotationValue member,
- AnnotationMirror annotation,
AnnotationMirror[] parentAnnotations,
+ AnnotationInstance annotation,
AnnotationInstance[] parentAnnotations,
MemberDeclaration classMember )
{
}
Modified:
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/AnnotationMemberType.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/AnnotationMemberType.java?view=diff&r1=161024&r2=161025
==============================================================================
---
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/AnnotationMemberType.java
(original)
+++
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/AnnotationMemberType.java
Mon Apr 11 23:42:11 2005
@@ -17,7 +17,7 @@
*/
package org.apache.beehive.netui.compiler;
-import
org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationMirror;
+import
org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationInstance;
import
org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationTypeElementDeclaration;
import
org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationValue;
import org.apache.beehive.netui.compiler.typesystem.declaration.Declaration;
@@ -43,7 +43,7 @@
* @return a result (any Object) that will be passed back to the parent
checker. May be null</code>.
*/
public final Object check( AnnotationTypeElementDeclaration valueDecl,
AnnotationValue value,
- AnnotationMirror[] parentAnnotations,
MemberDeclaration classMember,
+ AnnotationInstance[] parentAnnotations,
MemberDeclaration classMember,
int annotationArrayIndex )
{
//
@@ -62,7 +62,7 @@
* @return a result (any Object) that will be passed back to the parent
checker. May be null</code>.
*/
public Object onCheck( AnnotationTypeElementDeclaration valueDecl,
AnnotationValue member,
- AnnotationMirror[] parentAnnotations,
MemberDeclaration classMember,
+ AnnotationInstance[] parentAnnotations,
MemberDeclaration classMember,
int annotationArrayIndex )
{
return null;
@@ -118,27 +118,27 @@
_parentGrammar.addError( element, key, new Object[]{ arg1, arg2, arg3
} );
}
- protected void addError( AnnotationMirror element, String key )
+ protected void addError( AnnotationInstance element, String key )
{
_parentGrammar.addError( element, key, null );
}
- protected void addError( AnnotationMirror element, String key, Object[]
args )
+ protected void addError( AnnotationInstance element, String key, Object[]
args )
{
_parentGrammar.addError( element, key, args );
}
- protected void addError( AnnotationMirror element, String key, Object arg1
)
+ protected void addError( AnnotationInstance element, String key, Object
arg1 )
{
_parentGrammar.addError( element, key, new Object[]{ arg1 } );
}
- protected void addError( AnnotationMirror element, String key, Object
arg1, Object arg2 )
+ protected void addError( AnnotationInstance element, String key, Object
arg1, Object arg2 )
{
_parentGrammar.addError( element, key, new Object[]{ arg1, arg2 } );
}
- protected void addError( AnnotationMirror element, String key, Object
arg1, Object arg2, Object arg3 )
+ protected void addError( AnnotationInstance element, String key, Object
arg1, Object arg2, Object arg3 )
{
_parentGrammar.addError( element, key, new Object[]{ arg1, arg2, arg3
} );
}
@@ -193,27 +193,27 @@
_parentGrammar.addWarning( element, key, new Object[]{ arg1, arg2,
arg3 } );
}
- protected void addWarning( AnnotationMirror element, String key )
+ protected void addWarning( AnnotationInstance element, String key )
{
_parentGrammar.addWarning( element, key, null );
}
- protected void addWarning( AnnotationMirror element, String key, Object[]
args )
+ protected void addWarning( AnnotationInstance element, String key,
Object[] args )
{
_parentGrammar.addWarning( element, key, args );
}
- protected void addWarning( AnnotationMirror element, String key, Object
arg1 )
+ protected void addWarning( AnnotationInstance element, String key, Object
arg1 )
{
_parentGrammar.addWarning( element, key, new Object[]{ arg1 } );
}
- protected void addWarning( AnnotationMirror element, String key, Object
arg1, Object arg2 )
+ protected void addWarning( AnnotationInstance element, String key, Object
arg1, Object arg2 )
{
_parentGrammar.addWarning( element, key, new Object[]{ arg1, arg2 } );
}
- protected void addWarning( AnnotationMirror element, String key, Object
arg1, Object arg2, Object arg3 )
+ protected void addWarning( AnnotationInstance element, String key, Object
arg1, Object arg2, Object arg3 )
{
_parentGrammar.addWarning( element, key, new Object[]{ arg1, arg2,
arg3 } );
}
Added:
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/AnnotationToXML.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/AnnotationToXML.java?view=auto&rev=161025
==============================================================================
---
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/AnnotationToXML.java
(added)
+++
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/AnnotationToXML.java
Mon Apr 11 23:42:11 2005
@@ -0,0 +1,120 @@
+/*
+ * Copyright 2004 The Apache 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;
+
+import
org.apache.beehive.netui.compiler.typesystem.declaration.TypeDeclaration;
+import
org.apache.beehive.netui.compiler.typesystem.declaration.MemberDeclaration;
+import
org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationInstance;
+import
org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationTypeElementDeclaration;
+import
org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationValue;
+import org.apache.beehive.netui.compiler.typesystem.type.TypeInstance;
+import
org.apache.beehive.netui.compiler.schema.annotations.ProcessedAnnotationsDocument;
+import org.apache.beehive.netui.compiler.schema.annotations.AnnotatedElement;
+import
org.apache.beehive.netui.compiler.schema.annotations.ProcessedAnnotation;
+import
org.apache.beehive.netui.compiler.schema.annotations.AnnotationAttribute;
+import org.apache.beehive.netui.compiler.model.StrutsApp;
+import org.apache.xmlbeans.XmlOptions;
+
+import java.util.Map;
+import java.util.Iterator;
+import java.util.List;
+import java.io.File;
+import java.io.IOException;
+
+public class AnnotationToXML
+{
+ private static final String ANNOTATIONS_FILE_PREFIX = "jpf-annotations";
+
+ private ProcessedAnnotationsDocument _doc;
+ private TypeDeclaration _typeDecl;
+
+ public AnnotationToXML( TypeDeclaration typeDecl )
+ {
+ _doc = ProcessedAnnotationsDocument.Factory.newInstance();
+ _typeDecl = typeDecl;
+ ProcessedAnnotationsDocument.ProcessedAnnotations pa =
_doc.addNewProcessedAnnotations();
+ pa.setTypeName( typeDecl.getQualifiedName() );
+ }
+
+ public void include( MemberDeclaration memberDecl, AnnotationInstance
annotation )
+ {
+ AnnotatedElement element =
_doc.getProcessedAnnotations().addNewAnnotatedElement();
+ String name = memberDecl instanceof TypeDeclaration
+ ? ( ( TypeDeclaration ) memberDecl ).getQualifiedName()
+ : memberDecl.getSimpleName();
+ element.setElementName( name );
+ ProcessedAnnotation xmlAnnotation = element.addNewAnnotation();
+ include( xmlAnnotation, annotation );
+ }
+
+ private void include( ProcessedAnnotation xmlAnnotation,
AnnotationInstance annotation )
+ {
+ xmlAnnotation.setAnnotationName(
annotation.getAnnotationType().getAnnotationTypeDeclaration().getQualifiedName()
);
+
+ Map elementValues = annotation.getElementValues();
+
+ for ( Iterator i = elementValues.entrySet().iterator(); i.hasNext(); )
+ {
+ Map.Entry entry = ( Map.Entry ) i.next();
+ AnnotationTypeElementDeclaration elementDecl = (
AnnotationTypeElementDeclaration ) entry.getKey();
+ AnnotationValue annotationValue = ( AnnotationValue )
entry.getValue();
+
+ String name = elementDecl.getSimpleName();
+ Object value = annotationValue.getValue();
+ AnnotationAttribute xmlAttr =
xmlAnnotation.addNewAnnotationAttribute();
+ xmlAttr.setAttributeName( name );
+
+ if ( value instanceof List )
+ {
+ for ( Iterator j = ( ( List ) value ).iterator(); j.hasNext();
)
+ {
+ Object o = j.next();
+ assert o instanceof AnnotationValue :
o.getClass().getName();
+ Object listVal = ( ( AnnotationValue ) o ).getValue();
+
+ // we only handle lists of annotations at the moment
+ assert listVal instanceof AnnotationInstance :
listVal.getClass().getName();
+ include( xmlAttr.addNewAnnotationValue(), (
AnnotationInstance ) listVal );
+ }
+ }
+ else
+ {
+ // we only support a few types at the moment
+ assert value instanceof TypeInstance || value instanceof
String : value.getClass().getName();
+ xmlAttr.setStringValue1( value.toString() );
+ }
+ }
+ }
+
+ public void writeXml( File webappRoot, Diagnostics diagnostics )
+ {
+ String typeName = _typeDecl.getQualifiedName();
+ String outputFilePath = webappRoot + StrutsApp.getOutputFileURI(
ANNOTATIONS_FILE_PREFIX, typeName, false );
+
+ try
+ {
+ XmlOptions options = new XmlOptions();
+ options.setSavePrettyPrint();
+ _doc.save( new File( outputFilePath ), options );
+ }
+ catch ( IOException e )
+ {
+ diagnostics.addError( _typeDecl, "error.could-not-generate",
outputFilePath, e.getMessage() );
+ }
+ }
+}
Propchange:
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/AnnotationToXML.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/BaseChecker.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/BaseChecker.java?view=diff&r1=161024&r2=161025
==============================================================================
---
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/BaseChecker.java
(original)
+++
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/BaseChecker.java
Mon Apr 11 23:42:11 2005
@@ -57,7 +57,7 @@
try
{
- webappRoot = StrutsApp.getWebappRootFromJpf( sourceFile );
+ webappRoot = StrutsApp.getWebappRootFromSourceFile( sourceFile );
}
catch ( NoWebInfDirectoryException e )
{
Modified:
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/CompilerUtils.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/CompilerUtils.java?view=diff&r1=161024&r2=161025
==============================================================================
---
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/CompilerUtils.java
(original)
+++
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/CompilerUtils.java
Mon Apr 11 23:42:11 2005
@@ -28,7 +28,7 @@
import org.apache.beehive.netui.compiler.typesystem.type.DeclaredType;
import org.apache.beehive.netui.compiler.typesystem.type.InterfaceType;
import org.apache.beehive.netui.compiler.typesystem.type.ReferenceType;
-import org.apache.beehive.netui.compiler.typesystem.type.TypeMirror;
+import org.apache.beehive.netui.compiler.typesystem.type.TypeInstance;
import org.apache.beehive.netui.compiler.typesystem.type.TypeVariable;
import org.apache.beehive.netui.compiler.typesystem.util.SourcePosition;
@@ -47,22 +47,26 @@
public class CompilerUtils
implements JpfLanguageConstants
{
- public static boolean isJpfAnnotation( AnnotationMirror annotation, String
unqualifiedName )
+ public static boolean isJpfAnnotation( AnnotationInstance annotation,
String unqualifiedName )
{
String annotationName = getDeclaration( annotation.getAnnotationType()
).getQualifiedName();
return annotationName.equals( ANNOTATION_QUALIFIER + unqualifiedName );
}
- public static AnnotationMirror getAnnotation( Declaration element, String
unqualifiedName )
+ public static AnnotationInstance getAnnotation( Declaration element,
String unqualifiedName )
{
- AnnotationMirror[] annotations = element.getAnnotationMirrors();
- unqualifiedName = ANNOTATION_QUALIFIER + unqualifiedName;
+ return getAnnotationFullyQualified( element, ANNOTATION_QUALIFIER +
unqualifiedName );
+ }
+
+ public static AnnotationInstance getAnnotationFullyQualified( Declaration
element, String fullyQualifiedName )
+ {
+ AnnotationInstance[] annotations = element.getAnnotationInstances();
for ( int ii = 0; ii < annotations.length; ii++ )
{
- AnnotationMirror i = annotations[ii];
+ AnnotationInstance i = annotations[ii];
String iName = getDeclaration( i.getAnnotationType()
).getQualifiedName();
- if ( unqualifiedName.equals( iName ) ) return i;
+ if ( fullyQualifiedName.equals( iName ) ) return i;
}
return null;
@@ -70,7 +74,7 @@
public static AnnotationValue getAnnotationValue( Declaration element,
String annotationName, String valueName )
{
- AnnotationMirror ann = getAnnotation( element, annotationName );
+ AnnotationInstance ann = getAnnotation( element, annotationName );
return ann != null ? getAnnotationValue( ann, valueName, true ) : null;
}
@@ -81,7 +85,7 @@
private static AnnotationValue assertAnnotationValue( Declaration element,
String annotationName, String valueName,
boolean
defaultIsNull )
{
- AnnotationMirror ann = getAnnotation( element, annotationName );
+ AnnotationInstance ann = getAnnotation( element, annotationName );
if ( ann == null )
{
@@ -99,7 +103,7 @@
return ( String ) getValue( element, annotationName, memberName,
defaultIsNull );
}
- public static AnnotationValue getAnnotationValue( AnnotationMirror
annotation, String memberName,
+ public static AnnotationValue getAnnotationValue( AnnotationInstance
annotation, String memberName,
boolean defaultIsNull )
{
Map valuesPresent = annotation.getElementValues();
@@ -150,25 +154,25 @@
return value != null ? ( Boolean ) value.getValue() : null;
}
- public static String getString( AnnotationMirror annotation, String
memberName, boolean defaultIsNull )
+ public static String getString( AnnotationInstance annotation, String
memberName, boolean defaultIsNull )
{
AnnotationValue value = getAnnotationValue( annotation, memberName,
defaultIsNull );
return value != null ? ( String ) value.getValue() : ( defaultIsNull ?
null : "" );
}
- public static TypeMirror getTypeMirror( AnnotationMirror annotation,
String memberName, boolean defaultIsNull )
+ public static TypeInstance getTypeInstance( AnnotationInstance annotation,
String memberName, boolean defaultIsNull )
{
AnnotationValue value = getAnnotationValue( annotation, memberName,
defaultIsNull );
- return value != null ? ( TypeMirror ) value.getValue() : null;
+ return value != null ? ( TypeInstance ) value.getValue() : null;
}
- public static String getEnumFieldName( AnnotationMirror annotation, String
memberName, boolean defaultIsNull )
+ public static String getEnumFieldName( AnnotationInstance annotation,
String memberName, boolean defaultIsNull )
{
AnnotationValue value = getAnnotationValue( annotation, memberName,
defaultIsNull );
return value != null ? getEnumFieldName( value ) : null;
}
- public static List getStringArray( AnnotationMirror annotation, String
memberName, boolean defaultIsNull )
+ public static List getStringArray( AnnotationInstance annotation, String
memberName, boolean defaultIsNull )
{
AnnotationValue value = getAnnotationValue( annotation, memberName,
defaultIsNull );
if ( value == null ) return null;
@@ -177,7 +181,7 @@
return ret;
}
- public static DeclaredType getDeclaredType( AnnotationMirror annotation,
String memberName, boolean defaultIsNull )
+ public static DeclaredType getDeclaredType( AnnotationInstance annotation,
String memberName, boolean defaultIsNull )
{
AnnotationValue value = getAnnotationValue( annotation, memberName,
defaultIsNull );
@@ -188,37 +192,37 @@
return value != null ? ( DeclaredType ) value.getValue() : null;
}
- public static ReferenceType getReferenceType( AnnotationMirror annotation,
String memberName, boolean defaultIsNull )
+ public static ReferenceType getReferenceType( AnnotationInstance
annotation, String memberName, boolean defaultIsNull )
{
AnnotationValue value = getAnnotationValue( annotation, memberName,
defaultIsNull );
return value != null ? ( ReferenceType ) value.getValue() : null;
}
- public static Integer getInteger( AnnotationMirror annotation, String
memberName, boolean defaultIsNull )
+ public static Integer getInteger( AnnotationInstance annotation, String
memberName, boolean defaultIsNull )
{
AnnotationValue value = getAnnotationValue( annotation, memberName,
defaultIsNull );
return value != null ? ( Integer ) value.getValue() : ( defaultIsNull
? null : new Integer( 0 ) );
}
- public static Long getLong( AnnotationMirror annotation, String
memberName, boolean defaultIsNull )
+ public static Long getLong( AnnotationInstance annotation, String
memberName, boolean defaultIsNull )
{
AnnotationValue value = getAnnotationValue( annotation, memberName,
defaultIsNull );
return value != null ? ( Long ) value.getValue() : ( defaultIsNull ?
null : new Long( 0 ) );
}
- public static Float getFloat( AnnotationMirror annotation, String
memberName, boolean defaultIsNull )
+ public static Float getFloat( AnnotationInstance annotation, String
memberName, boolean defaultIsNull )
{
AnnotationValue value = getAnnotationValue( annotation, memberName,
defaultIsNull );
return value != null ? ( Float ) value.getValue() : ( defaultIsNull ?
null : new Float( 0 ) );
}
- public static Double getDouble( AnnotationMirror annotation, String
memberName, boolean defaultIsNull )
+ public static Double getDouble( AnnotationInstance annotation, String
memberName, boolean defaultIsNull )
{
AnnotationValue value = getAnnotationValue( annotation, memberName,
defaultIsNull );
return value != null ? ( Double ) value.getValue() : ( defaultIsNull ?
null : new Double( 0 ) );
}
- public static Boolean getBoolean( AnnotationMirror annotation, String
memberName, boolean defaultIsNull )
+ public static Boolean getBoolean( AnnotationInstance annotation, String
memberName, boolean defaultIsNull )
{
AnnotationValue value = getAnnotationValue( annotation, memberName,
defaultIsNull );
return value != null ? ( Boolean ) value.getValue() : ( defaultIsNull
? null : Boolean.FALSE );
@@ -240,7 +244,7 @@
return ret;
}
- public static List getAnnotationArray( AnnotationMirror annotation, String
memberName,
+ public static List getAnnotationArray( AnnotationInstance annotation,
String memberName,
boolean
defaultIsNull )
{
AnnotationValue value = getAnnotationValue( annotation, memberName,
defaultIsNull );
@@ -277,20 +281,20 @@
}
}
- public static String getQualifiedName( AnnotationMirror annotation )
+ public static String getQualifiedName( AnnotationInstance annotation )
{
return getDeclaration( annotation.getAnnotationType()
).getQualifiedName();
}
- public static String getSimpleName( AnnotationMirror annotation )
+ public static String getSimpleName( AnnotationInstance annotation )
{
return getDeclaration( annotation.getAnnotationType()
).getSimpleName();
}
- public static AnnotationMirror getAnnotation( AnnotationMirror annotation,
String memberName, boolean defaultIsNull )
+ public static AnnotationInstance getAnnotation( AnnotationInstance
annotation, String memberName, boolean defaultIsNull )
{
AnnotationValue value = getAnnotationValue( annotation, memberName,
defaultIsNull );
- return value != null ? ( AnnotationMirror ) value.getValue() : null;
+ return value != null ? ( AnnotationInstance ) value.getValue() : null;
}
public static MethodDeclaration getClassMethod( TypeDeclaration jclass,
String methodName, String desiredAnnotation )
@@ -435,7 +439,7 @@
ClassType superclass = jclass.getSuperclass();
- if ( superclass != null )
+ if ( superclass != null && ! getDeclaration( superclass
).getQualifiedName().startsWith( "java.lang." ) )
{
getClassMethods( getDeclaration( superclass ), desiredAnnotation,
true, results );
}
@@ -538,7 +542,7 @@
}
}
- public static boolean isAssignableFrom( String className, TypeMirror type,
AnnotationProcessorEnvironment env )
+ public static boolean isAssignableFrom( String className, TypeInstance
type, AnnotationProcessorEnvironment env )
{
if ( ! ( type instanceof DeclaredType ) ) return false;
return isAssignableFrom( className, getDeclaration( ( DeclaredType )
type ), env );
@@ -567,13 +571,13 @@
return false;
}
- public static boolean isAssignableFrom( TypeMirror base, TypeDeclaration
cl )
+ public static boolean isAssignableFrom( TypeInstance base, TypeDeclaration
cl )
{
if ( ! ( base instanceof DeclaredType ) ) return false;
return isAssignableFrom( getDeclaration( ( DeclaredType ) base ), cl );
}
- public static boolean isAssignableFrom( TypeDeclaration base, TypeMirror
cl )
+ public static boolean isAssignableFrom( TypeDeclaration base, TypeInstance
cl )
{
if ( ! ( cl instanceof DeclaredType ) ) return false;
return isAssignableFrom( base, getDeclaration( ( DeclaredType ) cl ) );
@@ -585,7 +589,7 @@
return isAssignableFrom( base, cl );
}
- public static boolean isOfClass( TypeMirror type, String className,
AnnotationProcessorEnvironment env )
+ public static boolean isOfClass( TypeInstance type, String className,
AnnotationProcessorEnvironment env )
{
if ( ! ( type instanceof DeclaredType ) ) return false;
return typesAreEqual( getDeclaration( ( DeclaredType ) type ),
env.getTypeDeclaration( className ) );
@@ -771,7 +775,7 @@
*/
}
- public static boolean annotationsAreEqual( AnnotationMirror a1,
AnnotationMirror a2, boolean allowExactDuplicates,
+ public static boolean annotationsAreEqual( AnnotationInstance a1,
AnnotationInstance a2, boolean allowExactDuplicates,
AnnotationProcessorEnvironment
env )
{
assert a1 != null;
@@ -820,10 +824,10 @@
Object o1 = ( ( AnnotationValue ) j1.next() ).getValue();
Object o2 = ( ( AnnotationValue ) j2.next() ).getValue();
- if ( o1 instanceof AnnotationMirror )
+ if ( o1 instanceof AnnotationInstance )
{
- if ( ! ( o2 instanceof AnnotationMirror ) ) return
false;
- if ( ! annotationsAreEqual( ( AnnotationMirror ) o1, (
AnnotationMirror ) o2, allowExactDuplicates, env ) ) return false;
+ if ( ! ( o2 instanceof AnnotationInstance ) ) return
false;
+ if ( ! annotationsAreEqual( ( AnnotationInstance ) o1,
( AnnotationInstance ) o2, allowExactDuplicates, env ) ) return false;
}
else
{
@@ -831,10 +835,10 @@
}
}
}
- else if ( val1 instanceof AnnotationMirror )
+ else if ( val1 instanceof AnnotationInstance )
{
- if ( ! ( val2 instanceof AnnotationMirror ) ) return false;
- if ( ! annotationsAreEqual( ( AnnotationMirror ) val1, (
AnnotationMirror ) val2, allowExactDuplicates, env ) ) return false;
+ if ( ! ( val2 instanceof AnnotationInstance ) ) return false;
+ if ( ! annotationsAreEqual( ( AnnotationInstance ) val1, (
AnnotationInstance ) val2, allowExactDuplicates, env ) ) return false;
}
else if ( ! val1.equals( val2 ) )
{
@@ -929,8 +933,7 @@
return null;
}
- public static Collection getBeanProperties( ClassDeclaration type,
-
boolean getInheritedProperties )
+ public static Collection getBeanProperties( ClassDeclaration type, boolean
getInheritedProperties )
{
MethodDeclaration[] methods = getInheritedProperties ?
getClassMethods( type, null ) : type.getMethods();
ArrayList ret = new ArrayList();
@@ -979,7 +982,7 @@
private static final FieldDeclaration[] FIELDS = new
FieldDeclaration[0];
private static final MethodDeclaration[] METHODS = new
MethodDeclaration[0];
private static final TypeDeclaration[] NESTED_TYPES = new
TypeDeclaration[0];
- private static final AnnotationMirror[] ANNOTATIONS = new
AnnotationMirror[0];
+ private static final AnnotationInstance[] ANNOTATIONS = new
AnnotationInstance[0];
public PackageDeclaration getPackage()
{
@@ -994,7 +997,7 @@
/*
public Collection getFormalTypeParameters()
{
- return Collections.emptyList();
+ return Collections.EMPTY_LIST;
}
*/
@@ -1028,7 +1031,7 @@
throw new IllegalStateException( "not implemented " );
}
- public AnnotationMirror[] getAnnotationMirrors()
+ public AnnotationInstance[] getAnnotationInstances()
{
return ANNOTATIONS;
}
@@ -1042,7 +1045,7 @@
public Set getModifiers()
{
- return Collections.emptySet();
+ return Collections.EMPTY_SET;
}
public String getSimpleName()
@@ -1095,9 +1098,9 @@
return false;
}
- public static TypeMirror getArrayBaseType( ArrayType arrayType )
+ public static TypeInstance getArrayBaseType( ArrayType arrayType )
{
- TypeMirror baseType = arrayType;
+ TypeInstance baseType = arrayType;
do
{
@@ -1131,7 +1134,7 @@
}
}
- public static TypeMirror getGenericBoundsType( TypeMirror type )
+ public static TypeInstance getGenericBoundsType( TypeInstance type )
{
if ( type instanceof TypeVariable )
{
@@ -1169,7 +1172,7 @@
{
try
{
- retVal = new File( StrutsApp.getWebappRootFromJpf(
sourceFile ) + File.separator
+ retVal = new File( StrutsApp.getWebappRootFromSourceFile(
sourceFile ) + File.separator
+ WEBINF_SRC_DIR + File.separator
+ jpfParentRelativePath
+ File.separator + relativePath );
}
@@ -1210,7 +1213,7 @@
}
}
- return alternateRoot != null ? new File( alternateRoot ) :
StrutsApp.getWebappRootFromJpf( jpfSourceFile );
+ return alternateRoot != null ? new File( alternateRoot ) :
StrutsApp.getWebappRootFromSourceFile( jpfSourceFile );
}
catch ( NoWebInfDirectoryException e )
{
