ace-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1465922 [1/3] - in /ace/trunk: build/ org.apache.ace.authentication.itest/ org.apache.ace.authentication.itest/src/org/apache/ace/it/authentication/ org.apache.ace.client.repository.itest/ org.apache.ace.client.repository.itest/src/org/apa...
Date Tue, 09 Apr 2013 08:12:36 GMT
Author: marrs
Date: Tue Apr  9 08:12:33 2013
New Revision: 1465922

URL: http://svn.apache.org/r1465922
Log:
ACE-333 Merged quite a few projects. More commits coming.

Added:
    ace/trunk/org.apache.ace.deployment/provider.repositorybased.bnd
    ace/trunk/org.apache.ace.log.server.store.itest/
    ace/trunk/org.apache.ace.log.server.store.itest/.classpath
    ace/trunk/org.apache.ace.log.server.store.itest/.project
    ace/trunk/org.apache.ace.log.server.store.itest/.settings/
    ace/trunk/org.apache.ace.log.server.store.itest/.settings/org.eclipse.jdt.core.prefs
    ace/trunk/org.apache.ace.log.server.store.itest/bnd.bnd
    ace/trunk/org.apache.ace.log.server.store.itest/build.xml
    ace/trunk/org.apache.ace.log.server.store.itest/src/
    ace/trunk/org.apache.ace.log.server.store.itest/src/org/
    ace/trunk/org.apache.ace.log.server.store.itest/src/org/apache/
    ace/trunk/org.apache.ace.log.server.store.itest/src/org/apache/ace/
    ace/trunk/org.apache.ace.log.server.store.itest/src/org/apache/ace/server/
    ace/trunk/org.apache.ace.log.server.store.itest/src/org/apache/ace/server/log/
    ace/trunk/org.apache.ace.log.server.store.itest/src/org/apache/ace/server/log/store/
    ace/trunk/org.apache.ace.log.server.store.itest/src/org/apache/ace/server/log/store/tests/
    ace/trunk/org.apache.ace.log.server.store.itest/src/org/apache/ace/server/log/store/tests/MongoLogStoreTest.java
    ace/trunk/org.apache.ace.log.server.store.itest/src/org/example/
    ace/trunk/org.apache.ace.log.server.ui/
    ace/trunk/org.apache.ace.log.server.ui/.classpath
    ace/trunk/org.apache.ace.log.server.ui/.project
    ace/trunk/org.apache.ace.log.server.ui/bnd.bnd
    ace/trunk/org.apache.ace.log.server.ui/build.xml
    ace/trunk/org.apache.ace.log.server.ui/src/
    ace/trunk/org.apache.ace.log.server.ui/src/org/
    ace/trunk/org.apache.ace.log.server.ui/src/org/apache/
    ace/trunk/org.apache.ace.log.server.ui/src/org/apache/ace/
    ace/trunk/org.apache.ace.log.server.ui/src/org/apache/ace/log/
    ace/trunk/org.apache.ace.log.server.ui/src/org/apache/ace/log/server/
    ace/trunk/org.apache.ace.log.server.ui/src/org/apache/ace/log/server/ui/
    ace/trunk/org.apache.ace.log.server.ui/src/org/apache/ace/log/server/ui/Activator.java
    ace/trunk/org.apache.ace.log.server.ui/src/org/apache/ace/log/server/ui/LogViewerExtension.java
    ace/trunk/org.apache.ace.repository/
    ace/trunk/org.apache.ace.repository/.classpath
    ace/trunk/org.apache.ace.repository/.project
    ace/trunk/org.apache.ace.repository/.settings/
    ace/trunk/org.apache.ace.repository/.settings/org.eclipse.jdt.core.prefs
    ace/trunk/org.apache.ace.repository/api.bnd
    ace/trunk/org.apache.ace.repository/bnd.bnd
    ace/trunk/org.apache.ace.repository/build.xml
    ace/trunk/org.apache.ace.repository/ext.bnd
    ace/trunk/org.apache.ace.repository/impl.bnd
    ace/trunk/org.apache.ace.repository/servlet.bnd
    ace/trunk/org.apache.ace.repository/src/
    ace/trunk/org.apache.ace.repository/src/org/
    ace/trunk/org.apache.ace.repository/src/org/apache/
    ace/trunk/org.apache.ace.repository/src/org/apache/ace/
    ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/
    ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/Repository.java
    ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/RepositoryReplication.java
    ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/ext/
    ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/ext/BackupRepository.java
    ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/ext/CachedRepository.java
    ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/ext/impl/
    ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/ext/impl/CachedRepositoryImpl.java
    ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/ext/impl/FilebasedBackupRepository.java
    ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/ext/impl/RemoteRepository.java
    ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/ext/impl/packageinfo
    ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/ext/packageinfo
    ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/impl/
    ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/impl/Activator.java
    ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/impl/RepositoryFactory.java
    ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/impl/RepositoryImpl.java
    ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/impl/constants/
    ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/impl/constants/RepositoryConstants.java
    ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/packageinfo
    ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/servlet/
    ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/servlet/Activator.java
    ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/servlet/RepositoryReplicationServlet.java
    ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/servlet/RepositoryServlet.java
    ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/servlet/RepositoryServletBase.java
    ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/servlet/packageinfo
    ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/task/
    ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/task/Activator.java
    ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/task/RepositoryReplicationTask.java
    ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/task/packageinfo
    ace/trunk/org.apache.ace.repository/task.bnd
    ace/trunk/org.apache.ace.repository/test/
    ace/trunk/org.apache.ace.repository/test/org/
    ace/trunk/org.apache.ace.repository/test/org/apache/
    ace/trunk/org.apache.ace.repository/test/org/apache/ace/
    ace/trunk/org.apache.ace.repository/test/org/apache/ace/repository/
    ace/trunk/org.apache.ace.repository/test/org/apache/ace/repository/impl/
    ace/trunk/org.apache.ace.repository/test/org/apache/ace/repository/impl/RepositoryImplTest.java
Removed:
    ace/trunk/org.apache.ace.deployment/deployment.repositorybased.bnd
    ace/trunk/org.apache.ace.gateway.log/
    ace/trunk/org.apache.ace.gateway.log.store/
    ace/trunk/org.apache.ace.log/
    ace/trunk/org.apache.ace.log.listener/
    ace/trunk/org.apache.ace.log.servlet/
    ace/trunk/org.apache.ace.log.task/
    ace/trunk/org.apache.ace.repository.api/
    ace/trunk/org.apache.ace.repository.ext/
    ace/trunk/org.apache.ace.repository.impl/
    ace/trunk/org.apache.ace.repository.servlet/
    ace/trunk/org.apache.ace.repository.task/
    ace/trunk/org.apache.ace.server.log.store/
    ace/trunk/org.apache.ace.server.log.store.itest/
    ace/trunk/org.apache.ace.server.log.ui/
Modified:
    ace/trunk/build/bnd.bnd
    ace/trunk/org.apache.ace.authentication.itest/bnd.bnd
    ace/trunk/org.apache.ace.authentication.itest/src/org/apache/ace/it/authentication/LogAuthenticationTest.java
    ace/trunk/org.apache.ace.client.repository.itest/bnd.bnd
    ace/trunk/org.apache.ace.client.repository.itest/src/org/apache/ace/it/repositoryadmin/BaseRepositoryAdminTest.java
    ace/trunk/org.apache.ace.client.repository/bnd.bnd
    ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/impl/Activator.java
    ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/stateful/impl/StatefulTargetRepositoryImpl.java
    ace/trunk/org.apache.ace.client.rest.itest/bnd.bnd
    ace/trunk/org.apache.ace.client.rest/bnd.bnd
    ace/trunk/org.apache.ace.configurator.useradmin.itest/bnd.bnd
    ace/trunk/org.apache.ace.deployment.itest/bnd.bnd
    ace/trunk/org.apache.ace.deployment/bnd.bnd
    ace/trunk/org.apache.ace.http.itest/bnd.bnd
    ace/trunk/org.apache.ace.log.itest/bnd.bnd
    ace/trunk/org.apache.ace.log.itest/src/org/apache/ace/it/log/LogIntegrationTest.java
    ace/trunk/org.apache.ace.managementagent/bnd.bnd
    ace/trunk/org.apache.ace.managementagent/src/org/apache/ace/managementagent/Activator.java
    ace/trunk/org.apache.ace.repository.itest/bnd.bnd
    ace/trunk/org.apache.ace.repository.itest/src/org/apache/ace/it/repository/RepositoryTest.java
    ace/trunk/org.apache.ace.repository.itest/src/org/apache/ace/it/repository/Utils.java
    ace/trunk/org.apache.ace.useradmin.ui.itest/bnd.bnd
    ace/trunk/org.apache.ace.verifier/bnd.bnd
    ace/trunk/run-client/client.bndrun
    ace/trunk/run-client/conf/org.apache.ace.scheduler.cfg
    ace/trunk/run-server-allinone/server-allinone.bndrun
    ace/trunk/run-server/server.bndrun

Modified: ace/trunk/build/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/build/bnd.bnd?rev=1465922&r1=1465921&r2=1465922&view=diff
==============================================================================
--- ace/trunk/build/bnd.bnd (original)
+++ ace/trunk/build/bnd.bnd Tue Apr  9 08:12:33 2013
@@ -18,8 +18,6 @@
     org.apache.ace.deployment,\
     org.apache.ace.deployment.itest,\
     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,\
@@ -28,9 +26,8 @@
     org.apache.ace.location.upnp,\
     org.apache.ace.log,\
     org.apache.ace.log.itest,\
