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/28 00:23:55 UTC

svn commit: r789022 [3/3] - in /incubator/ace/trunk/liq: ./ conf/autoconf/ conf/dev-client/ conf/dev-client/net.luminis.liq.server.log.store.factory/ conf/dev-client/net.luminis.liq.server.log.task.factory/ conf/dev-client/org.apache.ace.server.log.sto...

Modified: incubator/ace/trunk/liq/target-dev-gateway.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/target-dev-gateway.xml?rev=789022&r1=789021&r2=789022&view=diff
==============================================================================
--- incubator/ace/trunk/liq/target-dev-gateway.xml (original)
+++ incubator/ace/trunk/liq/target-dev-gateway.xml Sat Jun 27 22:23:50 2009
@@ -15,17 +15,17 @@
         </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="org.apache.ace.consolelogger-1.0.0.jar" />
+            	<include name="org.apache.ace.log.listener-1.0.0.jar" />           
+            	<include name="org.apache.ace.gateway.log.store-1.0.0.jar" />
+            	<include name="org.apache.ace.gateway.log-1.0.0.jar" />
+            	<include name="org.apache.ace.log-1.0.0.jar" />
+            	<include name="org.apache.ace.configurator-1.0.0.jar" />
+            	<include name="org.apache.ace.scheduler-1.0.0.jar" />
+            	<include name="org.apache.ace.deployment-1.0.0.jar" />
+            	<include name="org.apache.ace.deployment.task-1.0.0.jar" />
+            	<include name="org.apache.ace.identification.property-1.0.0.jar" />
+            	<include name="org.apache.ace.discovery.property-1.0.0.jar" />
             </fileset>
             <fileset dir="ext">
             	<include name="org.osgi.compendium.jar" />
@@ -48,27 +48,27 @@
         <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/org.apache.ace.consolelogger-1.0.0.jar
+			file:bundle/org.apache.ace.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.ace.gateway.log.store-1.0.0.jar
+            file:bundle/org.apache.ace.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.ace.log-1.0.0.jar
+            file:bundle/org.apache.ace.configurator-1.0.0.jar
+            file:bundle/org.apache.ace.scheduler-1.0.0.jar
+            file:bundle/org.apache.ace.deployment-1.0.0.jar
+            file:bundle/org.apache.ace.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/org.apache.ace.identification.property-1.0.0.jar
+            file:bundle/org.apache.ace.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"/>

Modified: incubator/ace/trunk/liq/target-dev-licensedgateway.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/target-dev-licensedgateway.xml?rev=789022&r1=789021&r2=789022&view=diff
==============================================================================
--- incubator/ace/trunk/liq/target-dev-licensedgateway.xml (original)
+++ incubator/ace/trunk/liq/target-dev-licensedgateway.xml Sat Jun 27 22:23:50 2009
@@ -15,28 +15,28 @@
         </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="org.apache.ace.consolelogger-1.0.0.jar" />
+            	<include name="org.apache.ace.log.listener-1.0.0.jar" />           
+            	<include name="org.apache.ace.gateway.log.store-1.0.0.jar" />
+            	<include name="org.apache.ace.gateway.log-1.0.0.jar" />
+            	<include name="org.apache.ace.log-1.0.0.jar" />
+            	<include name="org.apache.ace.configurator-1.0.0.jar" />
+            	<include name="org.apache.ace.scheduler-1.0.0.jar" />
+            	<include name="org.apache.ace.deployment-1.0.0.jar" />
+            	<include name="org.apache.ace.deployment.task-1.0.0.jar" />
+            	<include name="org.apache.ace.identification.property-1.0.0.jar" />
+            	<include name="org.apache.ace.discovery.property-1.0.0.jar" />
+                <include name="org.apache.ace.identification.user.os-1.0.0.jar" />
+                <include name="org.apache.ace.identification.hardware.network-1.0.0.jar" />
+            	<include name="org.apache.ace.time-1.0.0.jar" />
+            	<include name="org.apache.ace.activation.info.factory.gateway-1.0.0.jar" />
+            	<include name="org.apache.ace.license.service-1.0.0.jar" />
+            	<include name="org.apache.ace.license.matcher-1.0.0.jar" />
+                <include name="org.apache.ace.license.manager-1.0.0.jar" />
+            	<include name="org.apache.ace.license.manager.servlet-1.0.0.jar" />
+            	<include name="org.apache.ace.encryptedstore-1.0.0.jar" />
             	<include name="net.miginfocom-1.0.0.jar" />
