Commit Graph

225 Commits

Author SHA1 Message Date
Gunnar Hillert
218668cb9c Merge pull request #56 from garyrussell/INTSAMPLES-76-4
* garyrussell-INTSAMPLES-76-4:
  INTSAMPLES-76 Wait for Server (Intermediate)
2012-05-27 00:23:15 -04:00
Gary Russell
80653acd07 INTSAMPLES-76 Wait for Server (Intermediate)
Also need to wait in the intermediate TCP sample.
2012-05-26 10:11:01 -04:00
Gunnar Hillert
2bfa2acd3e Merge pull request #55 from garyrussell/garyrussell-INTSAMPLES-76-3
* garyrussell-INTSAMPLES-76-3:
  INTSAMPLES-76 Wait For Server
2012-05-24 16:22:54 -04:00
Gary Russell
433cff0a40 INTSAMPLES-76 Wait For Server
Add utility and @Before methods to all tests
to wait for the server to start before starting.
2012-05-24 08:05:57 -04:00
Gary Russell
02059beadd Merge pull request #53 from ghillert/INTSAMPLES-76-2 2012-05-17 14:24:50 -04:00
Gunnar Hillert
a1964402ef INTSAMPLES-76 - Wait for Server to Start
before attempting to connect.
2012-05-17 14:22:52 -04:00
Gary Russell
f9f8fc5030 Merge pull request #52 from ghillert/INTSAMPLES-76 2012-05-16 18:10:32 -04:00
Gunnar Hillert
6aa46ab901 INTSAMPLES-76 - Fix Failing Tests in TCP Client Server Sample
* The port is no longer hard-coded
* fixed also the conversion service test and refactored it into its own class
2012-05-16 17:55:39 -04:00
Gunnar Hillert
bddb52b469 Merge pull request #51 from garyrussell/INTSAMPLES-75
* garyrussell-INTSAMPLES-75:
  INTSAMPLES-75 Fix For 2.2.0.M1
2012-05-16 01:29:34 -04:00
Gary Russell
566e1a76aa INTSAMPLES-75 Fix For 2.2.0.M1
Change MessageHandlingException to MessagingException.
2012-05-16 01:20:12 -04:00
Gunnar Hillert
7e70f81749 Merge pull request #50 from garyrussell-INTSAMPLES-74
* garyrussell-INTSAMPLES-74:
  INTSAMPLES-74 2.2.0.M1 (SF 3.1.1) Compatibility
2012-05-16 01:03:34 -04:00
Gary Russell
3cacd50253 INTSAMPLES-74 2.2.0.M1 (SF 3.1.1) Compatibility
Change 'user' property to userid to avoid conflict
with environment property.
2012-05-15 19:59:43 -04:00
Mark Fisher
dc31846615 fixed prompt to mention 1, 2, or 3 as valid options 2012-03-17 17:31:07 -03:00
Mark Fisher
f6b6fc315f minor typo 2012-03-17 17:24:56 -03:00
Gunnar Hillert
53c9d76dfe Merge pull request #32 from vbose/vbose-branch
* vbose-branch:
  INTSAMPLES-36 - Adding rest-http sample to demonstrate the usage of Spring Integration's new HTTP Path facility usage
2012-03-17 01:50:14 -04:00
Vigil Bose
f7bd84e22f INTSAMPLES-36 - Adding rest-http sample to demonstrate the usage of Spring Integration's new HTTP Path facility usage
* The JIRA referenced for this sample is https://jira.springsource.org/browse/INTSAMPLES-36
2012-03-17 01:22:40 -04:00
Gunnar Hillert
af7e6049ac Merge pull request #37 from amolnayak311/INTSAMPLES-61
* amolnayak311-INTSAMPLES-61:
  INTSAMPLES-61 Changes, use LinkedHashMap to demonstrate LRU concept
