Author: jbonofre
Date: Sat Aug 4 18:19:26 2012
New Revision: 1369384
URL: http://svn.apache.org/viewvc?rev=1369384&view=rev
Log:
[MRM-1651] Complete Karaf features
Modified:
archiva/redback/redback-components/trunk/redback-components-parent/pom.xml
archiva/redback/redback-components/trunk/redback-features/pom.xml
archiva/redback/redback-components/trunk/redback-features/src/main/resources/features.xml
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/test/java/org/apache/archiva/redback/components/registry/modello/AbstractRegistryGeneratorTestCase.java
archiva/redback/redback-components/trunk/spring-registry/pom.xml
Modified:
archiva/redback/redback-components/trunk/redback-components-parent/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/redback-components-parent/pom.xml?rev=1369384&r1=1369383&r2=1369384&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/redback-components-parent/pom.xml
(original)
+++ archiva/redback/redback-components/trunk/redback-components-parent/pom.xml
Sat Aug 4 18:19:26 2012
@@ -18,25 +18,32 @@
~ under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+
<modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-parent</artifactId>
<version>9-SNAPSHOT</version>
<relativePath></relativePath>
</parent>
+
<groupId>org.apache.archiva.redback.components</groupId>
<artifactId>redback-components</artifactId>
<version>2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Archiva Redback Components Parent Project</name>
<url>http://archiva.apache.org/redback/components</url>
+
<properties>
+ <commons-configuration.version>1.8</commons-configuration.version>
+ <commons-lang.version>2.6</commons-lang.version>
<slf4jVersion>1.6.6</slf4jVersion>
<springVersion>3.1.2.RELEASE</springVersion>
<distUrlReleaseRepo>https://archiva-repository.apache.org/archiva/repository/archiva-releases-stage/</distUrlReleaseRepo>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
+
<description>Parent Pom for various components used in Redback, Apache
Archiva and Apache Continuum.</description>
<scm>
@@ -83,7 +90,7 @@
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.6</version>
+ <version>${commons-lang.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Modified: archiva/redback/redback-components/trunk/redback-features/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/redback-features/pom.xml?rev=1369384&r1=1369383&r2=1369384&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/redback-features/pom.xml (original)
+++ archiva/redback/redback-components/trunk/redback-features/pom.xml Sat Aug
4 18:19:26 2012
@@ -34,8 +34,22 @@
<name>Redback :: Components :: Karaf features</name>
<properties>
- <commons-lang.version>2.6</commons-lang.version>
+
<commons-beanutils.bundle.version>1.7.0_5</commons-beanutils.bundle.version>
+ <commons-codec.bundle.version>1.3_5</commons-codec.bundle.version>
+
<commons-collections.bundle.version>3.2.1_3</commons-collections.bundle.version>
+ <commons-digester.bundle.version>1.8_4</commons-digester.bundle.version>
+
<commons-httpclient.bundle.version>3.1_7</commons-httpclient.bundle.version>
+ <commons-jexl.version>2.1.1</commons-jexl.version>
+ <commons-jxpath.version>1.3</commons-jxpath.version>
+ <commons-net.bundle.version>1.4.1_6</commons-net.bundle.version>
+ <commons-vfs2.version>2.0</commons-vfs2.version>
+ <ehcache.bundle.version>2.5.3_1-SNAPSHOT</ehcache.bundle.version>
<javax-inject.bundle.version>1_1</javax-inject.bundle.version>
+ <jdo2-api.bundle.version>2.0_1-SNAPSHOT</jdo2-api.bundle.version>
+ <jdom.bundle.version>1.1_4</jdom.bundle.version>
+ <jsch.bundle.version>0.1.48_1</jsch.bundle.version>
+ <quartz.bundle.version>2.1.5_1</quartz.bundle.version>
+ <oscache.bundle.version>2.4_5</oscache.bundle.version>
</properties>
<build>
Modified:
archiva/redback/redback-components/trunk/redback-features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/redback-features/src/main/resources/features.xml?rev=1369384&r1=1369383&r2=1369384&view=diff
==============================================================================
---
archiva/redback/redback-components/trunk/redback-features/src/main/resources/features.xml
(original)
+++
archiva/redback/redback-components/trunk/redback-features/src/main/resources/features.xml
Sat Aug 4 18:19:26 2012
@@ -15,8 +15,8 @@
-->
<features name="redback-components-${project.version}"
xmlns="http://karaf.apache.org/xmlns/features/v1.0.0";>
- <feature name="redback-spring-apacheds" version="${project.version}"
resolver="(obr)">
- <!-- Require ApacheDS bundle -->
+ <feature name="redback-apacheds" version="${project.version}"
resolver="(obr)">
+ <!-- TODO add ApacheDS bundle -->
<bundle>mvn:org.apache.archiva.redback.components/spring-apacheds/${project.version}</bundle>
</feature>
@@ -29,7 +29,7 @@
<feature name="redback-cache-ehcache" version="${project.version}"
resolver="(obr)">
<feature version="${project.version}">redback-cache-api</feature>
- <!-- Require ehcache bundle -->
+ <bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ehcache/${ehcache.bundle.version}</bundle>
<bundle>mvn:org.apache.archiva.redback.components.cache/spring-cache-ehcache/${project.version}</bundle>
</feature>
@@ -40,18 +40,42 @@
<feature name="redback-cache-oscache" version="${project.version}"
resolver="(obr)">
<feature version="${project.version}">redback-cache-api</feature>
- <!-- Require oscache bundle -->
+ <bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oscache/${oscache.bundle.version}</bundle>
<bundle>mvn:org.apache.archiva.redback.components.cache/spring-cache-oscache/${project.version}</bundle>
</feature>
- <feature name="redback-spring-jdo2" version="${project.version}"
resolver="(obr)">
- <!-- javax.jdo2 bundle require -->
+ <feature name="redback-jdo2" version="${project.version}" resolver="(obr)">
+ <bundle
dependency="true">mvn:commons-lang/commons-lang/${commons-lang.version}</bundle>
+ <bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdo2-api/${jdo2-api.bundle.version}</bundle>
<bundle>mvn:org.apache.archiva.redback.components/spring-jdo2/${project.version}</bundle>
</feature>
- <feature name="redback-spring-quartz" version="${project.version}"
resolver="(obr)">
+ <feature name="redback-quartz" version="${project.version}" resolver="(obr)">
+ <feature>spring</feature>
<bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax-inject/${javax-inject.bundle.version}</bundle>
+ <bundle
dependency="true">mvn:commons-lang/commons-lang/${commons-lang.version}</bundle>
+ <bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.quartz/${quartz.bundle.version}</bundle>
<bundle>mvn:org.apache.archiva.redback.components/spring-quartz/${project.version}</bundle>
</feature>
+ <feature name="redback-registry" version="${project.version}"
resolver="(obr)">
+ <!-- TODO add jackrabbit bundle -->
+ <feature>war</feature>
+ <bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-net/${commons-net.bundle.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.jsch/${jsch.bundle.version}</bundle>
+ <bundle
dependency="true">mvn:org.apache.commons/commons-vfs2/${commons-vfs2.version}</bundle>
+ <bundle
dependency="true">mvn:commons-lang/commons-lang/${commons-lang.version}</bundle>
+ <bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom.bundle.version}</bundle>
+ <bundle
dependency="true">mvn:commons-jxpath/commons-jxpath/${commons-jxpath.version}</bundle>
+ <bundle
dependency="true">mvn:org.apache.commons/commons-jexl/${commons-jexl.version}</bundle>
+ <bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-digester/${commons-digester.bundle.version}</bundle>
+ <bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-collections/${commons-collections.bundle.version}</bundle>
+ <bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-codec/${commons-codec.bundle.version}</bundle>
+ <bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/${commons-beanutils.bundle.version}</bundle>
+ <bundle
dependency="true">mvn:commons-configuration/commons-configuration/${commons-configuration.version}</bundle>
+
<bundle>mvn:org.apache.archiva.redback.components.registry/spring-registry-api/${project.version}</bundle>
+
<bundle>mvn:org.apache.archiva.redback.components.registry/spring-registry-commons/${project.version}</bundle>
+ </feature>
+
</features>
\ No newline at end of file
Modified:
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/test/java/org/apache/archiva/redback/components/registry/modello/AbstractRegistryGeneratorTestCase.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/test/java/org/apache/archiva/redback/components/registry/modello/AbstractRegistryGeneratorTestCase.java?rev=1369384&r1=1369383&r2=1369384&view=diff
==============================================================================
---
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/test/java/org/apache/archiva/redback/components/registry/modello/AbstractRegistryGeneratorTestCase.java
(original)
+++
archiva/redback/redback-components/trunk/spring-registry/modello-plugin-redback-registry/src/test/java/org/apache/archiva/redback/components/registry/modello/AbstractRegistryGeneratorTestCase.java
Sat Aug 4 18:19:26 2012
@@ -80,7 +80,7 @@ public abstract class AbstractRegistryGe
addDependency( "org.apache.archiva.redback.components.registry",
"spring-registry-commons", registryVersion );
addDependency( "org.codehaus.plexus", "plexus-container-default",
"1.0-alpha-33" );
addDependency( "commons-collections", "commons-collections", "3.1" );
- addDependency( "commons-configuration", "commons-configuration", "1.7"
);
+ addDependency( "commons-configuration", "commons-configuration", "1.8"
);
addDependency( "commons-lang", "commons-lang", "2.6" );
addDependency( "commons-logging", "commons-logging-api", "1.0.4" );
addDependency( "org.codehaus.plexus", "plexus-interpolation", "1.14" );
Modified: archiva/redback/redback-components/trunk/spring-registry/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-registry/pom.xml?rev=1369384&r1=1369383&r2=1369384&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/spring-registry/pom.xml (original)
+++ archiva/redback/redback-components/trunk/spring-registry/pom.xml Sat Aug 4
18:19:26 2012
@@ -68,7 +68,7 @@
<dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
- <version>1.8</version>
+ <version>${commons-configuration.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
