Commit Graph

246 Commits

Author SHA1 Message Date
Ilayaperumal Gopinathan
325ee9a4f3 Kafka: PP for consumer context bean
JIRA: https://jira.spring.io/browse/INTEXT-112
https://jira.spring.io/browse/INTEXT-111

 - Avoid using hardcoded bean names for consumer context
 - Remove Integer value topic streams count, instead use string value
   - This will allow placeholder values to be used for `streams` attribute
 - Set `group-id` as a bean name for consumer configuration bean only if
   the group id is specified explicitly. This will allow placeholder values
   not being used as a bean name.
 - Add test cases to verify multiple consumer configurations within the
   same consumer context.

Set consumerConfigurations as propertyValue

Better handling of consumerConfigurations

 - Add getConsumerConfiguration(String groupId) in KafkaConsumerContext
   - Fix tests
 - Add additional test case to check multi consumer contexts

Fix getConsumerConfiguration(groupId)

Polishing
2014-08-20 21:11:08 +03:00
Artem Bilan
5f4089db0a DSL-(S)FTP-Namespace-Builder-Factory
**DO NOT MERGE YET**.

There is need to provide tests on the matter.

(S)FTP Tests

* Add test cases for (s)ftp components based on embedded (S)FtpServers
* Upgrade some dependencies
* Fix bug in the `IntegrationFlowBeanPostProcessor` for the registration internal (a result of `MessageSourceSpec`) as a bean in the AC
2014-08-20 17:32:40 +03:00
Tim Ysewyn
1b1f95c004 Java DSL: Fix EnricherSpec to prevent assertions
Fixes: https://github.com/spring-projects/spring-integration-extensions/issues/101
2014-08-20 17:28:48 +03:00
Ilayaperumal Gopinathan
501209384b Make ConsumerContext disposable
- This will allow shutting down the consumer connector for the consumer
configuration when the associated context no longer exists.
2014-08-19 13:11:07 +03:00
Artem Bilan
4b5ba00536 Kafka-GH-92: Allow PP for the <topic-filter>
Fixes https://github.com/spring-projects/spring-integration-extensions/issues/92
2014-08-19 13:07:54 +03:00
Rob Harrop
d06e8cbec3 AWS: Updated to spring-integration to 4.0.3
Made the corresponding API changes.

Had to update jacoco to latest (0.7.1.blah) to get the tests to work correctly on OSX Java 8

Fixed JavaDoc errors show up by the Java 8 linter. Build passes

Bringing dependencies inline with Spring 4.0.6

Updated mockito to 1.9.5

Updated Hamcrest to 1.3

Updated aws-sdk to 1.8.7

Merge branch 'master' into integration-4.0

Reformatted gradle file inline with the existing standard

Switch back to using the milestone repo

Upgrade Gradle version to 1.12

Updated the schema references to use un-versioned refs

Updated author tags and copyright dates

