svn commit: r660882 - in /activemq/camel/trunk/components/camel-spring-integration: pom.xml src/main/java/org/apache/camel/component/spring/integration/adapter/CamelSourceAdapter.java

[ni...@apache.org]

Author: ningjiang
Date: Wed May 28 02:47:52 2008
New Revision: 660882

URL: http://svn.apache.org/viewvc?rev=660882&view=rev
Log:
CAMEL-554 upgraded the Spring Integration version to 1.0.0M4

Modified:
    activemq/camel/trunk/components/camel-spring-integration/pom.xml
    activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelSourceAdapter.java

Modified: activemq/camel/trunk/components/camel-spring-integration/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring-integration/pom.xml?rev=660882&r1=660881&r2=660882&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-spring-integration/pom.xml (original)
+++ activemq/camel/trunk/components/camel-spring-integration/pom.xml Wed May 28 02:47:52 2008
@@ -13,7 +13,7 @@
 
   <properties>
 	<camel.osgi.export.pkg>org.apache.camel.component.spring.integration.*</camel.osgi.export.pkg>
-    <spring-integration-version>1.0.0.CI-137</spring-integration-version>
+    <spring-integration-version>1.0.0.M4</spring-integration-version>
   </properties>
 
   <version>1.4-SNAPSHOT</version>
@@ -22,13 +22,19 @@
     <repository>
       <id>spring.maven.milestone</id>
       <name>Spring Milestone Maven Repo</name>
-      <url>http://s3.amazonaws.com/maven.springframework.org/milestone</url>
+      <url>http://repository.springsource.com/maven/bundles/milestone</url>
     </repository>
 
     <repository>
-      <id>spring.maven.snapshot</id>
-      <name>Spring Snapshot Maven Repo</name>
-      <url>http://s3.amazonaws.com/maven.springframework.org/snapshot</url>
+      <id>spring.maven.realse</id>
+      <name>Spring Release Maven Repo</name>
+      <url>http://repository.springsource.com/maven/bundles/release</url>
+    </repository>
+
+    <repository>
+      <id>com.springsource.repository.bundles.external</id>
+      <name>SpringSource Enterprise Bundle Repository - External Bundle Releases</name>
+      <url>http://repository.springsource.com/maven/bundles/external</url>
     </repository>
   </repositories>
 
@@ -76,7 +82,7 @@
     </dependency>
     <dependency>
       <groupId>org.springframework.integration</groupId>
-      <artifactId>spring-integration-core</artifactId>
+      <artifactId>org.springframework.integration</artifactId>
       <version>${spring-integration-version}</version>
       <exclusions>
         <exclusion>

Modified: activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelSourceAdapter.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelSourceAdapter.java?rev=660882&r1=660881&r2=660882&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelSourceAdapter.java (original)
+++ activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelSourceAdapter.java Wed May 28 02:47:52 2008
@@ -28,7 +28,7 @@
 import org.springframework.integration.bus.MessageBus;
 import org.springframework.integration.bus.MessageBusAware;
 import org.springframework.integration.channel.MessageChannel;
-import org.springframework.integration.channel.RequestReplyTemplate;
+import org.springframework.integration.gateway.RequestReplyTemplate;
 import org.springframework.integration.message.Message;
 
 /**