Author: [email protected]
Date: Wed May 9 11:31:26 2012
New Revision: 2324
Log:
[AMDATUAUTH-123] Multi tenancy fixes, added cassandra/opensocial to the release
demo and fixed performance test artifact
Modified:
trunk/amdatu-auth/oauth-example/consumer/pom.xml
trunk/amdatu-auth/release-demo/pom.xml
trunk/amdatu-auth/release-demo/src/main/assembly/bin-component.xml
trunk/amdatu-auth/test-performance/test-releases/auth-0.2.2/pom.xml
trunk/amdatu-auth/test-performance/test-releases/auth-0.2.2/src/main/assembly/bin-release.xml
trunk/amdatu-auth/test-performance/test-releases/auth-0.3.0/pom.xml
trunk/amdatu-auth/test-performance/test-releases/auth-0.3.0/src/main/assembly/bin-release.xml
trunk/amdatu-auth/test-performance/test-releases/pom.xml
Modified: trunk/amdatu-auth/oauth-example/consumer/pom.xml
==============================================================================
--- trunk/amdatu-auth/oauth-example/consumer/pom.xml (original)
+++ trunk/amdatu-auth/oauth-example/consumer/pom.xml Wed May 9 11:31:26 2012
@@ -115,7 +115,7 @@
<X-MultiTenant-Version>1</X-MultiTenant-Version>
<X-MultiTenant-Bundle-Activator>org.amdatu.auth.example.oauth.consumer.osgi.Activator</X-MultiTenant-Bundle-Activator>
<X-MultiTenant-Binding>TENANTS</X-MultiTenant-Binding>
-
<X-MultiTenant-Scope>(|(org.amdatu.tenant.pid=%TENANTPID%)(objectClass=org.osgi.service.log.LogService))</X-MultiTenant-Scope>
+
<X-MultiTenant-Scope>(|(org.amdatu.tenant.pid=%TENANTPID%)(objectClass=org.osgi.service.log.LogService)(objectClass=org.amdatu.web.rest.jaxrs.JaxRsSpi))</X-MultiTenant-Scope>
<Bundle-Activator>org.amdatu.tenant.adapter.MultiTenantBundleActivator</Bundle-Activator>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Embed-Dependency>*;scope=compile</Embed-Dependency>
Modified: trunk/amdatu-auth/release-demo/pom.xml
==============================================================================
--- trunk/amdatu-auth/release-demo/pom.xml (original)
+++ trunk/amdatu-auth/release-demo/pom.xml Wed May 9 11:31:26 2012
@@ -34,8 +34,8 @@
<amdatu.tenant.id>tenant1</amdatu.tenant.id>
<amdatu.tenant.name>Tenant 1</amdatu.tenant.name>
- <org.amdatu.cassandra.version>0.2.2</org.amdatu.cassandra.version>
- <org.amdatu.opensocial.version>0.2.0</org.amdatu.opensocial.version>
+ <org.amdatu.cassandra.version>0.3.0-SNAPSHOT</org.amdatu.cassandra.version>
+
<org.amdatu.opensocial.version>0.3.0-SNAPSHOT</org.amdatu.opensocial.version>
<org.amdatu.tenant.version>0.4.0-RC2</org.amdatu.tenant.version>
<org.amdatu.fileinstall.version>${org.amdatu.tenant.version}</org.amdatu.fileinstall.version>
@@ -171,37 +171,44 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.amdatu.eventadmin</groupId>
-
<artifactId>org.amdatu.multitenant.org.apache.felix.eventadmin</artifactId>
+ <groupId>org.amdatu.eventadmin</groupId>
+
<artifactId>org.amdatu.multitenant.org.apache.felix.eventadmin</artifactId>
<version>${org.amdatu.eventadmin.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.amdatu.configadmin</groupId>
-
<artifactId>org.amdatu.multitenant.org.apache.felix.configadmin</artifactId>
+ <groupId>org.amdatu.configadmin</groupId>
+
<artifactId>org.amdatu.multitenant.org.apache.felix.configadmin</artifactId>
<version>${org.amdatu.configadmin.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.amdatu.preferences</groupId>
- <artifactId>org.amdatu.multitenant.org.apache.felix.prefs</artifactId>
+ <groupId>org.amdatu.preferences</groupId>
+ <artifactId>org.amdatu.multitenant.org.apache.felix.prefs</artifactId>
<version>${org.amdatu.preferences.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.amdatu.useradmin</groupId>
-
<artifactId>org.amdatu.multitenant.org.ops4j.pax.useradmin.pax-useradmin-service</artifactId>
+ <groupId>org.amdatu.useradmin</groupId>
+
<artifactId>org.amdatu.multitenant.org.ops4j.pax.useradmin.pax-useradmin-service</artifactId>
<version>${org.amdatu.useradmin.version}</version>
<scope>runtime</scope>
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.useradmin</groupId>
-
<artifactId>org.amdatu.multitenant.org.amdatu.useradmin.pax.fsstorage</artifactId>
+ <groupId>org.amdatu.useradmin</groupId>
+
<artifactId>org.amdatu.multitenant.org.amdatu.useradmin.pax.fsstorage</artifactId>
<version>${org.amdatu.useradmin.version}</version>
<scope>runtime</scope>
<type>bundle</type>
</dependency>
+ <dependency>
+ <groupId>org.amdatu.template</groupId>
+ <artifactId>org.amdatu.template.processor</artifactId>
+ <version>${org.amdatu.template.version}</version>
+ <scope>runtime</scope>
+ <type>bundle</type>
+ </dependency>
<!-- Web dependencies -->
<dependency>
@@ -277,12 +284,6 @@
</dependency>
<dependency>
<groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.tokenstore.mem</artifactId>
- <type>bundle</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.amdatu.auth</groupId>
<artifactId>org.amdatu.auth.tokenprovider</artifactId>
<type>bundle</type>
<scope>compile</scope>
@@ -301,13 +302,13 @@
</dependency>
<dependency>
<groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.oauth.store.consumer.mem</artifactId>
+ <artifactId>org.amdatu.auth.tools.loghandler</artifactId>
<type>bundle</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.tools.loghandler</artifactId>
+ <artifactId>org.amdatu.auth.tools.shellcommands</artifactId>
<type>bundle</type>
<scope>compile</scope>
</dependency>
@@ -337,31 +338,18 @@
</dependency>
<dependency>
<groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.oauth.store.nonce.mem</artifactId>
- <type>bundle</type>
- <scope>compile</scope>
- </dependency>
-
-
-<!--
- <dependency>
- <groupId>org.amdatu.auth</groupId>
<artifactId>org.amdatu.auth.example.oauth.consumer</artifactId>
<type>bundle</type>
- <version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.amdatu.auth</groupId>
<artifactId>org.amdatu.auth.example.oauth.provider</artifactId>
<type>bundle</type>
- <version>${project.version}</version>
<scope>compile</scope>
</dependency>
- -->
<!-- Add the OpenSocial dependencies -->
- <!--
<dependency>
<groupId>org.amdatu.opensocial</groupId>
<artifactId>org.amdatu.opensocial.dashboard</artifactId>
@@ -388,12 +376,22 @@
</dependency>
<dependency>
<groupId>org.amdatu.opensocial</groupId>
+ <artifactId>org.amdatu.opensocial.shindig-lib</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>
- -->
- <!-- Disable until OpenSocial 0.2.1-RC1 is out
+ <dependency>
+ <groupId>org.amdatu.opensocial</groupId>
+ <artifactId>org.amdatu.opensocial.gadgetcontainer</artifactId>
+ <version>${org.amdatu.opensocial.version}</version>
+ <scope>compile</scope>
+ </dependency>
<dependency>
<groupId>org.amdatu.opensocial</groupId>
<artifactId>org.amdatu.opensocial.gadgetpack</artifactId>
@@ -414,7 +412,81 @@
<type>bundle</type>
<scope>compile</scope>
</dependency>
- -->
+
+ <!-- Add all the Cassandra dependencies -->
+ <dependency>
+ <groupId>org.amdatu.cassandra</groupId>
+ <artifactId>org.amdatu.cassandra.application</artifactId>
+ <version>${org.amdatu.cassandra.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.cassandra</groupId>
+ <artifactId>org.amdatu.cassandra.client</artifactId>
+ <version>${org.amdatu.cassandra.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.cassandra</groupId>
+ <artifactId>org.amdatu.cassandra.hector</artifactId>
+ <version>${org.amdatu.cassandra.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.cassandra</groupId>
+ <artifactId>org.amdatu.cassandra.listener</artifactId>
+ <version>${org.amdatu.cassandra.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.cassandra</groupId>
+ <artifactId>org.amdatu.cassandra.persistencemanager</artifactId>
+ <version>${org.amdatu.cassandra.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.cassandra</groupId>
+ <artifactId>org.amdatu.cassandra.persistencemanager.hector</artifactId>
+ <version>${org.amdatu.cassandra.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.cassandra</groupId>
+ <artifactId>org.amdatu.cassandra.store.consumer</artifactId>
+ <version>${org.amdatu.cassandra.version}</version>
+ <type>bundle</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.cassandra</groupId>
+ <artifactId>org.amdatu.cassandra.store.gadget</artifactId>
+ <version>${org.amdatu.cassandra.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.cassandra</groupId>
+ <artifactId>org.amdatu.cassandra.store.nonce</artifactId>
+ <version>${org.amdatu.cassandra.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.cassandra</groupId>
+ <artifactId>org.amdatu.cassandra.store.token</artifactId>
+ <version>${org.amdatu.cassandra.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.cassandra</groupId>
+ <artifactId>org.amdatu.cassandra.store.useradmin</artifactId>
+ <version>${org.amdatu.cassandra.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.cassandra</groupId>
+ <artifactId>org.amdatu.cassandra.config</artifactId>
+ <version>${org.amdatu.cassandra.version}</version>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
<build>
<defaultGoal>package</defaultGoal>
Modified: trunk/amdatu-auth/release-demo/src/main/assembly/bin-component.xml
==============================================================================
--- trunk/amdatu-auth/release-demo/src/main/assembly/bin-component.xml
(original)
+++ trunk/amdatu-auth/release-demo/src/main/assembly/bin-component.xml Wed May
9 11:31:26 2012
@@ -45,6 +45,7 @@
<include>org.amdatu.web:org.amdatu.web.wink</include>
<include>org.amdatu.web:org.amdatu.web.jsp</include>
<include>org.amdatu.web:org.amdatu.web.resource</include>
+ <include>org.amdatu.template:org.amdatu.template.processor</include>
</includes>
<unpack>false</unpack>
<useTransitiveDependencies>false</useTransitiveDependencies>
@@ -58,10 +59,12 @@
<includes>
<include>org.amdatu.auth:*</include>
<include>org.amdatu.opensocial:*</include>
+ <include>org.amdatu.cassandra:*</include>
</includes>
<excludes>
<exclude>org.amdatu.auth:org.amdatu.auth.config</exclude>
<exclude>org.amdatu.opensocial:org.amdatu.opensocial.config</exclude>
+ <exclude>org.amdatu.cassandra:org.amdatu.cassandra.config</exclude>
</excludes>
<unpack>false</unpack>
<useTransitiveDependencies>false</useTransitiveDependencies>
@@ -75,6 +78,7 @@
<includes>
<include>org.amdatu.auth:org.amdatu.auth.config</include>
<include>org.amdatu.opensocial:org.amdatu.opensocial.config</include>
+ <include>org.amdatu.cassandra:org.amdatu.cassandra.config</include>
</includes>
<unpack>true</unpack>
<unpackOptions>
Modified: trunk/amdatu-auth/test-performance/test-releases/auth-0.2.2/pom.xml
==============================================================================
--- trunk/amdatu-auth/test-performance/test-releases/auth-0.2.2/pom.xml
(original)
+++ trunk/amdatu-auth/test-performance/test-releases/auth-0.2.2/pom.xml Wed May
9 11:31:26 2012
@@ -27,11 +27,10 @@
<packaging>pom</packaging>
<properties>
- <!-- Release version is the next release version (i.e 0.3.0), current
- version is the actual version (i.e. 0.3.0-SNAPSHOT) -->
+ <!-- Release version is the final release version (i.e 0.3.0), current
+ version is the actual version (i.e. 0.3.0-SNAPSHOT or 0.3.0-RC1) -->
<release.version>0.2.2</release.version>
- <!-- FIXME: should become 0.2.2-RC2 or final -->
- <current.version>0.2.2-SNAPSHOT</current.version>
+ <current.version>0.2.2-RC2-SNAPSHOT</current.version>
</properties>
<dependencies>
@@ -59,6 +58,28 @@
</plugin>
</plugins>
</pluginManagement>
+
+ <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/bin-release.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
</project>
Modified:
trunk/amdatu-auth/test-performance/test-releases/auth-0.2.2/src/main/assembly/bin-release.xml
==============================================================================
---
trunk/amdatu-auth/test-performance/test-releases/auth-0.2.2/src/main/assembly/bin-release.xml
(original)
+++
trunk/amdatu-auth/test-performance/test-releases/auth-0.2.2/src/main/assembly/bin-release.xml
Wed May 9 11:31:26 2012
@@ -19,6 +19,7 @@
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
http://maven.apache.org/xsd/assembly-1.1.2.xsd";>
<id>bin</id>
<formats>
+ <format>dir</format>
<format>zip</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
Modified: trunk/amdatu-auth/test-performance/test-releases/auth-0.3.0/pom.xml
==============================================================================
--- trunk/amdatu-auth/test-performance/test-releases/auth-0.3.0/pom.xml
(original)
+++ trunk/amdatu-auth/test-performance/test-releases/auth-0.3.0/pom.xml Wed May
9 11:31:26 2012
@@ -58,42 +58,28 @@
</plugin>
</plugins>
</pluginManagement>
- </build>
- <profiles>
- <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/bin-release.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+ <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/bin-release.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified:
trunk/amdatu-auth/test-performance/test-releases/auth-0.3.0/src/main/assembly/bin-release.xml
==============================================================================
---
trunk/amdatu-auth/test-performance/test-releases/auth-0.3.0/src/main/assembly/bin-release.xml
(original)
+++
trunk/amdatu-auth/test-performance/test-releases/auth-0.3.0/src/main/assembly/bin-release.xml
Wed May 9 11:31:26 2012
@@ -19,6 +19,7 @@
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
http://maven.apache.org/xsd/assembly-1.1.2.xsd";>
<id>bin</id>
<formats>
+ <format>dir</format>
<format>zip</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
Modified: trunk/amdatu-auth/test-performance/test-releases/pom.xml
==============================================================================
--- trunk/amdatu-auth/test-performance/test-releases/pom.xml (original)
+++ trunk/amdatu-auth/test-performance/test-releases/pom.xml Wed May 9
11:31:26 2012
@@ -32,39 +32,4 @@
<module>auth-0.3.0</module>
</modules>
- <profiles>
- <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/bin-release.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
