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 2009/06/27 17:53:26 UTC

svn commit: r788992 [7/25] - in /incubator/ace/trunk: gateway/ gateway/src/ gateway/src/net/ gateway/src/net/luminis/ gateway/src/net/luminis/liq/ gateway/src/net/luminis/liq/bootstrap/ gateway/src/net/luminis/liq/bootstrap/multigateway/ gateway/src/ne...

Added: incubator/ace/trunk/liq/src/net/luminis/liq/repository/Repository.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/src/net/luminis/liq/repository/Repository.java?rev=788992&view=auto
==============================================================================
--- incubator/ace/trunk/liq/src/net/luminis/liq/repository/Repository.java (added)
+++ incubator/ace/trunk/liq/src/net/luminis/liq/repository/Repository.java Sat Jun 27 15:53:04 2009
@@ -0,0 +1,40 @@
+package net.luminis.liq.repository;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * Providing full access to a repository, which includes read and write access.
+ */
+public interface Repository {
+
+    /**
+     * Determines the versions inside the repository.
+     * 
+     * @returns A <code>SortedRangeSet</code> representing all the versions currently inside the repository.
+     * @throws IOException If there is an error determining the current versions.
+     */
+    public SortedRangeSet getRange() throws IOException;
+    
+    /**
+     * Commits data into the repository.
+     *
+     * @param data The data to be committed.
+     * @param fromVersion The version the data is based upon.
+     * @return True if the commit succeeded, false otherwise if the <code>fromVersion</code> is not the latest version.
+     * @throws IOException If there was a problem reading or writing the data.
+     * @throws IllegalArgumentException If the version is not greater than 0.
+     * @throws IllegalStateException If an attempt to commit was made on a non-master repository.
+     */
+    public boolean commit(InputStream data, long fromVersion) throws IOException, IllegalArgumentException;
+
+    /**
+     * Checks out the version of the repository that have been passed to this
+     * method as parameter.
+     * @return a stream containing a checkout of the passed in version of
+     * the repository, or null if the version does not exist
+     * @throws IOException if there is an error reading the version
+     * @throws IllegalArgumentException if the version is invalid.
+     */
+    public InputStream checkout(long version) throws IOException, IllegalArgumentException;
+}

Added: incubator/ace/trunk/liq/src/net/luminis/liq/repository/RepositoryReplication.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/src/net/luminis/liq/repository/RepositoryReplication.java?rev=788992&view=auto
==============================================================================
--- incubator/ace/trunk/liq/src/net/luminis/liq/repository/RepositoryReplication.java (added)
+++ incubator/ace/trunk/liq/src/net/luminis/liq/repository/RepositoryReplication.java Sat Jun 27 15:53:04 2009
@@ -0,0 +1,36 @@
+package net.luminis.liq.repository;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * The interface for replication of the data in a repository.
+ */
+public interface RepositoryReplication {
+
+    /**
+     * Determines the versions inside the repository.
+     * 
+     * @returns A <code>SortedRangeSet</code> representing all the versions currently inside the repository.
+     * @throws IOException If there is an error determining the current versions.
+     */
+    public SortedRangeSet getRange() throws IOException;
+    
+    /**
+     * Gets the specified version.
+     * 
+     * @return A stream containing the specified version's data or <code>null</code> if the version does not exist.
+     * @throws IOException If there is an error reading the version.
+     * @throws IllegalArgumentException If the specified version is not greater than 0.
+     */
+    public InputStream get(long version) throws IOException, IllegalArgumentException;
+
+    /**
+     * Store the stream data as the specified version.
+     * 
+     * @return returns True if all went fine, false if the version already existed.
+     * @throws IOException If the stream data could not be stored successfully due to I/O problems.
+     * @throws IllegalArgumentException If the version number is not greater than 0.
+     */
+    public boolean put(InputStream data, long version) throws IOException, IllegalArgumentException;
+}

Added: incubator/ace/trunk/liq/src/net/luminis/liq/repository/SortedRangeSet.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/src/net/luminis/liq/repository/SortedRangeSet.java?rev=788992&view=auto
==============================================================================
--- incubator/ace/trunk/liq/src/net/luminis/liq/repository/SortedRangeSet.java (added)
+++ incubator/ace/trunk/liq/src/net/luminis/liq/repository/SortedRangeSet.java Sat Jun 27 15:53:04 2009
@@ -0,0 +1,173 @@
+package net.luminis.liq.repository;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.StringTokenizer;
+
+/**
+ * Collection that stores a sorted set of ranges and is able to represent them
+ * as a string.
+ */
+public class SortedRangeSet {
+    /**
+     * A static set which contains all possible values.
+     */
+    public final static SortedRangeSet FULL_SET = new SortedRangeSet(0 + "-" + Long.MAX_VALUE) {
+        public boolean contains(long number) {
+            return true;
+        }
+    };
+    
+    private List m_ranges = new ArrayList();
+    
+    /**
+     * Creates a new instance from a string representation.
+     * 
+     * @param representation The string representation of a <code>SortedRangeSet</code>.
+     * @throws NumberFormatException If the string representation does not contain a valid <code>SortedRangeSet</code>.
+     */
+    public SortedRangeSet(String representation) {
+        StringTokenizer st = new StringTokenizer(representation, ",");
+        while (st.hasMoreTokens()) {
+            m_ranges.add(new Range(st.nextToken()));
+        }
+    }
+    
+    /**
+     * Creates a new instance from an array of longs.
+     * 
+     * @param items Array of longs
+     */
+    public SortedRangeSet(long[] items) {
+        // TODO: deal with items not being in ascending order
+        Range r = null;
+        for (int i = 0; i < items.length; i++) {
+            if (r == null) {
+                r = new Range(items[i]);
+            }
+            else {
+                if (items[i] == r.getHigh() + 1) {
+                    r.setHigh(items[i]);
+                }
+                else {
+                    m_ranges.add(r);
+                    r = new Range(items[i]);
+                }
+            }
+        }
+        if (r != null) {
+            m_ranges.add(r);
+        }
+    }
+    
+    private SortedRangeSet() {
+    }
+    
+    /**
+     * Retrieve a string representation of the <code>SortedRangeSet</code>.
+     * 
+     * @return A string representation of the <code>SortedRangeSet</code>.
+     */
+    public String toRepresentation() {
+        StringBuffer result = new StringBuffer();
+        Iterator i = m_ranges.iterator();
+        while (i.hasNext()) {
+            Range r = (Range) i.next();
+            if (result.length() > 0) {
+                result.append(',');
+            }
+            result.append(r.toRepresentation());
+        }
+        return result.toString();
+    }
+    
+    /**
+     * Creates the difference between this set and <code>dest</code>, by (in set notation)<br>
+     * <code>result = dest \ this</code>,<br>
+     * that is, if <code>dest = {1, 2}</code> and <code>this = {2, 3}</code>, then
+     * <code>result = {1, 2} \ {2, 3} = {1}</code>
+     * @param dest The set from which this set should be 'set-minussed'.
+     * @return The resulting set after the diff.
+     */
+    public SortedRangeSet diffDest(SortedRangeSet dest) {
+        SortedRangeSet result = new SortedRangeSet();
+        RangeIterator i = dest.iterator();
+        while (i.hasNext()) {
+            long number = i.next();
+            if (!contains(number)) {
+                result.add(number);
+            }
+        }
+        return result;
+    }
+    
+    public boolean contains(long number) {
+        Iterator i = m_ranges.iterator();
+        while (i.hasNext()) {
+            Range r = (Range) i.next();
+            if (r.contains(number)) {
+                return true;
+            }
+        }
+        return false;
+    }
+    
+    private void add(long number) {
+        ListIterator i = m_ranges.listIterator();
+        while (i.hasNext()) {
+            int index = i.nextIndex();
+            Range r = (Range) i.next();
+            if (r.contains(number)) {
+                return;
+            }
+            long low = r.getLow();
+            long high = r.getHigh();
+            if (number < low) {
+                if (number == low - 1) {
+                    r.setLow(number);
+                    return;
+                }
+                else {
+                    Range nr = new Range(number);
+                    m_ranges.add(index, nr);
+                    return;
+                }
+            }
+            if (number == high + 1) {
+                r.setHigh(number);
+                if (i.hasNext()) {
+                    Range nr = (Range) i.next();
+                    if (number == low - 1) {
+                        r.setHigh(nr.getHigh());
+                        i.remove();
+                    }
+                }
+                return;
+            }
+        }
+        Range nr = new Range(number);
+        m_ranges.add(nr);
+    }
+    
+    public RangeIterator iterator() {
+        return new RangeIterator(m_ranges.iterator());
+    }
+    
+    /**
+     * Returns the highest value present in any of the ranges in this <code>SortredRangeSet</code>.
+     * 
+     * @return The highest value present in any of the ranges in this <code>SortredRangeSet</code> or <code>0</code> if the <code>SortedRangeSet</code> is empty.
+     */
+    public long getHigh() {
+        int size = m_ranges.size();
+        if (size > 0) {
+            Range range = (Range) m_ranges.get(size - 1);
+            return range.getHigh();
+        }
+        else {
+            return 0;
+        }
+    }
+}

Added: incubator/ace/trunk/liq/src/net/luminis/liq/scheduler/constants/SchedulerConstants.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/src/net/luminis/liq/scheduler/constants/SchedulerConstants.java?rev=788992&view=auto
==============================================================================
--- incubator/ace/trunk/liq/src/net/luminis/liq/scheduler/constants/SchedulerConstants.java (added)
+++ incubator/ace/trunk/liq/src/net/luminis/liq/scheduler/constants/SchedulerConstants.java Sat Jun 27 15:53:04 2009
@@ -0,0 +1,9 @@
+package net.luminis.liq.scheduler.constants;
+
+public interface SchedulerConstants {
+    public static final String SCHEDULER_PID = "net.luminis.liq.scheduler";
+    public static final String SCHEDULER_NAME_KEY = "taskName";
+    public static final String SCHEDULER_DESCRIPTION_KEY = "description";
+    public static final String SCHEDULER_RECIPE = "recipe";
+    public static final String SCHEDULER_RECIPE_OVERRIDE = "override";
+}

Added: incubator/ace/trunk/liq/src/net/luminis/liq/util/Codec.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/src/net/luminis/liq/util/Codec.java?rev=788992&view=auto
==============================================================================
--- incubator/ace/trunk/liq/src/net/luminis/liq/util/Codec.java (added)
+++ incubator/ace/trunk/liq/src/net/luminis/liq/util/Codec.java Sat Jun 27 15:53:04 2009
@@ -0,0 +1,64 @@
+package net.luminis.liq.util;
+
+import java.text.CharacterIterator;
+import java.text.StringCharacterIterator;
+
+public class Codec {
+    
+    public static String decode(String source) throws IllegalArgumentException {
+        StringBuffer result = new StringBuffer();
+        StringCharacterIterator sci = new StringCharacterIterator(source);
+        for (char c = sci.current(); c != CharacterIterator.DONE; c = sci.next()) {
+            if (c == '$') {
+                c = sci.next();
+                if (c != CharacterIterator.DONE) {
+                    if (c == '$') {
+                        result.append('$');
+                    }
+                    else if (c == 'k') {
+                        result.append(',');
+                    }
+                    else if (c == 'n') {
+                        result.append('\n');
+                    }
+                    else if (c == 'r') {
+                        result.append('\r');
+                    }
+                    else {
+                        throw new IllegalArgumentException("Unknown escape character: " + c);
+                    }
+                }
+                else {
+                    throw new IllegalArgumentException("Unexpected end of input: " + source);
+                }
+            }
+            else {
+                result.append(c);
+            }
+        }
+        return result.toString();
+    }
+    
+    public static String encode(String source) {
+        StringBuffer result = new StringBuffer();
+        StringCharacterIterator sci = new StringCharacterIterator(source);
+        for (char c = sci.current(); c != CharacterIterator.DONE; c = sci.next()) {
+            if (c == '$') {
+                result.append("$$");
+            }
+            else if (c == ',') {
+                result.append("$k");
+            }
+            else if (c == '\n') {
+                result.append("$n");
+            }
+            else if (c == '\r') {
+                result.append("$r");
+            }
+            else {
+                result.append(c);
+            }
+        }
+        return result.toString();
+    }
+}

