You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ace.apache.org by ma...@apache.org on 2012/07/05 14:10:06 UTC

svn commit: r1357570 [27/34] - in /ace/sandbox/marrs: cnf/ cnf/ext/ cnf/lib/ cnf/releaserepo/ cnf/repo/ cnf/repo/.obrcache/ cnf/repo/.obrcache/http%3A%2F%2Fbundles.bndtools.org.s3.amazonaws.com%2Fcom.jcraft.jsch/ cnf/repo/.obrcache/http%3A%2F%2Fbundles...

Added: ace/sandbox/marrs/org.apache.ace.launcher/pom.xml
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.launcher/pom.xml?rev=1357570&view=auto
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.launcher/pom.xml (added)
+++ ace/sandbox/marrs/org.apache.ace.launcher/pom.xml Thu Jul  5 12:09:30 2012
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <!--
+
+        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.
+    -->
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.ace</groupId>
+        <artifactId>ace-pom</artifactId>
+        <version>0.8.1-SNAPSHOT</version>
+        <relativePath>../pom/pom.xml</relativePath>
+    </parent>
+
+    <artifactId>org.apache.ace.launcher</artifactId>
+    <version>0.8.1-SNAPSHOT</version>
+    <packaging>bundle</packaging>
+
+    <name>Apache ACE :: Launcher</name>
+    <description />
+
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/ace/trunk/ace-launcher</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/ace/trunk/ace-launcher</developerConnection>
+        <url>http://svn.apache.org/repos/asf/ace/trunk/ace-launcher</url>
+    </scm>
+
+    <properties>
+        <embed.dependency>*;scope=compile;inline=true</embed.dependency>
+        <embed.transitive>false</embed.transitive>
+        <private.package>org.apache.ace.launcher</private.package>
+        <main.class>
+            org.apache.ace.launcher.Main
+        </main.class>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.ace</groupId>
+            <artifactId>org.apache.ace.managementagent</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.felix</groupId>
+                    <artifactId>org.osgi.foundation</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.framework</artifactId>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+
+</project>