AWS: SI-4.0 Polishing
2014-08-15 12:27:56 +03:00
Artem Bilan
8cc38bc1b7 DSL: Add File. Namespace Builder Factory
* Introduce `ComponentsRegistration` *marker* to extract internal components from the `IntegrationComponentSpec` to be registered as bean in the application context
* Add `ConsumerEndpointSpec#order(int order)` for the `order` of target `AbstractMessageHandler`
* Fix `AggregatorSpec` to use `DefaultAggregatingMessageGroupProcessor` by default
* Fix `IntegrationFlowBeanPostProcessor#generateBeanName` to check if `instance instanceof NamedComponent` and its `beanName` has been configured
using `IntegrationComponentSpec#id`
2014-08-13 13:50:09 +03:00
Gunnar Hillert
c9348c66f0 Splunk next development version 1.2.0.BUILD-SNAPSHOT 2014-07-24 11:53:39 -04:00
Spring Buildmaster
a0e93b4c94 [artifactory-release] Splunk Release version 1.1.0.RELEASE 2014-07-24 11:50:02 -04:00
Artem Bilan
d40d510e4c Splunk: Disable real-time search (GH-#39) 2014-07-24 17:26:34 +03:00
Soby Chacko
46d7567a77 INTEXT-104: Kafka: order for o-channel-adapter
JIRA: https://jira.spring.io/browse/INTEXT-104

`order` attribute now honored if kafka outbound adapter is connected to a subscribable channel
unit tests and samples are updated

Polishing: use `<xsd:attributeGroup ref="integration:channelAdapterAttributes"/>` for adapter tags to cover `SmartLifecycle` options.
2014-07-24 10:43:07 +03:00
Artem Bilan
7b59bc5b87 DSL: Add targetCompatibility = 1.6 2014-07-23 19:02:23 +03:00
Soby Chacko
07d45d69c1 INTEXT-110: Update Kafka version to 0.8.1.1
JIRA: https://jira.spring.io/browse/INTEXT-110

Perform the necessary API Changes (Partioner interface in Kafka is now non-genericized for Keys - concrete Object is the new type for Key)
Unit test updates for an internal Kafka class (MessageMetadata)
Updates for the samples Kafka project to use the new M2 snapshot, Spring 4.0 Messaging changes, other build related minor changes, etc.
2014-07-22 18:00:29 +03:00
Gary Russell
8dc41021b8 Update kafka to Spring Integration 4.0.3 2014-07-21 15:18:34 -04:00
Spring Buildmaster
7e0068b9df [artifactory-release] Next development version (kafka) 2014-07-21 12:16:41 -07:00
Spring Buildmaster
46b5cc438a [artifactory-release] Release version 1.0.0.M1 (kafka) 2014-07-21 12:16:37 -07:00
Artem Bilan
f6c9f1305b DSL: Fixes and polishing after upgrade
* Upgrade to SI 4.0.3 and Boot 1.1.4
* Add `HeaderEnricherSpec#headerChannelsToString()`
* Fix `DslRecipientListRouter` according core changes
* Fix `Amqp` and `Jms` modules for the bug around "All Message creators need a BeanFactory"
using fake `new DefaultListableBeanFactory()` for `(Amqp)JmsChannelFactoryBean`
2014-07-17 14:53:17 +03:00
Andy Wilkinson
24e8c59878 Add the Spring IO plugin to Splunk extension
Configure the Spring IO plugin such that it's only applied when the
build is run with -PplatformVersion=<version>. This platformVersion
property is used to determine the version of the Platform that will
be used when running the springIoCheck task. The plugin can be used
by running a build as follows:

./gradlew clean springIoCheck -PplatformVersion=1.1.0.BUILD-SNAPSHOT -PJDK7_HOME=… -PJDK8_HOME=…

This will test the project on JDK7 and JDK 8 using the dependencies
defined in the latest snapshot of Spring IO Platform 1.1.0.
2014-07-15 11:51:20 +01:00
Artem Bilan
85378e5253 Kafka: KCCtx: return null if consumedData.isEmpty
Fixes: https://github.com/spring-projects/spring-integration-extensions/issues/68
2014-07-01 15:01:22 +03:00
Artem Bilan
906880acf0 DSL: Use DelayerEndpointSpec for .delay()
GH: https://github.com/spring-projects/spring-integration-extensions/issues/84
2014-07-01 14:49:53 +03:00
Artem Bilan
c639066daf Splunk: Populate count=0 to the reader Job
PR: https://github.com/spring-projects/spring-integration-extensions/pull/82
2014-06-30 10:08:07 +03:00
Artem Bilan
ab5073fb4d AWS-S3: Close tag in the sample config
PR: https://github.com/spring-projects/spring-integration-extensions/pull/85
2014-06-28 14:10:48 +03:00
Spring Buildmaster
c515a566ff [artifactory-release] SMPP Next development version 2014-06-25 08:37:36 -07:00
Spring Buildmaster
455a1ef766 [artifactory-release] SMPP Release version 1.0.0.RELEASE 2014-06-25 08:37:32 -07:00
Artem Bilan
55d9ef5d3a Revert "[artifactory-release] SMPP Release version 1.0.0.GA"
This reverts commit 4519168dfc.
2014-06-25 18:28:52 +03:00
Artem Bilan
4652b04c73 Revert "[artifactory-release] SMPP Next development version"
This reverts commit 2ed3ad7474.
2014-06-25 18:17:51 +03:00
Spring Buildmaster
2ed3ad7474 [artifactory-release] SMPP Next development version 2014-06-25 08:09:19 -07:00
Spring Buildmaster
4519168dfc [artifactory-release] SMPP Release version 1.0.0.GA 2014-06-25 08:09:14 -07:00
Edge Dalmacio
d1d6b068bc INTEXT-73: Sending multipart SMS messages through
JIRA: https://jira.spring.io/browse/INTEXT-73

minor optimization

added test for multipart messages

Signed-off-by: Edge Dalmacio <edgar.dalmacio@gmail.com>

INTEXT-73 Replaced String[] with List

INTEXT-73 fixed test

Polishing code format
2014-06-24 17:15:46 +03:00
Edge Dalmacio
7590253871 INTEXT-107 Upgrade to Spring Integration 4.0
JIRA: https://jira.spring.io/browse/INTEXT-107

* Upgrade to Gradle 1.12
* Fix compile warnings
* Fix XSD declaration
* Get rid of `EasyMock`
2014-06-24 14:02:02 +03:00
Spring Buildmaster
2b049dd478 [artifactory-release] Next development version Java DSL 2014-06-19 06:03:36 -07:00
Spring Buildmaster
5bb2e40ecc [artifactory-release] Release version Java DSL 1.0.0.M2 2014-06-19 06:03:32 -07:00
Artem Bilan
3085f71277 DSL: Add Jms.messageDriverAdapter 2014-06-13 21:20:16 +03:00
Jonathan Pearlin
989ce89fed INTEXT-106: Update to spring-integration 4.0
JIRA: https://jira.spring.io/browse/INTEXT-106

* Upgrade to SI 4.0 and other libs
* Upgrade to Gradle 1.12
* Polisihng for `build.gradle`
* Fix compile warnings
2014-06-13 19:14:43 +03:00
Artem Bilan
1307646c3c DSL: Polishing for priorityChannel test 2014-06-12 18:24:12 +03:00
Artem Bilan
a35db31e61 DSL: Add Jms.inboundGateway() infrastructure 2014-06-12 18:16:43 +03:00
Olivier Lamy
49538abbe6 INTEXT-105: Fix "index" property according to the schema
JIRA: https://jira.spring.io/browse/INTEXT-105

Previously the `SplunkIndexWriter` has property `indexName`,
however the XSD for `<int-splunk:index-writer/>` provides the `index` attribute

Rename the property and add parser test
2014-06-12 14:09:28 +03:00
Artem Bilan
b42e6e1503 DSL: JMS in/out adapters, outbound gateway
* Others fixes, improvements and refactoring
2014-06-11 19:16:57 +03:00
Artem Bilan
7394516a2d DSL: Add Jms factory
* Add `Spec` implementations for `JmsChannel`s
* Fix the bug around `SourcePollingChannelAdapterFactoryBean` named bean registration
* Remove unused classes
* Add test for `Jms.pollableChannel`
2014-06-10 18:42:23 +03:00
Artem Bilan
36063ec8f2 DSL: Add Amqp.*channel() support
* Upgrade to the latest Boot snapshot
* Polishing and workarounds for `Proxy` beans. Caused by `@EnableJmx`
2014-06-09 13:54:40 +03:00
Artem Bilan
bb85518449 INTEXT-94: Fix Auth bug for Splunk 6.x
JIRA: https://jira.spring.io/browse/INTEXT-94

* Upgrade to Splunk Client 1.3
2014-06-06 17:35:29 +03:00
Olivier Lamy
198205058c Splunk: Servers failover
upgrade versions

Conflicts:
	spring-integration-splunk/gradle.properties

upgrade gradle version

revert spring integration upgrade version

Add a feature to be able to declare more than one splunk server.
It's a simple failover mechanism with any pooling.
Before give back the Service instance, the framework just try a getInfo call.
To preserve backward compat this check it's not activated per default but only
if the splunk server instance is marked with testOnBorrow.

Sample:
````xml
  <int-splunk:server id="splunkServer" host="${splunk.server.host}" port="${splunk.server.port}"
                     username="${splunk.server.username}" password="${splunk.server.password}"
                     owner="${splunk.server.owner}" scheme="${splunk.server.scheme}" testOnBorrow="true" />

  <int-splunk:server id="splunkServerBackup" host="localhost" port="9999"
                     username="${splunk.server.username}" password="${splunk.server.password}"
                     owner="${splunk.server.owner}" scheme="${splunk.server.scheme}" testOnBorrow="true" />

  <util:list id="splunkServersList">
    <ref bean="splunkServer" />
    <ref bean="splunkServerBackup" />
  </util:list>

  <bean id="splunkServiceFactory" class="org.springframework.integration.splunk.support.SplunkServiceFactory">
    <constructor-arg ref="splunkServersList"/>
  </bean>

  <int-splunk:inbound-channel-adapter id="splunk-notify-order-status-change-channel"
                                      auto-startup="true"
                                      search=""
                                      splunk-server-ref="splunkServer;splunkServerBackup"
                                      channel="notify-order-status-change-input"
                                      mode="BLOCKING"
                                      init-earliest-time="${splunk.order-status-change.init-earliest-time}"
                                      >
    <int:poller fixed-rate="${splunk.order-status-change.pooling.rate.time}" time-unit="SECONDS"/>
  </int-splunk:inbound-channel-adapter>
````

some changes due to pr comments

Conflicts:
	spring-integration-splunk/gradle.properties

formatting: tabs instead of spaces.....

fix documentation with failover mechanism

formatting

formatting

upgrade versions

some changes due to pr comments

fix javadoc issues

1.1 xsd file

Polishing and upgrading
2014-06-06 13:49:32 +03:00
Artem Bilan
dd085c8945 DSL: Fix @Autowired issue for IntegrationFlows
* Move DSL parser logic from `BFPP` to `BPP` as soon as the DSL doesn't populate any `BeanDefinition` - just real objects,
which can be registered with `this.beanFactory.registerSingleton(beanName, component);`
* Add more DSL for `Amqp` 'Namespace' factory and provide tests on the matter
* Comment out `spring-integration-jdbc` and `spring-integration-jpa` dependecies because the provide `spring-jdbc` dependency,
but it causes an issue in Boot: https://github.com/spring-projects/spring-boot/issues/1041
2014-06-06 00:38:21 +03:00
Gary Russell
5bf98b033b Remove spring-integration-mqtt from master 2014-06-02 15:27:31 -04:00
Spring Buildmaster
c8ed4a5036 [artifactory-release] Splunk Next development version 2014-06-02 17:24:04 +03:00
Spring Buildmaster
4adcd74534 [artifactory-release] Splunk Release version 1.1.0.M2 2014-06-02 17:24:03 +03:00
Glenn Renfro
3ba75060eb XD-1170 updted import for MessageHandlingException 2014-06-02 17:24:03 +03:00
Spring Buildmaster
cce7bb94b3 [artifactory-release] Next development version 2014-06-02 17:24:03 +03:00
Spring Buildmaster
57469b3977 [artifactory-release] Release version 1.1.0.M1 2014-06-02 17:24:03 +03:00
Glenn Renfro
aafda12a5f Uses Spring 4.0 dependencies
Updated the buid version 1.1.0
2014-06-02 17:24:03 +03:00