deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/CdiTestRunner.java (7 lines):
	- line 221: //TODO use Rules instead
	- line 243: //TODO use Rules instead
	- line 286: //TODO use Rules instead
	- line 502: //skip scope-handling if @TestControl isn't used explicitly on the test-class -> TODO re-visit it
	- line 700: //force a clean context - TODO discuss onScopeStopped call
	- line 768: //TODO check if context was started by parent
	- line 840: //TODO better handling for invalid constellations


deltaspike/modules/jpa/impl/src/main/java/org/apache/deltaspike/jpa/impl/transaction/BeanManagedUserTransactionStrategy.java (4 lines):
	- line 53: //TODO move to a separated ds-jta module and use @Specializes -> no additional config is needed
	- line 71: applyTransactionTimeout(); //needs to be done before UserTransaction#begin - TODO move this call
	- line 240: //currently to filter STATUS_UNKNOWN - see to-do -> TODO re-visit it
	- line 358: this.getTransactionStatus() != Status.STATUS_UNKNOWN; //TODO re-visit it


deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/view/metadata/CallbackDescriptor.java (3 lines):
	- line 61: //TODO discuss how deep we should scan
	- line 116: //fallback to the default (which might exist) -> TODO check meta-data of Bean<T>
	- line 136: //ds now allows callbacks with parameters -> TODO refactor this approach


deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/DefaultConfigNodeConverter.java (3 lines):
	- line 94: //TODO add qualifier support
	- line 105: //TODO move to stereotype-util, improve it and merge it with DefaultViewConfigInheritanceStrategy
	- line 234: //TODO add aggregation in case of arrays


deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/HierarchyDiscovery.java (3 lines):
	- line 36: //X TODO: Look at merging this with ClassUtils perhaps
	- line 37: //X TODO: JavaDoc
	- line 38: //X TODO review


deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/listener/phase/DeltaSpikePhaseListener.java (3 lines):
	- line 182: //TODO check if we have to restrict the other callbacks as well
	- line 185: //TODO don't call the callbacks in case of an initial redirct
	- line 228: //TODO discuss how we handle it


deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/util/JsfUtils.java (3 lines):
	- line 83: //TODO add multi-value support
	- line 312: //TODO log it in case of project-stage development
	- line 349: //TODO discuss how we handle it


deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/view/metadata/ViewConfigResolver.java (2 lines):
	- line 34: //TODO re-visit name since we also need ConfigDescriptor
	- line 48: //TODO re-visit name (depends on other discussions)


deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ReflectionUtils.java (2 lines):
	- line 45: //X TODO: Look at merging this with some of the other classes from CODI, or if they're really needed
	- line 46: //X TODO: Also some methods need JavaDoc


deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/DefaultErrorViewAwareExceptionHandlerWrapper.java (2 lines):
	- line 94: //TODO show it in case of project-stage development
	- line 142: //TODO it should be possible to configure the exceptions we handle


deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/listener/request/DeltaSpikeLifecycleWrapper.java (2 lines):
	- line 67: * //TODO StartupEvent
	- line 80: //TODO broadcastApplicationStartupBroadcaster();


deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/authorization/DefaultAccessDecisionVoterContext.java (2 lines):
	- line 35: @RequestScoped //TODO we might need a different scope for it
	- line 110: //TODO specify nested security calls


deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/control/event/ExceptionStackEvent.java (2 lines):
	- line 47: // private Deque<ExceptionStackItem> origExceptionStackItems; // TODO: Later
	- line 85: // TODO: Later this.origExceptionStackItems = new ArrayDeque<ExceptionStackItem>(exceptionStackItems);


deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/conversation/GroupedConversationContext.java (2 lines):
	- line 42: //TODO add RequestCache
	- line 43: //TODO ConversationSubGroup


deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/authorization/AccessDeniedExceptionBroadcaster.java (2 lines):
	- line 21: //X TODO import org.apache.deltaspike.core.api.exception.control.event.ExceptionToCatchEvent;
	- line 39: /* TODO: gpetracek please


deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/view/metadata/ConfigDescriptor.java (2 lines):
	- line 81: //TODO <T extends ExecutableCallbackDescriptor<?>> when major version is incremented
	- line 95: //TODO <T extends ExecutableCallbackDescriptor<?>> when major version is incremented


deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/listener/phase/JsfRequestLifecycleBroadcaster.java (2 lines):
	- line 104: //TODO discuss exception handling
	- line 124: //TODO discuss exception handling


deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/ExcludeExtension.java (2 lines):
	- line 127: //TODO needs further discussions for a different feature CodiStartupBroadcaster.broadcastStartup();
	- line 158: //TODO re-visit the impact of java.lang.annotation.Inherited (for @Exclude) for the available use-cases


deltaspike/modules/jpa/impl/src/main/java/org/apache/deltaspike/jpa/impl/transaction/EnvironmentAwareTransactionStrategy.java (2 lines):
	- line 58: //TODO depending on further discussions about an own JTA module, BeanManagedUserTransactionStrategy
	- line 97: applyTransactionTimeout(); //needs to be done before UserTransaction#begin - TODO move this call


deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/view/metadata/DefaultCallback.java (1 line):
	- line 62: //TODO find a better name


deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/util/ClientWindowHelper.java (1 line):
	- line 70: // TODO currently this is broken in Mojarra and will be fixed in 4.0.6


deltaspike/core/impl/obsolete/src/main/java/org/apache/deltaspike/core/impl/control/HandlerMethodStorage.java (1 line):
	- line 34: //X TODO move it to the spi package - otherwise there is no need for an interface


deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/clientwindow/DeltaSpikeClientWindow.java (1 line):
	- line 75: //X TODO proper mechanism


deltaspike/modules/jpa/impl/src/main/java/org/apache/deltaspike/jpa/impl/transaction/context/EntityManagerEntry.java (1 line):
	- line 32: //TODO DELTASPIKE-259 - use the annotation itself + calculate a key for #hashCode and #equals


deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/InjectableMethod.java (1 line):
	- line 195: //X TODO check if it is compatible with Weld


deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/future/DefaultFutureableStrategy.java (1 line):
	- line 221: // TODO: handle cancel


deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/listener/action/DeltaSpikeActionListener.java (1 line):
	- line 61: //TODO re-visit it


deltaspike/modules/proxy/api/src/main/java/org/apache/deltaspike/proxy/spi/DeltaSpikeProxyClassGeneratorHolder.java (1 line):
	- line 24: // TODO it would be great if we could just rewrite it to an AppScoped bean


deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/listener/phase/BeforePhase.java (1 line):
	- line 39: * //TODO - for lifecycle callbacks in view-definitions


deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/conversation/ConversationKey.java (1 line):
	- line 45: //TODO maybe we have to add a real qualifier instead


deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/literal/ViewLiteral.java (1 line):
	- line 31: //TODO remove null trick once we can merge with default values and the tests pass


deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/control/Handles.java (1 line):
	- line 48: int ordinal() default 0; //TODO discuss Precedence


deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/view/metadata/Aggregated.java (1 line):
	- line 37: //TODO re-visit and discuss method-level (for annotation-attributes)


deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authorization/AccessDecisionVoterContext.java (1 line):
	- line 43: * TODO review it (this method is new)


deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/listener/phase/AfterPhase.java (1 line):
	- line 43: * //TODO - for lifecycle callbacks in view-definitions


deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedConstructorImpl.java (1 line):
	- line 52: // TODO: investigate this behavior further, on different JVM's and


deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/projectstage/ProjectStage.java (1 line):
	- line 57: * <li>TODO specify!</li>


deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/jmx/MBeanExtension.java (1 line):
	- line 164: // TODO we have to check the origin of this issue


deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ProjectStageProducer.java (1 line):
	- line 61: //TODO discuss it


deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/viewaccess/ViewAccessContext.java (1 line):
	- line 39: private static final String KEY = "VAS"; //TODO re-visit key (e.g. view-id instead of using one big storage)


deltaspike/modules/proxy/api/src/main/java/org/apache/deltaspike/proxy/util/EnableInterceptorsProxyFactory.java (1 line):
	- line 60: // TODO this can be optimized by caching this in a appscoped bean


deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/config/BaseConfigPropertyProducer.java (1 line):
	- line 212: * TODO we should make Converters for single attributes configurable.


deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/extension/AuthorizationParameter.java (1 line):
	- line 74: * TODO comment is no equals!!!


deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/literal/FolderLiteral.java (1 line):
	- line 31: //TODO remove null trick once we can merge with default values and the tests pass


deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/spi/authorization/EditableAccessDecisionVoterContext.java (1 line):
	- line 45: * TODO review it (this method is new)


deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/AbstractPathConfigDescriptor.java (1 line):
	- line 118: //TODO validate during bootstrapping


deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/message/JsfMessageProducer.java (1 line):
	- line 68: // X TODO check if the JsfMessage should get injected into a UIComponent and use #getClientId()


deltaspike/modules/jpa/impl/src/main/java/org/apache/deltaspike/jpa/impl/entitymanager/EntityManagerRefLookup.java (1 line):
	- line 115: // TODO should we really not apply the FlushMode on the active EntityManager?


deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/config/view/View.java (1 line):
	- line 322: //TODO discuss if we use a central interface in the spi package


deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/authorization/SecuredAnnotationAuthorizer.java (1 line):
	- line 78: //X TODO check the use-cases for it


deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/view/navigation/NavigationParameter.java (1 line):
	- line 66: //TODO add special support for list-annotations (add value automatically)


deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/TestControl.java (1 line):
	- line 48: //TODO discuss callbacks


deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/config/view/Folder.java (1 line):
	- line 137: //TODO discuss if we use a central interface in the spi package


deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/DefaultViewConfigResolver.java (1 line):
	- line 182: result = getViewConfigDescriptor(path); //TODO re-visit it


deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/util/SecurityUtils.java (1 line):
	- line 223: //TODO discuss it (with CODI handling such messages was easier)


deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/spi/junit/TestStatementDecoratorFactory.java (1 line):
	- line 24: //TODO find a better name


deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/DefaultViewConfigInheritanceStrategy.java (1 line):
	- line 39: //TODO remove parts which aren't needed any longer


deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/util/ConversationUtils.java (1 line):
	- line 114: //TODO move validation to the bootstrapping process


deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/RepositoryExtension.java (1 line):
	- line 57: // TODO: Hack still required?


deltaspike/core/impl/obsolete/src/main/java/org/apache/deltaspike/core/impl/resourceloader/ResourceLoaderExtension.java (1 line):
	- line 33: //TODO re-visit it based on DELTASPIKE-472


deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/jmx/BroadcasterProducer.java (1 line):
	- line 44: //TODO discuss validation during bootstrapping


deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/ConfigurationExtension.java (1 line):
	- line 261: // TODO: support partialbean binding? can make sense for virtual properties +