Author: iocanel
Date: Tue Jun 19 15:35:59 2012
New Revision: 1351744
URL: http://svn.apache.org/viewvc?rev=1351744&view=rev
Log:
[DIRECTMEMORY-91] Fixed directmemory-solr OSGi metadata. Added a feature for
directmemory-solr.
Modified:
incubator/directmemory/trunk/integrations/solr/pom.xml
incubator/directmemory/trunk/platforms/karaf/pom.xml
incubator/directmemory/trunk/platforms/karaf/src/main/resources/features.xml
incubator/directmemory/trunk/pom.xml
Modified: incubator/directmemory/trunk/integrations/solr/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/directmemory/trunk/integrations/solr/pom.xml?rev=1351744&r1=1351743&r2=1351744&view=diff
==============================================================================
--- incubator/directmemory/trunk/integrations/solr/pom.xml (original)
+++ incubator/directmemory/trunk/integrations/solr/pom.xml Tue Jun 19 15:35:59
2012
@@ -38,7 +38,7 @@ under the License.
org.apache.solr.*,
org.slf4j.*
</osgi.import>
-
<osgi.export>org.apache.directmemory.examples.*;version="${project.version}</osgi.export>
+
<osgi.export>org.apache.directmemory.solr.*;version="${project.version}</osgi.export>
</properties>
<build>
@@ -75,7 +75,6 @@ under the License.
<dependency>
<groupId>org.apache.solr</groupId>
<artifactId>solr-core</artifactId>
- <version>3.6.0</version>
</dependency>
<dependency>
@@ -98,7 +97,6 @@ under the License.
<dependency>
<groupId>org.apache.solr</groupId>
<artifactId>solr-test-framework</artifactId>
- <version>3.6.0</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: incubator/directmemory/trunk/platforms/karaf/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/directmemory/trunk/platforms/karaf/pom.xml?rev=1351744&r1=1351743&r2=1351744&view=diff
==============================================================================
--- incubator/directmemory/trunk/platforms/karaf/pom.xml (original)
+++ incubator/directmemory/trunk/platforms/karaf/pom.xml Tue Jun 19 15:35:59
2012
@@ -34,6 +34,13 @@
<name>Apache DirectMemory :: Platforms :: Karaf</name>
<description>${project.name}</description>
+ <properties>
+ <httpcore4-version>4.1.2</httpcore4-version>
+ <httpclient4-version>4.1.2</httpclient4-version>
+ <commons-codec-version>1.4</commons-codec-version>
+
<commons-httpclient-bundle-version>3.1_7</commons-httpclient-bundle-version>
+ </properties>
+
<build>
<plugins>
<plugin>
Modified:
incubator/directmemory/trunk/platforms/karaf/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/incubator/directmemory/trunk/platforms/karaf/src/main/resources/features.xml?rev=1351744&r1=1351743&r2=1351744&view=diff
==============================================================================
---
incubator/directmemory/trunk/platforms/karaf/src/main/resources/features.xml
(original)
+++
incubator/directmemory/trunk/platforms/karaf/src/main/resources/features.xml
Tue Jun 19 15:35:59 2012
@@ -36,12 +36,28 @@
<bundle>mvn:org.apache.directmemory/directmemory-cache/${project.version}</bundle>
</feature>
- <feature name='directmemory-ehcace' description='Apache DirectMemory -
EhCache' version='${project.version}' resolver='(obr)'>
- <feature version="${project.version}">directmemory</feature>
- <bundle dependency='true'>
-
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ehcache/${ehcache.bundle.version}
- </bundle>
-
<bundle>mvn:org.apache.directmemory/directmemory-ehcache/${project.version}</bundle>
+ <feature name='directmemory-ehcace' description='Apache DirectMemory -
EhCache' version='${project.version}'
+ resolver='(obr)'>
+ <feature version="${project.version}">directmemory</feature>
+ <bundle dependency='true'>
+
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ehcache/${ehcache.bundle.version}
+ </bundle>
+
<bundle>mvn:org.apache.directmemory/directmemory-ehcache/${project.version}</bundle>
+ </feature>
+
+ <feature name='directmemory-solr' description='Apache DirectMemory - Solr'
version='${project.version}'
+ resolver='(obr)'>
+ <feature version="${project.version}">directmemory</feature>
+ <bundle
dependency='true'>mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}</bundle>
+ <bundle
dependency='true'>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}</bundle>
+ <bundle
dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
+ <bundle dependency='true'>
+
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient-bundle-version}
+ </bundle>
+ <bundle dependency='true'>
+
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.solr-solrj/${solr.bundle.version}
+ </bundle>
+
<bundle>mvn:org.apache.directmemory/directmemory-solr/${project.version}</bundle>
</feature>
</features>
Modified: incubator/directmemory/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/directmemory/trunk/pom.xml?rev=1351744&r1=1351743&r2=1351744&view=diff
==============================================================================
--- incubator/directmemory/trunk/pom.xml (original)
+++ incubator/directmemory/trunk/pom.xml Tue Jun 19 15:35:59 2012
@@ -251,6 +251,8 @@ under the License.
<pax-exam.version>1.2.4</pax-exam.version>
<pax-tiny-bundle.version>1.3.1</pax-tiny-bundle.version>
<protostuff.version>1.0.5</protostuff.version>
+ <solr.version>3.6.0</solr.version>
+ <solr.bundle.version>3.6.0_1</solr.bundle.version>
<slf4j.version>1.6.4</slf4j.version>
<msgpack.version>0.6.5</msgpack.version>
<protobuf.version>2.4.1</protobuf.version>
@@ -632,6 +634,18 @@ under the License.
</dependency>
<dependency>
+ <groupId>org.apache.solr</groupId>
+ <artifactId>solr-core</artifactId>
+ <version>${solr.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.solr</groupId>
+ <artifactId>solr-test-framework</artifactId>
+ <version>${solr.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
