Author: clement
Date: Thu Dec 13 15:07:20 2012
New Revision: 1421329
URL: http://svn.apache.org/viewvc?rev=1421329&view=rev
Log:
Fix FELIX-3819 - The export directive of iPOJO is wrong
Added:
felix/trunk/ipojo/handler/eventadmin/src/main/java/org/apache/felix/ipojo/handlers/event/EventUtil.java
- copied, changed from r1421158,
felix/trunk/ipojo/handler/eventadmin/src/main/java/org/apache/felix/ipojo/handlers/event/publisher/EventUtil.java
Removed:
felix/trunk/ipojo/handler/eventadmin/src/main/java/org/apache/felix/ipojo/handlers/event/publisher/EventUtil.java
Modified:
felix/trunk/ipojo/handler/eventadmin/src/main/java/org/apache/felix/ipojo/handlers/event/publisher/EventAdminPublisherMetadata.java
felix/trunk/ipojo/handler/eventadmin/src/main/java/org/apache/felix/ipojo/handlers/event/subscriber/EventAdminSubscriberHandler.java
felix/trunk/ipojo/handler/eventadmin/src/main/java/org/apache/felix/ipojo/handlers/event/subscriber/EventAdminSubscriberMetadata.java
felix/trunk/ipojo/runtime/core/pom.xml
Copied:
felix/trunk/ipojo/handler/eventadmin/src/main/java/org/apache/felix/ipojo/handlers/event/EventUtil.java
(from r1421158,
felix/trunk/ipojo/handler/eventadmin/src/main/java/org/apache/felix/ipojo/handlers/event/publisher/EventUtil.java)
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/handler/eventadmin/src/main/java/org/apache/felix/ipojo/handlers/event/EventUtil.java?p2=felix/trunk/ipojo/handler/eventadmin/src/main/java/org/apache/felix/ipojo/handlers/event/EventUtil.java&p1=felix/trunk/ipojo/handler/eventadmin/src/main/java/org/apache/felix/ipojo/handlers/event/publisher/EventUtil.java&r1=1421158&r2=1421329&rev=1421329&view=diff
==============================================================================
---
felix/trunk/ipojo/handler/eventadmin/src/main/java/org/apache/felix/ipojo/handlers/event/publisher/EventUtil.java
(original)
+++
felix/trunk/ipojo/handler/eventadmin/src/main/java/org/apache/felix/ipojo/handlers/event/EventUtil.java
Thu Dec 13 15:07:20 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.ipojo.handlers.event.publisher;
+package org.apache.felix.ipojo.handlers.event;
import org.apache.felix.ipojo.parser.ParseUtils;
Modified:
felix/trunk/ipojo/handler/eventadmin/src/main/java/org/apache/felix/ipojo/handlers/event/publisher/EventAdminPublisherMetadata.java
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/handler/eventadmin/src/main/java/org/apache/felix/ipojo/handlers/event/publisher/EventAdminPublisherMetadata.java?rev=1421329&r1=1421328&r2=1421329&view=diff
==============================================================================
---
felix/trunk/ipojo/handler/eventadmin/src/main/java/org/apache/felix/ipojo/handlers/event/publisher/EventAdminPublisherMetadata.java
(original)
+++
felix/trunk/ipojo/handler/eventadmin/src/main/java/org/apache/felix/ipojo/handlers/event/publisher/EventAdminPublisherMetadata.java
Thu Dec 13 15:07:20 2012
@@ -19,6 +19,7 @@
package org.apache.felix.ipojo.handlers.event.publisher;
import org.apache.felix.ipojo.ConfigurationException;
+import org.apache.felix.ipojo.handlers.event.EventUtil;
import org.apache.felix.ipojo.metadata.Element;
import org.apache.felix.ipojo.parser.ParseUtils;
Modified:
felix/trunk/ipojo/handler/eventadmin/src/main/java/org/apache/felix/ipojo/handlers/event/subscriber/EventAdminSubscriberHandler.java
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/handler/eventadmin/src/main/java/org/apache/felix/ipojo/handlers/event/subscriber/EventAdminSubscriberHandler.java?rev=1421329&r1=1421328&r2=1421329&view=diff
==============================================================================
---
felix/trunk/ipojo/handler/eventadmin/src/main/java/org/apache/felix/ipojo/handlers/event/subscriber/EventAdminSubscriberHandler.java
(original)
+++
felix/trunk/ipojo/handler/eventadmin/src/main/java/org/apache/felix/ipojo/handlers/event/subscriber/EventAdminSubscriberHandler.java
Thu Dec 13 15:07:20 2012
@@ -18,25 +18,13 @@
*/
package org.apache.felix.ipojo.handlers.event.subscriber;
-import java.lang.reflect.InvocationTargetException;
-import java.util.Collection;
-import java.util.Dictionary;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import java.util.TreeSet;
-
import org.apache.felix.ipojo.ConfigurationException;
import org.apache.felix.ipojo.InstanceManager;
import org.apache.felix.ipojo.PrimitiveHandler;
import org.apache.felix.ipojo.architecture.ComponentTypeDescription;
import org.apache.felix.ipojo.architecture.HandlerDescription;
import org.apache.felix.ipojo.architecture.PropertyDescription;
-import org.apache.felix.ipojo.handlers.event.publisher.EventUtil;
+import org.apache.felix.ipojo.handlers.event.EventUtil;
import org.apache.felix.ipojo.metadata.Element;
import org.apache.felix.ipojo.parser.MethodMetadata;
import org.apache.felix.ipojo.parser.PojoMetadata;
@@ -45,6 +33,9 @@ import org.osgi.framework.Filter;
import org.osgi.service.event.Event;
import org.osgi.service.event.EventHandler;
+import java.lang.reflect.InvocationTargetException;
+import java.util.*;
+
/**
* Event Subscriber Handler.
*
Modified:
felix/trunk/ipojo/handler/eventadmin/src/main/java/org/apache/felix/ipojo/handlers/event/subscriber/EventAdminSubscriberMetadata.java
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/handler/eventadmin/src/main/java/org/apache/felix/ipojo/handlers/event/subscriber/EventAdminSubscriberMetadata.java?rev=1421329&r1=1421328&r2=1421329&view=diff
==============================================================================
---
felix/trunk/ipojo/handler/eventadmin/src/main/java/org/apache/felix/ipojo/handlers/event/subscriber/EventAdminSubscriberMetadata.java
(original)
+++
felix/trunk/ipojo/handler/eventadmin/src/main/java/org/apache/felix/ipojo/handlers/event/subscriber/EventAdminSubscriberMetadata.java
Thu Dec 13 15:07:20 2012
@@ -19,7 +19,7 @@
package org.apache.felix.ipojo.handlers.event.subscriber;
import org.apache.felix.ipojo.ConfigurationException;
-import org.apache.felix.ipojo.handlers.event.publisher.EventUtil;
+import org.apache.felix.ipojo.handlers.event.EventUtil;
import org.apache.felix.ipojo.metadata.Element;
import org.apache.felix.ipojo.parser.ParseUtils;
import org.osgi.framework.BundleContext;
Modified: felix/trunk/ipojo/runtime/core/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core/pom.xml?rev=1421329&r1=1421328&r2=1421329&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core/pom.xml (original)
+++ felix/trunk/ipojo/runtime/core/pom.xml Thu Dec 13 15:07:20 2012
@@ -154,9 +154,10 @@
org.apache.felix.ipojo.handlers.configuration;
version="${ipojo.package.version}",
org.apache.felix.ipojo.context;
version="${ipojo.package.version}",
<!-- Embedded manipulator -->
- org.apache.felix.ipojo.manipulator;
version="${ipojo.manipulator.version}",
+ org.apache.felix.ipojo.manipulation*;
version="${ipojo.manipulator.version}",
org.apache.felix.ipojo.xml.parser;
version="${ipojo.manipulator.version}",
- org.apache.felix.ipojo.*;
version="${ipojo.manipulator.version}",
+ org.apache.felix.ipojo.manipulator*;
version="${ipojo.manipulator.version}",
+ org.apache.felix.ipojo.annotations*;
version="${ipojo.package.version}",
<!-- Compendium packages -->
org.osgi.service.cm,
org.osgi.service.log