Added: incubator/ace/trunk/liq/src/net/luminis/liq/util/VersionRange.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/src/net/luminis/liq/util/VersionRange.java?rev=788992&view=auto
==============================================================================
--- incubator/ace/trunk/liq/src/net/luminis/liq/util/VersionRange.java (added)
+++ incubator/ace/trunk/liq/src/net/luminis/liq/util/VersionRange.java Sat Jun 27 15:53:04 2009
@@ -0,0 +1,122 @@
+/* 
+ * 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 net.luminis.liq.util;
+
+import org.osgi.framework.Version;
+
+public class VersionRange
+{
+    private Version m_low = null;
+    private boolean m_isLowInclusive = false;
+    private Version m_high = null;
+    private boolean m_isHighInclusive = false;
+    private String m_toString = null;
+    public static final VersionRange infiniteRange = new VersionRange(Version.emptyVersion, true, null, true);
+
+    public VersionRange(Version low, boolean isLowInclusive,
+        Version high, boolean isHighInclusive)
+    {
+        m_low = low;
+        m_isLowInclusive = isLowInclusive;
+        m_high = high;
+        m_isHighInclusive = isHighInclusive;
+    }
+
+    public Version getLow()
+    {
+        return m_low;
+    }
+
+    public boolean isLowInclusive()
+    {
+        return m_isLowInclusive;
+    }
+
+    public Version getHigh()
+    {
+        return m_high;
+    }
+
+    public boolean isHighInclusive()
+    {
+        return m_isHighInclusive;
+    }
+
+    public boolean isInRange(Version version)
+    {
+        // We might not have an upper end to the range.
+        if (m_high == null)
+        {
+            return (version.compareTo(m_low) >= 0);
+        }
+        else if (isLowInclusive() && isHighInclusive())
+        {
+            return (version.compareTo(m_low) >= 0) && (version.compareTo(m_high) <= 0);
+        }
+        else if (isHighInclusive())
+        {
+            return (version.compareTo(m_low) > 0) && (version.compareTo(m_high) <= 0);
+        }
+        else if (isLowInclusive())
+        {
+            return (version.compareTo(m_low) >= 0) && (version.compareTo(m_high) < 0);
+        }
+        return (version.compareTo(m_low) > 0) && (version.compareTo(m_high) < 0);
+    }
+
+    public static VersionRange parse(String range)
+    {
+        // Check if the version is an interval.
+        if (range.indexOf(',') >= 0)
+        {
+            String s = range.substring(1, range.length() - 1);
+            String vlo = s.substring(0, s.indexOf(',')).trim();
+            String vhi = s.substring(s.indexOf(',') + 1, s.length()).trim();
+            return new VersionRange (
+                new Version(vlo), (range.charAt(0) == '['),
+                new Version(vhi), (range.charAt(range.length() - 1) == ']'));
+        }
+        else
+        {
+            return new VersionRange(new Version(range), true, null, false);
+        }
+    }
+
+    public String toString()
+    {
+        if (m_toString == null)
+        {
+            if (m_high != null)
+            {
+                StringBuffer sb = new StringBuffer();
+                sb.append(m_isLowInclusive ? '[' : '(');
+                sb.append(m_low.toString());
+                sb.append(',');
+                sb.append(m_high.toString());
+                sb.append(m_isHighInclusive ? ']' : ')');
+                m_toString = sb.toString();
+            }
+            else
+            {
+                m_toString = m_low.toString();
+            }
+        }
+        return m_toString;
+    }
+}
\ No newline at end of file

Added: incubator/ace/trunk/liq/target-dev-client.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/target-dev-client.xml?rev=788992&view=auto
==============================================================================
--- incubator/ace/trunk/liq/target-dev-client.xml (added)
+++ incubator/ace/trunk/liq/target-dev-client.xml Sat Jun 27 15:53:04 2009
@@ -0,0 +1,143 @@
+<project name="dev-client" default="warning">
+    <property name="deploy-dir" value="deploy/target/${ant.project.name}" />
+    <property name="app-name" value="L-iQ PS client" />
+	
+    <target name="warning">
+        <echo message="Please run top level build." />
+    </target>
+    
+    <target name="deploy">
+        <mkdir dir="${deploy-dir}" />
+        <copy todir="${deploy-dir}">
+            <fileset dir="lib/felix/1.4.1">
+                <include name="**" />
+            </fileset>
+        </copy>
+        <copy todir="${deploy-dir}/bundle">
+            <fileset dir="deploy/bundle">
+                <include name="net.luminis.liq.consolelogger-1.0.0.jar" />
+            	<include name="net.luminis.liq.scheduler-1.0.0.jar" />
+            	<include name="net.luminis.liq.configurator-1.0.0.jar" />
+            	<include name="net.luminis.liq.configurator.useradmin.task-1.0.0.jar" />
+            	<include name="net.luminis.liq.resourceprocessor.useradmin-1.0.0.jar" />
+            	<include name="net.luminis.liq.discovery.property-1.0.0.jar" />
+            	<include name="net.luminis.liq.server.log.store-1.0.0.jar" />
+            	<include name="net.luminis.liq.server.log.task-1.0.0.jar" />
+            	<include name="net.luminis.liq.repository-1.0.0.jar" />
+            	<include name="net.luminis.liq.client.repositoryuseradmin-1.0.0.jar" />
+            	<include name="net.luminis.liq.client.repository.stateful-1.0.0.jar" />
+            	<include name="net.luminis.liq.client.repository-1.0.0.jar" />
+            	<include name="net.luminis.liq.client.repository.helper.base-1.0.0.jar" />
+            	<include name="net.luminis.liq.client.repository.helper.bundle-1.0.0.jar" />
+            	<include name="net.luminis.liq.client.repository.helper.driverbundle-1.0.0.jar" />
+            	<include name="net.luminis.liq.client.repository.helper.configuration-1.0.0.jar" />
+            	<include name="net.luminis.liq.client.repository.helper.user-1.0.0.jar" />
+                <include name="net.luminis.liq.client.repository.helper.license-1.0.0.jar" />
+                <include name="net.luminis.liq.activation.store-1.0.0.jar" />
+                <include name="net.luminis.liq.activationinfo.store-1.0.0.jar" />
+                <include name="net.luminis.liq.activation.matcher-1.0.0.jar" />
+            	<include name="net.luminis.liq.swingui.resources-1.0.0.jar" />
+            	<include name="net.luminis.liq.swingui.resources.en-1.0.0.jar" />
+            	<include name="net.luminis.liq.swingui.resources.nl-1.0.0.jar" />
+            	<include name="net.luminis.liq.swingui.skin-1.0.0.jar" />
+            	<include name="net.luminis.liq.swingui-1.0.0.jar" />
+            </fileset>
+            <fileset dir="ext">
+            	<include name="org.osgi.compendium.jar" />
+                <include name="osgi.mobile.jar" />
+                <include name="javax.servlet.jar" />
+                <include name="org.apache.felix.dependencymanager.jar" />
+                <include name="org.apache.felix.dependencymanager.shell.jar" />
+                <include name="forms-1.0.7.jar" />
+                <include name="swingx-2007_03_18.jar" />
+                <include name="SwingHelper.jar" />
+                <include name="xstream-1.3.jar" />
+                <include name="miglayout15-swing.jar" />
+            </fileset>
+            <fileset dir="lib">
+                <include name="org.apache.felix.configadmin.jar" />
+                <include name="log_all-2.0.0.jar" />
+            	<include name="useradmin_all-2.0.0.jar" />
+            	<include name="net.luminis.liq.xstream-1.3.jar" />
+                <include name="org.apache.felix.eventadmin.jar" />
+            	<include name="org.apache.felix.prefs.jar" />
+            </fileset>
+    	</copy>
+        <copy todir="${deploy-dir}/conf">
+            <fileset dir="conf/${ant.project.name}">
+                <include name="**/*.cfg" />
+            </fileset>
+        </copy>
+        <move file="${deploy-dir}/conf/dev-config.properties" tofile="${deploy-dir}/conf/config.properties" />
+        <delete file="${deploy-dir}/conf/test-config.properties" />
+        <replace file="${deploy-dir}/conf/config.properties" token="@bundles@" value="
+        	file:bundle/net.luminis.liq.consolelogger-1.0.0.jar
+            file:bundle/javax.servlet.jar
+            file:bundle/org.osgi.compendium.jar 
+            file:bundle/osgi.mobile.jar 
+            file:bundle/org.apache.felix.dependencymanager.jar 
+            file:bundle/org.apache.felix.dependencymanager.shell.jar 
+            file:bundle/org.apache.felix.shell-1.0.2.jar 
+            file:bundle/org.apache.felix.shell.tui-1.0.2.jar 
+            file:bundle/org.apache.felix.configadmin.jar
+        	file:bundle/org.apache.felix.eventadmin.jar
+            file:bundle/org.apache.felix.prefs.jar
+        	file:bundle/useradmin_all-2.0.0.jar
+        	file:bundle/log_all-2.0.0.jar
+            file:bundle/net.luminis.liq.scheduler-1.0.0.jar
+        	file:bundle/net.luminis.liq.configurator-1.0.0.jar
+        	file:bundle/net.luminis.liq.resourceprocessor.useradmin-1.0.0.jar
+        	file:bundle/net.luminis.liq.configurator.useradmin.task-1.0.0.jar
+        	file:bundle/net.luminis.liq.client.repositoryuseradmin-1.0.0.jar
+            file:bundle/net.luminis.liq.discovery.property-1.0.0.jar
+            file:bundle/net.luminis.liq.server.log.store-1.0.0.jar
+            file:bundle/net.luminis.liq.server.log.task-1.0.0.jar
+            file:bundle/net.luminis.liq.repository-1.0.0.jar
+            file:bundle/net.luminis.liq.client.repository.stateful-1.0.0.jar
+        	file:bundle/net.luminis.liq.client.repository-1.0.0.jar
+        	file:bundle/net.luminis.liq.client.repository.helper.base-1.0.0.jar
+        	file:bundle/net.luminis.liq.client.repository.helper.bundle-1.0.0.jar
+        	file:bundle/net.luminis.liq.client.repository.helper.driverbundle-1.0.0.jar
+        	file:bundle/net.luminis.liq.client.repository.helper.configuration-1.0.0.jar
+        	file:bundle/net.luminis.liq.client.repository.helper.user-1.0.0.jar
+            file:bundle/net.luminis.liq.client.repository.helper.license-1.0.0.jar
+            file:bundle/net.luminis.liq.activationinfo.store-1.0.0.jar
+        	file:bundle/net.luminis.liq.activation.store-1.0.0.jar
+        	file:bundle/net.luminis.liq.activation.matcher-1.0.0.jar
+        	file:bundle/net.luminis.liq.xstream-1.3.jar
+        	file:bundle/net.luminis.liq.swingui.resources-1.0.0.jar
+        	file:bundle/net.luminis.liq.swingui.resources.en-1.0.0.jar
+        	file:bundle/net.luminis.liq.swingui.resources.nl-1.0.0.jar
+        	file:bundle/net.luminis.liq.swingui.skin-1.0.0.jar
+        	file:bundle/net.luminis.liq.swingui-1.0.0.jar
+            file:bundle/net.luminis.liq.http.echo.client-1.0.0.jar" />
+        <replace file="${deploy-dir}/conf/config.properties" token="@properties@" value="" />
+    	
+    	<property name="vmargs" value="-Dorg.knopflerfish.useradmin.dontsave=true -Dorg.apache.felix.eventadmin.Timeout=0" />
+    	
+    	<property name="runCommand" value="java ${vmargs} -jar bin/felix.jar"/>
+    	<property name="runNlCommand" value="java -Duser.language=nl ${vmargs} -jar bin/felix.jar"/>
+        <property name="runSecureCommand" value="java ${vmargs} -Djavax.net.ssl.keyStore=/tmp/node2Keystore -Djavax.net.ssl.keyStorePassword=secret -Djavax.net.ssl.trustStore=/tmp/truststore -Djavax.net.ssl.trustStorePassword=secret -jar bin/felix.jar" />
+    	<property name="debugCommand" value="java ${vmargs} -jar -Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y -Dcom.sun.management.jmxremote.port=6666 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false bin/felix.jar"/>
+    	<echo file="${deploy-dir}/run.sh">#!/bin/sh
+${runCommand}
+        </echo>
+		<echo file="${deploy-dir}/run.bat">${runCommand}
+        </echo>
+		<echo file="${deploy-dir}/run_nl.sh">#!/bin/sh
+${runNlCommand}
+        </echo>
+		<echo file="${deploy-dir}/run_nl.bat">${runNlCommand}
+        </echo>
+        <echo file="${deploy-dir}/debug.sh">#!/bin/sh
+${debugCommand}
+        </echo>
+        <echo file="${deploy-dir}/debug.bat">${debugCommand}
+        </echo>
+        <echo file="${deploy-dir}/run_secure.sh">#!/bin/sh
+${runSecureCommand}
+        </echo>
+        <echo file="${deploy-dir}/run_secure.bat">${runSecureCommand}
+        </echo>
+    </target>
+</project>
\ No newline at end of file

