Commit Graph

6273 Commits

Author SHA1 Message Date
Gunnar Hillert
2b5ddefa9d INT-2403 - Fix Samples Url in AMQP Doc Chapter 2012-01-13 15:09:06 -05:00
Mark Fisher
277ba477a4 Merge pull request #318 from garyrussell/INT-2400a
INT-2400 More expected-type Fixes
2012-01-13 14:26:11 -05:00
Gary Russell
4872876e4f INT-2400 More expected-type Fixes
CollectionFilter in core; package changes in security.
2012-01-13 13:40:40 -05:00
Mark Fisher
10a384a6d1 Merge pull request #316 from garyrussell/INT-2400
NT-2400 Fix tool:expected-type Classes
2012-01-13 13:22:31 -05:00
Gary Russell
f76f63f23a NT-2400 Fix tool:expected-type Classes
* MessageChannel was moved from core to the base package.
* ChannelResolver moved from core to support.
* TcpConnectionInterceptorFactoryChain was incorrect.
2012-01-13 13:21:41 -05:00
Chris Beams
efc5e75817 Update reference doc copyright to 2012 2012-01-12 13:07:27 +01:00
Spring Buildmaster
da800ab508 Increment version to 2.1.1.BUILD-SNAPSHOT 2012-01-06 13:11:05 -08:00
Spring Buildmaster
455696815d Release version 2.1.0.RELEASE 2012-01-06 13:11:00 -08:00
Oleg Zhurakousky
33fb666bdd Updated build.gradle with new upper range for org.apache.commons.net
Updated build.gradle with new upper range for org.apache.commons.net
2012-01-06 16:02:29 -05:00
Chris Beams
dc2550fa0c Upgrade docbook and bundlor plugins to 0.1.1
Picks up minor changes allowing 'reference' and 'docbook' plugins
to show up in `gradle tasks` listings.
2012-01-06 19:37:04 +01:00
Kenneth Bowen
e48afc5a36 Add 'group' and 'Description' to the 'reference' task.
'./gradlew tasks' did not output a description of the reference task.
Add a description of the task to the documentation group.
2012-01-06 12:35:27 -05:00
Mark Fisher
f5d6d5b15f updated changelog and readme for 2.1 GA 2012-01-05 21:33:22 -05:00
Mark Fisher
0534a89690 Merge pull request #306 from garyrussell/INT-2359b
INT-2364 package-info File Base Package
2012-01-05 18:20:56 -05:00
Gary Russell
c994f1c05e INT-2364 package-info File Base Package 2012-01-05 18:20:10 -05:00
Mark Fisher
c5d55a5469 removed warnings 2012-01-05 18:16:41 -05:00
Chris Beams
f30da932e8 INT-2388 Update Gradle build
This is a significant update to the build system, including the changes
listed below. README.md has been updated with instructions on the most
important day-to-day commands.

 - Eliminate buildSrc submodule

   In favor of using the new bundlor and docbook-reference plugins. The
   net effect is a large reduction in number of lines of build code.
   Common docbook resources, stylesheets, etc are stored directly in the
   docbook plugin.

   This means that --recursive is no longer required when cloning and
   there will never be a need to use `git submodule` commands. README
   files have been updated to reflect.

   Use of the new bundlor plugin also means the removal of template.mf
   files from the source tree in favor of an inline approach. See
   build.gradle for details. Bundlor 'import templates' are built up
   programmatically and kept physically close to gradle dependency
   declarations, leading to more convenience when changing these values
   and hopefully fewer errors / version inconsistencies over time.

   Certain tests depended on the presence of template.mf files, all of
   which have recently been removed from the source tree in favor of the
   new bundlor plugin which allows for inlining bundlor configuration
   within the Gradle build script. These tests now create temp files
   using the java.io.File API instead.

 - Upgrade to Gradle 1.0-milestone-6

   The m6 release is significantly faster when resolving dependencies
   and has a number of valuable new features over the earlier m3
   version. Review the release notes for Gradle 1.0-milestone-6 online
   for full details.

 - Switch to repo.springsource.org repository

   Previously the project build declared as many repositories as
   necessary to resolve all project dependencies.

   Now depending on a single 'virtual repository' defined within the
   SpringSource Artifactory instance at http://repo.springsource.org.
   Currently, the virtual repository in use is 'libs-milestone', which
   allows for the resolution of all "milestone-or-better" versions of
   all S2 and third-party dependencies.

   Should snapshot dependencies become required, this value may be
   changed from 'libs-milestone' to 'libs-snapshot'. To build only
   against GA releases, change the value to 'libs-release'.

 - New build plan(s)

   Spring Integration build plans have been updated to use the
   Artifactory Bamboo plugin and publish to repo.springsource.org.
   Build plans have names like 2.1.x to reflect the version under
   development, not necessarily the name of the branch, as this may
   change over time and across major releases.

 - Improve release process

   As mentioned above, Spring Integration will now use the Artifactory
   Bamboo plugin to publish releases and also use Artifactory's support
   for pushing builds directly into Maven Central via oss.sonatype.org.

   Generate poms that contain all necessary fields for onboarding at
   Maven central (scm, developers, organization, licenses, etc).

   Generate -source and -javadoc poms to comply with Maven Central
   onboarding rules (and for general good practice anyway).

   Generation of PGP signatures, sha1 and md5 checksums are all handled
   automatically by Artifactory. These are also requirements for
   automated entry into Maven Central.

 - Remove source-level pom generation

   Automatic generation of Maven poms suitable for use in building
   Spring Integration is no longer supported. Generation and
   publication of poms for the purpose of dependency management remains
   supported.

   Sonar support has to date depended on these poms, but will be
   switched over to use the Gradle Sonar plugin shortly.

 - Eliminate docs subproject

   Move docs/src to the root of the project and eliminate docs as a
   formal subproject. This simplifies the build in a number of ways,
   including removing the need for distinguishing between 'subprojects'
   and 'javaprojects' as well as allowing users to build both 'api' and
   'reference' docs without qualifying with a ':docs' prefix.

   Also rename the src/info directory to src/dist to better reflect that
   these files are packaged with the distribution. For example, the
   readme.txt there is really the distribution readme, distinct from the
   README.md at the root of the project which is for building from source,
   etc.
