Author: [email protected]
Date: Thu Feb 17 16:03:30 2011
New Revision: 802
Log:
AMDATU-306 replaced hardcoded felix main version with param in scripts
Modified:
branches/0.2/src/main/resources/conf/amdatu-minimal.properties
branches/0.2/src/main/resources/conf/amdatu-web.properties
branches/0.2/src/main/resources/conf/felix-config.properties
branches/0.2/src/main/resources/shell/run.sh
branches/0.2/src/main/resources/shell/startup.bat
Modified: branches/0.2/src/main/resources/conf/amdatu-minimal.properties
==============================================================================
--- branches/0.2/src/main/resources/conf/amdatu-minimal.properties
(original)
+++ branches/0.2/src/main/resources/conf/amdatu-minimal.properties Thu Feb
17 16:03:30 2011
@@ -81,7 +81,7 @@
reference:file:amdatu-system/org.apache.felix.eventadmin-1.2.2.jar \
reference:file:amdatu-system/org.apache.felix.fileinstall-${org.apache.felix.file.install.version}.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.main-${org.apache.felix.main.version}.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 \
Modified: branches/0.2/src/main/resources/conf/amdatu-web.properties
==============================================================================
--- branches/0.2/src/main/resources/conf/amdatu-web.properties (original)
+++ branches/0.2/src/main/resources/conf/amdatu-web.properties Thu Feb 17
16:03:30 2011
@@ -81,7 +81,7 @@
reference:file:amdatu-system/org.apache.felix.eventadmin-1.2.2.jar \
reference:file:amdatu-system/org.apache.felix.fileinstall-${org.apache.felix.file.install.version}.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.main-${org.apache.felix.main.version}.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 \
Modified: branches/0.2/src/main/resources/conf/felix-config.properties
==============================================================================
--- branches/0.2/src/main/resources/conf/felix-config.properties
(original)
+++ branches/0.2/src/main/resources/conf/felix-config.properties Thu Feb
17 16:03:30 2011
@@ -81,7 +81,7 @@
reference:file:amdatu-system/org.apache.felix.eventadmin-1.2.2.jar \
reference:file:amdatu-system/org.apache.felix.fileinstall-${org.apache.felix.file.install.version}.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.main-${org.apache.felix.main.version}.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 \
Modified: branches/0.2/src/main/resources/shell/run.sh
==============================================================================
--- branches/0.2/src/main/resources/shell/run.sh (original)
+++ branches/0.2/src/main/resources/shell/run.sh Thu Feb 17 16:03:30 2011
@@ -18,4 +18,4 @@
fi
# Run the platform...
-java $JAVA_OPTS -jar amdatu-system/org.apache.felix.main-2.0.5.jar
+java $JAVA_OPTS -jar
amdatu-system/org.apache.felix.main-${org.apache.felix.main.version}.jar
Modified: branches/0.2/src/main/resources/shell/startup.bat
==============================================================================
--- branches/0.2/src/main/resources/shell/startup.bat (original)
+++ branches/0.2/src/main/resources/shell/startup.bat Thu Feb 17 16:03:30 2011
@@ -22,5 +22,5 @@
echo Starting Amdatu server
echo JAVA_OPTS=%JAVA_OPTS%
-java %JAVA_OPTS% -jar amdatu-system/org.apache.felix.main-2.0.5.jar
+java %JAVA_OPTS% -jar
amdatu-system/org.apache.felix.main-${org.apache.felix.main.version}.jar
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
