diff --git a/pom.xml b/pom.xml index 1538fd1c3d..e8531daea7 100644 --- a/pom.xml +++ b/pom.xml @@ -31,11 +31,6 @@ spring-integration-twitter spring-integration-activiti - - scm:svn:https://src.springframework.org/svn/spring-integration/trunk - scm:svn:https://src.springframework.org/svn/spring-integration/trunk/ - https://fisheye.springframework.org/browse/spring-integration/trunk - UTF-8 @@ -257,7 +252,9 @@ - + @@ -377,9 +374,11 @@ - + + maven-assembly-plugin 2.2-beta-5 false @@ -400,8 +399,10 @@ - + org.apache.maven.plugins maven-release-plugin 2.0 diff --git a/readme.txt b/readme.txt index dd75024828..6be89cfbc1 100644 --- a/readme.txt +++ b/readme.txt @@ -1,4 +1,4 @@ -TODO: complete +TODO: complete project distribution zip file can be built by executing diff --git a/spring-integration-ftp/pom.xml b/spring-integration-ftp/pom.xml index f402efa788..b3ab0f838b 100644 --- a/spring-integration-ftp/pom.xml +++ b/spring-integration-ftp/pom.xml @@ -1,89 +1,89 @@ - 4.0.0 - - org.springframework.integration - spring-integration-parent - 2.0.0.BUILD-SNAPSHOT - - org.springframework.integration - spring-integration-ftp - jar - Spring Integration FTP Support - - - javax.activation - activation - 1.1.1 - true - - - org.springframework.integration - spring-integration-file - ${project.version} - - - commons-net - commons-net - 2.0 - - - cglib - cglib-nodep - ${cglib.version} - test - - - org.easymock - easymock - ${org.easymock.version} - test - - - org.easymock - easymockclassextension - ${org.easymock.version} - test - - - junit - junit - ${junit.version} - test - - - org.springframework - spring-context-support - ${org.springframework.version} - compile - - - org.springframework - spring-test - ${org.springframework.version} - test - - - org.springframework.integration - spring-integration-stream - ${project.version} - compile - - - org.springframework.integration - spring-integration-core - ${project.version} - compile - - - commons-lang - commons-lang - 2.5 - - - commons-io - commons-io - 1.4 - - + 4.0.0 + + org.springframework.integration + spring-integration-parent + 2.0.0.BUILD-SNAPSHOT + + org.springframework.integration + spring-integration-ftp + jar + Spring Integration FTP Support + + + javax.activation + activation + 1.1.1 + true + + + org.springframework.integration + spring-integration-file + ${project.version} + + + commons-net + commons-net + 2.0 + + + cglib + cglib-nodep + ${cglib.version} + test + + + org.easymock + easymock + ${org.easymock.version} + test + + + org.easymock + easymockclassextension + ${org.easymock.version} + test + + + junit + junit + ${junit.version} + test + + + org.springframework + spring-context-support + ${org.springframework.version} + compile + + + org.springframework + spring-test + ${org.springframework.version} + test + + + org.springframework.integration + spring-integration-stream + ${project.version} + compile + + + org.springframework.integration + spring-integration-core + ${project.version} + compile + + + commons-lang + commons-lang + 2.5 + + + commons-io + commons-io + 1.4 + + diff --git a/spring-integration-groovy/.classpath b/spring-integration-groovy/.classpath index 438f0fe3b3..98f38b6746 100644 --- a/spring-integration-groovy/.classpath +++ b/spring-integration-groovy/.classpath @@ -3,7 +3,6 @@ - diff --git a/spring-integration-ip/.settings/org.eclipse.jdt.core.prefs b/spring-integration-ip/.settings/org.eclipse.jdt.core.prefs index 61810d8175..35ade795c8 100644 --- a/spring-integration-ip/.settings/org.eclipse.jdt.core.prefs +++ b/spring-integration-ip/.settings/org.eclipse.jdt.core.prefs @@ -1,5 +1,6 @@ -#Sat Jul 10 12:27:30 BST 2010 +#Sat Sep 04 08:01:10 EDT 2010 eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 org.eclipse.jdt.core.compiler.compliance=1.5 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning diff --git a/spring-integration-samples/async-gateway/.classpath b/spring-integration-samples/async-gateway/.classpath index 96489ff1c9..e3c5b1bf15 100644 --- a/spring-integration-samples/async-gateway/.classpath +++ b/spring-integration-samples/async-gateway/.classpath @@ -2,8 +2,6 @@ - - diff --git a/spring-integration-samples/async-gateway/readme.txt b/spring-integration-samples/async-gateway/readme.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/spring-integration-samples/cafe/.classpath b/spring-integration-samples/cafe/.classpath index f42fb64cfa..70a3874ccc 100644 --- a/spring-integration-samples/cafe/.classpath +++ b/spring-integration-samples/cafe/.classpath @@ -2,8 +2,6 @@ - - diff --git a/spring-integration-samples/errorhandling/.classpath b/spring-integration-samples/errorhandling/.classpath index 96489ff1c9..24166ba51f 100644 --- a/spring-integration-samples/errorhandling/.classpath +++ b/spring-integration-samples/errorhandling/.classpath @@ -1,9 +1,6 @@ - - - diff --git a/spring-integration-samples/filecopy/.classpath b/spring-integration-samples/filecopy/.classpath index 96489ff1c9..24166ba51f 100644 --- a/spring-integration-samples/filecopy/.classpath +++ b/spring-integration-samples/filecopy/.classpath @@ -1,9 +1,6 @@ - - - diff --git a/spring-integration-samples/helloworld/.classpath b/spring-integration-samples/helloworld/.classpath index f42fb64cfa..16f01e2ee7 100644 --- a/spring-integration-samples/helloworld/.classpath +++ b/spring-integration-samples/helloworld/.classpath @@ -1,9 +1,6 @@ - - - diff --git a/spring-integration-samples/jms/.classpath b/spring-integration-samples/jms/.classpath index 96489ff1c9..24166ba51f 100644 --- a/spring-integration-samples/jms/.classpath +++ b/spring-integration-samples/jms/.classpath @@ -1,9 +1,6 @@ - - - diff --git a/spring-integration-samples/jmx/.classpath b/spring-integration-samples/jmx/.classpath index f42fb64cfa..16f01e2ee7 100644 --- a/spring-integration-samples/jmx/.classpath +++ b/spring-integration-samples/jmx/.classpath @@ -1,9 +1,6 @@ - - - diff --git a/spring-integration-samples/loanshark/.settings/org.eclipse.wst.common.component b/spring-integration-samples/loanshark/.settings/org.eclipse.wst.common.component index 2911432a91..abb2f42b94 100644 --- a/spring-integration-samples/loanshark/.settings/org.eclipse.wst.common.component +++ b/spring-integration-samples/loanshark/.settings/org.eclipse.wst.common.component @@ -4,6 +4,9 @@ uses + + uses + uses diff --git a/spring-integration-samples/oddeven/.classpath b/spring-integration-samples/oddeven/.classpath index 96489ff1c9..24166ba51f 100644 --- a/spring-integration-samples/oddeven/.classpath +++ b/spring-integration-samples/oddeven/.classpath @@ -1,9 +1,6 @@ - - - diff --git a/spring-integration-samples/quote/.classpath b/spring-integration-samples/quote/.classpath index 96489ff1c9..24166ba51f 100644 --- a/spring-integration-samples/quote/.classpath +++ b/spring-integration-samples/quote/.classpath @@ -1,9 +1,6 @@ - - - diff --git a/spring-integration-samples/ws-outbound-gateway/.classpath b/spring-integration-samples/ws-outbound-gateway/.classpath index 96489ff1c9..24166ba51f 100644 --- a/spring-integration-samples/ws-outbound-gateway/.classpath +++ b/spring-integration-samples/ws-outbound-gateway/.classpath @@ -1,9 +1,6 @@ - - - diff --git a/spring-integration-samples/xml/.classpath b/spring-integration-samples/xml/.classpath index 96489ff1c9..24166ba51f 100644 --- a/spring-integration-samples/xml/.classpath +++ b/spring-integration-samples/xml/.classpath @@ -1,9 +1,6 @@ - - - diff --git a/spring-integration-stream/.classpath b/spring-integration-stream/.classpath index f14ce4afb4..7406f09944 100644 --- a/spring-integration-stream/.classpath +++ b/spring-integration-stream/.classpath @@ -5,6 +5,11 @@ - + + + + + + diff --git a/spring-integration-stream/.project b/spring-integration-stream/.project index cc507ad98e..08b7f9ad19 100644 --- a/spring-integration-stream/.project +++ b/spring-integration-stream/.project @@ -5,6 +5,11 @@ + + org.eclipse.wst.common.project.facet.core.builder + + + org.eclipse.jdt.core.javabuilder @@ -15,9 +20,17 @@ + + org.eclipse.wst.validation.validationbuilder + + + + org.eclipse.jem.workbench.JavaEMFNature + org.eclipse.wst.common.modulecore.ModuleCoreNature org.maven.ide.eclipse.maven2Nature org.eclipse.jdt.core.javanature + org.eclipse.wst.common.project.facet.core.nature diff --git a/spring-integration-stream/.settings/org.eclipse.jdt.core.prefs b/spring-integration-stream/.settings/org.eclipse.jdt.core.prefs index 42e95bfdb0..35ade795c8 100644 --- a/spring-integration-stream/.settings/org.eclipse.jdt.core.prefs +++ b/spring-integration-stream/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,10 @@ -#Wed May 26 00:59:51 CEST 2010 +#Sat Sep 04 08:01:10 EDT 2010 eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 org.eclipse.jdt.core.compiler.compliance=1.5 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.autoboxing=ignore org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning org.eclipse.jdt.core.compiler.problem.deadCode=warning @@ -11,6 +13,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled org.eclipse.jdt.core.compiler.problem.discouragedReference=warning org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore diff --git a/src/assembly/distribution.xml b/src/assembly/distribution.xml index 5463bf3959..cef58d6e1f 100644 --- a/src/assembly/distribution.xml +++ b/src/assembly/distribution.xml @@ -24,16 +24,6 @@ dos -