Author: [email protected]
Date: Wed Apr 13 10:24:05 2011
New Revision: 961
Log:
[AMDATUCASSANDRA-7] Refactored cassandra module to depend on parent-pom instead
of the reactor root pom. Removed unnecessary cassandra dependency in course
examples service.
Modified:
trunk/amdatu-cassandra/cassandra-useradminstore/pom.xml
trunk/amdatu-cassandra/pom.xml
trunk/amdatu-example/course-service/pom.xml
trunk/amdatu-example/course-service/src/main/java/org/amdatu/example/course/service/osgi/Activator.java
trunk/amdatu-example/course-service/src/main/java/org/amdatu/example/course/service/service/ProfileDataProvider.java
trunk/amdatu-example/pom.xml
trunk/amdatu-release/pom.xml
trunk/pom.xml
trunk/src/main/resources/conf/felix-config.properties
Modified: trunk/amdatu-cassandra/cassandra-useradminstore/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/cassandra-useradminstore/pom.xml (original)
+++ trunk/amdatu-cassandra/cassandra-useradminstore/pom.xml Wed Apr 13
10:24:05 2011
@@ -12,13 +12,12 @@
<name>Amdatu Cassandra - User Admin Cassandra Store</name>
<description>Provides an implementation of the Pax UserAdmin
store</description>
+ <properties>
+ <pax.useradmin.version>0.0.1-amdatu1</pax.useradmin.version>
+ </properties>
+
<dependencies>
<dependency>
- <groupId>org.ops4j.pax.useradmin</groupId>
- <artifactId>pax-useradmin-service</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.amdatu.cassandra</groupId>
<artifactId>listener</artifactId>
<scope>provided</scope>
@@ -68,6 +67,12 @@
<scope>provided</scope>
<type>bundle</type>
</dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.useradmin</groupId>
+ <artifactId>pax-useradmin-service</artifactId>
+ <version>${pax.useradmin.version}</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
Modified: trunk/amdatu-cassandra/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/pom.xml (original)
+++ trunk/amdatu-cassandra/pom.xml Wed Apr 13 10:24:05 2011
@@ -5,12 +5,60 @@
<groupId>org.amdatu</groupId>
<artifactId>amdatu</artifactId>
<version>0.2.0-SNAPSHOT</version>
+ <relativePath>../amdatu-parent/pom.xml</relativePath>
</parent>
+ <groupId>org.amdatu</groupId>
<artifactId>org.amdatu.cassandra</artifactId>
+ <version>0.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Amdatu Cassandra</name>
<description>This project brings Apache Cassandra persistence services to
the Amdatu platform</description>
+ <properties>
+ <!-- Version of dependend projects -->
+ <amdatu.core.version>0.2.0-SNAPSHOT</amdatu.core.version>
+
+
+ <!-- Version of cassandra itself -->
+ <cassandra.version>0.7.4</cassandra.version>
+
+ <!-- Name of the Cassandra cluster this node is part of -->
+ <cassandra.clustername>'Amdatu Cluster'</cassandra.clustername>
+
+ <!-- Comma-separated list of IP addresses of nodes in the cassandra
cluster, i.e. "172.16.10.109,172.16.10.203" -->
+ <cassandra.seeds>127.0.0.1</cassandra.seeds>
+
+ <!-- Address for incoming cassandra connections. In case this is a
stand-alone node, define "localhost".
+ Otherwise, specify the IP address other nodes in the cluster will use
to connect to this node (they
+ define this IP address in their list of seeds). For example:
"172.16.11.108" -->
+ <cassandra.listen_address>localhost</cassandra.listen_address>
+
+ <!-- The default Cassandra replication factor -->
+
<cassandra.default_replication_factor>1</cassandra.default_replication_factor>
+
+ <!-- The READ consistency level -->
+ <cassandra.consistency_level_read>ONE</cassandra.consistency_level_read>
+
+ <!-- The WRITE consistency level -->
+ <cassandra.consistency_level_write>ONE</cassandra.consistency_level_write>
+
+ <!-- Auto bootstrap mode -->
+ <cassandra.autobootstrap>false</cassandra.autobootstrap>
+
+ <!-- The initial token. If you plan to later build a cluster including
this first instance, it is
+ recommended to set the initial token�s value to zero -->
+ <cassandra.initial_token />
+
+ <!-- The RPC address for other Thrift clients to connect to -->
+ <cassandra.rpc_address />
+
+ <!-- The RPC port for Thrift communication -->
+ <cassandra.rpc_port>9160</cassandra.rpc_port>
+
+ <!-- The storage port -->
+ <cassandra.storage_port>7000</cassandra.storage_port>
+ </properties>
+
<dependencyManagement>
<dependencies>
<dependency>
@@ -51,6 +99,20 @@
</dependencies>
</dependencyManagement>
+ <repositories>
+ <repository>
+ <id>riptano</id>
+ <name>Riptano Repository</name>
+ <url>http://mvn.riptano.com/content/repositories/riptano</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
<modules>
<module>cassandra-application</module>
<module>cassandra-gadgetstore</module>
Modified: trunk/amdatu-example/course-service/pom.xml
==============================================================================
--- trunk/amdatu-example/course-service/pom.xml (original)
+++ trunk/amdatu-example/course-service/pom.xml Wed Apr 13 10:24:05 2011
@@ -41,20 +41,6 @@
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.cassandra</groupId>
- <artifactId>listener</artifactId>
- <scope>provided</scope>
- <version>${project.version}</version>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.cassandra</groupId>
- <artifactId>application</artifactId>
- <scope>provided</scope>
- <version>${project.version}</version>
- <type>bundle</type>
- </dependency>
- <dependency>
<groupId>org.amdatu.core</groupId>
<artifactId>tenant</artifactId>
<scope>provided</scope>
Modified:
trunk/amdatu-example/course-service/src/main/java/org/amdatu/example/course/service/osgi/Activator.java
==============================================================================
---
trunk/amdatu-example/course-service/src/main/java/org/amdatu/example/course/service/osgi/Activator.java
(original)
+++
trunk/amdatu-example/course-service/src/main/java/org/amdatu/example/course/service/osgi/Activator.java
Wed Apr 13 10:24:05 2011
@@ -19,7 +19,6 @@
import java.util.Dictionary;
import java.util.Hashtable;
-import org.amdatu.cassandra.application.CassandraConfigurationService;
import org.amdatu.core.config.templates.ConfigTemplateManager;
import org.amdatu.example.course.service.CourseService;
import org.amdatu.example.course.service.service.CourseOntologyDataProvider;
@@ -43,7 +42,7 @@
/**
* This is the activator for the course service bundle
- *
+ *
* @author ivol
*/
public class Activator extends ServiceDependentActivator {
@@ -100,7 +99,6 @@
createComponent()
.setImplementation(ProfileDataProvider.class)
.add(createServiceDependency().setService(LogService.class).setRequired(true))
-
.add(createServiceDependency().setService(CassandraConfigurationService.class).setRequired(true))
.add(createServiceDependency().setService(PersonService.class).setRequired(true))
.add(createServiceDependency().setService(UserAdmin.class).setRequired(true)));
}
Modified:
trunk/amdatu-example/course-service/src/main/java/org/amdatu/example/course/service/service/ProfileDataProvider.java
==============================================================================
---
trunk/amdatu-example/course-service/src/main/java/org/amdatu/example/course/service/service/ProfileDataProvider.java
(original)
+++
trunk/amdatu-example/course-service/src/main/java/org/amdatu/example/course/service/service/ProfileDataProvider.java
Wed Apr 13 10:24:05 2011
@@ -17,7 +17,6 @@
package org.amdatu.example.course.service.service;
import org.amdatu.authorization.login.service.LoginService;
-import org.amdatu.cassandra.application.CassandraConfigurationService;
import org.amdatu.opensocial.profile.PersonService;
import org.amdatu.opensocial.profile.SerializablePersonImpl;
import org.apache.shindig.social.core.model.NameImpl;
@@ -29,7 +28,7 @@
import org.osgi.service.useradmin.UserAdmin;
/**
- * This class creates profiles and persons in Cassandra.
+ * This class creates profiles and persons in UserAdmin.
* @author ivol
* @exclude
*/
@@ -38,7 +37,6 @@
private volatile LogService m_logService;
private volatile UserAdmin m_userAdmin;
private volatile PersonService m_personService;
- private volatile CassandraConfigurationService m_cassandraConfig;
/**
* The init() method is invoked by the Felix dependency manager.
@@ -64,37 +62,33 @@
// FIXME: works for now but we should set some 'initialized'
property in config admin
// but since we are using fileinstall, that cannot be done using
ConfigurationAdmin
if (m_userAdmin.getRoles(null) == null ||
m_userAdmin.getRoles(null).length <= 2) {
- if (!m_cassandraConfig.isAutoBootstrapMode()) {
- m_logService.log(LogService.LOG_DEBUG, "Less then 2 roles
found in UserAdmin, creating test roles");
+ m_logService.log(LogService.LOG_DEBUG, "Less
then 2 roles found in UserAdmin, creating test roles");
- // Create 8 test profiles for "John Doe", "Jane Doe",
"George Doe", "Melissa Doe",
- // "Ted Brown", "Elisa Devis", "Mario Rossi" and "Maija
Meikalainen"
- createTestPerson("johnd", "John Doe", 43, new
String[]{"janed", "georged", "melissad", "marior"});
- createTestPerson("janed", "Jane Doe", 41, new
String[]{"johnd", "georged", "melissad", "maijam"});
- createTestPerson("georged", "George Doe", 13, new
String[]{"johnd", "janed", "melissad", "tedb"});
- createTestPerson("melissad", "Melissa Doe", 16, new
String[]{"johnd", "janed", "georged", "elisab"});
- createTestPerson("tedb", "Ted Brown", 13, new
String[]{"georged"});
- createTestPerson("elisad", "Elisa Davis", 15, new
String[]{"melissad"});
- createTestPerson("marior", "Mario Rossi", 54, new
String[]{"johnd"});
- createTestPerson("maijam", "Maija Meik\u00e4l\u00e4inen",
37, new String[]{"janed"});
-
- // Now create roles 'Teacher' and 'Student' and assign
basic members
- Group teacher = (Group) m_userAdmin.createRole("Teacher",
Role.GROUP);
- teacher.addMember(m_userAdmin.getRole("marior"));
- teacher.addMember(m_userAdmin.getRole("maijam"));
-
- Group student = (Group) m_userAdmin.createRole("Student",
Role.GROUP);
- student.addMember(m_userAdmin.getRole("elisad"));
- student.addMember(m_userAdmin.getRole("melissad"));
- student.addMember(m_userAdmin.getRole("tedb"));
- student.addMember(m_userAdmin.getRole("georged"));
-
- Group parent = (Group) m_userAdmin.createRole("Parent",
Role.GROUP);
- parent.addMember(m_userAdmin.getRole("janed"));
- parent.addMember(m_userAdmin.getRole("johnd"));
- } else {
- m_logService.log(LogService.LOG_DEBUG, "Running in auto
boostrap mode, no data inserted");
- }
+ // Create 8 test profiles for "John Doe", "Jane
Doe", "George Doe", "Melissa Doe",
+ // "Ted Brown", "Elisa Devis", "Mario Rossi"
and "Maija Meikalainen"
+ createTestPerson("johnd", "John Doe", 43, new
String[]{"janed", "georged", "melissad", "marior"});
+ createTestPerson("janed", "Jane Doe", 41, new
String[]{"johnd", "georged", "melissad", "maijam"});
+ createTestPerson("georged", "George Doe", 13,
new String[]{"johnd", "janed", "melissad", "tedb"});
+ createTestPerson("melissad", "Melissa Doe", 16,
new String[]{"johnd", "janed", "georged", "elisab"});
+ createTestPerson("tedb", "Ted Brown", 13, new
String[]{"georged"});
+ createTestPerson("elisad", "Elisa Davis", 15,
new String[]{"melissad"});
+ createTestPerson("marior", "Mario Rossi", 54,
new String[]{"johnd"});
+ createTestPerson("maijam", "Maija
Meik\u00e4l\u00e4inen", 37, new String[]{"janed"});
+
+ // Now create roles 'Teacher' and 'Student' and
assign basic members
+ Group teacher = (Group)
m_userAdmin.createRole("Teacher", Role.GROUP);
+
teacher.addMember(m_userAdmin.getRole("marior"));
+
teacher.addMember(m_userAdmin.getRole("maijam"));
+
+ Group student = (Group)
m_userAdmin.createRole("Student", Role.GROUP);
+
student.addMember(m_userAdmin.getRole("elisad"));
+
student.addMember(m_userAdmin.getRole("melissad"));
+ student.addMember(m_userAdmin.getRole("tedb"));
+
student.addMember(m_userAdmin.getRole("georged"));
+
+ Group parent = (Group)
m_userAdmin.createRole("Parent", Role.GROUP);
+ parent.addMember(m_userAdmin.getRole("janed"));
+ parent.addMember(m_userAdmin.getRole("johnd"));
} else {
m_logService.log(LogService.LOG_DEBUG, "Test users already
exist, none created");
}
Modified: trunk/amdatu-example/pom.xml
==============================================================================
--- trunk/amdatu-example/pom.xml (original)
+++ trunk/amdatu-example/pom.xml Wed Apr 13 10:24:05 2011
@@ -35,27 +35,6 @@
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.core.cassandra</groupId>
- <artifactId>application</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.core.cassandra</groupId>
- <artifactId>listener</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.core.cassandra</groupId>
- <artifactId>persistencemanager</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
<groupId>org.amdatu.core</groupId>
<artifactId>tenant</artifactId>
<version>${project.version}</version>
Modified: trunk/amdatu-release/pom.xml
==============================================================================
--- trunk/amdatu-release/pom.xml (original)
+++ trunk/amdatu-release/pom.xml Wed Apr 13 10:24:05 2011
@@ -10,6 +10,10 @@
<artifactId>amdatu-release</artifactId>
<name>Amdatu Release</name>
+ <properties>
+ <cassandra.project.version>0.2.0-SNAPSHOT</cassandra.project.version>
+ </properties>
+
<dependencies>
<!-- Authentication bundles -->
<dependency>
@@ -89,42 +93,42 @@
<dependency>
<groupId>org.amdatu.cassandra</groupId>
<artifactId>application</artifactId>
- <version>${project.version}</version>
+ <version>${cassandra.project.version}</version>
<scope>runtime</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.cassandra</groupId>
<artifactId>listener</artifactId>
- <version>${project.version}</version>
+ <version>${cassandra.project.version}</version>
<scope>runtime</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.cassandra</groupId>
<artifactId>persistencemanager</artifactId>
- <version>${project.version}</version>
+ <version>${cassandra.project.version}</version>
<scope>runtime</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.cassandra</groupId>
<artifactId>gadgetstore</artifactId>
- <version>${project.version}</version>
+ <version>${cassandra.project.version}</version>
<scope>runtime</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.cassandra</groupId>
<artifactId>useradminstore</artifactId>
- <version>${project.version}</version>
+ <version>${cassandra.project.version}</version>
<scope>runtime</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.cassandra</groupId>
<artifactId>tenantstore</artifactId>
- <version>${project.version}</version>
+ <version>${cassandra.project.version}</version>
<scope>runtime</scope>
<type>bundle</type>
</dependency>
Modified: trunk/pom.xml
==============================================================================
--- trunk/pom.xml (original)
+++ trunk/pom.xml Wed Apr 13 10:24:05 2011
@@ -40,42 +40,6 @@
tenant1.properties.hostname=${server.hostname}
</default.tenants>
- <!-- Name of the Cassandra cluster this node is part of -->
- <cassandra.clustername>'Amdatu Cluster'</cassandra.clustername>
-
- <!-- Comma-separated list of IP addresses of nodes in the cassandra
cluster, i.e. "172.16.10.109,172.16.10.203" -->
- <cassandra.seeds>127.0.0.1</cassandra.seeds>
-
- <!-- Address for incoming cassandra connections. In case this is a
stand-alone node, define "localhost".
- Otherwise, specify the IP address other nodes in the cluster will use
to connect to this node (they
- define this IP address in their list of seeds). For example:
"172.16.11.108" -->
- <cassandra.listen_address>localhost</cassandra.listen_address>
-
- <!-- The default Cassandra replication factor -->
-
<cassandra.default_replication_factor>1</cassandra.default_replication_factor>
-
- <!-- The READ consistency level -->
- <cassandra.consistency_level_read>ONE</cassandra.consistency_level_read>
-
- <!-- The WRITE consistency level -->
- <cassandra.consistency_level_write>ONE</cassandra.consistency_level_write>
-
- <!-- Auto bootstrap mode -->
- <cassandra.autobootstrap>false</cassandra.autobootstrap>
-
- <!-- The initial token. If you plan to later build a cluster including
this first instance, it is
- recommended to set the initial token�s value to zero -->
- <cassandra.initial_token />
-
- <!-- The RPC address for other Thrift clients to connect to -->
- <cassandra.rpc_address />
-
- <!-- The RPC port for Thrift communication -->
- <cassandra.rpc_port>9160</cassandra.rpc_port>
-
- <!-- The storage port -->
- <cassandra.storage_port>7000</cassandra.storage_port>
-
<!-- JMX configuration -->
<jmxremote.port />
<jmxremote.ssl>false</jmxremote.ssl>
@@ -117,7 +81,6 @@
Version numbers of platform bundles
-->
<shindig.version>2.0.0</shindig.version>
- <cassandra.version>0.7.4</cassandra.version>
</properties>
<prerequisites>
Modified: trunk/src/main/resources/conf/felix-config.properties
==============================================================================
--- trunk/src/main/resources/conf/felix-config.properties (original)
+++ trunk/src/main/resources/conf/felix-config.properties Wed Apr 13
10:24:05 2011
@@ -95,12 +95,12 @@
reference:file:amdatu-system/pax-swissbox-core-${pax.swissbox.version}.jar \
reference:file:amdatu-system/ops4j-base-lang-1.2.2.jar \
reference:file:amdatu-system/org.apache.felix.scr-1.6.0.jar \
-
reference:file:amdatu-application/org.amdatu.cassandra.application-${project.version}.jar
\
-
reference:file:amdatu-application/org.amdatu.cassandra.gadgetstore-${project.version}.jar
\
-
reference:file:amdatu-application/org.amdatu.cassandra.listener-${project.version}.jar
\
-
reference:file:amdatu-application/org.amdatu.cassandra.persistencemanager-${project.version}.jar
\
-
reference:file:amdatu-application/org.amdatu.cassandra.tenantstore-${project.version}.jar
\
-
reference:file:amdatu-application/org.amdatu.cassandra.useradminstore-${project.version}.jar
\
+
reference:file:amdatu-application/org.amdatu.cassandra.application-${cassandra.project.version}.jar
\
+
reference:file:amdatu-application/org.amdatu.cassandra.gadgetstore-${cassandra.project.version}.jar
\
+
reference:file:amdatu-application/org.amdatu.cassandra.listener-${cassandra.project.version}.jar
\
+
reference:file:amdatu-application/org.amdatu.cassandra.persistencemanager-${cassandra.project.version}.jar
\
+
reference:file:amdatu-application/org.amdatu.cassandra.tenantstore-${cassandra.project.version}.jar
\
+
reference:file:amdatu-application/org.amdatu.cassandra.useradminstore-${cassandra.project.version}.jar
\
reference:file:amdatu-core/org.amdatu.core.loghandler-${project.version}.jar \
reference:file:amdatu-core/org.amdatu.core.tenant-${project.version}.jar \
reference:file:amdatu-core/org.amdatu.core.tenantuseradmindecorator-${project.version}.jar
\
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
