Author: jawi
Date: Wed Jul 12 17:50:35 2017
New Revision: 1801762
URL: http://svn.apache.org/viewvc?rev=1801762&view=rev
Log:
Fixed some minor dings and dents:
- added explicit setting for the OBR location to the Gogo scripts, as these
scripts are more than often used as starting point for other ACE related
scripts;
- fixed the line endings on a single configuration file.
Modified:
ace/trunk/run-server-allinone/conf/org.apache.ace.client.repository.cfg
ace/trunk/run-server-allinone/scripts/addbundles.gogo
ace/trunk/run-server-allinone/scripts/clear.gogo
ace/trunk/run-server-allinone/scripts/test_autoconf.gogo
Modified:
ace/trunk/run-server-allinone/conf/org.apache.ace.client.repository.cfg
URL:
http://svn.apache.org/viewvc/ace/trunk/run-server-allinone/conf/org.apache.ace.client.repository.cfg?rev=1801762&r1=1801761&r2=1801762&view=diff
==============================================================================
--- ace/trunk/run-server-allinone/conf/org.apache.ace.client.repository.cfg
(original)
+++ ace/trunk/run-server-allinone/conf/org.apache.ace.client.repository.cfg Wed
Jul 12 17:50:35 2017
@@ -1 +1,6 @@
-# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2
(http://www.apache.org/licenses/LICENSE-2.0).
showunregisteredtargets = true
deploymentversionlimit = -1
obrlocation = http://${org.apache.ace.obr}/obr
\ No newline at end of file
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2
(http://www.apache.org/licenses/LICENSE-2.0).
+
+showunregisteredtargets = true
+deploymentversionlimit = -1
+obrlocation = http://${org.apache.ace.obr}/obr
+
Modified: ace/trunk/run-server-allinone/scripts/addbundles.gogo
URL:
http://svn.apache.org/viewvc/ace/trunk/run-server-allinone/scripts/addbundles.gogo?rev=1801762&r1=1801761&r2=1801762&view=diff
==============================================================================
--- ace/trunk/run-server-allinone/scripts/addbundles.gogo (original)
+++ ace/trunk/run-server-allinone/scripts/addbundles.gogo Wed Jul 12 17:50:35
2017
@@ -4,12 +4,15 @@
# Creates an additional 100 bundles and 10 configuration files
#
+obrHost = getproperty "org.apache.ace.obr"
+aceObr = "http://$obrHost/obr/";
+
# install test bundle with additional Gogo commands needed later on in this
script
pwd = (cd) getAbsolutePath
start 'file:'$pwd'/../org.apache.ace.test/generated/org.apache.ace.test.jar'
# create a workspace
-w = (cw)
+w = (cw [obrlocation=$aceObr])
# create 100 bundle artifacts and link them to the 10 features...
a = 0
Modified: ace/trunk/run-server-allinone/scripts/clear.gogo
URL:
http://svn.apache.org/viewvc/ace/trunk/run-server-allinone/scripts/clear.gogo?rev=1801762&r1=1801761&r2=1801762&view=diff
==============================================================================
--- ace/trunk/run-server-allinone/scripts/clear.gogo (original)
+++ ace/trunk/run-server-allinone/scripts/clear.gogo Wed Jul 12 17:50:35 2017
@@ -4,13 +4,16 @@
# attempt to delete anything from an OBR, just all the metadata in ACE.
#
+obrHost = getproperty "org.apache.ace.obr"
+aceObr = "http://$obrHost/obr/";
+
# install test bundle with additional Gogo commands needed later on in this
script
pwd = (cd) getAbsolutePath
start 'file:'$pwd'/../org.apache.ace.test/generated/org.apache.ace.test.jar'
# create a workspace
-w = (cw)
+w = (cw [obrlocation=$aceObr])
# delete contents of workspace
each ($w la) {$w da $it}
Modified: ace/trunk/run-server-allinone/scripts/test_autoconf.gogo
URL:
http://svn.apache.org/viewvc/ace/trunk/run-server-allinone/scripts/test_autoconf.gogo?rev=1801762&r1=1801761&r2=1801762&view=diff
==============================================================================
--- ace/trunk/run-server-allinone/scripts/test_autoconf.gogo (original)
+++ ace/trunk/run-server-allinone/scripts/test_autoconf.gogo Wed Jul 12
17:50:35 2017
@@ -1,12 +1,15 @@
# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2
(http://www.apache.org/licenses/LICENSE-2.0).
+obrHost = getproperty "org.apache.ace.obr"
+aceObr = "http://$obrHost/obr/";
+
# install test bundle with additional Gogo commands needed later on in this
script
pwd = (cd) getAbsolutePath
#start 'file:'$pwd'/../org.apache.ace.test/generated/org.apache.ace.test.jar'
# create a workspace
-w = (cw)
+w = (cw [obrlocation=$aceObr])
$w ca
'file:'$pwd'/../cnf/localrepo/org.apache.felix.configadmin/org.apache.felix.configadmin-1.8.8.jar'
true
$w ca
'file:'$pwd'/../cnf/localrepo/org.apache.felix.metatype/org.apache.felix.metatype-1.1.2.jar'
true
@@ -51,7 +54,7 @@ $w cd 'autoconf-test'
$w cf2d '(name=autoconf-deps)' '(name=autoconf-test)'
$w cf2d '(name=shell)' '(name=autoconf-test)'
$w cf2d '(name=http)' '(name=autoconf-test)'
-
+
($w ct [id=target-1] [httpPort="8888"]) setautoapprove true
$w cd2t '(name=autoconf-test)' '(id=target-1)'