Added: ace/sandbox/marrs/org.apache.ace.launcher/src/org/apache/ace/launcher/Main.java
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.launcher/src/org/apache/ace/launcher/Main.java?rev=1357570&view=auto
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.launcher/src/org/apache/ace/launcher/Main.java (added)
+++ ace/sandbox/marrs/org.apache.ace.launcher/src/org/apache/ace/launcher/Main.java Thu Jul  5 12:09:30 2012
@@ -0,0 +1,253 @@
+/*
+ * 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.launcher;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.apache.ace.managementagent.Activator;
+import org.osgi.framework.Constants;
+import org.osgi.framework.launch.FrameworkFactory;
+
+/**
+ * A simple launcher, that launches the embedded Felix together with a management agent.
+ */
+public class Main {
+
+    private final boolean m_quiet = Boolean.parseBoolean(System.getProperty("quiet", "false"));
+    private final List m_additionalBundleActivators = new ArrayList();
+
+    private Argument m_identification = new KeyValueArgument() {
+        public void handle(String key, String value) {
+            if ("identification".equals(key)) {
+                System.setProperty("identification", value);
+            }
+        }
+
+        public String getDescription() {
+            return "identification: sets the target ID to use";
+        }
+    };
+
+    private Argument m_discovery = new KeyValueArgument() {
+        public void handle(String key, String value) {
+            if ("discovery".equals(key)) {
+                System.setProperty("discovery", value);
+            }
+        }
+
+        public String getDescription() {
+            return "discovery: sets the ACE server to connect to";
+        }
+    };
+
+    private Argument m_agents = new KeyValueArgument() {
+        public void handle(String key, String value) {
+            if ("agents".equals(key)) {
+                System.setProperty("agents", value);
+            }
+        }
+
+        public String getDescription() {
+            return "agents: configures multiple management agents: agent-id,identification,discovery[;agent-id,identification,discovery]*";
+        }
+    };
+    
+    private Argument m_auth = new KeyValueArgument() {
+        @Override
+        protected void handle(String key, String value) {
+            if ("auth".equals(key)) {
+                System.setProperty("auth", value);
+            }
+        }
+        
+        public String getDescription() {
+            return "auth: point to the properties file containing the authentication credentials for a certain subsystem: <dir/file/url>";
+        }
+    };
+
+    private Argument m_help = new Argument() {
+        public void handle(String argument) {
+            if ("help".equals(argument)) {
+                showHelp();
+                System.exit(0);
+            }
+        }
+
+        public String getDescription() {
+            return "help: prints this help message";
+        }
+    };
+
+    private Argument m_additionalBundles = new KeyValueArgument() {
+        public void handle(String key, String value) {
+            if ("bundle".equals(key)) {
+                try {
+                    Class clazz = Class.forName(value);
+                    if (!m_quiet) {
+                        System.out.println("Adding additional bundle activator: " + clazz.getName());
+                    }
+                    m_additionalBundleActivators.add(clazz.newInstance());
+                }
+                catch (Exception e) {
+                    System.err.println("Bundle (" + value + ") not added! Details: " + e.getMessage());
+                }
+            }
+        }
+
+        public String getDescription() {
+            return "bundle: adds an additional bundle to be started with this management agent: bundle=my.fully.qualified.BundleActivator";
+        }
+    };
+    
+    private FrameworkOption m_fwOptionHandler = new FrameworkOption();
+    
+    private final List<Argument> m_arguments = Arrays.asList(
+        m_auth,
+        m_additionalBundles,
+        m_identification,
+        m_discovery,
+        m_agents,
+        m_fwOptionHandler,
+        m_help);
+
+    public static void main(String[] args) throws Exception {
+        new Main(args).run();
+    }
+
+    public Main(String[] args) {
+        for (String arg : args) {
+            for (Argument argument : m_arguments) {
+                argument.handle(arg);
+            }
+        }
+    }
+
+    public void run() throws Exception {
+        FrameworkFactory factory = (FrameworkFactory) Class.forName("org.apache.felix.framework.FrameworkFactory").newInstance();
+
+        List activators = new ArrayList();
+        activators.add(new Activator());
+        activators.addAll(m_additionalBundleActivators);
+        
+        String[] extraSystemPackageArray = {
+            "org.osgi.service.deploymentadmin;version=\"1.0\"",
+            "org.osgi.service.deploymentadmin.spi;version=\"1.0\"",
+            "org.osgi.service.cm;version=\"1.3\"",
+            "org.osgi.service.event;version=\"1.2\"",
+            "org.osgi.service.log;version=\"1.3\"",
+            "org.osgi.service.metatype;version=\"1.1\"",
+            "org.apache.felix.dm;version=\"3.0\"",
+            "org.apache.felix.dm.tracker;version=\"3.0\"",
+            "org.apache.ace.log;version=\"0.8.1.SNAPSHOT\"",
+            "org.apache.ace.deployment.service;version=\"0.8.1.SNAPSHOT\""
+        };
+        
+        String extraSystemPackages = createExtraSystemPackages(extraSystemPackageArray);
+
+        Map frameworkProperties = new HashMap();
+        frameworkProperties.put("felix.systembundle.activators", activators);
+        frameworkProperties.put(Constants.FRAMEWORK_SYSTEMPACKAGES_EXTRA, extraSystemPackages);
+        frameworkProperties.putAll(m_fwOptionHandler.getProperties());
+
+        factory.newFramework(frameworkProperties).start();
+    }
+
+    /**
+     * @param extraSystemPackages
+     * @return
+     */
+    private String createExtraSystemPackages(String[] extraSystemPackages) {
+        String isolateMA = System.getProperty("isolateMA", "managementagent");
+
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < extraSystemPackages.length; i++) {
+            if (i > 0) {
+                sb.append(",");
+            }
+            sb.append(extraSystemPackages[i]);
+            if (isolateMA != null && !"".equals(isolateMA.trim())) {
+                sb.append(String.format(";%1$s=true;mandatory:=%1$s", isolateMA));
+            }
+        }
+        return sb.toString();
+    }
+
+    private void showHelp() {
+        System.out.println("Apache ACE Launcher\n"
+                + "Usage:\n"
+                + "  java -jar ace-launcher.jar [identification=<id>] [discovery=<ace-server>] [options...]");
+
+        System.out.println("All known options are,");
+        for (Argument argument : m_arguments) {
+            System.out.println("  " + argument.getDescription());
+        }
+
+        System.out.println("Example:\n"
+                + "  java -jar ace-launcher.jar identification=MyTarget discovery=http://provisioning.company.com:8080 "
+                + "fwOption=org.osgi.framework.system.packages.extra=sun.misc,com.sun.management");
+    }
+
+    private interface Argument {
+        void handle(String argument);
+        String getDescription();
+    }
+
+    private static abstract class KeyValueArgument implements Argument {
+        public void handle(String argument) {
+            Pattern pattern = Pattern.compile("(\\w*)=(.*)");
+            Matcher m = pattern.matcher(argument);
+            if (m.matches()) {
+                handle(m.group(1), m.group(2));
+            }
+        }
+
+        protected abstract void handle(String key, String value);
+    }
+
+    private static class FrameworkOption extends KeyValueArgument {
+        private Properties m_properties = new Properties();
+        @Override
+        protected void handle(String key, String value) {
+            if (key.equals("fwOption")) {
+                Pattern pattern = Pattern.compile("([^=]*)=(.*)");
+                Matcher m = pattern.matcher(value);
+                if (!m.matches()) {
+                    throw new IllegalArgumentException(value + " is not a valid framework option.");
+                }
+                m_properties.put(m.group(1), m.group(2));
+            }
+        }
+
+        public String getDescription() {
+            return "fwOption: sets framework options for the OSGi framework to be created. This argument may be repeated";
+        }
+
+        public Properties getProperties() {
+            return m_properties;
+        }
+    }
+}

Added: ace/sandbox/marrs/org.apache.ace.target.defaults/old/main/resources/org/apache/ace/deploymenttarget/defaults/DevGateway.args
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.target.defaults/old/main/resources/org/apache/ace/deploymenttarget/defaults/DevGateway.args?rev=1357570&view=auto
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.target.defaults/old/main/resources/org/apache/ace/deploymenttarget/defaults/DevGateway.args (added)
+++ ace/sandbox/marrs/org.apache.ace.target.defaults/old/main/resources/org/apache/ace/deploymenttarget/defaults/DevGateway.args Thu Jul  5 12:09:30 2012
@@ -0,0 +1,26 @@
+mvn:org.osgi/org.osgi.compendium/${dependency.version.osgi.compendium}
+mvn:org.javax.servlet/servlet-api/${dependency.version.servletapi}
+
+mvn:org.apache.felix/org.apache.felix.dependencymanager/${dependency.version.dependencymanager}
+mvn:org.apache.felix/org.apache.felix.eventadmin/${dependency.version.eventadmin}
+mvn:org.apache.felix/org.apache.felix.deploymentadmin/${dependency.version.deploymentadmin}
+mvn:org.apache.felix/org.apache.felix.configadmin/${dependency.version.configadmin}
+
+mvn:${project.groupId}/ace-consolelogger/${project.version}@update
+mvn:${project.groupId}/ace-gateway-log-store/${project.version}@update
+mvn:${project.groupId}/ace-gateway-log/${project.version}@update
+mvn:${project.groupId}/ace-log/${project.version}@update
+
+mvn:${project.groupId}/ace-configurator/${project.version}@update
+mvn:${project.groupId}/ace-scheduler/${project.version}@update
+
+mvn:${project.groupId}/ace-deployment/${project.version}@update
+mvn:${project.groupId}/ace-deployment-task/${project.version}@update
+
+mvn:${project.groupId}/ace-identification-property/${project.version}@update
+mvn:${project.groupId}/ace-discovery-property/${project.version}@update
+
+
+# UNKNOWN SOURCE / NEED
+#file:../../../ext/osgi.mobile.jar
+#file:../../../lib/log_all-2.0.0.jar
\ No newline at end of file