-    org.apache.ace.log.listener,\
-    org.apache.ace.log.servlet,\
-    org.apache.ace.log.task,\
+    org.apache.ace.log.server.store.itest,\
+    org.apache.ace.log.server.ui,\
     org.apache.ace.managementagent,\
     org.apache.ace.nodelauncher,\
     org.apache.ace.obr,\
@@ -42,76 +39,11 @@
     org.apache.ace.scheduler,\
     org.apache.ace.server.action,\
     org.apache.ace.server.action.popupmessage,\
-    org.apache.ace.server.log.store,\
-    org.apache.ace.server.log.store.itest,\
-    org.apache.ace.server.log.ui,\
     org.apache.ace.tageditor,\
     org.apache.ace.target.mgmt.ui,\
     org.apache.ace.test,\
+    org.apache.ace.useradmin.ui,\
+    org.apache.ace.useradmin.ui.itest,\
     org.apache.ace.verifier,\
     org.apache.ace.webui.vaadin
-
--Xdependson \
-    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.rest,\
-    org.apache.ace.configurator,\
-    org.apache.ace.configurator.serveruseradmin,\
-    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.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.gateway.log,\
-    org.apache.ace.gateway.log.store,\
-    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.launcher,\
-    org.apache.ace.location.upnp,\
-    org.apache.ace.log,\
-    org.apache.ace.log.listener,\
-    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.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.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,\
-    org.apache.ace.server.log.ui,\
-    org.apache.ace.tageditor,\
-    org.apache.ace.target.mgmt.ui,\
-    org.apache.ace.test,\
-    org.apache.ace.webui.vaadin
+    
\ No newline at end of file

Modified: ace/trunk/org.apache.ace.authentication.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.authentication.itest/bnd.bnd?rev=1465922&r1=1465921&r2=1465922&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.authentication.itest/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.authentication.itest/bnd.bnd Tue Apr  9 08:12:33 2013
@@ -6,8 +6,8 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
 	org.apache.felix.dependencymanager,\
 	org.apache.ace.connectionfactory;version=latest,\
 	org.apache.ace.repository.api;version=latest,\
-	org.apache.ace.log;version=latest,\
-	org.apache.ace.server.log.store.api;version=latest,\
+	org.apache.ace.log.api;version=latest,\
+	org.apache.ace.log.server.store.api;version=latest,\
 	org.apache.ace.client.repository.api;version=latest,\
 	org.apache.ace.repository.impl;version=latest,\
 	org.apache.ace.discovery.api;version=latest,\
@@ -18,6 +18,7 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
 	org.apache.ace.range.api;version=latest,\
 	org.apache.ace.obr.storage;version=latest
 -runfw: org.apache.felix.framework;version='[4,5)'
+-runvm: -ea
 -runbundles: osgi.cmpn,\
 	org.apache.felix.log,\
 	org.apache.felix.dependencymanager,\
@@ -26,46 +27,46 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
 	org.apache.felix.eventadmin,\
 	org.apache.felix.prefs,\
 	org.apache.felix.http.jetty,\
-	org.apache.ace.log.task;version=latest,\
-	org.apache.ace.log;version=latest,\
-	org.apache.ace.client.repository.helper.bundle;version=latest,\
-	org.apache.ace.discovery.api;version=latest,\
-	org.apache.ace.discovery.property;version=latest,\
-	org.apache.ace.configurator.serveruseradmin;version=latest,\
-	org.apache.ace.range.api;version=latest,\
-	org.apache.ace.repository.impl;version=latest,\
+	org.apache.felix.useradmin,\
+	org.apache.felix.useradmin.filestore,\
+	org.apache.felix.gogo.command,\
+	org.apache.felix.gogo.runtime,\
+	org.apache.felix.gogo.shell,\
+	org.apache.ace.authentication.api;version=latest,\
+	org.apache.ace.authentication.impl;version=latest,\
 	org.apache.ace.authentication.processor.basicauth;version=latest,\
-	org.apache.ace.client.repository.helper.base;version=latest,\
-	org.apache.ace.repository.api;version=latest,\
 	org.apache.ace.client.repository.api;version=latest,\
-	org.apache.ace.server.log.store.api;version=latest,\
-	org.apache.ace.server.log.store.filelogstore;version=latest,\
-	org.apache.ace.repository.servlet;version=latest,\
-	org.apache.ace.identification.api;version=latest,\
-	org.apache.ace.resourceprocessor.useradmin;version=latest,\
-	org.apache.ace.gateway.log.store;version=latest,\
-	org.apache.ace.httplistener;version=latest,\
-	org.apache.ace.obr.storage;version=latest,\
-	org.apache.ace.test;version=latest,\
+	org.apache.ace.client.repository.helper.base;version=latest,\
+	org.apache.ace.client.repository.helper.bundle;version=latest,\
 	org.apache.ace.client.repository.helper.configuration;version=latest,\
-	org.apache.ace.configurator.useradmin.task;version=latest,\
-	org.apache.ace.identification.property;version=latest,\
-	org.apache.ace.gateway.log;version=latest,\
-	org.apache.ace.obr.metadata;version=latest,\
-	org.apache.ace.authentication.api;version=latest,\
 	org.apache.ace.client.repository.impl;version=latest,\
+	org.apache.ace.configurator.serveruseradmin;version=latest,\
+	org.apache.ace.configurator.useradmin.task;version=latest,\
 	org.apache.ace.connectionfactory;version=latest,\
-	org.apache.ace.authentication.impl;version=latest,\
+	org.apache.ace.deployment.provider.api;version=latest,\
+	org.apache.ace.discovery.api;version=latest,\
+	org.apache.ace.discovery.property;version=latest,\
+	org.apache.ace.httplistener;version=latest,\
+	org.apache.ace.identification.api;version=latest,\
+	org.apache.ace.identification.property;version=latest,\
+	org.apache.ace.log.api;version=latest,\
 	org.apache.ace.log.listener;version=latest,\
+	org.apache.ace.log.server.store.api;version=latest,\
+	org.apache.ace.log.server.store.file;version=latest,\
+	org.apache.ace.log.server.servlet;version=latest,\
+	org.apache.ace.log.target;version=latest,\
+	org.apache.ace.log.target.store.impl;version=latest,\
+	org.apache.ace.log.server.task;version=latest,\
+	org.apache.ace.obr.metadata;version=latest,\
 	org.apache.ace.obr.servlet;version=latest,\
-	org.apache.ace.deployment.provider.api;version=latest,\
-	org.apache.ace.scheduler;version=latest,\
-	org.apache.ace.log.servlet;version=latest,\
-	org.apache.felix.useradmin,\
-	org.apache.felix.useradmin.filestore,\
-	org.apache.felix.gogo.command,\
-	org.apache.felix.gogo.runtime,\
-	org.apache.felix.gogo.shell
+	org.apache.ace.obr.storage;version=latest,\
+	org.apache.ace.range.api;version=latest,\
+	org.apache.ace.repository.api;version=latest,\
+	org.apache.ace.repository.impl;version=latest,\
+	org.apache.ace.repository.servlet;version=latest,\
+	org.apache.ace.resourceprocessor.useradmin;version=latest,\
+	org.apache.ace.scheduler.impl;version=latest,\
+	org.apache.ace.test;version=latest
 Private-Package: org.apache.ace.it.authentication
 Bundle-Version: 1.0.0
 -runrepos: Local,\

Modified: ace/trunk/org.apache.ace.authentication.itest/src/org/apache/ace/it/authentication/LogAuthenticationTest.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.authentication.itest/src/org/apache/ace/it/authentication/LogAuthenticationTest.java?rev=1465922&r1=1465921&r2=1465922&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.authentication.itest/src/org/apache/ace/it/authentication/LogAuthenticationTest.java (original)
+++ ace/trunk/org.apache.ace.authentication.itest/src/org/apache/ace/it/authentication/LogAuthenticationTest.java Tue Apr  9 08:12:33 2013
@@ -37,7 +37,7 @@ import org.apache.ace.log.LogDescriptor;
 import org.apache.ace.log.LogEvent;
 import org.apache.ace.repository.Repository;
 import org.apache.ace.repository.impl.constants.RepositoryConstants;
-import org.apache.ace.server.log.store.LogStore;
+import org.apache.ace.log.server.store.LogStore;
 import org.apache.ace.test.constants.TestConstants;
 import org.apache.felix.dm.Component;
 import org.osgi.framework.Constants;

Modified: ace/trunk/org.apache.ace.client.repository.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository.itest/bnd.bnd?rev=1465922&r1=1465921&r2=1465922&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository.itest/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.client.repository.itest/bnd.bnd Tue Apr  9 08:12:33 2013
@@ -4,7 +4,7 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
 	osgi.cmpn,\
 	org.apache.felix.dependencymanager,\
 	org.apache.ace.test;version=latest,\
-	org.apache.ace.log;version=latest,\
+	org.apache.ace.log.api;version=latest,\
 	org.apache.ace.httplistener;version=latest,\
 	org.apache.ace.discovery.api;version=latest,\
 	org.apache.ace.discovery.property;version=latest,\
@@ -19,8 +19,9 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
 	org.apache.ace.repository.impl;version=latest,\
 	org.apache.ace.client.repository.api;version=latest,\
 	org.apache.ace.client.repository.helper.bundle;version=latest,\
-	org.apache.ace.server.log.store.api;version=latest
+	org.apache.ace.log.server.store.api;version=latest
 -runfw: org.apache.felix.framework;version='[4,5)'
+-runvm: -ea
 -runbundles: \
 	osgi.cmpn,\
 	org.apache.felix.dependencymanager,\
