Author: [email protected]
Date: Fri May 11 11:13:47 2012
New Revision: 2331
Log:
[AMDATUAUTH-123] Upgraded to 1.0.0-RC1
Added:
trunk/amdatu-auth/release-demo/src/main/resources/config/tenant-PLATFORM.tenant
trunk/amdatu-auth/release-demo/src/main/resources/config/tenant-tenant1.tenant
Modified:
trunk/amdatu-auth/pom.xml
trunk/amdatu-auth/release-demo/pom.xml
trunk/amdatu-auth/release-demo/src/main/assembly/bin-component.xml
trunk/amdatu-auth/release-demo/src/main/resources/config/tenant-tenant1.xml
Modified: trunk/amdatu-auth/pom.xml
==============================================================================
--- trunk/amdatu-auth/pom.xml (original)
+++ trunk/amdatu-auth/pom.xml Fri May 11 11:13:47 2012
@@ -32,8 +32,8 @@
<properties>
<!-- Version of dependend components -->
- <org.amdatu.platform.version>0.4.0-RC2</org.amdatu.platform.version>
-
<org.amdatu.platform.itest.version>0.4.0-SNAPSHOT</org.amdatu.platform.itest.version>
+ <org.amdatu.platform.version>1.0.0-RC1</org.amdatu.platform.version>
+
<org.amdatu.platform.itest.version>1.0.0-RC1</org.amdatu.platform.itest.version>
</properties>
<scm>
@@ -404,6 +404,24 @@
</execution>
</executions>
</plugin>
+
+ <plugin>
+ <groupId>org.amdatu.maven</groupId>
+ <artifactId>org.amdatu.maven.plugin</artifactId>
+ <configuration>
+ <clientEndpoint>http://localhost:8080/client/work</clientEndpoint>
+ <obrEndpoint>http://localhost:8080/obr</obrEndpoint>
+ </configuration>
+ <executions>
+ <execution>
+ <id>uploadToAmdatu</id>
+ <phase>package</phase>
+ <goals>
+ <goal>deployArtifact</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</pluginManagement>
Modified: trunk/amdatu-auth/release-demo/pom.xml
==============================================================================
--- trunk/amdatu-auth/release-demo/pom.xml (original)
+++ trunk/amdatu-auth/release-demo/pom.xml Fri May 11 11:13:47 2012
@@ -37,7 +37,7 @@
<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.tenant.version>1.0.0-RC1</org.amdatu.tenant.version>
<org.amdatu.fileinstall.version>${org.amdatu.tenant.version}</org.amdatu.fileinstall.version>
<org.amdatu.deployment.version>${org.amdatu.tenant.version}</org.amdatu.deployment.version>
<org.amdatu.eventadmin.version>${org.amdatu.tenant.version}</org.amdatu.eventadmin.version>
@@ -153,6 +153,13 @@
</dependency>
<dependency>
<groupId>org.amdatu.tenant</groupId>
+ <artifactId>org.amdatu.tenant.conf.rp</artifactId>
+ <version>${org.amdatu.tenant.version}</version>
+ <scope>runtime</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.tenant</groupId>
<artifactId>org.amdatu.tenant.factory</artifactId>
<version>${org.amdatu.tenant.version}</version>
<scope>runtime</scope>
@@ -165,6 +172,12 @@
<scope>compile</scope>
</dependency>
<dependency>
+ <groupId>org.amdatu.fileinstall</groupId>
+ <artifactId>org.amdatu.fileinstall.tenantconf</artifactId>
+ <version>${org.amdatu.fileinstall.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
<groupId>org.amdatu.deployment</groupId>
<artifactId>org.amdatu.deployment.autoconf</artifactId>
<version>${org.amdatu.deployment.version}</version>
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 Fri May
11 11:13:47 2012
@@ -28,8 +28,10 @@
<include>org.apache.ace:org.apache.ace.managementagent</include>
<include>org.amdatu.tenant:org.amdatu.tenant.api</include>
<include>org.amdatu.tenant:org.amdatu.tenant.adapter</include>
+ <include>org.amdatu.tenant:org.amdatu.tenant.conf.rp</include>
<include>org.amdatu.tenant:org.amdatu.tenant.factory</include>
<include>org.amdatu.fileinstall:org.amdatu.fileinstall.autoconf</include>
+
<include>org.amdatu.fileinstall:org.amdatu.fileinstall.tenantconf</include>
<include>org.amdatu.deployment:org.amdatu.deployment.autoconf</include>
<include>org.amdatu.configadmin:org.amdatu.multitenant.org.apache.felix.configadmin</include>
<include>org.amdatu.eventadmin:org.amdatu.multitenant.org.apache.felix.eventadmin</include>
Added:
trunk/amdatu-auth/release-demo/src/main/resources/config/tenant-PLATFORM.tenant
==============================================================================
--- (empty file)
+++
trunk/amdatu-auth/release-demo/src/main/resources/config/tenant-PLATFORM.tenant
Fri May 11 11:13:47 2012
@@ -0,0 +1,2 @@
+org.amdatu.tenant.pid=org.amdatu.tenant.PLATFORM
+org.amdatu.tenant.name=Platform tenant
Added:
trunk/amdatu-auth/release-demo/src/main/resources/config/tenant-tenant1.tenant
==============================================================================
--- (empty file)
+++
trunk/amdatu-auth/release-demo/src/main/resources/config/tenant-tenant1.tenant
Fri May 11 11:13:47 2012
@@ -0,0 +1,3 @@
+org.amdatu.tenant.pid=${amdatu.tenant.id}
+org.amdatu.tenant.name=${amdatu.tenant.name}
+org.amdatu.web.hostnames=${amdatu.http.hostname}
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