Added: incubator/ace/trunk/liq/target-dev-customlicenseclient.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/target-dev-customlicenseclient.xml?rev=788992&view=auto
==============================================================================
--- incubator/ace/trunk/liq/target-dev-customlicenseclient.xml (added)
+++ incubator/ace/trunk/liq/target-dev-customlicenseclient.xml Sat Jun 27 15:53:04 2009
@@ -0,0 +1,136 @@
+<project name="dev-customlicenseclient" default="warning">
+    <property name="deploy-dir" value="deploy/target/${ant.project.name}" />
+    <property name="app-name" value="L-iQ PS client" />
+	
+    <target name="warning">
+        <echo message="Please run top level build." />
+    </target>
+    
+    <target name="deploy">
+        <mkdir dir="${deploy-dir}" />
+        <copy todir="${deploy-dir}">
+            <fileset dir="lib/felix/1.4.1">
+                <include name="**" />
+            </fileset>
+        </copy>
+        <copy todir="${deploy-dir}/bundle">
+            <fileset dir="deploy/bundle">
+                <include name="net.luminis.liq.consolelogger-1.0.0.jar" />
+            	<include name="net.luminis.liq.scheduler-1.0.0.jar" />
+            	<include name="net.luminis.liq.configurator-1.0.0.jar" />
+            	<include name="net.luminis.liq.configurator.useradmin.task-1.0.0.jar" />
+            	<include name="net.luminis.liq.resourceprocessor.useradmin-1.0.0.jar" />
+            	<include name="net.luminis.liq.discovery.property-1.0.0.jar" />
+            	<include name="net.luminis.liq.server.log.store-1.0.0.jar" />
+            	<include name="net.luminis.liq.server.log.task-1.0.0.jar" />
+            	<include name="net.luminis.liq.repository-1.0.0.jar" />
+            	<include name="net.luminis.liq.client.repositoryuseradmin-1.0.0.jar" />
+            	<include name="net.luminis.liq.client.repository.stateful-1.0.0.jar" />
+            	<include name="net.luminis.liq.client.repository-1.0.0.jar" />
+            	<include name="net.luminis.liq.client.repository.helper.base-1.0.0.jar" />
+            	<include name="net.luminis.liq.client.repository.helper.bundle-1.0.0.jar" />
+            	<include name="net.luminis.liq.client.repository.helper.driverbundle-1.0.0.jar" />
+            	<include name="net.luminis.liq.client.repository.helper.configuration-1.0.0.jar" />
+            	<include name="net.luminis.liq.client.repository.helper.user-1.0.0.jar" />
+            	<include name="net.luminis.liq.client.repository.helper.license-1.0.0.jar" />
+                <include name="net.luminis.liq.activation.store-1.0.0.jar" />
+                <include name="net.luminis.liq.activationinfo.store-1.0.0.jar" />
+                <include name="net.luminis.liq.activation.matcher-1.0.0.jar" />
+            	<include name="net.luminis.liq.swingui.resources-1.0.0.jar" />
+            	<include name="net.luminis.liq.swingui.resources.en-1.0.0.jar" />
+            	<include name="net.luminis.liq.swingui.resources.nl-1.0.0.jar" />
+            	<include name="net.luminis.liq.swingui.skin-1.0.0.jar" />
+            	<include name="net.luminis.liq.swingui-1.0.0.jar" />
+            </fileset>
+            <fileset dir="ext">
+            	<include name="org.osgi.compendium.jar" />
+                <include name="osgi.mobile.jar" />
+                <include name="javax.servlet.jar" />
+                <include name="org.apache.felix.dependencymanager.jar" />
+                <include name="org.apache.felix.dependencymanager.shell.jar" />
+                <include name="forms-1.0.7.jar" />
+                <include name="swingx-2007_03_18.jar" />
+                <include name="SwingHelper.jar" />
+                <include name="xstream-1.3.jar" />
+                <include name="miglayout15-swing.jar" />
+            </fileset>
+            <fileset dir="lib">
+                <include name="org.apache.felix.configadmin.jar" />
+                <include name="log_all-2.0.0.jar" />
+            	<include name="useradmin_all-2.0.0.jar" />
+            	<include name="net.luminis.liq.xstream-1.3.jar" />
+                <include name="org.apache.felix.eventadmin.jar" />
+            	<include name="org.apache.felix.prefs.jar" />
+            </fileset>
+    	</copy>
+        <copy todir="${deploy-dir}/conf">
+            <fileset dir="conf/${ant.project.name}">
+                <include name="**/*.cfg" />
+            </fileset>
+        </copy>
+        <move file="${deploy-dir}/conf/dev-config.properties" tofile="${deploy-dir}/conf/config.properties" />
+        <delete file="${deploy-dir}/conf/test-config.properties" />
+        <replace file="${deploy-dir}/conf/config.properties" token="@bundles@" value="
+        	file:bundle/net.luminis.liq.consolelogger-1.0.0.jar
+            file:bundle/javax.servlet.jar
+            file:bundle/org.osgi.compendium.jar 
+            file:bundle/osgi.mobile.jar 
+            file:bundle/org.apache.felix.dependencymanager.jar 
+            file:bundle/org.apache.felix.dependencymanager.shell.jar 
+            file:bundle/org.apache.felix.shell-1.0.2.jar 
+            file:bundle/org.apache.felix.shell.tui-1.0.2.jar 
+            file:bundle/org.apache.felix.configadmin.jar
+        	file:bundle/org.apache.felix.eventadmin.jar
+            file:bundle/org.apache.felix.prefs.jar
+        	file:bundle/useradmin_all-2.0.0.jar
+        	file:bundle/log_all-2.0.0.jar
+            file:bundle/net.luminis.liq.scheduler-1.0.0.jar
+        	file:bundle/net.luminis.liq.configurator-1.0.0.jar
+        	file:bundle/net.luminis.liq.resourceprocessor.useradmin-1.0.0.jar
+        	file:bundle/net.luminis.liq.configurator.useradmin.task-1.0.0.jar
+        	file:bundle/net.luminis.liq.client.repositoryuseradmin-1.0.0.jar
+            file:bundle/net.luminis.liq.discovery.property-1.0.0.jar
+            file:bundle/net.luminis.liq.server.log.store-1.0.0.jar
+            file:bundle/net.luminis.liq.server.log.task-1.0.0.jar
+            file:bundle/net.luminis.liq.repository-1.0.0.jar
+            file:bundle/net.luminis.liq.client.repository.stateful-1.0.0.jar
+        	file:bundle/net.luminis.liq.client.repository-1.0.0.jar
+        	file:bundle/net.luminis.liq.client.repository.helper.base-1.0.0.jar
+        	file:bundle/net.luminis.liq.client.repository.helper.bundle-1.0.0.jar
+        	file:bundle/net.luminis.liq.client.repository.helper.driverbundle-1.0.0.jar
+        	file:bundle/net.luminis.liq.client.repository.helper.configuration-1.0.0.jar
+        	file:bundle/net.luminis.liq.client.repository.helper.user-1.0.0.jar
+            file:bundle/net.luminis.liq.client.repository.helper.license-1.0.0.jar
+            file:bundle/net.luminis.liq.activationinfo.store-1.0.0.jar
+        	file:bundle/net.luminis.liq.activation.store-1.0.0.jar
+        	file:bundle/net.luminis.liq.activation.matcher-1.0.0.jar
+        	file:bundle/net.luminis.liq.xstream-1.3.jar
+        	file:bundle/net.luminis.liq.swingui.resources-1.0.0.jar
+        	file:bundle/net.luminis.liq.swingui.resources.en-1.0.0.jar
+        	file:bundle/net.luminis.liq.swingui.resources.nl-1.0.0.jar
+        	file:bundle/net.luminis.liq.swingui.skin-1.0.0.jar
+        	file:bundle/net.luminis.liq.swingui-1.0.0.jar" />
+        <replace file="${deploy-dir}/conf/config.properties" token="@properties@" value="" />
+    	
+    	<property name="vmargs" value="-Dorg.knopflerfish.useradmin.dontsave=true -Dorg.apache.felix.eventadmin.Timeout=0" />
+    	
+    	<property name="runCommand" value="java ${vmargs} -jar bin/felix.jar"/>
+    	<property name="runNlCommand" value="java -Duser.language=nl ${vmargs} -jar bin/felix.jar"/>
+    	<property name="debugCommand" value="java ${vmargs} -jar -Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y -Dcom.sun.management.jmxremote.port=6666 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false bin/felix.jar"/>
+    	<echo file="${deploy-dir}/run.sh">#!/bin/sh
+${runCommand}
+        </echo>
+		<echo file="${deploy-dir}/run.bat">${runCommand}
+        </echo>
+		<echo file="${deploy-dir}/run_nl.sh">#!/bin/sh
+${runNlCommand}
+        </echo>
+		<echo file="${deploy-dir}/run_nl.bat">${runNlCommand}
+        </echo>
+        <echo file="${deploy-dir}/debug.sh">#!/bin/sh
+${debugCommand}
+        </echo>
+        <echo file="${deploy-dir}/debug.bat">${debugCommand}
+        </echo>
+    </target>
+</project>
\ No newline at end of file

