You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ace.apache.org by br...@apache.org on 2013/06/11 09:56:27 UTC

svn commit: r1491702 [3/6] - in /ace/sandbox/bramk: cnf/localrepo/ cnf/localrepo/org.apache.ace.log.api/ cnf/localrepo/org.apache.ace.log.target.store.impl/ cnf/localrepo/org.apache.ace.log.target/ cnf/localrepo/org.apache.ace.range.api/ cnf/localrepo/...

Added: ace/sandbox/bramk/cnf/localrepo/org.apache.ace.log.api/org.apache.ace.log.api-1.0.0.jar
URL: http://svn.apache.org/viewvc/ace/sandbox/bramk/cnf/localrepo/org.apache.ace.log.api/org.apache.ace.log.api-1.0.0.jar?rev=1491702&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ace/sandbox/bramk/cnf/localrepo/org.apache.ace.log.api/org.apache.ace.log.api-1.0.0.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: ace/sandbox/bramk/cnf/localrepo/org.apache.ace.log.target.store.impl/org.apache.ace.log.target.store.impl-1.0.0.jar
URL: http://svn.apache.org/viewvc/ace/sandbox/bramk/cnf/localrepo/org.apache.ace.log.target.store.impl/org.apache.ace.log.target.store.impl-1.0.0.jar?rev=1491702&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ace/sandbox/bramk/cnf/localrepo/org.apache.ace.log.target.store.impl/org.apache.ace.log.target.store.impl-1.0.0.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: ace/sandbox/bramk/cnf/localrepo/org.apache.ace.log.target/org.apache.ace.log.target-1.0.0.jar
URL: http://svn.apache.org/viewvc/ace/sandbox/bramk/cnf/localrepo/org.apache.ace.log.target/org.apache.ace.log.target-1.0.0.jar?rev=1491702&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ace/sandbox/bramk/cnf/localrepo/org.apache.ace.log.target/org.apache.ace.log.target-1.0.0.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: ace/sandbox/bramk/cnf/localrepo/org.apache.ace.range.api/org.apache.ace.range.api-1.0.0.jar
URL: http://svn.apache.org/viewvc/ace/sandbox/bramk/cnf/localrepo/org.apache.ace.range.api/org.apache.ace.range.api-1.0.0.jar?rev=1491702&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ace/sandbox/bramk/cnf/localrepo/org.apache.ace.range.api/org.apache.ace.range.api-1.0.0.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: ace/sandbox/bramk/cnf/localrepo/org.apache.ace.test/org.apache.ace.test-1.0.0.jar
URL: http://svn.apache.org/viewvc/ace/sandbox/bramk/cnf/localrepo/org.apache.ace.test/org.apache.ace.test-1.0.0.jar?rev=1491702&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ace/sandbox/bramk/cnf/localrepo/org.apache.ace.test/org.apache.ace.test-1.0.0.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: ace/sandbox/bramk/cnf/localrepo/org.apache.commons.codec/org.apache.commons.codec-1.4.0.jar
URL: http://svn.apache.org/viewvc/ace/sandbox/bramk/cnf/localrepo/org.apache.commons.codec/org.apache.commons.codec-1.4.0.jar?rev=1491702&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ace/sandbox/bramk/cnf/localrepo/org.apache.commons.codec/org.apache.commons.codec-1.4.0.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: ace/sandbox/bramk/cnf/localrepo/org.apache.felix.dependencymanager/org.apache.felix.dependencymanager-3.1.0.jar
URL: http://svn.apache.org/viewvc/ace/sandbox/bramk/cnf/localrepo/org.apache.felix.dependencymanager/org.apache.felix.dependencymanager-3.1.0.jar?rev=1491702&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ace/sandbox/bramk/cnf/localrepo/org.apache.felix.dependencymanager/org.apache.felix.dependencymanager-3.1.0.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: ace/sandbox/bramk/cnf/localrepo/org.apache.felix.deploymentadmin/org.apache.felix.deploymentadmin-0.9.4.jar
URL: http://svn.apache.org/viewvc/ace/sandbox/bramk/cnf/localrepo/org.apache.felix.deploymentadmin/org.apache.felix.deploymentadmin-0.9.4.jar?rev=1491702&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ace/sandbox/bramk/cnf/localrepo/org.apache.felix.deploymentadmin/org.apache.felix.deploymentadmin-0.9.4.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: ace/sandbox/bramk/cnf/localrepo/org.apache.felix.framework/org.apache.felix.framework-4.0.3.jar
URL: http://svn.apache.org/viewvc/ace/sandbox/bramk/cnf/localrepo/org.apache.felix.framework/org.apache.felix.framework-4.0.3.jar?rev=1491702&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ace/sandbox/bramk/cnf/localrepo/org.apache.felix.framework/org.apache.felix.framework-4.0.3.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: ace/sandbox/bramk/cnf/localrepo/org.apache.felix.gogo.command/org.apache.felix.gogo.command-0.12.0.jar
URL: http://svn.apache.org/viewvc/ace/sandbox/bramk/cnf/localrepo/org.apache.felix.gogo.command/org.apache.felix.gogo.command-0.12.0.jar?rev=1491702&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ace/sandbox/bramk/cnf/localrepo/org.apache.felix.gogo.command/org.apache.felix.gogo.command-0.12.0.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: ace/sandbox/bramk/cnf/localrepo/org.apache.felix.gogo.runtime/org.apache.felix.gogo.runtime-0.10.0.jar
URL: http://svn.apache.org/viewvc/ace/sandbox/bramk/cnf/localrepo/org.apache.felix.gogo.runtime/org.apache.felix.gogo.runtime-0.10.0.jar?rev=1491702&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ace/sandbox/bramk/cnf/localrepo/org.apache.felix.gogo.runtime/org.apache.felix.gogo.runtime-0.10.0.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: ace/sandbox/bramk/cnf/localrepo/org.apache.felix.gogo.shell/org.apache.felix.gogo.shell-0.10.0.jar
URL: http://svn.apache.org/viewvc/ace/sandbox/bramk/cnf/localrepo/org.apache.felix.gogo.shell/org.apache.felix.gogo.shell-0.10.0.jar?rev=1491702&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ace/sandbox/bramk/cnf/localrepo/org.apache.felix.gogo.shell/org.apache.felix.gogo.shell-0.10.0.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: ace/sandbox/bramk/cnf/localrepo/org.mockito.mockito-all/org.mockito.mockito-all-1.9.0.jar
URL: http://svn.apache.org/viewvc/ace/sandbox/bramk/cnf/localrepo/org.mockito.mockito-all/org.mockito.mockito-all-1.9.0.jar?rev=1491702&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ace/sandbox/bramk/cnf/localrepo/org.mockito.mockito-all/org.mockito.mockito-all-1.9.0.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: ace/sandbox/bramk/cnf/localrepo/osgi.cmpn/osgi.cmpn-4.3.1.jar
URL: http://svn.apache.org/viewvc/ace/sandbox/bramk/cnf/localrepo/osgi.cmpn/osgi.cmpn-4.3.1.jar?rev=1491702&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ace/sandbox/bramk/cnf/localrepo/osgi.cmpn/osgi.cmpn-4.3.1.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: ace/sandbox/bramk/org.apache.ace.agent.itest/.classpath
URL: http://svn.apache.org/viewvc/ace/sandbox/bramk/org.apache.ace.agent.itest/.classpath?rev=1491702&view=auto
==============================================================================
--- ace/sandbox/bramk/org.apache.ace.agent.itest/.classpath (added)
+++ ace/sandbox/bramk/org.apache.ace.agent.itest/.classpath Tue Jun 11 07:56:25 2013
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="bin" path="src"/>
+	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