2012-01-05 17:49:04 -05:00
Mark Fisher
ae0ecff886 Merge pull request #305 from olegz/INT-2387
INT-2387 changed mkdir() method in Session to return boolean
2012-01-05 17:19:45 -05:00
Oleg Zhurakousky
15e64b707b INT-2387 changed mkdir() method in Session to return boolean 2012-01-05 17:13:54 -05:00
Mark Fisher
58602d4802 Merge pull request #301 from olegz/INT-2351-v2 2012-01-05 16:57:18 -05:00
Oleg Zhurakousky
b909e57c9b INT-2351
refactored implementations of FtpSession and SftpSession mkdir(path) method to avoid its previous dependency on hardcoded remote-file-separator
2012-01-05 16:52:41 -05:00
Mark Fisher
557822954b Merge pull request #303 from ghillert/INT-2359-GH 2012-01-05 16:19:21 -05:00
Gunnar Hillert
bd3a93d601 INT-2371 - add package-info.java files - XML
See: https://jira.springsource.org/browse/INT-2371

INT-2370 - add package-info.java files - JDBC
Reference: https://jira.springsource.org/browse/INT-2370

Add package-info.java files - Twitter
For reference: https://jira.springsource.org/browse/INT-2383

INT-2386 - add package-info.java files - XMPP
For reference: https://jira.springsource.org/browse/INT-2386

INT-2384 - add package-info.java files - WS
Reference: https://jira.springsource.org/browse/INT-2384

INT-2382 - add package-info.java files - Test
For reference: https://jira.springsource.org/browse/INT-2382
2012-01-05 16:17:18 -05:00
Mark Fisher
87fdf08fee Merge pull request #302 from garyrussell/INT-2359a 2012-01-05 15:30:57 -05:00
Gary Russell
89cdef7a90 INT-2373 package-info JMX
INT-2374 package-info Mail

INT-2375 package-info MongoDB

INT-2376 package-info Redis

INT-2377 package-info RMI

INT-2379 package-info Security

INT-2381 package-info Stream
2012-01-05 15:29:48 -05:00
Mark Fisher
0ac14b7095 Merge pull request #300 from garyrussell/INT-2359 2012-01-05 14:43:22 -05:00
Gary Russell
b59ee8e352 INT-2369 package-info IP
INT-2360 package-info Core

INT-2361 package-info AMQP

INT-2362 package-info Event

INT-2363 package-info Feed

INT-2364 package-info File

INT-2365 INT-2380 package-info (S)FTP

INT-2366 package-info GemFire

INT-2367 package-info Groovy

INT-2368 package-info Http

INT-2378 package-info Scripting

