ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ra...@apache.org
Subject [2/3] ignite git commit: IGNITE-1270 OSGify ignite-{camel, flume, schedule, twitter}.
Date Tue, 24 Nov 2015 19:32:20 GMT
IGNITE-1270 OSGify ignite-{camel,flume,schedule,twitter}.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3642f99c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3642f99c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3642f99c

Branch: refs/heads/ignite-1270
Commit: 3642f99c7fda74dd7c1ef256e4bb24ef81190e32
Parents: be586d7
Author: Raul Kripalani <raulk@apache.org>
Authored: Tue Nov 24 19:31:00 2015 +0000
Committer: Raul Kripalani <raulk@apache.org>
Committed: Tue Nov 24 19:31:00 2015 +0000

----------------------------------------------------------------------
 modules/camel/pom.xml                           | 11 +++-
 modules/flume/pom.xml                           | 16 +++--
 .../osgi-karaf/src/main/resources/features.xml  | 61 +++++++++++++++++---
 modules/osgi/pom.xml                            |  4 ++
 .../IgniteKarafFeaturesInstallationTest.java    | 17 +++++-
 modules/schedule/pom.xml                        | 25 +++++++-
 modules/twitter/pom.xml                         | 12 +++-
 parent/pom.xml                                  |  5 ++
 8 files changed, 134 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/3642f99c/modules/camel/pom.xml
----------------------------------------------------------------------
diff --git a/modules/camel/pom.xml b/modules/camel/pom.xml
index 60f0597..693dd85 100644
--- a/modules/camel/pom.xml
+++ b/modules/camel/pom.xml
@@ -36,7 +36,6 @@
     <url>http://ignite.apache.org</url>
 
     <properties>
-        <camel.version>2.16.0</camel.version>
         <guava.version>18.0</guava.version>
         <okhttp.version>2.5.0</okhttp.version>
     </properties>
@@ -99,4 +98,14 @@
 
     </dependencies>
 
+    <build>
+        <plugins>
+            <!-- Generate the OSGi MANIFEST.MF for this bundle. -->
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

http://git-wip-us.apache.org/repos/asf/ignite/blob/3642f99c/modules/flume/pom.xml
----------------------------------------------------------------------
diff --git a/modules/flume/pom.xml b/modules/flume/pom.xml
index cd4ee98..cab8e7e 100644
--- a/modules/flume/pom.xml
+++ b/modules/flume/pom.xml
@@ -35,10 +35,6 @@
     <version>1.5.0-SNAPSHOT</version>
     <url>http://ignite.apache.org</url>
 
-    <properties>
-        <flume-ng.version>1.6.0</flume-ng.version>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.apache.ignite</groupId>
@@ -49,7 +45,7 @@
         <dependency>
             <groupId>org.apache.flume</groupId>
             <artifactId>flume-ng-core</artifactId>
-            <version>${flume-ng.version}</version>
+            <version>${flume.ng.version}</version>
         </dependency>
 
         <dependency>
@@ -74,4 +70,14 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <!-- Generate the OSGi MANIFEST.MF for this bundle. -->
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
 </project>

http://git-wip-us.apache.org/repos/asf/ignite/blob/3642f99c/modules/osgi-karaf/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/modules/osgi-karaf/src/main/resources/features.xml b/modules/osgi-karaf/src/main/resources/features.xml
index 2a9987d..38b79b6 100644
--- a/modules/osgi-karaf/src/main/resources/features.xml
+++ b/modules/osgi-karaf/src/main/resources/features.xml
@@ -30,6 +30,8 @@
         <feature>ignite-core</feature>
         <feature>ignite-aop</feature>
         <feature>ignite-aws</feature>
+        <feature>ignite-camel</feature>
+        <feature>ignite-flume</feature>
         <feature>ignite-indexing</feature>
         <feature>ignite-hibernate</feature>
         <feature>ignite-jcl</feature>
@@ -41,8 +43,10 @@
         <feature>ignite-log4j</feature>-->
         <feature>ignite-rest-http</feature>
         <feature>ignite-scalar-2.11</feature>
+        <feature>ignite-schedule</feature>
         <feature>ignite-spring</feature>
         <feature>ignite-ssh</feature>
+        <feature>ignite-twitter</feature>
         <feature>ignite-urideploy</feature>
         <feature>ignite-web</feature>
         <feature>ignite-zookeeper</feature>