Added: ace/sandbox/bramk/org.apache.ace.agent.itest/.gitignore
URL: http://svn.apache.org/viewvc/ace/sandbox/bramk/org.apache.ace.agent.itest/.gitignore?rev=1491702&view=auto
==============================================================================
--- ace/sandbox/bramk/org.apache.ace.agent.itest/.gitignore (added)
+++ ace/sandbox/bramk/org.apache.ace.agent.itest/.gitignore Tue Jun 11 07:56:25 2013
@@ -0,0 +1,2 @@
+/bin/
+/generated/

Added: ace/sandbox/bramk/org.apache.ace.agent.itest/.project
URL: http://svn.apache.org/viewvc/ace/sandbox/bramk/org.apache.ace.agent.itest/.project?rev=1491702&view=auto
==============================================================================
--- ace/sandbox/bramk/org.apache.ace.agent.itest/.project (added)
+++ ace/sandbox/bramk/org.apache.ace.agent.itest/.project Tue Jun 11 07:56:25 2013
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.apache.ace.agent.itest</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/sandbox/bramk/org.apache.ace.agent.itest/.settings/org.eclipse.jdt.core.prefs
URL: http://svn.apache.org/viewvc/ace/sandbox/bramk/org.apache.ace.agent.itest/.settings/org.eclipse.jdt.core.prefs?rev=1491702&view=auto
==============================================================================
--- ace/sandbox/bramk/org.apache.ace.agent.itest/.settings/org.eclipse.jdt.core.prefs (added)
+++ ace/sandbox/bramk/org.apache.ace.agent.itest/.settings/org.eclipse.jdt.core.prefs Tue Jun 11 07:56:25 2013
@@ -0,0 +1,7 @@
+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.compliance=1.6
+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/sandbox/bramk/org.apache.ace.agent.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/sandbox/bramk/org.apache.ace.agent.itest/bnd.bnd?rev=1491702&view=auto
==============================================================================
--- ace/sandbox/bramk/org.apache.ace.agent.itest/bnd.bnd (added)
+++ ace/sandbox/bramk/org.apache.ace.agent.itest/bnd.bnd Tue Jun 11 07:56:25 2013
@@ -0,0 +1,22 @@
+Test-Cases: ${classes;CONCRETE;EXTENDS;junit.framework.TestCase}
+-runbundles: org.mockito.mockito-all,\
+	org.apache.ace.agent;version=latest,\
+	org.apache.ace.test;version=latest,\
+	org.apache.felix.dependencymanager,\
+	osgi.cmpn
+Private-Package: org.apache.ace.agent.itest
+-runee: JavaSE-1.6
+-runvm: -ea
+-runfw: org.apache.felix.framework
+-buildpath: osgi.core;version='[4.2,5)',\
+	osgi.cmpn,\
+	junit.osgi,\
+	org.apache.ace.agent;version=latest,\
+	org.apache.ace.test;version=latest,\
+	org.apache.felix.dependencymanager
+-runsystempackages: sun.reflect
+Import-Package: org.apache.ace.agent,\
+	*
+Bundle-Version: 1.0.0
+Bundle-Name: Apache ACE Agent itest
+Bundle-Description: Integration test bundle for the Apache ACE Agent
\ No newline at end of file

