Permalink
Switch branches/tags
Commits on May 15, 2012
  1. INT-2453 content-type and ObjectToJsonTransformer

    Oleg Zhurakousky committed with garyrussell May 15, 2012
    Added 'content-type' functionality to ObjectToJsonTransformer
    
    Added 'content-type' attribute to object-to-json-transformer element
    
    Added parser and usage tests to ensure propper overrides
    (see Mark's last comment here #409)
    
    Applied required changes to Amqp module to work with standard 'content-type' header
    
    INT-2453 polish based on PR comments
    
    INT-2453 polished test
    
    INT-2453 polished parser
  2. Merge pull request #437 from dturanski/INT-2550

    Oleg Zhurakousky committed May 15, 2012
    * INT-2550:
      INT-2550,INT-2552:added support for properties regionName and region to GemfireMessageStore
  3. INT-2550,INT-2552:added support for properties regionName and region …

    dturanski committed with Oleg Zhurakousky May 14, 2012
    …to GemfireMessageStore
    
    INT-2555:Upgraded to spring-data-gemfire 1.1.1.RELEASE
    
    document update
    
    INT-2550,INT-2552: updated GemfireMessageStore, test, and docs per Oleg's comments
    
    removed setRegion
  4. Merge pull request #440 from ghillert/INT-2560

    Oleg Zhurakousky committed May 15, 2012
    * INT-2560:
      INT-2560 - Fix tests in JpaPollingChannelAdapterTests For reference see: https://jira.springsource.org/browse/INT-2560
Commits on May 14, 2012
  1. INT-2556 - Fix Test JpaPollingChannelAdapterTests

    Gunnar Hillert committed with garyrussell May 14, 2012
  2. Merge pull request #436 from garyrussell/INT-2509

    Oleg Zhurakousky committed May 14, 2012
    * INT-2509:
      INT-2394 Support HA (Mirrored) Queues
  3. INT-2394 Support HA (Mirrored) Queues

    garyrussell committed with Oleg Zhurakousky Jan 9, 2012
    Changes to Connection Factory interface (stub).
    
    INT-2394 Polishing
    
    INT-2394 Map Gateway Correlation Header
    
    Map spring_reply_correlation if present.
    
    INT-2394 Map ReplyTo Stack
    
    Enable the use outbound-gateway in a destination application
    to which we sent a message using another outbound gateway.
    
    The RabbitTemplate now pushed exising correlation data onto
    a stacked header attribute.
    
    INT-2509 Publisher Confirms and Returns
    
    Add Publisher Confirm support to the outbound channel
    adapter.
    
    Add returns support to outbound channel adapter and gateway.
    
    INT-2509 Polishing
    
    PR Review comments.
    
    Docs.
    
    Fix chain test after rebase.
  4. Merge pull request #411 from ghillert/INT-1983

    Oleg Zhurakousky committed May 14, 2012
    * INT-1983:
      INT-1983 - Add JPA Adapter For reference see: https://jira.springsource.org/browse/INT-1983
  5. INT-1983 - Add JPA Adapter

    amolnayak311 committed with Oleg Zhurakousky Feb 16, 2012
    For reference see: https://jira.springsource.org/browse/INT-1983
    
    * INT-2435 - Add the ability to automatically resolve the entity-class from the payload as fallback
    * Add <transactional/> support for **Jpa Outbound Gateway** and **Jpa Outbound Channel Adapter**
    * Merging Documentation from: https://github.com/amolnayak311/spring-integration/blob/INT-2440/src/reference/docbook/jpa.xml
    * Provide JPA Tests against Hibernate, EclipseLink and OpenJPA
    * Improve Documentation
    * Remove trailing white-space, convert white-space to tabs, remove @transactional from DefaultJpaOperations
    * INT-2440 Adding the documentation for the JPA adapters
    
    INT-1983 - Code Review based Fixes
    * Fix indentation in XML Schema
    * Remove *transactional* sub-element definition from JPA Inbound Channel Adapter in XML Schema
    * Fix enumeration *gatewayType*
    
    INT-1983 - Based on Code Review
    
    * Remove '/** {@inheritDoc} */' from DefaultJpaOperations
    * Remove JavaDoc parameters that don't contains details
    * Cleanup *JpaUtils*
    * Remove "transaction-manager-ref" from *spring-integration-jpa-2.2.xsd*
    * Cleanup *spring-integration-jpa-2.2.xsd*
    * Provide documentation to *EclipseLinkJpaOperationsTests* on how to run tests in IDE
    * Provide documentation to *OpenJpaJpaOperationsTests* on how to run tests in IDE
    * Refactor JPA Reference Doc Chapter (work in progress)
    
    INT-1983 - Code Review: provide better JavaDoc
  6. Merge pull request #435 from artembilan/INT-2275

    Oleg Zhurakousky committed May 14, 2012
    * INT-2275:
      INT-2275: any outbound-channel-adapter in <chain>
  7. INT-2275: any outbound-channel-adapter in <chain>

    artembilan committed with Oleg Zhurakousky Jan 3, 2012
    Add re-init logic for nested chains
    Add logic about nested element for AbstractChannelAdapterParser
    Refactor of DefaultOutboundChannelAdapterParser
    Test for non-last nested chain with some outbound-channel-adapter
    Improve XSD for chain-type
    Manual outbound-channel-adapter ability for chain
    Integration tests for all outbound-channel-adapter within <chain>
    Remove redundant 'return-value-required' attribute from <stored-proc-outbound-channel-adapter>
    Add support 'expectReply' for FileWritingMessageHandler
    
    INT-2275 polishing & refactor FileOutbound*Parser
    
    HttpRequestExecutingMessageHandlerTests polishing
    
    INT-2275: polishing JavaDoc
Commits on May 10, 2012
  1. Merge pull request #434 from ghillert/INT-2545

    Oleg Zhurakousky committed May 10, 2012
    * INT-2545:
      INT-2545 - Upgrade bundlor-plugin + docbook-reference-plugin * Upgrade bundlor-plugin version to 0.1.2 * Upgrade docbook-reference-plugin to 0.1.5
  2. INT-2545 - Upgrade bundlor-plugin + docbook-reference-plugin

    Gunnar Hillert committed with Oleg Zhurakousky May 9, 2012
    * Upgrade bundlor-plugin version to 0.1.2
    * Upgrade docbook-reference-plugin to 0.1.5
  3. Merge pull request #403 from garyrussell/INT-2485a

    Oleg Zhurakousky committed May 10, 2012
    * INT-2485a:
      INT-2485 Orderly Shutdown
  4. INT-2485 Orderly Shutdown

    garyrussell committed with Oleg Zhurakousky Apr 2, 2012
    Initial commit - @ManagedOperation on IMBE
    
    - can be invoked via JMX, <control-bus/>, or getting a reference to
    the IMBE from the application context.
    
    INT-2485 Updates After Review Comments (JIRA)
    
    * Shutdown Schedulers first, and wait for them
    * Add a force parameter, which overrides thread pool shutdown options
    * Shutdown Sources/Channels after all thread pools have stopped
    * Mark other components as OrderlyShutdownCapable (e.g. JMS/AMQP Listener containers) and shut them down first
    * Wait for remaining time to allow for quiescence
    
    Also
    * remove TimeUnit parameter (not JMX-friendly); time limit is now always milliseconds
    * If thread pools don't stop in time limit, force them down.
    
    INT-2485 Handle Self-Destruction
    
    Add shutdown-executor to IMBE.
    
    When the shutdown was called on a Spring-Managed thread, the shutdown
    was not clean because we timed out waiting for the current thread to
    terminate. After that, we force terminated other components.
    
    Now, by providing a dedicated Executor for the shutdown process, it
    is used for the shutdown instead of the current thread. This Executor
    is *not* shutdown.
    
    It is not necessary to provide an Executor if the stopActiveComponents()
    method is called on some other thread that is not involved in the
    shutdown.
    
    Also adds executor name to logs, when available.
    
    INT-2485 Polishing
    
    Fix MBean object name collision when running all tests.
    
    INT-2485 Enable TCP Shutdown
    
    Make TCP connection factories 'OrderlyShutdownCapable' so
    they are stopped before schedulers/executors in order for
    them to release any executor threads they are holding.
    
    INT-2485 Polishing
    
    Didn't need DirectFieldAccessor - scheduler and executor have
    an accessor for the native ExecutorService.
    
    Copyrights
    
    INT-2485 Polishing
    
    schemaLocation version.
    
    INT-2485 PR Review Polishing
Commits on May 9, 2012
  1. INT-2508 Priority Channel FIFO

    Oleg Zhurakousky committed with garyrussell May 8, 2012
    Fix a concurrency issue with the PriorityChannel by
    introducing a private MessageWrapper; an implementation
    of Message, to maintain the contract with the Comparator.
    
    The MessageWrapper contains the original Message plus
    an incremented sequence number, used as a tie-breaker,
    to maintain FIFO semantics within priority.
    
    Previously, the sequence number was added to, and removed
    from, the headers of the original Message using a
    DirectFieldAccessor.
    
    This could cause concurrent modification
    exceptions when it was removed.
    
    INT-2508 polishing based on PR comments
    
    INT-2508 Polish Whitespace
  2. Merge pull request #431 from artembilan/INT-2542

    Oleg Zhurakousky committed May 9, 2012
    * INT-2542:
      INT-2542: order attr. for logging-channel-adapter
  3. INT-2542: order attr. for logging-channel-adapter

    artembilan committed with Oleg Zhurakousky May 8, 2012
    Additional tests for LoggingChannelAdapterParser
Commits on May 8, 2012
  1. INT-2497

    Oleg Zhurakousky committed with garyrussell May 8, 2012
    changed warning message to error in AbstractCorrelatingMessageHandlerParser when both beanRef and expression are present, re-enabled commented out test to verify the error
  2. INT-2247

    Oleg Zhurakousky committed with garyrussell May 8, 2012
    remove MockHttpServletRequest.java, MockHttpServletResponse.java in favor of Spring 3.1 mock classes
    
    INT-2247 polishing
    
    Revert imports
  3. Merge pull request #423 from garyrussell/INT-2519a

    Oleg Zhurakousky committed May 8, 2012
    * INT-2519a:
      INT-2519 Fix Failing Test
  4. INT-2519 Fix Failing Test

    garyrussell committed May 8, 2012
    Depending on timing, it was possible the event the test
    case was waiting for would never happen. With no timeout
    the selector will block until the next IO event occurs,
    and there is none in this test.
    
    Adding a call to factory.close() forces a wakeup of
    the selector, which will force the harvest to occur.
    
    This is a test-only problem.
  5. INT-2437 upgraded mongo to 1.1.0.M1

    Oleg Zhurakousky committed May 8, 2012
Commits on May 7, 2012
  1. Merge pull request #404 from garyrussell/INT-2519

    Oleg Zhurakousky committed May 7, 2012
    * INT-2519:
      INT-2519 Fix Memory Leak
  2. INT-2519 Fix Memory Leak

    garyrussell committed with Oleg Zhurakousky Apr 18, 2012
    When using NIO, a Map of connections is maintained (keyed
    by the SocketChannel) and used to manage registrations
    for NIO events, timeouts etc.
    
    When a connection is closed, the corresponding entry
    should be removed from the map. The code to do this
    is in AbstractConnectionFactory.processNioSelections().
    However, if no socket timeout (soTimeout) has been set,
    or it was explicitly set to 0, connections are not
    removed from the map. This was because the timeout
    logic and map cleanup is done in the same iteration
    loop.
    
    Now, if soTimeout is not set, the clean up loop
    operates every nioHarvestInterval milliseconds
    (default 2000), we don't want to run it on
    every selector event.
    
    In addition, it runs if the selectionCount is
    zero - this might occur when a socket
    is closed, when the selector.wakeup() is called.
    
    INT-2519 Polishing
    
    Rename connections field in NIO connection factories. Name
    collision caused TestUtils problem on some platforms.
  3. Merge pull request #419 from garyrussell/INT-1871a

    Oleg Zhurakousky committed May 7, 2012
    * INT-1871a:
      INT-1871 Remove Schema Versions
  4. INT-1871 Remove Schema Versions

    garyrussell committed with Oleg Zhurakousky May 7, 2012
    Schemas update to 2.2 after the PR and the new
    test config had 2.1 versioned schemas.
    
    INT-1871 polishing, removed unused import