You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ace.apache.org by ja...@apache.org on 2012/07/05 15:45:15 UTC
svn commit: r1357603 - in /ace/sandbox/marrs: cnf/ run-obr/ run-server/
run-server/conf/org.apache.ace.nodelauncher.amazon.cfg
run-server/server.bndrun
Author: jawi
Date: Thu Jul 5 13:45:14 2012
New Revision: 1357603
URL: http://svn.apache.org/viewvc?rev=1357603&view=rev
Log:
Yet some more build directories ignored.
Modified:
ace/sandbox/marrs/cnf/ (props changed)
ace/sandbox/marrs/run-obr/ (props changed)
ace/sandbox/marrs/run-server/ (props changed)
ace/sandbox/marrs/run-server/conf/org.apache.ace.nodelauncher.amazon.cfg
ace/sandbox/marrs/run-server/server.bndrun
Propchange: ace/sandbox/marrs/cnf/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Jul 5 13:45:14 2012
@@ -0,0 +1,3 @@
+bin
+cache
+
Propchange: ace/sandbox/marrs/run-obr/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Jul 5 13:45:14 2012
@@ -0,0 +1,4 @@
+bin
+bin_test
+generated
+
Propchange: ace/sandbox/marrs/run-server/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Jul 5 13:45:14 2012
@@ -0,0 +1,4 @@
+bin
+bin_test
+generated
+
Modified: ace/sandbox/marrs/run-server/conf/org.apache.ace.nodelauncher.amazon.cfg
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/run-server/conf/org.apache.ace.nodelauncher.amazon.cfg?rev=1357603&r1=1357602&r2=1357603&view=diff
==============================================================================
--- ace/sandbox/marrs/run-server/conf/org.apache.ace.nodelauncher.amazon.cfg (original)
+++ ace/sandbox/marrs/run-server/conf/org.apache.ace.nodelauncher.amazon.cfg Thu Jul 5 13:45:14 2012
@@ -4,30 +4,30 @@
#
# Configure your server here
-#server=http://your.ace.machine:8080
+server=http://localhost:8080
# Note that AMIs are specific to an Amazon availability zone
-#amiId=ami-6a31041e
-#location=eu-west-1
+amiId=ami-6a31041e
+location=eu-west-1
# Your access key ID and secret access key (AWS console, top right menu "Security Credentials")
-#accessKeyid=Your_access_key_here!
-#secretAccessKey=Your_secret_key_here!
+accessKeyid=Your_access_key_here!
+secretAccessKey=Your_secret_key_here!
# Tag prefix for instance names
-#tagPrefix=default
+tagPrefix=default
# Use this bootstrap to use a Sun VM instead of the OpenJDK one provided by Amazon
-#nodeBootstrap=cd ~; wget -Ojava.bin http://javadl.sun.com/webapps/download/AutoDL?BundleId=43871 ;chmod +x java.bin;./java.bin /y; export PATH=`pwd`/jre1.6.0_23/bin:$PATH
+nodeBootstrap=cd ~; wget -Ojava.bin http://javadl.sun.com/webapps/download/AutoDL?BundleId=43871 ;chmod +x java.bin;./java.bin /y; export PATH=`pwd`/jre1.6.0_23/bin:$PATH
# Open up any extra ports (comma separated list)
-#extraPorts=9090
+extraPorts=9090
# Should we run the process as root? This only works if your account is in the sudoers file.
-#runAsRoot=true
+runAsRoot=true
# A comma separated list of extra artifacts that will be downloaded from the OBR (just list their filenames here)
-#additionalObrDownloads=
+additionalObrDownloads=
# A comma separated list of extra artifacts that will be downloaded from the specified URLs (list full URLs here)
-#externalDownloadUrls=
+externalDownloadUrls=
Modified: ace/sandbox/marrs/run-server/server.bndrun
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/run-server/server.bndrun?rev=1357603&r1=1357602&r2=1357603&view=diff
==============================================================================
--- ace/sandbox/marrs/run-server/server.bndrun (original)
+++ ace/sandbox/marrs/run-server/server.bndrun Thu Jul 5 13:45:14 2012
@@ -55,7 +55,6 @@
org.knopflerfish.bundle.useradmin;resolution=file:/Users/marcel/dev/ace-bndtools/cnf/repo/org.knopflerfish.bundle.useradmin/org.knopflerfish.bundle.useradmin-2.0.2.jar;version='[2.0.2,2.0.3)',\
org.apache.ace.configurator.useradmin.task;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.configurator.useradmin.task/generated/org.apache.ace.configurator.useradmin.task.jar;version=latest,\
org.apache.ace.http.redirector;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.http.redirector/generated/org.apache.ace.http.redirector.jar;version=latest,\
- slf4j.api;resolution=http://bundles.bndtools.org.s3.amazonaws.com/slf4j.api/slf4j.api-1.6.2.jar;version='[1.6.2,1.6.3)',\
org.apache.felix.prefs;resolution=file:/Users/marcel/dev/ace-bndtools/cnf/repo/org.apache.felix.prefs/org.apache.felix.prefs-1.0.4.jar;version='[1.0.4,1.0.5)',\
org.apache.ace.log.servlet;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.log.servlet/generated/org.apache.ace.log.servlet.jar;version=latest,\
org.apache.ace.deployment.streamgenerator;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.deployment.streamgenerator/generated/org.apache.ace.deployment.streamgenerator.jar;version=latest,\