Author: marrs
Date: Thu Apr 4 10:12:23 2013
New Revision: 1464415
URL: http://svn.apache.org/r1464415
Log:
ACE-333 Small fixes, the top level build is still work in progress.
Modified:
ace/trunk/build/bnd.bnd
ace/trunk/org.apache.ace.managementagent/bnd.bnd
ace/trunk/org.apache.ace.obr/bnd.bnd
Modified: ace/trunk/build/bnd.bnd
URL:
http://svn.apache.org/viewvc/ace/trunk/build/bnd.bnd?rev=1464415&r1=1464414&r2=1464415&view=diff
==============================================================================
--- ace/trunk/build/bnd.bnd (original)
+++ ace/trunk/build/bnd.bnd Thu Apr 4 10:12:23 2013
@@ -5,12 +5,7 @@
org.apache.ace.authentication.itest,\
org.apache.ace.builder,\
org.apache.ace.client.automation,\
- org.apache.ace.client.repository.api,\
- org.apache.ace.client.repository.helper.base,\
- org.apache.ace.client.repository.helper.bundle,\
- org.apache.ace.client.repository.helper.configuration,\
- org.apache.ace.client.repository.helper.user,\
- org.apache.ace.client.repository.impl,\
+ org.apache.ace.client.repository,\
org.apache.ace.client.repository.itest,\
org.apache.ace.client.rest,\
org.apache.ace.client.rest.itest,\
@@ -20,30 +15,15 @@
org.apache.ace.configurator.useradmin.task,\
org.apache.ace.connectionfactory,\
org.apache.ace.consolelogger,\
- org.apache.ace.deployment.api,\
- org.apache.ace.deployment.deploymentadmin,\
+ org.apache.ace.deployment,\
org.apache.ace.deployment.itest,\
- org.apache.ace.deployment.provider.api,\
- org.apache.ace.deployment.provider.base,\
- org.apache.ace.deployment.provider.filebased,\
- org.apache.ace.deployment.provider.repositorybased,\
- org.apache.ace.deployment.servlet,\
- org.apache.ace.deployment.streamgenerator,\
- org.apache.ace.deployment.task,\
- org.apache.ace.deployment.task.base,\
- org.apache.ace.deployment.verifier,\
- org.apache.ace.deployment.verifier.ui,\
- org.apache.ace.discovery.api,\
- org.apache.ace.discovery.property,\
- org.apache.ace.discovery.upnp,\
+ org.apache.ace.discovery,\
org.apache.ace.gateway.log,\
org.apache.ace.gateway.log.store,\
org.apache.ace.http.itest,\
org.apache.ace.http.redirector,\
org.apache.ace.httplistener,\
- org.apache.ace.identification.api,\
- org.apache.ace.identification.ifconfig,\
- org.apache.ace.identification.property,\
+ org.apache.ace.identification,\
org.apache.ace.launcher,\
org.apache.ace.location.upnp,\
org.apache.ace.log,\
@@ -52,23 +32,14 @@
org.apache.ace.log.servlet,\
org.apache.ace.log.task,\
org.apache.ace.managementagent,\
- org.apache.ace.nodelauncher.amazon,\
- org.apache.ace.nodelauncher.api,\
- org.apache.ace.nodelauncher.ui,\
- org.apache.ace.obr.metadata,\
- org.apache.ace.obr.servlet,\
- org.apache.ace.obr.storage,\
+ org.apache.ace.nodelauncher,\
+ org.apache.ace.obr,\
org.apache.ace.processlauncher,\
org.apache.ace.range.api,\
- org.apache.ace.repository.api,\
- org.apache.ace.repository.ext,\
- org.apache.ace.repository.impl,\
+ org.apache.ace.repository,\
org.apache.ace.repository.itest,\
- org.apache.ace.repository.servlet,\
- org.apache.ace.repository.task,\
org.apache.ace.resourceprocessor.useradmin,\
org.apache.ace.scheduler,\
- org.apache.ace.scheduler.api,\
org.apache.ace.server.action,\
org.apache.ace.server.action.popupmessage,\
org.apache.ace.server.log.store,\
@@ -77,6 +48,7 @@
org.apache.ace.tageditor,\
org.apache.ace.target.mgmt.ui,\
org.apache.ace.test,\
+ org.apache.ace.verifier,\
org.apache.ace.webui.vaadin
-Xdependson \
Modified: ace/trunk/org.apache.ace.managementagent/bnd.bnd
URL:
http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.managementagent/bnd.bnd?rev=1464415&r1=1464414&r2=1464415&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.managementagent/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.managementagent/bnd.bnd Thu Apr 4 10:12:23 2013
@@ -20,7 +20,7 @@
org.apache.ace.deployment.deploymentadmin;version=latest,\
org.apache.ace.deployment.task.base;version=latest,\
org.apache.ace.deployment.task;version=latest,\
- org.apache.ace.scheduler;version=latest
+ org.apache.ace.scheduler.impl;version=latest
Private-Package: EDU.oswego.cs.dl.util.concurrent;-split-package:=first,\
org.apache.felix.*;-split-package:=first,\
org.apache.ace.*;-split-package:=first,\
Modified: ace/trunk/org.apache.ace.obr/bnd.bnd
URL:
http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.obr/bnd.bnd?rev=1464415&r1=1464414&r2=1464415&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.obr/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.obr/bnd.bnd Thu Apr 4 10:12:23 2013
@@ -7,6 +7,7 @@
org.apache.ace.test;version=latest,\
org.apache.ace.deployment.provider.api;version=latest,\
org.apache.ace.deployment.provider.base;version=latest,\
- kxml2;version=2.3.0
+ kxml2;version=2.3.0,\
+ org.apache.ace.deployment.util.test;version=latest