Added: ace/sandbox/marrs/org.apache.ace.target.defaults/old/main/resources/org/apache/ace/deploymenttarget/defaults/DevServer.args
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.target.defaults/old/main/resources/org/apache/ace/deploymenttarget/defaults/DevServer.args?rev=1357570&view=auto
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.target.defaults/old/main/resources/org/apache/ace/deploymenttarget/defaults/DevServer.args (added)
+++ ace/sandbox/marrs/org.apache.ace.target.defaults/old/main/resources/org/apache/ace/deploymenttarget/defaults/DevServer.args Thu Jul  5 12:09:30 2012
@@ -0,0 +1 @@
+mvn:${project.groupId}/ace-consolelogger/${project.version}@update
\ No newline at end of file

Added: ace/sandbox/marrs/org.apache.ace.target.defaults/old/main/resources/org/apache/ace/deploymenttarget/defaults/DevServerWebUI.args
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.target.defaults/old/main/resources/org/apache/ace/deploymenttarget/defaults/DevServerWebUI.args?rev=1357570&view=auto
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.target.defaults/old/main/resources/org/apache/ace/deploymenttarget/defaults/DevServerWebUI.args (added)
+++ ace/sandbox/marrs/org.apache.ace.target.defaults/old/main/resources/org/apache/ace/deploymenttarget/defaults/DevServerWebUI.args Thu Jul  5 12:09:30 2012
@@ -0,0 +1 @@
+mvn:${project.groupId}/ace-consolelogger/${project.version}@update
\ No newline at end of file

Added: ace/sandbox/marrs/org.apache.ace.target.defaults/pom.xml
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.target.defaults/pom.xml?rev=1357570&view=auto
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.target.defaults/pom.xml (added)
+++ ace/sandbox/marrs/org.apache.ace.target.defaults/pom.xml Thu Jul  5 12:09:30 2012
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <!--
+
+        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.
+    -->
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.ace</groupId>
+        <artifactId>ace-pom</artifactId>
+        <version>0.8.1-SNAPSHOT</version>
+        <relativePath>../pom/pom.xml</relativePath>
+    </parent>
+
+    <version>0.8.1-SNAPSHOT</version>
+    <artifactId>org.apache.ace.target.defaults</artifactId>
+
+    <name>Apache ACE :: Target :: Defaults</name>
+    <description>Holds descriptors for certain ace launch configurations.</description>
+
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/ace/trunk/ace-target-defaults</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/ace/trunk/ace-target-defaults</developerConnection>
+        <url>http://svn.apache.org/repos/asf/ace/trunk/ace-target-defaults</url>
+    </scm>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+    </build>
+
+</project>

Added: ace/sandbox/marrs/org.apache.ace.target.devgateway/DISCLAIMER
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.target.devgateway/DISCLAIMER?rev=1357570&view=auto
==============================================================================
    (empty)

Added: ace/sandbox/marrs/org.apache.ace.target.devgateway/LICENSE
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.target.devgateway/LICENSE?rev=1357570&view=auto
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.target.devgateway/LICENSE (added)
+++ ace/sandbox/marrs/org.apache.ace.target.devgateway/LICENSE Thu Jul  5 12:09:30 2012
@@ -0,0 +1,203 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed 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.
+