Added: incubator/ace/trunk/liq/target-dev-customlicenseserver.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/target-dev-customlicenseserver.xml?rev=788992&view=auto
==============================================================================
--- incubator/ace/trunk/liq/target-dev-customlicenseserver.xml (added)
+++ incubator/ace/trunk/liq/target-dev-customlicenseserver.xml Sat Jun 27 15:53:04 2009
@@ -0,0 +1,160 @@
+<project name="dev-customlicenseserver" default="warning">
+    <property name="deploy-dir" value="deploy/target/${ant.project.name}" />
+    <property name="app-name" value="iMethod PS server" />
+
+    <target name="warning">
+        <echo message="Please run top level build." />
+    </target>
+    
+    <target name="deploy">
+        <copy todir="${deploy-dir}">
+            <fileset dir="lib/felix/1.4.1">
+                <include name="**" />
+            </fileset>
+        </copy>
+        <copy todir="${deploy-dir}/bundle">
+            <fileset dir="deploy/bundle">
+                <include name="net.luminis.liq.inotify.alertlog.listener-1.0.0.jar" />
+                <include name="net.luminis.liq.inotify.serviceengineermanager.useradminbased-1.0.0.jar" />
+            	<include name="net.luminis.liq.consolelogger-1.0.0.jar" />
+            	<include name="net.luminis.liq.configurator-1.0.0.jar" />
+            	<include name="net.luminis.liq.configurator.useradmin.task-1.0.0.jar" />
+            	<include name="net.luminis.liq.resourceprocessor.useradmin-1.0.0.jar" />
+            	<include name="net.luminis.liq.http.listener-1.0.0.jar" />
+            	<include name="net.luminis.liq.deployment.servlet-1.0.0.jar" />
+            	<include name="net.luminis.liq.deployment.provider.repositorybased-1.0.0.jar" />
+            	<include name="net.luminis.liq.deployment.streamgenerator-1.0.0.jar" />
+            	<include name="net.luminis.liq.discovery.property-1.0.0.jar" />
+            	<include name="net.luminis.liq.server.log.store-1.0.0.jar" />
+            	<include name="net.luminis.liq.server.log-1.0.0.jar" />
+            	<include name="net.luminis.liq.server.action-1.0.0.jar" />
+            	<include name="net.luminis.liq.server.action.mailaction-1.0.0.jar" />
+                <include name="net.luminis.liq.server.action.popupmessage-1.0.0.jar" />
+            	<include name="net.luminis.liq.mailservice.javamail-1.0.0.jar" />
+            	<include name="net.luminis.liq.scheduler-1.0.0.jar" />
+            	<include name="net.luminis.liq.repository-1.0.0.jar" />
+            	<include name="net.luminis.liq.repository.servlet-1.0.0.jar" />
+            	<include name="net.luminis.liq.client.repository-1.0.0.jar" />
+            	<include name="net.luminis.liq.client.repository.stateful-1.0.0.jar" />
+            	<include name="net.luminis.liq.client.repository.helper.base-1.0.0.jar" />
+            	<include name="net.luminis.liq.client.repository.helper.bundle-1.0.0.jar" />
+            	<include name="net.luminis.liq.repository.servlet-1.0.0.jar" />
+            	<include name="net.luminis.liq.obr.servlet-1.0.0.jar" />
+            	<include name="net.luminis.liq.obr.storage-1.0.0.jar" />
+            	<include name="net.luminis.liq.obr.metadata-1.0.0.jar" />
+            	<include name="net.luminis.liq.license.servlet-1.0.0.jar" />
+            </fileset>
+            <fileset dir="lib">
+                <include name="net.luminis.liq.consolelogger-1.0.0.jar" />
+            	<include name="net.luminis.liq.xstream-1.3.jar" />
+                <include name="org.apache.felix.configadmin.jar" />
+                <include name="org.apache.felix.eventadmin.jar" />
+                <include name="log_all-2.0.0.jar" />
+                <include name="http.jetty.jar" />
+            	<include name="useradmin_all-2.0.0.jar" />
+            	<include name="org.apache.felix.prefs.jar" />
+            </fileset>
+            <fileset dir="ext">
+            	<include name="org.osgi.compendium.jar" />
+                <include name="osgi.mobile.jar" />
+                <include name="javax.servlet.jar" />
+                <include name="org.apache.felix.dependencymanager.jar" />
+                <include name="org.apache.felix.dependencymanager.shell.jar" />
+                <!--include name="xstream-1.3.jar" /-->
+            </fileset>
+        </copy>
+        <copy todir="${deploy-dir}/conf" overwrite="true">
+            <fileset dir="conf/${ant.project.name}">
+                <include name="**/*.cfg" />
+            </fileset>
+        </copy>
+ 
+       <!-- We 'pre-package' this server's OBR with a few bundles. -->
+        <copy todir="${deploy-dir}/store" overwrite="true">
+            <fileset dir="lib">
+                <include name="servicebased.host-1.0.0.jar" />
+                <include name="servicebased.square-1.0.0.jar" />
+                <include name="servicebased.circle-1.0.0.jar" />
+                <include name="servicebased.triangle-1.0.0.jar" />
+            </fileset>
+        	<fileset dir="deploy/bundle">
+        		<include name="net.luminis.liq.swingui.artifactmanager-1.0.0.jar" />
+        		<include name="net.luminis.liq.swingui.artifactmanager.ps-1.0.0.jar" />
+        	</fileset>
+        </copy>
+    	
+        <property name="bundles-noshell" value="
+            file:bundle/net.luminis.liq.consolelogger-1.0.0.jar
+        	file:bundle/log_all-2.0.0.jar
+            file:bundle/osgi.mobile.jar 
+            file:bundle/org.osgi.compendium.jar 
+            file:bundle/http.jetty.jar
+            file:bundle/javax.servlet.jar
+        	file:bundle/useradmin_all-2.0.0.jar
+        	file:bundle/org.apache.felix.eventadmin.jar
+            file:bundle/org.apache.felix.shell-1.0.2.jar 
+        	file:bundle/org.apache.felix.configadmin.jar 
+            file:bundle/org.apache.felix.shell.tui-1.0.2.jar 
+            file:bundle/org.apache.felix.dependencymanager.jar 
+            file:bundle/org.apache.felix.prefs.jar
+            file:bundle/net.luminis.liq.configurator-1.0.0.jar
+            file:bundle/net.luminis.liq.http.listener-1.0.0.jar
+            file:bundle/net.luminis.liq.deployment.servlet-1.0.0.jar
+            file:bundle/net.luminis.liq.deployment.provider.repositorybased-1.0.0.jar
+            file:bundle/net.luminis.liq.deployment.streamgenerator-1.0.0.jar
+        	file:bundle/net.luminis.liq.discovery.property-1.0.0.jar
+            file:bundle/net.luminis.liq.server.log.store-1.0.0.jar
+            file:bundle/net.luminis.liq.server.log-1.0.0.jar
+        	file:bundle/net.luminis.liq.mailservice.javamail-1.0.0.jar
+    	    file:bundle/net.luminis.liq.server.action-1.0.0.jar
+        	file:bundle/net.luminis.liq.server.action.mailaction-1.0.0.jar
+            file:bundle/net.luminis.liq.server.action.popupmessage-1.0.0.jar
+            file:bundle/net.luminis.liq.scheduler-1.0.0.jar
+            file:bundle/net.luminis.liq.obr.servlet-1.0.0.jar
+            file:bundle/net.luminis.liq.obr.storage-1.0.0.jar
+            file:bundle/net.luminis.liq.obr.metadata-1.0.0.jar
+            file:bundle/net.luminis.liq.repository-1.0.0.jar
+            file:bundle/net.luminis.liq.repository.servlet-1.0.0.jar
+        	file:bundle/net.luminis.liq.xstream-1.3.jar
+        	file:bundle/net.luminis.liq.client.repository-1.0.0.jar
+        	file:bundle/net.luminis.liq.client.repository.stateful-1.0.0.jar
+        	file:bundle/net.luminis.liq.client.repository.helper.base-1.0.0.jar
+        	file:bundle/net.luminis.liq.client.repository.helper.bundle-1.0.0.jar
+            file:bundle/net.luminis.liq.inotify.alertlog.listener-1.0.0.jar
+            file:bundle/net.luminis.liq.inotify.serviceengineermanager.useradminbased-1.0.0.jar
+        	file:bundle/net.luminis.liq.configurator.useradmin.task-1.0.0.jar
+        	file:bundle/net.luminis.liq.resourceprocessor.useradmin-1.0.0.jar
+        	file:bundle/net.luminis.liq.license.servlet-1.0.0.jar
+        " />
+        <property name="bundles-shell" value="${bundles-noshell}
+            file:bundle/org.apache.felix.shell-1.0.1.jar 
+            file:bundle/org.apache.felix.shell.tui-1.0.1.jar" />
+        
+    	<copy file="lib/felix/1.4.1/conf/dev-config.properties" overwrite="true" tofile="${deploy-dir}/conf/config.properties"/>
+        <copy file="lib/felix/1.4.1/conf/dev-config.properties" overwrite="true" tofile="${deploy-dir}/conf/config-noshell.properties"/>
+    	
+    	<replace file="${deploy-dir}/conf/config.properties" token="@bundles@" value="${bundles-shell}" />
+        <replace file="${deploy-dir}/conf/config-noshell.properties" token="@bundles@" value="${bundles-noshell}" />
+        <replace file="${deploy-dir}/conf/config.properties" token="@properties@" value="org.osgi.service.http.port=8080" />
+        <replace file="${deploy-dir}/conf/config-noshell.properties" token="@properties@" value="org.osgi.service.http.port=8080" />
+
+    	<property name="runCommand" value="java -Xms256m -Xmx256m -Dorg.apache.felix.eventadmin.Timeout=0 -jar bin/felix.jar"/>
+    	<property name="runNoshellCommand" value="java -Xms256m -Xmx256m -Dorg.apache.felix.eventadmin.Timeout=0 -Dfelix.config.properties=file:conf/config-noshell.properties -jar bin/felix.jar > output-felix.txt 2>&amp;1"/>
+    	<property name="debugCommand" value="java -Xms256m -Xmx256m -jar -Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y -Dorg.apache.felix.eventadmin.Timeout=0 -Dcom.sun.management.jmxremote.port=6666 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false bin/felix.jar"/>
+    	<echo file="${deploy-dir}/run.sh">#!/bin/sh
+${runCommand}
+        </echo>
+		<echo file="${deploy-dir}/run.bat">${runCommand}
+        </echo>
+    	<echo file="${deploy-dir}/run-noshell.sh">#!/bin/sh
+${runNoshellCommand}
+        </echo>
+		<echo file="${deploy-dir}/run-noshell.bat">${runNoshellCommand}
+        </echo>
+        <echo file="${deploy-dir}/debug.sh">#!/bin/sh
+${debugCommand}
+        </echo>
+        <echo file="${deploy-dir}/debug.bat">${debugCommand}
+        </echo>
+    </target>
+</project>
\ No newline at end of file