@@ -72,16 +76,27 @@
         <bundle start="true">mvn:org.apache.ignite/ignite-aws/${project.version}</bundle>
     </feature>
 
-    <feature name="ignite-indexing" version="${project.version}" description="Apache Ignite
:: Indexing">
+    <feature name="ignite-camel" version="${project.version}" description="Apache Ignite
:: Camel">
         <details>
-            <![CDATA[The Apache Ignite Indexing module + dependencies. This module is
a fragment of ignite-core. 
+            <![CDATA[The Apache Ignite Camel module.
+
+            Make sure to install the Apache Camel feature repository before installing this
feature.
+
+                mvn:org.apache.camel.karaf/apache-camel/\${camel.version}/xml/features
             
-            Be sure to refresh ignite-core manually in case it is not refreshed automatically.]]>
+            Installing this feature will trigger the installation of the 'camel-core' feature
from the Camel repository.]]>
         </details>
-        <bundle start="true" dependency="true">mvn:org.osgi/org.osgi.enterprise/${osgi.enterprise.version}</bundle>
-        <bundle start="true" dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.lucene/${lucene.bundle.version}</bundle>
-        <bundle start="true" dependency="true">mvn:com.h2database/h2/${h2.version}</bundle>
-        <bundle start="false">mvn:org.apache.ignite/ignite-indexing/${project.version}</bundle>
+        <feature>camel-core</feature>
+        <bundle start="true">mvn:org.apache.ignite/ignite-camel/${project.version}</bundle>
+    </feature>
+
+    <feature name="ignite-flume" version="${project.version}" description="Apache Ignite
:: Flume">
+        <details>
+            <![CDATA[The Apache Ignite Flume module + dependencies.]]>
+        </details>
+        <feature prerequisite="true">wrap</feature>
+        <bundle start="true" dependency="true">wrap:mvn:org.apache.flume/flume-ng-core/${flume.ng.version}$Bundle-SymbolicName=flume-ng-core&amp;Bundle-Version=${flume.ng.version}</bundle>
+        <bundle start="true">mvn:org.apache.ignite/ignite-flume/${project.version}</bundle>
     </feature>
 
     <feature name="ignite-hibernate" version="${project.version}" description="Apache
Ignite :: Hibernate">
@@ -94,6 +109,18 @@
         <bundle start="true">mvn:org.apache.ignite/ignite-hibernate/${project.version}</bundle>
     </feature>
 
+    <feature name="ignite-indexing" version="${project.version}" description="Apache Ignite
:: Indexing">
+        <details>
+            <![CDATA[The Apache Ignite Indexing module + dependencies. This module is
a fragment of ignite-core. 
+            
+            Be sure to refresh ignite-core manually in case it is not refreshed automatically.]]>
+        </details>
+        <bundle start="true" dependency="true">mvn:org.osgi/org.osgi.enterprise/${osgi.enterprise.version}</bundle>
+        <bundle start="true" dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.lucene/${lucene.bundle.version}</bundle>
+        <bundle start="true" dependency="true">mvn:com.h2database/h2/${h2.version}</bundle>
+        <bundle start="false">mvn:org.apache.ignite/ignite-indexing/${project.version}</bundle>
+    </feature>
+
     <feature name="ignite-jcl" version="${project.version}" description="Apache Ignite
:: JCL">
         <details>
             <![CDATA[The Apache Ignite JCL integration module. In Apache Karaf, this module
will integrate with Pax Logging.]]>
@@ -196,6 +223,15 @@
         <bundle start="true">mvn:org.apache.ignite/ignite-scalar_2.10/${project.version}</bundle>
     </feature>
 
+    <feature name="ignite-schedule" version="${project.version}" description="Apache Ignite
:: Schedule">
+        <details>
+            <![CDATA[The Apache Ignite Schedule module + dependencies. This module is
a fragment of ignite-core.]]>
+        </details>
+        <feature prerequisite="true">wrap</feature>
+        <bundle start="true" dependency="true">wrap:mvn:it.sauronsoftware.cron4j/cron4j/${cron4j.version}$Bundle-SymbolicName=cron4j&amp;Bundle-Version=${cron4j.version}</bundle>
+        <bundle start="true">mvn:org.apache.ignite/ignite-schedule/${project.version}</bundle>
+    </feature>
+
     <feature name="ignite-spring" version="${project.version}" description="Apache Ignite
