b3ff9be78f
M1 cut of environment, profiles and property work (SPR-7508)
...
Decomposed Environment interface into PropertySources, PropertyResolver
objects
Environment interface and implementations are still present, but
simpler.
PropertySources container aggregates PropertySource objects;
PropertyResolver provides search, conversion, placeholder
replacement. Single implementation for now is
PropertySourcesPlaceholderResolver
Renamed EnvironmentAwarePropertyPlaceholderConfigurer to
PropertySourcesPlaceholderConfigurer
<context:property-placeholder/> now registers PSPC by default, else
PPC if systemPropertiesMode* settings are involved
Refined configuration and behavior of default profiles
See Environment interface Javadoc for details
Added Portlet implementations of relevant interfaces:
* DefaultPortletEnvironment
* PortletConfigPropertySource, PortletContextPropertySource
* Integrated each appropriately throughout Portlet app contexts
Added protected 'createEnvironment()' method to AbstractApplicationContext
Subclasses can override at will to supply a custom Environment
implementation. In practice throughout the framework, this is how
Web- and Portlet-related ApplicationContexts override use of the
DefaultEnvironment and swap in DefaultWebEnvironment or
DefaultPortletEnvironment as appropriate.
Introduced "stub-and-replace" behavior for Servlet- and Portlet-based
PropertySource implementations
Allows for early registration and ordering of the stub, then
replacement with actual backing object at refresh() time.
Added AbstractApplicationContext.initPropertySources() method to
support stub-and-replace behavior. Called from within existing
prepareRefresh() method so as to avoid impact with
ApplicationContext implementations that copy and modify AAC's
refresh() method (e.g.: Spring DM).
Added methods to WebApplicationContextUtils and
PortletApplicationContextUtils to support stub-and-replace behavior
Added comprehensive Javadoc for all new or modified types and members
Added XSD documentation for all new or modified elements and attributes
Including nested <beans>, <beans profile="..."/>, and changes for
certain attributes type from xsd:IDREF to xsd:string
Improved fix for detecting non-file based Resources in
PropertiesLoaderSupport (SPR-7547, SPR-7552)
Technically unrelated to environment work, but grouped in with
this changeset for convenience.
Deprecated (removed) context:property-placeholder
'system-properties-mode' attribute from spring-context-3.1.xsd
Functionality is preserved for those using schemas up to and including
spring-context-3.0. For 3.1, system-properties-mode is no longer
supported as it conflicts with the idea of managing a set of property
sources within the context's Environment object. See Javadoc in
PropertyPlaceholderConfigurer, AbstractPropertyPlaceholderConfigurer
and PropertySourcesPlaceholderConfigurer for details.
Introduced CollectionUtils.toArray(Enumeration<E>, A[])
Work items remaining for 3.1 M2:
Consider repackaging PropertySource* types; eliminate internal use
of SystemPropertyUtils and deprecate
Further work on composition of Environment interface; consider
repurposing existing PlaceholderResolver interface to obviate need
for resolve[Required]Placeholder() methods currently in Environment.
Ensure configurability of placeholder prefix, suffix, and value
separator when working against an AbstractPropertyResolver
Add JNDI-based Environment / PropertySource implementatinos
Consider support for @Profile at the @Bean level
Provide consistent logging for the entire property resolution
lifecycle; consider issuing all such messages against a dedicated
logger with a single category.
Add reference documentation to cover the featureset.
2011-01-03 09:04:34 +00:00
b130a36af7
[SPR-7850][SPR-7851] Upgraded to JUnit 4.8.1 and TestNG 5.12.1; added changelog entries for 3.1.0.M1.
2010-12-30 08:00:58 +00:00
f480333d31
Merge 3.1.0 development branch into trunk
...
Branch in question is 'env' branch from git://git.springsource.org/sandbox/cbeams.git; merged into
git-svn repository with:
git merge -s recursive -Xtheirs --no-commit env
No merge conflicts, but did need to
git rm spring-build
prior to committing.
With this change, Spring 3.1.0 development is now happening on SVN
trunk. Further commits to the 3.0.x line will happen in an as-yet
uncreated SVN branch. 3.1.0 snapshots will be available
per the usual nightly CI build from trunk.
2010-10-25 19:48:20 +00:00
e56cfb8173
consistent use of JDK 1.5's ThreadLocal.remove() over ThreadLocal.set(null), preventing leaks (SPR-7441)
2010-09-01 17:17:25 +00:00
7730e76c06
Publishing license and notice files
2010-08-23 13:17:31 +00:00
dbfa049e1e
Prepping for 3.0.5
2010-08-19 11:04:04 +00:00
3963ff6e3b
use generic Class<?> in TransactionAttributeSource signature
2010-08-15 21:19:52 +00:00
99733aef2a
introspect superclass when given a CGLIB proxy as target class (SPR-7448); use generic Class<?> in TransactionAttributeSource signature
2010-08-11 21:47:50 +00:00
4d56b89619
transaction names based on method id from most specific method (target class instead of interface; SPR-7317)
2010-06-28 19:47:13 +00:00
ef3b70d40a
Spring's MessageEndpointFactory classes are now JCA 1.6 compliant as well
2010-06-23 17:23:11 +00:00
b31c34ed7d
Upgrading version to 3.0.4
2010-06-15 14:18:29 +00:00
6c6004a93b
@Transactional qualifier value matches against @Qualifier annotations on @Bean methods as well (SPR-7232)
2010-05-26 09:46:03 +00:00
b0afa0c472
only retrieve transaction manager bean if necessary (SPR-7153)
2010-05-03 12:51:54 +00:00
eb7f8309e2
Update version in POMs to 3.0.3
2010-04-15 10:26:14 +00:00
ab139dffd0
added javadoc references to semantic definition of transaction attributes (SPR-7029)
2010-03-24 23:22:52 +00:00
4e7752c9ba
JCA listener containers delegate to wrapped Transaction handle (for Geronimo compatibility; SPR-6991)
2010-03-23 16:27:34 +00:00
706a09c49e
SPR-7009: TransactionInterceptor now extracts ultimate target class before evaluating @Transactional metadata to accommodate double-proxying cases
2010-03-23 12:06:30 +00:00
296aa96d71
AopUtils.getTargetClass(...) never returns null (SPR-7011)
2010-03-22 18:31:13 +00:00
5dc59aaa7b
avoid Synchronization List preparations upfront if possible (SPR-6999)
2010-03-22 14:31:58 +00:00
19b4618fb5
avoid Synchronization List preparations upfront if possible (SPR-6999)
2010-03-22 14:23:02 +00:00
bb75662a7e
@Transactional qualifiers work in unit tests as well (SPR-6892)
2010-03-12 20:44:41 +00:00
1a351db6e0
Update Central POMs to 3.0.2
2010-02-21 15:32:18 +00:00
8d0bb00188
+ make use or property placeholders inside template.mf
2010-02-19 09:43:22 +00:00
f0bb45ae28
included qualifier value in debug log for each transaction (SPR-6811)
2010-02-09 14:57:17 +00:00
c5c38c6664
non-matching @Transactional qualifier value will lead to IllegalStateException (SPR-6810)
2010-02-08 18:32:38 +00:00
0f7f749ada
Updated Eclipse .classpath to aspectj 1.6.8
2010-02-04 13:45:14 +00:00
0fd4a45070
+ upgrade to AspectJ 1.6.8
...
+ externalize some of the jar versions
+ align the versions of some dependencies between pom.xml and ivy.xml
2010-02-04 11:46:21 +00:00
41ecbc6814
fixed WebSphereUowTransactionManager regression: correctly roll back in case of exception (SPR-6695)
2010-02-03 19:41:14 +00:00
df54c8613d
TransactionInterceptor is able to serialize "transactionManagerBeanName" as well (SPR-6680)
2010-02-01 14:45:11 +00:00
b077d5ba97
SPR-6678: fix poms for 3.0.1
2010-01-13 11:07:08 +00:00
2e032889ef
added "alwaysTranslate" flag (SPR-6630)
2010-01-12 13:26:22 +00:00
38f5c7a1d5
added assertion
2010-01-07 23:28:25 +00:00
2ba1dd47b0
allow for identifying a specific JBossWorkManagerMBean (SPR-6648)
2010-01-06 22:15:58 +00:00
9ca6003533
fixed scoped proxy unwrapping (SPR-6625)
2010-01-05 12:52:28 +00:00
fd1bfeefe4
avoid hard-coded AOP dependency for ScopedObject check
2009-12-15 21:20:51 +00:00
c4d8f6b3eb
extended registerAfterCompletionWithExistingTransaction's exception handling to detect JBoss RollbackException as well (SPR-6450)
2009-12-07 20:53:21 +00:00
93abbd0ef7
newTransactionStatus reverted to its original role, just without preparing synchronization (SPR-6521)
2009-12-07 14:27:27 +00:00
1202f67cc8
SPR-5327: tweak the ivy.xml so that commons-logging is a separate configuration. It already comes out as optional in the generated poms (including core), which isn't great, but I can't see what is causing that
2009-12-04 18:25:31 +00:00
5165465821
initialize synchronization after begin while instantiating TransactionStatus as early as possible (SPR-6409)
2009-12-01 01:32:51 +00:00
021663b12f
SPR-5507 The 'shutdownOrder' property of SmartLifecycle has been renamed 'phase'. The order no longer applies to shutdown only; now startup order is determined by the phase value as well. Components start in ascending order and stop in descending order.
2009-11-24 16:07:23 +00:00
46cd083976
added chaining-capable "add" method to MutablePropertyValues
2009-11-19 22:30:35 +00:00
a741410421
TransactionTemplate catches undeclared checked exception and rethrows it as UndeclaredThrowableException (SPR-6361)
2009-11-19 16:36:15 +00:00
535ec5cffd
SPR-5507 Added support for shutdown order on SmartLifecycle. DefaultLifecycleProcessor now manages the shutdown in phases depending on that order (with a timeout value per group).
2009-11-12 02:09:44 +00:00
2b962e7730
added unwrapping of scoped proxy tp unwrapResourceIfNecessary() (SPR-5671)
2009-11-11 18:16:41 +00:00
d5fd22c8fe
SPR-5507 GenericMessageEndpointManager now implements SmartLifecycle instead of ApplicationListener.
2009-11-10 12:59:50 +00:00
90f8e5dcf8
WebSphereUowTransactionManager suspends synchronizations even without existing transaction (SPR-6167)
2009-11-09 19:59:27 +00:00
d96bea9f6a
SPR-4716 GenericMessageEndpointManager now "auto-starts" upon receiving a ContextRefreshedEvent rather than within afterPropertiesSet().
2009-11-06 15:24:12 +00:00
09e6a85edd
fixed overview files
2009-09-25 08:47:18 +00:00
c6cd1a528e
SPR-6119 - Add slf4j dependency back to orm's pom.xml but in test scope as it is needed to run tests that use Hibernate
...
SPR-5956 - Remove commons-logging dependency definitions in pom.xml for all but spring-core so as to make exclusion rule easier for user who use slf4j
2009-09-25 05:16:55 +00:00
557dd1f1c4
initialize transaction synchronization before doBegin call in order to avoid OutOfMemory failures after resource binding
2009-09-24 14:02:40 +00:00
33265eecbd
polishing
2009-09-23 21:19:28 +00:00
0698947e6d
skip processing when no PlatformTransactionManager found (SPR-3955)
2009-09-22 13:31:56 +00:00
4f94f45ec4
pom maintenance
2009-09-21 07:37:30 +00:00
8d66c90760
revised JTA 1.1 support and javadoc
2009-09-18 13:48:37 +00:00
ad4f50a0d4
removed outdated reflection code
2009-09-17 15:24:24 +00:00
45dc856993
Jpa/JdoTransactionManager passes resolved timeout into Jpa/JdoDialect's beginTransaction; HibernateJpaDialect applies timeout onto native Hibernate Transaction before begin call (SPR-5195)
2009-09-08 22:35:32 +00:00
1045847cf7
updated to CGLIB 2.2 and EHCache 1.6.2
2009-09-07 18:04:27 +00:00
8754f0bc85
updated dependencies
2009-08-31 11:25:54 +00:00
a7acea2329
remove obsolete xsd
2009-08-24 23:09:25 +00:00
3ac3a72e91
added test with custom repository annotation
2009-08-08 13:57:05 +00:00
97e3b5ca8c
SPR-5976 - Upgrade POMS to JUnit 4.6
2009-08-05 17:48:53 +00:00
3d29023ef3
Updating POMs to contain Junit & EasyMock version numbers. Apparently, the maven ant tasks cannot resolve our parent pom.
2009-08-03 09:21:44 +00:00
1bfb26e4b2
updated aspectj weaver version in .classpath files to match ivy.xml configuration
2009-07-24 20:09:01 +00:00
54285ea57c
polishing
2009-07-21 14:19:18 +00:00
3f6e4282d6
WebSphereUowTransactionManager falls back to UOWManagerFactory lookup by default
2009-07-21 14:18:53 +00:00
7f3c4cec25
STS-260: added missing import-package headers so that editor works again
2009-07-20 08:46:19 +00:00
9163d8043b
updated .jms dependency on junit 4.6.0 from test->runtime to test->compile. touched all org.eclipse.jdt.core.prefs (during the process of importing the projects). only the date comments within each have changed.
2009-07-15 07:26:31 +00:00
0c16554e23
SPR-5803 and additional POM maintenance/development
2009-07-09 19:38:07 +00:00
620c9b1f96
[SPR-5895] Upgraded to EasyMock 2.5.1.
2009-07-03 09:32:15 +00:00
8bfb56c75b
[SPR-5887] Upgraded to JUnit 4.6.0.
2009-07-02 18:07:55 +00:00
3426ad3781
prepared 3.0 versions of the remaining namespaces
2009-06-03 10:29:17 +00:00
a9696c7282
RESOLVED - SPR-5523: Replace all 'package.html' artifacts with 'package-info.java'
...
* Applied patch submitted by Carlos Zuniga
2009-06-01 04:14:22 +00:00
6cc33fc609
added spring.tooling descriptor and images for all namespaces
2009-05-26 11:58:09 +00:00
af56f6497c
Updated regarding generics; fixed typos.
2009-05-25 09:04:05 +00:00
814a807446
generified JtaTransactionManager code
2009-05-15 15:04:11 +00:00
b0ed6d5685
polishing
2009-05-12 23:53:45 +00:00
bbd69da37f
updated all Spring Framework OSGI manifests to list unversioned imports explicitly; relaxed several OSGi bundle dependencies to optional and extended version ranges
2009-05-12 16:43:15 +00:00
68deb43d8e
removed WebLogic 7.0 support code
2009-05-11 22:47:50 +00:00
d34953e933
polishing
2009-05-08 23:16:53 +00:00
d34c4a2cf0
@Transactional supports qualifier value for choosing between multiple transaction managers
2009-05-08 23:13:43 +00:00
cea8f7f69e
custom stereotype annotations can be meta-annotated with @Service, @Controller etc as well; @Scope and @Transactional are now supported as meta-annotations on custom annotations
2009-04-26 11:41:06 +00:00
1facd45c5e
switched to use XInclude
2009-04-14 21:37:40 +00:00
362629d03b
Change version from 3.0.0.M3 to 3.0.0.BUILD-SNAPSHOT (again)
2009-04-09 14:38:35 +00:00
8f76197485
Change version from 3.0.0.M3 to 3.0.0.BUILD-SNAPSHOT
2009-04-03 14:03:48 +00:00
351fba1a04
POM maintenance
...
Place parent pom in publicly accessible directory (org.sf.spring-parent).
Create a component list pom in org.sf.spring-library.
2009-03-29 09:56:38 +00:00
160e04c15a
AspectJ update
2009-03-27 00:10:31 +00:00
0dfba993e8
updating eclipse classpath for test dependencies
2009-03-26 04:30:37 +00:00
665b284443
Added some leftover tests
2009-03-25 11:26:39 +00:00
0152d8d21d
SPR-5385, SPR-5301 - initial pass completed of POMs for maven central repository upload. N.B. Can not build spring with these POMs.
...
Cleanup remains to meet maven central metadata requirements
2009-03-25 08:06:34 +00:00
0b463c0838
SPR-5385, SPR-5301 - partial work committed.
2009-03-24 05:56:56 +00:00
a0139abf1e
added a DuplicatKeyException catagory for SQLException translation (SPR-5125)
2009-03-09 23:26:54 +00:00
160249c012
generified FactoryBeans and further Java 5 code style updates
2009-02-25 00:34:22 +00:00
4cc42bf16f
added "flush()" method to TransactionStatus and TransactionSynchronization interfaces; test context manager automatically flushes transactions before rolling back; general polishing of transaction management code
2009-02-19 00:24:05 +00:00
43caa57296
optimized OrderComparator usage
2009-02-17 18:19:57 +00:00
a25e24f37e
generified TransactionCallback; WebSphereUowTransactionManager preserves original exception in case of rollback (SPR-5270)
2009-02-15 19:48:18 +00:00
fb057bb5f6
generified NumberUtils signature
2009-02-12 17:40:51 +00:00
205df56ee4
support for WebSphere's ResourceAdapter-managed transactions
2009-02-09 15:36:20 +00:00
7e4fb09369
added "Future submit(Runnable)" and "Future submit(Callable)" to AsyncTaskExecutor; SchedulingTaskExecutor interface extends AsyncTaskExecutor; added ExecutorServiceAdapter class as a standard wrapper for a Spring TaskExecutor; added ThreadPoolExecutorFactoryBean; reduced backport-concurrent support to TaskExecutor adapters
2009-02-05 22:45:35 +00:00
92588cddc6
Java 5 code style
2009-02-05 21:04:13 +00:00
ea68d343fa
eliminated svn:externals in favor of localized copies of shared artifacts
2008-12-18 21:27:18 +00:00
Chris Beams
Sam Brannen
Juergen Hoeller
Ben Hale
Arjen Poutsma
David Syer
Costin Leau
Mark Fisher
Thomas Risberg
Mark Pollack
Christian Dupuis
Scott Andrews