Change the structure of the iPOJO project.
Handlers are now in a separate directory (handler).

Update the iPOJO pom file to refer on the moved projects.
Update some artifactId to be consistent.

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@679299 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/ipojo/handler/extender/LICENSE b/ipojo/handler/extender/LICENSE
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/ipojo/handler/extender/LICENSE
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed 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.
diff --git a/ipojo/handler/extender/NOTICE b/ipojo/handler/extender/NOTICE
new file mode 100644
index 0000000..f80d474
--- /dev/null
+++ b/ipojo/handler/extender/NOTICE
@@ -0,0 +1,23 @@
+Apache Felix iPOJO Extender Pattern Handler
+Copyright 2008 The Apache Software Foundation
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+This product includes software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright 2006 The OSGi Alliance.
+Licensed under the Apache License 2.0.
+
+II. Used Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright 2006 The OSGi Alliance.
+Licensed under the Apache License 2.0.
+
+III. License Summary
+- Apache License 2.0
diff --git a/ipojo/handler/extender/doc/changelog.txt b/ipojo/handler/extender/doc/changelog.txt
new file mode 100644
index 0000000..8ca4f32
--- /dev/null
+++ b/ipojo/handler/extender/doc/changelog.txt
@@ -0,0 +1,3 @@
+Version 0.8.0

+-------------

+* [2008-05-16] Initial release
\ No newline at end of file
diff --git a/ipojo/handler/extender/metadata.xml b/ipojo/handler/extender/metadata.xml
new file mode 100644
index 0000000..68c4aa0
--- /dev/null
+++ b/ipojo/handler/extender/metadata.xml
@@ -0,0 +1,24 @@
+<!--

+	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.

+-->

+<ipojo>

+	<handler

+		classname="org.apache.felix.ipojo.handler.extender.ExtenderModelHandler"

+		name="extender" namespace="org.apache.felix.ipojo.extender">

+	</handler>

+</ipojo>
\ No newline at end of file
diff --git a/ipojo/handler/extender/pom.xml b/ipojo/handler/extender/pom.xml
new file mode 100644
index 0000000..e48c6b3
--- /dev/null
+++ b/ipojo/handler/extender/pom.xml
@@ -0,0 +1,100 @@
+<!--

+	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.

+-->

+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

+	<parent>

+		<groupId>org.apache.felix</groupId>

+		<artifactId>felix</artifactId>

+		<version>1.0.2</version>

+		<relativePath>../../pom/pom.xml</relativePath>

+	</parent>

+	<modelVersion>4.0.0</modelVersion>

+	<packaging>bundle</packaging>

+	<name>Apache Felix iPOJO Extender Pattern Handler</name>

+	<artifactId>

+		org.apache.felix.ipojo.handler.extender

+	</artifactId>

+	<groupId>org.apache.felix</groupId>

+	<version>0.9.0-SNAPSHOT</version>

+

+	<dependencies>

+		<dependency>

+			<groupId>org.apache.felix</groupId>

+			<artifactId>org.apache.felix.ipojo</artifactId>

+			<version>0.9.0-SNAPSHOT</version>

+		</dependency>

+		<dependency>

+			<groupId>org.apache.felix</groupId>

+			<artifactId>org.apache.felix.ipojo.metadata</artifactId>

+			<version>0.9.0-SNAPSHOT</version>

+		</dependency>

+		<dependency>

+			<groupId>org.apache.felix</groupId>

+			<artifactId>org.osgi.core</artifactId>

+			<version>1.0.0</version>

+		</dependency>

+		<dependency>

+			<groupId>org.apache.felix</groupId>

+			<artifactId>org.osgi.compendium</artifactId>

+			<version>1.0.0</version>

+		</dependency>

+	</dependencies>

+

+	<build>

+		<plugins>

+			<plugin>

+				<groupId>org.apache.felix</groupId>

+				<artifactId>maven-bundle-plugin</artifactId>

+				<extensions>true</extensions>

+				<configuration>

+					<instructions>

+						<Bundle-Vendor>

+							The Apache Software Foundation

+						</Bundle-Vendor>

+						<Private-Package>

+							org.apache.felix.ipojo.handler.extender

+						</Private-Package>

+						<Bundle-Name>${pom.name}</Bundle-Name>

+						<Bundle-SymbolicName>

+							org.apache.felix.ipojo.handler.extender.pattern

+						</Bundle-SymbolicName>

+						<Include-Resource>

+							META-INF/LICENCE=LICENSE,

+							META-INF/NOTICE=NOTICE

+						</Include-Resource>

