Author: ivol37 at gmail.com
Date: Wed Nov 10 14:29:00 2010
New Revision: 346
Log:
[AMDATU-129] Ongoing Refactoring/moving of SVN layout
Modified:
trunk/amdatu-core/cassandra-useradminstore/pom.xml
trunk/amdatu-core/tenant/pom.xml
trunk/amdatu-example/course-service/pom.xml
trunk/amdatu-opensocial/profile-service/pom.xml
trunk/amdatu-release/pom.xml
trunk/integration-tests/pom.xml
trunk/integration-tests/src/test/java/org/amdatu/test/integration/base/IntegrationTestBase.java
trunk/pom.xml
trunk/src/main/resources/conf/felix-config.properties
Modified: trunk/amdatu-core/cassandra-useradminstore/pom.xml
==============================================================================
--- trunk/amdatu-core/cassandra-useradminstore/pom.xml (original)
+++ trunk/amdatu-core/cassandra-useradminstore/pom.xml Wed Nov 10 14:29:00 2010
@@ -7,8 +7,8 @@
<artifactId>org.amdatu.core</artifactId>
<version>0.0.6-SNAPSHOT</version>
</parent>
- <groupId>org.amdatu.core</groupId>
- <artifactId>useradmin-cassandra-store</artifactId>
+ <groupId>org.amdatu.core.cassandra</groupId>
+ <artifactId>useradminstore</artifactId>
<packaging>bundle</packaging>
<name>Amdatu Core - User Admin Cassandra Store</name>
<description>Provides an implementation of the Pax UserAdmin
store</description>
@@ -39,7 +39,7 @@
</dependency>
<dependency>
<groupId>org.amdatu.core</groupId>
- <artifactId>tenant-service</artifactId>
+ <artifactId>tenant</artifactId>
<scope>provided</scope>
<type>bundle</type>
</dependency>
Modified: trunk/amdatu-core/tenant/pom.xml
==============================================================================
--- trunk/amdatu-core/tenant/pom.xml (original)
+++ trunk/amdatu-core/tenant/pom.xml Wed Nov 10 14:29:00 2010
@@ -8,7 +8,7 @@
<version>0.0.6-SNAPSHOT</version>
</parent>
<groupId>org.amdatu.core</groupId>
- <artifactId>tenant-service</artifactId>
+ <artifactId>tenant</artifactId>
<packaging>bundle</packaging>
<name>Amdatu Core - Tenant Service</name>
<description>This bundle provides a tenant management service with tenant
CRUD operations</description>
@@ -51,7 +51,7 @@
<configuration>
<instructions>
<Bundle-Activator>org.amdatu.core.tenant.osgi.Activator</Bundle-Activator>
-
<Bundle-SymbolicName>org.amdatu.core.tenant-service</Bundle-SymbolicName>
+ <Bundle-SymbolicName>org.amdatu.core.tenant</Bundle-SymbolicName>
<Export-Package>
org.amdatu.core.tenant
</Export-Package>
Modified: trunk/amdatu-example/course-service/pom.xml
==============================================================================
--- trunk/amdatu-example/course-service/pom.xml (original)
+++ trunk/amdatu-example/course-service/pom.xml Wed Nov 10 14:29:00 2010
@@ -40,7 +40,7 @@
</dependency>
<dependency>
<groupId>org.amdatu.core</groupId>
- <artifactId>tenant-service</artifactId>
+ <artifactId>tenant</artifactId>
<scope>provided</scope>
<type>bundle</type>
</dependency>
Modified: trunk/amdatu-opensocial/profile-service/pom.xml
==============================================================================
--- trunk/amdatu-opensocial/profile-service/pom.xml (original)
+++ trunk/amdatu-opensocial/profile-service/pom.xml Wed Nov 10 14:29:00 2010
@@ -40,7 +40,7 @@
</dependency>
<dependency>
<groupId>org.amdatu.core</groupId>
- <artifactId>tenant-service</artifactId>
+ <artifactId>tenant</artifactId>
<scope>provided</scope>
<type>bundle</type>
</dependency>
Modified: trunk/amdatu-release/pom.xml
==============================================================================
--- trunk/amdatu-release/pom.xml (original)
+++ trunk/amdatu-release/pom.xml Wed Nov 10 14:29:00 2010
@@ -154,7 +154,7 @@
</dependency>
<dependency>
<groupId>org.amdatu.core</groupId>
- <artifactId>tenant-service</artifactId>
+ <artifactId>tenant</artifactId>
<version>${platform.version}</version>
<scope>runtime</scope>
<type>bundle</type>
Modified: trunk/integration-tests/pom.xml
==============================================================================
--- trunk/integration-tests/pom.xml (original)
+++ trunk/integration-tests/pom.xml Wed Nov 10 14:29:00 2010
@@ -80,7 +80,7 @@
</dependency>
<dependency>
<groupId>org.amdatu.core</groupId>
- <artifactId>tenant-service</artifactId>
+ <artifactId>tenant</artifactId>
<scope>test</scope>
<type>bundle</type>
</dependency>
Modified:
trunk/integration-tests/src/test/java/org/amdatu/test/integration/base/IntegrationTestBase.java
==============================================================================
---
trunk/integration-tests/src/test/java/org/amdatu/test/integration/base/IntegrationTestBase.java
(original)
+++
trunk/integration-tests/src/test/java/org/amdatu/test/integration/base/IntegrationTestBase.java
Wed Nov 10 14:29:00 2010
@@ -281,7 +281,7 @@
}
protected static MavenArtifactProvisionOption amdatuTenantService() {
- return
mavenBundle().groupId("org.amdatu.core").artifactId("tenant-service").versionAsInProject();
+ return
mavenBundle().groupId("org.amdatu.core").artifactId("tenant").versionAsInProject();
}
protected static MavenArtifactProvisionOption
amdatuCassandraPersistenceManager() {
Modified: trunk/pom.xml
==============================================================================
--- trunk/pom.xml (original)
+++ trunk/pom.xml Wed Nov 10 14:29:00 2010
@@ -339,7 +339,7 @@
</dependency>
<dependency>
<groupId>org.amdatu.core</groupId>
- <artifactId>tenant-service</artifactId>
+ <artifactId>tenant</artifactId>
<version>${platform.version}</version>
<scope>provided</scope>
<type>bundle</type>
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 Nov 10
14:29:00 2010
@@ -77,7 +77,7 @@
# component is the target start level. Any number of these properties
# may be specified for different start levels.
felix.auto.start.1=reference:file:amdatu-system/org.apache.felix.configadmin-1.2.4.jar
reference:file:amdatu-system/org.apache.felix.dependencymanager-3.0.0-SNAPSHOT.jar
reference:file:amdatu-system/org.apache.felix.eventadmin-1.2.2.jar
reference:file:amdatu-system/org.apache.felix.fileinstall-3.0.0.jar
reference:file:amdatu-system/org.apache.felix.log-1.0.0.jar
reference:file:amdatu-system/org.apache.felix.main-2.0.5.jar
reference:file:amdatu-system/org.apache.felix.metatype-1.0.4.jar
reference:file:amdatu-system/org.apache.felix.shell.tui-1.4.1.jar
reference:file:amdatu-system/org.apache.felix.shell-1.4.2.jar
reference:file:amdatu-system/org.apache.felix.webconsole-3.1.2.jar
reference:file:amdatu-system/org.apache.sling.commons.mime-2.1.4.jar
reference:file:amdatu-system/org.apache.sling.commons.osgi-2.0.6.jar
reference:file:amdatu-system/org.osgi.compendium-1.0.0.jar
reference:file:amdatu-system/org.osgi.core-1.0.0.jar
reference:file:amdatu-system/pax-useradmin-service-0.0.1-SNAPSHOT.jar
reference:file:amdatu-system/org.apache.felix.http.bundle-${org.apache.felix.http.version}.jar
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
-felix.auto.start.2=reference:file:amdatu-core/org.amdatu.core.config.filebased-${platform.version}.jar
reference:file:amdatu-core/org.amdatu.core.cassandra-application-${platform.version}.jar
reference:file:amdatu-core/org.amdatu.core.cassandra-listener-${platform.version}.jar
reference:file:amdatu-core/org.amdatu.core.cassandra-persistencemanager-${platform.version}.jar
reference:file:amdatu-core/org.amdatu.core.loghandler-${platform.version}.jar
reference:file:amdatu-core/org.amdatu.core.tenant-service-${platform.version}.jar
reference:file:amdatu-core/org.amdatu.core.config.templates-${platform.version}.jar
reference:file:amdatu-core/org.amdatu.core.useradmin-cassandra-store-${platform.version}.jar
reference:file:amdatu-application/org.amdatu.web.rest.jaxrs-${platform.version}.jar
reference:file:amdatu-application/org.amdatu.web.rest.wink-${platform.version}.jar
+felix.auto.start.2=reference:file:amdatu-core/org.amdatu.core.config.filebased-${platform.version}.jar
reference:file:amdatu-core/org.amdatu.core.cassandra-application-${platform.version}.jar
reference:file:amdatu-core/org.amdatu.core.cassandra-listener-${platform.version}.jar
reference:file:amdatu-core/org.amdatu.core.cassandra-persistencemanager-${platform.version}.jar
reference:file:amdatu-core/org.amdatu.core.loghandler-${platform.version}.jar
reference:file:amdatu-core/org.amdatu.core.tenant-${platform.version}.jar
reference:file:amdatu-core/org.amdatu.core.config.templates-${platform.version}.jar
reference:file:amdatu-core/org.amdatu.core.useradmin-cassandra-store-${platform.version}.jar
reference:file:amdatu-application/org.amdatu.web.rest.jaxrs-${platform.version}.jar
reference:file:amdatu-application/org.amdatu.web.rest.wink-${platform.version}.jar
felix.auto.start.10=reference:file:amdatu-application/org.amdatu.opensocial.shindig-${platform.version}.jar
reference:file:amdatu-application/org.amdatu.opensocial.profile-${platform.version}.jar
reference:file:amdatu-application/org.amdatu.authorization.login.service-${platform.version}.jar
reference:file:amdatu-application/org.amdatu.web.httpcontext-${platform.version}.jar
reference:file:amdatu-application/org.amdatu.semanticweb.sesame-${platform.version}.jar
reference:file:amdatu-application/org.amdatu.opensocial.dashboard-${platform.version}.jar
reference:file:amdatu-application/org.amdatu.opensocial.gadgetmanagement-${platform.version}.jar
reference:file:amdatu-application/org.amdatu.web.jsp-${platform.version}.jar
reference:file:amdatu-application/org.amdatu.semanticweb.sparqlendpoint-${platform.version}.jar
reference:file:amdatu-application/org.amdatu.authorization.login.gadget-${platform.version}.jar
felix.auto.start.20=reference:file:amdatu-examples/org.amdatu.example.friendsgadget-${platform.version}.jar
reference:file:amdatu-examples/org.amdatu.example.coursegadget-${platform.version}.jar
reference:file:amdatu-examples/org.amdatu.example.courseservice-${platform.version}.jar
