FishEye
Quick Search:

Line History

0

Show Arbitrary Diff

From to

Supports revisions and tags.

History

MAIN 1.59 1.1

Branch MAIN

1.59 annotated / raw | Diffs: previous, other | Lines: 1182 ( +157, -155 )

Created: 2008-08-05 21:56:29 -0400 (5 months 1 day ago) | Author: scottc | Changeset: MAIN:scottc:20080806015629

Fix for CSP-105, which had previously been implemented. Has not been unit tested, Brian will...

Tags: coldspring-1-2

1.58 annotated / raw | Diffs: previous, other | Lines: 1180 ( +20, -5 )

Created: 2008-08-05 13:30:44 -0400 (5 months 2 days ago) | Author: bkotek | Changeset: MAIN:bkotek:20080805173044

Fix and test for allowing abstract beans with no class name.

1.57 annotated / raw | Diffs: previous, other | Lines: 1165 ( +2, -1 )

Created: 2008-07-10 23:03:43 -0400 (5 months 27 days ago) | Author: bkotek | Changeset: MAIN:bkotek:20080711030343

Variable "bean" was not var-scoped in the getBean() method!

1.56 annotated / raw | Diffs: previous, other | Lines: 1164 ( +208, -195 )

Created: 2008-05-23 08:14:30 -0400 (7 months ago) | Author: scottc | Changeset: MAIN:scottc:20080523121430

CSP-90 put cflocks back after a merge issue back from 1.5.1 -> 1.52

1.55 annotated / raw | Diffs: previous, other | Lines: 1151 ( +3, -3 )

Created: 2008-04-18 22:33:11 -0400 (8 months ago) | Author: scottc | Changeset: MAIN:scottc:20080419023311

a few more var scope issues

1.54 annotated / raw | Diffs: previous, other | Lines: 1151 ( +2, -2 )

Created: 2008-04-18 20:52:34 -0400 (8 months ago) | Author: bkotek | Changeset: MAIN:bkotek:20080419005234

Update to include Sean's bug fix for creation of dependent bean definition.

1.53 annotated / raw | Diffs: previous, other | Lines: 1151 ( +60, -14 )

Created: 2008-04-12 03:41:30 -0400 (8 months ago) | Author: pjf | Changeset: MAIN:pjf:20080412074130

- Added helper method to find all bean names that match by type which returns an array of all beans with the same type
- Cleaned up code related to findBeanNameByType which returns the name of one bean that matches by type

1.52 annotated / raw | Diffs: previous, other | Lines: 1105 ( +407, -418 )

Created: 2008-03-06 21:25:04 -0500 (10 months ago) | Author: pjf | Changeset: MAIN:pjf:20080307022504

Var'ed and scope variables caught by a var scope checker

1.51 annotated / raw | Diffs: previous, other | Lines: 1116 ( +208, -202 )

Created: 2008-01-20 16:50:28 -0500 (11 months ago) | Author: scottc | Changeset: MAIN:scottc:20080120215028

CSP-90 - moved the lock on getBean so we check if it is constructed from within the lock. Added two locks in constructBean. First locks the check / write on the singleton cache, the second locks the entire dependecy injection ruitine per bean so only one thread will execute it.

1.50 annotated / raw | Diffs: previous, other | Lines: 1110 ( +9, -3 )

Created: 2008-01-19 15:45:15 -0500 (11 months ago) | Author: scottc | Changeset: MAIN:scottc:20080119204515

CSP-90 - added a lock in getBean named by beanFactoryID and requested bean

1.49 annotated / raw | Diffs: previous, other | Lines: 1104 ( +249, -249 )

Created: 2008-01-16 16:39:08 -0500 (11 months ago) | Author: jared_cmg | Changeset: MAIN:jared_cmg:20080116213908

Added check for "no" in addition to byName and byType in the bean config autowiring override, thus allowing beans to override the beanfactory default for autowiring. Without this, you can't turn autowiring off for a specific bean config.

This can be important if you have setters that match other bean id attribute values but you don't want them actually injected.

1.48 annotated / raw | Diffs: previous, other | Lines: 1104 ( +11, -12 )

Created: 2007-11-23 12:07:16 -0500 (13 months ago) | Author: scottc | Changeset: MAIN:scottc:20071123170716

CSP-83 added another property to beanDefinition, so that we have isFactory and isProxyFactory. This way only ProxyFactoryBean implementations get buildAdvisorChain called. Also removed sys.outs from last commit