Added: incubator/ace/trunk/liq/target-dev-gateway-ma.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/target-dev-gateway-ma.xml?rev=788992&view=auto
==============================================================================
--- incubator/ace/trunk/liq/target-dev-gateway-ma.xml (added)
+++ incubator/ace/trunk/liq/target-dev-gateway-ma.xml Sat Jun 27 15:53:04 2009
@@ -0,0 +1,70 @@
+<project name="dev-gateway-ma" default="warning">
+    <property name="deploy-dir" value="deploy/target/${ant.project.name}" />
+	<property name="app-name" value="L-iQ PS gateway" />
+
+    <target name="warning">
+        <echo message="Please run top level build." />
+    </target>
+    
+    <target name="deploy">
+        <mkdir dir="${deploy-dir}" />
+        <copy todir="${deploy-dir}">
+            <fileset dir="lib/felix/1.4.1">
+                <include name="**" />
+            </fileset>
+        </copy>
+        <copy todir="${deploy-dir}/bundle">
+            <fileset dir="deploy/bundle">
+                <include name="net.luminis.liq.consolelogger-1.0.0.jar" />
+            	<include name="net.luminis.liq.ma-1.0.0.jar" />
+            </fileset>
+            <fileset dir="ext">
+            	<include name="org.osgi.compendium.jar" />
+                <include name="osgi.mobile.jar" />
+                <include name="javax.servlet.jar" />
+                <include name="org.apache.felix.dependencymanager.jar" />
+            </fileset>
+            <fileset dir="lib">
+                <include name="org.apache.felix.configadmin.jar" />
+                <include name="log_all-2.0.0.jar" />
+                <include name="org.apache.felix.eventadmin.jar" />
+                <include name="org.apache.felix.deploymentadmin-0.9.0-SNAPSHOT.jar" />
+            </fileset>
+        </copy>
+    	<copy todir="${deploy-dir}/conf">
+    		<fileset dir="conf/${ant.project.name}">
+                <include name="**/*.cfg" />
+			</fileset>
+		</copy>
+        <move file="${deploy-dir}/conf/dev-config.properties" tofile="${deploy-dir}/conf/config.properties" />
+        <delete file="${deploy-dir}/conf/test-config.properties" />
+        <replace file="${deploy-dir}/conf/config.properties" token="@bundles@" value="
+        	file:bundle/net.luminis.liq.consolelogger-1.0.0.jar
+        	file:bundle/log_all-2.0.0.jar
+            file:bundle/javax.servlet.jar
+            file:bundle/org.osgi.compendium.jar 
+            file:bundle/osgi.mobile.jar 
+            file:bundle/org.apache.felix.deploymentadmin-0.9.0-SNAPSHOT.jar
+            file:bundle/net.luminis.liq.ma-1.0.0.jar           
+            file:bundle/org.apache.felix.dependencymanager.jar 
+            file:bundle/org.apache.felix.eventadmin.jar
+            file:bundle/org.apache.felix.shell-1.0.2.jar 
+            file:bundle/org.apache.felix.shell.tui-1.0.2.jar 
+            file:bundle/org.apache.felix.configadmin.jar 
+            file:bundle/net.luminis.liq.log-1.0.0.jar" />
+        <replace file="${deploy-dir}/conf/config.properties" token="@properties@" value="" />
+
+    	<property name="runCommand" value="java -jar bin/felix.jar"/>
+    	<property name="debugCommand" value="java -jar -Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y -Dcom.sun.management.jmxremote.port=6666 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false bin/felix.jar"/>
+    	<echo file="${deploy-dir}/run.sh">#!/bin/sh
+${runCommand}
+        </echo>
+		<echo file="${deploy-dir}/run.bat">${runCommand}
+        </echo>
+        <echo file="${deploy-dir}/debug.sh">#!/bin/sh
+${debugCommand}
+        </echo>
+        <echo file="${deploy-dir}/debug.bat">${debugCommand}
+        </echo>
+    </target>
+</project>
\ No newline at end of file

Added: incubator/ace/trunk/liq/target-dev-gateway-upnp.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/target-dev-gateway-upnp.xml?rev=788992&view=auto
==============================================================================
--- incubator/ace/trunk/liq/target-dev-gateway-upnp.xml (added)
+++ incubator/ace/trunk/liq/target-dev-gateway-upnp.xml Sat Jun 27 15:53:04 2009
@@ -0,0 +1,89 @@
+<project name="dev-gateway-upnp" default="warning">
+    <property name="deploy-dir" value="deploy/target/${ant.project.name}" />
+	<property name="app-name" value="L-iQ PS gateway with UPnP support" />
+
+    <target name="warning">
+        <echo message="Please run top level build." />
+    </target>
+    
+    <target name="deploy">
+        <mkdir dir="${deploy-dir}" />
+        <copy todir="${deploy-dir}">
+            <fileset dir="lib/felix/1.4.1">
+                <include name="**" />
+            </fileset>
+        </copy>
+        <copy todir="${deploy-dir}/bundle">
+            <fileset dir="deploy/bundle">
+                <include name="net.luminis.liq.consolelogger-1.0.0.jar" />
+            	<include name="net.luminis.liq.log.listener-1.0.0.jar" />           
+            	<include name="net.luminis.liq.gateway.log.store-1.0.0.jar" />
+            	<include name="net.luminis.liq.gateway.log-1.0.0.jar" />
+            	<include name="net.luminis.liq.log-1.0.0.jar" />
+            	<include name="net.luminis.liq.configurator-1.0.0.jar" />
+            	<include name="net.luminis.liq.scheduler-1.0.0.jar" />
+            	<include name="net.luminis.liq.deployment-1.0.0.jar" />
+            	<include name="net.luminis.liq.deployment.task-1.0.0.jar" />
+            	<include name="net.luminis.liq.identification.property-1.0.0.jar" />
+            	<include name="net.luminis.liq.discovery.upnp-1.0.0.jar" />
+            </fileset>
+            <fileset dir="ext">
+            	<include name="org.osgi.compendium.jar" />
+                <include name="osgi.mobile.jar" />
+                <include name="javax.servlet.jar" />
+                <include name="org.apache.felix.dependencymanager.jar" />
+            </fileset>
+            <fileset dir="lib">
+                <include name="org.apache.felix.configadmin.jar" />
+                <include name="log_all-2.0.0.jar" />
+                <include name="org.apache.felix.eventadmin.jar" />
+                <include name="org.apache.felix.deploymentadmin-0.9.0-SNAPSHOT.jar" />
+                <include name="org.apache.felix.upnp.basedriver-0.8.0.jar" />
+            </fileset>
+        </copy>
+    	<copy todir="${deploy-dir}/conf">
+    		<fileset dir="conf/${ant.project.name}">
+                <include name="**/*.cfg" />
+			</fileset>
+		</copy>
+        <move file="${deploy-dir}/conf/dev-config.properties" tofile="${deploy-dir}/conf/config.properties" />
+        <delete file="${deploy-dir}/conf/test-config.properties" />
+        <replace file="${deploy-dir}/conf/config.properties" token="@bundles@" value="
+        	file:bundle/net.luminis.liq.consolelogger-1.0.0.jar
+			file:bundle/net.luminis.liq.log.listener-1.0.0.jar           
+        	file:bundle/log_all-2.0.0.jar
+            file:bundle/javax.servlet.jar
+            file:bundle/org.osgi.compendium.jar 
+            file:bundle/osgi.mobile.jar 
+            file:bundle/org.apache.felix.dependencymanager.jar 
+            file:bundle/net.luminis.liq.gateway.log.store-1.0.0.jar
+            file:bundle/net.luminis.liq.gateway.log-1.0.0.jar
+            file:bundle/org.apache.felix.eventadmin.jar
+            file:bundle/org.apache.felix.shell-1.0.1.jar 
+            file:bundle/org.apache.felix.shell.tui-1.0.1.jar 
+            file:bundle/org.apache.felix.configadmin.jar 
+            file:bundle/net.luminis.liq.log-1.0.0.jar
+            file:bundle/net.luminis.liq.configurator-1.0.0.jar
+            file:bundle/net.luminis.liq.scheduler-1.0.0.jar
+            file:bundle/net.luminis.liq.deployment-1.0.0.jar
+            file:bundle/net.luminis.liq.deployment.task-1.0.0.jar
+            file:bundle/org.apache.felix.deploymentadmin-0.9.0-SNAPSHOT.jar
+            file:bundle/org.apache.felix.upnp.basedriver-0.8.0.jar
+            file:bundle/net.luminis.liq.identification.property-1.0.0.jar
+            file:bundle/net.luminis.liq.discovery.upnp-1.0.0.jar" />
+        <replace file="${deploy-dir}/conf/config.properties" token="@properties@" value="" />
+
+    	<property name="runCommand" value="java -jar bin/felix.jar"/>
+    	<property name="debugCommand" value="java -jar -Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y -Dcom.sun.management.jmxremote.port=6666 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false bin/felix.jar"/>
+    	<echo file="${deploy-dir}/run.sh">#!/bin/sh
+${runCommand}
+        </echo>
+		<echo file="${deploy-dir}/run.bat">${runCommand}
+        </echo>
+        <echo file="${deploy-dir}/debug.sh">#!/bin/sh
+${debugCommand}
+        </echo>
+        <echo file="${deploy-dir}/debug.bat">${debugCommand}
+        </echo>
+    </target>
+</project>