-                <include name="net.luminis.liq.http.listener-1.0.0.jar" />
+                <include name="org.apache.ace.http.listener-1.0.0.jar" />
             </fileset>
             <fileset dir="ext">
             	<include name="org.osgi.compendium.jar" />
@@ -61,39 +61,39 @@
         <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/org.apache.ace.consolelogger-1.0.0.jar
+			file:bundle/org.apache.ace.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.ace.gateway.log.store-1.0.0.jar
+            file:bundle/org.apache.ace.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/org.apache.ace.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.ace.log-1.0.0.jar
+            file:bundle/org.apache.ace.configurator-1.0.0.jar
+            file:bundle/org.apache.ace.scheduler-1.0.0.jar
+            file:bundle/org.apache.ace.deployment-1.0.0.jar
+            file:bundle/org.apache.ace.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/org.apache.ace.identification.property-1.0.0.jar
+            file:bundle/org.apache.ace.discovery.property-1.0.0.jar
+        	file:bundle/org.apache.ace.identification.hardware.network-1.0.0.jar
+        	file:bundle/org.apache.ace.identification.user.os-1.0.0.jar
+        	file:bundle/org.apache.ace.time-1.0.0.jar
+        	file:bundle/org.apache.ace.license.service-1.0.0.jar
+        	file:bundle/org.apache.ace.activation.info.factory.gateway-1.0.0.jar
+        	file:bundle/org.apache.ace.license.matcher-1.0.0.jar
+        	file:bundle/org.apache.ace.license.manager-1.0.0.jar
+        	file:bundle/org.apache.ace.license.manager.servlet-1.0.0.jar
+        	file:bundle/org.apache.ace.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" />

Modified: incubator/ace/trunk/liq/target-dev-multigateway.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/target-dev-multigateway.xml?rev=789022&r1=789021&r2=789022&view=diff
==============================================================================
--- incubator/ace/trunk/liq/target-dev-multigateway.xml (original)
+++ incubator/ace/trunk/liq/target-dev-multigateway.xml Sat Jun 27 22:23:50 2009
@@ -21,24 +21,24 @@
                 <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" />
+            	<include name="org.apache.ace.configurator-1.0.0.jar" />
+                <include name="org.apache.ace.scheduler-1.0.0.jar" />
+                <include name="org.apache.ace.deployment-1.0.0.jar" />
+                <include name="org.apache.ace.deployment.task-1.0.0.jar" />
+                <include name="org.apache.ace.identification.property-1.0.0.jar" />
+                <include name="org.apache.ace.discovery.property-1.0.0.jar" />
+				<include name="org.apache.ace.log.listener-1.0.0.jar" />           
+                <include name="org.apache.ace.log-1.0.0.jar" />
+                <include name="org.apache.ace.gateway.log.store-1.0.0.jar" />
+            	<include name="org.apache.ace.gateway.log-1.0.0.jar" />
             </fileset>
             <fileset dir="deploy/test">
-                <include name="net.luminis.liq.consolelogger-1.0.0.jar" />
+                <include name="org.apache.ace.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" />
+                <include name="org.apache.ace.gateway.deploymentadmin-1.0.0.jar" />
             </fileset>
         </copy>
         <copy todir="${deploy-dir}/conf">

Modified: incubator/ace/trunk/liq/target-dev-obr.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/target-dev-obr.xml?rev=789022&r1=789021&r2=789022&view=diff
==============================================================================
--- incubator/ace/trunk/liq/target-dev-obr.xml (original)
+++ incubator/ace/trunk/liq/target-dev-obr.xml Sat Jun 27 22:23:50 2009
@@ -15,12 +15,12 @@
         </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" />
+            	<include name="org.apache.ace.consolelogger-1.0.0.jar" />
+            	<include name="org.apache.ace.http.listener-1.0.0.jar" />
+            	<include name="org.apache.ace.configurator-1.0.0.jar" />
+            	<include name="org.apache.ace.obr.servlet-1.0.0.jar" />
+            	<include name="org.apache.ace.obr.storage-1.0.0.jar" />
+            	<include name="org.apache.ace.obr.metadata-1.0.0.jar" />
             </fileset>
             <fileset dir="ext">
             	<include name="org.osgi.compendium.jar" />
