Author: [email protected]
Date: Thu Apr 21 13:32:32 2011
New Revision: 1033
Log:
[AMDATUCASSANDRA-7] Updated and refactored core/web dependencies
Modified:
trunk/amdatu-cassandra/cassandra-application/pom.xml
trunk/amdatu-cassandra/cassandra-gadgetstore/pom.xml
trunk/amdatu-cassandra/cassandra-listener/pom.xml
trunk/amdatu-cassandra/cassandra-persistencemanager/pom.xml
trunk/amdatu-cassandra/cassandra-tenantstore/pom.xml
trunk/amdatu-cassandra/cassandra-useradminstore/pom.xml
trunk/amdatu-cassandra/pom.xml
trunk/amdatu-cassandra/release/pom.xml
trunk/amdatu-cassandra/test-integration/pom.xml
trunk/amdatu-cassandra/test-integration/src/test/java/org/amdatu/cassandra/test/integration/base/IntegrationTestBase.java
trunk/amdatu-cassandra/test-performance/test-bundle/pom.xml
Modified: trunk/amdatu-cassandra/cassandra-application/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/cassandra-application/pom.xml (original)
+++ trunk/amdatu-cassandra/cassandra-application/pom.xml Thu Apr 21
13:32:32 2011
@@ -61,9 +61,8 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.amdatu.core.config</groupId>
- <artifactId>templates</artifactId>
- <scope>provided</scope>
+ <groupId>org.amdatu.core</groupId>
+ <artifactId>org.amdatu.core.config.templates</artifactId>
<type>bundle</type>
</dependency>
</dependencies>
Modified: trunk/amdatu-cassandra/cassandra-gadgetstore/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/cassandra-gadgetstore/pom.xml (original)
+++ trunk/amdatu-cassandra/cassandra-gadgetstore/pom.xml Thu Apr 21
13:32:32 2011
@@ -15,25 +15,22 @@
<dependency>
<groupId>org.amdatu.cassandra</groupId>
<artifactId>org.amdatu.cassandra.listener</artifactId>
- <scope>provided</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.cassandra</groupId>
<artifactId>org.amdatu.cassandra.application</artifactId>
- <scope>provided</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.cassandra</groupId>
<artifactId>org.amdatu.cassandra.persistencemanager</artifactId>
- <scope>provided</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.opensocial</groupId>
<artifactId>gadgetmanagement</artifactId>
- <version>${project.version}</version>
+ <version>${amdatu.opensocial.version}</version>
<scope>provided</scope>
<type>bundle</type>
</dependency>
Modified: trunk/amdatu-cassandra/cassandra-listener/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/cassandra-listener/pom.xml (original)
+++ trunk/amdatu-cassandra/cassandra-listener/pom.xml Thu Apr 21 13:32:32 2011
@@ -10,17 +10,16 @@
<packaging>bundle</packaging>
<name>Amdatu Cassandra - Apache Cassandra Listener</name>
<description>The Cassandra listener uses the whiteboard pattern to listen to
services that register ColumnFamily's and keyspaces.</description>
+
<dependencies>
<dependency>
<groupId>org.amdatu.cassandra</groupId>
<artifactId>org.amdatu.cassandra.application</artifactId>
- <scope>provided</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.cassandra</groupId>
<artifactId>org.amdatu.cassandra.persistencemanager</artifactId>
- <scope>provided</scope>
<type>bundle</type>
</dependency>
</dependencies>
Modified: trunk/amdatu-cassandra/cassandra-persistencemanager/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/cassandra-persistencemanager/pom.xml (original)
+++ trunk/amdatu-cassandra/cassandra-persistencemanager/pom.xml Thu Apr 21
13:32:32 2011
@@ -15,7 +15,6 @@
<dependency>
<groupId>org.amdatu.cassandra</groupId>
<artifactId>org.amdatu.cassandra.application</artifactId>
- <scope>provided</scope>
<type>bundle</type>
</dependency>
<dependency>
Modified: trunk/amdatu-cassandra/cassandra-tenantstore/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/cassandra-tenantstore/pom.xml (original)
+++ trunk/amdatu-cassandra/cassandra-tenantstore/pom.xml Thu Apr 21
13:32:32 2011
@@ -14,28 +14,22 @@
<dependencies>
<dependency>
<groupId>org.amdatu.core</groupId>
- <artifactId>tenant</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
+ <artifactId>org.amdatu.core.tenant</artifactId>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.cassandra</groupId>
<artifactId>org.amdatu.cassandra.application</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.cassandra</groupId>
<artifactId>org.amdatu.cassandra.persistencemanager</artifactId>
- <scope>provided</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.cassandra</groupId>
<artifactId>org.amdatu.cassandra.listener</artifactId>
- <scope>provided</scope>
<type>bundle</type>
</dependency>
</dependencies>
Modified: trunk/amdatu-cassandra/cassandra-useradminstore/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/cassandra-useradminstore/pom.xml (original)
+++ trunk/amdatu-cassandra/cassandra-useradminstore/pom.xml Thu Apr 21
13:32:32 2011
@@ -19,40 +19,40 @@
<dependency>
<groupId>org.amdatu.cassandra</groupId>
<artifactId>org.amdatu.cassandra.listener</artifactId>
- <scope>provided</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.cassandra</groupId>
<artifactId>org.amdatu.cassandra.application</artifactId>
- <scope>provided</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.cassandra</groupId>
<artifactId>org.amdatu.cassandra.persistencemanager</artifactId>
- <scope>provided</scope>
<type>bundle</type>
</dependency>
<dependency>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
- <version>1.4</version>
- <scope>compile</scope>
+ <groupId>org.amdatu.core</groupId>
+ <artifactId>org.amdatu.core.tenant</artifactId>
+ <type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.web.rest</groupId>
- <artifactId>jaxrs</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
+ <groupId>org.amdatu.web</groupId>
+ <artifactId>org.amdatu.web.jaxrs</artifactId>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.web</groupId>
- <artifactId>httpcontext</artifactId>
- <scope>provided</scope>
+ <artifactId>org.amdatu.web.httpcontext</artifactId>
<type>bundle</type>
</dependency>
+
+ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ <version>1.4</version>
+ <scope>compile</scope>
+ </dependency>
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
@@ -60,13 +60,6 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.amdatu.core</groupId>
- <artifactId>tenant</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
<groupId>org.ops4j.pax.useradmin</groupId>
<artifactId>pax-useradmin-service</artifactId>
<version>${pax.useradmin.version}</version>
Modified: trunk/amdatu-cassandra/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/pom.xml (original)
+++ trunk/amdatu-cassandra/pom.xml Thu Apr 21 13:32:32 2011
@@ -16,8 +16,9 @@
<properties>
<!-- Version of dependend projects -->
- <amdatu.core.version>0.2.0-SNAPSHOT</amdatu.core.version>
-
+ <amdatu.core.version>0.2.1-SNAPSHOT</amdatu.core.version>
+ <amdatu.web.version>0.2.1-SNAPSHOT</amdatu.web.version>
+ <amdatu.opensocial.version>0.2.0-SNAPSHOT</amdatu.opensocial.version>
<!-- Version of cassandra itself -->
<cassandra.version>0.7.4</cassandra.version>
@@ -61,6 +62,7 @@
<dependencyManagement>
<dependencies>
+ <!-- Internal project dependencies -->
<dependency>
<groupId>org.amdatu.cassandra</groupId>
<artifactId>org.amdatu.cassandra.application</artifactId>
@@ -70,6 +72,13 @@
</dependency>
<dependency>
<groupId>org.amdatu.cassandra</groupId>
+ <artifactId>org.amdatu.cassandra.gadgetstore</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.cassandra</groupId>
<artifactId>org.amdatu.cassandra.listener</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
@@ -83,19 +92,72 @@
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.core.config</groupId>
- <artifactId>templates</artifactId>
+ <groupId>org.amdatu.cassandra</groupId>
+ <artifactId>org.amdatu.cassandra.tenantstore</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.web</groupId>
- <artifactId>httpcontext</artifactId>
+ <groupId>org.amdatu.cassandra</groupId>
+ <artifactId>org.amdatu.cassandra.useradminstore</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
<type>bundle</type>
</dependency>
+
+ <!-- Amdatu core dependencies -->
+ <dependency>
+ <groupId>org.amdatu.core</groupId>
+ <artifactId>org.amdatu.core.config.templates</artifactId>
+ <version>${amdatu.core.version}</version>
+ <scope>provided</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.core</groupId>
+ <artifactId>org.amdatu.core.tenant</artifactId>
+ <version>${amdatu.core.version}</version>
+ <scope>provided</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.core</groupId>
+ <artifactId>org.amdatu.core.loghandler</artifactId>
+ <version>${amdatu.core.version}</version>
+ <scope>provided</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.core</groupId>
+ <artifactId>org.amdatu.core.tenantuseradmindecorator</artifactId>
+ <version>${amdatu.core.version}</version>
+ <scope>provided</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.core</groupId>
+ <artifactId>org.amdatu.core.tenantstore.fs</artifactId>
+ <version>${amdatu.core.version}</version>
+ <scope>provided</scope>
+ <type>bundle</type>
+ </dependency>
+
+ <!-- Amdatu web dependencies -->
+ <dependency>
+ <groupId>org.amdatu.web</groupId>
+ <artifactId>org.amdatu.web.httpcontext</artifactId>
+ <version>${amdatu.web.version}</version>
+ <scope>provided</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.web</groupId>
+ <artifactId>org.amdatu.web.jaxrs</artifactId>
+ <version>${amdatu.web.version}</version>
+ <scope>provided</scope>
+ <type>bundle</type>
+ </dependency>
</dependencies>
</dependencyManagement>
Modified: trunk/amdatu-cassandra/release/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/release/pom.xml (original)
+++ trunk/amdatu-cassandra/release/pom.xml Thu Apr 21 13:32:32 2011
@@ -7,7 +7,6 @@
<version>0.2.0-SNAPSHOT</version>
</parent>
<artifactId>amdatu-cassandra</artifactId>
- <version>0.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Amdatu Cassandra - release</name>
<description>Release module for the Amdatu Cassandra project.</description>
@@ -16,45 +15,36 @@
<dependency>
<groupId>org.amdatu.cassandra</groupId>
<artifactId>org.amdatu.cassandra.application</artifactId>
- <version>${project.version}</version>
<scope>runtime</scope>
<type>bundle</type>
- <classifier>javadoc</classifier>
</dependency>
<dependency>
<groupId>org.amdatu.cassandra</groupId>
<artifactId>org.amdatu.cassandra.gadgetstore</artifactId>
- <version>${project.version}</version>
<scope>runtime</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.cassandra</groupId>
<artifactId>org.amdatu.cassandra.listener</artifactId>
- <version>${project.version}</version>
<scope>runtime</scope>
<type>bundle</type>
- <classifier>javadoc</classifier>
</dependency>
<dependency>
<groupId>org.amdatu.cassandra</groupId>
<artifactId>org.amdatu.cassandra.persistencemanager</artifactId>
- <version>${project.version}</version>
<scope>runtime</scope>
<type>bundle</type>
- <classifier>javadoc</classifier>
</dependency>
<dependency>
<groupId>org.amdatu.cassandra</groupId>
<artifactId>org.amdatu.cassandra.tenantstore</artifactId>
- <version>${project.version}</version>
<scope>runtime</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.cassandra</groupId>
<artifactId>org.amdatu.cassandra.useradminstore</artifactId>
- <version>${project.version}</version>
<scope>runtime</scope>
<type>bundle</type>
</dependency>
Modified: trunk/amdatu-cassandra/test-integration/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/test-integration/pom.xml (original)
+++ trunk/amdatu-cassandra/test-integration/pom.xml Thu Apr 21 13:32:32 2011
@@ -7,7 +7,6 @@
<version>0.2.0-SNAPSHOT</version>
</parent>
<artifactId>org.amdatu.cassandra.test-integration</artifactId>
- <version>0.2.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Amdatu Cassandra - Integration Tests</name>
<description>This bundle contains integration tests for the
project</description>
@@ -56,80 +55,69 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.amdatu.web.rest</groupId>
- <artifactId>jaxrs</artifactId>
- <version>${project.version}</version>
+ <groupId>org.amdatu.web</groupId>
+ <artifactId>org.amdatu.web.jaxrs</artifactId>
<scope>test</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.web</groupId>
- <artifactId>httpcontext</artifactId>
- <version>${project.version}</version>
+ <artifactId>org.amdatu.web.httpcontext</artifactId>
<scope>test</scope>
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.core.config</groupId>
- <artifactId>templates</artifactId>
- <version>${project.version}</version>
+ <groupId>org.amdatu.core</groupId>
+ <artifactId>org.amdatu.core.config.templates</artifactId>
<scope>test</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.core</groupId>
- <artifactId>loghandler</artifactId>
- <version>${project.version}</version>
+ <artifactId>org.amdatu.core.loghandler</artifactId>
<scope>test</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.core</groupId>
- <artifactId>tenant</artifactId>
- <version>${project.version}</version>
+ <artifactId>org.amdatu.core.tenant</artifactId>
<scope>test</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.core</groupId>
- <artifactId>tenantuseradmindecorator</artifactId>
- <version>${project.version}</version>
+ <artifactId>org.amdatu.core.tenantuseradmindecorator</artifactId>
<scope>test</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.core</groupId>
- <artifactId>tenantstore-fs</artifactId>
- <version>${project.version}</version>
+ <artifactId>org.amdatu.core.tenantstore.fs</artifactId>
<scope>test</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.cassandra</groupId>
<artifactId>org.amdatu.cassandra.application</artifactId>
- <version>${project.version}</version>
<scope>test</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.cassandra</groupId>
<artifactId>org.amdatu.cassandra.persistencemanager</artifactId>
- <version>${project.version}</version>
<scope>test</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.cassandra</groupId>
<artifactId>org.amdatu.cassandra.listener</artifactId>
- <version>${project.version}</version>
<scope>test</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.cassandra</groupId>
<artifactId>org.amdatu.cassandra.useradminstore</artifactId>
- <version>${project.version}</version>
<scope>test</scope>
<type>bundle</type>
</dependency>
@@ -143,14 +131,13 @@
<dependency>
<groupId>org.amdatu.opensocial</groupId>
<artifactId>gadgetmanagement</artifactId>
- <version>${project.version}</version>
+ <version>${amdatu.opensocial.version}</version>
<scope>test</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.cassandra</groupId>
<artifactId>org.amdatu.cassandra.gadgetstore</artifactId>
- <version>${project.version}</version>
<scope>test</scope>
<type>bundle</type>
</dependency>
@@ -199,7 +186,6 @@
</dependencies>
<build>
-
<finalName>${project.groupId}.${project.artifactId}-${project.version}</finalName>
<pluginManagement>
<plugins>
<plugin>
Modified:
trunk/amdatu-cassandra/test-integration/src/test/java/org/amdatu/cassandra/test/integration/base/IntegrationTestBase.java
==============================================================================
---
trunk/amdatu-cassandra/test-integration/src/test/java/org/amdatu/cassandra/test/integration/base/IntegrationTestBase.java
(original)
+++
trunk/amdatu-cassandra/test-integration/src/test/java/org/amdatu/cassandra/test/integration/base/IntegrationTestBase.java
Thu Apr 21 13:32:32 2011
@@ -178,7 +178,7 @@
if (dependency.getState() ==
ComponentDependencyDeclaration.STATE_UNAVAILABLE_REQUIRED) {
moreInfo +=
"\nThe component depends on the following
unavailable service: "
- + dependency.getName();
+ + dependency.getName();
}
}
}
@@ -292,9 +292,9 @@
@Override
public boolean accept(final File pathname) {
return
pathname.getName().startsWith("org.amdatu.cassandra.test-integration-")
- && pathname.getName().endsWith(".jar")
- && !pathname.getName().endsWith("-javadoc.jar")
- && !pathname.getName().endsWith("-sources.jar");
+ && pathname.getName().endsWith(".jar")
+ && !pathname.getName().endsWith("-javadoc.jar")
+ && !pathname.getName().endsWith("-sources.jar");
}
};
return new File("target").listFiles(ff)[0];
@@ -302,68 +302,79 @@
// //////////////////////////////////////////////////////////
// A load of Pax Exam definitions for easier (typo-free) provisioning
+ private static MavenArtifactProvisionOption getCassandraOption(final
String artifactId) {
+ return
mavenBundle().groupId("org.amdatu.cassandra").artifactId(artifactId).versionAsInProject();
+ }
+
+ private static MavenArtifactProvisionOption getCoreOption(final String
artifactId) {
+ return
mavenBundle().groupId("org.amdatu.core").artifactId(artifactId).versionAsInProject();
+ }
+
+ private static MavenArtifactProvisionOption getWebOption(final String
artifactId) {
+ return
mavenBundle().groupId("org.amdatu.web").artifactId(artifactId).versionAsInProject();
+ }
protected static MavenArtifactProvisionOption
amdatuUserAdminCassandraStore() {
- return
mavenBundle().groupId("org.amdatu.cassandra").artifactId("useradminstore").version("0.2.0-SNAPSHOT");
+ return getCassandraOption("org.amdatu.cassandra.useradminstore");
}
protected static MavenArtifactProvisionOption amdatuGadgetCassandraStore()
{
- return
mavenBundle().groupId("org.amdatu.cassandra").artifactId("gadgetstore").version("0.2.0-SNAPSHOT");
+ return getCassandraOption("org.amdatu.cassandra.gadgetstore");
}
protected static MavenArtifactProvisionOption
amdatuCassandraPersistenceManager() {
- return
mavenBundle().groupId("org.amdatu.cassandra").artifactId("persistencemanager").version("0.2.0-SNAPSHOT");
+ return getCassandraOption("org.amdatu.cassandra.persistencemanager");
}
protected static MavenArtifactProvisionOption amdatuCassandraListener() {
- return
mavenBundle().groupId("org.amdatu.cassandra").artifactId("listener").version("0.2.0-SNAPSHOT");
+ return getCassandraOption("org.amdatu.cassandra.listener");
}
protected static MavenArtifactProvisionOption amdatuCassandraApplication()
{
- return
mavenBundle().groupId("org.amdatu.cassandra").artifactId("application").version("0.2.0-SNAPSHOT");
+ return getCassandraOption("org.amdatu.cassandra.application");
}
protected static MavenArtifactProvisionOption
amdatuConfigTemplateManager() {
- return
mavenBundle().groupId("org.amdatu.core.config").artifactId("templates").version("0.2.0-SNAPSHOT");
+ return getCoreOption("org.amdatu.core.config.templates");
}
protected static MavenArtifactProvisionOption amdatuLogHandler() {
- return
mavenBundle().groupId("org.amdatu.core").artifactId("loghandler").version("0.2.0-SNAPSHOT");
+ return getCoreOption("org.amdatu.core.loghandler");
}
protected static MavenArtifactProvisionOption amdatuTenantService() {
- return
mavenBundle().groupId("org.amdatu.core").artifactId("tenant").versionAsInProject();
+ return getCoreOption("org.amdatu.core.tenant");
}
protected static MavenArtifactProvisionOption
amdatuTenantUserAdminDecoratorService() {
- return
mavenBundle().groupId("org.amdatu.core").artifactId("tenantuseradmindecorator").versionAsInProject();
+ return getCoreOption("org.amdatu.core.tenantuseradmindecorator");
}
protected static MavenArtifactProvisionOption amdatuTenantStoreFSService()
{
- return
mavenBundle().groupId("org.amdatu.core").artifactId("tenantstore-fs").versionAsInProject();
+ return getCoreOption("org.amdatu.core.tenantstore.fs");
}
protected static MavenArtifactProvisionOption amdatuHttpContext() {
- return
mavenBundle().groupId("org.amdatu.web").artifactId("httpcontext").versionAsInProject();
+ return getWebOption("org.amdatu.web.httpcontext").versionAsInProject();
}
protected static MavenArtifactProvisionOption amdatuJaxRs() {
- return
mavenBundle().groupId("org.amdatu.web.rest").artifactId("jaxrs").versionAsInProject();
+ return getWebOption("org.amdatu.web.jaxrs").versionAsInProject();
}
protected static MavenArtifactProvisionOption slingCommons() {
return
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.commons.osgi")
- .versionAsInProject();
+ .versionAsInProject();
}
protected static MavenArtifactProvisionOption slingMime() {
return
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.commons.mime")
- .versionAsInProject();
+ .versionAsInProject();
}
protected static MavenArtifactProvisionOption paxUserAdmin() {
return
mavenBundle().groupId("org.ops4j.pax.useradmin").artifactId("pax-useradmin-service")
- .versionAsInProject();
+ .versionAsInProject();
}
protected static MavenArtifactProvisionOption paxSwissbox() {
@@ -380,7 +391,7 @@
protected static MavenArtifactProvisionOption configAdmin() {
return
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.configadmin")
- .versionAsInProject();
+ .versionAsInProject();
}
protected static MavenArtifactProvisionOption eventAdmin() {
@@ -389,7 +400,7 @@
protected static MavenArtifactProvisionOption dependencyManager() {
return
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.dependencymanager")
- .versionAsInProject();
+ .versionAsInProject();
}
protected static MavenArtifactProvisionOption compendium() {
Modified: trunk/amdatu-cassandra/test-performance/test-bundle/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/test-performance/test-bundle/pom.xml (original)
+++ trunk/amdatu-cassandra/test-performance/test-bundle/pom.xml Thu Apr 21
13:32:32 2011
@@ -13,20 +13,23 @@
<properties>
<org.apache.wink.version>1.1.1-incubating</org.apache.wink.version>
<org.apache.felix.http.version>2.2.0</org.apache.felix.http.version>
+
+ <amdatu.web.version>0.2.1-SNAPSHOT</amdatu.web.version>
+ <amdatu.casandra.version>0.2.0-SNAPSHOT</amdatu.casandra.version>
</properties>
<dependencies>
<dependency>
<groupId>org.amdatu.web</groupId>
- <artifactId>httpcontext</artifactId>
- <version>0.2.0-SNAPSHOT</version>
+ <artifactId>org.amdatu.webhttpcontext</artifactId>
+ <version>${amdatu.web.version}</version>
<scope>provided</scope>
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.web.rest</groupId>
- <artifactId>jaxrs</artifactId>
- <version>0.2.0-SNAPSHOT</version>
+ <groupId>org.amdatu.web</groupId>
+ <artifactId>org.amdatu.web.rest.jaxrs</artifactId>
+ <version>${amdatu.web.version}</version>
<scope>provided</scope>
<type>bundle</type>
</dependency>
@@ -52,21 +55,21 @@
<groupId>org.amdatu.cassandra</groupId>
<artifactId>org.amdatu.cassandra.application</artifactId>
<scope>provided</scope>
- <version>0.2.0-SNAPSHOT</version>
+ <version>${amdatu.casandra.version}</version>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.cassandra</groupId>
<artifactId>org.amdatu.cassandra.persistencemanager</artifactId>
<scope>provided</scope>
- <version>${project.version}</version>
+ <version>${amdatu.casandra.version}</version>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.cassandra</groupId>
<artifactId>org.amdatu.cassandra.listener</artifactId>
<scope>provided</scope>
- <version>${project.version}</version>
+ <version>${amdatu.casandra.version}</version>
<type>bundle</type>
</dependency>
</dependencies>
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
