Author: [email protected]
Date: Tue Feb 28 15:40:30 2012
New Revision: 2118
Log:
[Amdatu release]prepare branch amdatu-cassandra-0.2.3
Modified:
trunk/amdatu-cassandra/cassandra-application/pom.xml
trunk/amdatu-cassandra/pom.xml
trunk/amdatu-cassandra/release-demo/pom.xml
trunk/amdatu-cassandra/release/pom.xml
trunk/amdatu-cassandra/test-performance/test-execution/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 Tue Feb 28
15:40:30 2012
@@ -172,7 +172,7 @@
</goals>
</pluginExecutionFilter>
<action>
-
<ignore></ignore>
+ <ignore />
</action>
</pluginExecution>
</pluginExecutions>
Modified: trunk/amdatu-cassandra/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/pom.xml (original)
+++ trunk/amdatu-cassandra/pom.xml Tue Feb 28 15:40:30 2012
@@ -43,9 +43,9 @@
</properties>
<scm>
-
<connection>scm:svn:http://subversion.amdatu.org/svn/amdatu/trunk/amdatu-cassandra</connection>
-
<developerConnection>scm:svn:http://subversion.amdatu.org/svn/amdatu/trunk/amdatu-cassandra</developerConnection>
- <url>http://subversion.amdatu.org/viewvc/amdatu/amdatu-cassandra</url>
+
<connection>scm:svn:http://subversion.amdatu.org/svn/amdatu/branches/amdatu-cassandra-0.2.3</connection>
+
<developerConnection>scm:svn:http://subversion.amdatu.org/svn/amdatu/branches/amdatu-cassandra-0.2.3</developerConnection>
+
<url>http://subversion.amdatu.org/svn/amdatu/branches/amdatu-cassandra-0.2.3</url>
</scm>
<dependencies>
Modified: trunk/amdatu-cassandra/release-demo/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/release-demo/pom.xml (original)
+++ trunk/amdatu-cassandra/release-demo/pom.xml Tue Feb 28 15:40:30 2012
@@ -1,546 +1,545 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2010, 2011 The Amdatu Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.verning permissions and limitations
- 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.amdatu.cassandra</groupId>
- <artifactId>org.amdatu.cassandra</artifactId>
- <version>0.2.3-SNAPSHOT</version>
- </parent>
- <artifactId>org.amdatu.cassandra.release.demo</artifactId>
- <packaging>pom</packaging>
- <name>Amdatu Cassandra Demo release</name>
-
- <properties>
- <amdatu.http.hostname>localhost</amdatu.http.hostname>
- <amdatu.http.port>8080</amdatu.http.port>
- <amdatu.https.port>8045</amdatu.https.port>
- <amdatu.log.level>INFO</amdatu.log.level>
-
- <org.amdatu.core.version>0.2.1</org.amdatu.core.version>
- <org.amdatu.web.version>0.2.1</org.amdatu.web.version>
- <org.amdatu.lib.version>0.2.1</org.amdatu.lib.version>
- <org.amdatu.auth.version>0.2.1</org.amdatu.auth.version>
- <org.amdatu.opensocial.version>0.2.0</org.amdatu.opensocial.version>
-
- <org.apache.felix.main.version>4.0.2</org.apache.felix.main.version>
-
<org.apache.felix.eventadmin.version>1.2.2</org.apache.felix.eventadmin.version>
-
<org.apache.felix.configadmin.version>1.2.4</org.apache.felix.configadmin.version>
- <org.apache.felix.scr.version>1.6.0</org.apache.felix.scr.version>
- <org.apache.felix.log.version>1.0.0</org.apache.felix.log.version>
-
<org.apache.felix.file.install.version>3.1.10</org.apache.felix.file.install.version>
- <org.apache.felix.http.version>2.0.4</org.apache.felix.http.version>
-
<org.apache.felix.metatype.version>1.0.4</org.apache.felix.metatype.version>
-
<org.apache.felix.webconsole.version>3.1.2</org.apache.felix.webconsole.version>
-
<org.apache.felix.shell.tui.version>1.4.1</org.apache.felix.shell.tui.version>
- <org.apache.felix.shell.version>1.4.2</org.apache.felix.shell.version>
- <org.apache.felix.prefs.version>1.0.4</org.apache.felix.prefs.version>
-
- <pax.useradmin.version>0.0.1-amdatu1</pax.useradmin.version>
-
- <!-- Cassandra properties -->
- <cassandra.autobootstrap>false</cassandra.autobootstrap>
- <cassandra.clustername>'Amdatu Cassandra Cluster'</cassandra.clustername>
- <cassandra.consistency_level_read>ONE</cassandra.consistency_level_read>
- <cassandra.consistency_level_write>ONE</cassandra.consistency_level_write>
-
<cassandra.default_replication_factor>1</cassandra.default_replication_factor>
- <cassandra.initial_token>0</cassandra.initial_token>
- <cassandra.listen_address>127.0.0.1</cassandra.listen_address>
- <cassandra.rpc_address>127.0.0.1</cassandra.rpc_address>
- <cassandra.rpc_port>9160</cassandra.rpc_port>
- <cassandra.seeds>127.0.0.1</cassandra.seeds>
- <cassandra.storage_port>7000</cassandra.storage_port>
- </properties>
-
- <repositories>
- <repository>
- <id>amdatu.releases</id>
- <name>Amdatu Release Repository</name>
- <url>http://repository.amdatu.org/releases</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>amdatu.snapshots</id>
- <name>Amdatu Snapshot Repository</name>
- <url>http://repository.amdatu.org/snapshots</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
-
- <dependencies>
- <dependency>
- <groupId>org.amdatu.core</groupId>
- <artifactId>org.amdatu.core.config.templates</artifactId>
- <version>${org.amdatu.core.version}</version>
- <scope>runtime</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.core</groupId>
- <artifactId>org.amdatu.core.loghandler</artifactId>
- <version>${org.amdatu.core.version}</version>
- <scope>runtime</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.core</groupId>
- <artifactId>org.amdatu.core.tenant</artifactId>
- <version>${org.amdatu.core.version}</version>
- <scope>runtime</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.core</groupId>
- <artifactId>org.amdatu.core.tenantstore.inmem</artifactId>
- <version>${org.amdatu.core.version}</version>
- <scope>runtime</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.core</groupId>
- <artifactId>org.amdatu.core.tenantuseradmindecorator</artifactId>
- <version>${org.amdatu.core.version}</version>
- <scope>runtime</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.web</groupId>
- <artifactId>org.amdatu.web.httpcontext</artifactId>
- <version>${org.amdatu.web.version}</version>
- <scope>runtime</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.web</groupId>
- <artifactId>org.amdatu.web.dispatcher</artifactId>
- <version>${org.amdatu.web.version}</version>
- <scope>runtime</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.web</groupId>
- <artifactId>org.amdatu.web.tenantresolver.hostname</artifactId>
- <version>${org.amdatu.web.version}</version>
- <scope>runtime</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.web</groupId>
- <artifactId>org.amdatu.web.resource</artifactId>
- <version>${org.amdatu.web.version}</version>
- <scope>runtime</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.web</groupId>
- <artifactId>org.amdatu.web.jsp</artifactId>
- <version>${org.amdatu.web.version}</version>
- <scope>compile</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.web</groupId>
- <artifactId>org.amdatu.web.jaxrs</artifactId>
- <version>${org.amdatu.web.version}</version>
- <scope>runtime</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.web</groupId>
- <artifactId>org.amdatu.web.wink</artifactId>
- <version>${org.amdatu.web.version}</version>
- <scope>runtime</scope>
- <type>bundle</type>
- </dependency>
-
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>${org.osgi.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>${org.osgi.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.main</artifactId>
- <version>${org.apache.felix.main.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.eventadmin</artifactId>
- <version>${org.apache.felix.eventadmin.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.configadmin</artifactId>
- <version>${org.apache.felix.configadmin.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr</artifactId>
- <version>${org.apache.felix.scr.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.log</artifactId>
- <version>${org.apache.felix.log.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.fileinstall</artifactId>
- <version>${org.apache.felix.file.install.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.jetty</artifactId>
- <version>${org.apache.felix.http.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.framework</artifactId>
- <version>${org.apache.felix.main.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.prefs</artifactId>
- <version>${org.apache.felix.prefs.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.dependencymanager</artifactId>
- <version>${org.apache.felix.dependencymanager.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.dependencymanager.shell</artifactId>
- <version>${org.apache.felix.dependencymanager.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.metatype</artifactId>
- <version>${org.apache.felix.metatype.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.webconsole</artifactId>
- <version>${org.apache.felix.webconsole.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.shell.tui</artifactId>
- <version>${org.apache.felix.shell.tui.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.shell</artifactId>
- <version>${org.apache.felix.shell.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.useradmin</groupId>
- <artifactId>pax-useradmin-service</artifactId>
- <version>${pax.useradmin.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <!-- Add all the Cassandra dependencies -->
- <dependency>
- <groupId>org.amdatu.cassandra</groupId>
- <artifactId>org.amdatu.cassandra.application</artifactId>
- <type>bundle</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.amdatu.cassandra</groupId>
- <artifactId>org.amdatu.cassandra.client</artifactId>
- <type>bundle</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.amdatu.cassandra</groupId>
- <artifactId>org.amdatu.cassandra.hector</artifactId>
- <type>bundle</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.amdatu.cassandra</groupId>
- <artifactId>org.amdatu.cassandra.store.gadget</artifactId>
- <type>bundle</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.amdatu.cassandra</groupId>
- <artifactId>org.amdatu.cassandra.listener</artifactId>
- <type>bundle</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.amdatu.cassandra</groupId>
- <artifactId>org.amdatu.cassandra.persistencemanager</artifactId>
- <type>bundle</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.amdatu.cassandra</groupId>
- <artifactId>org.amdatu.cassandra.persistencemanager.hector</artifactId>
- <type>bundle</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.amdatu.cassandra</groupId>
- <artifactId>org.amdatu.cassandra.store.consumer</artifactId>
- <type>bundle</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.amdatu.cassandra</groupId>
- <artifactId>org.amdatu.cassandra.store.token</artifactId>
- <type>bundle</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.amdatu.cassandra</groupId>
- <artifactId>org.amdatu.cassandra.store.nonce</artifactId>
- <type>bundle</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.amdatu.cassandra</groupId>
- <artifactId>org.amdatu.cassandra.store.useradmin</artifactId>
- <type>bundle</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.amdatu.cassandra</groupId>
- <artifactId>org.amdatu.cassandra.config</artifactId>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
-
- <!-- Add the nec. Auth dependencies -->
- <dependency>
- <groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.login.gadget</artifactId>
- <version>${org.amdatu.auth.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.login.service</artifactId>
- <version>${org.amdatu.auth.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.oauth.api</artifactId>
- <version>${org.amdatu.auth.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.oauth.client</artifactId>
- <version>${org.amdatu.auth.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.oauth.consumerregistry</artifactId>
- <version>${org.amdatu.auth.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.oauth.server</artifactId>
- <version>${org.amdatu.auth.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.tokenprovider</artifactId>
- <version>${org.amdatu.auth.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.useradmin.gadget</artifactId>
- <version>${org.amdatu.auth.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.useradmin.rest</artifactId>
- <version>${org.amdatu.auth.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.config</artifactId>
- <version>${org.amdatu.auth.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <!-- Add the OpenSocial dependencies -->
- <dependency>
- <groupId>org.amdatu.opensocial</groupId>
- <artifactId>org.amdatu.opensocial.dashboard</artifactId>
- <version>${org.amdatu.opensocial.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.amdatu.opensocial</groupId>
- <artifactId>org.amdatu.opensocial.gadgetmanagement</artifactId>
- <version>${org.amdatu.opensocial.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.amdatu.opensocial</groupId>
- <artifactId>org.amdatu.opensocial.profile</artifactId>
- <version>${org.amdatu.opensocial.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.amdatu.opensocial</groupId>
- <artifactId>org.amdatu.opensocial.shindig</artifactId>
- <version>${org.amdatu.opensocial.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.amdatu.opensocial</groupId>
- <artifactId>org.amdatu.opensocial.config</artifactId>
- <version>${org.amdatu.opensocial.version}</version>
- <scope>compile</scope>
- </dependency>
-
- </dependencies>
- <build>
- <defaultGoal>package</defaultGoal>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2.1</version>
- <configuration>
- <appendAssemblyId>true</appendAssemblyId>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- <profiles>
- <!--
- This profile is active by default and only assembles the dev server.
- However it will be overruled by the release profile below unless that one
- is deactivated.
- -->
- <profile>
- <id>development</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>create-release</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <appendAssemblyId>false</appendAssemblyId>
- <descriptors>
- <descriptor>src/main/assembly/dev-server.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <!--
- The release profile by default generates all binary, source,
- javadoc and assemblies
- -->
- <id>release</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>create-release</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <appendAssemblyId>false</appendAssemblyId>
- <descriptors>
- <descriptor>src/main/assembly/dev-server.xml</descriptor>
- <descriptor>src/main/assembly/bin-release.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2010, 2011 The Amdatu Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.verning permissions and limitations
+ 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.amdatu.cassandra</groupId>
+ <artifactId>org.amdatu.cassandra</artifactId>
+ <version>0.2.3-SNAPSHOT</version>
+ </parent>
+ <artifactId>org.amdatu.cassandra.release.demo</artifactId>
+ <packaging>pom</packaging>
+ <name>Amdatu Cassandra Demo release</name>
+
+ <properties>
+ <amdatu.http.hostname>localhost</amdatu.http.hostname>
+ <amdatu.http.port>8080</amdatu.http.port>
+ <amdatu.https.port>8045</amdatu.https.port>
+ <amdatu.log.level>INFO</amdatu.log.level>
+
+ <org.amdatu.core.version>0.2.1</org.amdatu.core.version>
+ <org.amdatu.web.version>0.2.1</org.amdatu.web.version>
+ <org.amdatu.lib.version>0.2.1</org.amdatu.lib.version>
+ <org.amdatu.auth.version>0.2.1</org.amdatu.auth.version>
+ <org.amdatu.opensocial.version>0.2.0</org.amdatu.opensocial.version>
+
+ <org.apache.felix.main.version>4.0.2</org.apache.felix.main.version>
+
<org.apache.felix.eventadmin.version>1.2.2</org.apache.felix.eventadmin.version>
+
<org.apache.felix.configadmin.version>1.2.4</org.apache.felix.configadmin.version>
+ <org.apache.felix.scr.version>1.6.0</org.apache.felix.scr.version>
+ <org.apache.felix.log.version>1.0.0</org.apache.felix.log.version>
+
<org.apache.felix.file.install.version>3.1.10</org.apache.felix.file.install.version>
+ <org.apache.felix.http.version>2.0.4</org.apache.felix.http.version>
+
<org.apache.felix.metatype.version>1.0.4</org.apache.felix.metatype.version>
+
<org.apache.felix.webconsole.version>3.1.2</org.apache.felix.webconsole.version>
+
<org.apache.felix.shell.tui.version>1.4.1</org.apache.felix.shell.tui.version>
+ <org.apache.felix.shell.version>1.4.2</org.apache.felix.shell.version>
+ <org.apache.felix.prefs.version>1.0.4</org.apache.felix.prefs.version>
+
+ <pax.useradmin.version>0.0.1-amdatu1</pax.useradmin.version>
+
+ <!-- Cassandra properties -->
+ <cassandra.autobootstrap>false</cassandra.autobootstrap>
+ <cassandra.clustername>'Amdatu Cassandra Cluster'</cassandra.clustername>
+ <cassandra.consistency_level_read>ONE</cassandra.consistency_level_read>
+ <cassandra.consistency_level_write>ONE</cassandra.consistency_level_write>
+
<cassandra.default_replication_factor>1</cassandra.default_replication_factor>
+ <cassandra.initial_token>0</cassandra.initial_token>
+ <cassandra.listen_address>127.0.0.1</cassandra.listen_address>
+ <cassandra.rpc_address>127.0.0.1</cassandra.rpc_address>
+ <cassandra.rpc_port>9160</cassandra.rpc_port>
+ <cassandra.seeds>127.0.0.1</cassandra.seeds>
+ <cassandra.storage_port>7000</cassandra.storage_port>
+ </properties>
+
+ <repositories>
+ <repository>
+ <id>amdatu.releases</id>
+ <name>Amdatu Release Repository</name>
+ <url>http://repository.amdatu.org/releases</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>amdatu.snapshots</id>
+ <name>Amdatu Snapshot Repository</name>
+ <url>http://repository.amdatu.org/snapshots</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.amdatu.core</groupId>
+ <artifactId>org.amdatu.core.config.templates</artifactId>
+ <version>${org.amdatu.core.version}</version>
+ <scope>runtime</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.core</groupId>
+ <artifactId>org.amdatu.core.loghandler</artifactId>
+ <version>${org.amdatu.core.version}</version>
+ <scope>runtime</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.core</groupId>
+ <artifactId>org.amdatu.core.tenant</artifactId>
+ <version>${org.amdatu.core.version}</version>
+ <scope>runtime</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.core</groupId>
+ <artifactId>org.amdatu.core.tenantstore.inmem</artifactId>
+ <version>${org.amdatu.core.version}</version>
+ <scope>runtime</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.core</groupId>
+ <artifactId>org.amdatu.core.tenantuseradmindecorator</artifactId>
+ <version>${org.amdatu.core.version}</version>
+ <scope>runtime</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.web</groupId>
+ <artifactId>org.amdatu.web.httpcontext</artifactId>
+ <version>${org.amdatu.web.version}</version>
+ <scope>runtime</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.web</groupId>
+ <artifactId>org.amdatu.web.dispatcher</artifactId>
+ <version>${org.amdatu.web.version}</version>
+ <scope>runtime</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.web</groupId>
+ <artifactId>org.amdatu.web.tenantresolver.hostname</artifactId>
+ <version>${org.amdatu.web.version}</version>
+ <scope>runtime</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.web</groupId>
+ <artifactId>org.amdatu.web.resource</artifactId>
+ <version>${org.amdatu.web.version}</version>
+ <scope>runtime</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.web</groupId>
+ <artifactId>org.amdatu.web.jsp</artifactId>
+ <version>${org.amdatu.web.version}</version>
+ <scope>compile</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.web</groupId>
+ <artifactId>org.amdatu.web.jaxrs</artifactId>
+ <version>${org.amdatu.web.version}</version>
+ <scope>runtime</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.web</groupId>
+ <artifactId>org.amdatu.web.wink</artifactId>
+ <version>${org.amdatu.web.version}</version>
+ <scope>runtime</scope>
+ <type>bundle</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>${org.osgi.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>${org.osgi.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.main</artifactId>
+ <version>${org.apache.felix.main.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.eventadmin</artifactId>
+ <version>${org.apache.felix.eventadmin.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.configadmin</artifactId>
+ <version>${org.apache.felix.configadmin.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr</artifactId>
+ <version>${org.apache.felix.scr.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.log</artifactId>
+ <version>${org.apache.felix.log.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.fileinstall</artifactId>
+ <version>${org.apache.felix.file.install.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.http.jetty</artifactId>
+ <version>${org.apache.felix.http.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.framework</artifactId>
+ <version>${org.apache.felix.main.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.prefs</artifactId>
+ <version>${org.apache.felix.prefs.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.dependencymanager</artifactId>
+ <version>${org.apache.felix.dependencymanager.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.dependencymanager.shell</artifactId>
+ <version>${org.apache.felix.dependencymanager.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.metatype</artifactId>
+ <version>${org.apache.felix.metatype.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.webconsole</artifactId>
+ <version>${org.apache.felix.webconsole.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.shell.tui</artifactId>
+ <version>${org.apache.felix.shell.tui.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.shell</artifactId>
+ <version>${org.apache.felix.shell.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.useradmin</groupId>
+ <artifactId>pax-useradmin-service</artifactId>
+ <version>${pax.useradmin.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <!-- Add all the Cassandra dependencies -->
+ <dependency>
+ <groupId>org.amdatu.cassandra</groupId>
+ <artifactId>org.amdatu.cassandra.application</artifactId>
+ <type>bundle</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.cassandra</groupId>
+ <artifactId>org.amdatu.cassandra.client</artifactId>
+ <type>bundle</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.cassandra</groupId>
+ <artifactId>org.amdatu.cassandra.hector</artifactId>
+ <type>bundle</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.cassandra</groupId>
+ <artifactId>org.amdatu.cassandra.store.gadget</artifactId>
+ <type>bundle</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.cassandra</groupId>
+ <artifactId>org.amdatu.cassandra.listener</artifactId>
+ <type>bundle</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.cassandra</groupId>
+ <artifactId>org.amdatu.cassandra.persistencemanager</artifactId>
+ <type>bundle</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.cassandra</groupId>
+ <artifactId>org.amdatu.cassandra.persistencemanager.hector</artifactId>
+ <type>bundle</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.cassandra</groupId>
+ <artifactId>org.amdatu.cassandra.store.consumer</artifactId>
+ <type>bundle</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.cassandra</groupId>
+ <artifactId>org.amdatu.cassandra.store.token</artifactId>
+ <type>bundle</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.cassandra</groupId>
+ <artifactId>org.amdatu.cassandra.store.nonce</artifactId>
+ <type>bundle</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.cassandra</groupId>
+ <artifactId>org.amdatu.cassandra.store.useradmin</artifactId>
+ <type>bundle</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.cassandra</groupId>
+ <artifactId>org.amdatu.cassandra.config</artifactId>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+
+ <!-- Add the nec. Auth dependencies -->
+ <dependency>
+ <groupId>org.amdatu.auth</groupId>
+ <artifactId>org.amdatu.auth.login.gadget</artifactId>
+ <version>${org.amdatu.auth.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.auth</groupId>
+ <artifactId>org.amdatu.auth.login.service</artifactId>
+ <version>${org.amdatu.auth.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.auth</groupId>
+ <artifactId>org.amdatu.auth.oauth.api</artifactId>
+ <version>${org.amdatu.auth.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.auth</groupId>
+ <artifactId>org.amdatu.auth.oauth.client</artifactId>
+ <version>${org.amdatu.auth.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.auth</groupId>
+ <artifactId>org.amdatu.auth.oauth.consumerregistry</artifactId>
+ <version>${org.amdatu.auth.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.auth</groupId>
+ <artifactId>org.amdatu.auth.oauth.server</artifactId>
+ <version>${org.amdatu.auth.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.auth</groupId>
+ <artifactId>org.amdatu.auth.tokenprovider</artifactId>
+ <version>${org.amdatu.auth.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.auth</groupId>
+ <artifactId>org.amdatu.auth.useradmin.gadget</artifactId>
+ <version>${org.amdatu.auth.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.auth</groupId>
+ <artifactId>org.amdatu.auth.useradmin.rest</artifactId>
+ <version>${org.amdatu.auth.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.auth</groupId>
+ <artifactId>org.amdatu.auth.config</artifactId>
+ <version>${org.amdatu.auth.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <!-- Add the OpenSocial dependencies -->
+ <dependency>
+ <groupId>org.amdatu.opensocial</groupId>
+ <artifactId>org.amdatu.opensocial.dashboard</artifactId>
+ <version>${org.amdatu.opensocial.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.opensocial</groupId>
+ <artifactId>org.amdatu.opensocial.gadgetmanagement</artifactId>
+ <version>${org.amdatu.opensocial.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.opensocial</groupId>
+ <artifactId>org.amdatu.opensocial.profile</artifactId>
+ <version>${org.amdatu.opensocial.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.opensocial</groupId>
+ <artifactId>org.amdatu.opensocial.shindig</artifactId>
+ <version>${org.amdatu.opensocial.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.opensocial</groupId>
+ <artifactId>org.amdatu.opensocial.config</artifactId>
+ <version>${org.amdatu.opensocial.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ </dependencies>
+ <build>
+ <defaultGoal>package</defaultGoal>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2.1</version>
+ <configuration>
+ <appendAssemblyId>true</appendAssemblyId>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ <profiles>
+ <!--
+ This profile is active by default and only assembles the dev server.
+ However it will be overruled by the release profile below unless that one
+ is deactivated.
+ -->
+ <profile>
+ <id>development</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>create-release</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+ <descriptor>src/main/assembly/dev-server.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <!--
+ The release profile by default generates all binary, source,
+ javadoc and assemblies
+ -->
+ <id>release</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>create-release</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+ <descriptor>src/main/assembly/dev-server.xml</descriptor>
+ <descriptor>src/main/assembly/bin-release.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
Modified: trunk/amdatu-cassandra/release/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/release/pom.xml (original)
+++ trunk/amdatu-cassandra/release/pom.xml Tue Feb 28 15:40:30 2012
@@ -176,7 +176,7 @@
</goals>
</pluginExecutionFilter>
<action>
-
<ignore></ignore>
+ <ignore
/>
</action>
</pluginExecution>
</pluginExecutions>
Modified: trunk/amdatu-cassandra/test-performance/test-execution/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/test-performance/test-execution/pom.xml
(original)
+++ trunk/amdatu-cassandra/test-performance/test-execution/pom.xml Tue Feb
28 15:40:30 2012
@@ -128,7 +128,7 @@
</goals>
</pluginExecutionFilter>
<action>
-
<ignore></ignore>
+ <ignore />
</action>
</pluginExecution>
</pluginExecutions>
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