@@ -42,7 +42,7 @@
         <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/org.apache.ace.consolelogger-1.0.0.jar
         	file:bundle/log_all-2.0.0.jar
             file:bundle/osgi.mobile.jar 
             file:bundle/org.osgi.compendium.jar 
@@ -52,11 +52,11 @@
             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" />
+            file:bundle/org.apache.ace.http.listener-1.0.0.jar
+            file:bundle/org.apache.ace.configurator-1.0.0.jar
+            file:bundle/org.apache.ace.obr.servlet-1.0.0.jar
+            file:bundle/org.apache.ace.obr.storage-1.0.0.jar
+            file:bundle/org.apache.ace.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"/>

Modified: 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=789022&r1=789021&r2=789022&view=diff
==============================================================================
--- incubator/ace/trunk/liq/target-dev-obrdeployed-gateway.xml (original)
+++ incubator/ace/trunk/liq/target-dev-obrdeployed-gateway.xml Sat Jun 27 22:23:50 2009
@@ -15,19 +15,19 @@
         </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" />
+                <include name="org.apache.ace.consolelogger-1.0.0.jar" />
+            	<include name="org.apache.ace.log.listener-1.0.0.jar" />           
+            	<include name="org.apache.ace.gateway.log.store-1.0.0.jar" />
+            	<include name="org.apache.ace.gateway.log-1.0.0.jar" />
+            	<include name="org.apache.ace.log-1.0.0.jar" />
+            	<include name="org.apache.ace.configurator-1.0.0.jar" />
+            	<include name="org.apache.ace.scheduler-1.0.0.jar" />
+            	<include name="org.apache.ace.deployment-1.0.0.jar" />
+            	<include name="org.apache.ace.deployment.task-1.0.0.jar" />
+            	<include name="org.apache.ace.identification.property-1.0.0.jar" />
+            	<include name="org.apache.ace.discovery.property-1.0.0.jar" />
+            	<include name="org.apache.ace.swingui.artifactmanager-1.0.0.jar" />
+            	<include name="org.apache.ace.swingui.artifactmanager.obr-1.0.0.jar" />
             </fileset>
             <fileset dir="ext">
             	<include name="org.osgi.compendium.jar" />
@@ -51,28 +51,28 @@
         <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/org.apache.ace.consolelogger-1.0.0.jar
+			file:bundle/org.apache.ace.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.ace.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.ace.log-1.0.0.jar
+            file:bundle/org.apache.ace.configurator-1.0.0.jar
+            file:bundle/org.apache.ace.scheduler-1.0.0.jar
+            file:bundle/org.apache.ace.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.ace.identification.property-1.0.0.jar
+            file:bundle/org.apache.ace.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/org.apache.ace.swingui.artifactmanager-1.0.0.jar
+        	file:bundle/org.apache.ace.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="" />

Modified: 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=789022&r1=789021&r2=789022&view=diff
==============================================================================
--- incubator/ace/trunk/liq/target-dev-obrdeployed-obr.xml (original)
+++ incubator/ace/trunk/liq/target-dev-obrdeployed-obr.xml Sat Jun 27 22:23:50 2009
@@ -15,12 +15,12 @@
         </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" />
+            	<include name="org.apache.ace.consolelogger-1.0.0.jar" />
+            	<include name="org.apache.ace.http.listener-1.0.0.jar" />
+            	<include name="org.apache.ace.configurator-1.0.0.jar" />
+            	<include name="org.apache.ace.obr.servlet-1.0.0.jar" />
+            	<include name="org.apache.ace.obr.storage-1.0.0.jar" />
+            	<include name="org.apache.ace.obr.metadata-1.0.0.jar" />
             </fileset>
             <fileset dir="ext">
             	<include name="org.osgi.compendium.jar" />
@@ -51,7 +51,7 @@
         <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/org.apache.ace.consolelogger-1.0.0.jar
         	file:bundle/log_all-2.0.0.jar
             file:bundle/osgi.mobile.jar 
             file:bundle/org.osgi.compendium.jar 
@@ -61,11 +61,11 @@
             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" />
+            file:bundle/org.apache.ace.http.listener-1.0.0.jar
+            file:bundle/org.apache.ace.configurator-1.0.0.jar
+            file:bundle/org.apache.ace.obr.servlet-1.0.0.jar
+            file:bundle/org.apache.ace.obr.storage-1.0.0.jar
+            file:bundle/org.apache.ace.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"/>