Tags: coldspring-1-2-rc1

1.47 annotated / raw | Diffs: previous, other | Lines: 1105 ( +43, -10 )

Created: 2007-11-22 15:55:58 -0500 (13 months ago) | Author: scottc | Changeset: MAIN:scottc:20071122205558

CSP-84 - FINALLY implemented support for Non-Lazy loading of beans!

1.46 annotated / raw | Diffs: previous, other | Lines: 1072 ( +62, -81 )

Created: 2007-06-05 16:20:12 -0400 (19 months ago) | Author: scottc | Changeset: MAIN:scottc:20070605202012

removed case statements for peter, fixed up parseEntries

1.45 annotated / raw | Diffs: previous, other | Lines: 1091 ( +180, -211 )

Created: 2007-06-02 17:02:57 -0400 (19 months ago) | Author: scottc | Changeset:

Removed ALL output from bean factory and aop, no system out, no logging. Added support for placeholders in map and list tags, major restructuring of bean factory, abstract bean factory, bean property

1.44 annotated / raw | Diffs: previous, other | Lines: 1122 ( +8, -5 )

Created: 2007-03-12 22:12:03 -0400 (21 months ago) | Author: wiersma | Changeset: MAIN:wiersma:20070313021203

Fix for CSP-79 contributed by Peter Farrell. Cffile needs to be used for CF 6 compatablity and the fileExist check was failing on shared host with sandboxing enabled.

1.43 annotated / raw | Diffs: previous, other | Lines: 1119 ( +88, -86 )

Created: 2007-02-09 17:38:42 -0500 (22 months ago) | Author: scottc | Changeset: MAIN:scottc:20070209223842

Added fix for Sean. Setting up bean factories would exit of there were no beans, but that's not good, we may be setting up an alias only bf

1.42 annotated / raw | Diffs: previous, other | Lines: 1117 ( +60, -29 )

Created: 2007-02-03 13:54:46 -0500 (23 months ago) | Author: wiersma | Changeset: MAIN:wiersma:20070203185446

An update to CSP-74 to address the import tag only being parsed when loadBeans was called instead of also when loadBeansFromXML was called.

1.41 annotated / raw | Diffs: previous, other | Lines: 1086 ( +47, -22 )

Created: 2007-01-01 12:41:36 -0500 (2 years ago) | Author: scottc | Changeset: MAIN:scottc:20070101174136

added support for <alias name="fromName" alias="toName"/> tag

1.40 annotated / raw | Diffs: previous, other | Lines: 1061 ( +95, -4 )

Created: 2006-11-10 16:40:19 -0500 (2 years 1 month ago) | Author: wiersma | Changeset: MAIN:wiersma:20061110214019

Committing Jared's changes for CSP-74 which provides support for include files in the config files.

1.39 annotated / raw | Diffs: previous, other | Lines: 970 ( +2, -2 )

Created: 2006-10-02 20:38:20 -0400 (2 years 3 months ago) | Author: scottc | Changeset: MAIN:scottc:20061003003820

CSP-71: I really thought I had committed this fix for BFPP, need to look for class attribute before accessing it in the case that the bean definition is a factory-bean

1.38 annotated / raw | Diffs: previous, other | Lines: 970 ( +44, -4 )

Created: 2006-08-29 20:11:05 -0400 (2 years 4 months ago) | Author: scottc | Changeset: MAIN:scottc:20060830001105

CSP-71: Added support for BeanFactoryPostProcessors, and a PropertyPlaceholderConfigurer bean for loading a properties file and resolving ant style placeholders in the bean definitions (for value types). Still need to discuss how the factory should resolve a bean as a BeanFactoryPostProcessor.

1.37 annotated / raw | Diffs: previous, other | Lines: 930 ( +19, -3 )

Created: 2006-07-02 09:36:37 -0400 (2 years 6 months ago) | Author: rossd | Changeset: MAIN:rossd:20060702133637

Fix for FDL-62 (CS thinks isCFC() = isCFC())

1.36 annotated / raw | Diffs: previous, other | Lines: 914 ( +3, -3 )

Created: 2006-06-06 08:41:38 -0400 (2 years 7 months ago) | Author: rossd | Changeset: MAIN:rossd:20060606124138

including detail of nested exception when thrown during bean creation (CSP-55)

1.35 annotated / raw | Diffs: previous, other | Lines: 914 ( +50, -34 )