+					</instructions>

+				</configuration>

+			</plugin>

+			<plugin>

+				<groupId>org.apache.felix</groupId>

+				<artifactId>maven-ipojo-plugin</artifactId>

+				<version>0.9.0-SNAPSHOT</version>

+				<executions>

+					<execution>

+						<goals>

+							<goal>ipojo-bundle</goal>

+						</goals>

+						<configuration>

+							<metadata>metadata.xml</metadata>

+						</configuration>

+					</execution>

+				</executions>

+			</plugin>

+		</plugins>

+	</build>

+</project>

diff --git a/ipojo/handler/extender/src/main/java/org/apache/felix/ipojo/handler/extender/BundleTracker.java b/ipojo/handler/extender/src/main/java/org/apache/felix/ipojo/handler/extender/BundleTracker.java
new file mode 100644
index 0000000..a693023
--- /dev/null
+++ b/ipojo/handler/extender/src/main/java/org/apache/felix/ipojo/handler/extender/BundleTracker.java
@@ -0,0 +1,154 @@
+/* 

+ * 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.felix.ipojo.handler.extender;

+

+import java.util.HashSet;

+import java.util.Set;

+import org.osgi.framework.Bundle;

+import org.osgi.framework.BundleContext;

+import org.osgi.framework.BundleEvent;

+import org.osgi.framework.SynchronousBundleListener;

+

+/**

+ * This is a very simple bundle tracker utility class that tracks active

+ * bundles. The tracker must be given a bundle context upon creation,

+ * which it uses to listen for bundle events. The bundle tracker must be

+ * opened to track objects and closed when it is no longer needed. This

+ * class is abstract, which means in order to use it you must create a

+ * subclass of it. Subclasses must implement the <tt>addedBundle()</tt>

+ * and <tt>removedBundle()</tt> methods, which can be used to perform some

+ * custom action upon the activation or deactivation of bundles. Since this

+ * tracker is quite simple, its concurrency control approach is also

+ * simplistic. This means that subclasses should take great care to ensure

+ * that their <tt>addedBundle()</tt> and <tt>removedBundle()</tt> methods

+ * are very simple and do not do anything to change the state of any bundles.

+ * @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>

+ **/

+public abstract class BundleTracker {

+    /**

+     * Set of tracked bundles.

+     */

+    final Set m_bundleSet = new HashSet();

+

+    /**

+     * Bundle context.

+     */

+    final BundleContext m_context;

+

+    /**

+     * Synchronous bundle listener.

+     */

+    final SynchronousBundleListener m_listener;

+

+    /**

+     * Flag indicating if the tracking is open.

+     */

+    boolean m_open;

+

+    /**

+     * Constructs a bundle tracker object that will use the specified

+     * bundle context.

+     * @param context The bundle context to use to track bundles.

+     **/

+    public BundleTracker(BundleContext context) {

+        m_context = context;

+        m_listener = new SynchronousBundleListener() {

+            public void bundleChanged(BundleEvent evt) {

+                synchronized (BundleTracker.this) {

+                    if (!m_open) { return; }

+

+                    if (evt.getType() == BundleEvent.STARTED) {

+                        if (!m_bundleSet.contains(evt.getBundle())) {

+                            m_bundleSet.add(evt.getBundle());

+                            addedBundle(evt.getBundle());

+                        }

+                    } else if (evt.getType() == BundleEvent.STOPPED) {

+                        if (m_bundleSet.contains(evt.getBundle())) {

+                            m_bundleSet.remove(evt.getBundle());

+                            removedBundle(evt.getBundle());

+                        }

+                    }

+                }

+            }

+        };

+    }

+

+    /**

+     * Returns the current set of active bundles.

+     * @return The current set of active bundles.

+     **/

+    public synchronized Bundle[] getBundles() {

+        return (Bundle[]) m_bundleSet.toArray(new Bundle[m_bundleSet.size()]);

+    }

+

+    /**

+     * Call this method to start the tracking of active bundles.

+     **/

+    public synchronized void open() {

+        if (!m_open) {

+            m_open = true;

+

+            m_context.addBundleListener(m_listener);

+

+            Bundle[] bundles = m_context.getBundles();

+            for (int i = 0; i < bundles.length; i++) {

+                if (bundles[i].getState() == Bundle.ACTIVE) {

+                    m_bundleSet.add(bundles[i]);

+                    addedBundle(bundles[i]);

+                }

+            }

+        }

+    }

+

+    /**

+     * Call this method to stop the tracking of active bundles.

+     **/

+    public synchronized void close() {

+        if (m_open) {

+            m_open = false;

+

+            m_context.removeBundleListener(m_listener);

+

+            Bundle[] bundles = (Bundle[]) m_bundleSet.toArray(new Bundle[m_bundleSet.size()]);

+            for (int i = 0; i < bundles.length; i++) {

+                if (m_bundleSet.remove(bundles[i])) {

+                    removedBundle(bundles[i]);

+                }

+            }

+        }

+    }

+

+    /**

+     * Subclasses must implement this method; it can be used to perform

+     * actions upon the activation of a bundle. Subclasses should keep

+     * this method implementation as simple as possible and should not

+     * cause the change in any bundle state to avoid concurrency issues.

+     * @param bundle The bundle being added to the active set.

+     **/

+    protected abstract void addedBundle(Bundle bundle);

+

+    /**

+     * Subclasses must implement this method; it can be used to perform

+     * actions upon the deactivation of a bundle. Subclasses should keep

+     * this method implementation as simple as possible and should not

+     * cause the change in any bundle state to avoid concurrency issues.

+     * @param bundle The bundle being removed from the active set.

+     **/

+    protected abstract void removedBundle(Bundle bundle);

+}

