camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r1227550 - in /camel/trunk: apache-camel/pom.xml apache-camel/src/main/descriptors/common-bin.xml components/camel-twitter/pom.xml components/camel-twitter/src/main/resources/META-INF/services/org/apache/camel/TypeConverter parent/pom.xml
Date Thu, 05 Jan 2012 10:47:56 GMT
Author: ningjiang
Date: Thu Jan  5 10:47:56 2012
New Revision: 1227550

URL: http://svn.apache.org/viewvc?rev=1227550&view=rev
Log:
CAMEL-4017 clean up the code and added camel-twitter into the kit

Modified:
    camel/trunk/apache-camel/pom.xml
    camel/trunk/apache-camel/src/main/descriptors/common-bin.xml
    camel/trunk/components/camel-twitter/pom.xml
    camel/trunk/components/camel-twitter/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
    camel/trunk/parent/pom.xml

Modified: camel/trunk/apache-camel/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/apache-camel/pom.xml?rev=1227550&r1=1227549&r2=1227550&view=diff
==============================================================================
--- camel/trunk/apache-camel/pom.xml (original)
+++ camel/trunk/apache-camel/pom.xml Thu Jan  5 10:47:56 2012
@@ -451,6 +451,10 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
+      <artifactId>camel-twitter</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.camel</groupId>
       <artifactId>camel-test</artifactId>
     </dependency>    
     <dependency>

Modified: camel/trunk/apache-camel/src/main/descriptors/common-bin.xml
URL: http://svn.apache.org/viewvc/camel/trunk/apache-camel/src/main/descriptors/common-bin.xml?rev=1227550&r1=1227549&r2=1227550&view=diff
==============================================================================
--- camel/trunk/apache-camel/src/main/descriptors/common-bin.xml (original)
+++ camel/trunk/apache-camel/src/main/descriptors/common-bin.xml Thu Jan  5 10:47:56 2012
@@ -134,6 +134,7 @@
         <include>org.apache.camel:camel-test</include>
         <include>org.apache.camel:camel-testng</include>
         <include>org.apache.camel:camel-tagsoup</include>
+        <include>org.apache.camel:camel-twitter</include>
         <include>org.apache.camel:camel-velocity</include>
         <include>org.apache.camel:camel-xmlbeans</include>
         <include>org.apache.camel:camel-xmlsecurity</include>

Modified: camel/trunk/components/camel-twitter/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-twitter/pom.xml?rev=1227550&r1=1227549&r2=1227550&view=diff
==============================================================================
--- camel/trunk/components/camel-twitter/pom.xml (original)
+++ camel/trunk/components/camel-twitter/pom.xml Thu Jan  5 10:47:56 2012
@@ -47,25 +47,12 @@
       <dependency>
          <groupId>org.twitter4j</groupId>
          <artifactId>twitter4j-core</artifactId>
-         <version>2.2.5</version>
+         <version>${twitter4j-version}</version>
       </dependency>
       <dependency>
          <groupId>org.twitter4j</groupId>
          <artifactId>twitter4j-stream</artifactId>
-         <version>2.2.5</version>
-      </dependency>
-      <!-- to allow Spring annotations (jmx) to be tested -->
-      <dependency>
-         <groupId>org.springframework</groupId>
-         <artifactId>spring-context</artifactId>
-         <optional>true</optional>
-         <scope>test</scope>
-      </dependency>
-      <dependency>
-         <groupId>org.springframework</groupId>
-         <artifactId>spring-aop</artifactId>
-         <optional>true</optional>
-         <scope>test</scope>
+         <version>${twitter4j-version}</version>
       </dependency>
       <!-- testing -->
       <dependency>

Modified: camel/trunk/components/camel-twitter/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-twitter/src/main/resources/META-INF/services/org/apache/camel/TypeConverter?rev=1227550&r1=1227549&r2=1227550&view=diff
==============================================================================
--- camel/trunk/components/camel-twitter/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
(original)
+++ camel/trunk/components/camel-twitter/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
Thu Jan  5 10:47:56 2012
@@ -1 +1,18 @@
-org.apache.camel.component.twitter
\ No newline at end of file
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+org.apache.camel.component.twitter.util.TwitterConverter
\ No newline at end of file

Modified: camel/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1227550&r1=1227549&r2=1227550&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Thu Jan  5 10:47:56 2012
@@ -156,6 +156,7 @@
     <stringtemplate-version>3.0</stringtemplate-version>
     <tagsoup-version>1.2.1</tagsoup-version>
     <testng-version>6.0.1</testng-version>
+    <twitter4j-version>2.2.5</twitter4j-version>
     <velocity-version>1.7</velocity-version>
     <woodstox-version>4.1.1</woodstox-version>
     <xbean-spring-version>3.5</xbean-spring-version>
@@ -736,6 +737,11 @@
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
+        <artifactId>camel-twitter</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.camel</groupId>
         <artifactId>camel-test</artifactId>
         <version>${project.version}</version>
       </dependency>



Mime
View raw message