Added: ace/sandbox/bramk/org.apache.ace.agent.itest/build.xml
URL: http://svn.apache.org/viewvc/ace/sandbox/bramk/org.apache.ace.agent.itest/build.xml?rev=1491702&view=auto
==============================================================================
--- ace/sandbox/bramk/org.apache.ace.agent.itest/build.xml (added)
+++ ace/sandbox/bramk/org.apache.ace.agent.itest/build.xml Tue Jun 11 07:56:25 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/sandbox/bramk/org.apache.ace.agent.itest/src/org/apache/ace/agent/itest/BasicAgentTest.java
URL: http://svn.apache.org/viewvc/ace/sandbox/bramk/org.apache.ace.agent.itest/src/org/apache/ace/agent/itest/BasicAgentTest.java?rev=1491702&view=auto
==============================================================================
--- ace/sandbox/bramk/org.apache.ace.agent.itest/src/org/apache/ace/agent/itest/BasicAgentTest.java (added)
+++ ace/sandbox/bramk/org.apache.ace.agent.itest/src/org/apache/ace/agent/itest/BasicAgentTest.java Tue Jun 11 07:56:25 2013
@@ -0,0 +1,120 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.agent.itest;
+
+import java.util.Hashtable;
+import java.util.Map;
+
+import junit.framework.Assert;
+
+import org.apache.ace.agent.Agent;
+import org.apache.ace.agent.AgentFactory;
+import org.apache.ace.it.IntegrationTestBase;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleException;
+import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.framework.ServiceReference;
+
+/**
+ * Integration test for Management Agent Configuration
+ * 
+ */
+public class BasicAgentTest extends IntegrationTestBase {
+
+    public void testOneAgentConfiguration() throws Exception {
+
+        // agent factory should be up
+        AgentFactory agentFactory = getService(AgentFactory.class);
+        Assert.assertNotNull(agentFactory);
+
+        assertAgentDown("007");
+
+        // configure an agent
+        Map<String, String> config = new Hashtable<String, String>();
+        config.put("verbose", "true");
+        config.put("agents", "007");
+        config.put("serverurl", "http://localhost:8080");
+        config.put("logstores", "auditlog");
+        config.put("authType", "NONE");
+        agentFactory.updated(config);
+
+        try {
+            assertAgentUp("007");
+            config = new Hashtable<String, String>();
+            config.put("verbose", "true");
+            agentFactory.updated(config);
+
+            assertAgentDown("007");
+
+        }
+        catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void testTwoAgentsConfiguration() throws Exception {
+
+        // agent factory should be up
+        AgentFactory agentFactory = getService(AgentFactory.class);
+        Assert.assertNotNull(agentFactory);
+
+        assertAgentDown("007");
+        assertAgentDown("009");
+
+        // configure an agent
+        Map<String, String> config = new Hashtable<String, String>();
+        config.put("verbose", "true");
+        config.put("agents", "007,009");
+        config.put("serverurl", "http://localhost:8080");
+        config.put("logstores", "auditlog");
+        config.put("authType", "NONE");
+        agentFactory.updated(config);
+
+        assertAgentUp("007");
+        assertAgentUp("009");
+
+        config = new Hashtable<String, String>();
+        config.put("verbose", "true");
+        agentFactory.updated(config);
+
+        assertAgentDown("007");
+        assertAgentDown("009");
+    }
+
+    private void assertAgentUp(String agentId) throws InvalidSyntaxException {
+        String agentFilter = "(agent=" + agentId + ")";
+        ServiceReference[] references = m_bundleContext.getAllServiceReferences(Agent.class.getName(), agentFilter);
+        assertNotNull(references);
+    }
+
+    private void assertAgentDown(String agentId) throws InvalidSyntaxException {
+        String agentFilter = "(agent=" + agentId + ")";
+        ServiceReference[] references = m_bundleContext.getAllServiceReferences(Agent.class.getName(), agentFilter);
+        assertNull(references);
+    }
+
+    private void restartBundle(String bsn) throws BundleException {
+        for (Bundle bundle : m_bundleContext.getBundles()) {
+            if (bundle.getSymbolicName().equals(bsn)) {
+                bundle.stop();
+                bundle.start();
+            }
+        }
+    }
+}

Added: ace/sandbox/bramk/org.apache.ace.agent.itest/src/org/apache/ace/agent/itest/CustomAgentTest.java
URL: http://svn.apache.org/viewvc/ace/sandbox/bramk/org.apache.ace.agent.itest/src/org/apache/ace/agent/itest/CustomAgentTest.java?rev=1491702&view=auto
==============================================================================
--- ace/sandbox/bramk/org.apache.ace.agent.itest/src/org/apache/ace/agent/itest/CustomAgentTest.java (added)
+++ ace/sandbox/bramk/org.apache.ace.agent.itest/src/org/apache/ace/agent/itest/CustomAgentTest.java Tue Jun 11 07:56:25 2013
@@ -0,0 +1,108 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.agent.itest;
+
+import java.util.Hashtable;
+import java.util.Map;
+
+import junit.framework.Assert;
+
+import org.apache.ace.agent.Agent;
+import org.apache.ace.agent.AgentFactory;
+import org.apache.ace.agent.spi.AgentContext;
+import org.apache.ace.agent.spi.IdentificationHandler;
+import org.apache.ace.it.IntegrationTestBase;
+import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.framework.ServiceReference;
+
+/**
+ * Integration test for Management Agent Configuration
+ * 
+ */
+public class CustomAgentTest extends IntegrationTestBase {
+
+    public static class HardCodedIdentification implements IdentificationHandler {
+
+        @Override
+        public void sync() throws Exception {
+        }
+
+        @Override
+        public String getIdentification() {
+            return "hardcoded";
+        }
+
+    }
+
+    public void testCustomAgent() throws Exception {
+
+        // agent factory should be up
+        AgentFactory agentFactory = getService(AgentFactory.class);
+        Assert.assertNotNull(agentFactory);
+
+        assertAgentDown("007");
+
+        m_dependencyManager.add(
+            m_dependencyManager.createAdapterService(AgentContext.class, null)
+                .setInterface(IdentificationHandler.class.getName(), null)
+                .setImplementation(HardCodedIdentification.class));
+
+        // configure an agent
+        Map<String, String> config = new Hashtable<String, String>();
+        config.put("verbose", "true");
+        config.put("agents", "007");
+        config.put("serverurl", "http://localhost:8080");
+        config.put("logstores", "auditlog");
+        config.put("authType", "NONE");
+
+        // excludes default identificationhandler
+        config.put("system.factories", "org.apache.ace.agent.connection.DefaultConnectionHandlerFactory,"
+            + "org.apache.ace.agent.deployment.DefaultDeploymentHandlerFactory,"
+            + "org.apache.ace.agent.discovery.DefaultDiscoveryHandlerFactory,"
+            + "org.apache.ace.agent.download.DefaultDownloadHandlerFactory,"
+            + "org.apache.ace.agent.update.DefaultUpdateHandlerFactory,"
+            + "org.apache.ace.agent.versions.DefaultVersionsHandlerFactory,"
+            + "org.apache.ace.agent.logging.DefaultLoggingHandlerFactory,"
+            + "org.apache.ace.agent.eventlogging.DefaultEventLoggerFactory");
+
+        agentFactory.updated(config);
+        assertAgentUp("007");
+
+        try {
+            config = new Hashtable<String, String>();
+            agentFactory.updated(config);
+            assertAgentDown("007");
+        }
+        catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    private void assertAgentUp(String agentId) throws InvalidSyntaxException {
+        String agentFilter = "(agent=" + agentId + ")";
+        ServiceReference[] references = m_bundleContext.getAllServiceReferences(Agent.class.getName(), agentFilter);
+        assertNotNull(references);
+    }
+
+    private void assertAgentDown(String agentId) throws InvalidSyntaxException {
+        String agentFilter = "(agent=" + agentId + ")";
+        ServiceReference[] references = m_bundleContext.getAllServiceReferences(Agent.class.getName(), agentFilter);
+        assertNull(references);
+    }
+}

Added: ace/sandbox/bramk/org.apache.ace.agent.launcher/.classpath
URL: http://svn.apache.org/viewvc/ace/sandbox/bramk/org.apache.ace.agent.launcher/.classpath?rev=1491702&view=auto
==============================================================================
--- ace/sandbox/bramk/org.apache.ace.agent.launcher/.classpath (added)
+++ ace/sandbox/bramk/org.apache.ace.agent.launcher/.classpath Tue Jun 11 07:56:25 2013
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="bin" path="src"/>
+	<classpathentry kind="src" path="resources"/>
+	<classpathentry kind="src" output="bin_test" path="test"/>
+	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

Added: ace/sandbox/bramk/org.apache.ace.agent.launcher/.gitignore
URL: http://svn.apache.org/viewvc/ace/sandbox/bramk/org.apache.ace.agent.launcher/.gitignore?rev=1491702&view=auto
==============================================================================
--- ace/sandbox/bramk/org.apache.ace.agent.launcher/.gitignore (added)
+++ ace/sandbox/bramk/org.apache.ace.agent.launcher/.gitignore Tue Jun 11 07:56:25 2013
@@ -0,0 +1,3 @@
+/bin/
+/bin_test/
+/generated/

Added: ace/sandbox/bramk/org.apache.ace.agent.launcher/.project
URL: http://svn.apache.org/viewvc/ace/sandbox/bramk/org.apache.ace.agent.launcher/.project?rev=1491702&view=auto
==============================================================================
--- ace/sandbox/bramk/org.apache.ace.agent.launcher/.project (added)
+++ ace/sandbox/bramk/org.apache.ace.agent.launcher/.project Tue Jun 11 07:56:25 2013
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.apache.ace.agent.launcher</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/sandbox/bramk/org.apache.ace.agent.launcher/.settings/org.eclipse.jdt.core.prefs
URL: http://svn.apache.org/viewvc/ace/sandbox/bramk/org.apache.ace.agent.launcher/.settings/org.eclipse.jdt.core.prefs?rev=1491702&view=auto
==============================================================================
--- ace/sandbox/bramk/org.apache.ace.agent.launcher/.settings/org.eclipse.jdt.core.prefs (added)
+++ ace/sandbox/bramk/org.apache.ace.agent.launcher/.settings/org.eclipse.jdt.core.prefs Tue Jun 11 07:56:25 2013
@@ -0,0 +1,7 @@
+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.compliance=1.6
+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/sandbox/bramk/org.apache.ace.agent.launcher/README
URL: http://svn.apache.org/viewvc/ace/sandbox/bramk/org.apache.ace.agent.launcher/README?rev=1491702&view=auto
==============================================================================
--- ace/sandbox/bramk/org.apache.ace.agent.launcher/README (added)
+++ ace/sandbox/bramk/org.apache.ace.agent.launcher/README Tue Jun 11 07:56:25 2013
@@ -0,0 +1,22 @@
+ACE Management Agent launcher
+
+@see ACE-347
+
+Usage:
+
+usage: java -jar org.apache.ace.agent.launcher [options] [configurationfile]
+ -h,--help      print this message
+ -v,--verbose   verbose logging
+
+
+Notes:
+
+* Simplified config code (using commons-cli).
+* Includes good default configuration
+ 
+ TODOs:
+
+* Support simple single agent through CLI options
+* Remove 'default' agent from default configuration?
+* Extend configuration documentation
+* Clean felix-cache dir on restart?

Added: ace/sandbox/bramk/org.apache.ace.agent.launcher/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/sandbox/bramk/org.apache.ace.agent.launcher/bnd.bnd?rev=1491702&view=auto
==============================================================================
--- ace/sandbox/bramk/org.apache.ace.agent.launcher/bnd.bnd (added)
+++ ace/sandbox/bramk/org.apache.ace.agent.launcher/bnd.bnd Tue Jun 11 07:56:25 2013
@@ -0,0 +1,21 @@
+# The Jar Main-Class header
+Main-Class: org.apache.ace.agent.launcher.Launcher
+Bundle-Version: 1.0.0
+Bundle-Name: Apache ACE Agent launcher
+Bundle-Description: Standalone laucher that start an Apache Felix framework with an embedded ACE Agent
+
+# Include the felix defaults
+Include-Resource: @${repo;org.apache.felix.framework;4.0.3}!/default.properties,\
+    @${repo;org.apache.felix.framework;4.0.3}!/META-INF/services/*,\
+    @${repo;org.apache.felix.framework;4.0.3}!/org/*,\
+	${repo;org.apache.ace.agent;latest}
+  
+Private-Package: org.apache.ace.agent.launcher,\
+	org.apache.commons.cli,\
+	org.apache.ace.agent;-split-package:=merge-first,\
+	META-INF.services
+
+-buildpath: osgi.core;version='[4.3,5)',\
+	org.apache.commons.cli,\
+	org.apache.ace.agent;version=latest
+-sources: false

Added: ace/sandbox/bramk/org.apache.ace.agent.launcher/build.xml
URL: http://svn.apache.org/viewvc/ace/sandbox/bramk/org.apache.ace.agent.launcher/build.xml?rev=1491702&view=auto
==============================================================================
--- ace/sandbox/bramk/org.apache.ace.agent.launcher/build.xml (added)
+++ ace/sandbox/bramk/org.apache.ace.agent.launcher/build.xml Tue Jun 11 07:56:25 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/sandbox/bramk/org.apache.ace.agent.launcher/launch.bndrun
URL: http://svn.apache.org/viewvc/ace/sandbox/bramk/org.apache.ace.agent.launcher/launch.bndrun?rev=1491702&view=auto
==============================================================================
--- ace/sandbox/bramk/org.apache.ace.agent.launcher/launch.bndrun (added)
+++ ace/sandbox/bramk/org.apache.ace.agent.launcher/launch.bndrun Tue Jun 11 07:56:25 2013
@@ -0,0 +1,12 @@
+-runfw: org.apache.felix.framework;version='[4,5)'
+-runee: JavaSE-1.6
+
+-runbundles:\
+	org.apache.felix.gogo.runtime,\
+	org.apache.felix.gogo.shell,\
+	org.apache.felix.gogo.command
+
+-runrequires:\
+	osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.shell)',\
+	osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.command)'
+-resolve.effective: active
\ No newline at end of file

Added: ace/sandbox/bramk/org.apache.ace.agent.launcher/launcher.properties
URL: http://svn.apache.org/viewvc/ace/sandbox/bramk/org.apache.ace.agent.launcher/launcher.properties?rev=1491702&view=auto
==============================================================================
--- ace/sandbox/bramk/org.apache.ace.agent.launcher/launcher.properties (added)
+++ ace/sandbox/bramk/org.apache.ace.agent.launcher/launcher.properties Tue Jun 11 07:56:25 2013
@@ -0,0 +1,11 @@
+
+#
+# Basic single Management Agent
+
+agents=target-1
+serverurl=http://localhost:8080
+logstores=auditlog
+
+
+#system.bundles = ../../../../Lopexs/pulseon-1.6/com.lopexs.arl.media.rest-2013-05-08-13-28.jar,\
+#	../../../../Lopexs/pulseon-1.6/com.lopexs.arl.media.resolver-2013-05-08-13-28.jar 

Added: ace/sandbox/bramk/org.apache.ace.agent.launcher/resources/META-INF/services/org.apache.ace.agent.launcher.BundleProvider
URL: http://svn.apache.org/viewvc/ace/sandbox/bramk/org.apache.ace.agent.launcher/resources/META-INF/services/org.apache.ace.agent.launcher.BundleProvider?rev=1491702&view=auto
==============================================================================
--- ace/sandbox/bramk/org.apache.ace.agent.launcher/resources/META-INF/services/org.apache.ace.agent.launcher.BundleProvider (added)
+++ ace/sandbox/bramk/org.apache.ace.agent.launcher/resources/META-INF/services/org.apache.ace.agent.launcher.BundleProvider Tue Jun 11 07:56:25 2013
@@ -0,0 +1 @@
+org.apache.ace.agent.launcher.AgentBundleProvider
\ No newline at end of file