Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Various fixes/improvements #5

Merged
merged 12 commits into from
Apr 25, 2012
Merged

Commits on Mar 20, 2012

  1. Fix merge problem from pull request 4.

    The following commit from pull request 4 was not merged properly:
    dd3b30a	Add support for ManagedProperties to Java SE targets.
    Instead, 965afa2 was merged, which had a failing test.
    martiell committed Mar 20, 2012
    Configuration menu
    Copy the full SHA
    5224d30 View commit details
    Browse the repository at this point in the history
  2. Rename XML files used in autowire tests, and group them in a directory.

    The renamed XML files have names that suggest the purpose of the test,
    rather than being numbered sequentially.
    martiell committed Mar 20, 2012
    Configuration menu
    Copy the full SHA
    e425eb8 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    2dedbc4 View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2012

  1. Add ConfigurationBuilder to wire SpringConfigurationLoader and augmen…

    …tations.
    
    This adds a ConfigurationBuilder class to simplify creating a
    SpringConfigurationLoader configured with the necessary augmentations.
    The ConfigurationBuilder supports ApplicationContext objects in
    addition to BeanFactory objects.
    
    This change also adds the BeanFactory as an instance variable of
    SpringConfigurationLoader. The BeanFactory is required for retrieving
    information about each bean. Previously, it was only available for
    top-level beans. By storing the BeanFactory as an instance variable,
    it is now available for obtaining the BeanDefinition of nested beans.
    martiell committed Mar 26, 2012
    Configuration menu
    Copy the full SHA
    f675056 View commit details
    Browse the repository at this point in the history
  2. Merge nested bean definitions with their parent bean definitions.

    Previously, only top-level beans were merged with parent definitions.
    The Spring getMergedBeanDefinition method cannot be used for bean
    definitions that are not at the top-level, because the BeanFactory does
    not recognise the name of the nested bean.
    
    This change includes a simple algorithm for merging nested beans with
    their parents, because the methods required to merge BeanDefinitions
    in the BeanFactory are protected methods.
    martiell committed Mar 26, 2012
    Configuration menu
    Copy the full SHA
    33924b7 View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2012

  1. Configuration menu
    Copy the full SHA
    8df57dd View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    e25c3dd View commit details
    Browse the repository at this point in the history
  3. Fix inferred type of array properties.

    The getValue() method on the QDox Type class returns the element type
    as a string for array types. The code was using getValue() without
    checking whether the type was an array type. The toString() method
    returns the type name with array brackets for each array dimension,
    which provides the type in the required format.
    martiell committed Mar 30, 2012
    Configuration menu
    Copy the full SHA
    84fea80 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    e320656 View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2012

  1. Configuration menu
    Copy the full SHA
    38428ef View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    73d40a1 View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2012

  1. Configuration menu
    Copy the full SHA
    ccefe91 View commit details
    Browse the repository at this point in the history