From 1facd45c5eecd089726d0e925704e9535049197d Mon Sep 17 00:00:00 2001 From: Thomas Risberg Date: Tue, 14 Apr 2009 21:37:40 +0000 Subject: [PATCH] switched to use XInclude --- build-spring-framework/build.iml | 24 +- org.springframework.aop/aop.iml | 244 +-- org.springframework.beans/beans.iml | 198 +- .../context-support.iml | 338 ++-- org.springframework.context/context.iml | 442 ++--- org.springframework.core/core.iml | 592 +++--- org.springframework.expression/expression.iml | 98 +- org.springframework.instrument/instrument.iml | 42 +- .../integration-tests.iml | 1134 +++++------ org.springframework.orm/orm.iml | 484 ++--- org.springframework.test/test.iml | 320 +-- .../transaction.iml | 288 +-- .../web-portlet.iml | 184 +- org.springframework.web/web.iml | 510 ++--- spring-framework-reference/src/aop-api.xml | 3 + spring-framework-reference/src/aop.xml | 3 + spring-framework-reference/src/beans.xml | 3 + spring-framework-reference/src/cci.xml | 3 + spring-framework-reference/src/dao.xml | 5 +- spring-framework-reference/src/dtd.xml | 3 + .../src/dynamic-languages.xml | 5 +- spring-framework-reference/src/ejb.xml | 5 +- .../src/expressions.xml | 3 + .../src/getting-started.xml | 3 + spring-framework-reference/src/jdbc.xml | 3 + spring-framework-reference/src/jms.xml | 3 + spring-framework-reference/src/jmx.xml | 3 + spring-framework-reference/src/mail.xml | 3 + spring-framework-reference/src/metadata.xml | 5 +- spring-framework-reference/src/mvc.xml | 7 +- spring-framework-reference/src/new-in-3.xml | 3 + spring-framework-reference/src/orm.xml | 3 + spring-framework-reference/src/overview.xml | 3 + spring-framework-reference/src/oxm.xml | 3 + spring-framework-reference/src/portlet.xml | 9 +- spring-framework-reference/src/preface.xml | 3 + spring-framework-reference/src/remoting.xml | 3 + spring-framework-reference/src/resources.xml | 3 + spring-framework-reference/src/rest.xml | 3 + spring-framework-reference/src/scheduling.xml | 5 +- .../src/spring-form.tld.xml | 3 + .../src/spring-framework-reference.xml | 118 +- spring-framework-reference/src/spring.tld.xml | 3 + .../src/swf-sidebar.xml | 3 + spring-framework-reference/src/testing.xml | 3 + .../src/transaction.xml | 5 +- spring-framework-reference/src/validation.xml | 3 + spring-framework-reference/src/view.xml | 3 + .../src/web-integration.xml | 7 +- spring-framework-reference/src/xml-custom.xml | 5 +- .../src/xsd-configuration.xml | 5 +- spring-framework.ipr | 1710 ++++++++--------- 52 files changed, 3461 insertions(+), 3403 deletions(-) diff --git a/build-spring-framework/build.iml b/build-spring-framework/build.iml index 49b4a51471..b5887115b1 100644 --- a/build-spring-framework/build.iml +++ b/build-spring-framework/build.iml @@ -1,12 +1,12 @@ - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/org.springframework.aop/aop.iml b/org.springframework.aop/aop.iml index 880fad8aa2..f6efca15e9 100644 --- a/org.springframework.aop/aop.iml +++ b/org.springframework.aop/aop.iml @@ -1,122 +1,122 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.springframework.beans/beans.iml b/org.springframework.beans/beans.iml index 0439a2cde8..f390a208c9 100644 --- a/org.springframework.beans/beans.iml +++ b/org.springframework.beans/beans.iml @@ -1,99 +1,99 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.springframework.context.support/context-support.iml b/org.springframework.context.support/context-support.iml index 7224d09ead..68c5a88bb9 100644 --- a/org.springframework.context.support/context-support.iml +++ b/org.springframework.context.support/context-support.iml @@ -1,169 +1,169 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.springframework.context/context.iml b/org.springframework.context/context.iml index 89325e9ac4..a27a70f303 100644 --- a/org.springframework.context/context.iml +++ b/org.springframework.context/context.iml @@ -1,221 +1,221 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.springframework.core/core.iml b/org.springframework.core/core.iml index c0d99a4962..e3738c7bed 100644 --- a/org.springframework.core/core.iml +++ b/org.springframework.core/core.iml @@ -1,296 +1,296 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.springframework.expression/expression.iml b/org.springframework.expression/expression.iml index 9c786be507..00ece77561 100644 --- a/org.springframework.expression/expression.iml +++ b/org.springframework.expression/expression.iml @@ -1,49 +1,49 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.springframework.instrument/instrument.iml b/org.springframework.instrument/instrument.iml index ef0c9607f1..550885dbc3 100644 --- a/org.springframework.instrument/instrument.iml +++ b/org.springframework.instrument/instrument.iml @@ -1,21 +1,21 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + diff --git a/org.springframework.integration-tests/integration-tests.iml b/org.springframework.integration-tests/integration-tests.iml index b8369de693..78d6b5e0d9 100644 --- a/org.springframework.integration-tests/integration-tests.iml +++ b/org.springframework.integration-tests/integration-tests.iml @@ -1,567 +1,567 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.springframework.orm/orm.iml b/org.springframework.orm/orm.iml index ac9ded4c2a..53348c522b 100644 --- a/org.springframework.orm/orm.iml +++ b/org.springframework.orm/orm.iml @@ -1,242 +1,242 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.springframework.test/test.iml b/org.springframework.test/test.iml index f7e7efccf6..5b675419ff 100644 --- a/org.springframework.test/test.iml +++ b/org.springframework.test/test.iml @@ -1,160 +1,160 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.springframework.transaction/transaction.iml b/org.springframework.transaction/transaction.iml index 2b0acafa12..c497ed6065 100644 --- a/org.springframework.transaction/transaction.iml +++ b/org.springframework.transaction/transaction.iml @@ -1,144 +1,144 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.springframework.web.portlet/web-portlet.iml b/org.springframework.web.portlet/web-portlet.iml index fc04443b62..7ca2a7764f 100644 --- a/org.springframework.web.portlet/web-portlet.iml +++ b/org.springframework.web.portlet/web-portlet.iml @@ -1,92 +1,92 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.springframework.web/web.iml b/org.springframework.web/web.iml index 3f4fd40eff..0642a5f54a 100644 --- a/org.springframework.web/web.iml +++ b/org.springframework.web/web.iml @@ -1,255 +1,255 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/spring-framework-reference/src/aop-api.xml b/spring-framework-reference/src/aop-api.xml index eeed54240f..c75afa077c 100644 --- a/spring-framework-reference/src/aop-api.xml +++ b/spring-framework-reference/src/aop-api.xml @@ -1,4 +1,7 @@ + + Spring AOP APIs diff --git a/spring-framework-reference/src/aop.xml b/spring-framework-reference/src/aop.xml index 6fb7a9d797..b83f7be403 100644 --- a/spring-framework-reference/src/aop.xml +++ b/spring-framework-reference/src/aop.xml @@ -1,4 +1,7 @@ + + Aspect Oriented Programming with Spring diff --git a/spring-framework-reference/src/beans.xml b/spring-framework-reference/src/beans.xml index c30b2fc358..349588080f 100644 --- a/spring-framework-reference/src/beans.xml +++ b/spring-framework-reference/src/beans.xml @@ -1,4 +1,7 @@ + + The IoC container diff --git a/spring-framework-reference/src/cci.xml b/spring-framework-reference/src/cci.xml index a960eca3b2..fa5a376462 100644 --- a/spring-framework-reference/src/cci.xml +++ b/spring-framework-reference/src/cci.xml @@ -1,4 +1,7 @@ + + JCA CCI diff --git a/spring-framework-reference/src/dao.xml b/spring-framework-reference/src/dao.xml index 2e19e5393a..3eba493793 100644 --- a/spring-framework-reference/src/dao.xml +++ b/spring-framework-reference/src/dao.xml @@ -1,4 +1,7 @@ - + + + DAO support
diff --git a/spring-framework-reference/src/dtd.xml b/spring-framework-reference/src/dtd.xml index 1544414697..140d869bb0 100644 --- a/spring-framework-reference/src/dtd.xml +++ b/spring-framework-reference/src/dtd.xml @@ -1,4 +1,7 @@ + + <literal>spring-beans-2.0.dtd</literal> diff --git a/spring-framework-reference/src/dynamic-languages.xml b/spring-framework-reference/src/dynamic-languages.xml index 1522b6218f..51c7c33bb3 100644 --- a/spring-framework-reference/src/dynamic-languages.xml +++ b/spring-framework-reference/src/dynamic-languages.xml @@ -1,4 +1,7 @@ - + + + Dynamic language support diff --git a/spring-framework-reference/src/ejb.xml b/spring-framework-reference/src/ejb.xml index 061bea43be..cb360fcc65 100644 --- a/spring-framework-reference/src/ejb.xml +++ b/spring-framework-reference/src/ejb.xml @@ -1,4 +1,7 @@ - + + + Enterprise Java Beans (EJB) integration diff --git a/spring-framework-reference/src/expressions.xml b/spring-framework-reference/src/expressions.xml index b94c2d11f3..cb0aa3267f 100644 --- a/spring-framework-reference/src/expressions.xml +++ b/spring-framework-reference/src/expressions.xml @@ -1,4 +1,7 @@ + + Spring Expression Language (SpEL) diff --git a/spring-framework-reference/src/getting-started.xml b/spring-framework-reference/src/getting-started.xml index 68813229db..e6f8d16b96 100644 --- a/spring-framework-reference/src/getting-started.xml +++ b/spring-framework-reference/src/getting-started.xml @@ -1,4 +1,7 @@ + + Getting started with Spring diff --git a/spring-framework-reference/src/jdbc.xml b/spring-framework-reference/src/jdbc.xml index 9ca4477294..9d7137e15a 100644 --- a/spring-framework-reference/src/jdbc.xml +++ b/spring-framework-reference/src/jdbc.xml @@ -1,4 +1,7 @@ + + Data access using JDBC diff --git a/spring-framework-reference/src/jms.xml b/spring-framework-reference/src/jms.xml index 16ff8c6d39..3f59a18e37 100644 --- a/spring-framework-reference/src/jms.xml +++ b/spring-framework-reference/src/jms.xml @@ -1,4 +1,7 @@ + + JMS (Java Message Service) diff --git a/spring-framework-reference/src/jmx.xml b/spring-framework-reference/src/jmx.xml index 7d992c2022..7cd28ae699 100644 --- a/spring-framework-reference/src/jmx.xml +++ b/spring-framework-reference/src/jmx.xml @@ -1,4 +1,7 @@ + + JMX diff --git a/spring-framework-reference/src/mail.xml b/spring-framework-reference/src/mail.xml index 90e8717573..ed04a44f49 100644 --- a/spring-framework-reference/src/mail.xml +++ b/spring-framework-reference/src/mail.xml @@ -1,4 +1,7 @@ + + Email diff --git a/spring-framework-reference/src/metadata.xml b/spring-framework-reference/src/metadata.xml index f637a95457..f0474e6ed9 100644 --- a/spring-framework-reference/src/metadata.xml +++ b/spring-framework-reference/src/metadata.xml @@ -1,4 +1,7 @@ - + + + Annotations and Source Level Metadata Support
diff --git a/spring-framework-reference/src/mvc.xml b/spring-framework-reference/src/mvc.xml index 4ae264f64b..dbb93674f6 100644 --- a/spring-framework-reference/src/mvc.xml +++ b/spring-framework-reference/src/mvc.xml @@ -1,5 +1,8 @@ - + + + Web MVC framework
@@ -150,7 +153,7 @@ Features of Spring Web MVC - &swf-sidebar; + Spring's web module provides a wealth of unique web support features, including: diff --git a/spring-framework-reference/src/new-in-3.xml b/spring-framework-reference/src/new-in-3.xml index 08750970b1..65e2293517 100644 --- a/spring-framework-reference/src/new-in-3.xml +++ b/spring-framework-reference/src/new-in-3.xml @@ -1,4 +1,7 @@ + + What's new in Spring 3.0? diff --git a/spring-framework-reference/src/orm.xml b/spring-framework-reference/src/orm.xml index a33def81f6..88d3d36dbe 100644 --- a/spring-framework-reference/src/orm.xml +++ b/spring-framework-reference/src/orm.xml @@ -1,4 +1,7 @@ + + Object Relational Mapping (ORM) data access diff --git a/spring-framework-reference/src/overview.xml b/spring-framework-reference/src/overview.xml index 35ba638086..725cf2b9ec 100644 --- a/spring-framework-reference/src/overview.xml +++ b/spring-framework-reference/src/overview.xml @@ -1,4 +1,7 @@ + + Introduction diff --git a/spring-framework-reference/src/oxm.xml b/spring-framework-reference/src/oxm.xml index ef39710475..3f1b7af7de 100644 --- a/spring-framework-reference/src/oxm.xml +++ b/spring-framework-reference/src/oxm.xml @@ -1,4 +1,7 @@ + + Marshalling XML using O/X Mappers diff --git a/spring-framework-reference/src/portlet.xml b/spring-framework-reference/src/portlet.xml index 8fdca5371f..6b2d0578c1 100644 --- a/spring-framework-reference/src/portlet.xml +++ b/spring-framework-reference/src/portlet.xml @@ -1,5 +1,8 @@ - - + + + + Portlet MVC Framework
@@ -40,7 +43,7 @@ activities that generate what is displayed to the user. - &swf-sidebar; + The dual phases of portlet requests are one of the real strengths of the JSR-168 specification. For example, dynamic search results can be diff --git a/spring-framework-reference/src/preface.xml b/spring-framework-reference/src/preface.xml index b905e2e8bf..7d16ec8960 100644 --- a/spring-framework-reference/src/preface.xml +++ b/spring-framework-reference/src/preface.xml @@ -1,4 +1,7 @@ + + Preface diff --git a/spring-framework-reference/src/remoting.xml b/spring-framework-reference/src/remoting.xml index 8f44bcb903..a4d317c6c1 100644 --- a/spring-framework-reference/src/remoting.xml +++ b/spring-framework-reference/src/remoting.xml @@ -1,4 +1,7 @@ + + Remoting and web services using Spring diff --git a/spring-framework-reference/src/resources.xml b/spring-framework-reference/src/resources.xml index abedb98795..9b9c83bd6a 100644 --- a/spring-framework-reference/src/resources.xml +++ b/spring-framework-reference/src/resources.xml @@ -1,4 +1,7 @@ + + Resources diff --git a/spring-framework-reference/src/rest.xml b/spring-framework-reference/src/rest.xml index 6b176bbb19..c8e882a5ed 100644 --- a/spring-framework-reference/src/rest.xml +++ b/spring-framework-reference/src/rest.xml @@ -1,4 +1,7 @@ + + REST support diff --git a/spring-framework-reference/src/scheduling.xml b/spring-framework-reference/src/scheduling.xml index bc3a4b4bfa..405517e882 100644 --- a/spring-framework-reference/src/scheduling.xml +++ b/spring-framework-reference/src/scheduling.xml @@ -1,4 +1,7 @@ - + + + Scheduling and Thread Pooling
diff --git a/spring-framework-reference/src/spring-form.tld.xml b/spring-framework-reference/src/spring-form.tld.xml index 469f457aaf..f6a3c90dca 100644 --- a/spring-framework-reference/src/spring-form.tld.xml +++ b/spring-framework-reference/src/spring-form.tld.xml @@ -1,4 +1,7 @@ + + spring-form.tld
diff --git a/spring-framework-reference/src/spring-framework-reference.xml b/spring-framework-reference/src/spring-framework-reference.xml index aef346b549..418dbbf58f 100644 --- a/spring-framework-reference/src/spring-framework-reference.xml +++ b/spring-framework-reference/src/spring-framework-reference.xml @@ -1,44 +1,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -]> - + + + Reference Documentation (Work in progress) @@ -135,8 +99,8 @@ 2004-2009 Rod Johnson, Juergen Hoeller, Alef Arendsen, Colin Sampaleanu, Rob Harrop, Thomas Risberg, Darren Davison, - Dmitriy Kopylenko, Mark Pollack, Thierry Templier, Erwin Vervaet, Portia Tung, Ben Hale, Adrian Colyer, John Lewis, Costin Leau, - Mark Fisher, Sam Brannen, Ramnivas Laddad, Arjen Poutsma + Dmitriy Kopylenko, Mark Pollack, Thierry Templier, Erwin Vervaet, Portia Tung, Ben Hale, Adrian Colyer, John Lewis, + Costin Leau, Mark Fisher, Sam Brannen, Ramnivas Laddad, Arjen Poutsma @@ -149,10 +113,10 @@ - &preface; - &overview; - &whats-new-in-3; - &getting-started; + + + + Core Technologies @@ -215,13 +179,13 @@ - &beans; - &resources; - &validation; - &expressions; - &aop; - &aop-api; - &testing; + + + + + + + Data Access @@ -255,11 +219,11 @@ - &transaction; - &dao; - &jdbc; - &orm; - &oxm; + + + + + The Web @@ -300,11 +264,11 @@ - &mvc; - &view; - &rest; - &web-integration; - &portlet; + + + + + Integration @@ -344,20 +308,20 @@ - &remoting; - &ejb; - &jms; - &jmx; - &cci; - &mail; - &scheduling; - &dynamic-languages; - &metadata; + + + + + + + + + - &xsd-configuration; - &xml-custom; - &dtd; - &spring-tld; - &spring-form-tld; + + + + + diff --git a/spring-framework-reference/src/spring.tld.xml b/spring-framework-reference/src/spring.tld.xml index 33961b2bfd..438f6cacc5 100644 --- a/spring-framework-reference/src/spring.tld.xml +++ b/spring-framework-reference/src/spring.tld.xml @@ -1,4 +1,7 @@ + + spring.tld
diff --git a/spring-framework-reference/src/swf-sidebar.xml b/spring-framework-reference/src/swf-sidebar.xml index 2af2ed6717..5e66b9cbcf 100644 --- a/spring-framework-reference/src/swf-sidebar.xml +++ b/spring-framework-reference/src/swf-sidebar.xml @@ -1,4 +1,7 @@ + + Spring Web Flow diff --git a/spring-framework-reference/src/testing.xml b/spring-framework-reference/src/testing.xml index 3520aab839..3b26d7b62d 100644 --- a/spring-framework-reference/src/testing.xml +++ b/spring-framework-reference/src/testing.xml @@ -1,4 +1,7 @@ + + Testing diff --git a/spring-framework-reference/src/transaction.xml b/spring-framework-reference/src/transaction.xml index d136205e51..17574edf18 100644 --- a/spring-framework-reference/src/transaction.xml +++ b/spring-framework-reference/src/transaction.xml @@ -1,4 +1,7 @@ - + + + Transaction management diff --git a/spring-framework-reference/src/validation.xml b/spring-framework-reference/src/validation.xml index 032d059b82..ac098361fd 100644 --- a/spring-framework-reference/src/validation.xml +++ b/spring-framework-reference/src/validation.xml @@ -1,4 +1,7 @@ + + Validation, Data-binding, the <interfacename>BeanWrapper</interfacename>, and <literal>PropertyEditors</literal> diff --git a/spring-framework-reference/src/view.xml b/spring-framework-reference/src/view.xml index ba4ab4f427..0119f52cfb 100644 --- a/spring-framework-reference/src/view.xml +++ b/spring-framework-reference/src/view.xml @@ -1,4 +1,7 @@ + + View technologies diff --git a/spring-framework-reference/src/web-integration.xml b/spring-framework-reference/src/web-integration.xml index 6e842f858c..58a7c297d4 100644 --- a/spring-framework-reference/src/web-integration.xml +++ b/spring-framework-reference/src/web-integration.xml @@ -1,5 +1,8 @@ - + + + Integrating with other web frameworks
@@ -13,7 +16,7 @@ - &swf-sidebar; + One of the core value propositions of the Spring Framework is that of diff --git a/spring-framework-reference/src/xml-custom.xml b/spring-framework-reference/src/xml-custom.xml index 0936a8a152..0e8597cbfd 100644 --- a/spring-framework-reference/src/xml-custom.xml +++ b/spring-framework-reference/src/xml-custom.xml @@ -1,4 +1,7 @@ - + + + Extensible XML authoring
diff --git a/spring-framework-reference/src/xsd-configuration.xml b/spring-framework-reference/src/xsd-configuration.xml index 73f31f800b..73f7d24b8b 100644 --- a/spring-framework-reference/src/xsd-configuration.xml +++ b/spring-framework-reference/src/xsd-configuration.xml @@ -1,4 +1,7 @@ - + + + XML Schema-based configuration
diff --git a/spring-framework.ipr b/spring-framework.ipr index 38ebb636ab..09b60b86f7 100644 --- a/spring-framework.ipr +++ b/spring-framework.ipr @@ -1,862 +1,848 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +