Commit Graph

43 Commits

Author SHA1 Message Date
Oleg Zhurakousky
ebd06fc2d4 INT-1516 added docs for <router> expression, mentinoing projection/selection 2010-11-12 08:11:55 -05:00
Oleg Zhurakousky
063845ed79 INT-1516 added docs for RLR's selector-expression, fixed the docbook error' 2010-11-12 07:44:34 -05:00
Oleg Zhurakousky
35dee6df1d INT-1552 removed StringMessage references from the manual 2010-11-12 06:46:15 -05:00
Dave Syer
a0db55a75e INT-1420: add docs for control bus and tidy JMX 2010-11-12 09:27:13 +00:00
Chris Beams
ee34695bc4 Merge branch 'master' into buildSrc-extraction
Conflicts:
	spring-integration-twitter/src/main/java/org/springframework/integration/twitter/core/Twitter4jTemplate.java
2010-11-11 10:13:14 -08:00
Oleg Zhurakousky
a7eddb14e5 added more details to the docs on wire-tap sync/async behavior 2010-11-11 08:28:30 -05:00
Oleg Zhurakousky
374f70fb31 INT-1558 added XMPP documentation 2010-11-11 08:04:01 -05:00
Oleg Zhurakousky
1b5be152b2 INT-1598 added documentation for Claim Check 2010-11-10 16:13:29 -05:00
Gary Russell
41b45d2112 INT-1552 IP Doc Polishing 2010-11-10 15:48:39 -05:00
Gary Russell
ab7838db88 INT-1552 IP Doc Polishing 2010-11-10 14:53:53 -05:00
Oleg Zhurakousky
5bb4d8ba68 INT-1585 added documentation for header-filter 2010-11-10 14:38:24 -05:00
Oleg Zhurakousky
12b9fb5d91 INT-1560 added documentation for Feed Adapter. Removed dead code from Feed adapter 2010-11-10 13:13:34 -05:00
Oleg Zhurakousky
3066911916 INT-1501 enhanced documentation to include examples and explanation on header enricher sub-element including SpEL support 2010-11-10 12:10:19 -05:00
Chris Beams
b3f18afdd7 Further reorganization and polish of build script 2010-11-10 08:09:26 -08:00
Oleg Zhurakousky
30e106eeb0 INT-1501 initial refactoing of the transformer section to address better docs for header-enricher 2010-11-10 10:52:53 -05:00
Chris Beams
af26423502 Move docs/build.gradle -> buildSrc/docs.gradle 2010-11-09 16:02:07 -08:00
Chris Beams
65b838b5de Factor out 'remoteDocRoot' property
Remote path '/var/www/domains/springframework.org/static/htdocs' is no
longer hard-coded in docs/build.gradle, because (a) it will be needed
in two separate locations as schema uploads are developed, and (b) this
value should be easily editable during local testing.
2010-11-09 15:47:58 -08:00
Chris Beams
5828134799 Make doc symlink creation more robust
:docs:uploadArchives symlink creation now checks to ensure that
any existing wildcard (e.g., 2.0.x) or 'latest-ga' symlinks do
not point to targets with greater lexical value than the version
being published. If so, the symlink will not be overwritten.

EXAMPLE

    Given an existing docs/ directory listing as follows:

        1.0.3.RELEASE
        1.0.x -> 1.0.3.RELEASE
        2.0.0.BUILD-SNAPSHOT
        2.0.0.RC1
        2.0.x -> 2.0.0.RC1
        latest-ga -> 1.0.3.RELEASE

    Upon publishing 1.0.4.RELEASE, the directory listing will update as
    follows (asterisk indicates added / changed entries):

        1.0.3.RELEASE
      * 1.0.4.RELEASE
      * 1.0.x -> 1.0.4.RELEASE
        2.0.0.BUILD-SNAPSHOT
        2.0.0.RC1
        2.0.x -> 2.0.0.RC1
      * latest-ga -> 1.0.4.RELEASE

    This functionality worked as described prior to this change.
    However, it would break down in the following scenario.  Imagine the
    existing directory listing had been as below, following the release
    of Spring Integration 2.0.0.RELEASE:

        1.0.3.RELEASE
        1.0.x -> 1.0.3.RELEASE
        2.0.0.BUILD-SNAPSHOT
        2.0.0.RC1
        2.0.0.RELEASE
        2.0.x -> 2.0.0.RELEASE
        latest-ga -> 2.0.0.RELEASE

    Note that latest-ga points to 2.0.0.RELEASE.  Prior to the changes
    in this commit, if a new GA on the 1.0.x line were to be published
    the latest-ga symlink would have been incorrectly updated:

        1.0.3.RELEASE
      * 1.0.4.RELEASE
      * 1.0.x -> 1.0.4.RELEASE
        2.0.0.BUILD-SNAPSHOT
        2.0.0.RC1
        2.0.0.RELEASE
        2.0.x -> 2.0.0.RELEASE
      ! latest-ga -> 1.0.4.RELEASE

    ! indicates the mistake. We want latest-ga to point to the latest GA
    release at all times.  This now happens, such that the directory
    listing would be updated as follows:

        1.0.3.RELEASE
      * 1.0.4.RELEASE
      * 1.0.x -> 1.0.4.RELEASE
        2.0.0.BUILD-SNAPSHOT
        2.0.0.RC1
        2.0.0.RELEASE
        2.0.x -> 2.0.0.RELEASE
        latest-ga -> 2.0.0.RELEASE

    Note that 'latest-ga' remains unchanged.

    This same logic applies when updating wildcard links.  In the rare
    case that a 1.0.4.RELEASE were published *after* a 1.0.5.RELEASE,
    the wildcard symlink will not be updated.  It will remain pointing
    to 1.0.5.RELEASE.
2010-11-09 15:46:46 -08:00
Chris Beams
6f1c83c4ea Pick up buildSrc changes for Version and preconditions 2010-11-09 15:43:39 -08:00
Chris Beams
edae65ae52 Eliminate gradle directory in favor of shared buildSrc
.gradle scripts once in gradle/ dir now live in shared buildSrc/ dir.

Some hard-coding of Spring Integration specifics still remain and will
be removed shortly.
2010-11-09 15:07:22 -08:00
Chris Beams
418bd7b5a3 Remove unnecessary null check for sshPrivateKey 2010-11-09 10:40:16 -08:00
Chris Beams
4aaac0f04b Only attempt to access sshPrivateKey property if present 2010-11-08 06:56:29 -08:00
Chris Beams
172d97ddeb Update symlinks during :docs:uploadArchives
Previous to this change, symlinks at
http://static.springsource.org/spring-integration/docs had to be
maintained by hand.  The build now automatically updates:

* 'Wildcard' symlinks (e.g.: 2.0.x -> 2.0.0.RC1) if the release type
 is anything other than SNAPSHOT.

* 'Latest GA' symlink (e.g.: latest-ga -> 1.0.3.RELEASE) if the release
 type is RELEASE.

Also, deletion of the docs zip archive is now consolidated into the
same 'sshexec' command as the unzipping itself.  Unzipping is now
done with -q (quiet) to cut down on output noise.
2010-11-05 22:57:59 -07:00
Mark Fisher
a3d50d6146 updated HTTP section in reference manual with pacakge info (inbound and outbound) on plain bean examples 2010-11-05 18:27:35 -04:00
Chris Beams
541370c295 Respect sticky/setuid bits when unzipping docs remotely
The spring-integration/docs/ directory on static.springframework.org
has sticky group-write permissions.  unzip is now invoked with the '-K'
flag to ensure that newly created directories respect these permissions.

This is important to ensure that different (ssh) users can release the
project without running into permissions errors.  Without -K, the unzip
command will preserve whatever permissions were present on the files and
directories at the time of archiving, and this usually means that
group-write is off.

Of course, all this assumes that users doing releases are part of the same
group - 'springorg' in this case.
2010-11-05 09:31:53 -07:00
Chris Beams
ca765c1c08 Supply ssh private key during docs upload
Prior to this change, a graphical Ivy-branded authentication dialog was
appearing when attepmting to scp the docs zip file to
static.springframework.org.  This was because the 'keyFile' property
of the uploadArchives task was not being set.  It is being set correctly
now, based on the value of the 'sshPrivateKey' project property that
must be set in gradle.properties.  This value has been set on the
build server's gradle.properties file, such that the INT-NIGHTLY build
can succeed in pushing docs during the build.
2010-11-05 07:01:48 -07:00
Mark Fisher
e35de5a054 INT-1583 updated documentation 2010-11-03 13:03:49 -04:00
Mark Fisher
6cc758eefc INT-1582 if the payload is an ApplicationEvent it is passed as-is (no wrapping in MessagingException). Also, general polishing 2010-11-03 12:39:11 -04:00
Oleg Zhurakousky
52c958ead0 INT-1557 added Twiter Outbound adapter documentation 2010-11-02 18:43:40 -04:00
Oleg Zhurakousky
012d9df8f4 INT-1560, INT-1559 added placeholders for the docs for FTP, SFTP and FEED 2010-11-02 16:15:07 -04:00
Oleg Zhurakousky
acbfe9434c INT-1557 added initial documentation (OAuth, Connection INbound Adapters) for Twitter adapter 2010-11-02 15:59:22 -04:00
Oleg Zhurakousky
01dbe1916e INT-1577 restructured documentation to be consistent with Spring-core and EIP documentation 2010-11-02 12:07:56 -04:00
Oleg Zhurakousky
3061aaa08d INT-1552 general restructuring of the docs to introduce parts that are consistent with eip definitions 2010-11-02 10:28:54 -04:00
Chris Beams
bfeb2ff50f Polish readme 2010-10-28 14:25:01 -04:00
Chris Beams
cc79ea4cb4 Fix typo causing parsing in samples.xml &gt; entity 2010-10-28 14:18:55 -04:00
Mark Fisher
80fb9f10a5 updating changelog and readme 2010-10-28 12:03:14 -04:00
Chris Beams
a600e5279b Polish @author tags
Names should be spelled out ('Chris Beams') instead of abbreviated
('cbeams')
2010-10-27 15:54:05 -04:00
Chris Beams
7fc73e1f92 Attempt to fix svg 'Image not found' errors 2010-10-27 12:36:11 -04:00
Chris Beams
8b483a08b8 Simplify inclusion of images and css in html* doc dirs 2010-10-27 10:40:49 -04:00
Chris Beams
66f2335dcd Delete duplicate images; move rest to resources/images 2010-10-27 09:32:31 -04:00
Chris Beams
036a3f5b15 Update gradle files to reference new locations for resources 2010-10-27 09:29:19 -04:00
Chris Beams
b793bec395 Remove duplicated docbook xml files 2010-10-27 09:27:18 -04:00
Chris Beams
677fca51a9 Major progress on Gradle port
Complete:
--------
- src/* documentation resources moved to 'docs' subproject

- docbook sources upgraded to Docbook 5

- formatted all docbook sources to strip tab characters and
  eliminate trailing whitespace

- all projects compile and test successfully

- all artifacts upload successfully to s3, static.sf.org, etc.

Remaining:
---------
- documentation L&F needs work. CSS, images, and highlighting aren't
  hooked up properly

- spring-integration-jdbc codegen bits in Maven POM need to be
  transcribed into gradle

- dependencies that were optional or provided scope in maven are
  currently 'compile' scope in Gradle.  Need to figure out support
  in Gradle to fix this.

- run through Eclipse classpath and project generation scenarios

- delete all Maven artifacts
2010-10-26 18:51:08 -04:00