Author: [email protected]
Date: Wed Jan 25 11:07:28 2012
New Revision: 1996
Log:
AMDATU-527 Final tweaks to layout / improved batch script
Modified:
trunk/amdatu-kitchensink/release-server/README
trunk/amdatu-kitchensink/release-server/src/main/assembly/bin-component.xml
trunk/amdatu-kitchensink/release-server/src/main/resources/bin/run.bat
Modified: trunk/amdatu-kitchensink/release-server/README
==============================================================================
--- trunk/amdatu-kitchensink/release-server/README (original)
+++ trunk/amdatu-kitchensink/release-server/README Wed Jan 25 11:07:28 2012
@@ -1,8 +1,24 @@
= Initial version of the Amdatu Platform Kitchensink server
-This server support running various demos agains various server
-configurations. Deployment is managed through fileinstall.
+This server support running various demos against various platform
+configurations.
-Currently HARDCODED in the run script:
+Available platform:
+0) minimal - Basic set of services
+1) multitenant - Multi-Tenant deployment
+
+
+Several kitchensink demos can be found in the demos directory. These
+can be deployed by copying files into the deploy directory.
+
+Available demo:
+0) demo-multitenant - Simple demonstration of gloabl/local services
+
+
+
+
+TODO:
+0) Properly fix bat/sh script
+1) Demo config files should be part of demo artifacts not the kitchensink
+2) Give platforms/demos a dir hierarchie to allow for documentation etc.
--Dfelix.fileinstall.dir=servers/platform-multitenant,servers/demo-multitenant
\ No newline at end of file
Modified:
trunk/amdatu-kitchensink/release-server/src/main/assembly/bin-component.xml
==============================================================================
--- trunk/amdatu-kitchensink/release-server/src/main/assembly/bin-component.xml
(original)
+++ trunk/amdatu-kitchensink/release-server/src/main/assembly/bin-component.xml
Wed Jan 25 11:07:28 2012
@@ -13,7 +13,7 @@
<useTransitiveDependencies>false</useTransitiveDependencies>
</dependencySet>
<dependencySet>
- <outputDirectory>servers/platform-minimal</outputDirectory>
+ <outputDirectory>servers/minimal</outputDirectory>
<includes>
<include>org.apache.felix:org.apache.felix.configadmin</include>
<include>org.apache.felix:org.apache.felix.dependencymanager</include>
@@ -31,7 +31,7 @@
<useTransitiveDependencies>false</useTransitiveDependencies>
</dependencySet>
<dependencySet>
- <outputDirectory>servers/platform-multitenant</outputDirectory>
+ <outputDirectory>servers/multitenant</outputDirectory>
<includes>
<include>org.apache.felix:org.apache.felix.dependencymanager</include>
<include>org.apache.felix:org.apache.felix.dependencymanager.shell</include>
@@ -53,9 +53,9 @@
<useTransitiveDependencies>false</useTransitiveDependencies>
</dependencySet>
<dependencySet>
- <outputDirectory>servers/demo-multitenant</outputDirectory>
+ <outputDirectory>demos/multitenant</outputDirectory>
<includes>
- <include>org.amdatu.kitchensink:*</include>
+
<include>org.amdatu.kitchensink:org.amdatu.kitchensink.demo.tenant.*</include>
</includes>
<unpack>false</unpack>
<useTransitiveDependencies>false</useTransitiveDependencies>
@@ -84,17 +84,17 @@
</fileSet>
<fileSet>
<directory>src/main/resources/config/platform-minimal</directory>
- <outputDirectory>servers/platform-minimal</outputDirectory>
+ <outputDirectory>servers/minimal</outputDirectory>
<filtered>true</filtered>
</fileSet>
<fileSet>
<directory>src/main/resources/config/platform-multitenant</directory>
- <outputDirectory>servers/platform-multitenant</outputDirectory>
+ <outputDirectory>servers/multitenant</outputDirectory>
<filtered>true</filtered>
</fileSet>
<fileSet>
<directory>src/main/resources/config/demo-multitenant</directory>
- <outputDirectory>servers/demo-multitenant</outputDirectory>
+ <outputDirectory>demos/multitenant</outputDirectory>
<filtered>true</filtered>
</fileSet>
</fileSets>
Modified: trunk/amdatu-kitchensink/release-server/src/main/resources/bin/run.bat
==============================================================================
--- trunk/amdatu-kitchensink/release-server/src/main/resources/bin/run.bat
(original)
+++ trunk/amdatu-kitchensink/release-server/src/main/resources/bin/run.bat
Wed Jan 25 11:07:28 2012
@@ -1,19 +1,63 @@
@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
-Dfelix.fileinstall.dir=servers/platform-multitenant,servers/demo-multitenant
+set CURRENT_DIR=%cd%
+if "%AMDATU_HOME%" == "" (
+ echo AMDATU_HOME not set using pwd..
+ set AMDATU_HOME=%CURRENT_DIR%
+)
+
+set WORK_DIR=%AMDATU_HOME%\work
+set PLATFORM_DIR=%AMDATU_HOME%\servers
+set DEMO_DIR=%AMDATU_HOME%\demos
+set DEPLOY_DIR=%AMDATU_HOME%\deploy
+
+if not exist "%DEPLOY_DIR%" (
+ mkdir %DEPLOY_DIR%
+)
+
+set platformName=minimal
+
+:loop
+if "%1"=="" goto continue
+if "%1"=="-h" goto showUsage
+if "%1"=="-c" goto doClean
+if "%1"=="-p" goto setPlatform
+shift
+goto loop
+
+:showUsage
+echo run [ options]
+echo -h show this help message
+echo -c clean cache before start
+echo -p select a platform (default is minimum)
+goto eof
+
+:doClean
+if exist "%WORK_DIR%" (
+ rd /Q /S %WORK_DIR%
+)
+shift
+goto loop
+
+:setPlatform
+shift
+if "%1"=="" goto usage
+if not exist "%PLATFORM_DIR%\%1" (
+ echo Platform not found: %1
+ goto eof
+)
+set platformName=%1
+shift
+goto loop
-rem Set encoding to UTF-8
+:continue
set JAVA_OPTS=%JAVA_OPTS% -Dfile.encoding=utf-8
+set JAVA_OPTS=%JAVA_OPTS% -Xms256m -Xmx1024m -XX:MaxPermSize=256m
+set JAVA_OPTS=-Xdebug
-Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n
+set JAVA_OPTS=%JAVA_OPTS%
-Dfelix.config.properties=file:conf/amdatu-platform.properties
+set JAVA_OPTS=%JAVA_OPTS%
-Dfelix.fileinstall.dir=%PLATFORM_DIR%\%platformName%,%DEPLOY_DIR%
-echo Starting Amdatu server
-echo JAVA_OPTS=%JAVA_OPTS%
-
-java %JAVA_OPTS% -jar
lib/org.apache.felix.main-${org.apache.felix.main.version}.jar
+echo Starting Amdatu server (%platformName%)
+"%JAVA_HOME%\bin\java" %JAVA_OPTS% -jar lib/org.apache.felix.main-4.0.2.jar
+:eof
\ No newline at end of file
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
