You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by cm...@apache.org on 2011/02/22 00:27:41 UTC
svn commit: r1073186 [2/2] - in /camel/trunk: apache-camel/
apache-camel/src/main/descriptors/ components/
components/camel-jdbc-aggregator/
components/camel-jdbc-aggregator/src/main/java/org/apache/camel/component/jdbc/aggregationrepository/
component...
Copied: camel/trunk/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregationRepositoryTest.java (from r1073182, camel/trunk/components/camel-jdbc-aggregator/src/test/java/org/apache/camel/component/jdbc/aggregationrepository/JdbcAggregationRepositoryTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregationRepositoryTest.java?p2=camel/trunk/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregationRepositoryTest.java&p1=camel/trunk/components/camel-jdbc-aggregator/src/test/java/org/apache/camel/component/jdbc/aggregationrepository/JdbcAggregationRepositoryTest.java&r1=1073182&r2=1073186&rev=1073186&view=diff
==============================================================================
--- camel/trunk/components/camel-jdbc-aggregator/src/test/java/org/apache/camel/component/jdbc/aggregationrepository/JdbcAggregationRepositoryTest.java (original)
+++ camel/trunk/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregationRepositoryTest.java Mon Feb 21 23:27:38 2011
@@ -14,31 +14,20 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.jdbc.aggregationrepository;
+package org.apache.camel.processor.aggregate.jdbc;
import org.apache.camel.Exchange;
import org.apache.camel.impl.DefaultExchange;
-import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-public class JdbcAggregationRepositoryTest extends CamelTestSupport {
+public class JdbcAggregationRepositoryTest extends AbstractJdbcAggregationTestSupport {
- ApplicationContext applicationContext;
-
- @Override
- public void setUp() throws Exception {
- applicationContext = new ClassPathXmlApplicationContext("org/apache/camel/component/jdbc/aggregationrepository/JdbcSpringDataSource.xml");
-
- super.setUp();
+ void configureJdbcAggregationRepository() {
+ repo.setReturnOldExchange(true);
}
-
+
@Test
public void testOperations() {
- JdbcAggregationRepository repo = applicationContext.getBean("repo1", JdbcAggregationRepository.class);
- repo.setReturnOldExchange(true);
-
// Can't get something we have not put in...
Exchange actual = repo.get(context, "missing");
assertEquals(null, actual);
@@ -79,5 +68,4 @@ public class JdbcAggregationRepositoryTe
actual = repo.get(context, "foo");
assertEquals("counter:3", actual.getIn().getBody());
}
-
-}
+}
\ No newline at end of file
Copied: camel/trunk/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcExchangeSerializationTest.java (from r1073182, camel/trunk/components/camel-jdbc-aggregator/src/test/java/org/apache/camel/component/jdbc/aggregationrepository/JdbcExchangeSerializationTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcExchangeSerializationTest.java?p2=camel/trunk/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcExchangeSerializationTest.java&p1=camel/trunk/components/camel-jdbc-aggregator/src/test/java/org/apache/camel/component/jdbc/aggregationrepository/JdbcExchangeSerializationTest.java&r1=1073182&r2=1073186&rev=1073186&view=diff
==============================================================================
--- camel/trunk/components/camel-jdbc-aggregator/src/test/java/org/apache/camel/component/jdbc/aggregationrepository/JdbcExchangeSerializationTest.java (original)
+++ camel/trunk/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcExchangeSerializationTest.java Mon Feb 21 23:27:38 2011
@@ -14,32 +14,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.jdbc.aggregationrepository;
+package org.apache.camel.processor.aggregate.jdbc;
import java.util.Date;
import org.apache.camel.Exchange;
import org.apache.camel.impl.DefaultExchange;
-import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-public class JdbcExchangeSerializationTest extends CamelTestSupport {
-
- ApplicationContext applicationContext;
-
- @Override
- public void setUp() throws Exception {
- applicationContext = new ClassPathXmlApplicationContext("org/apache/camel/component/jdbc/aggregationrepository/JdbcSpringDataSource.xml");
-
- super.setUp();
- }
+public class JdbcExchangeSerializationTest extends AbstractJdbcAggregationTestSupport {
@Test
public void testExchangeSerialization() {
- JdbcAggregationRepository repo = applicationContext.getBean("repo1", JdbcAggregationRepository.class);
-
Exchange exchange = new DefaultExchange(context);
exchange.getIn().setBody("Hello World");
exchange.getIn().setHeader("name", "Olivier");
@@ -77,5 +63,4 @@ public class JdbcExchangeSerializationTe
assertNull(date);
assertSame(context, actual.getContext());
}
-
}
\ No newline at end of file
Copied: camel/trunk/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcGetNotFoundTest.java (from r1073182, camel/trunk/components/camel-jdbc-aggregator/src/test/java/org/apache/camel/component/jdbc/aggregationrepository/JdbcGetNotFoundTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcGetNotFoundTest.java?p2=camel/trunk/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcGetNotFoundTest.java&p1=camel/trunk/components/camel-jdbc-aggregator/src/test/java/org/apache/camel/component/jdbc/aggregationrepository/JdbcGetNotFoundTest.java&r1=1073182&r2=1073186&rev=1073186&view=diff
==============================================================================
--- camel/trunk/components/camel-jdbc-aggregator/src/test/java/org/apache/camel/component/jdbc/aggregationrepository/JdbcGetNotFoundTest.java (original)
+++ camel/trunk/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcGetNotFoundTest.java Mon Feb 21 23:27:38 2011
@@ -14,30 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.jdbc.aggregationrepository;
+package org.apache.camel.processor.aggregate.jdbc;
import org.apache.camel.Exchange;
import org.apache.camel.impl.DefaultExchange;
-import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-public class JdbcGetNotFoundTest extends CamelTestSupport {
-
- ApplicationContext applicationContext;
-
- @Override
- public void setUp() throws Exception {
- applicationContext = new ClassPathXmlApplicationContext("org/apache/camel/component/jdbc/aggregationrepository/JdbcSpringDataSource.xml");
-
- super.setUp();
- }
+public class JdbcGetNotFoundTest extends AbstractJdbcAggregationTestSupport {
@Test
public void testGetNotFound() {
- JdbcAggregationRepository repo = applicationContext.getBean("repo1", JdbcAggregationRepository.class);
-
Exchange exchange = new DefaultExchange(context);
exchange.getIn().setBody("Hello World");
@@ -47,8 +33,6 @@ public class JdbcGetNotFoundTest extends
@Test
public void testPutAndGetNotFound() {
- JdbcAggregationRepository repo = applicationContext.getBean("repo1", JdbcAggregationRepository.class);
-
Exchange exchange = new DefaultExchange(context);
exchange.getIn().setBody("Hello World");
log.info("Created " + exchange.getExchangeId());
@@ -64,5 +48,4 @@ public class JdbcGetNotFoundTest extends
Exchange out2 = repo.get(context, exchange2.getExchangeId());
assertNull("Should not find exchange", out2);
}
-
}
\ No newline at end of file
Copied: camel/trunk/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcGrowIssueTest.java (from r1073182, camel/trunk/components/camel-jdbc-aggregator/src/test/java/org/apache/camel/component/jdbc/aggregationrepository/JdbcGrowIssueTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcGrowIssueTest.java?p2=camel/trunk/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcGrowIssueTest.java&p1=camel/trunk/components/camel-jdbc-aggregator/src/test/java/org/apache/camel/component/jdbc/aggregationrepository/JdbcGrowIssueTest.java&r1=1073182&r2=1073186&rev=1073186&view=diff
==============================================================================
--- camel/trunk/components/camel-jdbc-aggregator/src/test/java/org/apache/camel/component/jdbc/aggregationrepository/JdbcGrowIssueTest.java (original)
+++ camel/trunk/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcGrowIssueTest.java Mon Feb 21 23:27:38 2011
@@ -14,29 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.jdbc.aggregationrepository;
+package org.apache.camel.processor.aggregate.jdbc;
import org.apache.camel.Exchange;
import org.apache.camel.impl.DefaultExchange;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Before;
import org.junit.Test;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-public class JdbcGrowIssueTest extends CamelTestSupport {
+public class JdbcGrowIssueTest extends AbstractJdbcAggregationTestSupport {
private static final int SIZE = 1024;
- private JdbcAggregationRepository repo;
-
- @Before
- @Override
- public void setUp() throws Exception {
- ApplicationContext applicationContext = new ClassPathXmlApplicationContext("org/apache/camel/component/jdbc/aggregationrepository/JdbcSpringDataSource.xml");
- repo = applicationContext.getBean("repo1", JdbcAggregationRepository.class);
-
- super.setUp();
- }
@Test
public void testGrowIssue() throws Exception {
@@ -65,5 +51,4 @@ public class JdbcGrowIssueTest extends C
int length = data.getIn().getBody(String.class).length();
assertEquals("Length should be 1024, was " + length, 1024, length);
}
-
-}
+}
\ No newline at end of file
Copied: camel/trunk/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcSpringAggregateRecoverWithRedeliveryPolicyTest.java (from r1073182, camel/trunk/components/camel-jdbc-aggregator/src/test/java/org/apache/camel/component/jdbc/aggregationrepository/JdbcSpringAggregateRecoverWithRedeliveryPolicyTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcSpringAggregateRecoverWithRedeliveryPolicyTest.java?p2=camel/trunk/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcSpringAggregateRecoverWithRedeliveryPolicyTest.java&p1=camel/trunk/components/camel-jdbc-aggregator/src/test/java/org/apache/camel/component/jdbc/aggregationrepository/JdbcSpringAggregateRecoverWithRedeliveryPolicyTest.java&r1=1073182&r2=1073186&rev=1073186&view=diff
==============================================================================
--- camel/trunk/components/camel-jdbc-aggregator/src/test/java/org/apache/camel/component/jdbc/aggregationrepository/JdbcSpringAggregateRecoverWithRedeliveryPolicyTest.java (original)
+++ camel/trunk/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcSpringAggregateRecoverWithRedeliveryPolicyTest.java Mon Feb 21 23:27:38 2011
@@ -14,14 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.jdbc.aggregationrepository;
+package org.apache.camel.processor.aggregate.jdbc;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
-import org.apache.camel.processor.aggregate.AggregationStrategy;
import org.apache.camel.test.junit4.CamelSpringTestSupport;
import org.junit.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
@@ -33,7 +32,7 @@ public class JdbcSpringAggregateRecoverW
@Override
protected AbstractXmlApplicationContext createApplicationContext() {
- return new ClassPathXmlApplicationContext("org/apache/camel/component/jdbc/aggregationrepository/JdbcSpringAggregateRecoverWithRedeliveryPolicyTest.xml");
+ return new ClassPathXmlApplicationContext("org/apache/camel/processor/aggregate/jdbc/JdbcSpringAggregateRecoverWithRedeliveryPolicyTest.xml");
}
@Test
@@ -67,18 +66,4 @@ public class JdbcSpringAggregateRecoverW
}
}
}
-
- public static class MyAggregationStrategy implements AggregationStrategy {
-
- public Exchange aggregate(Exchange oldExchange, Exchange newExchange) {
- if (oldExchange == null) {
- return newExchange;
- }
- String body1 = oldExchange.getIn().getBody(String.class);
- String body2 = newExchange.getIn().getBody(String.class);
-
- oldExchange.getIn().setBody(body1 + body2);
- return oldExchange;
- }
- }
}
\ No newline at end of file
Copied: camel/trunk/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcSpringAggregateTest.java (from r1073182, camel/trunk/components/camel-jdbc-aggregator/src/test/java/org/apache/camel/component/jdbc/aggregationrepository/JdbcSpringAggregateTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcSpringAggregateTest.java?p2=camel/trunk/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcSpringAggregateTest.java&p1=camel/trunk/components/camel-jdbc-aggregator/src/test/java/org/apache/camel/component/jdbc/aggregationrepository/JdbcSpringAggregateTest.java&r1=1073182&r2=1073186&rev=1073186&view=diff
==============================================================================
--- camel/trunk/components/camel-jdbc-aggregator/src/test/java/org/apache/camel/component/jdbc/aggregationrepository/JdbcSpringAggregateTest.java (original)
+++ camel/trunk/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcSpringAggregateTest.java Mon Feb 21 23:27:38 2011
@@ -14,13 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.jdbc.aggregationrepository;
+package org.apache.camel.processor.aggregate.jdbc;
import java.util.concurrent.TimeUnit;
-import org.apache.camel.Exchange;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.processor.aggregate.AggregationStrategy;
import org.apache.camel.test.junit4.CamelSpringTestSupport;
import org.junit.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
@@ -30,7 +28,7 @@ public class JdbcSpringAggregateTest ext
@Override
protected AbstractXmlApplicationContext createApplicationContext() {
- return new ClassPathXmlApplicationContext("org/apache/camel/component/jdbc/aggregationrepository/JdbcSpringAggregateTest.xml");
+ return new ClassPathXmlApplicationContext("org/apache/camel/processor/aggregate/jdbc/JdbcSpringAggregateTest.xml");
}
@Test
@@ -46,19 +44,4 @@ public class JdbcSpringAggregateTest ext
assertMockEndpointsSatisfied(30, TimeUnit.SECONDS);
}
-
- public static class MyAggregationStrategy implements AggregationStrategy {
-
- public Exchange aggregate(Exchange oldExchange, Exchange newExchange) {
- if (oldExchange == null) {
- return newExchange;
- }
- String body1 = oldExchange.getIn().getBody(String.class);
- String body2 = newExchange.getIn().getBody(String.class);
-
- oldExchange.getIn().setBody(body1 + body2);
- return oldExchange;
- }
- }
-
}
\ No newline at end of file
Copied: camel/trunk/components/camel-sql/src/test/resources/jndi.properties (from r1073182, camel/trunk/components/camel-jdbc-aggregator/src/test/resources/jndi.properties)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sql/src/test/resources/jndi.properties?p2=camel/trunk/components/camel-sql/src/test/resources/jndi.properties&p1=camel/trunk/components/camel-jdbc-aggregator/src/test/resources/jndi.properties&r1=1073182&r2=1073186&rev=1073186&view=diff
==============================================================================
(empty)
Copied: camel/trunk/components/camel-sql/src/test/resources/org/apache/camel/processor/aggregate/jdbc/JdbcSpringAggregateRecoverWithRedeliveryPolicyTest.xml (from r1073182, camel/trunk/components/camel-jdbc-aggregator/src/test/resources/org/apache/camel/component/jdbc/aggregationrepository/JdbcSpringAggregateRecoverWithRedeliveryPolicyTest.xml)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sql/src/test/resources/org/apache/camel/processor/aggregate/jdbc/JdbcSpringAggregateRecoverWithRedeliveryPolicyTest.xml?p2=camel/trunk/components/camel-sql/src/test/resources/org/apache/camel/processor/aggregate/jdbc/JdbcSpringAggregateRecoverWithRedeliveryPolicyTest.xml&p1=camel/trunk/components/camel-jdbc-aggregator/src/test/resources/org/apache/camel/component/jdbc/aggregationrepository/JdbcSpringAggregateRecoverWithRedeliveryPolicyTest.xml&r1=1073182&r2=1073186&rev=1073186&view=diff
==============================================================================
--- camel/trunk/components/camel-jdbc-aggregator/src/test/resources/org/apache/camel/component/jdbc/aggregationrepository/JdbcSpringAggregateRecoverWithRedeliveryPolicyTest.xml (original)
+++ camel/trunk/components/camel-sql/src/test/resources/org/apache/camel/processor/aggregate/jdbc/JdbcSpringAggregateRecoverWithRedeliveryPolicyTest.xml Mon Feb 21 23:27:38 2011
@@ -37,10 +37,10 @@
</bean>
<!-- aggregate the messages using this strategy -->
- <bean id="myAggregatorStrategy" class="org.apache.camel.component.jdbc.aggregationrepository.JdbcSpringAggregateRecoverWithRedeliveryPolicyTest$MyAggregationStrategy"/>
+ <bean id="myAggregatorStrategy" class="org.apache.camel.processor.aggregate.jdbc.AbstractJdbcAggregationTestSupport$MyAggregationStrategy"/>
<!-- and use this processor to simulate errors -->
- <bean id="myFailProcessor" class="org.apache.camel.component.jdbc.aggregationrepository.JdbcSpringAggregateRecoverWithRedeliveryPolicyTest$MyFailProcessor"/>
+ <bean id="myFailProcessor" class="org.apache.camel.processor.aggregate.jdbc.JdbcSpringAggregateRecoverWithRedeliveryPolicyTest$MyFailProcessor"/>
<camelContext id="camel" xmlns="http://camel.apache.org/schema/spring" trace="true">
<route>
Copied: camel/trunk/components/camel-sql/src/test/resources/org/apache/camel/processor/aggregate/jdbc/JdbcSpringAggregateTest.xml (from r1073182, camel/trunk/components/camel-jdbc-aggregator/src/test/resources/org/apache/camel/component/jdbc/aggregationrepository/JdbcSpringAggregateTest.xml)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sql/src/test/resources/org/apache/camel/processor/aggregate/jdbc/JdbcSpringAggregateTest.xml?p2=camel/trunk/components/camel-sql/src/test/resources/org/apache/camel/processor/aggregate/jdbc/JdbcSpringAggregateTest.xml&p1=camel/trunk/components/camel-jdbc-aggregator/src/test/resources/org/apache/camel/component/jdbc/aggregationrepository/JdbcSpringAggregateTest.xml&r1=1073182&r2=1073186&rev=1073186&view=diff
==============================================================================
--- camel/trunk/components/camel-jdbc-aggregator/src/test/resources/org/apache/camel/component/jdbc/aggregationrepository/JdbcSpringAggregateTest.xml (original)
+++ camel/trunk/components/camel-sql/src/test/resources/org/apache/camel/processor/aggregate/jdbc/JdbcSpringAggregateTest.xml Mon Feb 21 23:27:38 2011
@@ -30,7 +30,7 @@
<import resource="JdbcSpringDataSource.xml" />
<!-- aggregate the messages using this strategy -->
- <bean id="myAggregatorStrategy" class="org.apache.camel.component.jdbc.aggregationrepository.JdbcSpringAggregateTest$MyAggregationStrategy"/>
+ <bean id="myAggregatorStrategy" class="org.apache.camel.processor.aggregate.jdbc.AbstractJdbcAggregationTestSupport$MyAggregationStrategy"/>
<camelContext id="camel" xmlns="http://camel.apache.org/schema/spring" trace="true">
<route>
Copied: camel/trunk/components/camel-sql/src/test/resources/org/apache/camel/processor/aggregate/jdbc/JdbcSpringDataSource.xml (from r1073182, camel/trunk/components/camel-jdbc-aggregator/src/test/resources/org/apache/camel/component/jdbc/aggregationrepository/JdbcSpringDataSource.xml)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sql/src/test/resources/org/apache/camel/processor/aggregate/jdbc/JdbcSpringDataSource.xml?p2=camel/trunk/components/camel-sql/src/test/resources/org/apache/camel/processor/aggregate/jdbc/JdbcSpringDataSource.xml&p1=camel/trunk/components/camel-jdbc-aggregator/src/test/resources/org/apache/camel/component/jdbc/aggregationrepository/JdbcSpringDataSource.xml&r1=1073182&r2=1073186&rev=1073186&view=diff
==============================================================================
--- camel/trunk/components/camel-jdbc-aggregator/src/test/resources/org/apache/camel/component/jdbc/aggregationrepository/JdbcSpringDataSource.xml (original)
+++ camel/trunk/components/camel-sql/src/test/resources/org/apache/camel/processor/aggregate/jdbc/JdbcSpringDataSource.xml Mon Feb 21 23:27:38 2011
@@ -44,13 +44,13 @@
<jdbc:script location="classpath:/sql/init2.sql"/>
</jdbc:embedded-database>
- <bean id="repo1" class="org.apache.camel.component.jdbc.aggregationrepository.JdbcAggregationRepository">
+ <bean id="repo1" class="org.apache.camel.processor.aggregate.jdbc.JdbcAggregationRepository">
<property name="repositoryName" value="aggregationRepo1" />
<property name="transactionManager" ref="txManager1" />
<property name="dataSource" ref="dataSource1" />
</bean>
- <bean id="repo2" class="org.apache.camel.component.jdbc.aggregationrepository.JdbcAggregationRepository">
+ <bean id="repo2" class="org.apache.camel.processor.aggregate.jdbc.JdbcAggregationRepository">
<property name="repositoryName" value="aggregationRepo2" />
<property name="transactionManager" ref="txManager2" />
<property name="dataSource" ref="dataSource2" />
Copied: camel/trunk/components/camel-sql/src/test/resources/sql/init.sql (from r1073182, camel/trunk/components/camel-jdbc-aggregator/src/test/resources/sql/init.sql)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sql/src/test/resources/sql/init.sql?p2=camel/trunk/components/camel-sql/src/test/resources/sql/init.sql&p1=camel/trunk/components/camel-jdbc-aggregator/src/test/resources/sql/init.sql&r1=1073182&r2=1073186&rev=1073186&view=diff
==============================================================================
(empty)
Copied: camel/trunk/components/camel-sql/src/test/resources/sql/init2.sql (from r1073182, camel/trunk/components/camel-jdbc-aggregator/src/test/resources/sql/init2.sql)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sql/src/test/resources/sql/init2.sql?p2=camel/trunk/components/camel-sql/src/test/resources/sql/init2.sql&p1=camel/trunk/components/camel-jdbc-aggregator/src/test/resources/sql/init2.sql&r1=1073182&r2=1073186&rev=1073186&view=diff
==============================================================================
(empty)
Modified: camel/trunk/components/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/pom.xml?rev=1073186&r1=1073185&r2=1073186&view=diff
==============================================================================
--- camel/trunk/components/pom.xml (original)
+++ camel/trunk/components/pom.xml Mon Feb 21 23:27:38 2011
@@ -69,7 +69,6 @@
<module>camel-jaxb</module>
<module>camel-jibx</module>
<module>camel-jdbc</module>
- <module>camel-jdbc-aggregator</module>
<module>camel-jetty</module>
<module>camel-jing</module>
<module>camel-jms</module>
Modified: camel/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1073186&r1=1073185&r2=1073186&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Mon Feb 21 23:27:38 2011
@@ -414,11 +414,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-jdbc-aggregator</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-jetty</artifactId>
<version>${project.version}</version>
</dependency>
Modified: camel/trunk/platforms/karaf/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features.xml?rev=1073186&r1=1073185&r2=1073186&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml (original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Mon Feb 21 23:27:38 2011
@@ -390,13 +390,6 @@
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-jdbc/${pom.version}</bundle>
</feature>
- <feature name='camel-jdbc-aggregator' version='${pom.version}'>
- <bundle>mvn:org.springframework/spring-core/${spring-version}</bundle>
- <bundle>mvn:org.springframework/spring-tx/${spring-version}</bundle>
- <feature version='${pom.version}'>camel-core</feature>
- <bundle>mvn:org.springframework/spring-jdbc/${spring-version}</bundle>
- <bundle>mvn:org.apache.camel/camel-jdbc-aggregator/${pom.version}</bundle>
- </feature>
<feature name='camel-josql' version='${pom.version}'>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.josql/${josql-bundle-version}</bundle>
<feature version='${pom.version}'>camel-core</feature>