commit | d69e8afd0d080ffbc54138f149a65c2af54396eb | [log] [tgz] |
---|---|---|
author | Karl Pauls <pauls@apache.org> | Sat Aug 12 09:51:20 2006 +0000 |
committer | Karl Pauls <pauls@apache.org> | Sat Aug 12 09:51:20 2006 +0000 |
tree | 318122b829e593484820135b40eaff27d1def454 | |
parent | 0454ef10507284bf966a99fb25e31cc03d092cd8 [diff] |
Shortened directory names for the eventadmin and related subprojects. git-svn-id: https://svn.apache.org/repos/asf/incubator/felix/trunk@431004 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/org.apache.felix.eventadmin.bridge.configuration/pom.xml b/eventadmin.bridge.configuration/pom.xml similarity index 100% rename from org.apache.felix.eventadmin.bridge.configuration/pom.xml rename to eventadmin.bridge.configuration/pom.xml
diff --git a/org.apache.felix.eventadmin.bridge.configuration/src/main/java/org/apache/felix/eventadmin/bridge/configuration/Activator.java b/eventadmin.bridge.configuration/src/main/java/org/apache/felix/eventadmin/bridge/configuration/Activator.java similarity index 100% rename from org.apache.felix.eventadmin.bridge.configuration/src/main/java/org/apache/felix/eventadmin/bridge/configuration/Activator.java rename to eventadmin.bridge.configuration/src/main/java/org/apache/felix/eventadmin/bridge/configuration/Activator.java
diff --git a/org.apache.felix.eventadmin.bridge.configuration/src/main/java/org/apache/felix/eventadmin/bridge/configuration/ConfigurationEventToEventAdminBridge.java b/eventadmin.bridge.configuration/src/main/java/org/apache/felix/eventadmin/bridge/configuration/ConfigurationEventToEventAdminBridge.java similarity index 100% rename from org.apache.felix.eventadmin.bridge.configuration/src/main/java/org/apache/felix/eventadmin/bridge/configuration/ConfigurationEventToEventAdminBridge.java rename to eventadmin.bridge.configuration/src/main/java/org/apache/felix/eventadmin/bridge/configuration/ConfigurationEventToEventAdminBridge.java
diff --git a/org.apache.felix.eventadmin.bridge.upnp/pom.xml b/eventadmin.bridge.upnp/pom.xml similarity index 100% rename from org.apache.felix.eventadmin.bridge.upnp/pom.xml rename to eventadmin.bridge.upnp/pom.xml
diff --git a/org.apache.felix.eventadmin.bridge.upnp/src/main/java/org/apache/felix/eventadmin/bridge/upnp/Activator.java b/eventadmin.bridge.upnp/src/main/java/org/apache/felix/eventadmin/bridge/upnp/Activator.java similarity index 100% rename from org.apache.felix.eventadmin.bridge.upnp/src/main/java/org/apache/felix/eventadmin/bridge/upnp/Activator.java rename to eventadmin.bridge.upnp/src/main/java/org/apache/felix/eventadmin/bridge/upnp/Activator.java
diff --git a/org.apache.felix.eventadmin.bridge.upnp/src/main/java/org/apache/felix/eventadmin/bridge/upnp/UPnPEventToEventAdminBridge.java b/eventadmin.bridge.upnp/src/main/java/org/apache/felix/eventadmin/bridge/upnp/UPnPEventToEventAdminBridge.java similarity index 100% rename from org.apache.felix.eventadmin.bridge.upnp/src/main/java/org/apache/felix/eventadmin/bridge/upnp/UPnPEventToEventAdminBridge.java rename to eventadmin.bridge.upnp/src/main/java/org/apache/felix/eventadmin/bridge/upnp/UPnPEventToEventAdminBridge.java
diff --git a/org.apache.felix.eventadmin.bridge.useradmin/pom.xml b/eventadmin.bridge.useradmin/pom.xml similarity index 100% rename from org.apache.felix.eventadmin.bridge.useradmin/pom.xml rename to eventadmin.bridge.useradmin/pom.xml
diff --git a/org.apache.felix.eventadmin.bridge.useradmin/src/main/java/org/apache/felix/eventadmin/bridge/useradmin/Activator.java b/eventadmin.bridge.useradmin/src/main/java/org/apache/felix/eventadmin/bridge/useradmin/Activator.java similarity index 100% rename from org.apache.felix.eventadmin.bridge.useradmin/src/main/java/org/apache/felix/eventadmin/bridge/useradmin/Activator.java rename to eventadmin.bridge.useradmin/src/main/java/org/apache/felix/eventadmin/bridge/useradmin/Activator.java
diff --git a/org.apache.felix.eventadmin.bridge.useradmin/src/main/java/org/apache/felix/eventadmin/bridge/useradmin/UserAdminEventToEventAdminBridge.java b/eventadmin.bridge.useradmin/src/main/java/org/apache/felix/eventadmin/bridge/useradmin/UserAdminEventToEventAdminBridge.java similarity index 100% rename from org.apache.felix.eventadmin.bridge.useradmin/src/main/java/org/apache/felix/eventadmin/bridge/useradmin/UserAdminEventToEventAdminBridge.java rename to eventadmin.bridge.useradmin/src/main/java/org/apache/felix/eventadmin/bridge/useradmin/UserAdminEventToEventAdminBridge.java
diff --git a/org.apache.felix.eventadmin.bridge.wireadmin/pom.xml b/eventadmin.bridge.wireadmin/pom.xml similarity index 100% rename from org.apache.felix.eventadmin.bridge.wireadmin/pom.xml rename to eventadmin.bridge.wireadmin/pom.xml
diff --git a/org.apache.felix.eventadmin.bridge.wireadmin/src/main/java/org/apache/felix/eventadmin/bridge/wireadmin/Activator.java b/eventadmin.bridge.wireadmin/src/main/java/org/apache/felix/eventadmin/bridge/wireadmin/Activator.java similarity index 100% rename from org.apache.felix.eventadmin.bridge.wireadmin/src/main/java/org/apache/felix/eventadmin/bridge/wireadmin/Activator.java rename to eventadmin.bridge.wireadmin/src/main/java/org/apache/felix/eventadmin/bridge/wireadmin/Activator.java
diff --git a/org.apache.felix.eventadmin.bridge.wireadmin/src/main/java/org/apache/felix/eventadmin/bridge/wireadmin/WireAdminEventToEventAdminBridge.java b/eventadmin.bridge.wireadmin/src/main/java/org/apache/felix/eventadmin/bridge/wireadmin/WireAdminEventToEventAdminBridge.java similarity index 100% rename from org.apache.felix.eventadmin.bridge.wireadmin/src/main/java/org/apache/felix/eventadmin/bridge/wireadmin/WireAdminEventToEventAdminBridge.java rename to eventadmin.bridge.wireadmin/src/main/java/org/apache/felix/eventadmin/bridge/wireadmin/WireAdminEventToEventAdminBridge.java
diff --git a/org.apache.felix.eventadmin/pom.xml b/eventadmin/pom.xml similarity index 100% rename from org.apache.felix.eventadmin/pom.xml rename to eventadmin/pom.xml
diff --git a/org.apache.felix.eventadmin/src/main/java/org/apache/felix/eventadmin/impl/Activator.java b/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/Activator.java similarity index 100% rename from org.apache.felix.eventadmin/src/main/java/org/apache/felix/eventadmin/impl/Activator.java rename to eventadmin/src/main/java/org/apache/felix/eventadmin/impl/Activator.java
diff --git a/org.apache.felix.eventadmin/src/main/java/org/apache/felix/eventadmin/impl/EventAdminImpl.java b/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/EventAdminImpl.java similarity index 100% rename from org.apache.felix.eventadmin/src/main/java/org/apache/felix/eventadmin/impl/EventAdminImpl.java rename to eventadmin/src/main/java/org/apache/felix/eventadmin/impl/EventAdminImpl.java
diff --git a/org.apache.felix.eventadmin/src/main/java/org/apache/felix/eventadmin/impl/adapter/BundleEventAdapter.java b/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/adapter/BundleEventAdapter.java similarity index 100% rename from org.apache.felix.eventadmin/src/main/java/org/apache/felix/eventadmin/impl/adapter/BundleEventAdapter.java rename to eventadmin/src/main/java/org/apache/felix/eventadmin/impl/adapter/BundleEventAdapter.java
diff --git a/org.apache.felix.eventadmin/src/main/java/org/apache/felix/eventadmin/impl/adapter/FrameworkEventAdapter.java b/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/adapter/FrameworkEventAdapter.java similarity index 100% rename from org.apache.felix.eventadmin/src/main/java/org/apache/felix/eventadmin/impl/adapter/FrameworkEventAdapter.java rename to eventadmin/src/main/java/org/apache/felix/eventadmin/impl/adapter/FrameworkEventAdapter.java
diff --git a/org.apache.felix.eventadmin/src/main/java/org/apache/felix/eventadmin/impl/adapter/LogEventAdapter.java b/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/adapter/LogEventAdapter.java similarity index 100% rename from org.apache.felix.eventadmin/src/main/java/org/apache/felix/eventadmin/impl/adapter/LogEventAdapter.java rename to eventadmin/src/main/java/org/apache/felix/eventadmin/impl/adapter/LogEventAdapter.java
diff --git a/org.apache.felix.eventadmin/src/main/java/org/apache/felix/eventadmin/impl/adapter/ServiceEventAdapter.java b/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/adapter/ServiceEventAdapter.java similarity index 100% rename from org.apache.felix.eventadmin/src/main/java/org/apache/felix/eventadmin/impl/adapter/ServiceEventAdapter.java rename to eventadmin/src/main/java/org/apache/felix/eventadmin/impl/adapter/ServiceEventAdapter.java
diff --git a/org.apache.felix.eventadmin/src/main/java/org/apache/felix/eventadmin/impl/dispatch/CacheThreadPool.java b/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/dispatch/CacheThreadPool.java similarity index 100% rename from org.apache.felix.eventadmin/src/main/java/org/apache/felix/eventadmin/impl/dispatch/CacheThreadPool.java rename to eventadmin/src/main/java/org/apache/felix/eventadmin/impl/dispatch/CacheThreadPool.java
diff --git a/org.apache.felix.eventadmin/src/main/java/org/apache/felix/eventadmin/impl/dispatch/DelayScheduler.java b/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/dispatch/DelayScheduler.java similarity index 100% rename from org.apache.felix.eventadmin/src/main/java/org/apache/felix/eventadmin/impl/dispatch/DelayScheduler.java rename to eventadmin/src/main/java/org/apache/felix/eventadmin/impl/dispatch/DelayScheduler.java
diff --git a/org.apache.felix.eventadmin/src/main/java/org/apache/felix/eventadmin/impl/dispatch/Scheduler.java b/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/dispatch/Scheduler.java similarity index 100% rename from org.apache.felix.eventadmin/src/main/java/org/apache/felix/eventadmin/impl/dispatch/Scheduler.java rename to eventadmin/src/main/java/org/apache/felix/eventadmin/impl/dispatch/Scheduler.java
diff --git a/org.apache.felix.eventadmin/src/main/java/org/apache/felix/eventadmin/impl/dispatch/TaskHandler.java b/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/dispatch/TaskHandler.java similarity index 100% rename from org.apache.felix.eventadmin/src/main/java/org/apache/felix/eventadmin/impl/dispatch/TaskHandler.java rename to eventadmin/src/main/java/org/apache/felix/eventadmin/impl/dispatch/TaskHandler.java
diff --git a/org.apache.felix.eventadmin/src/main/java/org/apache/felix/eventadmin/impl/dispatch/TaskProducer.java b/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/dispatch/TaskProducer.java similarity index 100% rename from org.apache.felix.eventadmin/src/main/java/org/apache/felix/eventadmin/impl/dispatch/TaskProducer.java rename to eventadmin/src/main/java/org/apache/felix/eventadmin/impl/dispatch/TaskProducer.java
diff --git a/org.apache.felix.eventadmin/src/main/java/org/apache/felix/eventadmin/impl/dispatch/TaskQueue.java b/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/dispatch/TaskQueue.java similarity index 100% rename from org.apache.felix.eventadmin/src/main/java/org/apache/felix/eventadmin/impl/dispatch/TaskQueue.java rename to eventadmin/src/main/java/org/apache/felix/eventadmin/impl/dispatch/TaskQueue.java
diff --git a/org.apache.felix.eventadmin/src/main/java/org/apache/felix/eventadmin/impl/dispatch/ThreadPool.java b/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/dispatch/ThreadPool.java similarity index 100% rename from org.apache.felix.eventadmin/src/main/java/org/apache/felix/eventadmin/impl/dispatch/ThreadPool.java rename to eventadmin/src/main/java/org/apache/felix/eventadmin/impl/dispatch/ThreadPool.java
diff --git a/org.apache.felix.eventadmin/src/main/java/org/apache/felix/eventadmin/impl/handler/BlackList.java b/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/handler/BlackList.java similarity index 100% rename from org.apache.felix.eventadmin/src/main/java/org/apache/felix/eventadmin/impl/handler/BlackList.java rename to eventadmin/src/main/java/org/apache/felix/eventadmin/impl/handler/BlackList.java
diff --git a/org.apache.felix.eventadmin/src/main/java/org/apache/felix/eventadmin/impl/handler/BlacklistingHandlerTasks.java b/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/handler/BlacklistingHandlerTasks.java similarity index 100% rename from org.apache.felix.eventadmin/src/main/java/org/apache/felix/eventadmin/impl/handler/BlacklistingHandlerTasks.java rename to eventadmin/src/main/java/org/apache/felix/eventadmin/impl/handler/BlacklistingHandlerTasks.java
diff --git a/org.apache.felix.eventadmin/src/main/java/org/apache/felix/eventadmin/impl/handler/CacheFilters.java b/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/handler/CacheFilters.java similarity index 100% rename from org.apache.felix.eventadmin/src/main/java/org/apache/felix/eventadmin/impl/handler/CacheFilters.java rename to eventadmin/src/main/java/org/apache/felix/eventadmin/impl/handler/CacheFilters.java
diff --git a/org.apache.felix.eventadmin/src/main/java/org/apache/felix/eventadmin/impl/handler/CacheTopicHandlerFilters.java b/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/handler/CacheTopicHandlerFilters.java similarity index 100% rename from org.apache.felix.eventadmin/src/main/java/org/apache/felix/eventadmin/impl/handler/CacheTopicHandlerFilters.java rename to eventadmin/src/main/java/org/apache/felix/eventadmin/impl/handler/CacheTopicHandlerFilters.java
diff --git a/org.apache.felix.eventadmin/src/main/java/org/apache/felix/eventadmin/impl/handler/CleanBlackList.java b/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/handler/CleanBlackList.java similarity index 100% rename from org.apache.felix.eventadmin/src/main/java/org/apache/felix/eventadmin/impl/handler/CleanBlackList.java rename to eventadmin/src/main/java/org/apache/felix/eventadmin/impl/handler/CleanBlackList.java
diff --git a/org.apache.felix.eventadmin/src/main/java/org/apache/felix/eventadmin/impl/handler/Filters.java b/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/handler/Filters.java similarity index 100% rename from org.apache.felix.eventadmin/src/main/java/org/apache/felix/eventadmin/impl/handler/Filters.java rename to eventadmin/src/main/java/org/apache/felix/eventadmin/impl/handler/Filters.java
diff --git a/org.apache.felix.eventadmin/src/main/java/org/apache/felix/eventadmin/impl/handler/HandlerTasks.java b/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/handler/HandlerTasks.java similarity index 100% rename from org.apache.felix.eventadmin/src/main/java/org/apache/felix/eventadmin/impl/handler/HandlerTasks.java rename to eventadmin/src/main/java/org/apache/felix/eventadmin/impl/handler/HandlerTasks.java
diff --git a/org.apache.felix.eventadmin/src/main/java/org/apache/felix/eventadmin/impl/handler/TopicHandlerFilters.java b/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/handler/TopicHandlerFilters.java similarity index 100% rename from org.apache.felix.eventadmin/src/main/java/org/apache/felix/eventadmin/impl/handler/TopicHandlerFilters.java rename to eventadmin/src/main/java/org/apache/felix/eventadmin/impl/handler/TopicHandlerFilters.java
diff --git a/org.apache.felix.eventadmin/src/main/java/org/apache/felix/eventadmin/impl/security/CacheTopicPermissions.java b/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/security/CacheTopicPermissions.java similarity index 100% rename from org.apache.felix.eventadmin/src/main/java/org/apache/felix/eventadmin/impl/security/CacheTopicPermissions.java rename to eventadmin/src/main/java/org/apache/felix/eventadmin/impl/security/CacheTopicPermissions.java
diff --git a/org.apache.felix.eventadmin/src/main/java/org/apache/felix/eventadmin/impl/security/EventAdminSecurityDecorator.java b/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/security/EventAdminSecurityDecorator.java similarity index 100% rename from org.apache.felix.eventadmin/src/main/java/org/apache/felix/eventadmin/impl/security/EventAdminSecurityDecorator.java rename to eventadmin/src/main/java/org/apache/felix/eventadmin/impl/security/EventAdminSecurityDecorator.java
diff --git a/org.apache.felix.eventadmin/src/main/java/org/apache/felix/eventadmin/impl/security/SecureEventAdminFactory.java b/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/security/SecureEventAdminFactory.java similarity index 100% rename from org.apache.felix.eventadmin/src/main/java/org/apache/felix/eventadmin/impl/security/SecureEventAdminFactory.java rename to eventadmin/src/main/java/org/apache/felix/eventadmin/impl/security/SecureEventAdminFactory.java
diff --git a/org.apache.felix.eventadmin/src/main/java/org/apache/felix/eventadmin/impl/security/TopicPermissions.java b/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/security/TopicPermissions.java similarity index 100% rename from org.apache.felix.eventadmin/src/main/java/org/apache/felix/eventadmin/impl/security/TopicPermissions.java rename to eventadmin/src/main/java/org/apache/felix/eventadmin/impl/security/TopicPermissions.java
diff --git a/org.apache.felix.eventadmin/src/main/java/org/apache/felix/eventadmin/impl/tasks/AsyncDeliverTasks.java b/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/tasks/AsyncDeliverTasks.java similarity index 100% rename from org.apache.felix.eventadmin/src/main/java/org/apache/felix/eventadmin/impl/tasks/AsyncDeliverTasks.java rename to eventadmin/src/main/java/org/apache/felix/eventadmin/impl/tasks/AsyncDeliverTasks.java
diff --git a/org.apache.felix.eventadmin/src/main/java/org/apache/felix/eventadmin/impl/tasks/BlockTask.java b/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/tasks/BlockTask.java similarity index 100% rename from org.apache.felix.eventadmin/src/main/java/org/apache/felix/eventadmin/impl/tasks/BlockTask.java rename to eventadmin/src/main/java/org/apache/felix/eventadmin/impl/tasks/BlockTask.java
diff --git a/org.apache.felix.eventadmin/src/main/java/org/apache/felix/eventadmin/impl/tasks/DeliverTask.java b/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/tasks/DeliverTask.java similarity index 100% rename from org.apache.felix.eventadmin/src/main/java/org/apache/felix/eventadmin/impl/tasks/DeliverTask.java rename to eventadmin/src/main/java/org/apache/felix/eventadmin/impl/tasks/DeliverTask.java
diff --git a/org.apache.felix.eventadmin/src/main/java/org/apache/felix/eventadmin/impl/tasks/DeliverTasks.java b/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/tasks/DeliverTasks.java similarity index 100% rename from org.apache.felix.eventadmin/src/main/java/org/apache/felix/eventadmin/impl/tasks/DeliverTasks.java rename to eventadmin/src/main/java/org/apache/felix/eventadmin/impl/tasks/DeliverTasks.java
diff --git a/org.apache.felix.eventadmin/src/main/java/org/apache/felix/eventadmin/impl/tasks/DispatchTask.java b/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/tasks/DispatchTask.java similarity index 100% rename from org.apache.felix.eventadmin/src/main/java/org/apache/felix/eventadmin/impl/tasks/DispatchTask.java rename to eventadmin/src/main/java/org/apache/felix/eventadmin/impl/tasks/DispatchTask.java
diff --git a/org.apache.felix.eventadmin/src/main/java/org/apache/felix/eventadmin/impl/tasks/HandlerTask.java b/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/tasks/HandlerTask.java similarity index 100% rename from org.apache.felix.eventadmin/src/main/java/org/apache/felix/eventadmin/impl/tasks/HandlerTask.java rename to eventadmin/src/main/java/org/apache/felix/eventadmin/impl/tasks/HandlerTask.java
diff --git a/org.apache.felix.eventadmin/src/main/java/org/apache/felix/eventadmin/impl/tasks/HandlerTaskImpl.java b/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/tasks/HandlerTaskImpl.java similarity index 100% rename from org.apache.felix.eventadmin/src/main/java/org/apache/felix/eventadmin/impl/tasks/HandlerTaskImpl.java rename to eventadmin/src/main/java/org/apache/felix/eventadmin/impl/tasks/HandlerTaskImpl.java
diff --git a/org.apache.felix.eventadmin/src/main/java/org/apache/felix/eventadmin/impl/tasks/HandoverTask.java b/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/tasks/HandoverTask.java similarity index 100% rename from org.apache.felix.eventadmin/src/main/java/org/apache/felix/eventadmin/impl/tasks/HandoverTask.java rename to eventadmin/src/main/java/org/apache/felix/eventadmin/impl/tasks/HandoverTask.java
diff --git a/org.apache.felix.eventadmin/src/main/java/org/apache/felix/eventadmin/impl/tasks/ResumeTask.java b/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/tasks/ResumeTask.java similarity index 100% rename from org.apache.felix.eventadmin/src/main/java/org/apache/felix/eventadmin/impl/tasks/ResumeTask.java rename to eventadmin/src/main/java/org/apache/felix/eventadmin/impl/tasks/ResumeTask.java
diff --git a/org.apache.felix.eventadmin/src/main/java/org/apache/felix/eventadmin/impl/tasks/SyncDeliverTasks.java b/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/tasks/SyncDeliverTasks.java similarity index 100% rename from org.apache.felix.eventadmin/src/main/java/org/apache/felix/eventadmin/impl/tasks/SyncDeliverTasks.java rename to eventadmin/src/main/java/org/apache/felix/eventadmin/impl/tasks/SyncDeliverTasks.java
diff --git a/org.apache.felix.eventadmin/src/main/java/org/apache/felix/eventadmin/impl/util/CacheMap.java b/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/util/CacheMap.java similarity index 100% rename from org.apache.felix.eventadmin/src/main/java/org/apache/felix/eventadmin/impl/util/CacheMap.java rename to eventadmin/src/main/java/org/apache/felix/eventadmin/impl/util/CacheMap.java
diff --git a/org.apache.felix.eventadmin/src/main/java/org/apache/felix/eventadmin/impl/util/LeastRecentlyUsedCacheMap.java b/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/util/LeastRecentlyUsedCacheMap.java similarity index 100% rename from org.apache.felix.eventadmin/src/main/java/org/apache/felix/eventadmin/impl/util/LeastRecentlyUsedCacheMap.java rename to eventadmin/src/main/java/org/apache/felix/eventadmin/impl/util/LeastRecentlyUsedCacheMap.java
diff --git a/org.apache.felix.eventadmin/src/main/java/org/apache/felix/eventadmin/impl/util/LogWrapper.java b/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/util/LogWrapper.java similarity index 100% rename from org.apache.felix.eventadmin/src/main/java/org/apache/felix/eventadmin/impl/util/LogWrapper.java rename to eventadmin/src/main/java/org/apache/felix/eventadmin/impl/util/LogWrapper.java
diff --git a/pom.xml b/pom.xml index 7f4ec30..aea7c7f 100644 --- a/pom.xml +++ b/pom.xml
@@ -1,130 +1,130 @@ -<project> - <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.felix</groupId> - <artifactId>felix</artifactId> - <packaging>pom</packaging> - <name>Apache Felix (parent)</name> - <version>0.8.0-SNAPSHOT</version> - <modules> - <module>tools/maven2/maven-osgi-plugin</module> - <module>javax.servlet</module> - <module>org.osgi.core</module> - <module>org.osgi.compendium</module> - <module>framework</module> - <module>shell</module> - <module>shell.tui</module> - <module>shell.gui</module> - <module>shell.gui.plugin</module> - <module>bundlerepository</module> - <module>org.apache.felix.daemon</module> - <module>org.apache.felix.dependencymanager</module> - <module>main</module> - - <module>examples</module> - - <module>servicebinder</module> - <module>wireadmin</module> - <module>upnp.extra</module> - <module>upnp.basedriver</module> - <module>upnp.tester</module> - <module>upnp.sample.tv</module> - <module>upnp.sample.clock</module> - <module>upnp.sample.binaryLight</module> - <module>http.jetty</module> - <module>scr</module> - <module>org.apache.felix.eventadmin</module> - <module>org.apache.felix.eventadmin.bridge.upnp</module> - <module>org.apache.felix.eventadmin.bridge.configuration</module> - <module>org.apache.felix.eventadmin.bridge.useradmin</module> - <module>org.apache.felix.eventadmin.bridge.wireadmin</module> - <module>ipojo</module> - <module>ipojo.metadata</module> - <module>ipojo.plugin</module> - <module>ipojo.arch</module> - </modules> - - <repositories> - <!-- For snapshots (no release jars or non-apache jars) --> - <repository> - <id>apache.snapshots</id> - <name>Apache Snapshot Repository</name> - <url>http://cvs.apache.org/maven-snapshot-repository</url> - </repository> - - <repository> - <id>safehaus</id> - <name>Alternate Repository for Missing Ibiblio Artifacts</name> - <url>http://m2.safehaus.org</url> - </repository> - </repositories> - - <distributionManagement> - <snapshotRepository> - <name>Apache Snapshots</name> - <id>apache.snapshots</id> - <url> - scp://apache.org/www/cvs.apache.org/maven-snapshot-repository - </url> - </snapshotRepository> - <repository> - <name>ASF Mirrored M2 Distributions</name> - <id>apache.distributions</id> - <url> - scp://minotaur.apache.org/www/www.apache.org/dist/maven-repository - </url> - </repository> - </distributionManagement> - - <pluginRepositories> - <pluginRepository> - <id>apache.snapshots</id> - <name>snapshot plugins</name> - <url> - http://cvs.apache.org/maven-snapshot-repository - </url> - </pluginRepository> - </pluginRepositories> - - <!-- definitions for testing --> - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>easymock</groupId> - <artifactId>easymock</artifactId> - <version>1.2_Java1.3</version> - <scope>test</scope> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.4</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-report-plugin</artifactId> - </plugin> - </plugins> - </build> - <reporting> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-project-info-reports-plugin</artifactId> - </plugin> - </plugins> - </reporting> -</project> +<project> + <modelVersion>4.0.0</modelVersion> + <groupId>org.apache.felix</groupId> + <artifactId>felix</artifactId> + <packaging>pom</packaging> + <name>Apache Felix (parent)</name> + <version>0.8.0-SNAPSHOT</version> + <modules> + <module>tools/maven2/maven-osgi-plugin</module> + <module>javax.servlet</module> + <module>org.osgi.core</module> + <module>org.osgi.compendium</module> + <module>framework</module> + <module>shell</module> + <module>shell.tui</module> + <module>shell.gui</module> + <module>shell.gui.plugin</module> + <module>bundlerepository</module> + <module>org.apache.felix.daemon</module> + <module>org.apache.felix.dependencymanager</module> + <module>main</module> + + <module>examples</module> + + <module>servicebinder</module> + <module>wireadmin</module> + <module>upnp.extra</module> + <module>upnp.basedriver</module> + <module>upnp.tester</module> + <module>upnp.sample.tv</module> + <module>upnp.sample.clock</module> + <module>upnp.sample.binaryLight</module> + <module>http.jetty</module> + <module>scr</module> + <module>eventadmin</module> + <module>eventadmin.bridge.upnp</module> + <module>eventadmin.bridge.configuration</module> + <module>eventadmin.bridge.useradmin</module> + <module>eventadmin.bridge.wireadmin</module> + <module>ipojo</module> + <module>ipojo.metadata</module> + <module>ipojo.plugin</module> + <module>ipojo.arch</module> + </modules> + + <repositories> + <!-- For snapshots (no release jars or non-apache jars) --> + <repository> + <id>apache.snapshots</id> + <name>Apache Snapshot Repository</name> + <url>http://cvs.apache.org/maven-snapshot-repository</url> + </repository> + + <repository> + <id>safehaus</id> + <name>Alternate Repository for Missing Ibiblio Artifacts</name> + <url>http://m2.safehaus.org</url> + </repository> + </repositories> + + <distributionManagement> + <snapshotRepository> + <name>Apache Snapshots</name> + <id>apache.snapshots</id> + <url> + scp://apache.org/www/cvs.apache.org/maven-snapshot-repository + </url> + </snapshotRepository> + <repository> + <name>ASF Mirrored M2 Distributions</name> + <id>apache.distributions</id> + <url> + scp://minotaur.apache.org/www/www.apache.org/dist/maven-repository + </url> + </repository> + </distributionManagement> + + <pluginRepositories> + <pluginRepository> + <id>apache.snapshots</id> + <name>snapshot plugins</name> + <url> + http://cvs.apache.org/maven-snapshot-repository + </url> + </pluginRepository> + </pluginRepositories> + + <!-- definitions for testing --> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>easymock</groupId> + <artifactId>easymock</artifactId> + <version>1.2_Java1.3</version> + <scope>test</scope> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <target>1.4</target> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-report-plugin</artifactId> + </plugin> + </plugins> + </build> + <reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-project-info-reports-plugin</artifactId> + </plugin> + </plugins> + </reporting> +</project>