@@ -37,7 +38,7 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
 	org.apache.ace.httplistener;version=latest,\
 	org.apache.ace.authentication.api;version=latest,\
 	org.apache.ace.connectionfactory;version=latest,\
-	org.apache.ace.scheduler;version=latest,\
+	org.apache.ace.scheduler.impl;version=latest,\
 	org.apache.ace.scheduler.api;version=latest,\
 	org.apache.ace.deployment.provider.api;version=latest,\
 	org.apache.ace.deployment.provider.filebased;version=latest,\
@@ -53,9 +54,9 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
 	org.apache.ace.deployment.streamgenerator;version=latest,\
 	org.apache.ace.deployment.provider.base;version=latest,\
 	org.apache.ace.range.api;version=latest,\
-	org.apache.ace.log;version=latest,\
-	org.apache.ace.server.log.store.api;version=latest,\
-	org.apache.ace.server.log.store.filelogstore;version=latest,\
+	org.apache.ace.log.api;version=latest,\
+	org.apache.ace.log.server.store.api;version=latest,\
+	org.apache.ace.log.server.store.file;version=latest,\
 	org.apache.ace.repository.api;version=latest,\
 	org.apache.ace.repository.impl;version=latest,\
 	org.apache.ace.repository.servlet;version=latest,\

Modified: ace/trunk/org.apache.ace.client.repository.itest/src/org/apache/ace/it/repositoryadmin/BaseRepositoryAdminTest.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository.itest/src/org/apache/ace/it/repositoryadmin/BaseRepositoryAdminTest.java?rev=1465922&r1=1465921&r2=1465922&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository.itest/src/org/apache/ace/it/repositoryadmin/BaseRepositoryAdminTest.java (original)
+++ ace/trunk/org.apache.ace.client.repository.itest/src/org/apache/ace/it/repositoryadmin/BaseRepositoryAdminTest.java Tue Apr  9 08:12:33 2013
@@ -58,10 +58,10 @@ import org.apache.ace.client.repository.
 import org.apache.ace.client.repository.stateful.StatefulTargetRepository;
 import org.apache.ace.http.listener.constants.HttpConstants;
 import org.apache.ace.it.IntegrationTestBase;
+import org.apache.ace.log.server.store.LogStore;
 import org.apache.ace.obr.storage.file.constants.OBRFileStoreConstants;
 import org.apache.ace.repository.Repository;
 import org.apache.ace.repository.impl.constants.RepositoryConstants;
-import org.apache.ace.server.log.store.LogStore;
 import org.apache.ace.test.constants.TestConstants;
 import org.apache.felix.dm.Component;
 import org.osgi.framework.Constants;

Modified: ace/trunk/org.apache.ace.client.repository/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/bnd.bnd?rev=1465922&r1=1465921&r2=1465922&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.client.repository/bnd.bnd Tue Apr  9 08:12:33 2013
@@ -9,12 +9,12 @@
 	commons-collections;version=3.2.1,\
 	org.apache.felix.dependencymanager,\
 	org.apache.felix.gogo.runtime,\
-	org.apache.ace.log;version=latest,\
+	org.apache.ace.log.api;version=latest,\
 	org.apache.ace.connectionfactory;version=latest,\
 	org.apache.ace.deployment.provider.api;version=latest,\
 	org.apache.ace.repository.api;version=latest,\
 	org.apache.ace.range.api;version=latest,\
 	org.apache.ace.test;version=latest,\
 	org.apache.ace.repository.ext;version=latest,\
-	org.apache.ace.server.log.store.api;version=latest
+	org.apache.ace.log.server.store.api;version=latest
 -sub: *.bnd
\ No newline at end of file