Added: incubator/ace/trunk/liq/target-dev-gateway.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/target-dev-gateway.xml?rev=788992&view=auto
==============================================================================
--- incubator/ace/trunk/liq/target-dev-gateway.xml (added)
+++ incubator/ace/trunk/liq/target-dev-gateway.xml Sat Jun 27 15:53:04 2009
@@ -0,0 +1,87 @@
+<project name="dev-gateway" default="warning">
+    <property name="deploy-dir" value="deploy/target/${ant.project.name}" />
+	<property name="app-name" value="L-iQ PS gateway" />
+
+    <target name="warning">
+        <echo message="Please run top level build." />
+    </target>
+    
+    <target name="deploy">
+        <mkdir dir="${deploy-dir}" />
+        <copy todir="${deploy-dir}">
+            <fileset dir="lib/felix/1.4.1">
+                <include name="**" />
+            </fileset>
+        </copy>
+        <copy todir="${deploy-dir}/bundle">
+            <fileset dir="deploy/bundle">
+                <include name="net.luminis.liq.consolelogger-1.0.0.jar" />
+            	<include name="net.luminis.liq.log.listener-1.0.0.jar" />           
+            	<include name="net.luminis.liq.gateway.log.store-1.0.0.jar" />
+            	<include name="net.luminis.liq.gateway.log-1.0.0.jar" />
+            	<include name="net.luminis.liq.log-1.0.0.jar" />
+            	<include name="net.luminis.liq.configurator-1.0.0.jar" />
+            	<include name="net.luminis.liq.scheduler-1.0.0.jar" />
+            	<include name="net.luminis.liq.deployment-1.0.0.jar" />
+            	<include name="net.luminis.liq.deployment.task-1.0.0.jar" />
+            	<include name="net.luminis.liq.identification.property-1.0.0.jar" />
+            	<include name="net.luminis.liq.discovery.property-1.0.0.jar" />
+            </fileset>
+            <fileset dir="ext">
+            	<include name="org.osgi.compendium.jar" />
+                <include name="osgi.mobile.jar" />
+                <include name="javax.servlet.jar" />
+                <include name="org.apache.felix.dependencymanager.jar" />
+            </fileset>
+            <fileset dir="lib">
+                <include name="org.apache.felix.configadmin.jar" />
+                <include name="log_all-2.0.0.jar" />
+                <include name="org.apache.felix.eventadmin.jar" />
+                <include name="org.apache.felix.deploymentadmin-0.9.0-SNAPSHOT.jar" />
+            </fileset>
+        </copy>
+    	<copy todir="${deploy-dir}/conf">
+    		<fileset dir="conf/${ant.project.name}">
+                <include name="**/*.cfg" />
+			</fileset>
+		</copy>
+        <move file="${deploy-dir}/conf/dev-config.properties" tofile="${deploy-dir}/conf/config.properties" />
+        <delete file="${deploy-dir}/conf/test-config.properties" />
+        <replace file="${deploy-dir}/conf/config.properties" token="@bundles@" value="
+        	file:bundle/net.luminis.liq.consolelogger-1.0.0.jar
+			file:bundle/net.luminis.liq.log.listener-1.0.0.jar           
+        	file:bundle/log_all-2.0.0.jar
+            file:bundle/javax.servlet.jar
+            file:bundle/org.osgi.compendium.jar 
+            file:bundle/osgi.mobile.jar 
+            file:bundle/org.apache.felix.dependencymanager.jar 
+            file:bundle/net.luminis.liq.gateway.log.store-1.0.0.jar
+            file:bundle/net.luminis.liq.gateway.log-1.0.0.jar
+            file:bundle/org.apache.felix.eventadmin.jar
+            file:bundle/org.apache.felix.shell-1.0.2.jar 
+            file:bundle/org.apache.felix.shell.tui-1.0.2.jar 
+            file:bundle/org.apache.felix.configadmin.jar 
+            file:bundle/net.luminis.liq.log-1.0.0.jar
+            file:bundle/net.luminis.liq.configurator-1.0.0.jar
+            file:bundle/net.luminis.liq.scheduler-1.0.0.jar
+            file:bundle/net.luminis.liq.deployment-1.0.0.jar
+            file:bundle/net.luminis.liq.deployment.task-1.0.0.jar
+            file:bundle/org.apache.felix.deploymentadmin-0.9.0-SNAPSHOT.jar
+            file:bundle/net.luminis.liq.identification.property-1.0.0.jar
+            file:bundle/net.luminis.liq.discovery.property-1.0.0.jar" />
+        <replace file="${deploy-dir}/conf/config.properties" token="@properties@" value="" />
+
+    	<property name="runCommand" value="java -jar bin/felix.jar"/>
+    	<property name="debugCommand" value="java -jar -Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y -Dcom.sun.management.jmxremote.port=6666 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false bin/felix.jar"/>
+    	<echo file="${deploy-dir}/run.sh">#!/bin/sh
+${runCommand}
+        </echo>
+		<echo file="${deploy-dir}/run.bat">${runCommand}
+        </echo>
+        <echo file="${deploy-dir}/debug.sh">#!/bin/sh
+${debugCommand}
+        </echo>
+        <echo file="${deploy-dir}/debug.bat">${debugCommand}
+        </echo>
+    </target>
+</project>
\ No newline at end of file

Added: incubator/ace/trunk/liq/target-dev-licensedgateway.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/target-dev-licensedgateway.xml?rev=788992&view=auto
==============================================================================
--- incubator/ace/trunk/liq/target-dev-licensedgateway.xml (added)
+++ incubator/ace/trunk/liq/target-dev-licensedgateway.xml Sat Jun 27 15:53:04 2009
@@ -0,0 +1,114 @@
+<project name="dev-licensedgateway" default="warning">
+    <property name="deploy-dir" value="deploy/target/${ant.project.name}" />
+	<property name="app-name" value="L-iQ PS Licensed gateway" />
+
+    <target name="warning">
+        <echo message="Please run top level build." />
+    </target>
+    
+    <target name="deploy">
+        <mkdir dir="${deploy-dir}" />
+        <copy todir="${deploy-dir}">
+            <fileset dir="lib/felix/1.4.1">
+                <include name="**" />
+            </fileset>
+        </copy>
+        <copy todir="${deploy-dir}/bundle">
+            <fileset dir="deploy/bundle">
+                <include name="net.luminis.liq.consolelogger-1.0.0.jar" />
+            	<include name="net.luminis.liq.log.listener-1.0.0.jar" />           
+            	<include name="net.luminis.liq.gateway.log.store-1.0.0.jar" />
+            	<include name="net.luminis.liq.gateway.log-1.0.0.jar" />
+            	<include name="net.luminis.liq.log-1.0.0.jar" />
+            	<include name="net.luminis.liq.configurator-1.0.0.jar" />
+            	<include name="net.luminis.liq.scheduler-1.0.0.jar" />
+            	<include name="net.luminis.liq.deployment-1.0.0.jar" />
+            	<include name="net.luminis.liq.deployment.task-1.0.0.jar" />
+            	<include name="net.luminis.liq.identification.property-1.0.0.jar" />
+            	<include name="net.luminis.liq.discovery.property-1.0.0.jar" />
+                <include name="net.luminis.liq.identification.user.os-1.0.0.jar" />
+                <include name="net.luminis.liq.identification.hardware.network-1.0.0.jar" />
+            	<include name="net.luminis.liq.time-1.0.0.jar" />
+            	<include name="net.luminis.liq.activation.info.factory.gateway-1.0.0.jar" />
+            	<include name="net.luminis.liq.license.service-1.0.0.jar" />
+            	<include name="net.luminis.liq.license.matcher-1.0.0.jar" />
+                <include name="net.luminis.liq.license.manager-1.0.0.jar" />
+            	<include name="net.luminis.liq.license.manager.servlet-1.0.0.jar" />
+            	<include name="net.luminis.liq.encryptedstore-1.0.0.jar" />
+            	<include name="net.miginfocom-1.0.0.jar" />
+                <include name="net.luminis.liq.http.listener-1.0.0.jar" />
+            </fileset>
+            <fileset dir="ext">
+            	<include name="org.osgi.compendium.jar" />
+                <include name="osgi.mobile.jar" />
+                <include name="javax.servlet.jar" />
+                <include name="org.apache.felix.dependencymanager.jar" />
+                <include name="org.apache.felix.dependencymanager.shell.jar" />
+            </fileset>
+            <fileset dir="lib">
+                <include name="org.apache.felix.configadmin.jar" />
+                <include name="log_all-2.0.0.jar" />
+                <include name="org.apache.felix.eventadmin.jar" />
+                <include name="org.apache.felix.deploymentadmin-0.9.0-SNAPSHOT.jar" />
+                <include name="http.jetty.jar" />
+            </fileset>
+        </copy>
+    	<copy todir="${deploy-dir}/conf">
+    		<fileset dir="conf/${ant.project.name}">
+                <include name="**/*.cfg" />
+			</fileset>
+		</copy>
+        <move file="${deploy-dir}/conf/dev-config.properties" tofile="${deploy-dir}/conf/config.properties" />
+        <delete file="${deploy-dir}/conf/test-config.properties" />
+        <replace file="${deploy-dir}/conf/config.properties" token="@bundles@" value="
+        	file:bundle/net.luminis.liq.consolelogger-1.0.0.jar
+			file:bundle/net.luminis.liq.log.listener-1.0.0.jar           
+        	file:bundle/log_all-2.0.0.jar
+            file:bundle/javax.servlet.jar
+            file:bundle/org.osgi.compendium.jar 
+            file:bundle/osgi.mobile.jar 
+            file:bundle/org.apache.felix.dependencymanager.jar 
+            file:bundle/org.apache.felix.dependencymanager.shell.jar 
+            file:bundle/net.luminis.liq.gateway.log.store-1.0.0.jar
+            file:bundle/net.luminis.liq.gateway.log-1.0.0.jar
+            file:bundle/org.apache.felix.eventadmin.jar
+            file:bundle/org.apache.felix.shell-1.0.2.jar 
+            file:bundle/org.apache.felix.shell.tui-1.0.2.jar 
+            file:bundle/org.apache.felix.configadmin.jar
+            file:bundle/net.luminis.liq.http.listener-1.0.0.jar
+            file:bundle/http.jetty.jar 
+            file:bundle/net.luminis.liq.log-1.0.0.jar
+            file:bundle/net.luminis.liq.configurator-1.0.0.jar
+            file:bundle/net.luminis.liq.scheduler-1.0.0.jar
+            file:bundle/net.luminis.liq.deployment-1.0.0.jar
+            file:bundle/net.luminis.liq.deployment.task-1.0.0.jar
+            file:bundle/org.apache.felix.deploymentadmin-0.9.0-SNAPSHOT.jar
+            file:bundle/net.luminis.liq.identification.property-1.0.0.jar
+            file:bundle/net.luminis.liq.discovery.property-1.0.0.jar
+        	file:bundle/net.luminis.liq.identification.hardware.network-1.0.0.jar
+        	file:bundle/net.luminis.liq.identification.user.os-1.0.0.jar
+        	file:bundle/net.luminis.liq.time-1.0.0.jar
+        	file:bundle/net.luminis.liq.license.service-1.0.0.jar
+        	file:bundle/net.luminis.liq.activation.info.factory.gateway-1.0.0.jar
+        	file:bundle/net.luminis.liq.license.matcher-1.0.0.jar
+        	file:bundle/net.luminis.liq.license.manager-1.0.0.jar
+        	file:bundle/net.luminis.liq.license.manager.servlet-1.0.0.jar
+        	file:bundle/net.luminis.liq.encryptedstore-1.0.0.jar
+        	file:bundle/net.miginfocom-1.0.0.jar
+            " />
+        <replace file="${deploy-dir}/conf/config.properties" token="@properties@" value="org.osgi.service.http.port=8088" />
+
+    	<property name="runCommand" value="java -jar bin/felix.jar"/>
+    	<property name="debugCommand" value="java -jar -Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y -Dcom.sun.management.jmxremote.port=6666 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false bin/felix.jar"/>
+    	<echo file="${deploy-dir}/run.sh">#!/bin/sh
+${runCommand}
+        </echo>
+		<echo file="${deploy-dir}/run.bat">${runCommand}
+        </echo>
+        <echo file="${deploy-dir}/debug.sh">#!/bin/sh
+${debugCommand}
+        </echo>
+        <echo file="${deploy-dir}/debug.bat">${debugCommand}
+        </echo>
+    </target>
+</project>
\ No newline at end of file

