diff --git a/org.springframework.integration.event/pom.xml b/org.springframework.integration.event/pom.xml index 799bc191aa..0ab002ac14 100644 --- a/org.springframework.integration.event/pom.xml +++ b/org.springframework.integration.event/pom.xml @@ -3,16 +3,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 + + org.springframework.integration + spring-integration + 2.0.0.BUILD-SNAPSHOT + org.springframework.integration spring-integration-event jar Spring Integration Event Support - - org.springframework.integration - spring-integration-parent - 2.0.0.BUILD-SNAPSHOT - ../spring-integration-parent - junit diff --git a/org.springframework.integration.file/pom.xml b/org.springframework.integration.file/pom.xml index 15b28f1392..746d68cdeb 100644 --- a/org.springframework.integration.file/pom.xml +++ b/org.springframework.integration.file/pom.xml @@ -3,16 +3,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 + + org.springframework.integration + spring-integration + 2.0.0.BUILD-SNAPSHOT + org.springframework.integration spring-integration-file jar Spring Integration File Adapters - - org.springframework.integration - spring-integration-parent - 2.0.0.BUILD-SNAPSHOT - ../spring-integration-parent - cglib diff --git a/org.springframework.integration.http/pom.xml b/org.springframework.integration.http/pom.xml index 1f78ebd628..b37cdcd91f 100644 --- a/org.springframework.integration.http/pom.xml +++ b/org.springframework.integration.http/pom.xml @@ -3,16 +3,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 + + org.springframework.integration + spring-integration + 2.0.0.BUILD-SNAPSHOT + org.springframework.integration spring-integration-http jar Spring Integration HTTP Support - - org.springframework.integration - spring-integration-parent - 2.0.0.BUILD-SNAPSHOT - ../spring-integration-parent - javax.servlet diff --git a/org.springframework.integration.httpinvoker/pom.xml b/org.springframework.integration.httpinvoker/pom.xml index 249bdc08c0..49b06ebf9a 100644 --- a/org.springframework.integration.httpinvoker/pom.xml +++ b/org.springframework.integration.httpinvoker/pom.xml @@ -3,16 +3,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 + + org.springframework.integration + spring-integration + 2.0.0.BUILD-SNAPSHOT + org.springframework.integration spring-integration-httpinvoker jar Spring Integration HttpInvoker Support - - org.springframework.integration - spring-integration-parent - 2.0.0.BUILD-SNAPSHOT - ../spring-integration-parent - javax.servlet diff --git a/org.springframework.integration.ip/pom.xml b/org.springframework.integration.ip/pom.xml index e765e6450b..0c420bff39 100644 --- a/org.springframework.integration.ip/pom.xml +++ b/org.springframework.integration.ip/pom.xml @@ -3,16 +3,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 + + org.springframework.integration + spring-integration + 2.0.0.BUILD-SNAPSHOT + org.springframework.integration spring-integration-ip jar Spring Integration UDP Adapters - - org.springframework.integration - spring-integration-parent - 2.0.0.BUILD-SNAPSHOT - ../spring-integration-parent - cglib diff --git a/org.springframework.integration.jdbc/pom.xml b/org.springframework.integration.jdbc/pom.xml index 09d3d4a549..6a21374733 100644 --- a/org.springframework.integration.jdbc/pom.xml +++ b/org.springframework.integration.jdbc/pom.xml @@ -2,15 +2,14 @@ 4.0.0 + + org.springframework.integration + spring-integration + 2.0.0.BUILD-SNAPSHOT + spring-integration-jdbc jar Spring Integration JDBC - - org.springframework.integration - spring-integration-parent - 2.0.0.BUILD-SNAPSHOT - ../spring-integration-parent - cglib diff --git a/org.springframework.integration.jms/pom.xml b/org.springframework.integration.jms/pom.xml index 30d0047ba5..5894a8104d 100644 --- a/org.springframework.integration.jms/pom.xml +++ b/org.springframework.integration.jms/pom.xml @@ -3,16 +3,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 + + org.springframework.integration + spring-integration + 2.0.0.BUILD-SNAPSHOT + org.springframework.integration spring-integration-jms jar Spring Integration JMS Support - - org.springframework.integration - spring-integration-parent - 2.0.0.BUILD-SNAPSHOT - ../spring-integration-parent - org.apache.geronimo.specs diff --git a/org.springframework.integration.jmx/pom.xml b/org.springframework.integration.jmx/pom.xml index e53ac943cb..8a159beea0 100644 --- a/org.springframework.integration.jmx/pom.xml +++ b/org.springframework.integration.jmx/pom.xml @@ -3,16 +3,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 + + org.springframework.integration + spring-integration + 2.0.0.BUILD-SNAPSHOT + org.springframework.integration spring-integration-jmx jar Spring Integration JMX Support - - org.springframework.integration - spring-integration-parent - 2.0.0.BUILD-SNAPSHOT - ../spring-integration-parent - junit diff --git a/org.springframework.integration.mail/pom.xml b/org.springframework.integration.mail/pom.xml index cd0f6abe3f..5927058c4a 100644 --- a/org.springframework.integration.mail/pom.xml +++ b/org.springframework.integration.mail/pom.xml @@ -3,16 +3,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 + + org.springframework.integration + spring-integration + 2.0.0.BUILD-SNAPSHOT + org.springframework.integration spring-integration-mail jar Spring Integration Mail Support - - org.springframework.integration - spring-integration-parent - 2.0.0.BUILD-SNAPSHOT - ../spring-integration-parent - javax.activation diff --git a/org.springframework.integration.rmi/pom.xml b/org.springframework.integration.rmi/pom.xml index bc8c5bcced..4f52ab3ce0 100644 --- a/org.springframework.integration.rmi/pom.xml +++ b/org.springframework.integration.rmi/pom.xml @@ -3,16 +3,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 + + org.springframework.integration + spring-integration + 2.0.0.BUILD-SNAPSHOT + org.springframework.integration spring-integration-rmi jar Spring Integration RMI Support - - org.springframework.integration - spring-integration-parent - 2.0.0.BUILD-SNAPSHOT - ../spring-integration-parent - junit diff --git a/org.springframework.integration.security/pom.xml b/org.springframework.integration.security/pom.xml index b89db4e71a..1eedc1fbd5 100644 --- a/org.springframework.integration.security/pom.xml +++ b/org.springframework.integration.security/pom.xml @@ -3,16 +3,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 + + org.springframework.integration + spring-integration + 2.0.0.BUILD-SNAPSHOT + org.springframework.integration spring-integration-security jar Spring Integration Security Support - - org.springframework.integration - spring-integration-parent - 2.0.0.BUILD-SNAPSHOT - ../spring-integration-parent - org.easymock diff --git a/org.springframework.integration.stream/pom.xml b/org.springframework.integration.stream/pom.xml index eea8c4d609..449feb4e29 100644 --- a/org.springframework.integration.stream/pom.xml +++ b/org.springframework.integration.stream/pom.xml @@ -3,16 +3,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 + + org.springframework.integration + spring-integration + 2.0.0.BUILD-SNAPSHOT + org.springframework.integration spring-integration-stream jar Spring Integration Stream Support - - org.springframework.integration - spring-integration-parent - 2.0.0.BUILD-SNAPSHOT - ../spring-integration-parent - junit diff --git a/org.springframework.integration.test/pom.xml b/org.springframework.integration.test/pom.xml index b6b4c72cdb..5b00114733 100644 --- a/org.springframework.integration.test/pom.xml +++ b/org.springframework.integration.test/pom.xml @@ -3,16 +3,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 + + org.springframework.integration + spring-integration + 2.0.0.BUILD-SNAPSHOT + org.springframework.integration spring-integration-test jar Spring Integration Testing Support - - org.springframework.integration - spring-integration-parent - 2.0.0.BUILD-SNAPSHOT - ../spring-integration-parent - org.mockito diff --git a/org.springframework.integration.ws/pom.xml b/org.springframework.integration.ws/pom.xml index b205c9db71..7cde8756bd 100644 --- a/org.springframework.integration.ws/pom.xml +++ b/org.springframework.integration.ws/pom.xml @@ -3,16 +3,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 + + org.springframework.integration + spring-integration + 2.0.0.BUILD-SNAPSHOT + org.springframework.integration spring-integration-ws jar Spring Integration Web Services Support - - org.springframework.integration - spring-integration-parent - 2.0.0.BUILD-SNAPSHOT - ../spring-integration-parent - com.sun.xml.messaging.saaj diff --git a/org.springframework.integration.xml/pom.xml b/org.springframework.integration.xml/pom.xml index 914af2ecef..8568dfae5f 100644 --- a/org.springframework.integration.xml/pom.xml +++ b/org.springframework.integration.xml/pom.xml @@ -3,16 +3,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 + + org.springframework.integration + spring-integration + 2.0.0.BUILD-SNAPSHOT + org.springframework.integration spring-integration-xml jar Spring Integration XML Support - - org.springframework.integration - spring-integration-parent - 2.0.0.BUILD-SNAPSHOT - ../spring-integration-parent - tiger diff --git a/org.springframework.integration/pom.xml b/org.springframework.integration/pom.xml index 9348d7d1a7..dca29c8d4f 100644 --- a/org.springframework.integration/pom.xml +++ b/org.springframework.integration/pom.xml @@ -2,15 +2,14 @@ 4.0.0 + + org.springframework.integration + spring-integration + 2.0.0.BUILD-SNAPSHOT + spring-integration-core jar Spring Integration Core - - org.springframework.integration - spring-integration-parent - 2.0.0.BUILD-SNAPSHOT - ../spring-integration-parent - + 2.2 + 4.7 + 1.2.12 + 1.6.5 + 2.3 + 3.4.2.v_883_R34x + 1.8.4 + 1.5.10 + 3.0.2.RELEASE + + + + non-strict + + true + + + + fast + + true + true + + + + staging + + + staging + file:///${user.dir}/target/staging + + + staging + file:///${user.dir}/target/staging + + + staging + file:///${user.dir}/target/staging + + + + + release + + + + maven-source-plugin + + + attach-sources + + jar + + + + + + + + + + + staging + file:///${user.dir}/target/staging + + + spring-milestone + Spring Milestone Repository + s3://maven.springframework.org/milestone + + + spring-snapshot + Spring Snapshot Repository + s3://maven.springframework.org/snapshot + + + + + + org.springframework.build.aws + org.springframework.build.aws.maven + 2.0.0.RELEASE + + + + + ${project.basedir}/src/main/java + + + **/* + + + **/*.java + + + + ${project.basedir}/src/main/resources + + + **/* + + + + + + src/test/java + + **/* + + + **/*.java + + + + src/main/java + + **/* + + + **/*.java + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.5 + 1.5 + + + + + org.apache.maven.plugins + maven-surefire-plugin + + false + + **/*Tests.java + + + **/Abstract*.java + **/PropertyPlaceholderTests.java + + junit:junit + + + + com.agilejava.docbkx + docbkx-maven-plugin + 2.0.9 + + + + generate-html + generate-pdf + + pre-site + + + + + org.docbook + docbook-xml + 4.4 + runtime + + + + index.xml + true + css/html.css + true + src/docbkx/resources/xsl/html_chunk.xsl + src/docbkx/resources/xsl/fopdf.xsl + + + + version + ${pom.version} + + + + + + + + + + + + + + + + + + + + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + org.apache.ant + ant + 1.7.0 + + + org.apache.ant + ant-trax + 1.7.0 + + + org.apache.ant + ant-apache-regexp + 1.7.0 + + + foundrylogic.vpp + vpp + 2.2.1 + + + + + + + + + glassfish + Glassfish Repository + http://download.java.net/maven/glassfish + + false + + + + jboss + JBoss Repository + http://repository.jboss.org/maven2 + + true + + + false + + + + com.springsource.repository.bundles.release + SpringSource Enterprise Bundle Repository - SpringSource Bundle Releases + http://repository.springsource.com/maven/bundles/release + + + com.springsource.repository.bundles.external + SpringSource Enterprise Bundle Repository - External Bundle Releases + http://repository.springsource.com/maven/bundles/external + + + objectstyle + ObjectStyle.org Repository + http://objectstyle.org/maven2/ + + false + + + + + + com.springsource.repository.bundles.milestone + SpringSource Enterprise Bundle Repository - SpringSource Bundle Milestones + http://repository.springsource.com/maven/bundles/milestone + + false + + + + com.springsource.repository.bundles.snapshot + SpringSource Enterprise Bundle Repository - SpringSource Bundle Snapshots + http://repository.springsource.com/maven/bundles/snapshot + + + agilejava + http://agilejava.com/maven + + false + + + + + + + log4j + log4j + ${log4j.version} + test + + diff --git a/spring-integration-parent/.settings/org.eclipse.jdt.core.prefs b/spring-integration-parent/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 2f555b09ed..0000000000 --- a/spring-integration-parent/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,5 +0,0 @@ -#Mon Mar 01 14:41:03 GMT 2010 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 -org.eclipse.jdt.core.compiler.source=1.5 diff --git a/spring-integration-parent/.settings/org.maven.ide.eclipse.prefs b/spring-integration-parent/.settings/org.maven.ide.eclipse.prefs deleted file mode 100644 index 4f6f204fb0..0000000000 --- a/spring-integration-parent/.settings/org.maven.ide.eclipse.prefs +++ /dev/null @@ -1,9 +0,0 @@ -#Mon Mar 01 14:40:58 GMT 2010 -activeProfiles= -eclipse.preferences.version=1 -fullBuildGoals=process-test-resources -includeModules=false -resolveWorkspaceProjects=true -resourceFilterGoals=process-resources resources\:testResources -skipCompilerPlugin=true -version=1 diff --git a/spring-integration-reference/build.xml b/spring-integration-reference/build.xml deleted file mode 100644 index a1ea825ffd..0000000000 --- a/spring-integration-reference/build.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/spring-integration-reference/ivy.xml b/spring-integration-reference/ivy.xml deleted file mode 100644 index 3e57b0496e..0000000000 --- a/spring-integration-reference/ivy.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/spring-integration-reference/src/aggregator.xml b/src/docbkx/aggregator.xml similarity index 99% rename from spring-integration-reference/src/aggregator.xml rename to src/docbkx/aggregator.xml index 483ef00486..173f59a6b1 100644 --- a/spring-integration-reference/src/aggregator.xml +++ b/src/docbkx/aggregator.xml @@ -1,6 +1,6 @@ - + Aggregator diff --git a/spring-integration-reference/src/bridge.xml b/src/docbkx/bridge.xml similarity index 96% rename from spring-integration-reference/src/bridge.xml rename to src/docbkx/bridge.xml index bffeaa7fbf..b8018cb32d 100644 --- a/spring-integration-reference/src/bridge.xml +++ b/src/docbkx/bridge.xml @@ -1,6 +1,6 @@ - + Messaging Bridge diff --git a/spring-integration-reference/src/chain.xml b/src/docbkx/chain.xml similarity index 98% rename from spring-integration-reference/src/chain.xml rename to src/docbkx/chain.xml index 2564a9c7e0..14beee7766 100644 --- a/spring-integration-reference/src/chain.xml +++ b/src/docbkx/chain.xml @@ -1,6 +1,6 @@ - + Message Handler Chain diff --git a/spring-integration-reference/src/channel-adapter.xml b/src/docbkx/channel-adapter.xml similarity index 97% rename from spring-integration-reference/src/channel-adapter.xml rename to src/docbkx/channel-adapter.xml index 78bcd042c1..6b6d15c51e 100644 --- a/spring-integration-reference/src/channel-adapter.xml +++ b/src/docbkx/channel-adapter.xml @@ -1,6 +1,6 @@ - + Channel Adapter diff --git a/spring-integration-reference/src/channel.xml b/src/docbkx/channel.xml similarity index 99% rename from spring-integration-reference/src/channel.xml rename to src/docbkx/channel.xml index 0e46803ab7..2fac535a07 100644 --- a/spring-integration-reference/src/channel.xml +++ b/src/docbkx/channel.xml @@ -1,5 +1,5 @@ - + Message Channels diff --git a/spring-integration-reference/src/configuration.xml b/src/docbkx/configuration.xml similarity index 99% rename from spring-integration-reference/src/configuration.xml rename to src/docbkx/configuration.xml index e6885b3e8d..3748583eb8 100644 --- a/spring-integration-reference/src/configuration.xml +++ b/src/docbkx/configuration.xml @@ -1,5 +1,5 @@ - + Configuration
diff --git a/spring-integration-reference/src/delayer.xml b/src/docbkx/delayer.xml similarity index 97% rename from spring-integration-reference/src/delayer.xml rename to src/docbkx/delayer.xml index 9942e1e249..f1e1d0f91c 100644 --- a/spring-integration-reference/src/delayer.xml +++ b/src/docbkx/delayer.xml @@ -1,6 +1,6 @@ - + Delayer diff --git a/spring-integration-reference/src/endpoint.xml b/src/docbkx/endpoint.xml similarity index 99% rename from spring-integration-reference/src/endpoint.xml rename to src/docbkx/endpoint.xml index c819804662..abe01d88f8 100644 --- a/spring-integration-reference/src/endpoint.xml +++ b/src/docbkx/endpoint.xml @@ -1,6 +1,6 @@ - + Message Endpoints diff --git a/spring-integration-reference/src/event.xml b/src/docbkx/event.xml similarity index 93% rename from spring-integration-reference/src/event.xml rename to src/docbkx/event.xml index c6048ba2e7..ad8ba93120 100644 --- a/spring-integration-reference/src/event.xml +++ b/src/docbkx/event.xml @@ -1,5 +1,5 @@ - + Spring ApplicationEvent Support diff --git a/spring-integration-reference/src/file.xml b/src/docbkx/file.xml similarity index 98% rename from spring-integration-reference/src/file.xml rename to src/docbkx/file.xml index bc714f8f0f..01fc1c695c 100644 --- a/spring-integration-reference/src/file.xml +++ b/src/docbkx/file.xml @@ -1,5 +1,5 @@ - + File Support diff --git a/spring-integration-reference/src/filter.xml b/src/docbkx/filter.xml similarity index 97% rename from spring-integration-reference/src/filter.xml rename to src/docbkx/filter.xml index 8b7c340845..5546f9fe80 100644 --- a/spring-integration-reference/src/filter.xml +++ b/src/docbkx/filter.xml @@ -1,6 +1,6 @@ - + Filter diff --git a/spring-integration-reference/src/gateway.xml b/src/docbkx/gateway.xml similarity index 97% rename from spring-integration-reference/src/gateway.xml rename to src/docbkx/gateway.xml index 54e0df16b0..8483e2b4cf 100644 --- a/spring-integration-reference/src/gateway.xml +++ b/src/docbkx/gateway.xml @@ -1,6 +1,6 @@ - + Inbound Messaging Gateways diff --git a/spring-integration-reference/src/http.xml b/src/docbkx/http.xml similarity index 98% rename from spring-integration-reference/src/http.xml rename to src/docbkx/http.xml index 55a8f56c60..f7e797a2f7 100644 --- a/spring-integration-reference/src/http.xml +++ b/src/docbkx/http.xml @@ -1,5 +1,5 @@ - + HTTP Support diff --git a/spring-integration-reference/src/httpinvoker.xml b/src/docbkx/httpinvoker.xml similarity index 98% rename from spring-integration-reference/src/httpinvoker.xml rename to src/docbkx/httpinvoker.xml index da2492571e..fae646e28b 100644 --- a/spring-integration-reference/src/httpinvoker.xml +++ b/src/docbkx/httpinvoker.xml @@ -1,5 +1,5 @@ - + HttpInvoker Support diff --git a/spring-integration-reference/src/spring-integration-reference.xml b/src/docbkx/index.xml similarity index 83% rename from spring-integration-reference/src/spring-integration-reference.xml rename to src/docbkx/index.xml index 63183d58a5..d9b5921744 100644 --- a/spring-integration-reference/src/spring-integration-reference.xml +++ b/src/docbkx/index.xml @@ -1,20 +1,23 @@ - + Spring Integration Reference Manual - Spring Integration 2.0.0 M4 + Spring Integration &version; Spring Integration - 2.0.0 Milestone 4 + &version; + - + - + + diff --git a/spring-integration-reference/src/ip.xml b/src/docbkx/ip.xml similarity index 99% rename from spring-integration-reference/src/ip.xml rename to src/docbkx/ip.xml index 32dd80ea19..fae46ef0ae 100644 --- a/spring-integration-reference/src/ip.xml +++ b/src/docbkx/ip.xml @@ -1,5 +1,5 @@ - + TCP and UDP Support diff --git a/spring-integration-reference/src/jms.xml b/src/docbkx/jms.xml similarity index 99% rename from spring-integration-reference/src/jms.xml rename to src/docbkx/jms.xml index 6519b0676d..97fd8373e4 100644 --- a/spring-integration-reference/src/jms.xml +++ b/src/docbkx/jms.xml @@ -1,6 +1,6 @@ - + JMS Support diff --git a/spring-integration-reference/src/jmx.xml b/src/docbkx/jmx.xml similarity index 98% rename from spring-integration-reference/src/jmx.xml rename to src/docbkx/jmx.xml index aa44668380..8a957daa10 100644 --- a/spring-integration-reference/src/jmx.xml +++ b/src/docbkx/jmx.xml @@ -1,6 +1,6 @@ - + JMX Support diff --git a/spring-integration-reference/src/mail.xml b/src/docbkx/mail.xml similarity index 98% rename from spring-integration-reference/src/mail.xml rename to src/docbkx/mail.xml index f0c7f8cd9a..139f26bbbe 100644 --- a/spring-integration-reference/src/mail.xml +++ b/src/docbkx/mail.xml @@ -1,5 +1,5 @@ - + Mail Support diff --git a/spring-integration-reference/src/message-publishing.xml b/src/docbkx/message-publishing.xml similarity index 98% rename from spring-integration-reference/src/message-publishing.xml rename to src/docbkx/message-publishing.xml index c0edf65fdd..bd0547efe8 100644 --- a/spring-integration-reference/src/message-publishing.xml +++ b/src/docbkx/message-publishing.xml @@ -1,5 +1,5 @@ - + Message Publishing diff --git a/spring-integration-reference/src/message.xml b/src/docbkx/message.xml similarity index 98% rename from spring-integration-reference/src/message.xml rename to src/docbkx/message.xml index ad06c9dc3d..4e25938595 100644 --- a/spring-integration-reference/src/message.xml +++ b/src/docbkx/message.xml @@ -1,5 +1,5 @@ - + Message Construction @@ -10,7 +10,7 @@
The Message Interface - Here is the definition of the Message interface: + Here is the definition of the Message interface: public interface Message<T> { T getPayload(); @@ -219,4 +219,4 @@ assertEquals(MessagePriority.HIGHEST, anotherMessage.getHeaders().getPriority())
- \ No newline at end of file + diff --git a/spring-integration-reference/src/overview.xml b/src/docbkx/overview.xml similarity index 90% rename from spring-integration-reference/src/overview.xml rename to src/docbkx/overview.xml index b3d8740834..487d92819a 100644 --- a/spring-integration-reference/src/overview.xml +++ b/src/docbkx/overview.xml @@ -1,5 +1,5 @@ - + Spring Integration Overview @@ -40,7 +40,7 @@ within Spring and the well-known Enterprise Integration Patterns as described in the book of the same name by Gregor Hohpe and Bobby Woolf (Addison Wesley, 2004). Developers who have read that book should be immediately comfortable with the Spring Integration concepts and terminology. - +
@@ -69,7 +69,7 @@ Extension points should be abstract in nature but within well-defined boundaries to promote - reuse and portability. + reuse and portability. @@ -105,8 +105,12 @@ cc, subject, etc.) may be configured as Message header values by an upstream component. Developers can also store any arbitrary key-value pairs in the headers. - - + + + + + @@ -119,8 +123,12 @@ a channel, and consumers receive Messages from a channel. The Message Channel therefore decouples the messaging components, and also provides a convenient point for interception and monitoring of Messages. - - + + + + + A Message Channel may follow either Point-to-Point or Publish/Subscribe semantics. With a Point-to-Point @@ -177,7 +185,7 @@ Enterprise Integration Patterns book. Here, we provide only a high-level description of the main endpoint types supported by Spring Integration and their roles. The chapters that follow will elaborate and provide sample code as well as configuration examples. - +
Transformer @@ -216,8 +224,12 @@ a Service Activator or other endpoint capable of sending reply Messages. Likewise, a Message Router provides a proactive alternative to the reactive Message Filters used by multiple subscribers as described above. - - + + + + + @@ -264,8 +276,12 @@ channel. If no output channel has been configured, then the reply will be sent to the channel specified in the Message's "return address" if available. - - + + + + + A request-reply "Service Activator" endpoint connects a target object's method to input and output @@ -285,14 +301,22 @@ values. Spring Integration provides a number of Channel Adapters, and they will be described in upcoming chapters. - - + + + + + An inbound "Channel Adapter" endpoint connects a source system to a MessageChannel. - - + + + + + An outbound "Channel Adapter" endpoint connects a MessageChannel to a target system. @@ -300,4 +324,4 @@
- \ No newline at end of file + diff --git a/spring-integration-reference/src/resequencer.xml b/src/docbkx/resequencer.xml similarity index 96% rename from spring-integration-reference/src/resequencer.xml rename to src/docbkx/resequencer.xml index 8a59ea0b02..8c5034723f 100644 --- a/spring-integration-reference/src/resequencer.xml +++ b/src/docbkx/resequencer.xml @@ -1,6 +1,6 @@ - + Resequencer @@ -42,7 +42,7 @@ output-channel="outputChannel" discard-channel="discardChannel" release-partial-sequences="true" - message-store="messageStore" + message-store="messageStore" send-partial-result-on-expiry="true" send-timeout="86420000" /> diff --git a/spring-integration-reference/src/resources.xml b/src/docbkx/resources.xml similarity index 85% rename from spring-integration-reference/src/resources.xml rename to src/docbkx/resources.xml index bd9d8d2281..0f13c011dc 100644 --- a/spring-integration-reference/src/resources.xml +++ b/src/docbkx/resources.xml @@ -1,5 +1,5 @@ - + Additional Resources diff --git a/spring-integration-reference/css/html/highlight.css b/src/docbkx/resources/css/highlight.css similarity index 100% rename from spring-integration-reference/css/html/highlight.css rename to src/docbkx/resources/css/highlight.css diff --git a/src/docbkx/resources/css/html.css b/src/docbkx/resources/css/html.css new file mode 100644 index 0000000000..36297ac36d --- /dev/null +++ b/src/docbkx/resources/css/html.css @@ -0,0 +1,421 @@ +body { + text-align: justify; + margin-right: 2em; + margin-left: 2em; +} + +a, + a[accesskey^ + += +"h" +] +, +a[accesskey^ + += +"n" +] +, +a[accesskey^ + += +"u" +] +, +a[accesskey^ + += +"p" +] +{ +font-family: Verdana, Arial, helvetica, sans-serif + +; +font-size: + +12 +px + +; +color: #003399 + +; +} + +a:active { + color: #003399; +} + +a:visited { + color: #888888; +} + +p { + font-family: Verdana, Arial, sans-serif; +} + +dt { + font-family: Verdana, Arial, sans-serif; + font-size: 12px; +} + +p, dl, dt, dd, blockquote { + color: #000000; + margin-bottom: 3px; + margin-top: 3px; + padding-top: 0px; +} + +ol, ul, p { + margin-top: 6px; + margin-bottom: 6px; +} + +p, blockquote { + font-size: 90%; +} + +p.releaseinfo { + font-size: 100%; + font-weight: bold; + font-family: Verdana, Arial, helvetica, sans-serif; + padding-top: 10px; +} + +p.pubdate { + font-size: 120%; + font-weight: bold; + font-family: Verdana, Arial, helvetica, sans-serif; +} + +td { + font-size: 80%; +} + +td, th, span { + color: #000000; +} + +td[width^ + += +"40%" +] +{ +font-family: Verdana, Arial, helvetica, sans-serif + +; +font-size: + +12 +px + +; +color: #003399 + +; +} + +table[summary^ + += +"Navigation header" +] +tbody tr th[colspan^ + += +"3" +] +{ +font-family: Verdana, Arial, helvetica, sans-serif + +; +} + +blockquote { + margin-right: 0px; +} + +h1, h2, h3, h4, h6, H6 { + color: #000000; + font-weight: 500; + margin-top: 0px; + padding-top: 14px; + font-family: Verdana, Arial, helvetica, sans-serif; + margin-bottom: 0px; +} + +h2.title { + font-weight: 800; + margin-bottom: 8px; +} + +h2.subtitle { + font-weight: 800; + margin-bottom: 20px; +} + +.firstname, .surname { + font-size: 12px; + font-family: Verdana, Arial, helvetica, sans-serif; +} + +table { + border-collapse: collapse; + border-spacing: 0; + border: 1px black; + empty-cells: hide; + margin: 10px 0px 30px 50px; + width: 90%; +} + +div.table { + margin: 30px 0px 30px 0px; + border: 1px dashed gray; + padding: 10px; +} + +div .table-contents table { + border: 1px solid black; +} + +div.table > p.title { + padding-left: 10px; +} + +table[summary^ + += +"Navigation footer" +] +{ +border-collapse: collapse + +; +border-spacing: + +0 +; +border: + +1 +px black + +; +empty-cells: hide + +; +margin: + +0 +px + +; +width: + +100 +% +; +} + +table[summary^ + += +"Note" +] +, +table[summary^ + += +"Warning" +] +, +table[summary^ + += +"Tip" +] +{ +border-collapse: collapse + +; +border-spacing: + +0 +; +border: + +1 +px black + +; +empty-cells: hide + +; +margin: + +10 +px + +0 +px + +10 +px + +- +20 +px + +; +width: + +100 +% +; +} + +td { + padding: 4pt; + font-family: Verdana, Arial, helvetica, sans-serif; +} + +div.warning TD { + text-align: justify; +} + +h1 { + font-size: 150%; +} + +h2 { + font-size: 110%; +} + +h3 { + font-size: 100%; + font-weight: bold; +} + +h4 { + font-size: 90%; + font-weight: bold; +} + +h5 { + font-size: 90%; + font-style: italic; +} + +h6 { + font-size: 100%; + font-style: italic; +} + +tt { + font-size: 110%; + font-family: "Courier New", Courier, monospace; + color: #000000; +} + +.navheader, .navfooter { + border: none; +} + +div.navfooter table { + border: dashed gray; + border-width: 1px 1px 1px 1px; + background-color: #cde48d; +} + +pre { + font-size: 110%; + padding: 5px; + border-style: solid; + border-width: 1px; + border-color: #CCCCCC; + background-color: #f3f5e9; +} + +ul, ol, li { + list-style: disc; +} + +hr { + width: 100%; + height: 1px; + background-color: #CCCCCC; + border-width: 0px; + padding: 0px; +} + +.variablelist { + padding-top: 10px; + padding-bottom: 10px; + margin: 0; +} + +.term { + font-weight: bold; +} + +.mediaobject { + padding-top: 30px; + padding-bottom: 30px; +} + +.legalnotice { + font-family: Verdana, Arial, helvetica, sans-serif; + font-size: 12px; + font-style: italic; +} + +.sidebar { + float: right; + margin: 10px 0px 10px 30px; + padding: 10px 20px 20px 20px; + width: 33%; + border: 1px solid black; + background-color: #F4F4F4; + font-size: 14px; +} + +.property { + font-family: "Courier New", Courier, monospace; +} + +a code { + font-family: Verdana, Arial, monospace; + font-size: 12px; +} + +td code { + font-size: 110%; +} + +div.note * td, + div.tip * td, + div.warning * td, + div.calloutlist * td { + text-align: justify; + font-size: 100%; +} + +.programlisting .interfacename, + .programlisting .literal, + .programlisting .classname { + font-size: 95%; +} + +.title .interfacename, + .title .literal, + .title .classname { + font-size: 130%; +} + +/* everything in a is displayed in a coloured, comment-like font */ +.programlisting * .lineannotation, + .programlisting * .lineannotation * { + color: green; +} diff --git a/spring-integration-reference/css/html/stylesheet.css b/src/docbkx/resources/css/stylesheet.css similarity index 100% rename from spring-integration-reference/css/html/stylesheet.css rename to src/docbkx/resources/css/stylesheet.css diff --git a/spring-integration-reference/images/cafe-demo.png b/src/docbkx/resources/images/cafe-demo.png similarity index 100% rename from spring-integration-reference/images/cafe-demo.png rename to src/docbkx/resources/images/cafe-demo.png diff --git a/spring-integration-reference/images/channel.png b/src/docbkx/resources/images/channel.png similarity index 100% rename from spring-integration-reference/images/channel.png rename to src/docbkx/resources/images/channel.png diff --git a/spring-integration-reference/images/handler-endpoint.png b/src/docbkx/resources/images/handler-endpoint.png similarity index 100% rename from spring-integration-reference/images/handler-endpoint.png rename to src/docbkx/resources/images/handler-endpoint.png diff --git a/spring-integration-reference/images/handler.png b/src/docbkx/resources/images/handler.png similarity index 100% rename from spring-integration-reference/images/handler.png rename to src/docbkx/resources/images/handler.png diff --git a/spring-integration-reference/images/logo.png b/src/docbkx/resources/images/logo.png similarity index 100% rename from spring-integration-reference/images/logo.png rename to src/docbkx/resources/images/logo.png diff --git a/spring-integration-reference/images/message-bus.png b/src/docbkx/resources/images/message-bus.png similarity index 100% rename from spring-integration-reference/images/message-bus.png rename to src/docbkx/resources/images/message-bus.png diff --git a/spring-integration-reference/images/message.png b/src/docbkx/resources/images/message.png similarity index 100% rename from spring-integration-reference/images/message.png rename to src/docbkx/resources/images/message.png diff --git a/spring-integration-reference/images/router.png b/src/docbkx/resources/images/router.png similarity index 100% rename from spring-integration-reference/images/router.png rename to src/docbkx/resources/images/router.png diff --git a/spring-integration-reference/images/source-endpoint.png b/src/docbkx/resources/images/source-endpoint.png similarity index 100% rename from spring-integration-reference/images/source-endpoint.png rename to src/docbkx/resources/images/source-endpoint.png diff --git a/spring-integration-reference/images/source.png b/src/docbkx/resources/images/source.png similarity index 100% rename from spring-integration-reference/images/source.png rename to src/docbkx/resources/images/source.png diff --git a/spring-integration-reference/images/target-endpoint.png b/src/docbkx/resources/images/target-endpoint.png similarity index 100% rename from spring-integration-reference/images/target-endpoint.png rename to src/docbkx/resources/images/target-endpoint.png diff --git a/spring-integration-reference/images/target.png b/src/docbkx/resources/images/target.png similarity index 100% rename from spring-integration-reference/images/target.png rename to src/docbkx/resources/images/target.png diff --git a/src/docbkx/resources/images/xdev-spring_logo.jpg b/src/docbkx/resources/images/xdev-spring_logo.jpg new file mode 100644 index 0000000000..622962ee3c Binary files /dev/null and b/src/docbkx/resources/images/xdev-spring_logo.jpg differ diff --git a/src/docbkx/resources/xsl/fopdf.xsl b/src/docbkx/resources/xsl/fopdf.xsl new file mode 100644 index 0000000000..6ca1a684d6 --- /dev/null +++ b/src/docbkx/resources/xsl/fopdf.xsl @@ -0,0 +1,418 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Copyright © 2005-2007 + + + , + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -5em + -5em + + + + + + + + + + + Spring-WS ( + + ) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + 0 + 1 + + 1 + + + + + + book toc + + + + 2 + + + + + + + + + + 0 + 0 + 0 + + + 5mm + 10mm + 10mm + + 15mm + 10mm + 0mm + + 18mm + 18mm + + + 0pc + + + + + justify + false + + + 11 + 8 + + + 1.4 + + + + + + + 0.8em + + + + + + 17.4cm + + + + 4pt + 4pt + 4pt + 4pt + + + + 0.1pt + 0.1pt + + + + + 1 + + + + + + + + left + bold + + + pt + + + + + + + + + + + + + + + 0.8em + 0.8em + 0.8em + + + pt + + 0.1em + 0.1em + 0.1em + + + 0.6em + 0.6em + 0.6em + + + pt + + 0.1em + 0.1em + 0.1em + + + 0.4em + 0.4em + 0.4em + + + pt + + 0.1em + 0.1em + 0.1em + + + + + bold + + + pt + + false + 0.4em + 0.6em + 0.8em + + + + + + + + + pt + + + + + 1em + 1em + 1em + #444444 + solid + 0.1pt + 0.5em + 0.5em + 0.5em + 0.5em + 0.5em + 0.5em + + + + 1 + + #F0F0F0 + + + + + + 0 + 1 + + + 90 + + + + + '1' + + + + + + + figure after + example before + equation before + table before + procedure before + + + + 1 + + + + 0.8em + 0.8em + 0.8em + 0.1em + 0.1em + 0.1em + + + + + + + + + + + + + + + + + diff --git a/src/docbkx/resources/xsl/html.xsl b/src/docbkx/resources/xsl/html.xsl new file mode 100644 index 0000000000..aa7930bab8 --- /dev/null +++ b/src/docbkx/resources/xsl/html.xsl @@ -0,0 +1,91 @@ + + + + + + + + + html.css + + + 1 + 0 + 1 + 0 + + + + + + book toc + + + + 3 + + + + + 1 + + + + + + + 0 + + + 90 + + + + + 0 + + + + + figure after + example before + equation before + table before + procedure before + + + + , + + + + + + + + +
+

Authors

+

+ +

+ + + diff --git a/spring-integration-reference/styles/html/custom.xsl b/src/docbkx/resources/xsl/html/html_chunk.xsl similarity index 100% rename from spring-integration-reference/styles/html/custom.xsl rename to src/docbkx/resources/xsl/html/html_chunk.xsl diff --git a/spring-integration-reference/styles/html/titlepage.xml b/src/docbkx/resources/xsl/html/titlepage.xml similarity index 100% rename from spring-integration-reference/styles/html/titlepage.xml rename to src/docbkx/resources/xsl/html/titlepage.xml diff --git a/src/docbkx/resources/xsl/html_chunk.xsl b/src/docbkx/resources/xsl/html_chunk.xsl new file mode 100644 index 0000000000..59016d819a --- /dev/null +++ b/src/docbkx/resources/xsl/html_chunk.xsl @@ -0,0 +1,208 @@ + + + + + + + '5' + '1' + + 1 + 0 + 1 + 0 + + + + book toc + + + 3 + + + 1 + + + + + 1 + 90 + + + + figure after + example before + equation before + table before + procedure before + + + + , + + + + + + + + +
+

Authors

+

+ +

+ + + + + + + + + 1 + + + + + + + + + + +
+ +
+ + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + +   + + + + + + + + + + + + + + +  |  + + +   + + + + + + + + -toc + + + + + + + + +   + + + + + + + + + + + + +
+ + + +   + + + Sponsored by SpringSource + + + +   + + + +
+ +
+ + + diff --git a/spring-integration-reference/styles/pdf/custom.xsl b/src/docbkx/resources/xsl/pdf/fopdf.xsl similarity index 100% rename from spring-integration-reference/styles/pdf/custom.xsl rename to src/docbkx/resources/xsl/pdf/fopdf.xsl diff --git a/spring-integration-reference/styles/pdf/titlepage.xml b/src/docbkx/resources/xsl/pdf/titlepage.xml similarity index 100% rename from spring-integration-reference/styles/pdf/titlepage.xml rename to src/docbkx/resources/xsl/pdf/titlepage.xml diff --git a/spring-integration-reference/src/rmi.xml b/src/docbkx/rmi.xml similarity index 96% rename from spring-integration-reference/src/rmi.xml rename to src/docbkx/rmi.xml index bc823da3b7..877dcfac5e 100644 --- a/spring-integration-reference/src/rmi.xml +++ b/src/docbkx/rmi.xml @@ -1,5 +1,5 @@ - + RMI Support diff --git a/spring-integration-reference/src/router.xml b/src/docbkx/router.xml similarity index 98% rename from spring-integration-reference/src/router.xml rename to src/docbkx/router.xml index c7965c977b..5bb0fa182e 100644 --- a/spring-integration-reference/src/router.xml +++ b/src/docbkx/router.xml @@ -1,6 +1,6 @@ - + Router diff --git a/spring-integration-reference/src/samples.xml b/src/docbkx/samples.xml similarity index 98% rename from spring-integration-reference/src/samples.xml rename to src/docbkx/samples.xml index 53c19c811c..772a3a1ab7 100644 --- a/spring-integration-reference/src/samples.xml +++ b/src/docbkx/samples.xml @@ -1,5 +1,5 @@ - + Spring Integration Samples @@ -25,8 +25,12 @@ - - + + + + + @@ -444,4 +448,4 @@ - \ No newline at end of file + diff --git a/spring-integration-reference/src/security.xml b/src/docbkx/security.xml similarity index 96% rename from spring-integration-reference/src/security.xml rename to src/docbkx/security.xml index 9b3ff17399..476a36b883 100644 --- a/spring-integration-reference/src/security.xml +++ b/src/docbkx/security.xml @@ -1,5 +1,5 @@ - + Security in Spring Integration diff --git a/spring-integration-reference/src/service-activator.xml b/src/docbkx/service-activator.xml similarity index 97% rename from spring-integration-reference/src/service-activator.xml rename to src/docbkx/service-activator.xml index 897c44bde3..1d624f3010 100644 --- a/spring-integration-reference/src/service-activator.xml +++ b/src/docbkx/service-activator.xml @@ -1,6 +1,6 @@ - + Service Activator diff --git a/spring-integration-reference/src/splitter.xml b/src/docbkx/splitter.xml similarity index 98% rename from spring-integration-reference/src/splitter.xml rename to src/docbkx/splitter.xml index 439eff2b5b..db1dcf3032 100644 --- a/spring-integration-reference/src/splitter.xml +++ b/src/docbkx/splitter.xml @@ -1,6 +1,6 @@ - + Splitter diff --git a/spring-integration-reference/src/stream.xml b/src/docbkx/stream.xml similarity index 97% rename from spring-integration-reference/src/stream.xml rename to src/docbkx/stream.xml index 7336b843fa..789fa7be64 100644 --- a/spring-integration-reference/src/stream.xml +++ b/src/docbkx/stream.xml @@ -1,5 +1,5 @@ - + Stream Support diff --git a/spring-integration-reference/src/transformer.xml b/src/docbkx/transformer.xml similarity index 98% rename from spring-integration-reference/src/transformer.xml rename to src/docbkx/transformer.xml index 32f41058af..14b31baa85 100644 --- a/spring-integration-reference/src/transformer.xml +++ b/src/docbkx/transformer.xml @@ -1,6 +1,6 @@ - + Transformer diff --git a/spring-integration-reference/src/ws.xml b/src/docbkx/ws.xml similarity index 98% rename from spring-integration-reference/src/ws.xml rename to src/docbkx/ws.xml index 23a5659dd5..1a4a2a3a02 100644 --- a/spring-integration-reference/src/ws.xml +++ b/src/docbkx/ws.xml @@ -1,5 +1,5 @@ - + Web Services Support diff --git a/spring-integration-reference/src/xml.xml b/src/docbkx/xml.xml similarity index 99% rename from spring-integration-reference/src/xml.xml rename to src/docbkx/xml.xml index ef2d39f171..353ad1e13e 100644 --- a/spring-integration-reference/src/xml.xml +++ b/src/docbkx/xml.xml @@ -1,5 +1,5 @@ - + Dealing with XML Payloads