Author: marrs
Date: Mon Feb 18 14:33:07 2013
New Revision: 1447280
URL: http://svn.apache.org/r1447280
Log:
ACE-325 Added a stand-alone OBR node, renamed the all-in-one server bndrun file.
Added:
ace/trunk/run-obr/
ace/trunk/run-obr/.classpath
ace/trunk/run-obr/.project
ace/trunk/run-obr/.settings/
ace/trunk/run-obr/.settings/org.eclipse.jdt.core.prefs
ace/trunk/run-obr/bnd.bnd
ace/trunk/run-obr/build.xml
ace/trunk/run-obr/conf/
ace/trunk/run-obr/conf/org.apache.ace.connectionfactory/
ace/trunk/run-obr/conf/org.apache.ace.connectionfactory/obr.cfg
ace/trunk/run-obr/conf/org.apache.ace.obr.servlet.cfg
ace/trunk/run-obr/conf/org.apache.ace.obr.storage.file.cfg
ace/trunk/run-obr/obr.bndrun
ace/trunk/run-server-allinone/server-allinone.bndrun
- copied, changed from r1447209,
ace/trunk/run-server-allinone/server.bndrun
Removed:
ace/trunk/run-server-allinone/server.bndrun
Added: ace/trunk/run-obr/.classpath
URL:
http://svn.apache.org/viewvc/ace/trunk/run-obr/.classpath?rev=1447280&view=auto
==============================================================================
--- ace/trunk/run-obr/.classpath (added)
+++ ace/trunk/run-obr/.classpath Mon Feb 18 14:33:07 2013
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" output="bin_test" path="test"/>
+ <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="aQute.bnd.classpath.container"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Added: ace/trunk/run-obr/.project
URL:
http://svn.apache.org/viewvc/ace/trunk/run-obr/.project?rev=1447280&view=auto
==============================================================================
--- ace/trunk/run-obr/.project (added)
+++ ace/trunk/run-obr/.project Mon Feb 18 14:33:07 2013
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>run-obr</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>bndtools.core.bndbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>bndtools.core.bndnature</nature>
+ </natures>
+</projectDescription>
Added: ace/trunk/run-obr/.settings/org.eclipse.jdt.core.prefs
URL:
http://svn.apache.org/viewvc/ace/trunk/run-obr/.settings/org.eclipse.jdt.core.prefs?rev=1447280&view=auto
==============================================================================
--- ace/trunk/run-obr/.settings/org.eclipse.jdt.core.prefs (added)
+++ ace/trunk/run-obr/.settings/org.eclipse.jdt.core.prefs Mon Feb 18 14:33:07
2013
@@ -0,0 +1,11 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
Added: ace/trunk/run-obr/bnd.bnd
URL:
http://svn.apache.org/viewvc/ace/trunk/run-obr/bnd.bnd?rev=1447280&view=auto
==============================================================================
--- ace/trunk/run-obr/bnd.bnd (added)
+++ ace/trunk/run-obr/bnd.bnd Mon Feb 18 14:33:07 2013
@@ -0,0 +1 @@
+-nobundles
Added: ace/trunk/run-obr/build.xml
URL:
http://svn.apache.org/viewvc/ace/trunk/run-obr/build.xml?rev=1447280&view=auto
==============================================================================
--- ace/trunk/run-obr/build.xml (added)
+++ ace/trunk/run-obr/build.xml Mon Feb 18 14:33:07 2013
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="project" default="build">
+
+ <!-- -->
+
+ <import file="../cnf/build.xml" />
+</project>
Added: ace/trunk/run-obr/conf/org.apache.ace.connectionfactory/obr.cfg
URL:
http://svn.apache.org/viewvc/ace/trunk/run-obr/conf/org.apache.ace.connectionfactory/obr.cfg?rev=1447280&view=auto
==============================================================================
--- ace/trunk/run-obr/conf/org.apache.ace.connectionfactory/obr.cfg (added)
+++ ace/trunk/run-obr/conf/org.apache.ace.connectionfactory/obr.cfg Mon Feb 18
14:33:07 2013
@@ -0,0 +1,5 @@
+authentication.baseURL = http://localhost:${org.apache.ace.server.port}/obr/
+authentication.type = none
+#authentication.user.name = d
+#authentication.user.password = f
+
Added: ace/trunk/run-obr/conf/org.apache.ace.obr.servlet.cfg
URL:
http://svn.apache.org/viewvc/ace/trunk/run-obr/conf/org.apache.ace.obr.servlet.cfg?rev=1447280&view=auto
==============================================================================
--- ace/trunk/run-obr/conf/org.apache.ace.obr.servlet.cfg (added)
+++ ace/trunk/run-obr/conf/org.apache.ace.obr.servlet.cfg Mon Feb 18 14:33:07
2013
@@ -0,0 +1,2 @@
+org.apache.ace.server.servlet.endpoint=/obr
+authentication.enabled = false
Added: ace/trunk/run-obr/conf/org.apache.ace.obr.storage.file.cfg
URL:
http://svn.apache.org/viewvc/ace/trunk/run-obr/conf/org.apache.ace.obr.storage.file.cfg?rev=1447280&view=auto
==============================================================================
--- ace/trunk/run-obr/conf/org.apache.ace.obr.storage.file.cfg (added)
+++ ace/trunk/run-obr/conf/org.apache.ace.obr.storage.file.cfg Mon Feb 18
14:33:07 2013
@@ -0,0 +1 @@
+fileLocation=store
\ No newline at end of file
Added: ace/trunk/run-obr/obr.bndrun
URL:
http://svn.apache.org/viewvc/ace/trunk/run-obr/obr.bndrun?rev=1447280&view=auto
==============================================================================
--- ace/trunk/run-obr/obr.bndrun (added)
+++ ace/trunk/run-obr/obr.bndrun Mon Feb 18 14:33:07 2013
@@ -0,0 +1,27 @@
+-runfw: org.apache.felix.framework;version='[4,5)'
+-runee: JavaSE-1.6
+-runbundles: osgi.cmpn,\
+ org.apache.felix.dependencymanager,\
+ org.apache.felix.dependencymanager.shell,\
+ org.apache.felix.log,\
+ org.apache.felix.gogo.runtime,\
+ org.apache.felix.gogo.shell,\
+ org.apache.felix.gogo.command,\
+ org.apache.felix.configadmin,\
+ org.apache.felix.http.jetty,\
+ org.apache.felix.useradmin,\
+ org.apache.felix.useradmin.filestore,\
+ org.apache.ace.httplistener;version=latest,\
+ org.apache.ace.configurator;version=latest,\
+ org.apache.ace.obr.metadata;version=latest,\
+ org.apache.ace.obr.storage;version=latest,\
+ org.apache.ace.authentication.api;version=latest,\
+ org.apache.ace.authentication;version=latest,\
+ org.apache.ace.obr.servlet;version=latest
+-runrepos: Workspace,\
+ Release
+-runproperties: org.apache.felix.log.storeDebug=true,\
+ org.apache.felix.eventadmin.Timeout=0,\
+ org.apache.ace.obr.port=8082,\
+ org.osgi.service.http.port=8082,\
+ org.apache.felix.log.maxSize=1000
\ No newline at end of file
Copied: ace/trunk/run-server-allinone/server-allinone.bndrun (from r1447209,
ace/trunk/run-server-allinone/server.bndrun)
URL:
http://svn.apache.org/viewvc/ace/trunk/run-server-allinone/server-allinone.bndrun?p2=ace/trunk/run-server-allinone/server-allinone.bndrun&p1=ace/trunk/run-server-allinone/server.bndrun&r1=1447209&r2=1447280&rev=1447280&view=diff
==============================================================================
--- ace/trunk/run-server-allinone/server.bndrun (original)
+++ ace/trunk/run-server-allinone/server-allinone.bndrun Mon Feb 18 14:33:07
2013
@@ -5,7 +5,7 @@
org.apache.felix.useradmin.filestore;version='[1.0.1,1.0.2)',\
org.apache.felix.log;version='[1.0.1,1.0.2)',\
org.apache.felix.prefs;version='[1.0.4,1.0.5)',\
- org.apache.felix.configadmin;version=1.4.0,\
+ org.apache.felix.configadmin;version='[1.4.0,1.4.1)',\
org.apache.felix.eventadmin;version='[1.2.14,1.2.15)',\
org.apache.felix.gogo.runtime;version='[0.10.0,0.10.1)',\
org.apache.felix.gogo.shell;version='[0.10.0,0.10.1)',\