:: Spring Support">
         <details>
             <![CDATA[The Apache Ignite Spring integration module + dependencies. This
module is a fragment of ignite-core. 
@@ -225,6 +261,17 @@
         <bundle start="true">mvn:org.apache.ignite/ignite-ssh/${project.version}</bundle>
     </feature>
 
+    <feature name="ignite-twitter" version="${project.version}" description="Apache Ignite
:: Twitter">
+        <details>
+            <![CDATA[The Apache Ignite Twitter module + dependencies.]]>
+        </details>
+        <feature prerequisite="true">wrap</feature>
+        <bundle start="true" dependency="true">mvn:com.google.guava/guava/${guava14.version}</bundle>
+        <bundle start="true" dependency="true">wrap:mvn:com.twitter/hbc-core/${twitter.hbc.version}$Bundle-SymbolicName=Hosebird
Client Core&amp;Bundle-Version=${twitter.hbc.version}</bundle>
+        <bundle start="true" dependency="true">wrap:mvn:com.twitter/hbc-twitter4j/${twitter.hbc.version}$Bundle-SymbolicName=Hosebird
Client Twitter4J&amp;Bundle-Version=${twitter.hbc.version}</bundle>
+        <bundle start="true">mvn:org.apache.ignite/ignite-twitter/${project.version}</bundle>
+    </feature>
+
     <feature name="ignite-urideploy" version="${project.version}" description="Apache
Ignite :: URI Deploy">
         <details>
             <![CDATA[The Apache Ignite URI Deploy module + dependencies.

http://git-wip-us.apache.org/repos/asf/ignite/blob/3642f99c/modules/osgi/pom.xml
----------------------------------------------------------------------
diff --git a/modules/osgi/pom.xml b/modules/osgi/pom.xml
index 336ba20..d6d46bf 100644
--- a/modules/osgi/pom.xml
+++ b/modules/osgi/pom.xml
@@ -157,6 +157,10 @@
                             <name>projectVersion</name>
                             <value>${project.version}</value>
                         </property>
+                        <property>
+                            <name>camelVersion</name>
+                            <value>${camel.version}</value>
+                        </property>
                     </systemProperties>
                 </configuration>
             </plugin>

http://git-wip-us.apache.org/repos/asf/ignite/blob/3642f99c/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteKarafFeaturesInstallationTest.java
----------------------------------------------------------------------
diff --git a/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteKarafFeaturesInstallationTest.java
b/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteKarafFeaturesInstallationTest.java
index 5365938..305aa2c 100644
--- a/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteKarafFeaturesInstallationTest.java
+++ b/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteKarafFeaturesInstallationTest.java
@@ -17,6 +17,7 @@
 
 package org.apache.ignite.osgi;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -24,7 +25,9 @@ import org.apache.karaf.features.Feature;
 
 import org.junit.Test;
 import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.CoreOptions;
 import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.karaf.options.KarafDistributionOption;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.Constants;
 
@@ -37,6 +40,12 @@ import static org.junit.Assert.assertTrue;
  */
 public class IgniteKarafFeaturesInstallationTest extends AbstractIgniteKarafTest {
 
+    /** Number of features expected to exist. */
+    private static final int EXPECTED_FEATURES = 24;
+
+    private static final String CAMEL_REPO_URI = "mvn:org.apache.camel.karaf/apache-camel/"
+
+        System.getProperty("camelVersion") + "/xml/features";
+
     /**
      * Container configuration.
      *
@@ -44,7 +53,11 @@ public class IgniteKarafFeaturesInstallationTest extends AbstractIgniteKarafTest
      */
     @Configuration
     public Option[] config() {
-        return baseConfig();
+        List<Option> options = new ArrayList<>(Arrays.asList(baseConfig()));
+
+        options.add(KarafDistributionOption.features(CAMEL_REPO_URI));
+
+        return CoreOptions.options(options.toArray(new Option[0]));
     }
 
     /**
@@ -65,7 +78,7 @@ public class IgniteKarafFeaturesInstallationTest extends AbstractIgniteKarafTest
         Feature[] features = featuresSvc.getFeatures(IGNITE_FEATURES_NAME_REGEX);
 
         assertNotNull(features);
-        assertEquals(20, features.length);
+        assertEquals(24, features.length);
 
         for (Feature f : features) {
             if (IGNORED_FEATURES.contains(f.getName()))

http://git-wip-us.apache.org/repos/asf/ignite/blob/3642f99c/modules/schedule/pom.xml
----------------------------------------------------------------------
diff --git a/modules/schedule/pom.xml b/modules/schedule/pom.xml
index 3f53df6..9657a79 100644
--- a/modules/schedule/pom.xml
+++ b/modules/schedule/pom.xml
@@ -34,6 +34,13 @@
     <version>1.5.0-SNAPSHOT</version>
     <url>http://ignite.apache.org</url>
 
+    <properties>
+        <osgi.export.package>
+            org.apache.ignite.internal.processors.schedule,
+            {local-packages}
+        </osgi.export.package>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.apache.ignite</groupId>
@@ -44,7 +51,7 @@
         <dependency>
             <groupId>it.sauronsoftware.cron4j</groupId>
             <artifactId>cron4j</artifactId>
-            <version>2.2.5</version>
+            <version>${cron4j.version}</version>
         </dependency>
 
         <dependency>
@@ -75,4 +82,20 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <!-- Generate the OSGi MANIFEST.MF for this fragment. It is a fragment because
it contains internal processors 
+                 that would be looked up by ignite-core. -->
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Fragment-Host>org.apache.ignite.ignite-core</Fragment-Host>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

http://git-wip-us.apache.org/repos/asf/ignite/blob/3642f99c/modules/twitter/pom.xml
----------------------------------------------------------------------
diff --git a/modules/twitter/pom.xml b/modules/twitter/pom.xml
index 6c02935..6cbc5de 100644
--- a/modules/twitter/pom.xml
+++ b/modules/twitter/pom.xml
@@ -66,7 +66,7 @@
         <dependency>
             <groupId>com.twitter</groupId>
             <artifactId>hbc-twitter4j</artifactId>
-            <version>2.2.0</version>
+            <version>${twitter.hbc.version}</version>
         </dependency>
 
         <dependency>
@@ -119,4 +119,14 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <!-- Generate the OSGi MANIFEST.MF for this bundle. -->
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
 </project>

http://git-wip-us.apache.org/repos/asf/ignite/blob/3642f99c/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 0feef32..0697cfe 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -52,17 +52,21 @@
         <aspectj.bundle.version>1.7.2_1</aspectj.bundle.version>
         <aws.sdk.version>1.10.29</aws.sdk.version>
         <aws.sdk.bundle.version>1.10.12_1</aws.sdk.bundle.version>
+        <camel.version>2.16.0</camel.version>
         <commons.beanutils.version>1.8.3</commons.beanutils.version>
         <commons.beanutils.bundle.version>1.8.3_1</commons.beanutils.bundle.version>
         <commons.codec.version>1.6</commons.codec.version>
         <commons.collections.version>3.2.1</commons.collections.version>
         <commons.lang.version>2.6</commons.lang.version>
+        <cron4j.version>2.2.5</cron4j.version>
         <curator.version>2.9.1</curator.version>
         <ezmorph.version>1.0.6</ezmorph.version>
         <ezmorph.bundle.version>1.0.6_1</ezmorph.bundle.version>
+        <flume.ng.version>1.6.0</flume.ng.version>
         <guava.retrying.version>2.0.0</guava.retrying.version>
         <guava.version>18.0</guava.version>
         <guava16.version>16.0.1</guava16.version>
+        <guava14.version>14.0.1</guava14.version>
         <h2.version>1.3.175</h2.version>
         <hadoop.version>2.4.1</hadoop.version>
         <httpclient.version>4.5.1</httpclient.version>
@@ -98,6 +102,7 @@
         <spring41.osgi.feature.version>4.1.7.RELEASE_1</spring41.osgi.feature.version>
         <spring.version>4.1.0.RELEASE</spring.version>
         <tomcat.version>8.0.23</tomcat.version>
+        <twitter.hbc.version>2.2.0</twitter.hbc.version>
         <yammer.metrics.annotation.version>2.2.0</yammer.metrics.annotation.version>
         <yammer.metrics.core.version>2.2.0</yammer.metrics.core.version>
         <zkclient.version>0.5</zkclient.version>


Mime
View raw message