Modified: incubator/ace/trunk/liq/target-dev-relay.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/target-dev-relay.xml?rev=789022&r1=789021&r2=789022&view=diff
==============================================================================
--- incubator/ace/trunk/liq/target-dev-relay.xml (original)
+++ incubator/ace/trunk/liq/target-dev-relay.xml Sat Jun 27 22:23:50 2009
@@ -16,19 +16,19 @@
         </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" />
+            	<include name="org.apache.ace.configurator-1.0.0.jar" />
+            	<include name="org.apache.ace.discovery.property-1.0.0.jar" />
+            	<include name="org.apache.ace.scheduler-1.0.0.jar" />
+            	<include name="org.apache.ace.http.listener-1.0.0.jar" />
+            	<include name="org.apache.ace.deployment.servlet-1.0.0.jar" />
+            	<include name="org.apache.ace.deployment.provider.filebased-1.0.0.jar" />
+            	<include name="org.apache.ace.deployment.streamgenerator-1.0.0.jar" />
+            	<include name="org.apache.ace.server.log.store-1.0.0.jar" />
+            	<include name="org.apache.ace.server.log.task-1.0.0.jar" />
+            	<include name="org.apache.ace.server.log-1.0.0.jar" />
+            	<include name="org.apache.ace.repository-1.0.0.jar" />
+            	<include name="org.apache.ace.repository.task-1.0.0.jar" />
+            	<include name="org.apache.ace.repository.servlet-1.0.0.jar" />
             </fileset>
             <fileset dir="ext">
             	<include name="org.osgi.compendium.jar" />
@@ -61,19 +61,19 @@
             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" />
+            file:bundle/org.apache.ace.configurator-1.0.0.jar
+            file:bundle/org.apache.ace.discovery.property-1.0.0.jar
+            file:bundle/org.apache.ace.scheduler-1.0.0.jar
+            file:bundle/org.apache.ace.http.listener-1.0.0.jar
+            file:bundle/org.apache.ace.deployment.servlet-1.0.0.jar
+            file:bundle/org.apache.ace.deployment.provider.filebased-1.0.0.jar
+            file:bundle/org.apache.ace.deployment.streamgenerator-1.0.0.jar
+            file:bundle/org.apache.ace.server.log.store-1.0.0.jar
+            file:bundle/org.apache.ace.server.log.task-1.0.0.jar
+            file:bundle/org.apache.ace.server.log-1.0.0.jar
+            file:bundle/org.apache.ace.repository-1.0.0.jar
+            file:bundle/org.apache.ace.repository.task-1.0.0.jar
+            file:bundle/org.apache.ace.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"/>

Modified: incubator/ace/trunk/liq/target-dev-server-upnp.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/target-dev-server-upnp.xml?rev=789022&r1=789021&r2=789022&view=diff
==============================================================================
--- incubator/ace/trunk/liq/target-dev-server-upnp.xml (original)
+++ incubator/ace/trunk/liq/target-dev-server-upnp.xml Sat Jun 27 22:23:50 2009
@@ -16,31 +16,31 @@
         </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.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.upnp-1.0.0.jar" />