INT-2372 package-info JMS
2012-01-05 14:42:24 -05:00
Mark Fisher
55a6f87bc7 Merge pull request #297 from garyrussell/INT-2354
INT-2354 Fix Race Condition in Tests
2012-01-05 10:49:40 -05:00
Gary Russell
4810d3c634 INT-2354 Fix Race Condition in Tests
Some messages could occasionally be lost because the
listener container had not yet subscribed to the queue when
we started sending messages to it.
2012-01-05 10:48:22 -05:00
Mark Fisher
f612328a86 Merge pull request #299 from olegz/INT-2357
INT-2357 upgraded XMPP to Smack 3.2.1
2012-01-05 09:50:53 -05:00
Oleg Zhurakousky
c39eb005b6 INT-2357
upgraded XMPP to Smack 3.2.1

The changes in teh tests are due to changes in the underlying API where
XMPPConnection now exposes the configuration properties.
2012-01-05 09:49:09 -05:00
Mark Fisher
c90b61e7d8 Merge pull request #298 from olegz/INT-2358
* INT-2358:
  INT-2358
2012-01-05 09:42:00 -05:00
Oleg Zhurakousky
05e9828a6b INT-2358
added Lifecycle method implementations to RedisInboundChannelAdapter
2012-01-05 09:37:14 -05:00
Mark Fisher
770b4c22db Merge pull request #296 from ghillert/INT-2356
INT-2356 - Update Jackson to 1.9.2 For reference see: https://jira.springsource.org/browse/INT-2356
2012-01-04 15:09:43 -05:00
Gunnar Hillert
4d81e649ba INT-2356 - Update Jackson to 1.9.2
For reference see: https://jira.springsource.org/browse/INT-2356
2012-01-04 15:07:46 -05:00
Mark Fisher
0286e5fe6b Merge pull request #295 from garyrussell/INT-2355
INT-2355 Update Mockito to 1.9.0
2012-01-04 15:05:43 -05:00
Gary Russell
65fa5358e7 INT-2355 Update Mockito to 1.9.0 2012-01-04 12:05:48 -05:00
Mark Fisher
9378ee8d4c Merge pull request #291 from artembilan/INT-2345
INT-2345: Doc: 'async-executor' for <gateway/>
2012-01-04 11:31:47 -05:00
Artem Bilan
368c6fbd46 INT-2345: Doc: 'async-executor' for <gateway/> 2012-01-04 11:30:46 -05:00
Mark Fisher
b23131a09e Merge pull request #292 from olegz/INT-2353
INT-2353 upgraded scripting and groovy module to Groovy 1.8.5
2012-01-04 11:20:51 -05:00
Oleg Zhurakousky
11c8c2656c INT-2353 upgraded scripting and groovy module to Groovy 1.8.5 2012-01-04 10:59:11 -05:00
Mark Fisher
a017836b26 Merge pull request #288 from olegz/INT-2350
INT-2350 fixed FtpSession improved logic that deals with creating multiple directories independent of the OS hosting FTP server
2012-01-03 16:42:17 -05:00
Oleg Zhurakousky
80c64be91f INT-2350 fixed FtpSession
improved logic that deals with creating multiple directories independent of the OS hosting FTP server

INT-2350 polishing based on PR comments

INT-2350 polishing

INT-2350 polishing
2012-01-03 16:40:42 -05:00
Mark Fisher
0e3c70d798 Merge pull request #289 from olegz/INT-2344
added documentation about mapped-request/reply-headers

  change javadoc in DefaultAmqpHeaderMapper
2012-01-03 15:30:39 -05:00
Oleg Zhurakousky
0a3718ad12 INT-2344
added documentation about mapped-request/reply-headers, change javadoc in DefaultAmqpHeaderMapper
2012-01-03 14:21:57 -05:00
Mark Fisher
2f2d491ec8 Merge pull request #287 from garyrussell/INT-2346
INT-2346 Add ToC to Acrobat Bookmarks Pane
2012-01-03 13:03:43 -05:00
Gary Russell
61cd00c0b6 INT-2346 Add ToC to Acrobat Bookmarks Pane
Acrobat Reader supports ToC hyperlinks in Bookmarks pane;
this enables that feature.
2012-01-03 13:02:29 -05:00
Mark Fisher
6d033bae4a Merge pull request #285 from garyrussell/INT-2347
* INT-2347:
  INT-2347 Update Channel Mappings Atomically
2012-01-03 11:44:53 -05:00
Gary Russell
5750ca5ff5 INT-2347 Update Channel Mappings Atomically
Ensure consistent state if channel map is replaced
dynamically.
2012-01-03 11:44:13 -05:00
Mark Fisher
f3155f86fa corrected reversed test method names 2012-01-03 11:30:45 -05:00
Gary Russell
85ea4f6411 INT-2342 Add Test Cases 2012-01-03 11:19:52 -05:00