Created: 2006-06-02 12:39:07 -0400 (2 years 7 months ago) | Author: rossd | Changeset: MAIN:rossd:20060602163907

more error catching (CSP-55)
result of factory-method call may not have instance data (CSP-56)

1.34 annotated / raw | Diffs: previous, other | Lines: 898 ( +2, -2 )

Created: 2006-06-01 20:19:26 -0400 (2 years 7 months ago) | Author: scottc | Changeset: MAIN:scottc:20060602001926

Fix to getBean() method, we used to look first to see if the bean def exists in the current factory, then look to see if it exists in the parent before calling getBean() on parent. This would only alow 2 levels of factories. Changed to just call getBean() on parent, if it exists. Thanks Sean!

1.33 annotated / raw | Diffs: previous, other | Lines: 898 ( +2, -2 )

Created: 2006-05-29 13:02:41 -0400 (2 years 7 months ago) | Author: scottc | Changeset: MAIN:scottc:20060529170241

SmallÊtweak to BeanFactoryAware, look up the proper factory to inject through beanDef.getFactory(). This is because a child factory may beÊrunning the consrtuctBean function, but the bean needs a ref to it's own factory. Similar to the situation with storing beans in the singleton cache.

1.32 annotated / raw | Diffs: previous, other | Lines: 898 ( +3, -3 )

Created: 2006-05-28 12:02:08 -0400 (2 years 7 months ago) | Author: scottc | Changeset: MAIN:scottc:20060528160208

Added for CSP-54: Sort of, tweeked the way that constructBean adds bean instances to the singletonCache, what was happening was, when beanFactories were parented, the bean instances were stored in the child cache instead of the correct parent cache, but the beanDefinitions would be marked as constructed. Now we just get the proper bean factory to store the instance in. All seems to work fine now..

1.31 annotated / raw | Diffs: previous, other | Lines: 898 ( +33, -24 )

Created: 2006-05-23 21:25:34 -0400 (2 years 7 months ago) | Author: scottc | Changeset: MAIN:scottc:20060524012534

Fix for CSP-54: added a method 'localFactoryContaisBean' (will rename if we want!) to fix the issue with certain things like the m2 adapter and autowiring not being able to pick up beans in parent factories. Also cleaned up all the non scoped 'parent' references...

1.30 annotated / raw | Diffs: previous, other | Lines: 889 ( +14, -5 )

Created: 2006-05-18 21:18:31 -0400 (2 years 7 months ago) | Author: scottc | Changeset: MAIN:scottc:20060519011831

CSP-51 and CSP-50: Small fix to flattenMetaData, now checks to see if methods are private before adding them to the flattened functions, and takes care of private functions overwriting public ones.

1.29 annotated / raw | Diffs: previous, other | Lines: 880 ( +39, -44 )

Created: 2006-05-17 10:36:21 -0400 (2 years 7 months ago) | Author: rossd | Changeset: MAIN:rossd:20060517143621

Flatten bean metadata to include inherited methods - both in autowiring and explicit wiring (CSP-51 and CSP-50)
Also added typing to setBeanFactory

1.28 annotated / raw | Diffs: previous, other | Lines: 885 ( +17, -5 )

Created: 2006-05-14 15:47:10 -0400 (2 years 7 months ago) | Author: scottc | Changeset: MAIN:scottc:20060514194710

Changed the way that the aop ProxyFactories build the advisor chains, the advisors are now supplied by the bean factory from inside the constructBean method, which handles nonSingletons correctly. Also a small tweek for CSP-52 where the beanFactory wasn't being given to the RemoteFactoryBean

1.27 annotated / raw | Diffs: previous, other | Lines: 873 ( +16, -4 )

Created: 2006-05-06 08:05:59 -0400 (2 years 8 months ago) | Author: scottc | Changeset: MAIN:scottc:20060506120559

Leaving for 3 days on the bike, don't want to have uncommited code. I changed the building of the dependency list to be in a more accurate creation order. Also started to implement a chenge so that beanDefinition.getFactory() which is a string, doesn't need to constantly be evaluated. Unfinished. If this code sucks, please roll back!

1.26 annotated / raw | Diffs: previous, other | Lines: 861 ( +61, -15 )

Created: 2006-04-21 21:34:27 -0400 (2 years 8 months ago) | Author: scottc | Changeset: MAIN:scottc:20060422013427

Implemented Duck Typing version of BeanFactoryAware (setBeanFactory() method). Note, init methods and factory methods are still being a bit screwy with constructor args, so this bean factory has try catch blocks around them, beware!