Added: incubator/ace/trunk/liq/target-dev-multigateway.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/target-dev-multigateway.xml?rev=788992&view=auto
==============================================================================
--- incubator/ace/trunk/liq/target-dev-multigateway.xml (added)
+++ incubator/ace/trunk/liq/target-dev-multigateway.xml Sat Jun 27 15:53:04 2009
@@ -0,0 +1,52 @@
+<project name="dev-multigateway" default="warning">
+    <property name="deploy-dir" value="deploy/target/${ant.project.name}" />
+
+    <target name="warning">
+        <echo message="Please run top level build." />
+    </target>
+    
+    <target name="deploy">
+        <mkdir dir="${deploy-dir}" />
+        <copy todir="${deploy-dir}">
+            <fileset dir="lib/felix/1.4.1">
+                <include name="bin/felix.jar" />
+                <include name="conf/config.properties"/>
+            </fileset>
+        </copy>
+        <copy todir="${deploy-dir}/bundle">
+            <fileset dir="ext">
+                <include name="javax.servlet.jar" />
+                <include name="org.osgi.compendium.jar" /> 
+                <include name="osgi.mobile.jar" />
+                <include name="org.apache.felix.dependencymanager.jar" /> 
+            </fileset>
+            <fileset dir="deploy/bundle">
+            	<include name="net.luminis.liq.configurator-1.0.0.jar" />
+                <include name="net.luminis.liq.scheduler-1.0.0.jar" />
+                <include name="net.luminis.liq.deployment-1.0.0.jar" />
+                <include name="net.luminis.liq.deployment.task-1.0.0.jar" />
+                <include name="net.luminis.liq.identification.property-1.0.0.jar" />
+                <include name="net.luminis.liq.discovery.property-1.0.0.jar" />
+				<include name="net.luminis.liq.log.listener-1.0.0.jar" />           
+                <include name="net.luminis.liq.log-1.0.0.jar" />
+                <include name="net.luminis.liq.gateway.log.store-1.0.0.jar" />
+            	<include name="net.luminis.liq.gateway.log-1.0.0.jar" />
+            </fileset>
+            <fileset dir="deploy/test">
+                <include name="net.luminis.liq.consolelogger-1.0.0.jar" />
+            </fileset>
+            <fileset dir="lib">
+                <include name="org.apache.felix.configadmin.jar" />
+                <include name="org.apache.felix.eventadmin.jar" />
+                <include name="net.luminis.liq.gateway.deploymentadmin-1.0.0.jar" />
+            </fileset>
+        </copy>
+        <copy todir="${deploy-dir}/conf">
+            <fileset dir="conf/${ant.project.name}">
+                <include name="**/*.cfg" />
+            </fileset>
+        </copy>
+        <replace file="${deploy-dir}/conf/config.properties" token="@bundles@" value=""/>
+        <copy file="lib/run-multigateways.sh" tofile="${deploy-dir}/run.sh"/>
+    </target>
+</project>
\ No newline at end of file

Added: incubator/ace/trunk/liq/target-dev-obr.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/target-dev-obr.xml?rev=788992&view=auto
==============================================================================
--- incubator/ace/trunk/liq/target-dev-obr.xml (added)
+++ incubator/ace/trunk/liq/target-dev-obr.xml Sat Jun 27 15:53:04 2009
@@ -0,0 +1,75 @@
+<project name="dev-obr" default="warning">
+    <property name="deploy-dir" value="deploy/target/${ant.project.name}" />
+	<property name="app-name" value="L-iQ OBR" />
+
+    <target name="warning">
+        <echo message="Please run top level build." />
+    </target>
+    
+    <target name="deploy">
+        <mkdir dir="${deploy-dir}" />
+        <copy todir="${deploy-dir}">
+            <fileset dir="lib/felix/1.4.1">
+                <include name="**" />
+            </fileset>
+        </copy>
+        <copy todir="${deploy-dir}/bundle">
+            <fileset dir="deploy/bundle">
+            	<include name="net.luminis.liq.consolelogger-1.0.0.jar" />
+            	<include name="net.luminis.liq.http.listener-1.0.0.jar" />
+            	<include name="net.luminis.liq.configurator-1.0.0.jar" />
+            	<include name="net.luminis.liq.obr.servlet-1.0.0.jar" />
+            	<include name="net.luminis.liq.obr.storage-1.0.0.jar" />
+            	<include name="net.luminis.liq.obr.metadata-1.0.0.jar" />
+            </fileset>
+            <fileset dir="ext">
+            	<include name="org.osgi.compendium.jar" />
+                <include name="osgi.mobile.jar" />
+                <include name="javax.servlet.jar" />
+                <include name="org.apache.felix.dependencymanager.jar" />
+            </fileset>
+            <fileset dir="lib">
+                <include name="org.apache.felix.configadmin.jar" />
+                <include name="log_all-2.0.0.jar" />
+                <include name="http.jetty.jar" />
+            </fileset>
+        </copy>
+        <copy todir="${deploy-dir}/conf">
+            <fileset dir="conf/${ant.project.name}">
+                <include name="**/*.cfg" />
+            </fileset>
+        </copy>
+        <copy file="${deploy-dir}/conf/dev-config.properties" overwrite="true" tofile="${deploy-dir}/conf/config.properties" />
+        <delete file="${deploy-dir}/conf/test-config.properties" />
+        <replace file="${deploy-dir}/conf/config.properties" token="@bundles@" value="
+        	file:bundle/net.luminis.liq.consolelogger-1.0.0.jar
+        	file:bundle/log_all-2.0.0.jar
+            file:bundle/osgi.mobile.jar 
+            file:bundle/org.osgi.compendium.jar 
+            file:bundle/http.jetty.jar
+            file:bundle/javax.servlet.jar 
+            file:bundle/org.apache.felix.shell-1.0.2.jar 
+            file:bundle/org.apache.felix.shell.tui-1.0.2.jar 
+            file:bundle/org.apache.felix.configadmin.jar
+            file:bundle/org.apache.felix.dependencymanager.jar 
+            file:bundle/net.luminis.liq.http.listener-1.0.0.jar
+            file:bundle/net.luminis.liq.configurator-1.0.0.jar
+            file:bundle/net.luminis.liq.obr.servlet-1.0.0.jar
+            file:bundle/net.luminis.liq.obr.storage-1.0.0.jar
+            file:bundle/net.luminis.liq.obr.metadata-1.0.0.jar" />
+        <replace file="${deploy-dir}/conf/config.properties" token="@properties@" value="org.osgi.service.http.port=8082" />
+
+    	<property name="runCommand" value="java -jar bin/felix.jar"/>
+    	<property name="debugCommand" value="java -jar -Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y -Dcom.sun.management.jmxremote.port=6666 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false bin/felix.jar"/>
+    	<echo file="${deploy-dir}/run.sh">#!/bin/sh
+${runCommand}
+        </echo>
+		<echo file="${deploy-dir}/run.bat">${runCommand}
+        </echo>
+        <echo file="${deploy-dir}/debug.sh">#!/bin/sh
+${debugCommand}
+        </echo>
+        <echo file="${deploy-dir}/debug.bat">${debugCommand}
+        </echo>
+    </target>
+</project>

Added: incubator/ace/trunk/liq/target-dev-obrdeployed-gateway.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/target-dev-obrdeployed-gateway.xml?rev=788992&view=auto
==============================================================================
--- incubator/ace/trunk/liq/target-dev-obrdeployed-gateway.xml (added)
+++ incubator/ace/trunk/liq/target-dev-obrdeployed-gateway.xml Sat Jun 27 15:53:04 2009
@@ -0,0 +1,94 @@
+<project name="dev-obrdeployed-gateway" default="warning">
+    <property name="deploy-dir" value="deploy/target/${ant.project.name}" />
+	<property name="app-name" value="L-iQ PS gateway" />
+
+    <target name="warning">
+        <echo message="Please run top level build." />
+    </target>
+    
+    <target name="deploy">
+        <mkdir dir="${deploy-dir}" />
+        <copy todir="${deploy-dir}">
+            <fileset dir="lib/felix/1.4.1">
+                <include name="**" />
+            </fileset>
+        </copy>
+        <copy todir="${deploy-dir}/bundle">
+            <fileset dir="deploy/bundle">
+                <include name="net.luminis.liq.consolelogger-1.0.0.jar" />
+            	<include name="net.luminis.liq.log.listener-1.0.0.jar" />           
+            	<include name="net.luminis.liq.gateway.log.store-1.0.0.jar" />
+            	<include name="net.luminis.liq.gateway.log-1.0.0.jar" />
+            	<include name="net.luminis.liq.log-1.0.0.jar" />
+            	<include name="net.luminis.liq.configurator-1.0.0.jar" />
+            	<include name="net.luminis.liq.scheduler-1.0.0.jar" />
+            	<include name="net.luminis.liq.deployment-1.0.0.jar" />
+            	<include name="net.luminis.liq.deployment.task-1.0.0.jar" />
+            	<include name="net.luminis.liq.identification.property-1.0.0.jar" />
+            	<include name="net.luminis.liq.discovery.property-1.0.0.jar" />
+            	<include name="net.luminis.liq.swingui.artifactmanager-1.0.0.jar" />
+            	<include name="net.luminis.liq.swingui.artifactmanager.obr-1.0.0.jar" />
+            </fileset>
+            <fileset dir="ext">
+            	<include name="org.osgi.compendium.jar" />
+                <include name="osgi.mobile.jar" />
+                <include name="javax.servlet.jar" />
+                <include name="org.apache.felix.dependencymanager.jar" />
+            </fileset>
+            <fileset dir="lib">
+                <include name="org.apache.felix.configadmin.jar" />
+                <include name="log_all-2.0.0.jar" />
+                <include name="org.apache.felix.eventadmin.jar" />
+                <include name="org.apache.felix.deploymentadmin-0.9.0-SNAPSHOT.jar" />
+            	<include name="servicebased.host-1.0.0.jar" />
+            </fileset>
+        </copy>
+    	<copy todir="${deploy-dir}/conf">
+    		<fileset dir="conf/${ant.project.name}">
+                <include name="**/*.cfg" />
+			</fileset>
+		</copy>
+        <move file="${deploy-dir}/conf/dev-config.properties" tofile="${deploy-dir}/conf/config.properties" />
+        <delete file="${deploy-dir}/conf/test-config.properties" />
+        <replace file="${deploy-dir}/conf/config.properties" token="@bundles@" value="
+        	file:bundle/net.luminis.liq.consolelogger-1.0.0.jar
+			file:bundle/net.luminis.liq.log.listener-1.0.0.jar           
+        	file:bundle/log_all-2.0.0.jar
+            file:bundle/javax.servlet.jar
+            file:bundle/org.osgi.compendium.jar 
+            file:bundle/osgi.mobile.jar 
+            file:bundle/org.apache.felix.dependencymanager.jar 
+            file:bundle/net.luminis.liq.gateway.log.store-1.0.0.jar
+            file:bundle/org.apache.felix.eventadmin.jar
+            file:bundle/org.apache.felix.shell-1.0.2.jar 
+            file:bundle/org.apache.felix.shell.tui-1.0.2.jar 
+            file:bundle/org.apache.felix.configadmin.jar 
+            file:bundle/net.luminis.liq.log-1.0.0.jar
+            file:bundle/net.luminis.liq.configurator-1.0.0.jar
+            file:bundle/net.luminis.liq.scheduler-1.0.0.jar
+            file:bundle/net.luminis.liq.deployment-1.0.0.jar
+            file:bundle/org.apache.felix.deploymentadmin-0.9.0-SNAPSHOT.jar
+            file:bundle/net.luminis.liq.identification.property-1.0.0.jar
+            file:bundle/net.luminis.liq.discovery.property-1.0.0.jar
+        	file:bundle/org.apache.felix.bundlerepository-1.0.3.jar
+        	file:bundle/net.luminis.liq.swingui.artifactmanager-1.0.0.jar
+        	file:bundle/net.luminis.liq.swingui.artifactmanager.obr-1.0.0.jar
+        	file:bundle/servicebased.host-1.0.0.jar
+        	" />
+        <replace file="${deploy-dir}/conf/config.properties" token="@properties@" value="" />
+
+    	<property name="runCommand" value="java -jar -Dorg.apache.felix.deploymentadmin.stopunaffectedbundle=false bin/felix.jar"/>
+    	<property name="debugCommand" value="java -jar -Dorg.apache.felix.deploymentadmin.stopunaffectedbundle=false -Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y -Dcom.sun.management.jmxremote.port=6666 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false bin/felix.jar"/>
+    	<echo file="${deploy-dir}/run.sh">#!/bin/sh
+${runCommand}
+        </echo>
+		<echo file="${deploy-dir}/run.bat">${runCommand}
+        </echo>
+        <echo file="${deploy-dir}/debug.sh">#!/bin/sh
+${debugCommand}
+        </echo>
+        <echo file="${deploy-dir}/debug.bat">${debugCommand}
+        </echo>
+    	<echo file="${deploy-dir}/launcher.properties">vmarg1=-Dorg.apache.felix.deploymentadmin.stopunaffectedbundle=false</echo>
+    </target>
+</project>
\ No newline at end of file

