Modified author tags in the files to mention the Felix team. Changed
the 'provideService' package to be 'providedservice'. Added some
synchronization blocks to ProvidedService handler to fix some threading
issues uncovered by John Conlan.
git-svn-id: https://svn.apache.org/repos/asf/incubator/felix/trunk@416352 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/Activator.java b/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/Activator.java
index 827be0d..f87aaa7 100644
--- a/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/Activator.java
+++ b/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/Activator.java
@@ -32,8 +32,7 @@
/**
* iPOJO generic activator.
- * Date : 31 mars 2006
- * @author clement escoffier
+ * @author <a href="mailto:felix-dev@incubator.apache.org">Felix Project Team</a>
*/
public class Activator implements BundleActivator {
diff --git a/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/Callback.java b/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/Callback.java
index 5f93351..b3a0c1b 100644
--- a/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/Callback.java
+++ b/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/Callback.java
@@ -24,7 +24,7 @@
/**
* A callback allows calling a method on the component.
- * @author Clement Escoffier
+ * @author <a href="mailto:felix-dev@incubator.apache.org">Felix Project Team</a>
*/
public class Callback {
diff --git a/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/ComponentManager.java b/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/ComponentManager.java
index 998d13b..d979220 100644
--- a/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/ComponentManager.java
+++ b/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/ComponentManager.java
@@ -27,7 +27,7 @@
/**
* The component manager class manage one "version" of a component.
* It manages component lifecycle, component instance creation and handlers.
- * @author Clement Escoffier
+ * @author <a href="mailto:felix-dev@incubator.apache.org">Felix Project Team</a>
*/
public class ComponentManager {
diff --git a/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/ComponentManagerFactory.java b/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/ComponentManagerFactory.java
index 92678da..646db1d 100644
--- a/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/ComponentManagerFactory.java
+++ b/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/ComponentManagerFactory.java
@@ -23,7 +23,7 @@
/**
* The component manager factory class manages component manager object.
- * @author Clement Escoffier
+ * @author <a href="mailto:felix-dev@incubator.apache.org">Felix Project Team</a>
*/
public class ComponentManagerFactory {
diff --git a/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/ComponentMetadata.java b/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/ComponentMetadata.java
index 662b170..059531e 100644
--- a/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/ComponentMetadata.java
+++ b/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/ComponentMetadata.java
@@ -22,7 +22,7 @@
/**
* Component Metadata.
- * @author Clement Escoffier
+ * @author <a href="mailto:felix-dev@incubator.apache.org">Felix Project Team</a>
*/
public class ComponentMetadata {
diff --git a/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/DummyActivator.java b/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/DummyActivator.java
index 87a3b74..7f72a94 100644
--- a/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/DummyActivator.java
+++ b/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/DummyActivator.java
@@ -21,7 +21,7 @@
/**
* This class is just if you start ipojo. It does nothing but avoid the launch of the Activator class on the iPOJO bundle
- * @author escoffie
+ * @author <a href="mailto:felix-dev@incubator.apache.org">Felix Project Team</a>
*
*/
public class DummyActivator implements BundleActivator {
diff --git a/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/Handler.java b/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/Handler.java
index f08c9d0..b241f03 100644
--- a/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/Handler.java
+++ b/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/Handler.java
@@ -21,7 +21,7 @@
/**
* Handler Interface.
* An handler need implements tese method to be notifed of lifecycle change, getfield operation and putfield operation
- * @author Clement Escoffier
+ * @author <a href="mailto:felix-dev@incubator.apache.org">Felix Project Team</a>
*/
public interface Handler {
diff --git a/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/IPojoConfiguration.java b/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/IPojoConfiguration.java
index 782486f..fbf350d 100644
--- a/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/IPojoConfiguration.java
+++ b/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/IPojoConfiguration.java
@@ -22,13 +22,13 @@
import org.apache.felix.ipojo.handlers.configuration.ConfigurationHandler;
import org.apache.felix.ipojo.handlers.dependency.DependencyHandler;
import org.apache.felix.ipojo.handlers.lifecycle.callback.LifecycleCallbackHandler;
-import org.apache.felix.ipojo.handlers.providedService.ProvidedServiceHandler;
+import org.apache.felix.ipojo.handlers.providedservice.ProvidedServiceHandler;
/**
* Activator Basic Configuration.
* - Log Level
* - Available handlers
- * @author Clement Escoffier
+ * @author <a href="mailto:felix-dev@incubator.apache.org">Felix Project Team</a>
*/
public class IPojoConfiguration {
diff --git a/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/Nullable.java b/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/Nullable.java
index 6287128..bdb74dc 100644
--- a/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/Nullable.java
+++ b/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/Nullable.java
@@ -18,7 +18,7 @@
/**
* A nullable object must implement this interface.
- * @author Clement Escoffier
+ * @author <a href="mailto:felix-dev@incubator.apache.org">Felix Project Team</a>
*/
public interface Nullable {
// Nothing
diff --git a/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/architecture/Architecture.java b/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/architecture/Architecture.java
index 22f4f15..478572e 100644
--- a/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/architecture/Architecture.java
+++ b/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/architecture/Architecture.java
@@ -19,7 +19,7 @@
/**
* Architecture service.
* Allows to have information of the service delivery about GenSD component.
- * @author Clement Escoffier
+ * @author <a href="mailto:felix-dev@incubator.apache.org">Felix Project Team</a>
*/
public interface Architecture {
diff --git a/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/architecture/ComponentDescription.java b/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/architecture/ComponentDescription.java
index 01eccdb..9fb29b4 100644
--- a/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/architecture/ComponentDescription.java
+++ b/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/architecture/ComponentDescription.java
@@ -21,7 +21,7 @@
/**
* Component Description.
- * @author Clement Escoffier
+ * @author <a href="mailto:felix-dev@incubator.apache.org">Felix Project Team</a>
*/
public class ComponentDescription {
diff --git a/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/architecture/DependencyDescription.java b/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/architecture/DependencyDescription.java
index 3559d9a..74a9f6a 100644
--- a/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/architecture/DependencyDescription.java
+++ b/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/architecture/DependencyDescription.java
@@ -22,7 +22,7 @@
/**
* Dependency Description.
- * @author Clement Escoffier
+ * @author <a href="mailto:felix-dev@incubator.apache.org">Felix Project Team</a>
*/
public class DependencyDescription {
diff --git a/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/architecture/ProvidedServiceDescription.java b/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/architecture/ProvidedServiceDescription.java
index 64311ba..b663a1c 100644
--- a/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/architecture/ProvidedServiceDescription.java
+++ b/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/architecture/ProvidedServiceDescription.java
@@ -22,7 +22,7 @@
/**
* Provided Service Description.
- * @author Clement Escoffier
+ * @author <a href="mailto:felix-dev@incubator.apache.org">Felix Project Team</a>
*/
public class ProvidedServiceDescription {
diff --git a/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/architecture/State.java b/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/architecture/State.java
index 1291f03..9b5844c 100644
--- a/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/architecture/State.java
+++ b/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/architecture/State.java
@@ -17,8 +17,7 @@
package org.apache.felix.ipojo.architecture;
/**
- * @author Clement Escoffier
- *
+ * @author <a href="mailto:felix-dev@incubator.apache.org">Felix Project Team</a>
*/
public class State {
diff --git a/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/architecture/ArchitectureHandler.java b/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/architecture/ArchitectureHandler.java
index d17cde8..b78a6d1 100644
--- a/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/architecture/ArchitectureHandler.java
+++ b/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/architecture/ArchitectureHandler.java
@@ -28,11 +28,7 @@
import org.apache.felix.ipojo.handlers.dependency.Dependency;
import org.apache.felix.ipojo.handlers.dependency.DependencyHandler;
import org.apache.felix.ipojo.handlers.dependency.DependencyMetadata;
-import org.apache.felix.ipojo.handlers.providedService.Property;
-import org.apache.felix.ipojo.handlers.providedService.PropertyMetadata;
-import org.apache.felix.ipojo.handlers.providedService.ProvidedService;
-import org.apache.felix.ipojo.handlers.providedService.ProvidedServiceHandler;
-import org.apache.felix.ipojo.handlers.providedService.ProvidedServiceMetadata;
+import org.apache.felix.ipojo.handlers.providedservice.*;
import org.apache.felix.ipojo.metadata.Element;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
@@ -40,7 +36,7 @@
/**
* Achtiecture Handler : do reflection on your component.
- * @author Clement Escoffier
+ * @author <a href="mailto:felix-dev@incubator.apache.org">Felix Project Team</a>
*/
public class ArchitectureHandler implements Handler, Architecture {
diff --git a/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/configuration/ConfigurableProperty.java b/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/configuration/ConfigurableProperty.java
index 8f5a636..53de8c0 100644
--- a/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/configuration/ConfigurableProperty.java
+++ b/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/configuration/ConfigurableProperty.java
@@ -24,8 +24,8 @@
import org.apache.felix.ipojo.metadata.Element;
/**
- * @author Clement Escoffier
* Configurable Property
+ * @author <a href="mailto:felix-dev@incubator.apache.org">Felix Project Team</a>
*/
public class ConfigurableProperty {
diff --git a/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/configuration/ConfigurationHandler.java b/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/configuration/ConfigurationHandler.java
index a69f02a..e9683b1 100644
--- a/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/configuration/ConfigurationHandler.java
+++ b/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/configuration/ConfigurationHandler.java
@@ -33,7 +33,7 @@
/**
* Handler managing the Configuration Admin.
- * @author Clement Escoffier
+ * @author <a href="mailto:felix-dev@incubator.apache.org">Felix Project Team</a>
*/
public class ConfigurationHandler implements Handler, ManagedService {
diff --git a/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/dependency/Dependency.java b/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/dependency/Dependency.java
index f617633..75e7d6b 100644
--- a/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/dependency/Dependency.java
+++ b/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/dependency/Dependency.java
@@ -30,8 +30,8 @@
/**
* Represent a service dependency either for a componenet dependency either for
- * a provided service dependency. Date : 3 déc. 2005
- * @author clément
+ * a provided service dependency.
+ * @author <a href="mailto:felix-dev@incubator.apache.org">Felix Project Team</a>
*/
public class Dependency implements ServiceListener {
diff --git a/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyCallback.java b/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyCallback.java
index f185678..604d20f 100644
--- a/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyCallback.java
+++ b/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyCallback.java
@@ -23,8 +23,7 @@
/**
* This class allwos the creation of callback when service dependency arrives or disappear.
- * @author escoffie
- *
+ * @author <a href="mailto:felix-dev@incubator.apache.org">Felix Project Team</a>
*/
public class DependencyCallback {
diff --git a/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyHandler.java b/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyHandler.java
index 7f4859c..ee39ead 100644
--- a/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyHandler.java
+++ b/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyHandler.java
@@ -28,7 +28,7 @@
/**
* The dependency handler manages a list of dependencies.
- * @author clément
+ * @author <a href="mailto:felix-dev@incubator.apache.org">Felix Project Team</a>
*/
public class DependencyHandler implements Handler {
diff --git a/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyMetadata.java b/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyMetadata.java
index 38c6595..e4ca5eb 100644
--- a/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyMetadata.java
+++ b/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyMetadata.java
@@ -18,7 +18,7 @@
/**
* Dependency Metadata.
- * @author Clement Escoffier
+ * @author <a href="mailto:felix-dev@incubator.apache.org">Felix Project Team</a>
*/
public class DependencyMetadata {
diff --git a/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/dependency/NullableClassloader.java b/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/dependency/NullableClassloader.java
index b490fdf..49940de 100644
--- a/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/dependency/NullableClassloader.java
+++ b/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/dependency/NullableClassloader.java
@@ -26,7 +26,7 @@
/**
* iPOJO Classloader.
* This classloadert is used to load manipulated class.
- * @author Clement Escoffier
+ * @author <a href="mailto:felix-dev@incubator.apache.org">Felix Project Team</a>
*/
public class NullableClassloader extends ClassLoader {
diff --git a/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/dependency/nullable/MethodSignature.java b/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/dependency/nullable/MethodSignature.java
index ff49abd..e20ea49 100644
--- a/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/dependency/nullable/MethodSignature.java
+++ b/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/dependency/nullable/MethodSignature.java
@@ -19,8 +19,7 @@
/**
* Reprensent of method description.
* The goal of this class, is to be able to generate a proxy class, or a nullable class from an interface.
- * @author Clement Escoffier
- *
+ * @author <a href="mailto:felix-dev@incubator.apache.org">Felix Project Team</a>
*/
public class MethodSignature {
diff --git a/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/dependency/nullable/MethodSignatureVisitor.java b/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/dependency/nullable/MethodSignatureVisitor.java
index d1b341e..7c0cb47 100644
--- a/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/dependency/nullable/MethodSignatureVisitor.java
+++ b/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/dependency/nullable/MethodSignatureVisitor.java
@@ -26,8 +26,7 @@
/** This class implement a class visitor. It store all method signature of
* the visited interface. Then it returns these class signatures for the proxy
* generation or the nullable class.
- * Date : 4/9/2005
- * @author Clement Escoffier
+ * @author <a href="mailto:felix-dev@incubator.apache.org">Felix Project Team</a>
*/
public class MethodSignatureVisitor implements ClassVisitor, Opcodes {
diff --git a/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/dependency/nullable/NullableObjectWriter.java b/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/dependency/nullable/NullableObjectWriter.java
index 1eb0edf..7a035ea 100644
--- a/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/dependency/nullable/NullableObjectWriter.java
+++ b/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/dependency/nullable/NullableObjectWriter.java
@@ -28,7 +28,7 @@
import org.objectweb.asm.Type;
/** Create the proxy class.
- * @author clément
+ * @author <a href="mailto:felix-dev@incubator.apache.org">Felix Project Team</a>
*/
public class NullableObjectWriter implements Opcodes {
diff --git a/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/lifecycle/callback/LifecycleCallback.java b/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/lifecycle/callback/LifecycleCallback.java
index 1bc4899..c6b18e9 100644
--- a/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/lifecycle/callback/LifecycleCallback.java
+++ b/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/lifecycle/callback/LifecycleCallback.java
@@ -21,8 +21,7 @@
/**
* This class is the implementation of callback on lifecycle transition.
- * @author Clement Escoffier
- *
+ * @author <a href="mailto:felix-dev@incubator.apache.org">Felix Project Team</a>
*/
public class LifecycleCallback {
diff --git a/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/lifecycle/callback/LifecycleCallbackHandler.java b/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/lifecycle/callback/LifecycleCallbackHandler.java
index f20d3f6..4b99cf8 100644
--- a/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/lifecycle/callback/LifecycleCallbackHandler.java
+++ b/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/lifecycle/callback/LifecycleCallbackHandler.java
@@ -26,7 +26,7 @@
/**
* Lifecycle callback handler.
- * @author Clement Escoffier
+ * @author <a href="mailto:felix-dev@incubator.apache.org">Felix Project Team</a>
*/
public class LifecycleCallbackHandler implements Handler {
diff --git a/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/lifecycle/callback/LifecycleCallbackMetadata.java b/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/lifecycle/callback/LifecycleCallbackMetadata.java
index cc032a0..88db994 100644
--- a/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/lifecycle/callback/LifecycleCallbackMetadata.java
+++ b/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/lifecycle/callback/LifecycleCallbackMetadata.java
@@ -20,7 +20,7 @@
/**
* Lifecycle callback metadata.
- * @author Clement Escoffier
+ * @author <a href="mailto:felix-dev@incubator.apache.org">Felix Project Team</a>
*/
public class LifecycleCallbackMetadata {
diff --git a/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/providedService/Property.java b/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/providedservice/Property.java
similarity index 97%
rename from org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/providedService/Property.java
rename to org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/providedservice/Property.java
index c1dfe05..d94ef94 100644
--- a/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/providedService/Property.java
+++ b/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/providedservice/Property.java
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.felix.ipojo.handlers.providedService;
+package org.apache.felix.ipojo.handlers.providedservice;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
@@ -28,8 +28,7 @@
* A property can be attached to a field.
* The value of the property is thefield value.
* When the value change, the published value change too.
- * Date : 5 févr. 2006
- * @author clément
+ * @author <a href="mailto:felix-dev@incubator.apache.org">Felix Project Team</a>
*/
public class Property {
diff --git a/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/providedService/PropertyMetadata.java b/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/providedservice/PropertyMetadata.java
similarity index 93%
rename from org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/providedService/PropertyMetadata.java
rename to org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/providedservice/PropertyMetadata.java
index 9b90e76..90926d6 100644
--- a/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/providedService/PropertyMetadata.java
+++ b/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/providedservice/PropertyMetadata.java
@@ -14,11 +14,11 @@
* limitations under the License.
*
*/
-package org.apache.felix.ipojo.handlers.providedService;
+package org.apache.felix.ipojo.handlers.providedservice;
/**
* Property metadata : either static either dynamic.
- * @author Clement Escoffier
+ * @author <a href="mailto:felix-dev@incubator.apache.org">Felix Project Team</a>
*/
public class PropertyMetadata {
diff --git a/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/providedService/ProvidedService.java b/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/providedservice/ProvidedService.java
similarity index 93%
rename from org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/providedService/ProvidedService.java
rename to org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/providedservice/ProvidedService.java
index 041642d..8c9f0bb 100644
--- a/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/providedService/ProvidedService.java
+++ b/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/providedservice/ProvidedService.java
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.felix.ipojo.handlers.providedService;
+package org.apache.felix.ipojo.handlers.providedservice;
import java.util.Properties;
import java.util.logging.Level;
@@ -29,9 +29,7 @@
/**
* Provided Service represent a provided service by the component.
- * Date : 3 déc. 2005
- * @author clément
- *
+ * @author <a href="mailto:felix-dev@incubator.apache.org">Felix Project Team</a>
*/
public class ProvidedService implements ServiceFactory {
@@ -203,7 +201,11 @@
Properties serviceProperties = getServiceProperties();
m_state = REGISTERED;
- m_serviceRegistration = m_handler.getComponentManager().getContext().registerService(m_metadata.getServiceSpecification(), this, serviceProperties);
+ synchronized (this) {
+ m_serviceRegistration =
+ m_handler.getComponentManager().getContext().registerService(
+ m_metadata.getServiceSpecification(), this, serviceProperties);
+ }
}
}
@@ -268,7 +270,11 @@
Properties serviceProperties = getServiceProperties();
// Update the service registration
- if (m_state == REGISTERED) { m_serviceRegistration.setProperties(serviceProperties); }
+ if (m_state == REGISTERED) {
+ synchronized (this) {
+ m_serviceRegistration.setProperties(serviceProperties);
+ }
+ }
}
/**
diff --git a/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/providedService/ProvidedServiceHandler.java b/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/providedservice/ProvidedServiceHandler.java
similarity index 98%
rename from org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/providedService/ProvidedServiceHandler.java
rename to org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/providedservice/ProvidedServiceHandler.java
index d9b98cc..2351dcf 100644
--- a/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/providedService/ProvidedServiceHandler.java
+++ b/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/providedservice/ProvidedServiceHandler.java
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.felix.ipojo.handlers.providedService;
+package org.apache.felix.ipojo.handlers.providedservice;
import java.util.logging.Level;
@@ -24,8 +24,7 @@
import org.apache.felix.ipojo.metadata.Element;
/**
- * @author Clement Escoffier
- *
+ * @author <a href="mailto:felix-dev@incubator.apache.org">Felix Project Team</a>
*/
public class ProvidedServiceHandler implements Handler {
diff --git a/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/providedService/ProvidedServiceMetadata.java b/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/providedservice/ProvidedServiceMetadata.java
similarity index 95%
rename from org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/providedService/ProvidedServiceMetadata.java
rename to org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/providedservice/ProvidedServiceMetadata.java
index a4e7fd3..0e58391 100644
--- a/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/providedService/ProvidedServiceMetadata.java
+++ b/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/handlers/providedservice/ProvidedServiceMetadata.java
@@ -14,12 +14,12 @@
* limitations under the License.
*
*/
-package org.apache.felix.ipojo.handlers.providedService;
+package org.apache.felix.ipojo.handlers.providedservice;
/**
* Provided Service Metadata.
- * @author Clément Escoffier
+ * @author <a href="mailto:felix-dev@incubator.apache.org">Felix Project Team</a>
*/
public class ProvidedServiceMetadata {
diff --git a/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/parser/ManifestMetadataParser.java b/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/parser/ManifestMetadataParser.java
index b7171e6..c13494b 100644
--- a/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/parser/ManifestMetadataParser.java
+++ b/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/parser/ManifestMetadataParser.java
@@ -24,7 +24,7 @@
/**
* Manifest Metadata parser.
* Read a manifest file and construct metadata
- * @author Clement Escoffier
+ * @author <a href="mailto:felix-dev@incubator.apache.org">Felix Project Team</a>
*/
public class ManifestMetadataParser {
diff --git a/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/parser/ParseException.java b/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/parser/ParseException.java
index 4cf61b8..c59afd8 100644
--- a/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/parser/ParseException.java
+++ b/org.apache.felix.ipojo/src/main/java/org/apache/felix/ipojo/parser/ParseException.java
@@ -18,7 +18,7 @@
/**
* Exceptions thrown by parsers.
- * @author Clement Escoffier
+ * @author <a href="mailto:felix-dev@incubator.apache.org">Felix Project Team</a>
*/
public class ParseException extends Exception {