1.25 annotated / raw | Diffs: previous, other | Lines: 815 ( +15, -4 )

Created: 2006-04-20 16:24:43 -0400 (2 years 8 months ago) | Author: rossd | Changeset: MAIN:rossd:20060420202443

Autowiring cleanup CSP-49

1.24 annotated / raw | Diffs: previous, other | Lines: 804 ( +62, -28 )

Created: 2006-04-17 20:39:37 -0400 (2 years 8 months ago) | Author: scottc | Changeset: MAIN:scottc:20060418003937

CSP-14 - Some fixes to factory-bean / factory-method, moved actual bean creation out of beanDefinition and into the constructBean method in the bean factory. Also an  issue where the factory creating the bean wasn't added correctly as a dependency

1.23 annotated / raw | Diffs: previous, other | Lines: 770 ( +27, -3 )

Created: 2006-04-05 21:38:05 -0400 (2 years 9 months ago) | Author: scottc | Changeset: MAIN:scottc:20060406013805

CSP-47: More autowire. Now it works! Kind of, only turning autowire off per been. I will work on byType|byName this weekend

1.22 annotated / raw | Diffs: previous, other | Lines: 746 ( +7, -4 )

Created: 2006-03-08 08:14:56 -0500 (2 years 10 months ago) | Author: scottc | Changeset: MAIN:scottc:20060308131456

Per Sean's suggestion, I added a local beanFactoryId and added it to the singleton cache lock name. Now locks are local to the instance

1.21 annotated / raw | Diffs: previous, other | Lines: 743 ( +12, -10 )

Created: 2006-03-07 21:31:29 -0500 (2 years 10 months ago) | Author: scottc | Changeset: MAIN:scottc:20060308023129

Two fixes to the singleton cache access. singletonCacheContainsBean improperly returned false if a parent bean factory exists, and getBeanFromSingletonCache called the same method on a parent from within a lock. All better now...

1.20 annotated / raw | Diffs: previous, other | Lines: 741 ( +6, -2 )

Created: 2006-03-03 13:45:32 -0500 (2 years 10 months ago) | Author: rossd | Changeset: MAIN:rossd:20060303184532

fix for CSP-42 (init-methods being called more than once)

1.19 annotated / raw | Diffs: previous, other | Lines: 737 ( +3, -2 )

Created: 2006-02-24 14:51:08 -0500 (2 years 10 months ago) | Author: rossd | Changeset: MAIN:rossd:20060224195108

CSP-19 empty config file can be passed to loadBeans()

1.18 annotated / raw | Diffs: previous, other | Lines: 736 ( +43, -41 )

Created: 2006-02-24 10:28:09 -0500 (2 years 10 months ago) | Author: rossd | Changeset: MAIN:rossd:20060224152809

CSP-39 coldspring errors on beans w/ no methods (could be a marker interface, etc)

1.17 annotated / raw | Diffs: previous, other | Lines: 734 ( +53, -10 )

Created: 2006-02-11 17:55:02 -0500 (2 years 10 months ago) | Author: wiersma | Changeset: MAIN:wiersma:20060211225502

Added factory-bean/factory-method support. This should allow people to use their own factories with ColdSpring.

1.16 annotated / raw | Diffs: previous, other | Lines: 691 ( +27, -12 )

Created: 2006-01-13 09:57:21 -0500 (2 years 11 months ago) | Author: scottc | Changeset: MAIN:scottc:20060113145721

CSP-37 added support for retrieving factorybean instances (not the objects they create) with the '&' prefix

1.15 annotated / raw | Diffs: previous, other | Lines: 676 ( +2, -2 )

Created: 2005-11-16 11:16:11 -0500 (3 years 1 month ago) | Author: rossd | Changeset: MAIN:rossd:20051116161610

updates to license in all framework code

Tags: alpha-0-5-0

1.14 annotated / raw | Diffs: previous, other | Lines: 676 ( +44, -4 )

Created: 2005-11-04 20:49:24 -0500 (3 years 2 months ago) | Author: wiersma | Changeset: MAIN:wiersma:20051105014924

Implemented CSP-2 which provides heirarchal bean factory support along with a application context implmentation which can support parent app contexts. Also updated Mach II plugin to support passing in a parent bean factory from the app scope.

1.13 annotated / raw | Diffs: previous, other | Lines: 636 ( +7, -7 )