2012-03-16 15:36:07 -04:00
Amol Nayak
c97fb87ae8 INTSAMPLES-61 Changes, use LinkedHashMap to demonstrate LRU concept 2012-03-16 15:33:13 -04:00
Gunnar Hillert
b6b7a14fba Merge pull request #45 from ghillert/INTSAMPLES-64
INTSAMPLES-64 Poller Sample using custom Trigger
2012-02-16 08:31:26 -08:00
Gunnar Hillert
c53b236d77 INTSAMPLES-64 - Refactored Constructor of DynamicPeriodicTrigger 2012-02-15 14:20:28 -05:00
Gunnar Hillert
3e7d121dd4 INTSAMPLES-64 - Code Review Changes
* Better documentation in README.md
* Better error handling
* Using a better data-format
2012-02-15 12:17:52 -05:00
Gunnar Hillert
edd3f90299 INTSAMPLES-64 Poller Sample using custom Trigger
For reference: https://jira.springsource.org/browse/INTSAMPLES-64

Shows how the polling period can be changed at runtime using a custom trigger.
2012-02-14 17:16:58 -05:00
Gary Russell
66b25d3319 Merge pull request #43 from ghillert/INTSAMPLES-54
INTSAMPLES-54 - Update README.md
2012-02-13 14:49:38 -08:00
Gunnar Hillert
8e7314ef1d Merge branch 'christian-posta-INTSAMPLES-22' 2012-02-13 17:10:37 -05:00
Christian Posta
375cc41b1a INTSAMPLES-22: Create sample for inbound tcp-connection-factory using deserializer and serializer
* Added new tests
* Added comments
* Created the custom serializer/deserializer. Fixing some small issues with it
* Changed the sending to use java socket api
* Working, just trying to figure out junit differences
* Found an error in the input message (contained \r\n) fixed now
* added .idea and activemq-data folders to ignore
* Cleaned up unused code, added documentation to the README.md
* Added more comments
* Added Copyright notices
2012-02-13 17:07:22 -05:00
Gunnar Hillert
9eaea90170 INTSAMPLES-55 Code review: Mention that every 5th number returned by the Counter class is negative. 2012-02-13 17:05:54 -05:00
Gunnar Hillert
a60a5b2901 INTSAMPLES-55 - Update README.md for OddEven Sample
For reference: https://jira.springsource.org/browse/INTSAMPLES-55

* Update README.md to reflect correct classes
* Improve documentation
* Add Maven Exec Maven Plugin for easy execution from the command line
2012-02-13 17:05:54 -05:00
Gunnar Hillert
d3f789bd3d INTSAMPLES-53 Restructured client and server section in README.md 2012-02-13 17:05:54 -05:00
Gunnar Hillert
c223667e32 INTSAMPLES-53 Update README.md
For reference see: https://jira.springsource.org/browse/INTSAMPLES-53
2012-02-13 17:05:53 -05:00
Gunnar Hillert
834f0a9630 INTSAMPLES-56 Update README.md for ws-outbound-gateway sample
For reference: https://jira.springsource.org/browse/INTSAMPLES-56
2012-02-13 17:05:53 -05:00
Gunnar Hillert
c7e5a7815b INTSAMPLES-57 Update README.md
For reference: https://jira.springsource.org/browse/INTSAMPLES-57

* reflect the correct Main class to be used
* add exec-maven-plugin and add usage to README.md
2012-02-13 17:05:53 -05:00
Gary Russell
1cea69c371 Merge pull request #44 from ghillert/INTSAMPLES-55
INTSAMPLES-55 - Update README.md for OddEven Sample
2012-02-13 07:12:15 -08:00
Gunnar Hillert
8fa60ccf1e INTSAMPLES-55 Code review: Mention that every 5th number returned by the Counter class is negative. 2012-02-13 09:53:27 -05:00
Gunnar Hillert
b1aecbd910 INTSAMPLES-54 - Add missing Copyright notice 2012-02-13 09:46:20 -05:00
Gunnar Hillert
8ba0c2b58c INTSAMPLES-54 - Code Review: Rename DelayerApp to PollerApp 2012-02-13 09:43:28 -05:00
Gunnar Hillert
aae6038794 INTSAMPLES-55 - Update README.md for OddEven Sample
For reference: https://jira.springsource.org/browse/INTSAMPLES-55