Added: ace/sandbox/marrs/org.apache.ace.target.devgateway/NOTICE
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.target.devgateway/NOTICE?rev=1357570&view=auto
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.target.devgateway/NOTICE (added)
+++ ace/sandbox/marrs/org.apache.ace.target.devgateway/NOTICE Thu Jul  5 12:09:30 2012
@@ -0,0 +1,16 @@
+Apache ACE
+Copyright 2011 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+This product includes software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2010).
+Licensed under the Apache License 2.0.
+
+This product includes software developed at
+OPS4J (http://www.ops4j.org/).
+Licensed under the Apache License 2.0.
+

Added: ace/sandbox/marrs/org.apache.ace.target.devgateway/old/main/assembly/assembly.xml
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.target.devgateway/old/main/assembly/assembly.xml?rev=1357570&view=auto
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.target.devgateway/old/main/assembly/assembly.xml (added)
+++ ace/sandbox/marrs/org.apache.ace.target.devgateway/old/main/assembly/assembly.xml Thu Jul  5 12:09:30 2012
@@ -0,0 +1,71 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+    <id>distribution</id>
+    <formats>
+        <format>dir</format>
+        <format>zip</format>
+    </formats>
+    <baseDirectory>ace-target</baseDirectory>
+
+    <fileSets>
+<fileSet>
+      <directory>${project.basedir}</directory>
+      <includes>
+        <include>README*</include>
+        <include>LICENSE*</include>
+        <include>NOTICE*</include>
+        <include>DISCLAIMER*</include>
+      </includes>
+      <outputDirectory>.</outputDirectory>
+      <useDefaultExcludes>true</useDefaultExcludes>
+    </fileSet>
+
+        <fileSet>
+            <directory>src/main/resources/conf/</directory>
+            <outputDirectory>conf</outputDirectory>
+            <includes>
+                <include>**</include>
+            </includes>
+            <filtered>true</filtered>
+        </fileSet>
+    </fileSets>
+
+    <files>
+        <file>
+            <source>src/main/resources/run.sh</source>
+            <fileMode>0777</fileMode>
+        </file>
+		<file>
+	        <source>src/main/resources/run.bat</source>
+            <fileMode>0777</fileMode>
+       </file>
+    </files>
+    <dependencySets>
+        <dependencySet>
+            <useProjectArtifact>false</useProjectArtifact>
+            <useTransitiveDependencies>false</useTransitiveDependencies>
+            <outputDirectory>ace-bundles</outputDirectory>
+        </dependencySet>
+        <dependencySet>
+            <useProjectArtifact>false</useProjectArtifact>
+            <useTransitiveDependencies>false</useTransitiveDependencies>
+            <scope>provided</scope>
+            <outputDirectory>required-bundles</outputDirectory>
+            <excludes>
+                <exclude>org.ops4j.pax.runner:pax-runner</exclude>
+            </excludes>
+        </dependencySet>
+        <dependencySet>
+            <useProjectArtifact>false</useProjectArtifact>
+            <useTransitiveDependencies>false</useTransitiveDependencies>
+            <scope>provided</scope>
+            <includes>
+                <include>org.ops4j.pax.runner:pax-runner</include>
+            </includes>
+            <outputFileNameMapping>
+                ${artifact.artifactId}.${artifact.extension}
+            </outputFileNameMapping>
+        </dependencySet>
+    </dependencySets>
+</assembly>

Added: ace/sandbox/marrs/org.apache.ace.target.devgateway/old/main/resources/conf/org.apache.ace.discovery.property.cfg
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.target.devgateway/old/main/resources/conf/org.apache.ace.discovery.property.cfg?rev=1357570&view=auto
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.target.devgateway/old/main/resources/conf/org.apache.ace.discovery.property.cfg (added)
+++ ace/sandbox/marrs/org.apache.ace.target.devgateway/old/main/resources/conf/org.apache.ace.discovery.property.cfg Thu Jul  5 12:09:30 2012
@@ -0,0 +1 @@
+serverURL = http://localhost:8080
\ No newline at end of file

Added: ace/sandbox/marrs/org.apache.ace.target.devgateway/old/main/resources/conf/org.apache.ace.identification.property.cfg
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.target.devgateway/old/main/resources/conf/org.apache.ace.identification.property.cfg?rev=1357570&view=auto
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.target.devgateway/old/main/resources/conf/org.apache.ace.identification.property.cfg (added)
+++ ace/sandbox/marrs/org.apache.ace.target.devgateway/old/main/resources/conf/org.apache.ace.identification.property.cfg Thu Jul  5 12:09:30 2012
@@ -0,0 +1 @@
+targetID = defaultTargetID
\ No newline at end of file

Added: ace/sandbox/marrs/org.apache.ace.target.devgateway/old/main/resources/conf/org.apache.ace.scheduler.cfg
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.target.devgateway/old/main/resources/conf/org.apache.ace.scheduler.cfg?rev=1357570&view=auto
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.target.devgateway/old/main/resources/conf/org.apache.ace.scheduler.cfg (added)
+++ ace/sandbox/marrs/org.apache.ace.target.devgateway/old/main/resources/conf/org.apache.ace.scheduler.cfg Thu Jul  5 12:09:30 2012
@@ -0,0 +1,2 @@
+auditlog = 2000
+org.apache.ace.deployment.task.DeploymentUpdateTask = 2000

Added: ace/sandbox/marrs/org.apache.ace.target.devgateway/old/main/resources/conf/org.apache.ace.target.log.factory/auditlog.cfg
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.target.devgateway/old/main/resources/conf/org.apache.ace.target.log.factory/auditlog.cfg?rev=1357570&view=auto
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.target.devgateway/old/main/resources/conf/org.apache.ace.target.log.factory/auditlog.cfg (added)
+++ ace/sandbox/marrs/org.apache.ace.target.devgateway/old/main/resources/conf/org.apache.ace.target.log.factory/auditlog.cfg Thu Jul  5 12:09:30 2012
@@ -0,0 +1 @@
+name=auditlog
\ No newline at end of file

Added: ace/sandbox/marrs/org.apache.ace.target.devgateway/old/main/resources/conf/org.apache.ace.target.log.store.factory/auditlogstore.cfg
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.target.devgateway/old/main/resources/conf/org.apache.ace.target.log.store.factory/auditlogstore.cfg?rev=1357570&view=auto
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.target.devgateway/old/main/resources/conf/org.apache.ace.target.log.store.factory/auditlogstore.cfg (added)
+++ ace/sandbox/marrs/org.apache.ace.target.devgateway/old/main/resources/conf/org.apache.ace.target.log.store.factory/auditlogstore.cfg Thu Jul  5 12:09:30 2012
@@ -0,0 +1 @@
+name=auditlog
\ No newline at end of file

Added: ace/sandbox/marrs/org.apache.ace.target.devgateway/old/main/resources/conf/org.apache.ace.target.log.sync.factory/auditlog.cfg
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.target.devgateway/old/main/resources/conf/org.apache.ace.target.log.sync.factory/auditlog.cfg?rev=1357570&view=auto
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.target.devgateway/old/main/resources/conf/org.apache.ace.target.log.sync.factory/auditlog.cfg (added)
+++ ace/sandbox/marrs/org.apache.ace.target.devgateway/old/main/resources/conf/org.apache.ace.target.log.sync.factory/auditlog.cfg Thu Jul  5 12:09:30 2012
@@ -0,0 +1 @@
+name=auditlog
\ No newline at end of file

Added: ace/sandbox/marrs/org.apache.ace.target.devgateway/old/main/resources/conf/platform.properties
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.target.devgateway/old/main/resources/conf/platform.properties?rev=1357570&view=auto
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.target.devgateway/old/main/resources/conf/platform.properties (added)
+++ ace/sandbox/marrs/org.apache.ace.target.devgateway/old/main/resources/conf/platform.properties Thu Jul  5 12:09:30 2012
@@ -0,0 +1,17 @@
+-Dorg.apache.ace.configurator.CONFIG_DIR=conf
+-Dorg.apache.felix.deploymentadmin.stopunaffectedbundle=false
+-Dorg.osgi.framework.storage=cache
+-Dorg.apache.felix.http.nio=true
+-Dorg.apache.felix.http.enable=true
+-Dorg.osgi.service.http.port=8080
+-Dorg.apache.felix.https.enable=false
+-Dorg.osgi.service.http.port.secure=8443
+-Dorg.apache.felix.http.debug=false
+-Dorg.apache.felix.https.keystore=/tmp/node1Keystore
+-Dorg.apache.felix.https.keystore.password=secret
+-Dorg.apache.felix.https.keystore.key.password=secret
+-Dorg.apache.felix.https.truststore=/tmp/truststore
+-Dorg.apache.felix.https.truststore.password=secret
+-Dorg.apache.felix.https.clientcertificate=needs
+-Dorg.osgi.framework.bundle.parent=framework
+-Dorg.osgi.framework.bootdelegation=com.sun.*,sun.*

Added: ace/sandbox/marrs/org.apache.ace.target.devgateway/old/main/resources/run.bat
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.target.devgateway/old/main/resources/run.bat?rev=1357570&view=auto
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.target.devgateway/old/main/resources/run.bat (added)
+++ ace/sandbox/marrs/org.apache.ace.target.devgateway/old/main/resources/run.bat Thu Jul  5 12:09:30 2012
@@ -0,0 +1,2 @@
+@echo off
+call java -jar pax-runner.jar --autoWrap --workingDirectory=. scan-dir:ace-bundles scan-dir:required-bundles scan-file:file:conf/platform.properties %1 %2 %3
\ No newline at end of file

Added: ace/sandbox/marrs/org.apache.ace.target.devgateway/old/main/resources/run.sh
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.target.devgateway/old/main/resources/run.sh?rev=1357570&view=auto
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.target.devgateway/old/main/resources/run.sh (added)
+++ ace/sandbox/marrs/org.apache.ace.target.devgateway/old/main/resources/run.sh Thu Jul  5 12:09:30 2012
@@ -0,0 +1 @@
+java -jar pax-runner.jar --autoWrap --workingDirectory=. scan-dir:ace-bundles scan-dir:required-bundles scan-file:file:conf/platform.properties $*
\ No newline at end of file

Added: ace/sandbox/marrs/org.apache.ace.target.devgateway/pom.xml
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.target.devgateway/pom.xml?rev=1357570&view=auto
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.target.devgateway/pom.xml (added)
+++ ace/sandbox/marrs/org.apache.ace.target.devgateway/pom.xml Thu Jul  5 12:09:30 2012
@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <!--
+
+        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.
+    -->
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.ace</groupId>
+        <artifactId>ace-pom</artifactId>
+        <version>0.8.1-SNAPSHOT</version>
+        <relativePath>../pom/pom.xml</relativePath>
+    </parent>
+    <version>0.8.1-SNAPSHOT</version>
+    <!-- TODO rename to devtarget -->
+    <artifactId>org.apache.ace.target.devgateway</artifactId>
+    <packaging>pom</packaging>
+
+    <name>Apache ACE :: Target :: Dev Target</name>
+    <description />
+
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/ace/trunk/ace-target-devgateway</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/ace/trunk/ace-target-devgateway</developerConnection>
+        <url>http://svn.apache.org/repos/asf/ace/trunk/ace-target-devgateway</url>
+    </scm>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>2.2-beta-5</version>
+                <executions>
+                    <execution>
+                        <id>create-target</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>attached</goal>
+                        </goals>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>src/main/assembly/assembly.xml</descriptor>
+                            </descriptors>
+                            <archiveBaseDirectory>${project.outputDirectory}</archiveBaseDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.ops4j.pax.runner</groupId>
+            <artifactId>pax-runner</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.compendium</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.configadmin</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.eventadmin</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.dependencymanager</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.dependencymanager.shell</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.deploymentadmin</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.ace</groupId>
+            <artifactId>org.apache.ace.consolelogger</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.ace</groupId>
+            <artifactId>org.apache.ace.log.listener</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.ace</groupId>
+            <artifactId>org.apache.ace.gateway.log</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.ace</groupId>
+            <artifactId>org.apache.ace.gateway.log.store</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.ace</groupId>
+            <artifactId>org.apache.ace.range.api</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.ace</groupId>
+            <artifactId>org.apache.ace.log</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.ace</groupId>
+            <artifactId>org.apache.ace.discovery.api</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.ace</groupId>
+            <artifactId>org.apache.ace.discovery.property</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.ace</groupId>
+            <artifactId>org.apache.ace.identification.api</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.ace</groupId>
+            <artifactId>org.apache.ace.identification.property</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.ace</groupId>
+            <artifactId>org.apache.ace.scheduler</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.ace</groupId>
+            <artifactId>org.apache.ace.configurator</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.ace</groupId>
+            <artifactId>org.apache.ace.deployment.api</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.ace</groupId>
+            <artifactId>org.apache.ace.deployment.deploymentadmin</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.ace</groupId>
+            <artifactId>org.apache.ace.deployment.task.base</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.ace</groupId>
+            <artifactId>org.apache.ace.deployment.task</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.ace</groupId>
+            <artifactId>org.apache.ace.connectionfactory</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+    </dependencies>
+
+</project>

Added: ace/sandbox/marrs/org.apache.ace.target.devserver/DISCLAIMER
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.target.devserver/DISCLAIMER?rev=1357570&view=auto
==============================================================================
    (empty)

Added: ace/sandbox/marrs/org.apache.ace.target.devserver/LICENSE
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.target.devserver/LICENSE?rev=1357570&view=auto
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.target.devserver/LICENSE (added)
+++ ace/sandbox/marrs/org.apache.ace.target.devserver/LICENSE Thu Jul  5 12:09:30 2012
@@ -0,0 +1,395 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed 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.
+
+XStream License
+---------------
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list of
+conditions and the following disclaimer. Redistributions in binary form must reproduce
+the above copyright notice, this list of conditions and the following disclaimer in
+the documentation and/or other materials provided with the distribution.
+
+Neither the name of XStream nor the names of its contributors may be used to endorse
+or promote products derived from this software without specific prior written
+permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
+WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+XPP3 License
+------------
+* The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2000 The Apache Software Foundation.  All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ *    if any, must include the following acknowledgment:
+ *       "This product includes software developed by the
+ *        Apache Software Foundation (http://www.apache.org/)."
+ *    Alternately, this acknowledgment may appear in the software itself,
+ *    if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Apache" and "Apache Software Foundation" must
+ *    not be used to endorse or promote products derived from this
+ *    software without prior written permission. For written
+ *    permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache",
+ *    nor may "Apache" appear in their name, without prior written
+ *    permission of the Apache Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+
+kxml License
+---------------
+Copyright (c) 2002,2003, Stefan Haustein, Oberhausen, Rhld., Germany
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The  above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+IN THE SOFTWARE.
+
+knopflerfish License
+--------------------
+Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following
+  conditions are met:
+ 
+  - Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 
+  - Redistributions in binary form must reproduce the above
+    copyright notice, this list of conditions and the following
+    disclaimer in the documentation and/or other materials
+    provided with the distribution.
+ 
+  - Neither the name of the KNOPFLERFISH project nor the names of its
+    contributors may be used to endorse or promote products derived
+    from this software without specific prior written permission.
+ 
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+  COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+  HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+  STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+  OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Jersey and JSR-250 License
+
+    Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved.
+
+    The contents of this file are subject to the terms of either the GNU
+    General Public License Version 2 only ("GPL") or the Common Development
+    and Distribution License("CDDL") (collectively, the "License").  You
+    may not use this file except in compliance with the License.  You can
+    obtain a copy of the License at
+    https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
+    or packager/legal/LICENSE.txt.  See the License for the specific
+    language governing permissions and limitations under the License.
+
+    When distributing the software, include this License Header Notice in each
+    file and include the License file at packager/legal/LICENSE.txt.
+
+    GPL Classpath Exception:
+    Oracle designates this particular file as subject to the "Classpath"
+    exception as provided by Oracle in the GPL Version 2 section of the License
+    file that accompanied this code.
+
+    Modifications:
+    If applicable, add the following below the License Header, with the fields
+    enclosed by brackets [] replaced by your own identifying information:
+    "Portions Copyright [year] [name of copyright owner]"
+
+    Contributor(s):
+    If you wish your version of this file to be governed by only the CDDL or
+    only the GPL Version 2, indicate your decision by adding "[Contributor]
+    elects to include this software in this distribution under the [CDDL or GPL
+    Version 2] license."  If you don't indicate a single choice of license, a
+    recipient has the option to distribute your version of this file under
+    either the CDDL, the GPL Version 2 or to extend the choice of license to
+    its licensees as provided above.  However, if you add GPL Version 2 code
+    and therefore, elected the GPL Version 2 license, then the option applies
+    only if the new code is made subject to such option by the copyright
+    holder.
+
+Jcraft Jsch License
+
+Copyright (c) 2002-2010 Atsuhiko Yamanaka, JCraft,Inc. 
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+  1. Redistributions of source code must retain the above copyright notice,
+     this list of conditions and the following disclaimer.
+
+  2. Redistributions in binary form must reproduce the above copyright 
+     notice, this list of conditions and the following disclaimer in 
+     the documentation and/or other materials provided with the distribution.
+
+  3. The names of the authors may not be used to endorse or promote products
+     derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
+INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

Added: ace/sandbox/marrs/org.apache.ace.target.devserver/NOTICE
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.target.devserver/NOTICE?rev=1357570&view=auto
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.target.devserver/NOTICE (added)
+++ ace/sandbox/marrs/org.apache.ace.target.devserver/NOTICE Thu Jul  5 12:09:30 2012
@@ -0,0 +1,67 @@
+Apache ACE
+Copyright 2011 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+This product includes software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2010).
+Licensed under the Apache License 2.0.
+
+This product includes software developed at
+OPS4J (http://www.ops4j.org/).
+Licensed under the Apache License 2.0.
+
+This product includes software developed at
+'XStream' (http://xstream.codehaus.org)
+Copyright (c) 2003-2006, Joe Walnes
+Copyright (c) 2006-2007, XStream Committers
+Licensed under BSD style
+
+This product includes software developed at
+'Extreme! Lab, Indiana University' (http://www.extreme.indiana.edu/)
+Copyright (c) all rights reserved
+Licensed under Apache Software License, version 1.1
+
+This product includes software developed at
+'Stefan Haustein, Oberhausen, Rhld., Germany' (http://kxml.sourceforge.net/)
+Licensed under BSD style
+
+This product includes software developed at
+Knopflerfish (http://www.knopflerfish.org)
+Copyright (c) 2003-2010, KNOPFLERFISH project
+Licensed under BSD style
+
+This product includes software developed at 
+Vaadin (http://vaadin.com)
+Copyright (c) 2011 Vaadin Ltd.
+Licensed under Apache Software License, version 2
+
+This product includes software developed at
+The AOP alliance (http://aopalliance.sourceforge.net)
+License: Public Domain
+
+This product includes software developed at
+Google Inc.
+Copyright 2008-2011 Google Inc.
+Licensed under the Apache License 2.0.
+
+This product includes software developed at
+Atinject (http://code.google.com/p/atinject/)
+Licensed under the Apache License 2.0.
+
+This product includes software developed at
+Oracle.
+Copyright (c) 2010 Oracle and/or its affiliates.
+Licensed under the CDDL.
+
+This product includes software developed at
+JCraft.
+Copyright (c) 2002-2010 Atsuhiko Yamanaka, JCraft,Inc. 
+BSD-style license.
+
+This product includes software developed at
+oAuth (http://oauth.net/).
+Licensed under the Apache License 2.0.

Added: ace/sandbox/marrs/org.apache.ace.target.devserver/old/main/assembly/assembly.xml
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.target.devserver/old/main/assembly/assembly.xml?rev=1357570&view=auto
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.target.devserver/old/main/assembly/assembly.xml (added)
+++ ace/sandbox/marrs/org.apache.ace.target.devserver/old/main/assembly/assembly.xml Thu Jul  5 12:09:30 2012
@@ -0,0 +1,81 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+    <id>distribution</id>
+    <formats>
+        <format>dir</format>
+        <format>zip</format>
+    </formats>
+    <baseDirectory>ace-devserver</baseDirectory>
+
+    <fileSets>
+        <fileSet>
+      <directory>${project.basedir}</directory>
+      <includes>
+        <include>README*</include>
+        <include>LICENSE*</include>
+        <include>NOTICE*</include>
+        <include>DISCLAIMER*</include>
+      </includes>
+      <outputDirectory>.</outputDirectory>
+      <useDefaultExcludes>true</useDefaultExcludes>
+    </fileSet>
+        <fileSet>
+            <directory>src/main/resources/conf/</directory>
+            <outputDirectory>conf</outputDirectory>
+            <includes>
+                <include>**</include>
+            </includes>
+            <filtered>true</filtered>
+        </fileSet>
+        <fileSet>
+            <directory>store</directory>
+            <outputDirectory>store</outputDirectory>
+            <includes>
+                <include>**</include>
+            </includes>
+            <filtered>false</filtered>
+        </fileSet>
+    </fileSets>
+
+    <files>
+        <file>
+            <source>src/main/resources/run.sh</source>
+            <fileMode>0777</fileMode>
+        </file>
+		<file>
+            <source>src/main/resources/run.bat</source>
+            <fileMode>0777</fileMode>
+        </file>
+        <file>
+            <source>src/main/resources/platform.properties</source>
+        </file>
+    </files>
+    <dependencySets>
+        <dependencySet>
+            <useProjectArtifact>false</useProjectArtifact>
+            <useTransitiveDependencies>false</useTransitiveDependencies>
+            <outputDirectory>ace-bundles</outputDirectory>
+        </dependencySet>
+        <dependencySet>
+            <useProjectArtifact>false</useProjectArtifact>
+            <useTransitiveDependencies>false</useTransitiveDependencies>
+            <scope>provided</scope>
+            <outputDirectory>required-bundles</outputDirectory>
+            <excludes>
+                <exclude>org.ops4j.pax.runner:pax-runner</exclude>
+            </excludes>
+        </dependencySet>
+        <dependencySet>
+            <useProjectArtifact>false</useProjectArtifact>
+            <useTransitiveDependencies>false</useTransitiveDependencies>
+            <scope>provided</scope>
+            <includes>
+                <include>org.ops4j.pax.runner:pax-runner</include>
+            </includes>
+            <outputFileNameMapping>
+                ${artifact.artifactId}.${artifact.extension}
+            </outputFileNameMapping>
+        </dependencySet>
+    </dependencySets>
+</assembly>

Added: ace/sandbox/marrs/org.apache.ace.target.devserver/old/main/resources/conf/org.apache.ace.activation.matcher.cfg
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.target.devserver/old/main/resources/conf/org.apache.ace.activation.matcher.cfg?rev=1357570&view=auto
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.target.devserver/old/main/resources/conf/org.apache.ace.activation.matcher.cfg (added)
+++ ace/sandbox/marrs/org.apache.ace.target.devserver/old/main/resources/conf/org.apache.ace.activation.matcher.cfg Thu Jul  5 12:09:30 2012
@@ -0,0 +1,3 @@
+activationRepository = activation
+customerName = apache
+repositoryURL = http://localhost:8080/repository

Added: ace/sandbox/marrs/org.apache.ace.target.devserver/old/main/resources/conf/org.apache.ace.activation.servlet.cfg
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.target.devserver/old/main/resources/conf/org.apache.ace.activation.servlet.cfg?rev=1357570&view=auto
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.target.devserver/old/main/resources/conf/org.apache.ace.activation.servlet.cfg (added)
+++ ace/sandbox/marrs/org.apache.ace.target.devserver/old/main/resources/conf/org.apache.ace.activation.servlet.cfg Thu Jul  5 12:09:30 2012
@@ -0,0 +1 @@
+org.apache.ace.server.servlet.endpoint=/activation

Added: ace/sandbox/marrs/org.apache.ace.target.devserver/old/main/resources/conf/org.apache.ace.client.automation.cfg
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.target.devserver/old/main/resources/conf/org.apache.ace.client.automation.cfg?rev=1357570&view=auto
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.target.devserver/old/main/resources/conf/org.apache.ace.client.automation.cfg (added)
+++ ace/sandbox/marrs/org.apache.ace.target.devserver/old/main/resources/conf/org.apache.ace.client.automation.cfg Thu Jul  5 12:09:30 2012
@@ -0,0 +1,10 @@
+registerTargetFilter       = (id=*)
+approveTargetFilter        = (id=*)
+autoApproveTargetFilter    = (id=*)
+commitRepositories 		   = true
+targetRepository           = target
+deploymentRepository       = deployment
+storeRepository            = shop
+customerName               = apache
+hostName                   = http://localhost:8080
+endpoint                   = /repository
\ No newline at end of file

Added: ace/sandbox/marrs/org.apache.ace.target.devserver/old/main/resources/conf/org.apache.ace.client.rest.cfg
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.target.devserver/old/main/resources/conf/org.apache.ace.client.rest.cfg?rev=1357570&view=auto
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.target.devserver/old/main/resources/conf/org.apache.ace.client.rest.cfg (added)
+++ ace/sandbox/marrs/org.apache.ace.target.devserver/old/main/resources/conf/org.apache.ace.client.rest.cfg Thu Jul  5 12:09:30 2012
@@ -0,0 +1,2 @@
+org.apache.ace.server.servlet.endpoint=/client
+authentication.enabled=false

Added: ace/sandbox/marrs/org.apache.ace.target.devserver/old/main/resources/conf/org.apache.ace.configurator.useradmin.task.UpdateUserAdminTask.cfg
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.target.devserver/old/main/resources/conf/org.apache.ace.configurator.useradmin.task.UpdateUserAdminTask.cfg?rev=1357570&view=auto
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.target.devserver/old/main/resources/conf/org.apache.ace.configurator.useradmin.task.UpdateUserAdminTask.cfg (added)
+++ ace/sandbox/marrs/org.apache.ace.target.devserver/old/main/resources/conf/org.apache.ace.configurator.useradmin.task.UpdateUserAdminTask.cfg Thu Jul  5 12:09:30 2012
@@ -0,0 +1,3 @@
+repositoryLocation = http://localhost:8080/repository
+repositoryCustomer = apache
+repositoryName = user

Added: ace/sandbox/marrs/org.apache.ace.target.devserver/old/main/resources/conf/org.apache.ace.connectionfactory/auditlog.cfg
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.target.devserver/old/main/resources/conf/org.apache.ace.connectionfactory/auditlog.cfg?rev=1357570&view=auto
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.target.devserver/old/main/resources/conf/org.apache.ace.connectionfactory/auditlog.cfg (added)
+++ ace/sandbox/marrs/org.apache.ace.target.devserver/old/main/resources/conf/org.apache.ace.connectionfactory/auditlog.cfg Thu Jul  5 12:09:30 2012
@@ -0,0 +1,5 @@
+authentication.baseURL = http://localhost:8080/auditlog/
+authentication.type = none
+#authentication.user.name = d
+#authentication.user.password = f
+

Added: ace/sandbox/marrs/org.apache.ace.target.devserver/old/main/resources/conf/org.apache.ace.connectionfactory/client.cfg
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.target.devserver/old/main/resources/conf/org.apache.ace.connectionfactory/client.cfg?rev=1357570&view=auto
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.target.devserver/old/main/resources/conf/org.apache.ace.connectionfactory/client.cfg (added)
+++ ace/sandbox/marrs/org.apache.ace.target.devserver/old/main/resources/conf/org.apache.ace.connectionfactory/client.cfg Thu Jul  5 12:09:30 2012
@@ -0,0 +1,5 @@
+authentication.baseURL = http://localhost:8080/client/
+authentication.type = none
+#authentication.user.name = d
+#authentication.user.password = f
+

Added: ace/sandbox/marrs/org.apache.ace.target.devserver/old/main/resources/conf/org.apache.ace.connectionfactory/deployment.cfg
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.target.devserver/old/main/resources/conf/org.apache.ace.connectionfactory/deployment.cfg?rev=1357570&view=auto
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.target.devserver/old/main/resources/conf/org.apache.ace.connectionfactory/deployment.cfg (added)
+++ ace/sandbox/marrs/org.apache.ace.target.devserver/old/main/resources/conf/org.apache.ace.connectionfactory/deployment.cfg Thu Jul  5 12:09:30 2012
@@ -0,0 +1,5 @@
+authentication.baseURL = http://localhost:8080/deployment/
+authentication.type = none
+#authentication.user.name = d
+#authentication.user.password = f
+

Added: ace/sandbox/marrs/org.apache.ace.target.devserver/old/main/resources/conf/org.apache.ace.connectionfactory/obr.cfg
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.target.devserver/old/main/resources/conf/org.apache.ace.connectionfactory/obr.cfg?rev=1357570&view=auto
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.target.devserver/old/main/resources/conf/org.apache.ace.connectionfactory/obr.cfg (added)
+++ ace/sandbox/marrs/org.apache.ace.target.devserver/old/main/resources/conf/org.apache.ace.connectionfactory/obr.cfg Thu Jul  5 12:09:30 2012
@@ -0,0 +1,5 @@
+authentication.baseURL = http://localhost:8080/obr/
+authentication.type = none
+#authentication.user.name = d
+#authentication.user.password = f
+

Added: ace/sandbox/marrs/org.apache.ace.target.devserver/old/main/resources/conf/org.apache.ace.connectionfactory/replication.cfg
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.target.devserver/old/main/resources/conf/org.apache.ace.connectionfactory/replication.cfg?rev=1357570&view=auto
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.target.devserver/old/main/resources/conf/org.apache.ace.connectionfactory/replication.cfg (added)
+++ ace/sandbox/marrs/org.apache.ace.target.devserver/old/main/resources/conf/org.apache.ace.connectionfactory/replication.cfg Thu Jul  5 12:09:30 2012
@@ -0,0 +1,5 @@
+authentication.baseURL = http://localhost:8080/replication/
+authentication.type = none
+#authentication.user.name = d
+#authentication.user.password = f
+

Added: ace/sandbox/marrs/org.apache.ace.target.devserver/old/main/resources/conf/org.apache.ace.connectionfactory/repository.cfg
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.target.devserver/old/main/resources/conf/org.apache.ace.connectionfactory/repository.cfg?rev=1357570&view=auto
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.target.devserver/old/main/resources/conf/org.apache.ace.connectionfactory/repository.cfg (added)
+++ ace/sandbox/marrs/org.apache.ace.target.devserver/old/main/resources/conf/org.apache.ace.connectionfactory/repository.cfg Thu Jul  5 12:09:30 2012
@@ -0,0 +1,5 @@
+authentication.baseURL = http://localhost:8080/repository/
+authentication.type = none
+#authentication.user.name = d
+#authentication.user.password = f
+

Added: ace/sandbox/marrs/org.apache.ace.target.devserver/old/main/resources/conf/org.apache.ace.deployment.provider.filebased.cfg
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.target.devserver/old/main/resources/conf/org.apache.ace.deployment.provider.filebased.cfg?rev=1357570&view=auto
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.target.devserver/old/main/resources/conf/org.apache.ace.deployment.provider.filebased.cfg (added)
+++ ace/sandbox/marrs/org.apache.ace.target.devserver/old/main/resources/conf/org.apache.ace.deployment.provider.filebased.cfg Thu Jul  5 12:09:30 2012
@@ -0,0 +1 @@
+BaseDirectoryName=store