-            	<include name="net.luminis.liq.location.upnp-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.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.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.activationinfo.factory.server-1.0.0.jar" />
-            	<include name="net.luminis.liq.license.factory.server-1.0.0.jar" />
-                <include name="net.luminis.liq.server.activation-1.0.0.jar" />
-                <include name="net.luminis.liq.server.activation.store-1.0.0.jar" />
-                <include name="net.luminis.liq.server.activation.matcher-1.0.0.jar" />
-                <include name="net.luminis.liq.server.activation.servlet-1.0.0.jar" />
+            	<include name="org.apache.ace.consolelogger-1.0.0.jar" />
+            	<include name="org.apache.ace.configurator-1.0.0.jar" />
+            	<include name="org.apache.ace.configurator.useradmin.task-1.0.0.jar" />
+            	<include name="org.apache.ace.resourceprocessor.useradmin-1.0.0.jar" />
+            	<include name="org.apache.ace.http.listener-1.0.0.jar" />
+            	<include name="org.apache.ace.deployment.servlet-1.0.0.jar" />
+            	<include name="org.apache.ace.deployment.provider.repositorybased-1.0.0.jar" />
+            	<include name="org.apache.ace.deployment.streamgenerator-1.0.0.jar" />
+            	<include name="org.apache.ace.discovery.upnp-1.0.0.jar" />
+            	<include name="org.apache.ace.location.upnp-1.0.0.jar" />
+            	<include name="org.apache.ace.server.log.store-1.0.0.jar" />
+            	<include name="org.apache.ace.server.log-1.0.0.jar" />
+            	<include name="org.apache.ace.scheduler-1.0.0.jar" />
+            	<include name="org.apache.ace.repository-1.0.0.jar" />
+            	<include name="org.apache.ace.repository.servlet-1.0.0.jar" />
+                <include name="org.apache.ace.client.repository.stateful-1.0.0.jar" />
+                <include name="org.apache.ace.client.repository-1.0.0.jar" />
+                <include name="org.apache.ace.client.repository.helper.base-1.0.0.jar" />
+                <include name="org.apache.ace.client.repository.helper.bundle-1.0.0.jar" />
+                <include name="org.apache.ace.activationinfo.factory.server-1.0.0.jar" />
+            	<include name="org.apache.ace.license.factory.server-1.0.0.jar" />
+                <include name="org.apache.ace.server.activation-1.0.0.jar" />
+                <include name="org.apache.ace.server.activation.store-1.0.0.jar" />
+                <include name="org.apache.ace.server.activation.matcher-1.0.0.jar" />
+                <include name="org.apache.ace.server.activation.servlet-1.0.0.jar" />
             </fileset>
             <fileset dir="ext">
             	<include name="org.osgi.compendium.jar" />
@@ -49,7 +49,7 @@
                 <include name="org.apache.felix.dependencymanager.jar" />
             </fileset>
             <fileset dir="lib">
-                <include name="net.luminis.liq.xstream-1.3.jar" />
+                <include name="org.apache.ace.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" />
@@ -67,14 +67,14 @@
         <copy file="${deploy-dir}/conf/dev-config.properties" overwrite="true" tofile="${deploy-dir}/conf/config.properties" />
         <delete file="${deploy-dir}/conf/test-config.properties" />
         <property name="bundles-noshell" value="
-        	file:bundle/net.luminis.liq.consolelogger-1.0.0.jar
+        	file:bundle/org.apache.ace.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/net.luminis.liq.xstream-1.3.jar
+            file:bundle/org.apache.ace.xstream-1.3.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 
@@ -82,30 +82,30 @@
             file:bundle/org.apache.felix.dependencymanager.jar 
             file:bundle/org.apache.felix.prefs-0.1.0-SNAPSHOT.jar
             file:bundle/org.apache.felix.upnp.basedriver-0.8.0.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.location.upnp-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.upnp-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.scheduler-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.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.configurator.useradmin.task-1.0.0.jar
-        	file:bundle/net.luminis.liq.resourceprocessor.useradmin-1.0.0.jar
-        	file:bundle/net.luminis.liq.license.factory.server-1.0.0.jar
-        	file:bundle/net.luminis.liq.activationinfo.factory.server-1.0.0.jar
-            file:bundle/net.luminis.liq.server.activation-1.0.0.jar
-            file:bundle/net.luminis.liq.server.activation.store-1.0.0.jar
-            file:bundle/net.luminis.liq.server.activation.matcher-1.0.0.jar
-            file:bundle/net.luminis.liq.server.activation.servlet-1.0.0.jar" />
+            file:bundle/org.apache.ace.configurator-1.0.0.jar
+            file:bundle/org.apache.ace.http.listener-1.0.0.jar
+            file:bundle/org.apache.ace.location.upnp-1.0.0.jar
+            file:bundle/org.apache.ace.deployment.servlet-1.0.0.jar
+            file:bundle/org.apache.ace.deployment.provider.repositorybased-1.0.0.jar
+            file:bundle/org.apache.ace.deployment.streamgenerator-1.0.0.jar
+            file:bundle/org.apache.ace.discovery.upnp-1.0.0.jar
+            file:bundle/org.apache.ace.server.log.store-1.0.0.jar
+            file:bundle/org.apache.ace.server.log-1.0.0.jar
+            file:bundle/org.apache.ace.scheduler-1.0.0.jar
+            file:bundle/org.apache.ace.repository-1.0.0.jar
+            file:bundle/org.apache.ace.repository.servlet-1.0.0.jar
+    	    file:bundle/org.apache.ace.client.repository.stateful-1.0.0.jar
+    	    file:bundle/org.apache.ace.client.repository-1.0.0.jar
+            file:bundle/org.apache.ace.client.repository.helper.base-1.0.0.jar
+            file:bundle/org.apache.ace.client.repository.helper.bundle-1.0.0.jar
+            file:bundle/org.apache.ace.configurator.useradmin.task-1.0.0.jar
+        	file:bundle/org.apache.ace.resourceprocessor.useradmin-1.0.0.jar
+        	file:bundle/org.apache.ace.license.factory.server-1.0.0.jar
+        	file:bundle/org.apache.ace.activationinfo.factory.server-1.0.0.jar
+            file:bundle/org.apache.ace.server.activation-1.0.0.jar
+            file:bundle/org.apache.ace.server.activation.store-1.0.0.jar
+            file:bundle/org.apache.ace.server.activation.matcher-1.0.0.jar
+            file:bundle/org.apache.ace.server.activation.servlet-1.0.0.jar" />
         <property name="bundles-shell" value="${bundles-noshell}
             file:bundle/org.apache.felix.shell-1.0.0.jar 
             file:bundle/org.apache.felix.shell.tui-1.0.0.jar" />

