servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ff...@apache.org
Subject svn commit: r1227947 - in /servicemix/smx4/bundles/trunk: pom.xml twitter4j-2.2.5/ twitter4j-2.2.5/pom.xml twitter4j-2.2.5/src/main/resources/OSGI-INF/bundle.info twitter4j-core-2.2.5/
Date Fri, 06 Jan 2012 02:59:05 GMT
Author: ffang
Date: Fri Jan  6 02:59:05 2012
New Revision: 1227947

URL: http://svn.apache.org/viewvc?rev=1227947&view=rev
Log:
[SMX4-1032]add twitter4j bundle

Added:
    servicemix/smx4/bundles/trunk/twitter4j-2.2.5/
      - copied from r1227935, servicemix/smx4/bundles/trunk/twitter4j-core-2.2.5/
Removed:
    servicemix/smx4/bundles/trunk/twitter4j-core-2.2.5/
Modified:
    servicemix/smx4/bundles/trunk/pom.xml
    servicemix/smx4/bundles/trunk/twitter4j-2.2.5/pom.xml
    servicemix/smx4/bundles/trunk/twitter4j-2.2.5/src/main/resources/OSGI-INF/bundle.info

Modified: servicemix/smx4/bundles/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/pom.xml?rev=1227947&r1=1227946&r2=1227947&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/pom.xml Fri Jan  6 02:59:05 2012
@@ -46,7 +46,7 @@
       <module>jopt-simple-4.3</module>
       <module>not-yet-commons-ssl-0.3.11</module>
       <module>guava-11</module>
-      <module>twitter4j-core-2.2.5</module>
+      <module>twitter4j-2.2.5</module>
     </modules>
 
 </project>

Modified: servicemix/smx4/bundles/trunk/twitter4j-2.2.5/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/twitter4j-2.2.5/pom.xml?rev=1227947&r1=1227935&r2=1227947&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/twitter4j-2.2.5/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/twitter4j-2.2.5/pom.xml Fri Jan  6 02:59:05 2012
@@ -28,15 +28,14 @@
     </parent>
 
     <groupId>org.apache.servicemix.bundles</groupId>
-    <artifactId>org.apache.servicemix.bundles.twitter4j-core</artifactId>
+    <artifactId>org.apache.servicemix.bundles.twitter4j</artifactId>
     <version>2.2.5_1-SNAPSHOT</version>
     <packaging>bundle</packaging>
-    <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
-    <description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar file.</description>
+    <name>Apache ServiceMix :: Bundles :: twitter4j</name>
+    <description>This OSGi bundle wraps twitter4j-core and twitter-stream ${pkgVersion}
jar file.</description>
 
     <properties>
         <pkgGroupId>org.twitter4j</pkgGroupId>
-        <pkgArtifactId>twitter4j-core</pkgArtifactId>
         <pkgVersion>2.2.5</pkgVersion>
         <servicemix.osgi.export.pkg>
             twitter4j
@@ -51,7 +50,13 @@
     <dependencies>
         <dependency>
             <groupId>${pkgGroupId}</groupId>
-            <artifactId>${pkgArtifactId}</artifactId>
+            <artifactId>twitter4j-core</artifactId>
+            <version>${pkgVersion}</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>twitter4j-stream</artifactId>
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
@@ -71,12 +76,19 @@
                         <configuration>
                             <artifactSet>
                                 <includes>
-                                    <include>${pkgGroupId}:${pkgArtifactId}</include>
+                                    <include>${pkgGroupId}:twitter4j-core</include>
+                                    <include>${pkgGroupId}:twitter4j-stream</include>
                                 </includes>
                             </artifactSet>
                             <filters>
                                 <filter>
-                                    <artifact>${pkgGroupId}:${pkgArtifactId}</artifact>
+                                    <artifact>${pkgGroupId}:twitter4j-core</artifact>
+                                    <excludes>
+                                        <exclude>**</exclude>
+                                    </excludes>
+                                </filter>
+                                <filter>
+                                    <artifact>${pkgGroupId}:twitter4j-stream</artifact>
                                     <excludes>
                                         <exclude>**</exclude>
                                     </excludes>

Modified: servicemix/smx4/bundles/trunk/twitter4j-2.2.5/src/main/resources/OSGI-INF/bundle.info
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/twitter4j-2.2.5/src/main/resources/OSGI-INF/bundle.info?rev=1227947&r1=1227935&r2=1227947&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/twitter4j-2.2.5/src/main/resources/OSGI-INF/bundle.info
(original)
+++ servicemix/smx4/bundles/trunk/twitter4j-2.2.5/src/main/resources/OSGI-INF/bundle.info
Fri Jan  6 02:59:05 2012
@@ -2,7 +2,8 @@
     ${project.description}
 
     Original Maven URL:
-        \u001B[33mmvn:${pkgGroupId}/${pkgArtifactId}/${pkgVersion}\u001B[0m
+        \u001B[33mmvn:${pkgGroupId}/twitter4j-core\u001B[0m
+        \u001B[33mmvn:${pkgGroupId}/twitter4j-stream\u001B[0m
 
 \u001B[1mDESCRIPTION\u001B[0m
     Twitter4J is an unofficial Java library for the Twitter API.



Mime
View raw message