Added: incubator/ace/trunk/liq/target-dev-obrdeployed-obr.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/target-dev-obrdeployed-obr.xml?rev=788992&view=auto
==============================================================================
--- incubator/ace/trunk/liq/target-dev-obrdeployed-obr.xml (added)
+++ incubator/ace/trunk/liq/target-dev-obrdeployed-obr.xml Sat Jun 27 15:53:04 2009
@@ -0,0 +1,84 @@
+<project name="dev-obrdeployed-obr" default="warning">
+    <property name="deploy-dir" value="deploy/target/${ant.project.name}" />
+	<property name="app-name" value="L-iQ OBR" />
+
+    <target name="warning">
+        <echo message="Please run top level build." />
+    </target>
+    
+    <target name="deploy">
+        <mkdir dir="${deploy-dir}" />
+        <copy todir="${deploy-dir}">
+            <fileset dir="lib/felix/1.4.1">
+                <include name="**" />
+            </fileset>
+        </copy>
+        <copy todir="${deploy-dir}/bundle">
+            <fileset dir="deploy/bundle">
+            	<include name="net.luminis.liq.consolelogger-1.0.0.jar" />
+            	<include name="net.luminis.liq.http.listener-1.0.0.jar" />
+            	<include name="net.luminis.liq.configurator-1.0.0.jar" />
+            	<include name="net.luminis.liq.obr.servlet-1.0.0.jar" />
+            	<include name="net.luminis.liq.obr.storage-1.0.0.jar" />
+            	<include name="net.luminis.liq.obr.metadata-1.0.0.jar" />
+            </fileset>
+            <fileset dir="ext">
+            	<include name="org.osgi.compendium.jar" />
+                <include name="osgi.mobile.jar" />
+                <include name="javax.servlet.jar" />
+                <include name="org.apache.felix.dependencymanager.jar" />
+            </fileset>
+            <fileset dir="lib">
+                <include name="org.apache.felix.configadmin.jar" />
+                <include name="log_all-2.0.0.jar" />
+                <include name="http.jetty.jar" />
+            </fileset>
+        </copy>
+        <copy todir="${deploy-dir}/conf">
+            <fileset dir="conf/${ant.project.name}">
+                <include name="**/*.cfg" />
+            </fileset>
+        </copy>
+    	
+        <copy todir="${deploy-dir}/store" overwrite="true">
+            <fileset dir="lib">
+                <include name="servicebased.square-1.0.0.jar" />
+                <include name="servicebased.circle-1.0.0.jar" />
+                <include name="servicebased.triangle-1.0.0.jar" />
+            </fileset>
+        </copy>
+    	
+        <copy file="${deploy-dir}/conf/dev-config.properties" overwrite="true" tofile="${deploy-dir}/conf/config.properties" />
+        <delete file="${deploy-dir}/conf/test-config.properties" />
+        <replace file="${deploy-dir}/conf/config.properties" token="@bundles@" value="
+        	file:bundle/net.luminis.liq.consolelogger-1.0.0.jar
+        	file:bundle/log_all-2.0.0.jar
+            file:bundle/osgi.mobile.jar 
+            file:bundle/org.osgi.compendium.jar 
+            file:bundle/http.jetty.jar
+            file:bundle/javax.servlet.jar 
+            file:bundle/org.apache.felix.shell-1.0.2.jar 
+            file:bundle/org.apache.felix.shell.tui-1.0.2.jar 
+            file:bundle/org.apache.felix.configadmin.jar
+            file:bundle/org.apache.felix.dependencymanager.jar 
+            file:bundle/net.luminis.liq.http.listener-1.0.0.jar
+            file:bundle/net.luminis.liq.configurator-1.0.0.jar
+            file:bundle/net.luminis.liq.obr.servlet-1.0.0.jar
+            file:bundle/net.luminis.liq.obr.storage-1.0.0.jar
+            file:bundle/net.luminis.liq.obr.metadata-1.0.0.jar" />
+        <replace file="${deploy-dir}/conf/config.properties" token="@properties@" value="org.osgi.service.http.port=8082" />
+
+    	<property name="runCommand" value="java -jar bin/felix.jar"/>
+    	<property name="debugCommand" value="java -jar -Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y -Dcom.sun.management.jmxremote.port=6666 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false bin/felix.jar"/>
+    	<echo file="${deploy-dir}/run.sh">#!/bin/sh
+${runCommand}
+        </echo>
+		<echo file="${deploy-dir}/run.bat">${runCommand}
+        </echo>
+        <echo file="${deploy-dir}/debug.sh">#!/bin/sh
+${debugCommand}
+        </echo>
+        <echo file="${deploy-dir}/debug.bat">${debugCommand}
+        </echo>
+    </target>
+</project>

Added: incubator/ace/trunk/liq/target-dev-relay.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/target-dev-relay.xml?rev=788992&view=auto
==============================================================================
--- incubator/ace/trunk/liq/target-dev-relay.xml (added)
+++ incubator/ace/trunk/liq/target-dev-relay.xml Sat Jun 27 15:53:04 2009
@@ -0,0 +1,92 @@
+<project name="dev-relay" default="warning">
+    <property name="deploy-dir" value="deploy/target/${ant.project.name}" />
+	<property name="app-name" value="L-iQ PS relay" />
+
+    <target name="warning">
+        <echo message="Please run top level build." />
+    </target>
+    
+    <target name="deploy">
+        <mkdir dir="${deploy-dir}" />
+        <mkdir dir="${deploy-dir}/store" />
+        <copy todir="${deploy-dir}">
+            <fileset dir="lib/felix/1.4.1">
+                <include name="**" />
+            </fileset>
+        </copy>
+        <copy todir="${deploy-dir}/bundle">
+            <fileset dir="deploy/bundle">
+            	<include name="net.luminis.liq.configurator-1.0.0.jar" />
+            	<include name="net.luminis.liq.discovery.property-1.0.0.jar" />
+            	<include name="net.luminis.liq.scheduler-1.0.0.jar" />
+            	<include name="net.luminis.liq.http.listener-1.0.0.jar" />
+            	<include name="net.luminis.liq.deployment.servlet-1.0.0.jar" />
+            	<include name="net.luminis.liq.deployment.provider.filebased-1.0.0.jar" />
+            	<include name="net.luminis.liq.deployment.streamgenerator-1.0.0.jar" />
+            	<include name="net.luminis.liq.server.log.store-1.0.0.jar" />
+            	<include name="net.luminis.liq.server.log.task-1.0.0.jar" />
+            	<include name="net.luminis.liq.server.log-1.0.0.jar" />
+            	<include name="net.luminis.liq.repository-1.0.0.jar" />
+            	<include name="net.luminis.liq.repository.task-1.0.0.jar" />
+            	<include name="net.luminis.liq.repository.servlet-1.0.0.jar" />
+            </fileset>
+            <fileset dir="ext">
+            	<include name="org.osgi.compendium.jar" />
+                <include name="osgi.mobile.jar" />
+                <include name="javax.servlet.jar" />
+                <include name="org.apache.felix.dependencymanager.jar" />
+            </fileset>
+            <fileset dir="lib">
+                <include name="org.apache.felix.configadmin.jar" />
+                <include name="org.apache.felix.prefs.jar" />
+                <include name="log_all-2.0.0.jar" />
+                <include name="http.jetty.jar" />
+            </fileset>
+        </copy>
+        <copy todir="${deploy-dir}/conf">
+            <fileset dir="conf/${ant.project.name}">
+                <include name="**/*.cfg" />
+            </fileset>
+        </copy>
+        <copy file="${deploy-dir}/conf/dev-config.properties" overwrite="true" tofile="${deploy-dir}/conf/config.properties" />
+        <delete file="${deploy-dir}/conf/test-config.properties" />
+        <replace file="${deploy-dir}/conf/config.properties" token="@bundles@" value="
+        	file:bundle/log_all-2.0.0.jar
+            file:bundle/osgi.mobile.jar 
+            file:bundle/org.osgi.compendium.jar 
+            file:bundle/http.jetty.jar
+            file:bundle/javax.servlet.jar 
+            file:bundle/org.apache.felix.shell-1.0.2.jar 
+            file:bundle/org.apache.felix.shell.tui-1.0.2.jar 
+            file:bundle/org.apache.felix.configadmin.jar 
+            file:bundle/org.apache.felix.dependencymanager.jar 
+            file:bundle/org.apache.felix.prefs.jar
+            file:bundle/net.luminis.liq.configurator-1.0.0.jar
+            file:bundle/net.luminis.liq.discovery.property-1.0.0.jar
+            file:bundle/net.luminis.liq.scheduler-1.0.0.jar
+            file:bundle/net.luminis.liq.http.listener-1.0.0.jar
+            file:bundle/net.luminis.liq.deployment.servlet-1.0.0.jar
+            file:bundle/net.luminis.liq.deployment.provider.filebased-1.0.0.jar
+            file:bundle/net.luminis.liq.deployment.streamgenerator-1.0.0.jar
+            file:bundle/net.luminis.liq.server.log.store-1.0.0.jar
+            file:bundle/net.luminis.liq.server.log.task-1.0.0.jar
+            file:bundle/net.luminis.liq.server.log-1.0.0.jar
+            file:bundle/net.luminis.liq.repository-1.0.0.jar
+            file:bundle/net.luminis.liq.repository.task-1.0.0.jar
+            file:bundle/net.luminis.liq.repository.servlet-1.0.0.jar" />
+        <replace file="${deploy-dir}/conf/config.properties" token="@properties@" value="org.osgi.service.http.port=8081" />
+
+    	<property name="runCommand" value="java -jar bin/felix.jar"/>
+    	<property name="debugCommand" value="java -jar -Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y -Dcom.sun.management.jmxremote.port=6666 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false bin/felix.jar"/>
+    	<echo file="${deploy-dir}/run.sh">#!/bin/sh
+${runCommand}
+        </echo>
+		<echo file="${deploy-dir}/run.bat">${runCommand}
+        </echo>
+        <echo file="${deploy-dir}/debug.sh">#!/bin/sh
+${debugCommand}
+        </echo>
+        <echo file="${deploy-dir}/debug.bat">${debugCommand}
+        </echo>
+    </target>
+</project>