Modified: ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/impl/Activator.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/impl/Activator.java?rev=1465922&r1=1465921&r2=1465922&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/impl/Activator.java (original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/impl/Activator.java Tue Apr  9 08:12:33 2013
@@ -43,7 +43,7 @@ import org.apache.ace.client.repository.
 import org.apache.ace.client.repository.repository.TargetRepository;
 import org.apache.ace.client.repository.stateful.StatefulTargetRepository;
 import org.apache.ace.client.repository.stateful.impl.StatefulTargetRepositoryImpl;
-import org.apache.ace.server.log.store.LogStore;
+import org.apache.ace.log.server.store.LogStore;
 import org.apache.felix.dm.Component;
 import org.apache.felix.dm.DependencyActivatorBase;
 import org.apache.felix.dm.DependencyManager;

Modified: ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/stateful/impl/StatefulTargetRepositoryImpl.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/stateful/impl/StatefulTargetRepositoryImpl.java?rev=1465922&r1=1465921&r2=1465922&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/stateful/impl/StatefulTargetRepositoryImpl.java (original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/stateful/impl/StatefulTargetRepositoryImpl.java Tue Apr  9 08:12:33 2013
@@ -50,7 +50,7 @@ import org.apache.ace.client.repository.
 import org.apache.ace.client.repository.stateful.StatefulTargetRepository;
 import org.apache.ace.log.LogDescriptor;
 import org.apache.ace.log.LogEvent;
-import org.apache.ace.server.log.store.LogStore;
+import org.apache.ace.log.server.store.LogStore;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Filter;
 import org.osgi.framework.InvalidSyntaxException;

Modified: ace/trunk/org.apache.ace.client.rest.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.rest.itest/bnd.bnd?rev=1465922&r1=1465921&r2=1465922&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.rest.itest/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.client.rest.itest/bnd.bnd Tue Apr  9 08:12:33 2013
@@ -10,13 +10,13 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
 	gson,\
 	org.apache.felix.dependencymanager,\
 	org.apache.ace.test;version=latest,\
-	org.apache.ace.log;version=latest,\
+	org.apache.ace.log.api;version=latest,\
 	org.apache.ace.httplistener;version=latest,\
 	org.apache.ace.discovery.api;version=latest,\
 	org.apache.ace.discovery.property;version=latest,\
 	org.apache.ace.identification.api;version=latest,\
 	org.apache.ace.identification.property;version=latest,\
-	org.apache.ace.server.log.store.api;version=latest,\
+	org.apache.ace.log.server.store.api;version=latest,\
 	org.apache.ace.scheduler.api;version=latest,\
 	org.apache.ace.deployment.servlet;version=latest,\
 	org.apache.ace.deployment.provider.filebased;version=latest,\
@@ -28,6 +28,7 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
 	org.apache.ace.client.repository.helper.bundle;version=latest,\
 	org.apache.ace.client.repository.helper.configuration;version=latest
 -runfw: org.apache.felix.framework;version='[4,5)'
+-runvm: -ea
 -runbundles: osgi.cmpn,\
 	org.apache.felix.dependencymanager,\
 	org.apache.felix.configadmin,\
@@ -48,7 +49,7 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
 	org.apache.ace.httplistener;version=latest,\
 	org.apache.ace.authentication.api;version=latest,\
 	org.apache.ace.connectionfactory;version=latest,\
-	org.apache.ace.scheduler;version=latest,\
+	org.apache.ace.scheduler.impl;version=latest,\
 	org.apache.ace.scheduler.api;version=latest,\
 	org.apache.ace.deployment.provider.api;version=latest,\
 	org.apache.ace.discovery.api;version=latest,\
@@ -61,9 +62,9 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
 	org.apache.ace.deployment.streamgenerator;version=latest,\
 	org.apache.ace.deployment.provider.base;version=latest,\
 	org.apache.ace.range.api;version=latest,\
-	org.apache.ace.log;version=latest,\
-	org.apache.ace.server.log.store.api;version=latest,\
-	org.apache.ace.server.log.store.filelogstore;version=latest,\
+	org.apache.ace.log.api;version=latest,\
+	org.apache.ace.log.server.store.api;version=latest,\
+	org.apache.ace.log.server.store.file;version=latest,\
 	org.apache.ace.repository.api;version=latest,\
 	org.apache.ace.repository.impl;version=latest,\
 	org.apache.ace.repository.servlet;version=latest,\

Modified: ace/trunk/org.apache.ace.client.rest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.rest/bnd.bnd?rev=1465922&r1=1465921&r2=1465922&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.rest/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.client.rest/bnd.bnd Tue Apr  9 08:12:33 2013
@@ -1,7 +1,7 @@
 -buildpath: osgi.core,\
 	osgi.cmpn,\
 	org.apache.felix.dependencymanager,\
-	org.apache.ace.log;version=latest,\
+	org.apache.ace.log.api;version=latest,\
 	org.apache.ace.connectionfactory;version=latest,\
 	org.apache.ace.authentication.api;version=latest,\
 	org.apache.ace.client.repository.api;version=latest,\

Modified: ace/trunk/org.apache.ace.configurator.useradmin.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.configurator.useradmin.itest/bnd.bnd?rev=1465922&r1=1465921&r2=1465922&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.configurator.useradmin.itest/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.configurator.useradmin.itest/bnd.bnd Tue Apr  9 08:12:33 2013
@@ -4,17 +4,18 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
 	osgi.cmpn,\
 	org.apache.felix.dependencymanager,\
 	org.apache.ace.test;version=latest,\
-	org.apache.ace.log;version=latest,\
+	org.apache.ace.log.api;version=latest,\
 	org.apache.ace.httplistener;version=latest,\
 	org.apache.ace.discovery.api;version=latest,\
 	org.apache.ace.discovery.property;version=latest,\
 	org.apache.ace.identification.api;version=latest,\
 	org.apache.ace.identification.property;version=latest,\
-	org.apache.ace.server.log.store.api;version=latest,\
+	org.apache.ace.log.server.store.api;version=latest,\
 	org.apache.ace.range.api;version=latest,\
 	org.apache.ace.repository.api;version=latest,\
 	org.apache.ace.repository.impl;version=latest
 -runfw: org.apache.felix.framework;version='[4,5)'
+-runvm: -ea
 -runbundles: \
 	org.apache.felix.dependencymanager,\
 	org.apache.felix.configadmin,\
@@ -32,7 +33,7 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
 	org.apache.ace.resourceprocessor.useradmin;version=latest,\
 	org.apache.ace.repository.api;version=latest,\
 	org.apache.ace.connectionfactory;version=latest,\
-	org.apache.ace.scheduler;version=latest,\
+	org.apache.ace.scheduler.impl;version=latest,\
 	org.apache.ace.repository.impl;version=latest,\
 	org.apache.ace.repository.servlet;version=latest,\
 	org.apache.ace.configurator.useradmin.task;version=latest

Modified: ace/trunk/org.apache.ace.deployment.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.deployment.itest/bnd.bnd?rev=1465922&r1=1465921&r2=1465922&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.deployment.itest/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.deployment.itest/bnd.bnd Tue Apr  9 08:12:33 2013
@@ -5,19 +5,20 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
 	javax.servlet,\
 	org.apache.felix.dependencymanager,\
 	org.apache.ace.test;version=latest,\
-	org.apache.ace.log;version=latest,\
+	org.apache.ace.log.api;version=latest,\
 	org.apache.ace.httplistener;version=latest,\
 	org.apache.ace.discovery.api;version=latest,\
 	org.apache.ace.discovery.property;version=latest,\
 	org.apache.ace.identification.api;version=latest,\
 	org.apache.ace.identification.property;version=latest,\
-	org.apache.ace.server.log.store.api;version=latest,\
+	org.apache.ace.log.server.store.api;version=latest,\
 	org.apache.ace.scheduler.api;version=latest,\
 	org.apache.ace.deployment.servlet;version=latest,\
 	org.apache.ace.deployment.provider.api;version=latest,\
 	org.apache.ace.deployment.provider.filebased;version=latest,\
 	org.apache.ace.deployment.util.test;version=latest
 -runfw: org.apache.felix.framework;version='[4,5)'
+-runvm: -ea
 -runbundles: \
 	osgi.cmpn,\
 	org.apache.felix.dependencymanager,\
@@ -32,7 +33,7 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
 	org.apache.ace.httplistener;version=latest,\
 	org.apache.ace.authentication.api;version=latest,\
 	org.apache.ace.connectionfactory;version=latest,\
-	org.apache.ace.scheduler;version=latest,\
+	org.apache.ace.scheduler.impl;version=latest,\
 	org.apache.ace.scheduler.api;version=latest,\
 	org.apache.ace.deployment.provider.api;version=latest,\
 	org.apache.ace.deployment.provider.filebased;version=latest,\
@@ -48,5 +49,5 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
 	org.apache.ace.deployment.streamgenerator;version=latest,\
 	org.apache.ace.deployment.provider.base;version=latest,\
 	org.apache.ace.test;version=latest
-Private-Package: org.apache.ace.it.deployment
+Private-Package: org.apache.ace.it.deployment, org.apache.ace.deployment.util.test
 Bundle-Version: 1.0.0
\ No newline at end of file

Modified: ace/trunk/org.apache.ace.deployment/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.deployment/bnd.bnd?rev=1465922&r1=1465921&r2=1465922&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.deployment/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.deployment/bnd.bnd Tue Apr  9 08:12:33 2013
@@ -14,5 +14,6 @@
 	org.apache.ace.repository.api;version=latest,\
 	org.apache.ace.repository.ext;version=latest,\
 	org.apache.ace.scheduler.api;version=latest,\
+	org.apache.ace.test;version=latest,\
 	org.apache.ace.range.api;version=latest
 -sub: *.bnd

Added: ace/trunk/org.apache.ace.deployment/provider.repositorybased.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.deployment/provider.repositorybased.bnd?rev=1465922&view=auto
==============================================================================
--- ace/trunk/org.apache.ace.deployment/provider.repositorybased.bnd (added)
+++ ace/trunk/org.apache.ace.deployment/provider.repositorybased.bnd Tue Apr  9 08:12:33 2013
@@ -0,0 +1,6 @@
+Private-Package: org.apache.ace.deployment.provider.repositorybased,\
+	org.apache.ace.deployment.provider.impl,\
+	org.apache.ace.repository.ext,\
+	org.apache.ace.repository.ext.impl
+Bundle-Activator: org.apache.ace.deployment.provider.repositorybased.Activator
+Bundle-Version: 1.0.0

Modified: ace/trunk/org.apache.ace.http.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.http.itest/bnd.bnd?rev=1465922&r1=1465921&r2=1465922&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.http.itest/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.http.itest/bnd.bnd Tue Apr  9 08:12:33 2013
@@ -4,15 +4,16 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
 	osgi.cmpn,\
 	org.apache.felix.dependencymanager,\
 	org.apache.ace.test;version=latest,\
-	org.apache.ace.log;version=latest,\
+	org.apache.ace.log.api;version=latest,\
 	org.apache.ace.httplistener;version=latest,\
 	org.apache.ace.discovery.api;version=latest,\
 	org.apache.ace.discovery.property;version=latest,\
 	org.apache.ace.identification.api;version=latest,\
 	org.apache.ace.identification.property;version=latest,\
-	org.apache.ace.server.log.store.api;version=latest,\
+	org.apache.ace.log.server.store.api;version=latest,\
 	javax.servlet
 -runfw: org.apache.felix.framework;version='[4,5)'
+-runvm: -ea
 -runbundles: osgi.cmpn,\
 	org.apache.felix.eventadmin,\
 	org.apache.felix.http.jetty,\

Modified: ace/trunk/org.apache.ace.log.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.log.itest/bnd.bnd?rev=1465922&r1=1465921&r2=1465922&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.log.itest/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.log.itest/bnd.bnd Tue Apr  9 08:12:33 2013
@@ -4,13 +4,13 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
 	osgi.cmpn,\
 	org.apache.felix.dependencymanager,\
 	org.apache.ace.test;version=latest,\
-	org.apache.ace.log;version=latest,\
+	org.apache.ace.log.api;version=latest,\
 	org.apache.ace.httplistener;version=latest,\
 	org.apache.ace.discovery.api;version=latest,\
 	org.apache.ace.discovery.property;version=latest,\
 	org.apache.ace.identification.api;version=latest,\
 	org.apache.ace.identification.property;version=latest,\
-	org.apache.ace.server.log.store.api;version=latest
+	org.apache.ace.log.server.store.api;version=latest
 -runfw: org.apache.felix.framework;version='[4,5)'
 -runbundles: \
 	javax.servlet,\
@@ -20,29 +20,29 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
 	org.apache.felix.http.jetty,\
 	org.apache.felix.dependencymanager.shell,\
 	org.apache.felix.eventadmin,\
-	org.apache.ace.identification.property;version=latest,\
-	org.apache.ace.test;version=latest,\
-	org.apache.ace.httplistener;version=latest,\
-	org.apache.ace.log.listener;version=latest,\
-	org.apache.ace.deployment.provider.api;version=latest,\
-	org.apache.ace.log.servlet;version=latest,\
-	org.apache.ace.gateway.log;version=latest,\
 	org.apache.ace.authentication.api;version=latest,\
-	org.apache.ace.discovery.api;version=latest,\
-	org.apache.ace.range.api;version=latest,\
-	org.apache.ace.discovery.property;version=latest,\
-	org.apache.ace.log.task;version=latest,\
-	org.apache.ace.log;version=latest,\
-	org.apache.ace.identification.api;version=latest,\
-	org.apache.ace.resourceprocessor.useradmin;version=latest,\
-	org.apache.ace.gateway.log.store;version=latest,\
 	org.apache.ace.authentication.processor.basicauth;version=latest,\
-	org.apache.ace.client.repository.helper.base;version=latest,\
-	org.apache.ace.repository.api;version=latest,\
 	org.apache.ace.client.repository.api;version=latest,\
+	org.apache.ace.client.repository.helper.base;version=latest,\
 	org.apache.ace.connectionfactory;version=latest,\
 	org.apache.ace.consolelogger;version=latest,\
-	org.apache.ace.server.log.store.api;version=latest,\
-	org.apache.ace.server.log.store.filelogstore;version=latest
+	org.apache.ace.deployment.provider.api;version=latest,\
+	org.apache.ace.discovery.api;version=latest,\
+	org.apache.ace.discovery.property;version=latest,\
+	org.apache.ace.log.target.store.impl;version=latest,\
+	org.apache.ace.log.target;version=latest,\
+	org.apache.ace.httplistener;version=latest,\
+	org.apache.ace.identification.api;version=latest,\
+	org.apache.ace.identification.property;version=latest,\
+	org.apache.ace.log.api;version=latest,\
+	org.apache.ace.log.listener;version=latest,\
+	org.apache.ace.log.server.store.api;version=latest,\
+	org.apache.ace.log.server.store.file;version=latest,\
+	org.apache.ace.log.server.servlet;version=latest,\
+	org.apache.ace.log.server.task;version=latest,\
+	org.apache.ace.range.api;version=latest,\
+	org.apache.ace.repository.api;version=latest,\
+	org.apache.ace.resourceprocessor.useradmin;version=latest,\
+	org.apache.ace.test;version=latest
 Private-Package: org.apache.ace.it.log
 Bundle-Version: 1.0.0

Modified: ace/trunk/org.apache.ace.log.itest/src/org/apache/ace/it/log/LogIntegrationTest.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.log.itest/src/org/apache/ace/it/log/LogIntegrationTest.java?rev=1465922&r1=1465921&r2=1465922&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.log.itest/src/org/apache/ace/it/log/LogIntegrationTest.java (original)
+++ ace/trunk/org.apache.ace.log.itest/src/org/apache/ace/it/log/LogIntegrationTest.java Tue Apr  9 08:12:33 2013
@@ -33,7 +33,7 @@ import org.apache.ace.it.IntegrationTest
 import org.apache.ace.log.Log;
 import org.apache.ace.log.LogDescriptor;
 import org.apache.ace.log.LogEvent;
-import org.apache.ace.server.log.store.LogStore;
+import org.apache.ace.log.server.store.LogStore;
 import org.apache.ace.test.constants.TestConstants;
 import org.apache.felix.dm.Component;
 import org.osgi.framework.Constants;

Added: ace/trunk/org.apache.ace.log.server.store.itest/.classpath
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.log.server.store.itest/.classpath?rev=1465922&view=auto
==============================================================================
--- ace/trunk/org.apache.ace.log.server.store.itest/.classpath (added)
+++ ace/trunk/org.apache.ace.log.server.store.itest/.classpath Tue Apr  9 08:12:33 2013
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

Added: ace/trunk/org.apache.ace.log.server.store.itest/.project
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.log.server.store.itest/.project?rev=1465922&view=auto
==============================================================================
--- ace/trunk/org.apache.ace.log.server.store.itest/.project (added)
+++ ace/trunk/org.apache.ace.log.server.store.itest/.project Tue Apr  9 08:12:33 2013
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.apache.ace.log.server.store.itest</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>bndtools.core.bndbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>bndtools.core.bndnature</nature>
+	</natures>
+</projectDescription>

Added: ace/trunk/org.apache.ace.log.server.store.itest/.settings/org.eclipse.jdt.core.prefs
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.log.server.store.itest/.settings/org.eclipse.jdt.core.prefs?rev=1465922&view=auto
==============================================================================
--- ace/trunk/org.apache.ace.log.server.store.itest/.settings/org.eclipse.jdt.core.prefs (added)
+++ ace/trunk/org.apache.ace.log.server.store.itest/.settings/org.eclipse.jdt.core.prefs Tue Apr  9 08:12:33 2013
@@ -0,0 +1,11 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6

Added: ace/trunk/org.apache.ace.log.server.store.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.log.server.store.itest/bnd.bnd?rev=1465922&view=auto
==============================================================================
--- ace/trunk/org.apache.ace.log.server.store.itest/bnd.bnd (added)
+++ ace/trunk/org.apache.ace.log.server.store.itest/bnd.bnd Tue Apr  9 08:12:33 2013
@@ -0,0 +1,34 @@
+Test-Cases: ${classes;CONCRETE;EXTENDS;org.apache.ace.it.IntegrationTestBase}
+-runbundles: org.apache.ace.deployment.provider.api;version=latest,\
+	org.apache.felix.dependencymanager,\
+	org.apache.felix.gogo.command,\
+	org.apache.felix.gogo.runtime,\
+	org.apache.felix.gogo.shell,\
+	org.apache.felix.metatype,\
+	org.apache.felix.log,\
+	org.apache.felix.configadmin,\
+	org.apache.felix.eventadmin,\
+	org.apache.felix.dependencymanager.shell,\
+	com.mongodb,\
+	org.amdatu.mongo,\
+	org.apache.ace.log.api;version=latest,\
+	org.apache.ace.log.server.store.api;version=latest,\
+	org.apache.ace.log.server.store.mongo;version=latest,\
+	org.apache.ace.range.api;version=latest,\
+	org.apache.ace.test;version=latest
+Private-Package: org.apache.ace.server.log.store.tests
+-runvm: -ea
+-runfw: org.apache.felix.framework;version='[4,5)'
+-buildpath: \
+	osgi.core,\
+	osgi.cmpn,\
+	junit.osgi,\
+	com.mongodb,\
+	org.amdatu.mongo,\
+	org.mockito.mockito-all,\
+	org.apache.felix.dependencymanager,\
+	org.apache.ace.range.api;version=latest,\
+	org.apache.ace.test;version=latest,\
+	org.apache.ace.log.api;version=latest,\
+	org.apache.ace.log.server.store.api;version=latest
+-runsystempackages: sun.reflect

Added: ace/trunk/org.apache.ace.log.server.store.itest/build.xml
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.log.server.store.itest/build.xml?rev=1465922&view=auto
==============================================================================
--- ace/trunk/org.apache.ace.log.server.store.itest/build.xml (added)
+++ ace/trunk/org.apache.ace.log.server.store.itest/build.xml Tue Apr  9 08:12:33 2013
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="project" default="build"> 
+	<import file="../cnf/build.xml"/>
+</project>

Added: ace/trunk/org.apache.ace.log.server.store.itest/src/org/apache/ace/server/log/store/tests/MongoLogStoreTest.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.log.server.store.itest/src/org/apache/ace/server/log/store/tests/MongoLogStoreTest.java?rev=1465922&view=auto
==============================================================================
--- ace/trunk/org.apache.ace.log.server.store.itest/src/org/apache/ace/server/log/store/tests/MongoLogStoreTest.java (added)
+++ ace/trunk/org.apache.ace.log.server.store.itest/src/org/apache/ace/server/log/store/tests/MongoLogStoreTest.java Tue Apr  9 08:12:33 2013
@@ -0,0 +1,199 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.server.log.store.tests;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Properties;
+import java.util.concurrent.TimeUnit;
+
+import org.amdatu.mongo.MongoDBService;
+import org.apache.ace.it.IntegrationTestBase;
+import org.apache.ace.log.LogDescriptor;
+import org.apache.ace.log.LogEvent;
+import org.apache.ace.log.server.store.LogStore;
+import org.apache.felix.dm.Component;
+import org.osgi.service.log.LogService;
+
+import com.mongodb.BasicDBObject;
+import com.mongodb.DBCollection;
+import com.mongodb.MongoException;
+
+public class MongoLogStoreTest extends IntegrationTestBase {
+	private volatile LogStore m_logStore;
+	private volatile MongoDBService m_mongodbService;
+
+	@Override
+	protected void before() throws Exception {
+		configureFactory("org.amdatu.mongo", "dbName", "ace");
+		configureFactory("org.apache.ace.server.log.store.factory", "name", "serverlog");
+		super.before();
+	}
+
+	protected org.apache.felix.dm.Component[] getDependencies() {
+		return new Component[] { createComponent().setImplementation(this)
+				.add(createServiceDependency().setService(LogStore.class).setRequired(true))
+				.add(createServiceDependency().setService(MongoDBService.class).setRequired(true)) };
+	}
+
+	public void testPutEvents() throws Exception {
+
+		try {
+			DBCollection collection = m_mongodbService.getDB().getCollection("serverlog");
+			collection.remove(new BasicDBObject());
+			TimeUnit.SECONDS.sleep(2);
+
+			storeEvents();
+			collection = m_mongodbService.getDB().getCollection("serverlog");
+			assertEquals(5, collection.count());
+		} catch (MongoException ex) {
+			System.err.println("Mongodb not available on localhost, skipping test");
+		}
+	}
+
+	public void testGetEvents() throws Exception {
+		try {
+			DBCollection collection = m_mongodbService.getDB().getCollection("serverlog");
+			collection.remove(new BasicDBObject());
+			TimeUnit.SECONDS.sleep(2);
+
+			storeEvents();
+
+			List<LogEvent> events = m_logStore.get(new LogDescriptor("mytarget1,1,0"));
+			assertEquals(3, events.size());
+		} catch (MongoException ex) {
+			System.err.println("Mongodb not available on localhost, skipping test");
+		}
+	}
+
+	public void testGetEventsWithRange() throws Exception {
+		try {
+			DBCollection collection = m_mongodbService.getDB().getCollection("serverlog");
+			collection.remove(new BasicDBObject());
+			TimeUnit.SECONDS.sleep(2);
+
+			storeEvents();
+
+			List<LogEvent> events = m_logStore.get(new LogDescriptor("mytarget1,1,2"));
+			assertEquals(2, events.size());
+		} catch (Exception ex) {
+			System.err.println("Mongodb not available on localhost, skipping test");
+		}
+	}
+
+	public void testGetDescriptorsSingleLogId() throws Exception {
+		try {
+			DBCollection collection = m_mongodbService.getDB().getCollection("serverlog");
+			collection.remove(new BasicDBObject());
+			TimeUnit.SECONDS.sleep(2);
+
+			storeEvents();
+
+			List<LogDescriptor> descriptors = m_logStore.getDescriptors();
+			assertEquals(2, descriptors.size());
+			assertEquals("mytarget1", descriptors.get(0).getTargetID());
+			assertEquals(1, descriptors.get(0).getLogID());
+			assertEquals(4, descriptors.get(0).getRangeSet().getHigh());
+			assertEquals("mytarget2", descriptors.get(1).getTargetID());
+			assertEquals(1, descriptors.get(1).getLogID());
+			assertEquals(5, descriptors.get(1).getRangeSet().getHigh());
+		} catch (MongoException ex) {
+			System.err.println("Mongodb not available on localhost, skipping test");
+		}
+
+	}
+
+	public void testGetDescriptorsMultipleLogIds() throws Exception {
+		try {
+			DBCollection collection = m_mongodbService.getDB().getCollection("serverlog");
+			collection.remove(new BasicDBObject());
+			TimeUnit.SECONDS.sleep(2);
+
+			storeEvents();
+
+			Properties props = new Properties();
+			props.setProperty("myProperty", "myvalue");
+
+			LogEvent event1 = new LogEvent("mytarget1", 2, 1, System.currentTimeMillis(), LogService.LOG_ERROR, props);
+			LogEvent event2 = new LogEvent("mytarget1", 2, 2, System.currentTimeMillis(), LogService.LOG_ERROR, props);
+
+			m_logStore.put(Arrays.asList(event1, event2));
+
+			List<LogDescriptor> descriptors = m_logStore.getDescriptors();
+			assertEquals(3, descriptors.size());
+			assertEquals("mytarget1", descriptors.get(0).getTargetID());
+			assertEquals(1, descriptors.get(0).getLogID());
+			assertEquals(4, descriptors.get(0).getRangeSet().getHigh());
+
+			assertEquals("mytarget1", descriptors.get(1).getTargetID());
+			assertEquals(2, descriptors.get(1).getLogID());
+			assertEquals(2, descriptors.get(1).getRangeSet().getHigh());
+
+			assertEquals("mytarget2", descriptors.get(2).getTargetID());
+			assertEquals(1, descriptors.get(2).getLogID());
+			assertEquals(5, descriptors.get(2).getRangeSet().getHigh());
+		} catch (MongoException ex) {
+			System.err.println("Mongodb not available on localhost, skipping test");
+		}
+	}
+
+	public void testGetDescriptorsForTarget() throws Exception {
+		try {
+			DBCollection collection = m_mongodbService.getDB().getCollection("serverlog");
+			collection.remove(new BasicDBObject());
+			TimeUnit.SECONDS.sleep(2);
+
+			storeEvents();
+
+			Properties props = new Properties();
+			props.setProperty("myProperty", "myvalue");
+
+			LogEvent event1 = new LogEvent("mytarget1", 2, 1, System.currentTimeMillis(), LogService.LOG_ERROR, props);
+			LogEvent event2 = new LogEvent("mytarget1", 2, 2, System.currentTimeMillis(), LogService.LOG_ERROR, props);
+
+			m_logStore.put(Arrays.asList(event1, event2));
+
+			List<LogDescriptor> descriptors = m_logStore.getDescriptors("mytarget1");
+			assertEquals(2, descriptors.size());
+			assertEquals("mytarget1", descriptors.get(0).getTargetID());
+			assertEquals(1, descriptors.get(0).getLogID());
+			assertEquals(4, descriptors.get(0).getRangeSet().getHigh());
+
+			assertEquals("mytarget1", descriptors.get(1).getTargetID());
+			assertEquals(2, descriptors.get(1).getLogID());
+			assertEquals(2, descriptors.get(1).getRangeSet().getHigh());
+		} catch (MongoException ex) {
+			System.err.println("Mongodb not available on localhost, skipping test");
+		}
+	}
+
+	private void storeEvents() throws IOException {
+		Properties props = new Properties();
+		props.setProperty("myProperty", "myvalue");
+		LogEvent event1 = new LogEvent("mytarget1", 1, 1, System.currentTimeMillis(), LogService.LOG_ERROR, props);
+		LogEvent event2 = new LogEvent("mytarget1", 1, 2, System.currentTimeMillis(), LogService.LOG_ERROR, props);
+		LogEvent event3 = new LogEvent("mytarget2", 1, 3, System.currentTimeMillis(), LogService.LOG_ERROR, props);
+		LogEvent event4 = new LogEvent("mytarget2", 1, 5, System.currentTimeMillis(), LogService.LOG_ERROR, props);
+		LogEvent event5 = new LogEvent("mytarget1", 1, 4, System.currentTimeMillis(), LogService.LOG_ERROR, props);
+
+		m_logStore.put(Arrays.asList(event1, event2, event3, event4, event5));
+	}
+
+}

Added: ace/trunk/org.apache.ace.log.server.ui/.classpath
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.log.server.ui/.classpath?rev=1465922&view=auto
==============================================================================
--- ace/trunk/org.apache.ace.log.server.ui/.classpath (added)
+++ ace/trunk/org.apache.ace.log.server.ui/.classpath Tue Apr  9 08:12:33 2013
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

Added: ace/trunk/org.apache.ace.log.server.ui/.project
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.log.server.ui/.project?rev=1465922&view=auto
==============================================================================
--- ace/trunk/org.apache.ace.log.server.ui/.project (added)
+++ ace/trunk/org.apache.ace.log.server.ui/.project Tue Apr  9 08:12:33 2013
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.apache.ace.log.server.ui</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>bndtools.core.bndbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>bndtools.core.bndnature</nature>
+	</natures>
+</projectDescription>

Added: ace/trunk/org.apache.ace.log.server.ui/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.log.server.ui/bnd.bnd?rev=1465922&view=auto
==============================================================================
--- ace/trunk/org.apache.ace.log.server.ui/bnd.bnd (added)
+++ ace/trunk/org.apache.ace.log.server.ui/bnd.bnd Tue Apr  9 08:12:33 2013
@@ -0,0 +1,11 @@
+-buildpath: osgi.core,\
+	osgi.cmpn,\
+	org.apache.felix.dependencymanager,\
+	org.apache.ace.log.api;version=latest,\
+	org.apache.ace.client.repository.api;version=latest,\
+	org.apache.ace.log.server.store.api;version=latest,\
+	com.vaadin;version=latest,\
+	org.apache.ace.webui.vaadin;version=latest
+Private-Package: org.apache.ace.log.server.ui
+Bundle-Activator: org.apache.ace.log.server.ui.Activator
+Bundle-Version: 1.0.0
\ No newline at end of file

Added: ace/trunk/org.apache.ace.log.server.ui/build.xml
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.log.server.ui/build.xml?rev=1465922&view=auto
==============================================================================
--- ace/trunk/org.apache.ace.log.server.ui/build.xml (added)
+++ ace/trunk/org.apache.ace.log.server.ui/build.xml Tue Apr  9 08:12:33 2013
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="project" default="build"> 
+	<import file="../cnf/build.xml"/>
+</project>

Added: ace/trunk/org.apache.ace.log.server.ui/src/org/apache/ace/log/server/ui/Activator.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.log.server.ui/src/org/apache/ace/log/server/ui/Activator.java?rev=1465922&view=auto
==============================================================================
--- ace/trunk/org.apache.ace.log.server.ui/src/org/apache/ace/log/server/ui/Activator.java (added)
+++ ace/trunk/org.apache.ace.log.server.ui/src/org/apache/ace/log/server/ui/Activator.java Tue Apr  9 08:12:33 2013
@@ -0,0 +1,54 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.log.server.ui;
+
+import java.util.Properties;
+
+import org.apache.ace.log.server.store.LogStore;
+import org.apache.ace.webui.UIExtensionFactory;
+import org.apache.felix.dm.DependencyActivatorBase;
+import org.apache.felix.dm.DependencyManager;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.Constants;
+import org.osgi.service.log.LogService;
+
+public class Activator extends DependencyActivatorBase {
+
+    @Override
+    public void init(BundleContext context, DependencyManager manager) throws Exception {
+        Properties props = new Properties();
+        props.put(UIExtensionFactory.EXTENSION_POINT_KEY, UIExtensionFactory.EXTENSION_POINT_VALUE_TARGET);
+        props.put(Constants.SERVICE_RANKING, Integer.valueOf(10));
+        
+        manager.add(createComponent().setInterface(UIExtensionFactory.class.getName(), props)
+            .setImplementation(LogViewerExtension.class)
+            .add(createServiceDependency()
+                .setService(LogStore.class)
+                .setRequired(true))
+            .add(createServiceDependency()
+                .setService(LogService.class)
+                .setRequired(false))
+                );
+    }
+
+    @Override
+    public void destroy(BundleContext context, DependencyManager manager) throws Exception {
+        // Nop
+    }
+}

Added: ace/trunk/org.apache.ace.log.server.ui/src/org/apache/ace/log/server/ui/LogViewerExtension.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.log.server.ui/src/org/apache/ace/log/server/ui/LogViewerExtension.java?rev=1465922&view=auto
==============================================================================
--- ace/trunk/org.apache.ace.log.server.ui/src/org/apache/ace/log/server/ui/LogViewerExtension.java (added)
+++ ace/trunk/org.apache.ace.log.server.ui/src/org/apache/ace/log/server/ui/LogViewerExtension.java Tue Apr  9 08:12:33 2013
@@ -0,0 +1,286 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.log.server.ui;
+
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Dictionary;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ace.client.repository.RepositoryObject;
+import org.apache.ace.client.repository.object.TargetObject;
+import org.apache.ace.client.repository.stateful.StatefulTargetObject;
+import org.apache.ace.log.AuditEvent;
+import org.apache.ace.log.LogDescriptor;
+import org.apache.ace.log.LogEvent;
+import org.apache.ace.log.server.store.LogStore;
+import org.apache.ace.webui.NamedObject;
+import org.apache.ace.webui.UIExtensionFactory;
+import org.osgi.service.log.LogService;
+
+import com.vaadin.data.Container.Filterable;
+import com.vaadin.data.Property;
+import com.vaadin.data.util.filter.SimpleStringFilter;
+import com.vaadin.event.FieldEvents.TextChangeEvent;
+import com.vaadin.event.FieldEvents.TextChangeListener;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.TextArea;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.VerticalLayout;
+
+//import com.vaadin.data.util.
+
+/**
+ * Provides a simple AuditLog viewer for targets.
+ */
+public class LogViewerExtension implements UIExtensionFactory {
+
+    private static final String CAPTION = "LogViewer";
+
+    private static final String COL_TIME = "Time";
+    private static final String COL_TYPE = "Type";
+    private static final String COL_PROPERTIES = "Properties";
+
+    private static final String FILL_AREA = "100%";
+    private Table m_table;
+
+    private volatile LogStore m_store;
+    private volatile LogService m_logService;
+
+    /**
+     * contains a mapping of event type to a string representation of that type.
+     */
+    private final Map<Integer, String> m_eventTypeMapping = new HashMap<Integer, String>();
+
+    /**
+     * {@inheritDoc}
+     */
+    public Component create(Map<String, Object> context) {
+        RepositoryObject object = getRepositoryObjectFromContext(context);
+        if (object instanceof StatefulTargetObject
+            && !((StatefulTargetObject) object).isRegistered()) {
+            VerticalLayout result = new VerticalLayout();
+            result.setCaption(CAPTION);
+            result.addComponent(new Label(
+                "This target is not yet registered, so it has no log."));
+            return result;
+        }
+
+        m_table = new Table() {
+            @Override
+            protected String formatPropertyValue(Object rowId, Object colId, Property property) {
+                DateFormat formatter = SimpleDateFormat.getDateTimeInstance(DateFormat.DEFAULT, DateFormat.DEFAULT, getApplication().getLocale());
+                if (COL_TIME.equals(colId)) {
+                    return formatter.format(property.getValue());
+                }
+                return super.formatPropertyValue(rowId, colId, property);
+            }
+        };
+        m_table.setWidth(FILL_AREA);
+        m_table.setHeight(FILL_AREA);
+        m_table.addContainerProperty(COL_TIME, Date.class, null, "Time", null, null);
+        m_table.addContainerProperty(COL_TYPE, String.class, null, "Type", null, null);
+        m_table.addContainerProperty(COL_PROPERTIES, TextArea.class, null, "Properties", null, null);
+
+        m_table.setColumnExpandRatio(COL_PROPERTIES, 2);
+        m_table.setColumnExpandRatio(COL_TYPE, 1);
+        m_table.setColumnExpandRatio(COL_TIME, 1);
+        m_table.setColumnCollapsingAllowed(true);
+
+        try {
+            fillTable(object, m_table);
+            // Sort on time in descending order...
+            m_table.setSortAscending(false);
+            m_table.setSortContainerPropertyId(COL_TIME);
+        }
+        catch (IOException ex) {
+            m_logService.log(LogService.LOG_WARNING, "Log viewer failed!", ex);
+        }
+
+        TextField tf = makeTextField(COL_TYPE);
+        TextField pf = makeTextField(COL_PROPERTIES);
+
+        HorizontalLayout filters = new HorizontalLayout();
+        filters.setSpacing(true);
+        filters.addComponent(tf);
+        filters.addComponent(pf);
+
+        // main holds the two components:
+        VerticalLayout main = new VerticalLayout();
+        main.setCaption(CAPTION);
+        main.setSpacing(true);
+
+        main.addComponent(filters);
+        main.addComponent(m_table);
+        return main;
+    }
+
+    /**
+     * Returns a string representation of the given event's type.
+     * 
+     * @param event
+     *            the event to get the type for, cannot be <code>null</code>.
+     * @return a string representation of the event's type, never <code>null</code>.
+     */
+    final String getEventType(LogEvent event) {
+        if (m_eventTypeMapping.isEmpty()) {
+            // Lazily create a mapping of value -> name of all event-types...
+            for (Field f : AuditEvent.class.getFields()) {
+                if (((f.getModifiers() & Modifier.STATIC) != 0) && (f.getType() == Integer.TYPE)) {
+                    try {
+                        Integer value = (Integer) f.get(null);
+                        m_eventTypeMapping.put(value, normalize(f.getName()));
+                    }
+                    catch (IllegalAccessException e) {
+                        // Should not happen, as all fields are public on an
+                        // interface; otherwise we simply ignore this field...
+                        m_logService.log(LogService.LOG_DEBUG, "Failed to access public field of interface?!", e);
+                    }
+                }
+            }
+        }
+
+        String type = m_eventTypeMapping.get(event.getType());
+        if (type == null) {
+            type = Integer.toString(event.getType());
+        }
+
+        return type;
+    }
+
+    /**
+     * Creates a {@link TextArea} with a dump of the given event's properties.
+     * 
+     * @param event
+     *            the event to create a textarea for, cannot be <code>null</code>.
+     * @return a {@link TextArea} instance, never <code>null</code>.
+     */
+    final TextArea getProperties(LogEvent event) {
+        Dictionary props = event.getProperties();
+
+        TextArea area = new TextArea("", dumpProperties(props));
+        area.setWidth(FILL_AREA);
+        area.setRows(props.size());
+        area.setWordwrap(false);
+        area.setReadOnly(true);
+        area.setImmediate(true);
+        return area;
+    }
+
+    final Date getTime(LogEvent event) {
+        return new Date(event.getTime());
+    }
+
+    /**
+     * Dumps the given dictionary to a string by placing all key,value-pairs on a separate line.
+     * 
+     * @param dict
+     *            the dictionary to dump, may be <code>null</code>.
+     * @return a string dump of all properties in the given dictionary, never <code>null</code>.
+     */
+    private String dumpProperties(Dictionary dict) {
+        StringBuilder sb = new StringBuilder();
+        if (dict != null) {
+            Enumeration keys = dict.keys();
+            while (keys.hasMoreElements()) {
+                String key = keys.nextElement().toString();
+                String value = dict.get(key).toString();
+
+                if (sb.length() > 0) {
+                    sb.append("\n");
+                }
+                sb.append(key).append(": ").append(value);
+            }
+        }
+        return sb.toString();
+    }
+
+    /**
+     * Fills the table with all log entries for the given repository object.
+     * 
+     * @param object
+     *            the repository object to get the log for, cannot be <code>null</code>;
+     * @param table
+     *            the table to fill, cannot be <code>null</code>.
+     * @throws IOException
+     *             in case of I/O problems accessing the log store.
+     */
+    private void fillTable(RepositoryObject object, Table table) throws IOException {
+        String id = object.getAttribute(TargetObject.KEY_ID);
+        List<LogDescriptor> desc = m_store.getDescriptors(id);
+        if (desc != null) {
+            for (LogDescriptor log : desc) {
+                for (LogEvent event : m_store.get(log)) {
+                    table.addItem(new Object[] { getTime(event), getEventType(event), getProperties(event) }, null);
+                }
+            }
+        }
+    }
+
+    private RepositoryObject getRepositoryObjectFromContext(
+        Map<String, Object> context) {
+        Object contextObject = context.get("object");
+        if (contextObject == null) {
+            throw new IllegalStateException("No context object found");
+        }
+        // It looks like there is some bug (or some other reason that escapes
+        // me) why ace is using either the object directly or wraps it in a
+        // NamedObject first.
+        // Its unclear when it does which so for now we cater for both.
+        return (contextObject instanceof NamedObject ? ((NamedObject) contextObject)
+            .getObject() : (RepositoryObject) contextObject);
+    }
+
+    private TextField makeTextField(final String colType) {
+        TextField t = new TextField(colType);
+
+        t.addListener(new TextChangeListener() {
+            SimpleStringFilter filter = null;
+
+            public void textChange(TextChangeEvent event) {
+                Filterable f = (Filterable) m_table.getContainerDataSource();
+
+                // Remove old filter
+                if (filter != null) {
+                    f.removeContainerFilter(filter);
+                }
+                // Set new filter for the "Name" column
+                filter = new SimpleStringFilter(colType, event.getText(), true /* ignoreCase */, false /* onlyMatchPrefix */);
+
+                f.addContainerFilter(filter);
+            }
+        });
+
+        return t;
+    }
+    
+    private String normalize(String input) {
+        return input.toLowerCase().replaceAll("_", " ");
+    }
+}

Modified: ace/trunk/org.apache.ace.managementagent/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.managementagent/bnd.bnd?rev=1465922&r1=1465921&r2=1465922&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.managementagent/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.managementagent/bnd.bnd Tue Apr  9 08:12:33 2013
@@ -7,10 +7,10 @@
 	osgi.cmpn,\
 	org.apache.ace.connectionfactory;version=latest,\
 	org.apache.ace.consolelogger;version=latest,\
-	org.apache.ace.gateway.log;version=latest,\
-	org.apache.ace.gateway.log.store;version=latest,\
+	org.apache.ace.log.target;version=latest,\
+	org.apache.ace.log.target.store.impl;version=latest,\
 	org.apache.ace.range.api;version=latest,\
-	org.apache.ace.log;version=latest,\
+	org.apache.ace.log.api;version=latest,\
 	org.apache.ace.log.listener;version=latest,\
 	org.apache.ace.discovery.api;version=latest,\
 	org.apache.ace.discovery.property;version=latest,\

Modified: ace/trunk/org.apache.ace.managementagent/src/org/apache/ace/managementagent/Activator.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.managementagent/src/org/apache/ace/managementagent/Activator.java?rev=1465922&r1=1465921&r2=1465922&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.managementagent/src/org/apache/ace/managementagent/Activator.java (original)
+++ ace/trunk/org.apache.ace.managementagent/src/org/apache/ace/managementagent/Activator.java Tue Apr  9 08:12:33 2013
@@ -26,8 +26,8 @@ public class Activator extends Dependenc
         new org.apache.ace.deployment.task.Activator(),
         new org.apache.ace.discovery.property.Activator(),
         new org.apache.ace.connectionfactory.impl.Activator(),
-        new org.apache.ace.target.log.Activator(),
-        new org.apache.ace.target.log.store.impl.Activator(),
+        new org.apache.ace.log.target.Activator(),
+        new org.apache.ace.log.target.store.impl.Activator(),
         new org.apache.ace.identification.property.Activator(),
         new org.apache.ace.log.listener.Activator(),
         new org.apache.ace.scheduler.Activator(),

Modified: ace/trunk/org.apache.ace.repository.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.repository.itest/bnd.bnd?rev=1465922&r1=1465921&r2=1465922&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.repository.itest/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.repository.itest/bnd.bnd Tue Apr  9 08:12:33 2013
@@ -10,6 +10,7 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
 	org.apache.ace.repository.servlet;version=latest,\
 	org.apache.felix.dependencymanager		
 -runfw: org.apache.felix.framework;version='[4,5)'
+-runvm: -ea
 -runbundles: \
 	osgi.cmpn,\
 	org.apache.felix.log,\

Modified: ace/trunk/org.apache.ace.repository.itest/src/org/apache/ace/it/repository/RepositoryTest.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.repository.itest/src/org/apache/ace/it/repository/RepositoryTest.java?rev=1465922&r1=1465921&r2=1465922&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.repository.itest/src/org/apache/ace/it/repository/RepositoryTest.java (original)
+++ ace/trunk/org.apache.ace.repository.itest/src/org/apache/ace/it/repository/RepositoryTest.java Tue Apr  9 08:12:33 2013
@@ -25,6 +25,7 @@ import static org.apache.ace.it.reposito
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.net.ConnectException;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.util.Arrays;
@@ -53,7 +54,7 @@ public class RepositoryTest extends Inte
 	private volatile ConfigurationAdmin m_configAdmin;
 	
     private URL m_host;
-
+    
     public void testBadRequests() throws Exception {
         addRepository("testInstance", "apache", "test", false);
 
@@ -180,6 +181,8 @@ public class RepositoryTest extends Inte
                 HttpConstants.ENDPOINT, "/replication", "authentication.enabled", "false");
         configure("org.apache.ace.repository.servlet.RepositoryServlet",
                 HttpConstants.ENDPOINT, "/repository", "authentication.enabled", "false");
+
+        Utils.waitForWebserver(m_host);
     }
 
     protected Component[] getDependencies() {

Modified: ace/trunk/org.apache.ace.repository.itest/src/org/apache/ace/it/repository/Utils.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.repository.itest/src/org/apache/ace/it/repository/Utils.java?rev=1465922&r1=1465921&r2=1465922&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.repository.itest/src/org/apache/ace/it/repository/Utils.java (original)
+++ ace/trunk/org.apache.ace.repository.itest/src/org/apache/ace/it/repository/Utils.java Tue Apr  9 08:12:33 2013
@@ -22,18 +22,34 @@ package org.apache.ace.it.repository;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.net.ConnectException;
 import java.net.HttpURLConnection;
 import java.net.URL;
 
-/**
- * @author Jan Willem Janssen <janwillem.janssen@luminis.eu>
- *
- */
 final class Utils {
 	
     private static final int COPY_BUFFER_SIZE = 4096;
     private static final String MIME_APPLICATION_OCTET_STREAM = "application/octet-stream";           
-  
+
+    static void waitForWebserver(URL host) throws IOException {
+        int retries = 1;
+        IOException ioe = null;
+        while (retries++ < 10) {
+	        try {
+	        	((HttpURLConnection) host.openConnection()).getResponseCode();
+	        	return;
+	        }
+	        catch (ConnectException e) {
+	        	ioe = e;
+	        	try {
+	        		Thread.sleep(retries * 50);
+	        	}
+	        	catch (InterruptedException ie) {}
+	        }
+        }
+        throw ioe;
+    }
+    
     /* copy in to out */
     static void copy(InputStream in, OutputStream out) throws IOException {
         byte[] buffer = new byte[COPY_BUFFER_SIZE];

Added: ace/trunk/org.apache.ace.repository/.classpath
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.repository/.classpath?rev=1465922&view=auto
==============================================================================
--- ace/trunk/org.apache.ace.repository/.classpath (added)
+++ ace/trunk/org.apache.ace.repository/.classpath Tue Apr  9 08:12:33 2013
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" output="bin_test" path="test"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
+	<classpathentry kind="con" path="org.testng.TESTNG_CONTAINER"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

Added: ace/trunk/org.apache.ace.repository/.project
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.repository/.project?rev=1465922&view=auto
==============================================================================
--- ace/trunk/org.apache.ace.repository/.project (added)
+++ ace/trunk/org.apache.ace.repository/.project Tue Apr  9 08:12:33 2013
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.apache.ace.repository</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>bndtools.core.bndbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>bndtools.core.bndnature</nature>
+	</natures>
+</projectDescription>

Added: ace/trunk/org.apache.ace.repository/.settings/org.eclipse.jdt.core.prefs
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.repository/.settings/org.eclipse.jdt.core.prefs?rev=1465922&view=auto
==============================================================================
--- ace/trunk/org.apache.ace.repository/.settings/org.eclipse.jdt.core.prefs (added)
+++ ace/trunk/org.apache.ace.repository/.settings/org.eclipse.jdt.core.prefs Tue Apr  9 08:12:33 2013
@@ -0,0 +1,11 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6

Added: ace/trunk/org.apache.ace.repository/api.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.repository/api.bnd?rev=1465922&view=auto
==============================================================================
--- ace/trunk/org.apache.ace.repository/api.bnd (added)
+++ ace/trunk/org.apache.ace.repository/api.bnd Tue Apr  9 08:12:33 2013
@@ -0,0 +1,2 @@
+Export-Package: org.apache.ace.repository
+Bundle-Version: 1.0.0

Added: ace/trunk/org.apache.ace.repository/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.repository/bnd.bnd?rev=1465922&view=auto
==============================================================================
--- ace/trunk/org.apache.ace.repository/bnd.bnd (added)
+++ ace/trunk/org.apache.ace.repository/bnd.bnd Tue Apr  9 08:12:33 2013
@@ -0,0 +1,11 @@
+-buildpath: osgi.core,\
+	osgi.cmpn,\
+	org.apache.felix.dependencymanager,\
+	javax.servlet,\
+	org.apache.ace.range.api;version=latest,\
+	org.apache.ace.test;version=latest,\
+	org.apache.ace.authentication.api;version=latest,\
+	org.apache.ace.scheduler.api;version=latest,\
+	org.apache.ace.discovery.api;version=latest,\
+	org.apache.ace.connectionfactory;version=latest
+-sub: *.bnd
\ No newline at end of file

Added: ace/trunk/org.apache.ace.repository/build.xml
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.repository/build.xml?rev=1465922&view=auto
==============================================================================
--- ace/trunk/org.apache.ace.repository/build.xml (added)
+++ ace/trunk/org.apache.ace.repository/build.xml Tue Apr  9 08:12:33 2013
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="project" default="build">
+
+	<!-- -->
+
+	<import file="../cnf/build.xml" />
+</project>

Added: ace/trunk/org.apache.ace.repository/ext.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.repository/ext.bnd?rev=1465922&view=auto
==============================================================================
--- ace/trunk/org.apache.ace.repository/ext.bnd (added)
+++ ace/trunk/org.apache.ace.repository/ext.bnd Tue Apr  9 08:12:33 2013
@@ -0,0 +1,3 @@
+Export-Package: org.apache.ace.repository.ext,\
+	org.apache.ace.repository.ext.impl
+Bundle-Version: 1.0.0

Added: ace/trunk/org.apache.ace.repository/impl.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.repository/impl.bnd?rev=1465922&view=auto
==============================================================================
--- ace/trunk/org.apache.ace.repository/impl.bnd (added)
+++ ace/trunk/org.apache.ace.repository/impl.bnd Tue Apr  9 08:12:33 2013
@@ -0,0 +1,4 @@
+Private-Package: org.apache.ace.repository.impl,\
+	org.apache.ace.repository.impl.constants
+Bundle-Activator: org.apache.ace.repository.impl.Activator
+Bundle-Version: 1.0.0

Added: ace/trunk/org.apache.ace.repository/servlet.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.repository/servlet.bnd?rev=1465922&view=auto
==============================================================================
--- ace/trunk/org.apache.ace.repository/servlet.bnd (added)
+++ ace/trunk/org.apache.ace.repository/servlet.bnd Tue Apr  9 08:12:33 2013
@@ -0,0 +1,4 @@
+Private-Package: org.apache.ace.repository.servlet
+Bundle-Activator: org.apache.ace.repository.servlet.Activator
+Export-Package: org.apache.ace.repository.servlet
+Bundle-Version: 1.0.0

Added: ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/Repository.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/Repository.java?rev=1465922&view=auto
==============================================================================
--- ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/Repository.java (added)
+++ ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/Repository.java Tue Apr  9 08:12:33 2013
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.repository;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.apache.ace.range.SortedRangeSet;
+
+/**
+ * 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 java.io.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 java.io.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 java.io.IOException if there is an error reading the version
+     * @throws IllegalArgumentException if the version is invalid.
+     */
+    public InputStream checkout(long version) throws IOException, IllegalArgumentException;
+}
\ No newline at end of file



Mime
View raw message