diff --git a/ipojo/handler/extender/src/main/java/org/apache/felix/ipojo/handler/extender/ExtenderManager.java b/ipojo/handler/extender/src/main/java/org/apache/felix/ipojo/handler/extender/ExtenderManager.java
new file mode 100644
index 0000000..fe8cea3
--- /dev/null
+++ b/ipojo/handler/extender/src/main/java/org/apache/felix/ipojo/handler/extender/ExtenderManager.java
@@ -0,0 +1,135 @@
+/* 

+ * 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.felix.ipojo.handler.extender;

+

+import java.lang.reflect.InvocationTargetException;

+import java.util.Dictionary;

+import java.util.HashSet;

+import java.util.Set;

+

+import org.apache.felix.ipojo.PrimitiveHandler;

+import org.apache.felix.ipojo.util.Callback;

+import org.osgi.framework.Bundle;

+

+/**

+ * Track and manage extensions.

+ * @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>

+ */

+public class ExtenderManager extends BundleTracker {

+    

+    /**

+     * Looked extension.

+     */

+    private String m_extension;

+    

+    /**

+     * OnArrival method. 

+     */

+    private Callback m_onArrival;

+    

+    /**

+     * OnDeparture method. 

+     */

+    private Callback m_onDeparture;

+    

+    /**

+     * Attached handler. 

+     */

+    private PrimitiveHandler m_handler;

+    

+    /**

+     * Set of managed bundles.

+     */

+    private Set m_bundles = new HashSet();

+    

+    /**

+     * Constructor.

+     * @param handler : attached handler.

+     * @param extension : looked extension.

+     * @param bind : onArrival method

+     * @param unbind : onDeparture method.

+     */

+    public ExtenderManager(ExtenderModelHandler handler, String extension, String bind, String unbind) {

+        super(handler.getInstanceManager().getContext());

+        m_handler = handler;

+        m_onArrival = new Callback(bind, new Class[] {Bundle.class, String.class}, false, m_handler.getInstanceManager());

+        m_onDeparture = new Callback(unbind, new Class[] {Bundle.class}, false, m_handler.getInstanceManager());

+        m_extension = extension;

+    }

+

+

+    /**

+     * A bundle arrives.

+     * Checks if the bundle match with the looked extension, if so call the arrival callback.

+     * @param bundle : arriving bundle.

+     * @see org.apache.felix.ipojo.handler.extender.BundleTracker#addedBundle(org.osgi.framework.Bundle)

+     */

+    protected void addedBundle(Bundle bundle) {

+        Dictionary headers = bundle.getHeaders();

+        String header = (String) headers.get(m_extension);

+        if (header != null) {

+            synchronized (this) {

+                m_bundles.add(bundle);

+            }

+            try { // Call the callback outside the synchronized block.

+                m_onArrival.call(new Object[] {bundle, header});

+            } catch (NoSuchMethodException e) {

+                m_handler.error("The onArrival method " + m_onArrival.getMethod() + " does not exist in the class", e);

+                m_handler.getInstanceManager().stop();

+            } catch (IllegalAccessException e) {

+                m_handler.error("The onArrival method " + m_onArrival.getMethod() + " cannot be called", e);

+                m_handler.getInstanceManager().stop();

+            } catch (InvocationTargetException e) {

+                m_handler.error("The onArrival method " + m_onArrival.getMethod() + " has thrown an exception", e.getTargetException());

+                m_handler.getInstanceManager().stop();

+            }

+        }

+    }

+

+    /**

+     * A bundle is stopping.

+     * Check if the bundle was managed, if so call the remove departure callback.

+     * @param bundle : leaving bundle.

+     * @see org.apache.felix.ipojo.handler.extender.BundleTracker#removedBundle(org.osgi.framework.Bundle)

+     */

+    protected void removedBundle(Bundle bundle) {

+        boolean contained;

+        synchronized (this) {

+            contained = m_bundles.remove(bundle); // Stack confinement

+        }

+        

+        if (contained) {

+            try {

+                m_onDeparture.call(new Object[] {bundle});

+            } catch (NoSuchMethodException e) {

+                m_handler.error("The onDeparture method " + m_onDeparture.getMethod() + " does not exist in the class", e);

+                m_handler.getInstanceManager().stop();

+            } catch (IllegalAccessException e) {

+                m_handler.error("The onDeparture method " + m_onDeparture.getMethod() + " cannot be called", e);

+                m_handler.getInstanceManager().stop();

+            } catch (InvocationTargetException e) {

+                m_handler.error("The onDeparture method " + m_onDeparture.getMethod() + " has thrown an exception", e.getTargetException());

+                m_handler.getInstanceManager().stop();

+            }

+        }

+    }

+

+    

+

+}