* Update README.md to reflect correct classes
* Improve documentation
* Add Maven Exec Maven Plugin for easy execution from the command line
2012-02-10 15:39:39 -05:00
Gunnar Hillert
43b85119c8 INTSAMPLES-54 - Update README.md
* Update README.md to reflect correct classes
* Add documentation for Delayer application
* Add JavaDoc for delayer application
* Delete redundant *src/main/resources/log4j.properties*
* Add logger name to *Logging Channel Adapter* configuration
* Add Maven Exec Maven Plugin for easy execution from the command line
2012-02-10 12:02:55 -05:00
Gary Russell
9d14c3f0b2 Merge pull request #41 from ghillert/INTSAMPLES-53
INTSAMPLES-53 Update README.md

LGTM
2012-02-10 08:27:51 -08:00
Gunnar Hillert
09643d73b0 INTSAMPLES-53 Restructured client and server section in README.md 2012-02-10 10:48:20 -05:00
Gary Russell
4dc47bf2f7 Merge pull request #42 from ghillert/INTSAMPLES-56
INTSAMPLES-56 Update README.md for ws-outbound-gateway sample
2012-02-09 07:06:02 -08:00
Gary Russell
97dae9ed68 Merge pull request #40 from ghillert/INTSAMPLES-57
INTSAMPLES-57 Update README.md
2012-02-09 06:55:59 -08:00
Gunnar Hillert
cf68ac2921 INTSAMPLES-56 Update README.md for ws-outbound-gateway sample
For reference: https://jira.springsource.org/browse/INTSAMPLES-56
2012-02-09 00:59:33 -05:00
Gunnar Hillert
cd5f941523 INTSAMPLES-53 Update README.md
For reference see: https://jira.springsource.org/browse/INTSAMPLES-53
2012-02-08 17:42:55 -05:00
Gunnar Hillert
3f1c5a1633 INTSAMPLES-57 Update README.md
For reference: https://jira.springsource.org/browse/INTSAMPLES-57

* reflect the correct Main class to be used
* add exec-maven-plugin and add usage to README.md
2012-02-08 16:34:57 -05:00
Gary Russell
1930a92bbe Merge pull request #39 from ghillert/INTSAMPLES-46
INTSAMPLES-46 - Remove Eclipse Meta Data files
2012-02-08 09:21:42 -08:00
Gunnar Hillert
e05d04e976 INTSAMPLES-46 - Remove Eclipse Meta Data files
Delete *.project* file in sample project:

* control-bus
* http

Delete also:

* applications/cafe/.springBeans
* applications/loan-broker/.springBeans
* applications/loanshark/.springBeans
* basic/feed/.springBeans
* basic/file/.springBeans
* basic/ftp/.springBeans
* basic/helloworld/.springBeans
* basic/http/.springBeans
* basic/jms/.springBeans
* basic/jmx/.springBeans
* basic/mail/.springBeans
* basic/oddeven/.springBeans
* basic/quote/.springBeans
* basic/sftp/.springBeans
* basic/tcp-client-server/.springBeans
* basic/twitter/.springBeans
* basic/ws-inbound-gateway/.springBeans
* basic/ws-outbound-gateway/.springBeans
* basic/xml/.springBeans
* basic/xmpp/.springBeans
* intermediate/async-gateway/.springBeans
* intermediate/errorhandling/.springBeans
* intermediate/file-processing/.springBeans
* intermediate/multipart-http/.springBeans
* intermediate/travel/.springBeans
2012-02-08 11:55:34 -05:00
Gary Russell
4b67641e3a Merge pull request #35 from ghillert/INTSAMPLES-59
INTSAMPLES-59 - Remove Twitter4j reference
2012-02-01 06:18:43 -08:00
Gunnar Hillert
1867ca5c91 INTSAMPLES-59 - Remove Twitter4j reference
For reference see: https://jira.springsource.org/browse/INTSAMPLES-59
2012-02-01 01:39:01 -05:00
Gunnar Hillert
65c4d47206 Merge pull request #31 from ghillert/INTSAMPLES-48
INTSAMPLES-48 Add SLF4J dependency
2012-01-18 10:13:32 -08:00
Gary Russell
2b144d12d3 Merge pull request #30 from ghillert/INTSAMPLES-42
INTSAMPLES-42 - Convert all ReadMe files to MarkDown
2012-01-18 07:57:28 -08:00