Commit Graph

6298 Commits

Author SHA1 Message Date
Gary Russell
3518f3cb4e INT-2409 Fix STS 'Missing Bean' Warnings
Some generated bean names (e.g. LoggingHandler) cause
warnings in STS:

(Warning "Referenced bean
'org.springframework.integration.handler.LoggingHandler#0' not found")

Fix is to register these beans as components so an event is fired.
2012-01-30 10:15:10 -05:00
Mark Fisher
0be3dbc5c9 Merge pull request #339 from garyrussell/INT-2414
INT-2414 Error When container-class Supplied
2012-01-30 10:08:17 -05:00
Gary Russell
6f2dcab4b2 INT-2414 Error When container-class Supplied
JMS backed channels can have container-type and
container-class. Parser rejected container-class because
the schema has a default for container-type.

Both attributes are allowed; user must set container-type
appropriately (based on the superclass of the custom class)
when container-class is provided.
2012-01-24 12:33:51 -05:00
Mark Fisher
670495c6c0 Merge pull request #338 from garyrussell/INT-2415 2012-01-23 12:14:03 -05:00
Gary Russell
864a4ef291 INT-2415 MBean Name Collisions in Tests
JMX Tests failed due to InstanceAlreadyExistsException; name
collisions between MBeans registered in multiple tests.

Adds a domain to the new tests added to fix INT-2413 to
force unique MBean names.
2012-01-23 11:52:43 -05:00
Mark Fisher
235fb0e82e Merge pull request #324 from artembilan/INT-2180
INT-2180: fix Delayer's scheduler docs
2012-01-23 10:43:19 -05:00
Artem Bilan
7efff7ef7a INT-2180: fix Delayer's scheduler docs
spring-integration-2.1.xsd: Delayer's scheduler 'documentation' & tool's expected-type.
Reference Manual: Delayer's introduction: fix scheduler's <interfacename>.
2012-01-23 10:42:47 -05:00
Mark Fisher
03af248b55 Merge pull request #337 from garyrussell/INT-2413
INT-2413 <int-jmx:mbean-export/> And <control-bus>
2012-01-23 10:36:00 -05:00
Gary Russell
b899595e01 INT-2413 <int-jmx:mbean-export/> And <control-bus>
When an AbstractMappingMessageRouter is included in an
ApplicationContext that also has an <int-jmx:mbean-exporter/>,
the @ManagedOperations (set and remove mapping) are no longer
visible to the <control-bus/>.

Adds these methods to a new interface MappingMessageRouterManagement,
thus making them available on the proxy that the MBean exporter
creates.
2012-01-23 10:34:58 -05:00
Mark Fisher
e39a40581d Merge pull request #336 from garyrussell/INT-2411
INT-2411 default-output-channel Ignored on RLR
2012-01-23 10:31:27 -05:00
Gary Russell
46c9c807a2 INT-2411 default-output-channel Ignored on RLR
https://jira.springsource.org/browse/INT-2411

Namespace problem only; the default-output-channel was
not bound to the RecipientListRouter.

Workaround is to declare the router using <bean/> syntax.
2012-01-23 10:30:48 -05:00
Mark Fisher
9970cb03b4 Merge pull request #335 from garyrussell/INT-2402
INT-2402 Fix Versioned Schema Example
2012-01-23 10:27:48 -05:00
Gary Russell
6718556200 INT-2402 Fix Versioned Schema Example
https://jira.springsource.org/browse/INT-2402

Revert example showing how to use versioned schema to
actually use a versioned schema.
2012-01-23 10:27:13 -05:00
Mark Fisher
29e1e289d2 Merge pull request #333 from garyrussell/INT-2406 2012-01-23 10:24:53 -05:00
Gary Russell
0899768d1e INT-2406 Add JMSTimestamp Property To Headers
Inbound JMSTimestamp property is now mapped to header
jms_timestamp.
2012-01-23 10:22:30 -05:00
Mark Fisher
ce62274446 Merge pull request #332 from garyrussell/springNature 2012-01-23 10:16:24 -05:00
Gary Russell
af8180446a INT-2408 Add Spring Project Nature with Gradle
STS needs Spring Project Nature to get classpath XSD/Namespace resolution.
When switching back and forth between 2.0 and 2.1, ./gradlew eclipse
removes Spring Project Nature.

It is now added by ./gradlew eclipse when generating eclipse metadata
files.
2012-01-23 10:15:47 -05:00
Mark Fisher
dc002d9bfc Merge pull request #328 from garyrussell/INT-2407
INT-2404 Fix Auto-Created Channel; Event, TCP, UDP
2012-01-23 10:13:18 -05:00
Gary Russell
292aa90599 INT-2404 Fix Auto-Created Channel; Event, TCP, UDP
The AbstractChannelAdapterParser creates an implicit DirectChannel
if the adapter has no 'channel' attribute.

The Event, TCP, and UDP channel adapter parsers did not bind
this channel to the adapter and AC initialization failed with
'outputChannel is required'.

Further, the event schema marked the channel as being 'required',
precluding this feature.

INT-2407 Remove Channel use="required"

Parsers automatically generate the channel when none is provided.

- JMX
- JDBC
- SFTP
- Redis
- Feed
- XMPP
- Mail
- FTP
- HTTP
2012-01-23 10:12:34 -05:00
Mark Fisher
e7b514a1e4 Merge pull request #312 from ghillert/INT-2393
INT-2393 Add Sonar Support (Gradle Plugin)
2012-01-23 10:01:57 -05:00
Gunnar Hillert
92c974d443 INT-2393 Add Sonar Support (Gradle Plugin)
INT-2393 - Changes in Build.gradle based on Code Review
* Changed line to *jvmArgs "-javaagent:${configurations.jacoco.asPath}=destfile=${buildDir}/jacoco.exec,includes=org.springframework.integration.*"*
* Added *props["sonar.jacoco.reportPath"] = "${buildDirName}/jacoco.exec" to make build work with default build directory*
* Therefore able to remove: *buildDir = "target"*
* Moved *sonar* block to bottom of build script
* Added comments around the **configurations** block
* Switched to use Gradle Properties instead of System Properties for Sonar parameters

INT-2393 - rootProject.hasProperty works
* More simplifications after finding out that **rootProject.hasProperty** works inside the Sonar closure

INT-2393 Based on code review: Fixed build.gradle
Based on Code Review, converted println statement to logger.info in build.gradle
2012-01-23 10:01:12 -05:00
Mark Fisher
c19191fe70 Merge pull request #331 from cbeams/gradle
Improve api doc generation

  Upgrade to Gradle 1.0-milestone-8 snapshot
2012-01-23 09:58:50 -05:00
Chris Beams
55f23932b4 Improve api doc generation
- Touch up title text
 - Add 'header' (shows up in upper right and left of frameset)
 - Ensure @author attribution shows up (not true by default!)
 - Remove now-obsolete custom Javadoc CSS and background image
2012-01-23 09:57:38 -05:00
Chris Beams
f0e8bf10a9 Upgrade to Gradle 1.0-milestone-8 snapshot
Picks up changes that solve intermittent tests described at
http://issues.gradle.org/browse/GRADLE-2035

Also uses new snapshot versions of bundlor and docbook plugins that fix
incompatibility problems with 1.0-milestone-8.
2012-01-23 09:57:38 -05:00
Gary Russell
ca89573209 INT-2400 More Invalid Class Names in Schemas
File, Feed, Ftp, Redis
2012-01-14 10:56:15 -05:00
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