Modified: incubator/ace/trunk/liq/target-dev-server.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/target-dev-server.xml?rev=789022&r1=789021&r2=789022&view=diff
==============================================================================
--- incubator/ace/trunk/liq/target-dev-server.xml (original)
+++ incubator/ace/trunk/liq/target-dev-server.xml Sat Jun 27 22:23:50 2009
@@ -16,33 +16,33 @@
         </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.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.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.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.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.activation.servlet-1.0.0.jar" />
-                <include name="net.luminis.liq.activation.service-1.0.0.jar" />
-                <include name="net.luminis.liq.client.repository.helper.license-1.0.0.jar" />
+            	<include name="org.apache.ace.consolelogger-1.0.0.jar" />
+            	<include name="org.apache.ace.configurator-1.0.0.jar" />
+            	<include name="org.apache.ace.configurator.useradmin.task-1.0.0.jar" />
+            	<include name="org.apache.ace.resourceprocessor.useradmin-1.0.0.jar" />
+            	<include name="org.apache.ace.http.listener-1.0.0.jar" />
+            	<include name="org.apache.ace.deployment.servlet-1.0.0.jar" />
+            	<include name="org.apache.ace.deployment.provider.repositorybased-1.0.0.jar" />
+            	<include name="org.apache.ace.deployment.streamgenerator-1.0.0.jar" />
+            	<include name="org.apache.ace.discovery.property-1.0.0.jar" />
+            	<include name="org.apache.ace.server.log.store-1.0.0.jar" />
+            	<include name="org.apache.ace.server.log-1.0.0.jar" />
+            	<include name="org.apache.ace.scheduler-1.0.0.jar" />
+            	<include name="org.apache.ace.repository-1.0.0.jar" />
+            	<include name="org.apache.ace.repository.servlet-1.0.0.jar" />
+                <include name="org.apache.ace.client.repository.stateful-1.0.0.jar" />
+                <include name="org.apache.ace.client.repository-1.0.0.jar" />
+                <include name="org.apache.ace.client.repository.helper.base-1.0.0.jar" />
+                <include name="org.apache.ace.client.repository.helper.bundle-1.0.0.jar" />
+                <include name="org.apache.ace.activation.store-1.0.0.jar" />
+                <include name="org.apache.ace.activationinfo.store-1.0.0.jar" />
+                <include name="org.apache.ace.activation.matcher-1.0.0.jar" />
+                <include name="org.apache.ace.activation.servlet-1.0.0.jar" />
+                <include name="org.apache.ace.activation.service-1.0.0.jar" />
+                <include name="org.apache.ace.client.repository.helper.license-1.0.0.jar" />
                 <!-- for testing -->
                 <!--
-                <include name="net.luminis.liq.http.echo.servlet-1.0.0.jar" />
+                <include name="org.apache.ace.http.echo.servlet-1.0.0.jar" />
                 -->
             </fileset>
             <fileset dir="ext">
