Author: [email protected]
Date: Mon May 14 16:35:42 2012
New Revision: 2355
Log:
[AMDATUAUTH-156] Fixed release demo to use only Auth bundles
Added:
trunk/amdatu-release-demo/auth/src/main/resources/bin/run_auth.bat
trunk/amdatu-release-demo/auth/src/main/resources/bin/run_cassandra.bat
trunk/amdatu-release-demo/auth/src/main/resources/bin/run_opensocial.bat
trunk/amdatu-release-demo/pom.xml
Modified:
trunk/amdatu-release-demo/auth/pom.xml
trunk/amdatu-release-demo/auth/src/main/assembly/bin-component.xml
trunk/amdatu-release-demo/auth/src/main/resources/bin/run.bat
trunk/amdatu-release-demo/auth/src/main/resources/conf/amdatu-platform.properties
Modified: trunk/amdatu-release-demo/auth/pom.xml
==============================================================================
--- trunk/amdatu-release-demo/auth/pom.xml (original)
+++ trunk/amdatu-release-demo/auth/pom.xml Mon May 14 16:35:42 2012
@@ -34,6 +34,7 @@
<amdatu.tenant.id>tenant1</amdatu.tenant.id>
<amdatu.tenant.name>Tenant 1</amdatu.tenant.name>
+ <org.amdatu.auth.version>0.3.0-SNAPSHOT</org.amdatu.auth.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>
@@ -292,72 +293,105 @@
<dependency>
<groupId>org.amdatu.auth</groupId>
<artifactId>org.amdatu.auth.config</artifactId>
+ <version>${org.amdatu.auth.version}</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.amdatu.auth</groupId>
+ <artifactId>org.amdatu.auth.oauth.store.consumer.fs</artifactId>
+ <version>${org.amdatu.auth.version}</version>
+ <type>bundle</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.auth</groupId>
+ <artifactId>org.amdatu.auth.oauth.store.nonce.mem</artifactId>
+ <version>${org.amdatu.auth.version}</version>
+ <type>bundle</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.auth</groupId>
+ <artifactId>org.amdatu.auth.tokenstore.mem</artifactId>
+ <version>${org.amdatu.auth.version}</version>
+ <type>bundle</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.auth</groupId>
<artifactId>org.amdatu.auth.tokenprovider</artifactId>
+ <version>${org.amdatu.auth.version}</version>
<type>bundle</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.amdatu.auth</groupId>
<artifactId>org.amdatu.auth.oauth.api</artifactId>
+ <version>${org.amdatu.auth.version}</version>
<type>bundle</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.amdatu.auth</groupId>
<artifactId>org.amdatu.auth.oauth.consumerregistry</artifactId>
+ <version>${org.amdatu.auth.version}</version>
<type>bundle</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.amdatu.auth</groupId>
<artifactId>org.amdatu.auth.tools.loghandler</artifactId>
+ <version>${org.amdatu.auth.version}</version>
<type>bundle</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.amdatu.auth</groupId>
<artifactId>org.amdatu.auth.tools.shellcommands</artifactId>
+ <version>${org.amdatu.auth.version}</version>
<type>bundle</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.amdatu.auth</groupId>
<artifactId>org.amdatu.auth.login.service</artifactId>
+ <version>${org.amdatu.auth.version}</version>
<type>bundle</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.amdatu.auth</groupId>
<artifactId>org.amdatu.auth.useradmin.rest</artifactId>
+ <version>${org.amdatu.auth.version}</version>
<type>bundle</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.amdatu.auth</groupId>
<artifactId>org.amdatu.auth.oauth.client</artifactId>
+ <version>${org.amdatu.auth.version}</version>
<type>bundle</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.amdatu.auth</groupId>
<artifactId>org.amdatu.auth.oauth.server</artifactId>
+ <version>${org.amdatu.auth.version}</version>
<type>bundle</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.amdatu.auth</groupId>
<artifactId>org.amdatu.auth.example.oauth.consumer</artifactId>
+ <version>${org.amdatu.auth.version}</version>
<type>bundle</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.amdatu.auth</groupId>
<artifactId>org.amdatu.auth.example.oauth.provider</artifactId>
+ <version>${org.amdatu.auth.version}</version>
<type>bundle</type>
<scope>compile</scope>
</dependency>
Modified: trunk/amdatu-release-demo/auth/src/main/assembly/bin-component.xml
==============================================================================
--- trunk/amdatu-release-demo/auth/src/main/assembly/bin-component.xml
(original)
+++ trunk/amdatu-release-demo/auth/src/main/assembly/bin-component.xml Mon May
14 16:35:42 2012
@@ -55,9 +55,78 @@
<fileMode>0644</fileMode>
</dependencySet>
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputDirectory>deploy_auth</outputDirectory>
+ <includes>
+ <include>org.amdatu.auth:*</include>
+ </includes>
+ <excludes>
+
<exclude>org.amdatu.auth:org.amdatu.auth.example.oauth.consumer</exclude>
+
<exclude>org.amdatu.auth:org.amdatu.auth.example.oauth.provider</exclude>
+ <exclude>org.amdatu.auth:org.amdatu.auth.config</exclude>
+ </excludes>
+ <unpack>false</unpack>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ <directoryMode>0755</directoryMode>
+ <fileMode>0644</fileMode>
+ </dependencySet>
+
+ <!--Unpack the the config files to deploy directory -->
+ <dependencySet>
+ <outputDirectory>deploy_auth</outputDirectory>
+ <includes>
+ <include>org.amdatu.auth:org.amdatu.auth.config</include>
+ </includes>
+ <unpack>true</unpack>
+ <unpackOptions>
+ <excludes>
+ <exclude>META-INF/**</exclude>
+ </excludes>
+ <filtered>true</filtered>
+ </unpackOptions>
+ <outputFileNameMapping></outputFileNameMapping> <!-- MASSEMBLY-533 -->
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ </dependencySet>
+
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputDirectory>deploy_opensocial</outputDirectory>
+ <includes>
+ <include>org.amdatu.auth:*</include>
+ <include>org.amdatu.opensocial:*</include>
+ </includes>
+ <excludes>
+ <exclude>org.amdatu.auth:org.amdatu.auth.config</exclude>
+ <exclude>org.amdatu.opensocial:org.amdatu.opensocial.config</exclude>
+ </excludes>
+ <unpack>false</unpack>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ <directoryMode>0755</directoryMode>
+ <fileMode>0644</fileMode>
+ </dependencySet>
+
+ <!--Unpack the the config files to deploy directory -->
+ <dependencySet>
+ <outputDirectory>deploy_opensocial</outputDirectory>
+ <includes>
+ <include>org.amdatu.auth:org.amdatu.auth.config</include>
+ <include>org.amdatu.opensocial:org.amdatu.opensocial.config</include>
+ </includes>
+ <unpack>true</unpack>
+ <unpackOptions>
+ <excludes>
+ <exclude>META-INF/**</exclude>
+ </excludes>
+ <filtered>true</filtered>
+ </unpackOptions>
+ <outputFileNameMapping></outputFileNameMapping> <!-- MASSEMBLY-533 -->
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ </dependencySet>
+
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>deploy</outputDirectory>
+ <outputDirectory>deploy_cassandra</outputDirectory>
<includes>
<include>org.amdatu.auth:*</include>
<include>org.amdatu.opensocial:*</include>
@@ -76,7 +145,7 @@
<!--Unpack the the config files to deploy directory -->
<dependencySet>
- <outputDirectory>deploy</outputDirectory>
+ <outputDirectory>deploy_cassandra</outputDirectory>
<includes>
<include>org.amdatu.auth:org.amdatu.auth.config</include>
<include>org.amdatu.opensocial:org.amdatu.opensocial.config</include>
Added: trunk/amdatu-release-demo/auth/src/main/resources/bin/run_auth.bat
==============================================================================
--- (empty file)
+++ trunk/amdatu-release-demo/auth/src/main/resources/bin/run_auth.bat Mon May
14 16:35:42 2012
@@ -0,0 +1,21 @@
+@echo off
+
+rem Open a debug port
+set JAVA_OPTS=-Xdebug
-Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n
+
+rem Set memory options
+set JAVA_OPTS=%JAVA_OPTS% -Xms256m -Xmx1024m -XX:MaxPermSize=256m
+
+rem Felix property file
+set JAVA_OPTS=%JAVA_OPTS%
-Dfelix.config.properties=file:conf/amdatu-platform.properties
+
+rem Set encoding to UTF-8
+set JAVA_OPTS=%JAVA_OPTS% -Dfile.encoding=utf-8
+
+echo Starting Amdatu server
+echo JAVA_OPTS=%JAVA_OPTS%
+
+set JAVA_OPTS=%JAVA_OPTS% -Dfelix.fileinstall.dir=deploy_auth,multitenantweb
+
+java %JAVA_OPTS% -jar
lib/org.apache.felix.main-${org.apache.felix.main.version}.jar
+
Added: trunk/amdatu-release-demo/auth/src/main/resources/bin/run_cassandra.bat
==============================================================================
--- (empty file)
+++ trunk/amdatu-release-demo/auth/src/main/resources/bin/run_cassandra.bat
Mon May 14 16:35:42 2012
@@ -0,0 +1,21 @@
+@echo off
+
+rem Open a debug port
+set JAVA_OPTS=-Xdebug
-Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n
+
+rem Set memory options
+set JAVA_OPTS=%JAVA_OPTS% -Xms256m -Xmx1024m -XX:MaxPermSize=256m
+
+rem Felix property file
+set JAVA_OPTS=%JAVA_OPTS%
-Dfelix.config.properties=file:conf/amdatu-platform.properties
+
+rem Set encoding to UTF-8
+set JAVA_OPTS=%JAVA_OPTS% -Dfile.encoding=utf-8
+
+echo Starting Amdatu server
+echo JAVA_OPTS=%JAVA_OPTS%
+
+set JAVA_OPTS=%JAVA_OPTS%
-Dfelix.fileinstall.dir=deploy_cassandra,multitenantweb
+
+java %JAVA_OPTS% -jar
lib/org.apache.felix.main-${org.apache.felix.main.version}.jar
+
Added: trunk/amdatu-release-demo/auth/src/main/resources/bin/run_opensocial.bat
==============================================================================
--- (empty file)
+++ trunk/amdatu-release-demo/auth/src/main/resources/bin/run_opensocial.bat
Mon May 14 16:35:42 2012
@@ -0,0 +1,21 @@
+@echo off
+
+rem Open a debug port
+set JAVA_OPTS=-Xdebug
-Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n
+
+rem Set memory options
+set JAVA_OPTS=%JAVA_OPTS% -Xms256m -Xmx1024m -XX:MaxPermSize=256m
+
+rem Felix property file
+set JAVA_OPTS=%JAVA_OPTS%
-Dfelix.config.properties=file:conf/amdatu-platform.properties
+
+rem Set encoding to UTF-8
+set JAVA_OPTS=%JAVA_OPTS% -Dfile.encoding=utf-8
+
+echo Starting Amdatu server
+echo JAVA_OPTS=%JAVA_OPTS%
+
+set JAVA_OPTS=%JAVA_OPTS%
-Dfelix.fileinstall.dir=deploy_opensocial,multitenantweb
+
+java %JAVA_OPTS% -jar
lib/org.apache.felix.main-${org.apache.felix.main.version}.jar
+
Modified:
trunk/amdatu-release-demo/auth/src/main/resources/conf/amdatu-platform.properties
==============================================================================
---
trunk/amdatu-release-demo/auth/src/main/resources/conf/amdatu-platform.properties
(original)
+++
trunk/amdatu-release-demo/auth/src/main/resources/conf/amdatu-platform.properties
Mon May 14 16:35:42 2012
@@ -74,7 +74,6 @@
# Configuration for file install in a local development scenario. It
# should not be deployed and enabled in a real world deployment.
felix.fileinstall.poll=3000
-felix.fileinstall.dir=multitenantweb,deploy
felix.fileinstall.debug=1
felix.fileinstall.bundles.new.start=true
felix.fileinstall.filter=.*
Added: trunk/amdatu-release-demo/pom.xml
==============================================================================
--- (empty file)
+++ trunk/amdatu-release-demo/pom.xml Mon May 14 16:35:42 2012
@@ -0,0 +1,49 @@
+<?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</groupId>
+ <artifactId>amdatu</artifactId>
+ <version>6-RC2</version>
+ <relativePath>../amdatu-parent/pom.xml</relativePath>
+ </parent>
+ <artifactId>org.amdatu.auth.test.performance</artifactId>
+ <packaging>pom</packaging>
+ <name>Amdatu - Release demos</name>
+ <description>Root pom for release demos</description>
+
+ <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>
+ </repositories>
+
+ <modules>
+ <module>auth</module>
+ </modules>
+
+</project>
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