diff --git a/ipojo/handler/extender/src/main/java/org/apache/felix/ipojo/handler/extender/ExtenderModelHandler.java b/ipojo/handler/extender/src/main/java/org/apache/felix/ipojo/handler/extender/ExtenderModelHandler.java
new file mode 100644
index 0000000..0f51828
--- /dev/null
+++ b/ipojo/handler/extender/src/main/java/org/apache/felix/ipojo/handler/extender/ExtenderModelHandler.java
@@ -0,0 +1,95 @@
+/* 

+ * 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.felix.ipojo.handler.extender;

+

+import java.util.ArrayList;

+import java.util.Dictionary;

+import java.util.List;

+

+import org.apache.felix.ipojo.ConfigurationException;

+import org.apache.felix.ipojo.PrimitiveHandler;

+import org.apache.felix.ipojo.metadata.Element;

+

+/**

+ * Handler automating extender pattern. The component using this handler is notified 

+ * when an handler with a special manifest extension is detected, the component is notified.

+ * When a managed handler leaves, the component is also notified.

+ * @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>

+ */

+public class ExtenderModelHandler extends PrimitiveHandler {

+    

+    /**

+     * Handler namespace.

+     */

+    public static final String NAMESPACE = "org.apache.felix.ipojo.extender";

+    

+    /**

+     * Extension manager list.

+     * Immutable once set.

+     */

+    private List m_managers = new ArrayList(1);

+

+    /**

+     * Configure method.

+     * @param elem : component type element.

+     * @param dict : instance configuration.

+     * @throws ConfigurationException : the configuration is not valid.

+     * @see org.apache.felix.ipojo.Handler#configure(org.apache.felix.ipojo.metadata.Element, java.util.Dictionary)

+     */

+    public void configure(Element elem, Dictionary dict) throws ConfigurationException {

+        Element[] elems = elem.getElements("extender", NAMESPACE);

+        for (int i = 0; i < elems.length; i++) {

+            String extension = elems[i].getAttribute("extension");

+            String onArrival = elems[i].getAttribute("onArrival");

+            String onDeparture = elems[i].getAttribute("onDeparture");

+            

+            if (extension == null) {

+                throw new ConfigurationException("The extender element requires an 'extender' attribute");

+            }

+            if (onArrival == null || onDeparture == null) {

+                throw new ConfigurationException("The extender element requires the onArrival and onDeparture attributes");

+            }

+            

+            ExtenderManager wbm = new ExtenderManager(this, extension, onArrival, onDeparture);

+            m_managers.add(wbm);

+        }

+        

+    }

+

+    /**

+     * Start the handler.

+     * @see org.apache.felix.ipojo.Handler#start()

+     */

+    public void start() {

+        for (int i = 0; i < m_managers.size(); i++) {

+            ((ExtenderManager) m_managers.get(i)).open();

+        }

+    }

+

+    /**

+     * Stop the handler.

+     * @see org.apache.felix.ipojo.Handler#stop()

+     */

+    public void stop() {

+        for (int i = 0; i < m_managers.size(); i++) {

+            ((ExtenderManager) m_managers.get(i)).close();

+        } 

+    }

+

+}