Created: 2005-10-06 12:18:32 -0400 (3 years 3 months ago) | Author: rossd | Changeset: MAIN:rossd:20051006161828

fixes for CSP-16
when walking metadata during the autowire pass, we set a new property of BeanProperty (argument name) to match what we found in the metadata. BeanProperty.getArgumentName() will return the BeanProperty.getName() if argument name has not been set. When the beanfactory injects dependencies, it names the arguments BeanProperty.getArgumentName() instead of the previous BeanProperty.getName()

Tags: alpha-0-2-1

1.12 annotated / raw | Diffs: previous, other | Lines: 636 ( +59, -49 )

Created: 2005-09-26 13:24:20 -0400 (3 years 3 months ago) | Author: rossd | Changeset: MAIN:rossd:20050926172420

code cleaning, comments, etc
slight update to init-method handling

1.11 annotated / raw | Diffs: previous, other | Lines: 626 ( +21, -4 )

Created: 2005-09-26 09:52:28 -0400 (3 years 3 months ago) | Author: scottc | Changeset: MAIN:scottc:20050926135228

moved execution of init methods into a second loop after dependency injection in BeanFactory, added discovery of init-methods into beanProperties

1.10 annotated / raw | Diffs: previous, other | Lines: 609 ( +20, -2 )

Created: 2005-09-25 22:01:04 -0400 (3 years 3 months ago) | Author: rossd | Changeset: MAIN:rossd:20050926020103

updated license section

1.9 annotated / raw | Diffs: previous, other | Lines: 591 ( +16, -3 )

Created: 2005-09-25 13:37:48 -0400 (3 years 3 months ago) | Author: scottc | Changeset: MAIN:scottc:20050925173747

Made small change in DefaultXmlBeanFactory so setter injection will be properly aware of FactoryBeans, added getMethodName to aop.Method (don't know if I want this here, kind of tweeked for logging demo), also fixed aop.support.NamedMethodPointcut to return true if pattern is '*' wihtout trying to actually match the method name, and fixed aop.framework.AopProxyUtils to called 'init' on an advice when cloning it, if the method exists

1.8 annotated / raw | Diffs: previous, other | Lines: 578 ( +54, -7 )

Created: 2005-09-24 18:13:18 -0400 (3 years 3 months ago) | Author: rossd | Changeset: MAIN:rossd:20050924221317

fixes for autowiring by type

1.7 annotated / raw | Diffs: previous, other | Lines: 531 ( +107, -7 )

Created: 2005-09-24 15:55:04 -0400 (3 years 3 months ago) | Author: rossd | Changeset: MAIN:rossd:20050924195504

support for beanFactory default properties
removed constructor-arg circular dependancy support

1.6 annotated / raw | Diffs: previous, other | Lines: 431 ( +8, -6 )

Created: 2005-09-24 14:50:43 -0400 (3 years 3 months ago) | Author: rossd | Changeset: MAIN:rossd:20050924185043

first cut at autowiring

1.5 annotated / raw | Diffs: previous, other | Lines: 429 ( +86, -5 )

Created: 2005-09-24 12:44:16 -0400 (3 years 3 months ago) | Author: rossd | Changeset:

first cut at complex type support (map | list)

1.4 annotated / raw | Diffs: previous, other | Lines: 348 ( +45, -7 )

Created: 2005-09-21 20:34:17 -0400 (3 years 3 months ago) | Author: rossd | Changeset: MAIN:rossd:20050922003417

first cut at constructor-arg support

1.3 annotated / raw | Diffs: previous, other | Lines: 310 ( +12, -2 )

Created: 2005-09-13 13:01:53 -0400 (3 years 3 months ago) | Author: scottc | Changeset: MAIN:scottc:20050913170153

Added fixes for support of FactoryBeans, as well as locating method 'init' in bean construction. Also added full AOP package to synch with standalone aop packages from my repo

1.2 annotated / raw | Diffs: previous, other | Lines: 300 ( +29, -33 )

Created: 2005-09-12 22:30:26 -0400 (3 years 3 months ago) | Author: scottc | Changeset: MAIN:scottc:20050913023026

Added support for factory beans with indentifying by extends in constructBean function. Also moved retrieval of created bean back into the bean definition and added the coldspring.beans.factory.FactoryBean abstract class

1.1 annotated / raw | Lines: 304 ( +304, -0 )

Created: 2005-08-24 10:36:34 -0400 (3 years 4 months ago) | Author: scottc | Changeset: MAIN:scottc:20050824143634

Initial upload