@@ -53,7 +53,7 @@
                 <include name="org.apache.felix.dependencymanager.shell.jar" />
             </fileset>
             <fileset dir="lib">
-                <include name="net.luminis.liq.xstream-1.3.jar" />
+                <include name="org.apache.ace.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" />
@@ -70,41 +70,41 @@
         <copy file="${deploy-dir}/conf/dev-config.properties" overwrite="true" tofile="${deploy-dir}/conf/config.properties" />
         <delete file="${deploy-dir}/conf/test-config.properties" />
         <property name="bundles-noshell" value="
-        	file:bundle/net.luminis.liq.consolelogger-1.0.0.jar
+        	file:bundle/org.apache.ace.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/net.luminis.liq.xstream-1.3.jar
+            file:bundle/org.apache.ace.xstream-1.3.jar
     	    file:bundle/org.apache.felix.eventadmin.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.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.scheduler-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.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.configurator.useradmin.task-1.0.0.jar
-        	file:bundle/net.luminis.liq.resourceprocessor.useradmin-1.0.0.jar
-            file:bundle/net.luminis.liq.activation.store-1.0.0.jar
-            file:bundle/net.luminis.liq.activationinfo.store-1.0.0.jar
-            file:bundle/net.luminis.liq.activation.matcher-1.0.0.jar
-            file:bundle/net.luminis.liq.activation.servlet-1.0.0.jar
-            file:bundle/net.luminis.liq.activation.service-1.0.0.jar
-            file:bundle/net.luminis.liq.client.repository.helper.license-1.0.0.jar
+            file:bundle/org.apache.ace.configurator-1.0.0.jar
+            file:bundle/org.apache.ace.http.listener-1.0.0.jar
+            file:bundle/org.apache.ace.deployment.servlet-1.0.0.jar
+            file:bundle/org.apache.ace.deployment.provider.repositorybased-1.0.0.jar
+            file:bundle/org.apache.ace.deployment.streamgenerator-1.0.0.jar
+        	file:bundle/org.apache.ace.discovery.property-1.0.0.jar
+            file:bundle/org.apache.ace.server.log.store-1.0.0.jar
+            file:bundle/org.apache.ace.server.log-1.0.0.jar
+            file:bundle/org.apache.ace.scheduler-1.0.0.jar
+            file:bundle/org.apache.ace.repository-1.0.0.jar
+            file:bundle/org.apache.ace.repository.servlet-1.0.0.jar
+    	    file:bundle/org.apache.ace.client.repository.stateful-1.0.0.jar
+    	    file:bundle/org.apache.ace.client.repository-1.0.0.jar
+            file:bundle/org.apache.ace.client.repository.helper.base-1.0.0.jar
+            file:bundle/org.apache.ace.client.repository.helper.bundle-1.0.0.jar
+            file:bundle/org.apache.ace.configurator.useradmin.task-1.0.0.jar
+        	file:bundle/org.apache.ace.resourceprocessor.useradmin-1.0.0.jar
+            file:bundle/org.apache.ace.activation.store-1.0.0.jar
+            file:bundle/org.apache.ace.activationinfo.store-1.0.0.jar
+            file:bundle/org.apache.ace.activation.matcher-1.0.0.jar
+            file:bundle/org.apache.ace.activation.servlet-1.0.0.jar
+            file:bundle/org.apache.ace.activation.service-1.0.0.jar
+            file:bundle/org.apache.ace.client.repository.helper.license-1.0.0.jar
             " />
         <property name="bundles-shell" value="${bundles-noshell}
             file:bundle/org.apache.felix.shell-1.0.2.jar 

Modified: incubator/ace/trunk/liq/target-test.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/target-test.xml?rev=789022&r1=789021&r2=789022&view=diff
==============================================================================
--- incubator/ace/trunk/liq/target-test.xml (original)
+++ incubator/ace/trunk/liq/target-test.xml Sat Jun 27 22:23:50 2009
@@ -31,7 +31,7 @@
             	<include name="useradmin_all-2.0.0.jar" />
             	<include name="org.apache.felix.deploymentadmin-0.9.0-SNAPSHOT.jar" />
             	<!-- Temporarily added until we can use xstream in some other way -->
-				<include name="net.luminis.liq.xstream-1.3.jar" />
+				<include name="org.apache.ace.xstream-1.3.jar" />
             </fileset>
         </copy>
         <copy todir="${deploy-dir}/conf">