[webbeans-commits] Webbeans SVN: r111 - in ri/trunk: webbeans-api/src/main/java/javax/webbeans and 15 other directories.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Sun Sep 28 07:39:25 EDT 2008
Author: pete.muir at jboss.org
Date: 2008-09-28 07:39:24 -0400 (Sun, 28 Sep 2008)
New Revision: 111
Added:
ri/trunk/webbeans-api/src/main/java/javax/webbeans/AfterTransactionCompletion.java
ri/trunk/webbeans-api/src/main/java/javax/webbeans/AfterTransactionFailure.java
ri/trunk/webbeans-api/src/main/java/javax/webbeans/AfterTransactionSuccess.java
ri/trunk/webbeans-api/src/main/java/javax/webbeans/AnnotationLiteral.java
ri/trunk/webbeans-api/src/main/java/javax/webbeans/BeforeTransactionCompletion.java
ri/trunk/webbeans-api/src/main/java/javax/webbeans/ContextNotActiveException.java
ri/trunk/webbeans-api/src/main/java/javax/webbeans/Destructor.java
ri/trunk/webbeans-api/src/main/java/javax/webbeans/Interceptor.java
ri/trunk/webbeans-api/src/main/java/javax/webbeans/NonBinding.java
ri/trunk/webbeans-api/src/main/java/javax/webbeans/manager/
ri/trunk/webbeans-api/src/main/java/javax/webbeans/manager/Bean.java
ri/trunk/webbeans-api/src/main/java/javax/webbeans/manager/Context.java
ri/trunk/webbeans-api/src/main/java/javax/webbeans/manager/Conversation.java
ri/trunk/webbeans-api/src/main/java/javax/webbeans/manager/Manager.java
ri/trunk/webbeans-api/src/main/java/javax/webbeans/manager/Observer.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/BeanImpl.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/ApplicationScopedAnnotationLiteral.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/ConversationScopedAnnotationLiteral.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/CurrentAnnotationLiteral.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/DependentAnnotationLiteral.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/NamedAnnotationLiteral.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/ProductionAnnotationLiteral.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/RequestScopedAnnotationLiteral.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/StandardAnnotationLiteral.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/AnimalStereotypeAnnotationLiteral.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/AnotherDeploymentTypeAnnotationLiteral.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/AsynchronousAnnotationLiteral.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/FishStereotypeAnnotationLiteral.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/HornedAnimalDeploymentTypeAnnotationLiteral.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/HornedMamalStereotypeAnnotationLiteral.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/RiverFishStereotypeAnnotationLiteral.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/SynchronousAnnotationLiteral.java
Removed:
ri/trunk/webbeans-api/src/main/java/javax/webbeans/BoundTo.java
ri/trunk/webbeans-api/src/main/java/javax/webbeans/Component.java
ri/trunk/webbeans-api/src/main/java/javax/webbeans/ComponentInstance.java
ri/trunk/webbeans-api/src/main/java/javax/webbeans/Container.java
ri/trunk/webbeans-api/src/main/java/javax/webbeans/Context.java
ri/trunk/webbeans-api/src/main/java/javax/webbeans/ContextNotActive.java
ri/trunk/webbeans-api/src/main/java/javax/webbeans/Conversation.java
ri/trunk/webbeans-api/src/main/java/javax/webbeans/Destroys.java
ri/trunk/webbeans-api/src/main/java/javax/webbeans/DynamicBinding.java
ri/trunk/webbeans-api/src/main/java/javax/webbeans/Observer.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ComponentInstanceImpl.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ContainerImpl.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/ApplicationScopedBinding.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/ConversationScopedBinding.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/CurrentBinding.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/DependentBinding.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/NamedBinding.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/ProductionBinding.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/RequestScopedBinding.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/StandardBinding.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/AnimalStereotypeBinding.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/AnotherDeploymentTypeBinding.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/AsynchronousBinding.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/FishStereotypeBinding.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/HornedAnimalDeploymentTypeBinding.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/HornedMamalStereotypeBinding.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/RiverFishStereotypeBinding.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/SynchronousBinding.java
Modified:
ri/trunk/webbeans-api/.settings/org.eclipse.jdt.core.prefs
ri/trunk/webbeans-api/src/main/java/javax/webbeans/ApplicationScoped.java
ri/trunk/webbeans-api/src/main/java/javax/webbeans/BindingType.java
ri/trunk/webbeans-api/src/main/java/javax/webbeans/ConversationScoped.java
ri/trunk/webbeans-api/src/main/java/javax/webbeans/Decorates.java
ri/trunk/webbeans-api/src/main/java/javax/webbeans/Decorator.java
ri/trunk/webbeans-api/src/main/java/javax/webbeans/Dependent.java
ri/trunk/webbeans-api/src/main/java/javax/webbeans/DeploymentType.java
ri/trunk/webbeans-api/src/main/java/javax/webbeans/Disposes.java
ri/trunk/webbeans-api/src/main/java/javax/webbeans/IfExists.java
ri/trunk/webbeans-api/src/main/java/javax/webbeans/Initializer.java
ri/trunk/webbeans-api/src/main/java/javax/webbeans/InterceptorBindingType.java
ri/trunk/webbeans-api/src/main/java/javax/webbeans/Named.java
ri/trunk/webbeans-api/src/main/java/javax/webbeans/New.java
ri/trunk/webbeans-api/src/main/java/javax/webbeans/Observable.java
ri/trunk/webbeans-api/src/main/java/javax/webbeans/Observes.java
ri/trunk/webbeans-api/src/main/java/javax/webbeans/Produces.java
ri/trunk/webbeans-api/src/main/java/javax/webbeans/Production.java
ri/trunk/webbeans-api/src/main/java/javax/webbeans/RequestScoped.java
ri/trunk/webbeans-api/src/main/java/javax/webbeans/ScopeType.java
ri/trunk/webbeans-api/src/main/java/javax/webbeans/SessionScoped.java
ri/trunk/webbeans-api/src/main/java/javax/webbeans/Specializes.java
ri/trunk/webbeans-api/src/main/java/javax/webbeans/Standard.java
ri/trunk/webbeans-api/src/main/java/javax/webbeans/Stereotype.java
ri/trunk/webbeans-api/src/main/java/javax/webbeans/TypeLiteral.java
ri/trunk/webbeans-ri/.settings/org.eclipse.jdt.core.prefs
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/BasicContext.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/deployment/DeploymentStrategy.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/DeferredEventNotification.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventBus.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventImpl.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/ObserverImpl.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/ObserverMethod.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/init/Initialization.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/ComponentConstructor.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/Element.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/EnterpriseConstructor.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/InjectableMethod.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/JMSConstructor.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/MethodConstructor.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/Parameter.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/SimpleConstructor.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/Unit.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/AbstractClassComponentModel.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/AbstractComponentModel.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/AbstractEnterpriseComponentModel.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/EnterpriseComponentModel.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/EventComponentModel.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/MergedStereotypesModel.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/ProducerExpressionComponent.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/ProducerMethodComponentModel.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/RemoteComponentModel.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/SimpleComponentModel.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/WebBeansFilter.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/AbstractModelTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/BindingTypeTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ConstructorModelTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ContainerTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/DeploymentStrategyTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EnterpriseComponentModelTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ObserverTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerExpressionComponentModelTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerMethodComponentModelTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/RemoteComponentModelTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ScopeTypeTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleComponentModelTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Baboon.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Cheetah.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Cougar.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Elephant.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Orangutan.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/TameOrangutan.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/broken/Chimpanzee.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/broken/Gibbon.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockContainerImpl.java
Log:
Lots of API changes due to spec updates from Gavin, update impl to match
Modified: ri/trunk/webbeans-api/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- ri/trunk/webbeans-api/.settings/org.eclipse.jdt.core.prefs 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-api/.settings/org.eclipse.jdt.core.prefs 2008-09-28 11:39:24 UTC (rev 111)
@@ -1,259 +1,259 @@
-#Thu Jul 03 14:28:27 BST 2008
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+#Sun Sep 28 12:11:04 BST 2008
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.brace_position_for_switch=next_line
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=next_line
+org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.tabulation.size=3
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.tabulation.char=space
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.brace_position_for_block=next_line
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=next_line
org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=next_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=80
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=3
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=next_line
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.lineSplit=80
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=next_line
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=next_line
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-eclipse.preferences.version=1
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=next_line
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.indentation.size=3
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.line_length=80
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=80
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=space
+org.eclipse.jdt.core.formatter.tabulation.size=3
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
Added: ri/trunk/webbeans-api/src/main/java/javax/webbeans/AfterTransactionCompletion.java
===================================================================
--- ri/trunk/webbeans-api/src/main/java/javax/webbeans/AfterTransactionCompletion.java (rev 0)
+++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/AfterTransactionCompletion.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -0,0 +1,35 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2008, Red Hat Middleware LLC, and individual contributors
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+* http://www.apache.org/licenses/LICENSE-2.0
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+package javax.webbeans;
+
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+/**
+ * Specifies that an observer method is a transactional observer.
+ *
+ * @author Gavin King
+ *
+ */
+ at Retention(RUNTIME)
+ at Target(PARAMETER)
+public @interface AfterTransactionCompletion {
+}
Property changes on: ri/trunk/webbeans-api/src/main/java/javax/webbeans/AfterTransactionCompletion.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: ri/trunk/webbeans-api/src/main/java/javax/webbeans/AfterTransactionFailure.java
===================================================================
--- ri/trunk/webbeans-api/src/main/java/javax/webbeans/AfterTransactionFailure.java (rev 0)
+++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/AfterTransactionFailure.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -0,0 +1,35 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2008, Red Hat Middleware LLC, and individual contributors
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+* http://www.apache.org/licenses/LICENSE-2.0
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+package javax.webbeans;
+
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+/**
+ * Specifies that an observer method is a transactional observer.
+ *
+ * @author Gavin King
+ *
+ */
+ at Retention(RUNTIME)
+ at Target(PARAMETER)
+public @interface AfterTransactionFailure {
+}
Property changes on: ri/trunk/webbeans-api/src/main/java/javax/webbeans/AfterTransactionFailure.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: ri/trunk/webbeans-api/src/main/java/javax/webbeans/AfterTransactionSuccess.java
===================================================================
--- ri/trunk/webbeans-api/src/main/java/javax/webbeans/AfterTransactionSuccess.java (rev 0)
+++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/AfterTransactionSuccess.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -0,0 +1,35 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2008, Red Hat Middleware LLC, and individual contributors
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+* http://www.apache.org/licenses/LICENSE-2.0
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+package javax.webbeans;
+
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+/**
+ * Specifies that an observer method is a transactional observer.
+ *
+ * @author Gavin King
+ *
+ */
+ at Retention(RUNTIME)
+ at Target(PARAMETER)
+public @interface AfterTransactionSuccess {
+}
Property changes on: ri/trunk/webbeans-api/src/main/java/javax/webbeans/AfterTransactionSuccess.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: ri/trunk/webbeans-api/src/main/java/javax/webbeans/AnnotationLiteral.java
===================================================================
--- ri/trunk/webbeans-api/src/main/java/javax/webbeans/AnnotationLiteral.java (rev 0)
+++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/AnnotationLiteral.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -0,0 +1,104 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2008, Red Hat Middleware LLC, and individual contributors
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+* http://www.apache.org/licenses/LICENSE-2.0
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+package javax.webbeans;
+
+/**
+ * @author Pete Muir
+ * @author Gavin King
+ */
+import java.lang.annotation.Annotation;
+import java.lang.reflect.ParameterizedType;
+
+public abstract class AnnotationLiteral<T extends Annotation> implements
+ Annotation
+{
+
+ protected AnnotationLiteral()
+ {
+ if (!(getClass().getSuperclass() == AnnotationLiteral.class))
+ {
+ throw new RuntimeException(
+ "Not a direct subclass of AnnotationLiteral");
+ }
+ if (!(getClass().getGenericSuperclass() instanceof ParameterizedType))
+ {
+ throw new RuntimeException(
+ "Missing type parameter in AnnotationLiteral");
+ }
+ }
+
+ @SuppressWarnings("unchecked")
+ private static <T> Class<T> getAnnotationType(Class<?> clazz)
+ {
+ ParameterizedType parameterized = (ParameterizedType) clazz
+ .getGenericSuperclass();
+ return (Class<T>) parameterized.getActualTypeArguments()[0];
+ }
+
+ /*
+ // Alternative impl of getAnnotationType
+ private static <T> Class<T> getAnnotationType(Class<?> clazz)
+ {
+
+ Type type = clazz.getGenericSuperclass();
+ Class<T> annotationType = null;
+ if (type instanceof ParameterizedType)
+ {
+ ParameterizedType parameterizedType = (ParameterizedType) type;
+ if (parameterizedType.getActualTypeArguments().length == 1)
+ {
+ annotationType = (Class<T>) parameterizedType
+ .getActualTypeArguments()[0];
+ }
+ }
+ if (annotationType == null && clazz != Object.class)
+ {
+ return getAnnotationType(clazz.getSuperclass());
+ } else
+ {
+ return annotationType;
+ }
+ }
+ *
+ */
+
+ // TODO: equals(), hashCode()
+
+ private Class<T> annotationType;
+
+
+
+ public Class<? extends Annotation> annotationType()
+ {
+ annotationType = getAnnotationType(getClass());
+ if (annotationType == null)
+ {
+ throw new RuntimeException(
+ "Unable to determine type of annotation literal for " + getClass());
+ }
+ return annotationType;
+ }
+
+ @Override
+ public String toString()
+ {
+ // TODO Make this closer to the spec for Annotation
+ String annotationName = "@" + annotationType().getName();
+ return annotationName;
+ }
+}
Property changes on: ri/trunk/webbeans-api/src/main/java/javax/webbeans/AnnotationLiteral.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: ri/trunk/webbeans-api/src/main/java/javax/webbeans/ApplicationScoped.java
===================================================================
--- ri/trunk/webbeans-api/src/main/java/javax/webbeans/ApplicationScoped.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/ApplicationScoped.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -19,8 +19,6 @@
import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.PARAMETER;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Documented;
@@ -32,7 +30,7 @@
* @author Pete Muir
*/
- at Target( { METHOD, FIELD, PARAMETER, TYPE })
+ at Target( { TYPE, METHOD })
@Retention(RUNTIME)
@Documented
@ScopeType
Added: ri/trunk/webbeans-api/src/main/java/javax/webbeans/BeforeTransactionCompletion.java
===================================================================
--- ri/trunk/webbeans-api/src/main/java/javax/webbeans/BeforeTransactionCompletion.java (rev 0)
+++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/BeforeTransactionCompletion.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package javax.webbeans;
+
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+/**
+ * Specifies that an observer method is a transactional observer.
+ *
+ * @author Gavin King
+ *
+ */
+ at Retention(RUNTIME)
+ at Target(PARAMETER)
+public @interface BeforeTransactionCompletion {
+}
Property changes on: ri/trunk/webbeans-api/src/main/java/javax/webbeans/BeforeTransactionCompletion.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: ri/trunk/webbeans-api/src/main/java/javax/webbeans/BindingType.java
===================================================================
--- ri/trunk/webbeans-api/src/main/java/javax/webbeans/BindingType.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/BindingType.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -17,7 +17,7 @@
package javax.webbeans;
-import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Documented;
@@ -26,10 +26,14 @@
/**
*
+ * Specifies that an annotation type is a Web Beans
+ * binding type.
+ *
* @author Pete Muir
+ * @author Gavin King
*/
- at Target(TYPE)
+ at Target(ANNOTATION_TYPE)
@Retention(RUNTIME)
@Documented
public @interface BindingType
Deleted: ri/trunk/webbeans-api/src/main/java/javax/webbeans/BoundTo.java
===================================================================
--- ri/trunk/webbeans-api/src/main/java/javax/webbeans/BoundTo.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/BoundTo.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -1,40 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2008, Red Hat Middleware LLC, and individual contributors
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-* http://www.apache.org/licenses/LICENSE-2.0
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-
-package javax.webbeans;
-
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-/**
- *
- * @author Pete Muir
- */
-
- at Target(TYPE)
- at Retention(RUNTIME)
- at Documented
-public @interface BoundTo
-{
-
- public String value();
-
-}
Deleted: ri/trunk/webbeans-api/src/main/java/javax/webbeans/Component.java
===================================================================
--- ri/trunk/webbeans-api/src/main/java/javax/webbeans/Component.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/Component.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -1,41 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2008, Red Hat Middleware LLC, and individual contributors
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-* http://www.apache.org/licenses/LICENSE-2.0
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-
-package javax.webbeans;
-
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-/**
- *
- * @author Pete Muir
- */
-
- at Production
- at Stereotype
- at Target( { TYPE, METHOD })
- at Retention(RUNTIME)
- at Documented
-public @interface Component
-{
-
-}
Deleted: ri/trunk/webbeans-api/src/main/java/javax/webbeans/ComponentInstance.java
===================================================================
--- ri/trunk/webbeans-api/src/main/java/javax/webbeans/ComponentInstance.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/ComponentInstance.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -1,40 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2008, Red Hat Middleware LLC, and individual contributors
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-* http://www.apache.org/licenses/LICENSE-2.0
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-
-package javax.webbeans;
-
-import java.lang.annotation.Annotation;
-import java.util.Set;
-
-/**
- *
- * @author Pete Muir
- */
-
-public abstract class ComponentInstance<T>
-{
-
- public abstract Set<Class> getTypes();
- public abstract Set<Annotation> getBindingTypes();
- public abstract Annotation getScopeType();
- public abstract Annotation getDeploymentType();
- public abstract String getName();
-
- public abstract T create(Container container);
- public abstract void destroy(Container container, T instance);
-
-}
\ No newline at end of file
Deleted: ri/trunk/webbeans-api/src/main/java/javax/webbeans/Container.java
===================================================================
--- ri/trunk/webbeans-api/src/main/java/javax/webbeans/Container.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/Container.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -1,59 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2008, Red Hat Middleware LLC, and individual contributors
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-* http://www.apache.org/licenses/LICENSE-2.0
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-
-package javax.webbeans;
-
-import java.lang.annotation.Annotation;
-import java.util.Set;
-
-/**
- *
- * @author Pete Muir
- */
-
-public interface Container
-{
-
- public <T> T getInstanceByType(Class<T> type, Annotation... bindingTypes);
-
- public <T> T getInstanceByType(TypeLiteral<T> type,
- Annotation... bindingTypes);
-
- public <T> T resolveByType(Class<T> apiType, Annotation... bindingTypes);
-
- public <T> T resolveByType(TypeLiteral<T> apiType,
- Annotation... bindingTypes);
-
- public Object getInstanceByName(String name);
-
- public Set<ComponentInstance> resolveByName(String name);
-
- public void fireEvent(Object event, Annotation... bindings);
-
- public void addObserver(Observer observer);
-
- public void removeObserver(Observer observer);
-
- public <T> Set<Observer<T>> resolveObservers(T event, Annotation... bindings);
-
- public void addContext(Context context);
-
- public Context getContext(Class<Annotation> scopeType);
-
- public Container addComponent(ComponentInstance component);
-
-}
Deleted: ri/trunk/webbeans-api/src/main/java/javax/webbeans/Context.java
===================================================================
--- ri/trunk/webbeans-api/src/main/java/javax/webbeans/Context.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/Context.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -1,35 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2008, Red Hat Middleware LLC, and individual contributors
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-* http://www.apache.org/licenses/LICENSE-2.0
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-
-package javax.webbeans;
-
-import java.lang.annotation.Annotation;
-
-/**
- *
- * @author Pete Muir
- */
-
-public interface Context
-{
-
- public Class<? extends Annotation> getScopeType();
-
- public <T> T get(Container container, ComponentInstance<T> component, boolean create);
-
- public <T> void remove(Container container, ComponentInstance<T> component);
-}
Deleted: ri/trunk/webbeans-api/src/main/java/javax/webbeans/ContextNotActive.java
===================================================================
--- ri/trunk/webbeans-api/src/main/java/javax/webbeans/ContextNotActive.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/ContextNotActive.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -1,49 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2008, Red Hat Middleware LLC, and individual contributors
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-* http://www.apache.org/licenses/LICENSE-2.0
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-
-package javax.webbeans;
-
-/**
- * This exception is thrown if an invocation is performed on an inactive scope.
- *
- * @author Pete Muir
- * @author Shane Bryzak
- */
-
-public class ContextNotActive extends RuntimeException
-{
-
- public ContextNotActive()
- {
- }
-
- public ContextNotActive(String message)
- {
- super(message);
- }
-
- public ContextNotActive(Throwable cause)
- {
- super(cause);
- }
-
- public ContextNotActive(String message, Throwable cause)
- {
- super(message, cause);
- }
-
-}
Copied: ri/trunk/webbeans-api/src/main/java/javax/webbeans/ContextNotActiveException.java (from rev 77, ri/trunk/webbeans-api/src/main/java/javax/webbeans/ContextNotActive.java)
===================================================================
--- ri/trunk/webbeans-api/src/main/java/javax/webbeans/ContextNotActiveException.java (rev 0)
+++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/ContextNotActiveException.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -0,0 +1,49 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2008, Red Hat Middleware LLC, and individual contributors
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+* http://www.apache.org/licenses/LICENSE-2.0
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+package javax.webbeans;
+
+/**
+ * This exception is thrown if an invocation is performed on an inactive scope.
+ *
+ * @author Pete Muir
+ * @author Shane Bryzak
+ */
+
+public class ContextNotActiveException extends RuntimeException
+{
+
+ public ContextNotActiveException()
+ {
+ }
+
+ public ContextNotActiveException(String message)
+ {
+ super(message);
+ }
+
+ public ContextNotActiveException(Throwable cause)
+ {
+ super(cause);
+ }
+
+ public ContextNotActiveException(String message, Throwable cause)
+ {
+ super(message, cause);
+ }
+
+}
Deleted: ri/trunk/webbeans-api/src/main/java/javax/webbeans/Conversation.java
===================================================================
--- ri/trunk/webbeans-api/src/main/java/javax/webbeans/Conversation.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/Conversation.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -1,30 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2008, Red Hat Middleware LLC, and individual contributors
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-* http://www.apache.org/licenses/LICENSE-2.0
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-
-package javax.webbeans;
-
-/**
- *
- * @author Pete Muir
- */
-
-public interface Conversation
-{
-
- public void begin();
- public void end();
-}
Modified: ri/trunk/webbeans-api/src/main/java/javax/webbeans/ConversationScoped.java
===================================================================
--- ri/trunk/webbeans-api/src/main/java/javax/webbeans/ConversationScoped.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/ConversationScoped.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -19,8 +19,6 @@
import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.PARAMETER;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Documented;
@@ -32,7 +30,7 @@
* @author Pete Muir
*/
- at Target( { METHOD, FIELD, PARAMETER, TYPE })
+ at Target( { TYPE, METHOD })
@Retention(RUNTIME)
@Documented
@ScopeType
Modified: ri/trunk/webbeans-api/src/main/java/javax/webbeans/Decorates.java
===================================================================
--- ri/trunk/webbeans-api/src/main/java/javax/webbeans/Decorates.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/Decorates.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -25,7 +25,9 @@
import java.lang.annotation.Target;
/**
+ * Specifies that a field of a decorator class is the delegate.
*
+ * @author Gavin King
* @author Pete Muir
*/
Modified: ri/trunk/webbeans-api/src/main/java/javax/webbeans/Decorator.java
===================================================================
--- ri/trunk/webbeans-api/src/main/java/javax/webbeans/Decorator.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/Decorator.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -25,7 +25,9 @@
import java.lang.annotation.Target;
/**
+ * Specifies that a class is a decorator.
*
+ * @author Gavin King
* @author Pete Muir
*/
Modified: ri/trunk/webbeans-api/src/main/java/javax/webbeans/Dependent.java
===================================================================
--- ri/trunk/webbeans-api/src/main/java/javax/webbeans/Dependent.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/Dependent.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -19,8 +19,6 @@
import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.PARAMETER;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Documented;
@@ -32,7 +30,7 @@
* @author Pete Muir
*/
- at Target( { METHOD, FIELD, PARAMETER, TYPE })
+ at Target( { METHOD, TYPE })
@Retention(RUNTIME)
@Documented
@ScopeType
Modified: ri/trunk/webbeans-api/src/main/java/javax/webbeans/DeploymentType.java
===================================================================
--- ri/trunk/webbeans-api/src/main/java/javax/webbeans/DeploymentType.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/DeploymentType.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -17,7 +17,7 @@
package javax.webbeans;
-import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Documented;
@@ -25,11 +25,14 @@
import java.lang.annotation.Target;
/**
+ * Specifies that an annotation type is a Web Beans
+ * component type.
*
+ * @author Gavin King
* @author Pete Muir
*/
- at Target(TYPE)
+ at Target(ANNOTATION_TYPE)
@Retention(RUNTIME)
@Documented
public @interface DeploymentType
Deleted: ri/trunk/webbeans-api/src/main/java/javax/webbeans/Destroys.java
===================================================================
--- ri/trunk/webbeans-api/src/main/java/javax/webbeans/Destroys.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/Destroys.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -1,38 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2008, Red Hat Middleware LLC, and individual contributors
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-* http://www.apache.org/licenses/LICENSE-2.0
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-
-package javax.webbeans;
-
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-/**
- *
- * @author Pete Muir
- */
-
- at Target(METHOD)
- at Retention(RUNTIME)
- at Documented
-public @interface Destroys
-{
-
-}
Added: ri/trunk/webbeans-api/src/main/java/javax/webbeans/Destructor.java
===================================================================
--- ri/trunk/webbeans-api/src/main/java/javax/webbeans/Destructor.java (rev 0)
+++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/Destructor.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -0,0 +1,37 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2008, Red Hat Middleware LLC, and individual contributors
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+* http://www.apache.org/licenses/LICENSE-2.0
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+
+package javax.webbeans;
+
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+/**
+ * Specifies that a method of a Web Bean component implementation class is a Web
+ * Beans remove method.
+ *
+ * @author Gavin King
+ *
+ */
+ at Retention(RUNTIME)
+ at Target(METHOD)
+public @interface Destructor {
+}
Property changes on: ri/trunk/webbeans-api/src/main/java/javax/webbeans/Destructor.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: ri/trunk/webbeans-api/src/main/java/javax/webbeans/Disposes.java
===================================================================
--- ri/trunk/webbeans-api/src/main/java/javax/webbeans/Disposes.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/Disposes.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -25,7 +25,11 @@
import java.lang.annotation.Target;
/**
+ * Specifies that a parameter of a method of a Web Bean
+ * component implementation class is the parameter of
+ * a disposal method.
*
+ * @author Gavin King
* @author Pete Muir
*/
Deleted: ri/trunk/webbeans-api/src/main/java/javax/webbeans/DynamicBinding.java
===================================================================
--- ri/trunk/webbeans-api/src/main/java/javax/webbeans/DynamicBinding.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/DynamicBinding.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -1,75 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2008, Red Hat Middleware LLC, and individual contributors
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-* http://www.apache.org/licenses/LICENSE-2.0
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-
-package javax.webbeans;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-
-/**
- *
- * @author Pete Muir
- */
-
-public abstract class DynamicBinding<T extends Annotation> implements Annotation
-{
-
- private Class<T> annotationType;
-
- private static <T> Class<T> getAnnotationType(Class<?> clazz)
- {
-
- Type type = clazz.getGenericSuperclass();
- Class<T> annotationType = null;
- if (type instanceof ParameterizedType)
- {
- ParameterizedType parameterizedType = (ParameterizedType) type;
- if (parameterizedType.getActualTypeArguments().length == 1)
- {
- annotationType = (Class<T>) parameterizedType.getActualTypeArguments()[0];
- }
- }
- if (annotationType == null && clazz != Object.class)
- {
- return getAnnotationType(clazz.getSuperclass());
- }
- else
- {
- return annotationType;
- }
- }
-
- public Class<? extends Annotation> annotationType()
- {
- annotationType = getAnnotationType(getClass());
- if (annotationType == null)
- {
- throw new RuntimeException("Unable to determine type of dynamic binding for " + getClass());
- }
- return annotationType;
- }
-
- @Override
- public String toString()
- {
- // TODO Make this closer to the spec for Annotation
- String annotationName = "@" + annotationType().getName();
- return annotationName;
- }
-
-}
Modified: ri/trunk/webbeans-api/src/main/java/javax/webbeans/IfExists.java
===================================================================
--- ri/trunk/webbeans-api/src/main/java/javax/webbeans/IfExists.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/IfExists.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -25,7 +25,10 @@
import java.lang.annotation.Target;
/**
+ * Specifies that an observer method is only called if the current instance of
+ * the Web Bean declaring the observer method already exists.
*
+ * @author Gavin King
* @author Pete Muir
*/
Modified: ri/trunk/webbeans-api/src/main/java/javax/webbeans/Initializer.java
===================================================================
--- ri/trunk/webbeans-api/src/main/java/javax/webbeans/Initializer.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/Initializer.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -26,7 +26,11 @@
import java.lang.annotation.Target;
/**
+ * Specifies that a method of a Web Bean component
+ * implementation class is a Web Beans initializer method,
+ * or that a constructor is the Web Bean component constructor.
*
+ * @author Gavin King
* @author Pete Muir
*/
Added: ri/trunk/webbeans-api/src/main/java/javax/webbeans/Interceptor.java
===================================================================
--- ri/trunk/webbeans-api/src/main/java/javax/webbeans/Interceptor.java (rev 0)
+++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/Interceptor.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -0,0 +1,36 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2008, Red Hat Middleware LLC, and individual contributors
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+* http://www.apache.org/licenses/LICENSE-2.0
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+
+package javax.webbeans;
+
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+/**
+ * Specifies that a class is an interceptor.
+ *
+ * @author Gavin King
+ *
+ */
+ at Retention(RUNTIME)
+ at Target(TYPE)
+public @interface Interceptor {
+}
Property changes on: ri/trunk/webbeans-api/src/main/java/javax/webbeans/Interceptor.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: ri/trunk/webbeans-api/src/main/java/javax/webbeans/InterceptorBindingType.java
===================================================================
--- ri/trunk/webbeans-api/src/main/java/javax/webbeans/InterceptorBindingType.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/InterceptorBindingType.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -17,7 +17,7 @@
package javax.webbeans;
-import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Documented;
@@ -25,11 +25,14 @@
import java.lang.annotation.Target;
/**
+ * Specifies that an annotation type is a Web Beans
+ * interceptor binding type.
*
+ * @author Gavin King
* @author Pete Muir
*/
- at Target(TYPE)
+ at Target(ANNOTATION_TYPE)
@Retention(RUNTIME)
@Documented
public @interface InterceptorBindingType
Modified: ri/trunk/webbeans-api/src/main/java/javax/webbeans/Named.java
===================================================================
--- ri/trunk/webbeans-api/src/main/java/javax/webbeans/Named.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/Named.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -26,7 +26,9 @@
import java.lang.annotation.Target;
/**
+ * Specifies the Web Beans component name.
*
+ * @author Gavin King
* @author Pete Muir
*/
Modified: ri/trunk/webbeans-api/src/main/java/javax/webbeans/New.java
===================================================================
--- ri/trunk/webbeans-api/src/main/java/javax/webbeans/New.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/New.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -28,7 +28,9 @@
import java.lang.annotation.Target;
/**
+ * The special binding type.
*
+ * @author Gavin King
* @author Pete Muir
*/
Added: ri/trunk/webbeans-api/src/main/java/javax/webbeans/NonBinding.java
===================================================================
--- ri/trunk/webbeans-api/src/main/java/javax/webbeans/NonBinding.java (rev 0)
+++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/NonBinding.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -0,0 +1,37 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2008, Red Hat Middleware LLC, and individual contributors
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+* http://www.apache.org/licenses/LICENSE-2.0
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+
+package javax.webbeans;
+
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+/**
+ * Specifies that a member of a binding type or interceptor binding type is to
+ * be ignored for the purposes of resolution.
+ *
+ * @author Gavin King
+ *
+ */
+ at Retention(RUNTIME)
+ at Target(METHOD)
+public @interface NonBinding {
+}
Property changes on: ri/trunk/webbeans-api/src/main/java/javax/webbeans/NonBinding.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: ri/trunk/webbeans-api/src/main/java/javax/webbeans/Observable.java
===================================================================
--- ri/trunk/webbeans-api/src/main/java/javax/webbeans/Observable.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/Observable.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -17,8 +17,9 @@
package javax.webbeans;
import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.ElementType.LOCAL_VARIABLE;
+import static java.lang.annotation.ElementType.TYPE;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Documented;
@@ -30,10 +31,12 @@
* observed by observer methods.
*
* @author David Allen
+ * @author Gvin King
*/
- at Target( { FIELD, LOCAL_VARIABLE, PARAMETER })
+ at BindingType
@Retention(RUNTIME)
+ at Target( { TYPE, METHOD, FIELD, PARAMETER })
@Documented
public @interface Observable
{
Deleted: ri/trunk/webbeans-api/src/main/java/javax/webbeans/Observer.java
===================================================================
--- ri/trunk/webbeans-api/src/main/java/javax/webbeans/Observer.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/Observer.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -1,36 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2008, Red Hat Middleware LLC, and individual contributors
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-* http://www.apache.org/licenses/LICENSE-2.0
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-
-package javax.webbeans;
-
-import java.lang.annotation.Annotation;
-import java.util.Set;
-
-/**
- *
- * @author Pete Muir
- */
-
-public interface Observer<T>
-{
-
- public Class<T> getEventType();
- public Set<Annotation> getEventBindingTypes();
-
- public void notify(Container container, T event);
-
-}
Modified: ri/trunk/webbeans-api/src/main/java/javax/webbeans/Observes.java
===================================================================
--- ri/trunk/webbeans-api/src/main/java/javax/webbeans/Observes.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/Observes.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -25,7 +25,11 @@
import java.lang.annotation.Target;
/**
+ * Specifies that a parameter of a method of a Web Bean
+ * component implementation class is the event parameter
+ * of an observer method.
*
+ * @author Gavin King
* @author Pete Muir
*/
Modified: ri/trunk/webbeans-api/src/main/java/javax/webbeans/Produces.java
===================================================================
--- ri/trunk/webbeans-api/src/main/java/javax/webbeans/Produces.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/Produces.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -26,6 +26,10 @@
/**
*
+ * Specifies that a method of a Web Bean component
+ * implementation class is a Web Beans producer method.
+ *
+ * @author Gavin King
* @author Pete Muir
*/
Modified: ri/trunk/webbeans-api/src/main/java/javax/webbeans/Production.java
===================================================================
--- ri/trunk/webbeans-api/src/main/java/javax/webbeans/Production.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/Production.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -26,7 +26,9 @@
import java.lang.annotation.Target;
/**
+ * Component type for application components.
*
+ * @author Gavin King
* @author Pete Muir
*/
Modified: ri/trunk/webbeans-api/src/main/java/javax/webbeans/RequestScoped.java
===================================================================
--- ri/trunk/webbeans-api/src/main/java/javax/webbeans/RequestScoped.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/RequestScoped.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -19,8 +19,6 @@
import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.PARAMETER;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Documented;
@@ -32,7 +30,7 @@
* @author Pete Muir
*/
- at Target( { METHOD, FIELD, PARAMETER, TYPE })
+ at Target( { TYPE, METHOD })
@Retention(RUNTIME)
@Documented
@ScopeType
Modified: ri/trunk/webbeans-api/src/main/java/javax/webbeans/ScopeType.java
===================================================================
--- ri/trunk/webbeans-api/src/main/java/javax/webbeans/ScopeType.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/ScopeType.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -17,7 +17,7 @@
package javax.webbeans;
-import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Documented;
@@ -25,11 +25,13 @@
import java.lang.annotation.Target;
/**
- *
+ * Specifies that an annotation type is a Web Beans
+ * scope type.
+ * @author Gavin King
* @author Pete Muir
*/
- at Target(TYPE)
+ at Target(ANNOTATION_TYPE)
@Retention(RUNTIME)
@Documented
public @interface ScopeType
Modified: ri/trunk/webbeans-api/src/main/java/javax/webbeans/SessionScoped.java
===================================================================
--- ri/trunk/webbeans-api/src/main/java/javax/webbeans/SessionScoped.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/SessionScoped.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -19,8 +19,6 @@
import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.PARAMETER;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Documented;
@@ -32,7 +30,7 @@
* @author Pete Muir
*/
- at Target( { METHOD, FIELD, PARAMETER, TYPE })
+ at Target( { TYPE, METHOD })
@Retention(RUNTIME)
@Documented
@ScopeType
Modified: ri/trunk/webbeans-api/src/main/java/javax/webbeans/Specializes.java
===================================================================
--- ri/trunk/webbeans-api/src/main/java/javax/webbeans/Specializes.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/Specializes.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -17,7 +17,6 @@
package javax.webbeans;
-import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.ElementType.TYPE;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
@@ -26,11 +25,13 @@
import java.lang.annotation.Target;
/**
+ * Specifies that an implementation class directly specializes its superclass.
*
+ * @author Gavin King
* @author Pete Muir
*/
- at Target( { TYPE, METHOD })
+ at Target(TYPE)
@Retention(RUNTIME)
@Documented
public @interface Specializes
Modified: ri/trunk/webbeans-api/src/main/java/javax/webbeans/Standard.java
===================================================================
--- ri/trunk/webbeans-api/src/main/java/javax/webbeans/Standard.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/Standard.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -26,7 +26,9 @@
import java.lang.annotation.Target;
/**
+ * Component type for standard components.
*
+ * @author Gavin King
* @author Pete Muir
*/
Modified: ri/trunk/webbeans-api/src/main/java/javax/webbeans/Stereotype.java
===================================================================
--- ri/trunk/webbeans-api/src/main/java/javax/webbeans/Stereotype.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/Stereotype.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -17,7 +17,7 @@
package javax.webbeans;
-import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Annotation;
@@ -26,12 +26,14 @@
import java.lang.annotation.Target;
/**
+ * Specifies that an annotation type is a Web Beans stereotype.
*
* @author Pete Muir
+ * @author Gavin King
*/
- at Target(TYPE)
@Retention(RUNTIME)
+ at Target(ANNOTATION_TYPE)
@Documented
public @interface Stereotype
{
Modified: ri/trunk/webbeans-api/src/main/java/javax/webbeans/TypeLiteral.java
===================================================================
--- ri/trunk/webbeans-api/src/main/java/javax/webbeans/TypeLiteral.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/TypeLiteral.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -17,12 +17,47 @@
package javax.webbeans;
+import java.lang.reflect.GenericArrayType;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+
/**
*
* @author Pete Muir
+ * @author Gavin King
*/
public class TypeLiteral<T>
{
+
+ protected TypeLiteral() {
+ if (!(getClass().getSuperclass() == TypeLiteral.class)) {
+ throw new RuntimeException("Not a direct subclass of TypeLiteral");
+ }
+ if (!(getClass().getGenericSuperclass() instanceof ParameterizedType)) {
+ throw new RuntimeException("Missing type parameter in TypeLiteral");
+ }
+ }
+ public final Type getType() {
+ ParameterizedType parameterized = (ParameterizedType) getClass()
+ .getGenericSuperclass();
+ return parameterized.getActualTypeArguments()[0];
+ }
+
+ @SuppressWarnings("unchecked")
+ public final Class<T> getRawType() {
+ Type type = getType();
+ if (type instanceof Class) {
+ return (Class<T>) type;
+ } else if (type instanceof ParameterizedType) {
+ return (Class<T>) ((ParameterizedType) type).getRawType();
+ } else if (type instanceof GenericArrayType) {
+ return (Class<T>) Object[].class;
+ } else {
+ throw new RuntimeException("Illegal type");
+ }
+ }
+ // TODO: equals(), hashCode()
+
}
Copied: ri/trunk/webbeans-api/src/main/java/javax/webbeans/manager/Bean.java (from rev 77, ri/trunk/webbeans-api/src/main/java/javax/webbeans/ComponentInstance.java)
===================================================================
--- ri/trunk/webbeans-api/src/main/java/javax/webbeans/manager/Bean.java (rev 0)
+++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/manager/Bean.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -0,0 +1,41 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2008, Red Hat Middleware LLC, and individual contributors
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+* http://www.apache.org/licenses/LICENSE-2.0
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+package javax.webbeans.manager;
+
+import java.lang.annotation.Annotation;
+import java.util.Set;
+
+
+/**
+ *
+ * @author Pete Muir
+ */
+
+public abstract class Bean<T>
+{
+
+ public abstract Set<Class> getTypes();
+ public abstract Set<Annotation> getBindingTypes();
+ public abstract Annotation getScopeType();
+ public abstract Annotation getDeploymentType();
+ public abstract String getName();
+
+ public abstract T create(Manager container);
+ public abstract void destroy(Manager container, T instance);
+
+}
\ No newline at end of file
Property changes on: ri/trunk/webbeans-api/src/main/java/javax/webbeans/manager/Bean.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: ri/trunk/webbeans-api/src/main/java/javax/webbeans/manager/Context.java (from rev 77, ri/trunk/webbeans-api/src/main/java/javax/webbeans/Context.java)
===================================================================
--- ri/trunk/webbeans-api/src/main/java/javax/webbeans/manager/Context.java (rev 0)
+++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/manager/Context.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -0,0 +1,36 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2008, Red Hat Middleware LLC, and individual contributors
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+* http://www.apache.org/licenses/LICENSE-2.0
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+package javax.webbeans.manager;
+
+import java.lang.annotation.Annotation;
+
+
+/**
+ *
+ * @author Pete Muir
+ */
+
+public interface Context
+{
+
+ public Class<? extends Annotation> getScopeType();
+
+ public <T> T get(Manager container, Bean<T> component, boolean create);
+
+ public <T> void remove(Manager container, Bean<T> component);
+}
Property changes on: ri/trunk/webbeans-api/src/main/java/javax/webbeans/manager/Context.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: ri/trunk/webbeans-api/src/main/java/javax/webbeans/manager/Conversation.java (from rev 77, ri/trunk/webbeans-api/src/main/java/javax/webbeans/Conversation.java)
===================================================================
--- ri/trunk/webbeans-api/src/main/java/javax/webbeans/manager/Conversation.java (rev 0)
+++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/manager/Conversation.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -0,0 +1,30 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2008, Red Hat Middleware LLC, and individual contributors
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+* http://www.apache.org/licenses/LICENSE-2.0
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+package javax.webbeans.manager;
+
+/**
+ *
+ * @author Pete Muir
+ */
+
+public interface Conversation
+{
+
+ public void begin();
+ public void end();
+}
Property changes on: ri/trunk/webbeans-api/src/main/java/javax/webbeans/manager/Conversation.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: ri/trunk/webbeans-api/src/main/java/javax/webbeans/manager/Manager.java (from rev 77, ri/trunk/webbeans-api/src/main/java/javax/webbeans/Container.java)
===================================================================
--- ri/trunk/webbeans-api/src/main/java/javax/webbeans/manager/Manager.java (rev 0)
+++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/manager/Manager.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -0,0 +1,61 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2008, Red Hat Middleware LLC, and individual contributors
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+* http://www.apache.org/licenses/LICENSE-2.0
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+package javax.webbeans.manager;
+
+import java.lang.annotation.Annotation;
+import java.util.Set;
+
+import javax.webbeans.TypeLiteral;
+
+/**
+ *
+ * @author Pete Muir
+ */
+
+public interface Manager
+{
+
+ public <T> T getInstanceByType(Class<T> type, Annotation... bindingTypes);
+
+ public <T> T getInstanceByType(TypeLiteral<T> type,
+ Annotation... bindingTypes);
+
+ public <T> T resolveByType(Class<T> apiType, Annotation... bindingTypes);
+
+ public <T> T resolveByType(TypeLiteral<T> apiType,
+ Annotation... bindingTypes);
+
+ public Object getInstanceByName(String name);
+
+ public Set<Bean> resolveByName(String name);
+
+ public void fireEvent(Object event, Annotation... bindings);
+
+ public void addObserver(Observer observer);
+
+ public void removeObserver(Observer observer);
+
+ public <T> Set<Observer<T>> resolveObservers(T event, Annotation... bindings);
+
+ public void addContext(Context context);
+
+ public Context getContext(Class<Annotation> scopeType);
+
+ public Manager addComponent(Bean component);
+
+}
Property changes on: ri/trunk/webbeans-api/src/main/java/javax/webbeans/manager/Manager.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: ri/trunk/webbeans-api/src/main/java/javax/webbeans/manager/Observer.java (from rev 77, ri/trunk/webbeans-api/src/main/java/javax/webbeans/Observer.java)
===================================================================
--- ri/trunk/webbeans-api/src/main/java/javax/webbeans/manager/Observer.java (rev 0)
+++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/manager/Observer.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -0,0 +1,37 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2008, Red Hat Middleware LLC, and individual contributors
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+* http://www.apache.org/licenses/LICENSE-2.0
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+package javax.webbeans.manager;
+
+import java.lang.annotation.Annotation;
+import java.util.Set;
+
+
+/**
+ *
+ * @author Pete Muir
+ */
+
+public interface Observer<T>
+{
+
+ public Class<T> getEventType();
+ public Set<Annotation> getEventBindingTypes();
+
+ public void notify(Manager container, T event);
+
+}
Property changes on: ri/trunk/webbeans-api/src/main/java/javax/webbeans/manager/Observer.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: ri/trunk/webbeans-ri/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- ri/trunk/webbeans-ri/.settings/org.eclipse.jdt.core.prefs 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-ri/.settings/org.eclipse.jdt.core.prefs 2008-09-28 11:39:24 UTC (rev 111)
@@ -1,5 +1,259 @@
-#Thu Sep 11 11:33:04 BST 2008
+#Fri Sep 26 13:04:28 BST 2008
+eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.compliance=1.5
org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=next_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=80
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=3
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=80
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=space
+org.eclipse.jdt.core.formatter.tabulation.size=3
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/BasicContext.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/BasicContext.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/BasicContext.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -4,9 +4,9 @@
import java.util.HashMap;
import java.util.Map;
-import javax.webbeans.ComponentInstance;
-import javax.webbeans.Container;
-import javax.webbeans.Context;
+import javax.webbeans.manager.Bean;
+import javax.webbeans.manager.Context;
+import javax.webbeans.manager.Manager;
/**
* Basic implementation of javax.webbeans.Context, backed by a HashMap
@@ -16,17 +16,17 @@
*/
public class BasicContext implements Context
{
- private Map<ComponentInstance<?>, Object> values;
+ private Map<Bean<?>, Object> values;
private Class<? extends Annotation> scopeType;
public BasicContext(Class<? extends Annotation> scopeType)
{
this.scopeType = scopeType;
- values = new HashMap<ComponentInstance<?>,Object>();
+ values = new HashMap<Bean<?>,Object>();
}
@SuppressWarnings("unchecked")
- public <T> T get(Container container, ComponentInstance<T> component, boolean create)
+ public <T> T get(Manager container, Bean<T> component, boolean create)
{
T instance = (T) values.get(component);
if (instance != null)
@@ -53,7 +53,7 @@
}
@SuppressWarnings("unchecked")
- public <T> void remove(Container container, ComponentInstance<T> component)
+ public <T> void remove(Manager container, Bean<T> component)
{
T instance = (T) values.get(component);
@@ -71,11 +71,11 @@
}
@SuppressWarnings("unchecked")
- public void destroy(Container container)
+ public void destroy(Manager container)
{
// TODO this method isn't declared by the interface, but is implied by section 9.1.2 of the spec
- for (ComponentInstance c : values.keySet())
+ for (Bean c : values.keySet())
{
c.destroy(container, values.get(c));
}
Copied: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/BeanImpl.java (from rev 99, ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ComponentInstanceImpl.java)
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/BeanImpl.java (rev 0)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/BeanImpl.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -0,0 +1,71 @@
+package org.jboss.webbeans;
+
+import java.lang.annotation.Annotation;
+import java.util.Set;
+import java.util.logging.Logger;
+
+import javax.webbeans.manager.Bean;
+import javax.webbeans.manager.Manager;
+
+import org.jboss.webbeans.model.AbstractComponentModel;
+import org.jboss.webbeans.util.LoggerUtil;
+
+public class BeanImpl<T> extends Bean<T>
+{
+
+public static final String LOGGER_NAME = "componentMetaModel";
+
+ private static Logger log = LoggerUtil.getLogger(LOGGER_NAME);
+
+ private AbstractComponentModel<T, ?> componentMetaModel;
+
+ public BeanImpl(AbstractComponentModel<T, ?> componentMetaModel)
+ {
+ this.componentMetaModel = componentMetaModel;
+ }
+
+ @Override
+ public T create(Manager container)
+ {
+ return componentMetaModel.getConstructor().invoke(container);
+ }
+
+ @Override
+ public void destroy(Manager container, T instance)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public Set<Annotation> getBindingTypes()
+ {
+ return componentMetaModel.getBindingTypes();
+ }
+
+ @Override
+ public Annotation getDeploymentType()
+ {
+ return componentMetaModel.getDeploymentType();
+ }
+
+ @Override
+ public String getName()
+ {
+ return componentMetaModel.getName();
+ }
+
+ @Override
+ public Annotation getScopeType()
+ {
+ return componentMetaModel.getScopeType();
+ }
+
+ @Override
+ public Set<Class> getTypes()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+}
Deleted: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ComponentInstanceImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ComponentInstanceImpl.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ComponentInstanceImpl.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -1,71 +0,0 @@
-package org.jboss.webbeans;
-
-import java.lang.annotation.Annotation;
-import java.util.Set;
-import java.util.logging.Logger;
-
-import javax.webbeans.ComponentInstance;
-import javax.webbeans.Container;
-
-import org.jboss.webbeans.model.AbstractComponentModel;
-import org.jboss.webbeans.util.LoggerUtil;
-
-public class ComponentInstanceImpl<T> extends ComponentInstance<T>
-{
-
-public static final String LOGGER_NAME = "componentMetaModel";
-
- private static Logger log = LoggerUtil.getLogger(LOGGER_NAME);
-
- private AbstractComponentModel<T, ?> componentMetaModel;
-
- public ComponentInstanceImpl(AbstractComponentModel<T, ?> componentMetaModel)
- {
- this.componentMetaModel = componentMetaModel;
- }
-
- @Override
- public T create(Container container)
- {
- return componentMetaModel.getConstructor().invoke(container);
- }
-
- @Override
- public void destroy(Container container, T instance)
- {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public Set<Annotation> getBindingTypes()
- {
- return componentMetaModel.getBindingTypes();
- }
-
- @Override
- public Annotation getDeploymentType()
- {
- return componentMetaModel.getDeploymentType();
- }
-
- @Override
- public String getName()
- {
- return componentMetaModel.getName();
- }
-
- @Override
- public Annotation getScopeType()
- {
- return componentMetaModel.getScopeType();
- }
-
- @Override
- public Set<Class> getTypes()
- {
- // TODO Auto-generated method stub
- return null;
- }
-
-}
Deleted: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ContainerImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ContainerImpl.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ContainerImpl.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -1,171 +0,0 @@
-package org.jboss.webbeans;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.webbeans.ComponentInstance;
-import javax.webbeans.Container;
-import javax.webbeans.Context;
-import javax.webbeans.ContextNotActive;
-import javax.webbeans.Observer;
-import javax.webbeans.Standard;
-import javax.webbeans.TypeLiteral;
-
-import org.jboss.webbeans.bindings.ProductionBinding;
-import org.jboss.webbeans.bindings.StandardBinding;
-import org.jboss.webbeans.ejb.EjbManager;
-import org.jboss.webbeans.event.EventBus;
-
-public class ContainerImpl implements Container
-{
-
- private List<Annotation> enabledDeploymentTypes;
- private ModelManager modelManager;
- private EjbManager ejbLookupManager;
- private EventBus eventBus;
-
-
- private ThreadLocal<Map<Class<Annotation>, Context>> contexts =
- new ThreadLocal<Map<Class<Annotation>, Context>>();
-
- private Set<ComponentInstance> components;
-
- public ContainerImpl(List<Annotation> enabledDeploymentTypes)
- {
- initEnabledDeploymentTypes(enabledDeploymentTypes);
- this.modelManager = new ModelManager();
- this.ejbLookupManager = new EjbManager();
- this.components = new HashSet<ComponentInstance>();
- this.eventBus = new EventBus();
- }
-
- private void initEnabledDeploymentTypes(List<Annotation> enabledDeploymentTypes)
- {
- this.enabledDeploymentTypes = new ArrayList<Annotation>();
- if (enabledDeploymentTypes == null)
- {
- this.enabledDeploymentTypes.add(0, new StandardBinding());
- this.enabledDeploymentTypes.add(1, new ProductionBinding());
- }
- else
- {
- this.enabledDeploymentTypes.addAll(enabledDeploymentTypes);
- if (!this.enabledDeploymentTypes.get(0).annotationType().equals(Standard.class))
- {
- throw new RuntimeException("@Standard must be the lowest precedence deployment type");
- }
- }
- }
-
- public Container addComponent(ComponentInstance component)
- {
- components.add(component);
- return this;
- }
-
- public void addContext(Context context)
- {
- // TODO Auto-generated method stub
-
- }
-
- public void addObserver(Observer observer)
- {
- eventBus.addObserver(observer);
- }
-
- public void fireEvent(Object event, Annotation... bindings)
- {
- // TODO Auto-generated method stub
-
- }
-
- public Context getContext(Class<Annotation> scopeType)
- {
- Context context = contexts.get().get(scopeType);
-
- if (context == null)
- {
- // If context can't be found throw an exception (section 9.4 of spec)
- throw new ContextNotActive();
- }
- else
- {
- return context;
- }
- }
-
- public Object getInstanceByName(String name)
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- public <T> T getInstanceByType(Class<T> type, Annotation... bindingTypes)
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- public <T> T getInstanceByType(TypeLiteral<T> type,
- Annotation... bindingTypes)
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- public void removeObserver(Observer observer)
- {
- eventBus.removeObserver(observer);
- }
-
- public Set<ComponentInstance> resolveByName(String name)
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- public <T> T resolveByType(Class<T> apiType, Annotation... bindingTypes)
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- public <T> T resolveByType(TypeLiteral<T> apiType,
- Annotation... bindingTypes)
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- public <T> Set<Method> resolveDisposalMethods(Class<T> apiType, Annotation... bindingTypes)
- {
- return new HashSet<Method>();
- }
-
- public <T> Set<Observer<T>> resolveObservers(T event, Annotation... bindings)
- {
- return (Set<Observer<T>>) eventBus.getObservers(event, bindings);
- }
-
- public List<Annotation> getEnabledDeploymentTypes()
- {
- return enabledDeploymentTypes;
- }
-
- public ModelManager getModelManager()
- {
- return this.modelManager;
- }
-
- public EjbManager getEjbManager()
- {
- return ejbLookupManager;
- }
-
-}
Copied: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java (from rev 104, ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ContainerImpl.java)
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java (rev 0)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -0,0 +1,171 @@
+package org.jboss.webbeans;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.webbeans.ContextNotActiveException;
+import javax.webbeans.Standard;
+import javax.webbeans.TypeLiteral;
+import javax.webbeans.manager.Bean;
+import javax.webbeans.manager.Context;
+import javax.webbeans.manager.Manager;
+import javax.webbeans.manager.Observer;
+
+import org.jboss.webbeans.bindings.ProductionAnnotationLiteral;
+import org.jboss.webbeans.bindings.StandardAnnotationLiteral;
+import org.jboss.webbeans.ejb.EjbManager;
+import org.jboss.webbeans.event.EventBus;
+
+public class ManagerImpl implements Manager
+{
+
+ private List<Annotation> enabledDeploymentTypes;
+ private ModelManager modelManager;
+ private EjbManager ejbLookupManager;
+ private EventBus eventBus;
+
+
+ private ThreadLocal<Map<Class<Annotation>, Context>> contexts =
+ new ThreadLocal<Map<Class<Annotation>, Context>>();
+
+ private Set<Bean> components;
+
+ public ManagerImpl(List<Annotation> enabledDeploymentTypes)
+ {
+ initEnabledDeploymentTypes(enabledDeploymentTypes);
+ this.modelManager = new ModelManager();
+ this.ejbLookupManager = new EjbManager();
+ this.components = new HashSet<Bean>();
+ this.eventBus = new EventBus();
+ }
+
+ private void initEnabledDeploymentTypes(List<Annotation> enabledDeploymentTypes)
+ {
+ this.enabledDeploymentTypes = new ArrayList<Annotation>();
+ if (enabledDeploymentTypes == null)
+ {
+ this.enabledDeploymentTypes.add(0, new StandardAnnotationLiteral());
+ this.enabledDeploymentTypes.add(1, new ProductionAnnotationLiteral());
+ }
+ else
+ {
+ this.enabledDeploymentTypes.addAll(enabledDeploymentTypes);
+ if (!this.enabledDeploymentTypes.get(0).annotationType().equals(Standard.class))
+ {
+ throw new RuntimeException("@Standard must be the lowest precedence deployment type");
+ }
+ }
+ }
+
+ public Manager addComponent(Bean component)
+ {
+ components.add(component);
+ return this;
+ }
+
+ public void addContext(Context context)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void addObserver(Observer observer)
+ {
+ eventBus.addObserver(observer);
+ }
+
+ public void fireEvent(Object event, Annotation... bindings)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ public Context getContext(Class<Annotation> scopeType)
+ {
+ Context context = contexts.get().get(scopeType);
+
+ if (context == null)
+ {
+ // If context can't be found throw an exception (section 9.4 of spec)
+ throw new ContextNotActiveException();
+ }
+ else
+ {
+ return context;
+ }
+ }
+
+ public Object getInstanceByName(String name)
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public <T> T getInstanceByType(Class<T> type, Annotation... bindingTypes)
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public <T> T getInstanceByType(TypeLiteral<T> type,
+ Annotation... bindingTypes)
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public void removeObserver(Observer observer)
+ {
+ eventBus.removeObserver(observer);
+ }
+
+ public Set<Bean> resolveByName(String name)
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public <T> T resolveByType(Class<T> apiType, Annotation... bindingTypes)
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public <T> T resolveByType(TypeLiteral<T> apiType,
+ Annotation... bindingTypes)
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public <T> Set<Method> resolveDisposalMethods(Class<T> apiType, Annotation... bindingTypes)
+ {
+ return new HashSet<Method>();
+ }
+
+ public <T> Set<Observer<T>> resolveObservers(T event, Annotation... bindings)
+ {
+ return (Set<Observer<T>>) eventBus.getObservers(event, bindings);
+ }
+
+ public List<Annotation> getEnabledDeploymentTypes()
+ {
+ return enabledDeploymentTypes;
+ }
+
+ public ModelManager getModelManager()
+ {
+ return this.modelManager;
+ }
+
+ public EjbManager getEjbManager()
+ {
+ return ejbLookupManager;
+ }
+
+}
Property changes on: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/ApplicationScopedAnnotationLiteral.java (from rev 78, ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/ApplicationScopedBinding.java)
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/ApplicationScopedAnnotationLiteral.java (rev 0)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/ApplicationScopedAnnotationLiteral.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -0,0 +1,9 @@
+package org.jboss.webbeans.bindings;
+
+import javax.webbeans.AnnotationLiteral;
+import javax.webbeans.ApplicationScoped;
+
+public class ApplicationScopedAnnotationLiteral extends AnnotationLiteral<ApplicationScoped> implements ApplicationScoped
+{
+
+}
Property changes on: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/ApplicationScopedAnnotationLiteral.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/ApplicationScopedBinding.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/ApplicationScopedBinding.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/ApplicationScopedBinding.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -1,9 +0,0 @@
-package org.jboss.webbeans.bindings;
-
-import javax.webbeans.ApplicationScoped;
-import javax.webbeans.DynamicBinding;
-
-public class ApplicationScopedBinding extends DynamicBinding<ApplicationScoped> implements ApplicationScoped
-{
-
-}
Copied: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/ConversationScopedAnnotationLiteral.java (from rev 78, ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/ConversationScopedBinding.java)
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/ConversationScopedAnnotationLiteral.java (rev 0)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/ConversationScopedAnnotationLiteral.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -0,0 +1,9 @@
+package org.jboss.webbeans.bindings;
+
+import javax.webbeans.AnnotationLiteral;
+import javax.webbeans.ConversationScoped;
+
+public class ConversationScopedAnnotationLiteral extends AnnotationLiteral<ConversationScoped> implements ConversationScoped
+{
+
+}
Property changes on: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/ConversationScopedAnnotationLiteral.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/ConversationScopedBinding.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/ConversationScopedBinding.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/ConversationScopedBinding.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -1,9 +0,0 @@
-package org.jboss.webbeans.bindings;
-
-import javax.webbeans.ConversationScoped;
-import javax.webbeans.DynamicBinding;
-
-public class ConversationScopedBinding extends DynamicBinding<ConversationScoped> implements ConversationScoped
-{
-
-}
Copied: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/CurrentAnnotationLiteral.java (from rev 78, ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/CurrentBinding.java)
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/CurrentAnnotationLiteral.java (rev 0)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/CurrentAnnotationLiteral.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -0,0 +1,6 @@
+package org.jboss.webbeans.bindings;
+
+import javax.webbeans.AnnotationLiteral;
+import javax.webbeans.Current;
+
+public class CurrentAnnotationLiteral extends AnnotationLiteral<Current> implements Current {}
Property changes on: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/CurrentAnnotationLiteral.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/CurrentBinding.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/CurrentBinding.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/CurrentBinding.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -1,6 +0,0 @@
-package org.jboss.webbeans.bindings;
-
-import javax.webbeans.Current;
-import javax.webbeans.DynamicBinding;
-
-public class CurrentBinding extends DynamicBinding<Current> implements Current {}
Copied: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/DependentAnnotationLiteral.java (from rev 78, ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/DependentBinding.java)
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/DependentAnnotationLiteral.java (rev 0)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/DependentAnnotationLiteral.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -0,0 +1,9 @@
+package org.jboss.webbeans.bindings;
+
+import javax.webbeans.AnnotationLiteral;
+import javax.webbeans.Dependent;
+
+public class DependentAnnotationLiteral extends AnnotationLiteral<Dependent> implements Dependent
+{
+
+}
Property changes on: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/DependentAnnotationLiteral.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/DependentBinding.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/DependentBinding.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/DependentBinding.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -1,9 +0,0 @@
-package org.jboss.webbeans.bindings;
-
-import javax.webbeans.Dependent;
-import javax.webbeans.DynamicBinding;
-
-public class DependentBinding extends DynamicBinding<Dependent> implements Dependent
-{
-
-}
Copied: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/NamedAnnotationLiteral.java (from rev 78, ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/NamedBinding.java)
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/NamedAnnotationLiteral.java (rev 0)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/NamedAnnotationLiteral.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -0,0 +1,9 @@
+package org.jboss.webbeans.bindings;
+
+import javax.webbeans.AnnotationLiteral;
+import javax.webbeans.Named;
+
+public abstract class NamedAnnotationLiteral extends AnnotationLiteral<Named> implements Named
+{
+
+}
Property changes on: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/NamedAnnotationLiteral.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/NamedBinding.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/NamedBinding.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/NamedBinding.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -1,9 +0,0 @@
-package org.jboss.webbeans.bindings;
-
-import javax.webbeans.DynamicBinding;
-import javax.webbeans.Named;
-
-public abstract class NamedBinding extends DynamicBinding<Named> implements Named
-{
-
-}
Copied: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/ProductionAnnotationLiteral.java (from rev 78, ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/ProductionBinding.java)
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/ProductionAnnotationLiteral.java (rev 0)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/ProductionAnnotationLiteral.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -0,0 +1,9 @@
+package org.jboss.webbeans.bindings;
+
+import javax.webbeans.AnnotationLiteral;
+import javax.webbeans.Production;
+
+public class ProductionAnnotationLiteral extends AnnotationLiteral<Production> implements Production
+{
+
+}
Property changes on: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/ProductionAnnotationLiteral.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/ProductionBinding.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/ProductionBinding.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/ProductionBinding.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -1,9 +0,0 @@
-package org.jboss.webbeans.bindings;
-
-import javax.webbeans.DynamicBinding;
-import javax.webbeans.Production;
-
-public class ProductionBinding extends DynamicBinding<Production> implements Production
-{
-
-}
Copied: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/RequestScopedAnnotationLiteral.java (from rev 78, ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/RequestScopedBinding.java)
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/RequestScopedAnnotationLiteral.java (rev 0)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/RequestScopedAnnotationLiteral.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -0,0 +1,9 @@
+package org.jboss.webbeans.bindings;
+
+import javax.webbeans.AnnotationLiteral;
+import javax.webbeans.RequestScoped;
+
+public class RequestScopedAnnotationLiteral extends AnnotationLiteral<RequestScoped> implements RequestScoped
+{
+
+}
Property changes on: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/RequestScopedAnnotationLiteral.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/RequestScopedBinding.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/RequestScopedBinding.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/RequestScopedBinding.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -1,9 +0,0 @@
-package org.jboss.webbeans.bindings;
-
-import javax.webbeans.DynamicBinding;
-import javax.webbeans.RequestScoped;
-
-public class RequestScopedBinding extends DynamicBinding<RequestScoped> implements RequestScoped
-{
-
-}
Copied: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/StandardAnnotationLiteral.java (from rev 78, ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/StandardBinding.java)
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/StandardAnnotationLiteral.java (rev 0)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/StandardAnnotationLiteral.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -0,0 +1,9 @@
+package org.jboss.webbeans.bindings;
+
+import javax.webbeans.AnnotationLiteral;
+import javax.webbeans.Standard;
+
+public class StandardAnnotationLiteral extends AnnotationLiteral<Standard> implements Standard
+{
+
+}
Property changes on: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/StandardAnnotationLiteral.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/StandardBinding.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/StandardBinding.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/StandardBinding.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -1,9 +0,0 @@
-package org.jboss.webbeans.bindings;
-
-import javax.webbeans.DynamicBinding;
-import javax.webbeans.Standard;
-
-public class StandardBinding extends DynamicBinding<Standard> implements Standard
-{
-
-}
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/deployment/DeploymentStrategy.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/deployment/DeploymentStrategy.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/deployment/DeploymentStrategy.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -8,12 +8,12 @@
import javassist.bytecode.ClassFile;
-import javax.webbeans.Container;
import javax.webbeans.DeploymentType;
import javax.webbeans.Stereotype;
+import javax.webbeans.manager.Manager;
-import org.jboss.webbeans.ComponentInstanceImpl;
-import org.jboss.webbeans.ContainerImpl;
+import org.jboss.webbeans.BeanImpl;
+import org.jboss.webbeans.ManagerImpl;
import org.jboss.webbeans.introspector.SimpleAnnotatedType;
import org.jboss.webbeans.introspector.SimpleAnnotatedType;
import org.jboss.webbeans.model.SimpleComponentModel;
@@ -33,11 +33,11 @@
private static final Logger log = LoggerUtil.getLogger("deploymentStrategy");
private ClassLoader classLoader;
- private ContainerImpl container;
+ private ManagerImpl container;
public static String[] DEFAULT_IGNORED_PACKAGES = {"java", "com.sun", "sun", "javasssit"};
- public DeploymentStrategy(ClassLoader classLoader, ContainerImpl container)
+ public DeploymentStrategy(ClassLoader classLoader, ManagerImpl container)
{
this.classLoader = classLoader;
this.container = container;
@@ -141,7 +141,7 @@
SimpleComponentModel componentModel = new SimpleComponentModel(
new SimpleAnnotatedType(componentClass),
new SimpleAnnotatedType(null, new HashMap()), container);
- container.addComponent(new ComponentInstanceImpl(componentModel));
+ container.addComponent(new BeanImpl(componentModel));
log.info("Web Bean: " + componentModel);
}
}
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/DeferredEventNotification.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/DeferredEventNotification.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/DeferredEventNotification.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -1,8 +1,8 @@
package org.jboss.webbeans.event;
import javax.transaction.Synchronization;
-import javax.webbeans.Container;
-import javax.webbeans.Observer;
+import javax.webbeans.manager.Manager;
+import javax.webbeans.manager.Observer;
/**
* A synchronization object which will deliver the event to the observer
@@ -13,7 +13,7 @@
*/
public class DeferredEventNotification implements Synchronization
{
- private Container container;
+ private Manager container;
private Observer<Object> observer;
private Object event;
@@ -25,7 +25,7 @@
* @param event The event being fired
*/
@SuppressWarnings("unchecked")
- public DeferredEventNotification(Container container, Object event, Observer observer)
+ public DeferredEventNotification(Manager container, Object event, Observer observer)
{
this.container = container;
this.observer = observer;
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventBus.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventBus.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventBus.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -12,8 +12,8 @@
import javax.transaction.SystemException;
import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
-import javax.webbeans.Container;
-import javax.webbeans.Observer;
+import javax.webbeans.manager.Manager;
+import javax.webbeans.manager.Observer;
import org.jboss.webbeans.util.JNDI;
@@ -67,7 +67,7 @@
* @throws IllegalStateException
* @throws RollbackException
*/
- public void deferEvent(Container container, Object event, Observer o) throws SystemException, IllegalStateException, RollbackException
+ public void deferEvent(Manager container, Object event, Observer o) throws SystemException, IllegalStateException, RollbackException
{
if (tm != null) {
// Get the current transaction associated with the thread
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventImpl.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventImpl.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -7,7 +7,7 @@
import javax.webbeans.Event;
-import org.jboss.webbeans.ComponentInstanceImpl;
+import org.jboss.webbeans.BeanImpl;
import org.jboss.webbeans.model.EventComponentModel;
/**
@@ -16,7 +16,7 @@
* @author David Allen
*
*/
-public class EventImpl<T> extends ComponentInstanceImpl<T> implements Event<T>
+public class EventImpl<T> extends BeanImpl<T> implements Event<T>
{
private EventComponentModel<T> componentModel;
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/ObserverImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/ObserverImpl.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/ObserverImpl.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -7,8 +7,8 @@
import java.util.List;
import java.util.Set;
-import javax.webbeans.Container;
-import javax.webbeans.Observer;
+import javax.webbeans.manager.Manager;
+import javax.webbeans.manager.Observer;
import org.jboss.webbeans.injectable.Parameter;
import org.jboss.webbeans.model.AbstractComponentModel;
@@ -97,7 +97,7 @@
* @see javax.webbeans.Observer#notify(javax.webbeans.Container,
* java.lang.Object)
*/
- public void notify(Container container, T event)
+ public void notify(Manager container, T event)
{
// Get the most specialized instance of the component
Object instance = container.getInstanceByType(compModel.getType(),
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/ObserverMethod.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/ObserverMethod.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/ObserverMethod.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -3,7 +3,7 @@
import java.lang.reflect.Method;
import java.util.List;
-import javax.webbeans.Container;
+import javax.webbeans.manager.Manager;
import org.jboss.webbeans.injectable.InjectableMethod;
import org.jboss.webbeans.injectable.Parameter;
@@ -31,7 +31,7 @@
* @param instance The component instance to invoke the observer method on
* @param event The event object being fired
*/
- public void invoke(Container container, Object instance, Object event)
+ public void invoke(Manager container, Object instance, Object event)
{
try
{
@@ -52,7 +52,7 @@
* @return an array of objects that serve as arguments for the invocation of the method
*/
@SuppressWarnings("unchecked")
- public Object[] getParameterValues(Container container, Object event)
+ public Object[] getParameterValues(Manager container, Object event)
{
// Let the super class get the parameter values, but substitute the event
// object so that we know for certain it is the correct one.
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/init/Initialization.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/init/Initialization.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/init/Initialization.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -2,7 +2,7 @@
import javax.servlet.ServletContext;
-import org.jboss.webbeans.ContainerImpl;
+import org.jboss.webbeans.ManagerImpl;
import org.jboss.webbeans.deployment.DeploymentStrategy;
/**
@@ -26,7 +26,7 @@
public Initialization create()
{
- ContainerImpl container = new ContainerImpl(null);
+ ManagerImpl container = new ManagerImpl(null);
servletContext.setAttribute(WEBBEANS_CONTAINER_KEY, container);
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/ComponentConstructor.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/ComponentConstructor.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/ComponentConstructor.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -1,10 +1,10 @@
package org.jboss.webbeans.injectable;
-import javax.webbeans.Container;
+import javax.webbeans.manager.Manager;
public interface ComponentConstructor<T>
{
- public T invoke(Container container);
+ public T invoke(Manager container);
}
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/Element.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/Element.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/Element.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -2,7 +2,7 @@
import java.lang.annotation.Annotation;
-import javax.webbeans.Container;
+import javax.webbeans.manager.Manager;
public abstract class Element<T>
{
@@ -30,7 +30,7 @@
return getType() + " with binding types " + getBindingTypes();
}
- public T getValue(Container container)
+ public T getValue(Manager container)
{
return container.getInstanceByType(getType(), getBindingTypes());
}
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/EnterpriseConstructor.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/EnterpriseConstructor.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/EnterpriseConstructor.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -1,8 +1,8 @@
package org.jboss.webbeans.injectable;
-import javax.webbeans.Container;
+import javax.webbeans.manager.Manager;
-import org.jboss.webbeans.ContainerImpl;
+import org.jboss.webbeans.ManagerImpl;
import org.jboss.webbeans.ejb.EjbMetaData;
@@ -16,12 +16,12 @@
this.ejbMetaData = ejbMetaData;
}
- public T invoke(Container container)
+ public T invoke(Manager container)
{
// TODO Hmm, this isn't right
- if (container instanceof ContainerImpl)
+ if (container instanceof ManagerImpl)
{
- ContainerImpl containerImpl = (ContainerImpl) container;
+ ManagerImpl containerImpl = (ManagerImpl) container;
return containerImpl.getEjbManager().lookup(ejbMetaData);
}
else
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/InjectableMethod.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/InjectableMethod.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/InjectableMethod.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -1,6 +1,6 @@
package org.jboss.webbeans.injectable;
-import javax.webbeans.Container;
+import javax.webbeans.manager.Manager;
// TODO Name this class better
public class InjectableMethod<T> extends Unit<T>
@@ -15,7 +15,7 @@
}
@SuppressWarnings("unchecked")
- public T invoke(Container container, Object instance)
+ public T invoke(Manager container, Object instance)
{
try
{
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/JMSConstructor.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/JMSConstructor.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/JMSConstructor.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -1,6 +1,6 @@
package org.jboss.webbeans.injectable;
-import javax.webbeans.Container;
+import javax.webbeans.manager.Manager;
import org.jboss.webbeans.util.JNDI;
@@ -16,7 +16,7 @@
this.jndiName = jndiName;
}
- public T invoke(Container container)
+ public T invoke(Manager container)
{
return JNDI.lookup(jndiName, type);
}
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/MethodConstructor.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/MethodConstructor.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/MethodConstructor.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -2,7 +2,7 @@
import java.lang.reflect.Method;
-import javax.webbeans.Container;
+import javax.webbeans.manager.Manager;
public class MethodConstructor<T> extends InjectableMethod<T> implements
ComponentConstructor<T>
@@ -13,7 +13,7 @@
super(method);
}
- public T invoke(Container container)
+ public T invoke(Manager container)
{
// TODO Auto-generated method stub
return null;
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/Parameter.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/Parameter.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/Parameter.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -2,12 +2,12 @@
import java.lang.annotation.Annotation;
-import org.jboss.webbeans.bindings.CurrentBinding;
+import org.jboss.webbeans.bindings.CurrentAnnotationLiteral;
public class Parameter<T> extends Element<T>
{
- private static Annotation[] currentBinding = {new CurrentBinding()};
+ private static Annotation[] currentBinding = {new CurrentAnnotationLiteral()};
private Class<? extends T> type;
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/SimpleConstructor.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/SimpleConstructor.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/SimpleConstructor.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -3,7 +3,7 @@
import java.lang.reflect.Constructor;
import java.util.logging.Logger;
-import javax.webbeans.Container;
+import javax.webbeans.manager.Manager;
import org.jboss.webbeans.util.LoggerUtil;
@@ -29,7 +29,7 @@
return constructor;
}
- public T invoke(Container container)
+ public T invoke(Manager container)
{
try
{
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/Unit.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/Unit.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/Unit.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -4,7 +4,7 @@
import java.util.ArrayList;
import java.util.List;
-import javax.webbeans.Container;
+import javax.webbeans.manager.Manager;
public abstract class Unit<T>
{
@@ -41,7 +41,7 @@
return injectedParameters;
}
- public Object[] getParameterValues(Container container)
+ public Object[] getParameterValues(Manager container)
{
Object[] parameterValues = new Object[parameters.size()];
for (int i = 0; i < parameterValues.length; i++)
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/AbstractClassComponentModel.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/AbstractClassComponentModel.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/AbstractClassComponentModel.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -8,7 +8,7 @@
import javax.webbeans.Dependent;
-import org.jboss.webbeans.ContainerImpl;
+import org.jboss.webbeans.ManagerImpl;
import org.jboss.webbeans.introspector.AnnotatedType;
import org.jboss.webbeans.util.LoggerUtil;
import org.jboss.webbeans.util.Reflections;
@@ -53,7 +53,7 @@
}
@Override
- protected void init(ContainerImpl container)
+ protected void init(ManagerImpl container)
{
super.init(container);
checkRequiredTypesImplemented();
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/AbstractComponentModel.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/AbstractComponentModel.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/AbstractComponentModel.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -13,10 +13,10 @@
import javax.webbeans.Named;
import javax.webbeans.ScopeType;
-import org.jboss.webbeans.ContainerImpl;
-import org.jboss.webbeans.bindings.CurrentBinding;
-import org.jboss.webbeans.bindings.DependentBinding;
-import org.jboss.webbeans.bindings.ProductionBinding;
+import org.jboss.webbeans.ManagerImpl;
+import org.jboss.webbeans.bindings.CurrentAnnotationLiteral;
+import org.jboss.webbeans.bindings.DependentAnnotationLiteral;
+import org.jboss.webbeans.bindings.ProductionAnnotationLiteral;
import org.jboss.webbeans.injectable.ComponentConstructor;
import org.jboss.webbeans.injectable.InjectableMethod;
import org.jboss.webbeans.introspector.AnnotatedItem;
@@ -38,7 +38,7 @@
protected InjectableMethod<?> removeMethod;
private Set<Class> apiTypes;
- protected void init(ContainerImpl container)
+ protected void init(ManagerImpl container)
{
mergedStereotypes = new MergedStereotypesModel<T, E>(getAnnotatedItem(), getXmlAnnotatedItem(), container);
initType();
@@ -94,7 +94,7 @@
if (bindingTypes.size() == 0)
{
log.finest("Adding default @Current binding type");
- bindingTypes.add(new CurrentBinding());
+ bindingTypes.add(new CurrentAnnotationLiteral());
}
else
{
@@ -146,7 +146,7 @@
{
throw new RuntimeException("All stereotypes must specify the same scope OR a scope must be specified on the component");
}
- this.scopeType = new DependentBinding();
+ this.scopeType = new DependentAnnotationLiteral();
log.finest("Using default @Dependent scope");
}
@@ -190,7 +190,7 @@
}
}
- protected void initDeploymentType(ContainerImpl container)
+ protected void initDeploymentType(ManagerImpl container)
{
Set<Annotation> xmlDeploymentTypes = getXmlAnnotatedItem().getAnnotations(DeploymentType.class);
@@ -232,7 +232,7 @@
if (getXmlAnnotatedItem().getDelegate() != null)
{
- this.deploymentType = new ProductionBinding();
+ this.deploymentType = new ProductionAnnotationLiteral();
log.finest("Using default @Production deployment type");
return;
}
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/AbstractEnterpriseComponentModel.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/AbstractEnterpriseComponentModel.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/AbstractEnterpriseComponentModel.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -3,7 +3,7 @@
import javax.webbeans.ApplicationScoped;
import javax.webbeans.Dependent;
-import org.jboss.webbeans.ContainerImpl;
+import org.jboss.webbeans.ManagerImpl;
import org.jboss.webbeans.ejb.EjbMetaData;
import org.jboss.webbeans.introspector.AnnotatedType;
@@ -21,7 +21,7 @@
}
@Override
- protected void init(ContainerImpl container)
+ protected void init(ManagerImpl container)
{
super.init(container);
ejbMetaData = container.getEjbManager().getEjbMetaData(getType());
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/EnterpriseComponentModel.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/EnterpriseComponentModel.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/EnterpriseComponentModel.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -4,9 +4,9 @@
import java.util.ArrayList;
import java.util.List;
-import javax.webbeans.Destroys;
+import javax.webbeans.Destructor;
-import org.jboss.webbeans.ContainerImpl;
+import org.jboss.webbeans.ManagerImpl;
import org.jboss.webbeans.injectable.ComponentConstructor;
import org.jboss.webbeans.injectable.EnterpriseConstructor;
import org.jboss.webbeans.injectable.InjectableMethod;
@@ -21,14 +21,14 @@
private String location;
public EnterpriseComponentModel(AnnotatedType<T> annotatedItem,
- AnnotatedType<T> xmlAnnotatedItem, ContainerImpl container)
+ AnnotatedType<T> xmlAnnotatedItem, ManagerImpl container)
{
super(annotatedItem, xmlAnnotatedItem);
init(container);
}
@Override
- protected void init(ContainerImpl container)
+ protected void init(ManagerImpl container)
{
super.init(container);
this.constructor = new EnterpriseConstructor<T>(getEjbMetaData());
@@ -57,7 +57,7 @@
}
// TODO loggigng
- protected void initRemoveMethod(ContainerImpl container)
+ protected void initRemoveMethod(ManagerImpl container)
{
if (getEjbMetaData().isStateful())
{
@@ -70,7 +70,7 @@
List<Method> possibleRemoveMethods = new ArrayList<Method>();
for (Method removeMethod : getEjbMetaData().getRemoveMethods())
{
- if (removeMethod.isAnnotationPresent(Destroys.class))
+ if (removeMethod.isAnnotationPresent(Destructor.class))
{
possibleRemoveMethods.add(removeMethod);
}
@@ -95,7 +95,7 @@
}
else
{
- List<Method> destroysMethods = Reflections.getMethods(getType(), Destroys.class);
+ List<Method> destroysMethods = Reflections.getMethods(getType(), Destructor.class);
if (destroysMethods.size() > 0)
{
throw new RuntimeException("Only stateful enterprise bean components can have methods annotated @Destroys; " + getType() + " is not a stateful enterprise bean component");
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/EventComponentModel.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/EventComponentModel.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/EventComponentModel.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -2,11 +2,11 @@
import java.lang.annotation.Annotation;
-import javax.webbeans.Container;
+import javax.webbeans.manager.Manager;
-import org.jboss.webbeans.ContainerImpl;
-import org.jboss.webbeans.bindings.DependentBinding;
-import org.jboss.webbeans.bindings.StandardBinding;
+import org.jboss.webbeans.ManagerImpl;
+import org.jboss.webbeans.bindings.DependentAnnotationLiteral;
+import org.jboss.webbeans.bindings.StandardAnnotationLiteral;
import org.jboss.webbeans.introspector.AnnotatedType;
/**
@@ -19,9 +19,9 @@
public class EventComponentModel<T> extends SimpleComponentModel<T>
{
- private StandardBinding deploymentType = new StandardBinding();
- private DependentBinding scopeType = new DependentBinding();
- private ContainerImpl container;
+ private StandardAnnotationLiteral deploymentType = new StandardAnnotationLiteral();
+ private DependentAnnotationLiteral scopeType = new DependentAnnotationLiteral();
+ private ManagerImpl container;
/**
* Creates a new component model for an injectable, observable event object.
@@ -31,7 +31,7 @@
* @param xmlAnnotatedItem The injectable variable defined in XML
* @param container The Web Beans container
*/
- public EventComponentModel(AnnotatedType annotatedItem, AnnotatedType xmlAnnotatedItem, ContainerImpl container)
+ public EventComponentModel(AnnotatedType annotatedItem, AnnotatedType xmlAnnotatedItem, ManagerImpl container)
{
super(annotatedItem, xmlAnnotatedItem, container);
// This is needed later for the impl of Event to fire events with the container
@@ -42,7 +42,7 @@
* The implementation of the container used to create this model.
* @return the container
*/
- public Container getContainer()
+ public Manager getContainer()
{
return container;
}
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/MergedStereotypesModel.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/MergedStereotypesModel.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/MergedStereotypesModel.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -8,7 +8,7 @@
import javax.webbeans.Stereotype;
-import org.jboss.webbeans.ContainerImpl;
+import org.jboss.webbeans.ManagerImpl;
import org.jboss.webbeans.introspector.AnnotatedItem;
/**
@@ -25,7 +25,7 @@
private Set<Class<?>> requiredTypes;
private Set<Class<? extends Annotation>> supportedScopes;
- public MergedStereotypesModel(AnnotatedItem<E> annotatedItem, AnnotatedItem<E> xmlAnnotatedItem, ContainerImpl container)
+ public MergedStereotypesModel(AnnotatedItem<E> annotatedItem, AnnotatedItem<E> xmlAnnotatedItem, ManagerImpl container)
{
possibleDeploymentTypes = new HashMap<Class<? extends Annotation>, Annotation>();
possibleScopeTypes = new HashSet<Annotation>();
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/ProducerExpressionComponent.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/ProducerExpressionComponent.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/ProducerExpressionComponent.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -7,7 +7,7 @@
import javax.webbeans.Dependent;
-import org.jboss.webbeans.ContainerImpl;
+import org.jboss.webbeans.ManagerImpl;
import org.jboss.webbeans.injectable.ComponentConstructor;
import org.jboss.webbeans.introspector.AnnotatedItem;
import org.jboss.webbeans.introspector.SimpleAnnotatedItem;
@@ -19,7 +19,7 @@
private AnnotatedItem<Method> annotatedItem = new SimpleAnnotatedItem<Method>(new HashMap<Class<? extends Annotation>, Annotation>());
private String location;
- public ProducerExpressionComponent(AnnotatedItem<Method> xmlAnnotatedMethod, ContainerImpl container)
+ public ProducerExpressionComponent(AnnotatedItem<Method> xmlAnnotatedMethod, ManagerImpl container)
{
this.xmlAnnotatedItem = xmlAnnotatedMethod;
init(container);
@@ -38,7 +38,7 @@
}
@Override
- protected void init(ContainerImpl container)
+ protected void init(ManagerImpl container)
{
super.init(container);
}
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/ProducerMethodComponentModel.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/ProducerMethodComponentModel.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/ProducerMethodComponentModel.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -10,7 +10,7 @@
import javax.webbeans.Dependent;
-import org.jboss.webbeans.ContainerImpl;
+import org.jboss.webbeans.ManagerImpl;
import org.jboss.webbeans.injectable.ComponentConstructor;
import org.jboss.webbeans.injectable.InjectableMethod;
import org.jboss.webbeans.injectable.MethodConstructor;
@@ -34,14 +34,14 @@
private Type declaredComponentType;
@SuppressWarnings("unchecked")
- public ProducerMethodComponentModel(AnnotatedMethod annotatedMethod, ContainerImpl container)
+ public ProducerMethodComponentModel(AnnotatedMethod annotatedMethod, ManagerImpl container)
{
this.annotatedMethod = annotatedMethod;
init(container);
}
@Override
- protected void init(ContainerImpl container)
+ protected void init(ManagerImpl container)
{
super.init(container);
checkProducerMethod();
@@ -50,7 +50,7 @@
}
@Override
- protected void initDeploymentType(ContainerImpl container)
+ protected void initDeploymentType(ManagerImpl container)
{
super.initDeploymentType(container);
if (getDeploymentType() == null)
@@ -63,7 +63,7 @@
}
}
- protected void initDeclaringComponent(ContainerImpl container)
+ protected void initDeclaringComponent(ManagerImpl container)
{
declaringComponent = (AbstractComponentModel<?, Class<?>>) container.getModelManager().getComponentModel(getAnnotatedItem().getDelegate().getDeclaringClass());
}
@@ -88,7 +88,7 @@
}
@SuppressWarnings("unchecked")
- protected void initRemoveMethod(ContainerImpl container)
+ protected void initRemoveMethod(ManagerImpl container)
{
Set<Method> disposalMethods = container.resolveDisposalMethods(getType(), getBindingTypes().toArray(new Annotation[0]));
if (disposalMethods.size() == 1)
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/RemoteComponentModel.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/RemoteComponentModel.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/RemoteComponentModel.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -4,10 +4,7 @@
import java.util.HashSet;
import java.util.Set;
-import javax.webbeans.BoundTo;
-import javax.webbeans.Destroys;
-
-import org.jboss.webbeans.ContainerImpl;
+import org.jboss.webbeans.ManagerImpl;
import org.jboss.webbeans.injectable.ComponentConstructor;
import org.jboss.webbeans.injectable.EnterpriseConstructor;
import org.jboss.webbeans.injectable.InjectableMethod;
@@ -15,20 +12,41 @@
public class RemoteComponentModel<T> extends AbstractEnterpriseComponentModel<T>
{
+
+ public RemoteComponentModel(AnnotatedType<T> annotatedItem,
+ AnnotatedType<T> xmlAnnotatedItem)
+ {
+ super(annotatedItem, xmlAnnotatedItem);
+ // TODO Auto-generated constructor stub
+ }
+
+ @Override
+ public ComponentConstructor<T> getConstructor()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public String getLocation()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
- private EnterpriseConstructor<T> constructor;
+ /*private EnterpriseConstructor<T> constructor;
private String boundTo;
private String location;
public RemoteComponentModel(AnnotatedType annotatedItem,
- AnnotatedType xmlAnnotatedItem, ContainerImpl container)
+ AnnotatedType xmlAnnotatedItem, ManagerImpl container)
{
super(annotatedItem, xmlAnnotatedItem);
init(container);
}
@Override
- protected void init(ContainerImpl container)
+ protected void init(ManagerImpl container)
{
super.init(container);
// TODO initialize constructor
@@ -113,6 +131,6 @@
location = "type: Remote Enterprise Component; declaring class: " + getType() +";";
}
return location;
- }
+ }*/
}
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/SimpleComponentModel.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/SimpleComponentModel.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/SimpleComponentModel.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -7,7 +7,7 @@
import javax.webbeans.BindingType;
import javax.webbeans.Initializer;
-import org.jboss.webbeans.ContainerImpl;
+import org.jboss.webbeans.ManagerImpl;
import org.jboss.webbeans.injectable.SimpleConstructor;
import org.jboss.webbeans.introspector.AnnotatedType;
import org.jboss.webbeans.util.LoggerUtil;
@@ -29,14 +29,14 @@
* @param container
*/
@SuppressWarnings("unchecked")
- public SimpleComponentModel(AnnotatedType annotatedItem, AnnotatedType xmlAnnotatedItem, ContainerImpl container)
+ public SimpleComponentModel(AnnotatedType annotatedItem, AnnotatedType xmlAnnotatedItem, ManagerImpl container)
{
super(annotatedItem, xmlAnnotatedItem);
init(container);
}
@Override
- protected void init(ContainerImpl container)
+ protected void init(ManagerImpl container)
{
super.init(container);
initConstructor();
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/WebBeansFilter.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/WebBeansFilter.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/WebBeansFilter.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -8,8 +8,8 @@
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
-import javax.webbeans.Container;
import javax.webbeans.RequestScoped;
+import javax.webbeans.manager.Manager;
import org.jboss.webbeans.BasicContext;
import org.jboss.webbeans.init.Initialization;
@@ -21,11 +21,11 @@
*/
public class WebBeansFilter implements Filter
{
- private Container container;
+ private Manager container;
public void init(FilterConfig filterConfig) throws ServletException
{
- container = (Container) filterConfig.getServletContext().getAttribute(
+ container = (Manager) filterConfig.getServletContext().getAttribute(
Initialization.WEBBEANS_CONTAINER_KEY);
}
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/AbstractModelTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/AbstractModelTest.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/AbstractModelTest.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -5,8 +5,8 @@
import java.util.HashMap;
import java.util.List;
-import org.jboss.webbeans.ContainerImpl;
-import org.jboss.webbeans.bindings.StandardBinding;
+import org.jboss.webbeans.ManagerImpl;
+import org.jboss.webbeans.bindings.StandardAnnotationLiteral;
import org.jboss.webbeans.introspector.AnnotatedType;
import org.jboss.webbeans.introspector.SimpleAnnotatedType;
import org.jboss.webbeans.model.StereotypeModel;
@@ -16,15 +16,15 @@
import org.jboss.webbeans.test.annotations.MammalStereotype;
import org.jboss.webbeans.test.annotations.RequestScopedAnimalStereotype;
import org.jboss.webbeans.test.annotations.RiverFishStereotype;
-import org.jboss.webbeans.test.bindings.AnotherDeploymentTypeBinding;
-import org.jboss.webbeans.test.bindings.HornedAnimalDeploymentTypeBinding;
+import org.jboss.webbeans.test.bindings.AnotherDeploymentTypeAnnotationLiteral;
+import org.jboss.webbeans.test.bindings.HornedAnimalDeploymentTypeAnnotationLiteral;
import org.jboss.webbeans.test.mock.MockContainerImpl;
import org.testng.annotations.BeforeMethod;
public class AbstractModelTest
{
- protected ContainerImpl container;
+ protected ManagerImpl container;
protected AnnotatedType<?> emptyAnnotatedItem;
@@ -34,15 +34,15 @@
emptyAnnotatedItem = new SimpleAnnotatedType<Object>(null, new HashMap<Class<? extends Annotation>, Annotation>());
List<Annotation> enabledDeploymentTypes = new ArrayList<Annotation>();
- enabledDeploymentTypes.add(new StandardBinding());
- enabledDeploymentTypes.add(new AnotherDeploymentTypeBinding());
- enabledDeploymentTypes.add(new HornedAnimalDeploymentTypeBinding());
+ enabledDeploymentTypes.add(new StandardAnnotationLiteral());
+ enabledDeploymentTypes.add(new AnotherDeploymentTypeAnnotationLiteral());
+ enabledDeploymentTypes.add(new HornedAnimalDeploymentTypeAnnotationLiteral());
container = new MockContainerImpl(enabledDeploymentTypes);
initStereotypes(container);
}
- private void initStereotypes(ContainerImpl container)
+ private void initStereotypes(ManagerImpl container)
{
container.getModelManager().addStereotype(new StereotypeModel<AnimalStereotype>(new SimpleAnnotatedType<AnimalStereotype>(AnimalStereotype.class)));
container.getModelManager().addStereotype(new StereotypeModel<HornedMammalStereotype>(new SimpleAnnotatedType<HornedMammalStereotype>(HornedMammalStereotype.class)));
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/BindingTypeTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/BindingTypeTest.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/BindingTypeTest.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -11,7 +11,7 @@
import org.jboss.webbeans.model.SimpleComponentModel;
import org.jboss.webbeans.test.annotations.Asynchronous;
import org.jboss.webbeans.test.annotations.Synchronous;
-import org.jboss.webbeans.test.bindings.AsynchronousBinding;
+import org.jboss.webbeans.test.bindings.AsynchronousAnnotationLiteral;
import org.jboss.webbeans.test.components.Antelope;
import org.jboss.webbeans.test.components.Cat;
import org.jboss.webbeans.test.components.Order;
@@ -74,7 +74,7 @@
public void testBindingTypesDeclaredInXml()
{
Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>();
- annotations.put(Asynchronous.class, new AsynchronousBinding());
+ annotations.put(Asynchronous.class, new AsynchronousAnnotationLiteral());
AnnotatedType annotatedItem = new SimpleAnnotatedType(Antelope.class, annotations);
SimpleComponentModel<Antelope> antelope = new SimpleComponentModel<Antelope>(emptyAnnotatedItem, annotatedItem, container);
@@ -86,7 +86,7 @@
public void testXmlBindingTypeOverridesAndIgnoresJava()
{
Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>();
- annotations.put(Asynchronous.class, new AsynchronousBinding());
+ annotations.put(Asynchronous.class, new AsynchronousAnnotationLiteral());
AnnotatedType annotatedItem = new SimpleAnnotatedType(Cat.class, annotations);
SimpleComponentModel<Cat> cat = new SimpleComponentModel<Cat>(new SimpleAnnotatedType(Cat.class), annotatedItem, container);
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ConstructorModelTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ConstructorModelTest.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ConstructorModelTest.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -5,7 +5,7 @@
import javax.webbeans.Current;
-import org.jboss.webbeans.ContainerImpl;
+import org.jboss.webbeans.ManagerImpl;
import org.jboss.webbeans.injectable.SimpleConstructor;
import org.jboss.webbeans.introspector.AnnotatedType;
import org.jboss.webbeans.introspector.SimpleAnnotatedType;
@@ -27,7 +27,7 @@
public class ConstructorModelTest
{
- private ContainerImpl container;
+ private ManagerImpl container;
private AnnotatedType emptyAnnotatedItem;
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ContainerTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ContainerTest.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ContainerTest.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -7,12 +7,12 @@
import javax.webbeans.Production;
import javax.webbeans.Standard;
-import org.jboss.webbeans.ContainerImpl;
-import org.jboss.webbeans.bindings.StandardBinding;
+import org.jboss.webbeans.ManagerImpl;
+import org.jboss.webbeans.bindings.StandardAnnotationLiteral;
import org.jboss.webbeans.test.annotations.AnotherDeploymentType;
import org.jboss.webbeans.test.annotations.HornedAnimalDeploymentType;
-import org.jboss.webbeans.test.bindings.AnotherDeploymentTypeBinding;
-import org.jboss.webbeans.test.bindings.HornedAnimalDeploymentTypeBinding;
+import org.jboss.webbeans.test.bindings.AnotherDeploymentTypeAnnotationLiteral;
+import org.jboss.webbeans.test.bindings.HornedAnimalDeploymentTypeAnnotationLiteral;
import org.jboss.webbeans.test.mock.MockContainerImpl;
import org.testng.annotations.Test;
@@ -22,7 +22,7 @@
@Test
public void testDefaultEnabledDeploymentTypes()
{
- ContainerImpl container = new MockContainerImpl(null);
+ ManagerImpl container = new MockContainerImpl(null);
assert container.getEnabledDeploymentTypes().size() == 2;
assert container.getEnabledDeploymentTypes().get(0).annotationType().equals(Standard.class);
assert container.getEnabledDeploymentTypes().get(1).annotationType().equals(Production.class);
@@ -32,10 +32,10 @@
public void testCustomDeploymentTypes()
{
List<Annotation> enabledDeploymentTypes = new ArrayList<Annotation>();
- enabledDeploymentTypes.add(new StandardBinding());
- enabledDeploymentTypes.add(new AnotherDeploymentTypeBinding());
- enabledDeploymentTypes.add(new HornedAnimalDeploymentTypeBinding());
- ContainerImpl container = new MockContainerImpl(enabledDeploymentTypes);
+ enabledDeploymentTypes.add(new StandardAnnotationLiteral());
+ enabledDeploymentTypes.add(new AnotherDeploymentTypeAnnotationLiteral());
+ enabledDeploymentTypes.add(new HornedAnimalDeploymentTypeAnnotationLiteral());
+ ManagerImpl container = new MockContainerImpl(enabledDeploymentTypes);
assert container.getEnabledDeploymentTypes().size() == 3;
assert container.getEnabledDeploymentTypes().get(0).annotationType().equals(Standard.class);
assert container.getEnabledDeploymentTypes().get(1).annotationType().equals(AnotherDeploymentType.class);
@@ -46,8 +46,8 @@
public void testStandardMustBeDeclared()
{
List<Annotation> enabledDeploymentTypes = new ArrayList<Annotation>();
- enabledDeploymentTypes.add(new AnotherDeploymentTypeBinding());
- enabledDeploymentTypes.add(new HornedAnimalDeploymentTypeBinding());
+ enabledDeploymentTypes.add(new AnotherDeploymentTypeAnnotationLiteral());
+ enabledDeploymentTypes.add(new HornedAnimalDeploymentTypeAnnotationLiteral());
boolean exception = false;
try
{
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/DeploymentStrategyTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/DeploymentStrategyTest.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/DeploymentStrategyTest.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -2,7 +2,7 @@
import java.net.URL;
-import org.jboss.webbeans.ContainerImpl;
+import org.jboss.webbeans.ManagerImpl;
import org.jboss.webbeans.deployment.DeploymentStrategy;
import org.jboss.webbeans.scannotation.ClasspathUrlFinder;
import org.testng.annotations.Test;
@@ -14,7 +14,7 @@
public void testDeploymentStrategy()
{
URL[] urls = {ClasspathUrlFinder.findClassBase(DeploymentStrategyTest.class)};
- ContainerImpl container = new ContainerImpl(null);
+ ManagerImpl container = new ManagerImpl(null);
DeploymentStrategy deploymentStrategy = new DeploymentStrategy(Thread.currentThread().getContextClassLoader(), container);
deploymentStrategy.scan(urls, "org.jboss.webbeans.test.annotations.broken", "org.jboss.webbeans.test.bindings.broken", "org.jboss.webbeans.test.components.broken");
}
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EnterpriseComponentModelTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EnterpriseComponentModelTest.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EnterpriseComponentModelTest.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -7,7 +7,7 @@
import javax.webbeans.Current;
import javax.webbeans.Dependent;
-import org.jboss.webbeans.ContainerImpl;
+import org.jboss.webbeans.ManagerImpl;
import org.jboss.webbeans.introspector.AnnotatedType;
import org.jboss.webbeans.introspector.SimpleAnnotatedType;
import org.jboss.webbeans.model.AbstractEnterpriseComponentModel;
@@ -31,7 +31,7 @@
public class EnterpriseComponentModelTest
{
-private ContainerImpl container;
+private ManagerImpl container;
private AnnotatedType emptyAnnotatedItem;
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ObserverTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ObserverTest.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ObserverTest.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -9,12 +9,12 @@
import java.util.List;
import java.util.Map;
-import javax.webbeans.Observer;
import javax.webbeans.Observes;
import javax.webbeans.Production;
+import javax.webbeans.manager.Observer;
-import org.jboss.webbeans.ContainerImpl;
-import org.jboss.webbeans.bindings.StandardBinding;
+import org.jboss.webbeans.ManagerImpl;
+import org.jboss.webbeans.bindings.StandardAnnotationLiteral;
import org.jboss.webbeans.event.ObserverImpl;
import org.jboss.webbeans.event.ObserverMethod;
import org.jboss.webbeans.introspector.AnnotatedType;
@@ -26,8 +26,8 @@
import org.jboss.webbeans.test.annotations.FishStereotype;
import org.jboss.webbeans.test.annotations.RequestScopedAnimalStereotype;
import org.jboss.webbeans.test.annotations.RiverFishStereotype;
-import org.jboss.webbeans.test.bindings.AnotherDeploymentTypeBinding;
-import org.jboss.webbeans.test.bindings.AsynchronousBinding;
+import org.jboss.webbeans.test.bindings.AnotherDeploymentTypeAnnotationLiteral;
+import org.jboss.webbeans.test.bindings.AsynchronousAnnotationLiteral;
import org.jboss.webbeans.test.components.Tuna;
import org.jboss.webbeans.test.mock.MockContainerImpl;
import org.jboss.webbeans.util.Reflections;
@@ -42,7 +42,7 @@
*/
public class ObserverTest
{
- private ContainerImpl container;
+ private ManagerImpl container;
public class Event
{
@@ -61,14 +61,14 @@
public void before()
{
List<Annotation> enabledDeploymentTypes = new ArrayList<Annotation>();
- enabledDeploymentTypes.add(new StandardBinding());
- enabledDeploymentTypes.add(new AnotherDeploymentTypeBinding());
+ enabledDeploymentTypes.add(new StandardAnnotationLiteral());
+ enabledDeploymentTypes.add(new AnotherDeploymentTypeAnnotationLiteral());
container = new MockContainerImpl(enabledDeploymentTypes);
initStereotypes(container);
}
- private void initStereotypes(ContainerImpl container)
+ private void initStereotypes(ManagerImpl container)
{
container.getModelManager().addStereotype(new StereotypeModel(new SimpleAnnotatedType(AnimalStereotype.class)));
container.getModelManager().addStereotype(new StereotypeModel(new SimpleAnnotatedType(FishStereotype.class)));
@@ -86,7 +86,7 @@
{
// Create an observer with known binding types
Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>();
- annotations.put(Asynchronous.class, new AsynchronousBinding());
+ annotations.put(Asynchronous.class, new AsynchronousAnnotationLiteral());
AnnotatedType annotatedItem = new SimpleAnnotatedType(Tuna.class, annotations);
SimpleComponentModel<Tuna> tuna = new SimpleComponentModel<Tuna>(new SimpleAnnotatedType(Tuna.class), annotatedItem, container);
assert tuna.getDeploymentType().annotationType().equals(Production.class);
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerExpressionComponentModelTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerExpressionComponentModelTest.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerExpressionComponentModelTest.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -3,7 +3,7 @@
import java.lang.annotation.Annotation;
import java.util.HashMap;
-import org.jboss.webbeans.ContainerImpl;
+import org.jboss.webbeans.ManagerImpl;
import org.jboss.webbeans.introspector.AnnotatedType;
import org.jboss.webbeans.introspector.SimpleAnnotatedType;
import org.jboss.webbeans.test.mock.MockContainerImpl;
@@ -13,7 +13,7 @@
public class ProducerExpressionComponentModelTest
{
- private ContainerImpl container;
+ private ManagerImpl container;
private AnnotatedType<?> emptyAnnotatedItem;
@BeforeMethod
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerMethodComponentModelTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerMethodComponentModelTest.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerMethodComponentModelTest.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -7,7 +7,7 @@
import javax.webbeans.Current;
import javax.webbeans.Dependent;
-import org.jboss.webbeans.ContainerImpl;
+import org.jboss.webbeans.ManagerImpl;
import org.jboss.webbeans.introspector.AnnotatedType;
import org.jboss.webbeans.introspector.SimpleAnnotatedMethod;
import org.jboss.webbeans.introspector.SimpleAnnotatedType;
@@ -33,7 +33,7 @@
public class ProducerMethodComponentModelTest
{
- private ContainerImpl container;
+ private ManagerImpl container;
private AnnotatedType<?> emptyAnnotatedItem;
@BeforeMethod
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/RemoteComponentModelTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/RemoteComponentModelTest.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/RemoteComponentModelTest.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -5,7 +5,7 @@
import javax.webbeans.Current;
-import org.jboss.webbeans.ContainerImpl;
+import org.jboss.webbeans.ManagerImpl;
import org.jboss.webbeans.introspector.AnnotatedType;
import org.jboss.webbeans.introspector.SimpleAnnotatedType;
import org.jboss.webbeans.model.RemoteComponentModel;
@@ -23,7 +23,7 @@
public class RemoteComponentModelTest
{
- private ContainerImpl container;
+ /*private ManagerImpl container;
private AnnotatedType<?> emptyAnnotatedItem;
@BeforeMethod
@@ -107,6 +107,6 @@
public void testStereotypeOnOtherInterface()
{
assert false;
- }
+ }*/
}
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ScopeTypeTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ScopeTypeTest.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ScopeTypeTest.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -9,17 +9,17 @@
import javax.webbeans.Dependent;
import javax.webbeans.RequestScoped;
-import org.jboss.webbeans.bindings.ConversationScopedBinding;
-import org.jboss.webbeans.bindings.RequestScopedBinding;
+import org.jboss.webbeans.bindings.ConversationScopedAnnotationLiteral;
+import org.jboss.webbeans.bindings.RequestScopedAnnotationLiteral;
import org.jboss.webbeans.introspector.AnnotatedType;
import org.jboss.webbeans.introspector.SimpleAnnotatedType;
import org.jboss.webbeans.model.SimpleComponentModel;
import org.jboss.webbeans.test.annotations.AnimalStereotype;
import org.jboss.webbeans.test.annotations.FishStereotype;
import org.jboss.webbeans.test.annotations.RiverFishStereotype;
-import org.jboss.webbeans.test.bindings.AnimalStereotypeBinding;
-import org.jboss.webbeans.test.bindings.FishStereotypeBinding;
-import org.jboss.webbeans.test.bindings.RiverFishStereotypeBinding;
+import org.jboss.webbeans.test.bindings.AnimalStereotypeAnnotationLiteral;
+import org.jboss.webbeans.test.bindings.FishStereotypeAnnotationLiteral;
+import org.jboss.webbeans.test.bindings.RiverFishStereotypeAnnotationLiteral;
import org.jboss.webbeans.test.components.Antelope;
import org.jboss.webbeans.test.components.ComponentWithTooManyScopeTypes;
import org.jboss.webbeans.test.components.Haddock;
@@ -83,8 +83,8 @@
try
{
Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>();
- annotations.put(RequestScoped.class, new RequestScopedBinding());
- annotations.put(ConversationScoped.class, new ConversationScopedBinding());
+ annotations.put(RequestScoped.class, new RequestScopedAnnotationLiteral());
+ annotations.put(ConversationScoped.class, new ConversationScopedAnnotationLiteral());
AnnotatedType antelopeAnnotatedItem = new SimpleAnnotatedType(Antelope.class, annotations);
new SimpleComponentModel<Antelope>(emptyAnnotatedItem, antelopeAnnotatedItem, container);
}
@@ -99,7 +99,7 @@
public void testScopeDeclaredInXml()
{
Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>();
- annotations.put(RequestScoped.class, new RequestScopedBinding());
+ annotations.put(RequestScoped.class, new RequestScopedAnnotationLiteral());
AnnotatedType annotatedItem = new SimpleAnnotatedType(Order.class, annotations);
SimpleComponentModel<Order> order = new SimpleComponentModel<Order>(new SimpleAnnotatedType(Order.class), annotatedItem, container);
@@ -120,7 +120,7 @@
public void testScopeDeclaredInXmlOverridesJava()
{
Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>();
- annotations.put(ConversationScoped.class, new ConversationScopedBinding());
+ annotations.put(ConversationScoped.class, new ConversationScopedAnnotationLiteral());
AnnotatedType annotatedItem = new SimpleAnnotatedType(SeaBass.class, annotations);
SimpleComponentModel<SeaBass> trout = new SimpleComponentModel<SeaBass>(new SimpleAnnotatedType(SeaBass.class), annotatedItem, container);
assert trout.getScopeType().annotationType().equals(ConversationScoped.class);
@@ -137,7 +137,7 @@
public void testScopeSpecifiedAndStereotyped()
{
Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>();
- annotations.put(FishStereotype.class, new FishStereotypeBinding());
+ annotations.put(FishStereotype.class, new FishStereotypeAnnotationLiteral());
AnnotatedType annotatedItem = new SimpleAnnotatedType(SeaBass.class, annotations);
SimpleComponentModel<SeaBass> trout = new SimpleComponentModel<SeaBass>(new SimpleAnnotatedType(SeaBass.class), annotatedItem, container);
assert trout.getScopeType().annotationType().equals(RequestScoped.class);
@@ -147,8 +147,8 @@
public void testMutipleIncompatibleScopeStereotypes()
{
Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>();
- annotations.put(FishStereotype.class, new FishStereotypeBinding());
- annotations.put(AnimalStereotype.class, new AnimalStereotypeBinding());
+ annotations.put(FishStereotype.class, new FishStereotypeAnnotationLiteral());
+ annotations.put(AnimalStereotype.class, new AnimalStereotypeAnnotationLiteral());
AnnotatedType annotatedItem = new SimpleAnnotatedType(Haddock.class, annotations);
boolean exception = false;
@@ -167,8 +167,8 @@
public void testMutipleIncompatibleScopeStereotypesWithScopeSpecified()
{
Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>();
- annotations.put(FishStereotype.class, new FishStereotypeBinding());
- annotations.put(AnimalStereotype.class, new AnimalStereotypeBinding());
+ annotations.put(FishStereotype.class, new FishStereotypeAnnotationLiteral());
+ annotations.put(AnimalStereotype.class, new AnimalStereotypeAnnotationLiteral());
AnnotatedType annotatedItem = new SimpleAnnotatedType(SeaBass.class, annotations);
SimpleComponentModel<SeaBass> trout = new SimpleComponentModel<SeaBass>(new SimpleAnnotatedType(SeaBass.class), annotatedItem, container);
@@ -179,8 +179,8 @@
public void testMutipleCompatibleScopeStereotypes()
{
Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>();
- annotations.put(FishStereotype.class, new FishStereotypeBinding());
- annotations.put(RiverFishStereotype.class, new RiverFishStereotypeBinding());
+ annotations.put(FishStereotype.class, new FishStereotypeAnnotationLiteral());
+ annotations.put(RiverFishStereotype.class, new RiverFishStereotypeAnnotationLiteral());
AnnotatedType annotatedItem = new SimpleAnnotatedType(Haddock.class, annotations);
SimpleComponentModel<Haddock> haddock = new SimpleComponentModel<Haddock>(new SimpleAnnotatedType(Haddock.class), annotatedItem, container);
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleComponentModelTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleComponentModelTest.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleComponentModelTest.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -15,13 +15,13 @@
import javax.webbeans.Production;
import javax.webbeans.RequestScoped;
-import org.jboss.webbeans.ContainerImpl;
-import org.jboss.webbeans.bindings.ConversationScopedBinding;
-import org.jboss.webbeans.bindings.CurrentBinding;
-import org.jboss.webbeans.bindings.DependentBinding;
-import org.jboss.webbeans.bindings.NamedBinding;
-import org.jboss.webbeans.bindings.RequestScopedBinding;
-import org.jboss.webbeans.bindings.StandardBinding;
+import org.jboss.webbeans.ManagerImpl;
+import org.jboss.webbeans.bindings.ConversationScopedAnnotationLiteral;
+import org.jboss.webbeans.bindings.CurrentAnnotationLiteral;
+import org.jboss.webbeans.bindings.DependentAnnotationLiteral;
+import org.jboss.webbeans.bindings.NamedAnnotationLiteral;
+import org.jboss.webbeans.bindings.RequestScopedAnnotationLiteral;
+import org.jboss.webbeans.bindings.StandardAnnotationLiteral;
import org.jboss.webbeans.introspector.AnnotatedType;
import org.jboss.webbeans.introspector.SimpleAnnotatedType;
import org.jboss.webbeans.model.SimpleComponentModel;
@@ -36,14 +36,14 @@
import org.jboss.webbeans.test.annotations.RequestScopedAnimalStereotype;
import org.jboss.webbeans.test.annotations.RiverFishStereotype;
import org.jboss.webbeans.test.annotations.Synchronous;
-import org.jboss.webbeans.test.bindings.AnimalStereotypeBinding;
-import org.jboss.webbeans.test.bindings.AnotherDeploymentTypeBinding;
-import org.jboss.webbeans.test.bindings.AsynchronousBinding;
-import org.jboss.webbeans.test.bindings.FishStereotypeBinding;
-import org.jboss.webbeans.test.bindings.HornedAnimalDeploymentTypeBinding;
-import org.jboss.webbeans.test.bindings.HornedMamalStereotypeBinding;
-import org.jboss.webbeans.test.bindings.RiverFishStereotypeBinding;
-import org.jboss.webbeans.test.bindings.SynchronousBinding;
+import org.jboss.webbeans.test.bindings.AnimalStereotypeAnnotationLiteral;
+import org.jboss.webbeans.test.bindings.AnotherDeploymentTypeAnnotationLiteral;
+import org.jboss.webbeans.test.bindings.AsynchronousAnnotationLiteral;
+import org.jboss.webbeans.test.bindings.FishStereotypeAnnotationLiteral;
+import org.jboss.webbeans.test.bindings.HornedAnimalDeploymentTypeAnnotationLiteral;
+import org.jboss.webbeans.test.bindings.HornedMamalStereotypeAnnotationLiteral;
+import org.jboss.webbeans.test.bindings.RiverFishStereotypeAnnotationLiteral;
+import org.jboss.webbeans.test.bindings.SynchronousAnnotationLiteral;
import org.jboss.webbeans.test.components.Antelope;
import org.jboss.webbeans.test.components.Carp;
import org.jboss.webbeans.test.components.Cat;
@@ -70,7 +70,7 @@
public class SimpleComponentModelTest
{
- private ContainerImpl container;
+ private ManagerImpl container;
private AnnotatedType emptyAnnotatedItem;
@@ -80,15 +80,15 @@
emptyAnnotatedItem = new SimpleAnnotatedType(null, new HashMap<Class<? extends Annotation>, Annotation>());
List<Annotation> enabledDeploymentTypes = new ArrayList<Annotation>();
- enabledDeploymentTypes.add(new StandardBinding());
- enabledDeploymentTypes.add(new AnotherDeploymentTypeBinding());
- enabledDeploymentTypes.add(new HornedAnimalDeploymentTypeBinding());
+ enabledDeploymentTypes.add(new StandardAnnotationLiteral());
+ enabledDeploymentTypes.add(new AnotherDeploymentTypeAnnotationLiteral());
+ enabledDeploymentTypes.add(new HornedAnimalDeploymentTypeAnnotationLiteral());
container = new MockContainerImpl(enabledDeploymentTypes);
initStereotypes(container);
}
- private void initStereotypes(ContainerImpl container)
+ private void initStereotypes(ManagerImpl container)
{
container.getModelManager().addStereotype(new StereotypeModel(new SimpleAnnotatedType(AnimalStereotype.class)));
container.getModelManager().addStereotype(new StereotypeModel(new SimpleAnnotatedType(HornedMammalStereotype.class)));
@@ -121,7 +121,7 @@
public void testXmlDeploymentTypeOverridesJava()
{
Map<Class<? extends Annotation>, Annotation> xmlDefinedDeploymentTypeAnnotations = new HashMap<Class<? extends Annotation>, Annotation>();
- xmlDefinedDeploymentTypeAnnotations.put(AnotherDeploymentType.class, new AnotherDeploymentTypeBinding());
+ xmlDefinedDeploymentTypeAnnotations.put(AnotherDeploymentType.class, new AnotherDeploymentTypeAnnotationLiteral());
AnnotatedType xmlDefinedDeploymentTypeAnnotatedItem = new SimpleAnnotatedType(ComponentWithTooManyDeploymentTypes.class, xmlDefinedDeploymentTypeAnnotations);
SimpleComponentModel<ComponentWithTooManyDeploymentTypes> component = new SimpleComponentModel<ComponentWithTooManyDeploymentTypes>(new SimpleAnnotatedType(ComponentWithTooManyDeploymentTypes.class), xmlDefinedDeploymentTypeAnnotatedItem, container);
@@ -148,7 +148,7 @@
public void testDeploymentTypePrecedenceSelection()
{
Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>();
- annotations.put(HornedMammalStereotype.class, new HornedMamalStereotypeBinding());
+ annotations.put(HornedMammalStereotype.class, new HornedMamalStereotypeAnnotationLiteral());
AnnotatedType annotatedItem = new SimpleAnnotatedType(Moose.class, annotations);
SimpleComponentModel<Moose> moose = new SimpleComponentModel<Moose>(new SimpleAnnotatedType(Moose.class), annotatedItem, container);
@@ -160,7 +160,7 @@
public void testDeploymentTypeSpecifiedAndStereotyped()
{
Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>();
- annotations.put(FishStereotype.class, new FishStereotypeBinding());
+ annotations.put(FishStereotype.class, new FishStereotypeAnnotationLiteral());
AnnotatedType annotatedItem = new SimpleAnnotatedType(SeaBass.class, annotations);
SimpleComponentModel<SeaBass> trout = new SimpleComponentModel<SeaBass>(new SimpleAnnotatedType(SeaBass.class), annotatedItem, container);
assert trout.getScopeType().annotationType().equals(RequestScoped.class);
@@ -184,7 +184,7 @@
public void testDefaultXmlNamed()
{
Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>();
- annotations.put(Named.class, new NamedBinding()
+ annotations.put(Named.class, new NamedAnnotationLiteral()
{
public String value()
@@ -203,7 +203,7 @@
public void testNonDefaultXmlNamed()
{
Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>();
- annotations.put(Named.class, new NamedBinding()
+ annotations.put(Named.class, new NamedAnnotationLiteral()
{
public String value()
@@ -239,9 +239,9 @@
public void testStereotypeDeclaredInXmlAndJava()
{
Map<Class<? extends Annotation>, Annotation> orderXmlAnnotations = new HashMap<Class<? extends Annotation>, Annotation>();
- orderXmlAnnotations.put(Current.class, new CurrentBinding());
- orderXmlAnnotations.put(Synchronous.class, new SynchronousBinding());
- orderXmlAnnotations.put(Named.class, new NamedBinding()
+ orderXmlAnnotations.put(Current.class, new CurrentAnnotationLiteral());
+ orderXmlAnnotations.put(Synchronous.class, new SynchronousAnnotationLiteral());
+ orderXmlAnnotations.put(Named.class, new NamedAnnotationLiteral()
{
public String value()
{
@@ -361,7 +361,7 @@
assert exception;
Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>();
- annotations.put(Dependent.class, new DependentBinding());
+ annotations.put(Dependent.class, new DependentAnnotationLiteral());
AnnotatedType annotatedItem = new SimpleAnnotatedType(Horse.class, annotations);
try
{
@@ -388,7 +388,7 @@
assert exception;
Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>();
- annotations.put(Dependent.class, new DependentBinding());
+ annotations.put(Dependent.class, new DependentAnnotationLiteral());
AnnotatedType annotatedItem = new SimpleAnnotatedType(Pig.class, annotations);
try
{
Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/AnimalStereotypeAnnotationLiteral.java (from rev 78, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/AnimalStereotypeBinding.java)
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/AnimalStereotypeAnnotationLiteral.java (rev 0)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/AnimalStereotypeAnnotationLiteral.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -0,0 +1,10 @@
+package org.jboss.webbeans.test.bindings;
+
+import javax.webbeans.AnnotationLiteral;
+
+import org.jboss.webbeans.test.annotations.AnimalStereotype;
+
+public class AnimalStereotypeAnnotationLiteral extends AnnotationLiteral<AnimalStereotype> implements AnimalStereotype
+{
+
+}
Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/AnimalStereotypeAnnotationLiteral.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/AnimalStereotypeBinding.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/AnimalStereotypeBinding.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/AnimalStereotypeBinding.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -1,10 +0,0 @@
-package org.jboss.webbeans.test.bindings;
-
-import javax.webbeans.DynamicBinding;
-
-import org.jboss.webbeans.test.annotations.AnimalStereotype;
-
-public class AnimalStereotypeBinding extends DynamicBinding<AnimalStereotype> implements AnimalStereotype
-{
-
-}
Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/AnotherDeploymentTypeAnnotationLiteral.java (from rev 78, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/AnotherDeploymentTypeBinding.java)
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/AnotherDeploymentTypeAnnotationLiteral.java (rev 0)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/AnotherDeploymentTypeAnnotationLiteral.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -0,0 +1,10 @@
+/**
+ *
+ */
+package org.jboss.webbeans.test.bindings;
+
+import javax.webbeans.AnnotationLiteral;
+
+import org.jboss.webbeans.test.annotations.AnotherDeploymentType;
+
+public class AnotherDeploymentTypeAnnotationLiteral extends AnnotationLiteral<AnotherDeploymentType> implements AnotherDeploymentType {}
\ No newline at end of file
Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/AnotherDeploymentTypeAnnotationLiteral.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/AnotherDeploymentTypeBinding.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/AnotherDeploymentTypeBinding.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/AnotherDeploymentTypeBinding.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -1,10 +0,0 @@
-/**
- *
- */
-package org.jboss.webbeans.test.bindings;
-
-import javax.webbeans.DynamicBinding;
-
-import org.jboss.webbeans.test.annotations.AnotherDeploymentType;
-
-public class AnotherDeploymentTypeBinding extends DynamicBinding<AnotherDeploymentType> implements AnotherDeploymentType {}
\ No newline at end of file
Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/AsynchronousAnnotationLiteral.java (from rev 78, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/AsynchronousBinding.java)
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/AsynchronousAnnotationLiteral.java (rev 0)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/AsynchronousAnnotationLiteral.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -0,0 +1,11 @@
+/**
+ *
+ */
+package org.jboss.webbeans.test.bindings;
+
+import javax.webbeans.AnnotationLiteral;
+
+import org.jboss.webbeans.test.annotations.Asynchronous;
+
+
+public class AsynchronousAnnotationLiteral extends AnnotationLiteral<Asynchronous> implements Asynchronous {}
\ No newline at end of file
Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/AsynchronousAnnotationLiteral.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/AsynchronousBinding.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/AsynchronousBinding.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/AsynchronousBinding.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -1,11 +0,0 @@
-/**
- *
- */
-package org.jboss.webbeans.test.bindings;
-
-import javax.webbeans.DynamicBinding;
-
-import org.jboss.webbeans.test.annotations.Asynchronous;
-
-
-public class AsynchronousBinding extends DynamicBinding<Asynchronous> implements Asynchronous {}
\ No newline at end of file
Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/FishStereotypeAnnotationLiteral.java (from rev 78, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/FishStereotypeBinding.java)
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/FishStereotypeAnnotationLiteral.java (rev 0)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/FishStereotypeAnnotationLiteral.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -0,0 +1,10 @@
+package org.jboss.webbeans.test.bindings;
+
+import javax.webbeans.AnnotationLiteral;
+
+import org.jboss.webbeans.test.annotations.RiverFishStereotype;
+
+public class FishStereotypeAnnotationLiteral extends AnnotationLiteral<RiverFishStereotype> implements RiverFishStereotype
+{
+
+}
Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/FishStereotypeAnnotationLiteral.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/FishStereotypeBinding.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/FishStereotypeBinding.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/FishStereotypeBinding.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -1,10 +0,0 @@
-package org.jboss.webbeans.test.bindings;
-
-import javax.webbeans.DynamicBinding;
-
-import org.jboss.webbeans.test.annotations.RiverFishStereotype;
-
-public class FishStereotypeBinding extends DynamicBinding<RiverFishStereotype> implements RiverFishStereotype
-{
-
-}
Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/HornedAnimalDeploymentTypeAnnotationLiteral.java (from rev 78, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/HornedAnimalDeploymentTypeBinding.java)
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/HornedAnimalDeploymentTypeAnnotationLiteral.java (rev 0)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/HornedAnimalDeploymentTypeAnnotationLiteral.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -0,0 +1,10 @@
+/**
+ *
+ */
+package org.jboss.webbeans.test.bindings;
+
+import javax.webbeans.AnnotationLiteral;
+
+import org.jboss.webbeans.test.annotations.HornedAnimalDeploymentType;
+
+public class HornedAnimalDeploymentTypeAnnotationLiteral extends AnnotationLiteral<HornedAnimalDeploymentType> implements HornedAnimalDeploymentType {}
\ No newline at end of file
Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/HornedAnimalDeploymentTypeAnnotationLiteral.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/HornedAnimalDeploymentTypeBinding.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/HornedAnimalDeploymentTypeBinding.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/HornedAnimalDeploymentTypeBinding.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -1,10 +0,0 @@
-/**
- *
- */
-package org.jboss.webbeans.test.bindings;
-
-import javax.webbeans.DynamicBinding;
-
-import org.jboss.webbeans.test.annotations.HornedAnimalDeploymentType;
-
-public class HornedAnimalDeploymentTypeBinding extends DynamicBinding<HornedAnimalDeploymentType> implements HornedAnimalDeploymentType {}
\ No newline at end of file
Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/HornedMamalStereotypeAnnotationLiteral.java (from rev 78, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/HornedMamalStereotypeBinding.java)
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/HornedMamalStereotypeAnnotationLiteral.java (rev 0)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/HornedMamalStereotypeAnnotationLiteral.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -0,0 +1,10 @@
+/**
+ *
+ */
+package org.jboss.webbeans.test.bindings;
+
+import javax.webbeans.AnnotationLiteral;
+
+import org.jboss.webbeans.test.annotations.HornedMammalStereotype;
+
+public class HornedMamalStereotypeAnnotationLiteral extends AnnotationLiteral<HornedMammalStereotype> implements HornedMammalStereotype {}
\ No newline at end of file
Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/HornedMamalStereotypeAnnotationLiteral.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/HornedMamalStereotypeBinding.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/HornedMamalStereotypeBinding.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/HornedMamalStereotypeBinding.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -1,10 +0,0 @@
-/**
- *
- */
-package org.jboss.webbeans.test.bindings;
-
-import javax.webbeans.DynamicBinding;
-
-import org.jboss.webbeans.test.annotations.HornedMammalStereotype;
-
-public class HornedMamalStereotypeBinding extends DynamicBinding<HornedMammalStereotype> implements HornedMammalStereotype {}
\ No newline at end of file
Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/RiverFishStereotypeAnnotationLiteral.java (from rev 78, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/RiverFishStereotypeBinding.java)
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/RiverFishStereotypeAnnotationLiteral.java (rev 0)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/RiverFishStereotypeAnnotationLiteral.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -0,0 +1,10 @@
+package org.jboss.webbeans.test.bindings;
+
+import javax.webbeans.AnnotationLiteral;
+
+import org.jboss.webbeans.test.annotations.FishStereotype;
+
+public class RiverFishStereotypeAnnotationLiteral extends AnnotationLiteral<FishStereotype> implements FishStereotype
+{
+
+}
Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/RiverFishStereotypeAnnotationLiteral.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/RiverFishStereotypeBinding.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/RiverFishStereotypeBinding.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/RiverFishStereotypeBinding.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -1,10 +0,0 @@
-package org.jboss.webbeans.test.bindings;
-
-import javax.webbeans.DynamicBinding;
-
-import org.jboss.webbeans.test.annotations.FishStereotype;
-
-public class RiverFishStereotypeBinding extends DynamicBinding<FishStereotype> implements FishStereotype
-{
-
-}
Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/SynchronousAnnotationLiteral.java (from rev 78, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/SynchronousBinding.java)
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/SynchronousAnnotationLiteral.java (rev 0)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/SynchronousAnnotationLiteral.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -0,0 +1,10 @@
+package org.jboss.webbeans.test.bindings;
+
+import javax.webbeans.AnnotationLiteral;
+
+import org.jboss.webbeans.test.annotations.Synchronous;
+
+public class SynchronousAnnotationLiteral extends AnnotationLiteral<Synchronous> implements Synchronous
+{
+
+}
Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/SynchronousAnnotationLiteral.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/SynchronousBinding.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/SynchronousBinding.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/bindings/SynchronousBinding.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -1,10 +0,0 @@
-package org.jboss.webbeans.test.bindings;
-
-import javax.webbeans.DynamicBinding;
-
-import org.jboss.webbeans.test.annotations.Synchronous;
-
-public class SynchronousBinding extends DynamicBinding<Synchronous> implements Synchronous
-{
-
-}
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Baboon.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Baboon.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Baboon.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -1,12 +1,11 @@
package org.jboss.webbeans.test.components;
import javax.ejb.Remote;
-import javax.webbeans.BoundTo;
import javax.webbeans.Production;
@Remote
@Production
- at BoundTo("/beans/baboon")
+// TODO @BoundTo("/beans/baboon")
public interface Baboon extends Animal
{
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Cheetah.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Cheetah.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Cheetah.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -1,14 +1,14 @@
package org.jboss.webbeans.test.components;
import javax.ejb.Remove;
-import javax.webbeans.Destroys;
+import javax.webbeans.Destructor;
import javax.webbeans.Production;
@Production
public class Cheetah
{
- @Remove @Destroys
+ @Remove @Destructor
public void remove()
{
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Cougar.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Cougar.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Cougar.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -2,7 +2,7 @@
import javax.ejb.Remove;
import javax.ejb.Stateful;
-import javax.webbeans.Destroys;
+import javax.webbeans.Destructor;
import javax.webbeans.Production;
@Production
@@ -16,13 +16,13 @@
}
- @Remove @Destroys
+ @Remove @Destructor
public void remove1()
{
}
- @Remove @Destroys
+ @Remove @Destructor
public void remove2()
{
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Elephant.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Elephant.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Elephant.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -2,7 +2,7 @@
import javax.ejb.Remove;
import javax.ejb.Stateful;
-import javax.webbeans.Destroys;
+import javax.webbeans.Destructor;
import javax.webbeans.Production;
@Production
@@ -16,7 +16,7 @@
}
- @Remove @Destroys
+ @Remove @Destructor
public void remove2()
{
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Orangutan.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Orangutan.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Orangutan.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -1,19 +1,18 @@
package org.jboss.webbeans.test.components;
import javax.ejb.Remote;
-import javax.webbeans.BoundTo;
-import javax.webbeans.Destroys;
+import javax.webbeans.Destructor;
import javax.webbeans.Named;
import javax.webbeans.Production;
@Remote
@Production
- at BoundTo("/beans/orangutan")
+//TODO @BoundTo("/beans/orangutan")
@Named
public interface Orangutan extends Animal
{
- @Destroys
+ @Destructor
public void removeOrangutan();
}
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/TameOrangutan.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/TameOrangutan.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/TameOrangutan.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -1,7 +1,6 @@
package org.jboss.webbeans.test.components;
import javax.ejb.Remote;
-import javax.webbeans.BoundTo;
import javax.webbeans.Named;
import javax.webbeans.Production;
@@ -9,7 +8,7 @@
@Remote
@Production
- at BoundTo("/beans/tame/orangutan")
+// TODO @BoundTo("/beans/tame/orangutan")
@Tame
@Named
public interface TameOrangutan extends Orangutan
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/broken/Chimpanzee.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/broken/Chimpanzee.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/broken/Chimpanzee.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -1,17 +1,16 @@
package org.jboss.webbeans.test.components.broken;
import javax.ejb.Remote;
-import javax.webbeans.BoundTo;
-import javax.webbeans.Destroys;
+import javax.webbeans.Destructor;
import javax.webbeans.Production;
@Remote
- at BoundTo("/beans/Chimpanzee")
+// TODO @BoundTo("/beans/Chimpanzee")
@Production
public interface Chimpanzee
{
- @Destroys
+ @Destructor
public void remove(String foo);
}
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/broken/Gibbon.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/broken/Gibbon.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/broken/Gibbon.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -1,20 +1,19 @@
package org.jboss.webbeans.test.components.broken;
import javax.ejb.Remote;
-import javax.webbeans.BoundTo;
-import javax.webbeans.Destroys;
+import javax.webbeans.Destructor;
import javax.webbeans.Production;
@Remote
- at BoundTo("/beans/Chimpanzee")
+// TODO @BoundTo("/beans/Chimpanzee")
@Production
public interface Gibbon
{
- @Destroys
+ @Destructor
public void remove();
- @Destroys
+ @Destructor
public void removeAgain();
}
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockContainerImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockContainerImpl.java 2008-09-26 12:44:21 UTC (rev 110)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockContainerImpl.java 2008-09-28 11:39:24 UTC (rev 111)
@@ -3,9 +3,9 @@
import java.lang.annotation.Annotation;
import java.util.List;
-import org.jboss.webbeans.ContainerImpl;
+import org.jboss.webbeans.ManagerImpl;
-public class MockContainerImpl extends ContainerImpl
+public class MockContainerImpl extends ManagerImpl
{
public MockContainerImpl(List<Annotation> enabledDeploymentTypes)
More information about the weld-commits
mailing list