[maven-release-plugin] copy for tag org.apache.felix.ipojo.runtime-project-1.8.2
git-svn-id: https://svn.apache.org/repos/asf/felix/releases/org.apache.felix.ipojo.runtime-project-1.8.2@1328703 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/annotations/doc/changelog.txt b/annotations/doc/changelog.txt
index e2c9f16..c0633cb 100644
--- a/annotations/doc/changelog.txt
+++ b/annotations/doc/changelog.txt
@@ -1,3 +1,8 @@
+Changes from the 1.8.0 to 1.8.2
+-------------------------------
+** Improvement
+ * [FELIX-3380] - minor javadoc corrections in @Temporal annotation
+
Changes from the 1.6.4 to 1.8.0
-------------------------------
** Bug
diff --git a/annotations/pom.xml b/annotations/pom.xml
index 9dbc71e..a55e8c6 100644
--- a/annotations/pom.xml
+++ b/annotations/pom.xml
@@ -26,7 +26,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>org.apache.felix.ipojo.annotations</artifactId>
<groupId>org.apache.felix</groupId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.8.2</version>
<packaging>bundle</packaging>
<name>Apache Felix iPOJO Annotations</name>
@@ -119,4 +119,10 @@
</resources>
</build>
+
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/felix/releases/org.apache.felix.ipojo.runtime-project-1.8.2</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/releases/org.apache.felix.ipojo.runtime-project-1.8.2</developerConnection>
+ <url>scm:svn:https://svn.apache.org/repos/asf/felix/releases/org.apache.felix.ipojo.runtime-project-1.8.2</url>
+ </scm>
</project>
diff --git a/composite/doc/changelog.txt b/composite/doc/changelog.txt
index 36548c7..0925163 100644
--- a/composite/doc/changelog.txt
+++ b/composite/doc/changelog.txt
@@ -1,3 +1,10 @@
+Changes from the 1.8.0 to 1.8.2
+-------------------------------
+** Bug
+ * [FELIX-3130] - Nested composites throws StackOverflowError on instantiation
+ * [FELIX-3323] - Ipojo composite throw ClassCastException when configuration is updated thru ConfigAdmin
+ * [FELIX-3451] - "instance.name" attribute not recognized
+
Changes from the 1.6.0 to 1.8.0
-------------------------------
** Improvement
diff --git a/composite/pom.xml b/composite/pom.xml
index b4b7573..3e329ea 100644
--- a/composite/pom.xml
+++ b/composite/pom.xml
@@ -17,140 +17,162 @@
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>
+ <parent>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>felix-parent</artifactId>
+ <version>1.2.1</version>
+ <relativePath>../../../pom/pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <packaging>bundle</packaging>
+ <name>Apache Felix iPOJO Composite</name>
+ <artifactId>org.apache.felix.ipojo.composite</artifactId>
<groupId>org.apache.felix</groupId>
- <artifactId>felix-parent</artifactId>
- <version>1.2.1</version>
- <relativePath>../../../pom/pom.xml</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <packaging>bundle</packaging>
- <name>Apache Felix iPOJO Composite</name>
- <artifactId>org.apache.felix.ipojo.composite</artifactId>
- <groupId>org.apache.felix</groupId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.8.2</version>
- <properties>
- <ipojo.package.version>1.8.0</ipojo.package.version>
- </properties>
+ <properties>
+ <ipojo.package.version>1.8.2</ipojo.package.version>
+ </properties>
- <description>
- iPOJO Composition Model. This is an iPOJO extension to execute service composition.
- </description>
- <url>http://felix.apache.org/site/ipojo-composition-tutorial.html</url>
+ <description>
+ iPOJO Composition Model. This is an iPOJO extension to execute service composition.
+ </description>
+ <url>http://felix.apache.org/site/ipojo-composition-tutorial.html</url>
- <dependencies>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>4.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.ipojo.manipulator</artifactId>
- <version>1.8.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.ipojo</artifactId>
- <version>1.8.0</version>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.3</version>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-Name>Apache Felix iPOJO Composite</Bundle-Name>
- <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
- <Bundle-Vendor> The Apache Software Foundation </Bundle-Vendor>
- <Bundle-Description> iPOJO Composititon Framework
- </Bundle-Description>
- <Bundle-DocURL>
- http://felix.apache.org/site/ipojo-composition-tutorial.html
- </Bundle-DocURL>
- <Import-Package>
- org.apache.felix.ipojo,
- org.apache.felix.ipojo.architecture,
- org.apache.felix.ipojo.context,
- org.apache.felix.ipojo.metadata,
- org.apache.felix.ipojo.parser,
- org.apache.felix.ipojo.util,
- org.apache.felix.ipojo.manipulation,
- org.osgi.framework;version=1.3,
- !org.objectweb.asm.tree,
- </Import-Package>
- <Private-Package>
- org.apache.felix.ipojo.composite.architecture,
- org.apache.felix.ipojo.composite.service*,
- org.apache.felix.ipojo.composite.instance,
- org.apache.felix.ipojo.composite.util,
- <!-- ASM (Manipulator dependencies) -->
- org.objectweb.asm.commons,
- org.objectweb.asm.signature,
- org.objectweb.asm
- </Private-Package>
- <Export-Package>
- org.apache.felix.ipojo.composite; version="${ipojo.package.version}"
- </Export-Package>
- <Include-Resource>
- META-INF/LICENSE=LICENSE,
- META-INF/NOTICE=NOTICE,
- META-INF/LICENSE.asm=LICENSE.asm,
- META-INF/DEPENDENCIES=DEPENDENCIES
- </Include-Resource>
- <IPOJO-Extension>
- composite:org.apache.felix.ipojo.composite.CompositeFactory
- </IPOJO-Extension>
- <_donotcopy> (CVS|.svn|.+.bak|~.+|metadata.xml) </_donotcopy>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-ipojo-plugin</artifactId>
- <version>1.8.0</version>
- <executions>
- <execution>
- <goals>
- <goal>ipojo-bundle</goal>
- </goals>
- <configuration>
- <metadata>src/main/resources/metadata.xml</metadata>
- <ignoreAnnotations>true</ignoreAnnotations>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rat-maven-plugin</artifactId>
- <configuration>
- <excludeSubProjects>false</excludeSubProjects>
- <useEclipseDefaultExcludes>true</useEclipseDefaultExcludes>
- <useMavenDefaultExcludes>true</useMavenDefaultExcludes>
- <excludes>
- <param>doc/**/*</param>
- <param>maven-eclipse.xml</param>
- <param>.checkstyle</param>
- <param>.externalToolBuilders/*</param>
- <param>LICENSE.asm</param>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <configuration>
- <enableRulesSummary>false</enableRulesSummary>
- <violationSeverity>warning</violationSeverity>
- <configLocation>http://felix.apache.org/ipojo/dev/checkstyle_ipojo.xml</configLocation>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>4.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.ipojo.manipulator</artifactId>
+ <!-- Same as the iPOJO core embedded manipulator -->
+ <version>1.8.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.ipojo</artifactId>
+ <version>1.8.2</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>.</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>LICENSE*</include>
+ <include>NOTICE*</include>
+ <include>DEPENDENCIES*</include>
+ </includes>
+ </resource>
+ </resources>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>1.4.3</version>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-Name>Apache Felix iPOJO Composite</Bundle-Name>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+ <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
+ <Bundle-Description>iPOJO Composititon Framework
+ </Bundle-Description>
+ <Bundle-DocURL>
+ http://felix.apache.org/site/ipojo-composition-tutorial.html
+ </Bundle-DocURL>
+ <Import-Package>
+ org.apache.felix.ipojo,
+ org.apache.felix.ipojo.architecture,
+ org.apache.felix.ipojo.context,
+ org.apache.felix.ipojo.metadata,
+ org.apache.felix.ipojo.parser,
+ org.apache.felix.ipojo.util,
+ org.apache.felix.ipojo.manipulation,
+ org.osgi.framework;version=1.3,
+ !org.objectweb.asm.tree,
+ </Import-Package>
+ <Private-Package>
+ org.apache.felix.ipojo.composite.architecture,
+ org.apache.felix.ipojo.composite.service*,
+ org.apache.felix.ipojo.composite.instance,
+ org.apache.felix.ipojo.composite.util,
+ <!-- ASM (Manipulator dependencies) -->
+ org.objectweb.asm.commons,
+ org.objectweb.asm.signature,
+ org.objectweb.asm
+ </Private-Package>
+ <Export-Package>
+ org.apache.felix.ipojo.composite; version="${ipojo.package.version}"
+ </Export-Package>
+ <Include-Resource>
+ META-INF/LICENSE=LICENSE,
+ META-INF/NOTICE=NOTICE,
+ META-INF/LICENSE.asm=LICENSE.asm,
+ META-INF/DEPENDENCIES=DEPENDENCIES
+ </Include-Resource>
+ <IPOJO-Extension>
+ composite:org.apache.felix.ipojo.composite.CompositeFactory
+ </IPOJO-Extension>
+ <_donotcopy>(CVS|.svn|.+.bak|~.+|metadata.xml)</_donotcopy>
+ </instructions>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-ipojo-plugin</artifactId>
+ <version>1.8.4</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>ipojo-bundle</goal>
+ </goals>
+ <configuration>
+ <metadata>src/main/resources/metadata.xml</metadata>
+ <ignoreAnnotations>true</ignoreAnnotations>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rat-maven-plugin</artifactId>
+ <configuration>
+ <excludeSubProjects>false</excludeSubProjects>
+ <useEclipseDefaultExcludes>true</useEclipseDefaultExcludes>
+ <useMavenDefaultExcludes>true</useMavenDefaultExcludes>
+ <excludes>
+ <param>doc/**/*</param>
+ <param>maven-eclipse.xml</param>
+ <param>.checkstyle</param>
+ <param>.externalToolBuilders/*</param>
+ <param>LICENSE.asm</param>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <configuration>
+ <enableRulesSummary>false</enableRulesSummary>
+ <violationSeverity>warning</violationSeverity>
+ <configLocation>http://felix.apache.org/ipojo/dev/checkstyle_ipojo.xml</configLocation>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/felix/releases/org.apache.felix.ipojo.runtime-project-1.8.2</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/releases/org.apache.felix.ipojo.runtime-project-1.8.2</developerConnection>
+ <url>scm:svn:https://svn.apache.org/repos/asf/felix/releases/org.apache.felix.ipojo.runtime-project-1.8.2</url>
+ </scm>
</project>
diff --git a/composite/src/main/java/org/apache/felix/ipojo/composite/CompositeFactory.java b/composite/src/main/java/org/apache/felix/ipojo/composite/CompositeFactory.java
index d739de5..517a003 100644
--- a/composite/src/main/java/org/apache/felix/ipojo/composite/CompositeFactory.java
+++ b/composite/src/main/java/org/apache/felix/ipojo/composite/CompositeFactory.java
@@ -77,8 +77,7 @@
}
public String getClassName() { return "composite"; }
-
-
+
/**
* Compute required handlers.
* @return the list of required handler.
diff --git a/composite/src/main/java/org/apache/felix/ipojo/composite/FactoryProxy.java b/composite/src/main/java/org/apache/felix/ipojo/composite/FactoryProxy.java
index db3a053..8af0c6c 100644
--- a/composite/src/main/java/org/apache/felix/ipojo/composite/FactoryProxy.java
+++ b/composite/src/main/java/org/apache/felix/ipojo/composite/FactoryProxy.java
@@ -174,4 +174,8 @@
return m_delegate.getVersion();
}
+ public Element getComponentMetadata() {
+ return m_delegate.getComponentMetadata();
+ }
+
}
diff --git a/core/DEPENDENCIES b/core/DEPENDENCIES
index 6cfe273..2c19f82 100644
--- a/core/DEPENDENCIES
+++ b/core/DEPENDENCIES
@@ -1,5 +1,5 @@
Apache Felix iPOJO Runtime
-Copyright 2008-2011 The Apache Software Foundation
+Copyright 2008-2012 The Apache Software Foundation
This software was developed at the Apache Software Foundation
(http://www.apache.org) and may have dependencies on other
diff --git a/core/NOTICE b/core/NOTICE
index 65496d1..d41ae7b 100644
--- a/core/NOTICE
+++ b/core/NOTICE
@@ -1,5 +1,5 @@
Apache Felix iPOJO Runtime
-Copyright 2008-2011 The Apache Software Foundation
+Copyright 2008-2012 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
diff --git a/core/doc/changelog.txt b/core/doc/changelog.txt
index bb0f693..3c6d4d6 100644
--- a/core/doc/changelog.txt
+++ b/core/doc/changelog.txt
@@ -1,44 +1,74 @@
-Changes from the 1.6.8 to 1.8.0
--------------------------------
-** Bug
- * [FELIX-2694] - Instance state not recomputed after reconfiguration when the instance is stopped
- * [FELIX-2716] - [iPOJO] Failure when creating proxies for classes in java.* packages
-
-** Improvement
- * [FELIX-2781] - Expose the implementation class as service when no interfaces are found in the hierarchy
- * [FELIX-1424] - Constructor Injection
- * [FELIX-1428] - Constructor injection of Configuration properties
- * [FELIX-2461] - Allow specifying the targeted service interface in the @ServiceController
- * [FELIX-2620] - Change iPojo annotation parameters to follow java naming conventions
- * [FELIX-2621] - Rename annotations to remove collisions
- * [FELIX-2622] - Support static service properties that are not mirrored into fields
- * [FELIX-2688] - iPojo "requires.filters" - Array object instead of Dictionary object
- * [FELIX-2705] - Provide a way to extend the logger strategy
- * [FELIX-2742] - Constructor injection of service dependencies
- * [FELIX-2744] - Add annotations to the maven-ipojo-plugin archetype
-
-Changes from the 1.6.6 to 1.6.8
--------------------------------
-** Improvement
- * [FELIX-2688] - iPojo "requires.filters" - Array object instead of Dictionary object
- * [FELIX-2705] - Provide a way to extend the logger strategy
-
-** Bug
- * [FELIX-2685] - Wrong Element name when XML namespace contains ':'
- * [FELIX-2694] - Instance state not recomputed after reconfiguration when the instance is stopped
-
-Changes from the 1.6.4 to 1.6.6
--------------------------------
-** Improvement
- * [FELIX-2594] - Have a way to create new custom iPojo handler without having to specify a handler usage
- * [FELIX-2623] - @Update annotated methods should not require a Dictionary parameter
-
-** Bug
- * [FELIX-2580] - iPOJO failed to create proxies on service which are not interface
- * [FELIX-2596] - DependencyHandler.onObjectCreation throws NPE when bundle is refreshed
- * [FELIX-2603] - wrong behavior of InstanceManager.onSet(..) method
- * [FELIX-2636] - Cannot control the validity of an iPOJO instance using a configuration property
-
+Changes from the 1.8.0 to 1.8.2
+-------------------------------
+** Bug
+ * [FELIX-2893] - Properties are not propagate to service by default
+ * [FELIX-2902] - Service properties added by propagation overrides already existing properties
+ * [FELIX-2907] - Problem calling _setInstanceManager on guice enhanced classe
+ * [FELIX-2981] - Unable to remove configuration properties using iPOJO's configuration handler
+ * [FELIX-2989] - Using a Service Controller set to true can trigger a service registration-unregistration-registration sequence
+ * [FELIX-2995] - The service properties are updated despite there is no changes
+ * [FELIX-3009] - Abstract classes as service specifications generates warnings at runtime
+ * [FELIX-3075] - Change to ServiceController status in current trunk does not re-register service
+ * [FELIX-3172] - Error when calling BundleContext.register(Class, Object, Dictionary)
+ * [FELIX-3192] - Service properties are not updated if the properties were already propagated
+ * [FELIX-3271] - On KF, the Instance singleton strategy throws an UnsupportedOperationException when stopping
+ * [FELIX-3323] - Ipojo composite throw ClassCastException when configuration is updated thru ConfigAdmin
+ * [FELIX-3356] - Objectweb ASM Clashes with IPojo
+ * [FELIX-3374] - Use of java.lang.Properties in iPOJO Core
+
+** Improvement
+ * [FELIX-3036] - Add IPOJO-Components header support
+ * [FELIX-3081] - Integrate the online-manipulator in iPOJO Core
+ * [FELIX-3144] - Method interceptors should receive Method or Constructor objects
+ * [FELIX-3155] - Allow identifying iPojo extensions by a namespace qualified name
+ * [FELIX-3190] - iPOJO Factories doesn't give access to the complete Metadata model
+ * [FELIX-3252] - Merge the online manipulator into iPOJO Core
+ * [FELIX-3326] - Accessing IPojo-Component's all inherited classes and all implemented interfaces in PrimitiveTypeDescription
+
+** New Feature
+ * [FELIX-2932] - Allows disabling the asynchronous processing in the iPOJO Extender
+
+Changes from the 1.6.8 to 1.8.0
+-------------------------------
+** Bug
+ * [FELIX-2694] - Instance state not recomputed after reconfiguration when the instance is stopped
+ * [FELIX-2716] - [iPOJO] Failure when creating proxies for classes in java.* packages
+
+** Improvement
+ * [FELIX-2781] - Expose the implementation class as service when no interfaces are found in the hierarchy
+ * [FELIX-1424] - Constructor Injection
+ * [FELIX-1428] - Constructor injection of Configuration properties
+ * [FELIX-2461] - Allow specifying the targeted service interface in the @ServiceController
+ * [FELIX-2620] - Change iPojo annotation parameters to follow java naming conventions
+ * [FELIX-2621] - Rename annotations to remove collisions
+ * [FELIX-2622] - Support static service properties that are not mirrored into fields
+ * [FELIX-2688] - iPojo "requires.filters" - Array object instead of Dictionary object
+ * [FELIX-2705] - Provide a way to extend the logger strategy
+ * [FELIX-2742] - Constructor injection of service dependencies
+ * [FELIX-2744] - Add annotations to the maven-ipojo-plugin archetype
+
+Changes from the 1.6.6 to 1.6.8
+-------------------------------
+** Improvement
+ * [FELIX-2688] - iPojo "requires.filters" - Array object instead of Dictionary object
+ * [FELIX-2705] - Provide a way to extend the logger strategy
+
+** Bug
+ * [FELIX-2685] - Wrong Element name when XML namespace contains ':'
+ * [FELIX-2694] - Instance state not recomputed after reconfiguration when the instance is stopped
+
+Changes from the 1.6.4 to 1.6.6
+-------------------------------
+** Improvement
+ * [FELIX-2594] - Have a way to create new custom iPojo handler without having to specify a handler usage
+ * [FELIX-2623] - @Update annotated methods should not require a Dictionary parameter
+
+** Bug
+ * [FELIX-2580] - iPOJO failed to create proxies on service which are not interface
+ * [FELIX-2596] - DependencyHandler.onObjectCreation throws NPE when bundle is refreshed
+ * [FELIX-2603] - wrong behavior of InstanceManager.onSet(..) method
+ * [FELIX-2636] - Cannot control the validity of an iPOJO instance using a configuration property
+
Changes from the 1.6.2 to 1.6.4
-------------------------------
** Improvement
diff --git a/core/pom.xml b/core/pom.xml
index 0169f41..ded72dc 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -17,212 +17,219 @@
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-parent</artifactId>
- <version>1.2.1</version>
- <relativePath>../../../pom/pom.xml</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <packaging>bundle</packaging>
- <name>Apache Felix iPOJO</name>
- <artifactId>org.apache.felix.ipojo</artifactId>
- <version>1.9.0-SNAPSHOT</version>
-
- <properties>
- <!--
- 1.8.1:
- * change in the MethodInterceptor interface (FELIX-3144)
- * change in the Factory interface (FELIX-3190)
- -->
- <ipojo.package.version>1.8.1</ipojo.package.version>
-
- <!-- Embedded manipulator version -->
- <ipojo.manipulator.version>1.8.0</ipojo.manipulator.version>
- </properties>
-
- <description>
- iPOJO Core bundle
- </description>
- <url>
- http://ipojo.org
- </url>
-
- <dependencies>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>4.3.0</version>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>4.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.ipojo.metadata</artifactId>
- <version>1.5.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.ipojo.manipulator</artifactId>
- <version>${ipojo.manipulator.version}</version>
- </dependency>
- <dependency>
- <groupId>asm</groupId>
- <artifactId>asm-all</artifactId>
- <version>3.3.1</version>
- <exclusions>
- <exclusion>
- <groupId>asm</groupId>
- <artifactId>asm-tree</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <target>jsr14</target>
- <source>1.5</source>
- </configuration>
- </plugin>
- <plugin>
+ <parent>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.3</version>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-Name>Apache Felix iPOJO</Bundle-Name>
- <Bundle-Vendor> The Apache Software Foundation </Bundle-Vendor>
- <Bundle-SymbolicName>org.apache.felix.ipojo;singleton:=true</Bundle-SymbolicName>
- <Bundle-Description> iPOJO Core Framework </Bundle-Description>
- <Bundle-Activator> org.apache.felix.ipojo.Extender
- </Bundle-Activator>
- <Bundle-DocURL>
- http://felix.apache.org/site/apache-felix-ipojo.html
- </Bundle-DocURL>
- <IPOJO-Extension>
- component:org.apache.felix.ipojo.ComponentFactory,
- handler:org.apache.felix.ipojo.HandlerManagerFactory
- </IPOJO-Extension>
- <Import-Package>
- org.osgi.framework;version=1.3, <!-- To support KF 2 -->
- org.osgi.service.cm,
- org.osgi.service.log,
- !org.objectweb.asm.tree,
- !sun.io,
- !net.sourceforge.cobertura.*, <!-- To support code coverage -->
+ <artifactId>felix-parent</artifactId>
+ <version>1.2.1</version>
+ <relativePath>../../../pom/pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <packaging>bundle</packaging>
+ <name>Apache Felix iPOJO</name>
+ <artifactId>org.apache.felix.ipojo</artifactId>
+ <version>1.8.2</version>
- <!--
- Packages used for the online-manipulator.
- They are optionals
- -->
- javax.xml.parsers;resolution:=optional,
- org.osgi.service.url;resolution:=optional,
- org.w3c.dom;resolution:=optional,
- org.xml.sax;resolution:=optional,
- org.xml.sax.helpers;resolution:=optional
- </Import-Package>
- <Private-Package>
- org.apache.felix.ipojo.handlers.architecture,
- org.apache.felix.ipojo.handlers.lifecycle.callback,
- org.apache.felix.ipojo.handlers.lifecycle.controller,
- <!-- ASM (Manipulator dependencies) -->
- org.objectweb.asm.commons,
- org.objectweb.asm.signature,
- org.objectweb.asm
- </Private-Package>
- <Export-Package>
- org.apache.felix.ipojo; version="${ipojo.package.version}",
- org.apache.felix.ipojo.metadata; version="${ipojo.package.version}",
- org.apache.felix.ipojo.architecture; version="${ipojo.package.version}",
- org.apache.felix.ipojo.parser; version="${ipojo.package.version}",
- org.apache.felix.ipojo.util; version="${ipojo.package.version}",
- org.apache.felix.ipojo.handlers.dependency; version="${ipojo.package.version}",
- org.apache.felix.ipojo.handlers.providedservice.*; version="${ipojo.package.version}",
- 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.xml.parser; version="${ipojo.manipulator.version}",
- org.apache.felix.ipojo.*; version="${ipojo.manipulator.version}",
- <!-- Compendium packages -->
- org.osgi.service.cm,
- org.osgi.service.log,
- </Export-Package>
- <Include-Resource>
- META-INF/LICENSE=LICENSE,
- META-INF/NOTICE=NOTICE, META-INF/LICENSE.asm=LICENSE.asm,
- META-INF/DEPENDENCIES=DEPENDENCIES
- </Include-Resource>
- <_donotcopy> (CVS|.svn|.+.bak|~.+|metadata.xml) </_donotcopy>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-ipojo-plugin</artifactId>
- <version>1.8.0</version>
- <executions>
- <execution>
- <goals>
- <goal>ipojo-bundle</goal>
- </goals>
- <configuration>
- <ignoreAnnotations>true</ignoreAnnotations>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rat-maven-plugin</artifactId>
- <configuration>
- <excludeSubProjects>false</excludeSubProjects>
- <useEclipseDefaultExcludes>true</useEclipseDefaultExcludes>
- <useMavenDefaultExcludes>true</useMavenDefaultExcludes>
- <excludes>
- <param>doc/**/*</param>
- <param>maven-eclipse.xml</param>
- <param>.checkstyle</param>
- <param>.externalToolBuilders/*</param>
- <param>LICENSE.asm</param>
- <param>.fbprefs</param>
- <param>DEPENDENCIES</param>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <configuration>
- <enableRulesSummary>false</enableRulesSummary>
- <violationSeverity>warning</violationSeverity>
- <configLocation>http://felix.apache.org/ipojo/dev/checkstyle_ipojo.xml</configLocation>
- </configuration>
- </plugin>
- </plugins>
+ <properties>
+ <!--
+ 1.8.2:
+ * change in the MethodInterceptor interface (FELIX-3144)
+ * change in the Factory interface (FELIX-3190)
+ -->
+ <ipojo.package.version>1.8.2</ipojo.package.version>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- <resource>
- <directory>.</directory>
- <targetPath>META-INF</targetPath>
- <includes>
- <include>LICENSE*</include>
- <include>NOTICE*</include>
- <include>DEPENDENCIES*</include>
- </includes>
- </resource>
- </resources>
+ <!-- Embedded manipulator version -->
+ <ipojo.manipulator.version>1.8.0</ipojo.manipulator.version>
+ </properties>
- </build>
+ <description>
+ iPOJO Core bundle
+ </description>
+ <url>
+ http://ipojo.org
+ </url>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>4.3.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>4.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.ipojo.metadata</artifactId>
+ <version>1.6.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.ipojo.manipulator</artifactId>
+ <version>${ipojo.manipulator.version}</version>
+ <!-- Switching to 1.8.2 breaks the junit4osgi tests...-->
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm-all</artifactId>
+ <version>3.3.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>asm</groupId>
+ <artifactId>asm-tree</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <target>jsr14</target>
+ <source>1.5</source>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>1.4.3</version>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-Name>Apache Felix iPOJO</Bundle-Name>
+ <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
+ <Bundle-SymbolicName>org.apache.felix.ipojo;singleton:=true</Bundle-SymbolicName>
+ <Bundle-Description>iPOJO Core Framework</Bundle-Description>
+ <Bundle-Activator>org.apache.felix.ipojo.Extender
+ </Bundle-Activator>
+ <Bundle-DocURL>
+ http://felix.apache.org/site/apache-felix-ipojo.html
+ </Bundle-DocURL>
+ <IPOJO-Extension>
+ component:org.apache.felix.ipojo.ComponentFactory,
+ handler:org.apache.felix.ipojo.HandlerManagerFactory
+ </IPOJO-Extension>
+ <Import-Package>
+ org.osgi.framework;version=1.3, <!-- To support KF 2 -->
+ org.osgi.service.cm,
+ org.osgi.service.log,
+ !org.objectweb.asm.tree,
+ !sun.io,
+ !net.sourceforge.cobertura.*, <!-- To support code coverage -->
+
+ <!--
+ Packages used for the online-manipulator.
+ They are optionals
+ -->
+ javax.xml.parsers;resolution:=optional,
+ org.osgi.service.url;resolution:=optional,
+ org.w3c.dom;resolution:=optional,
+ org.xml.sax;resolution:=optional,
+ org.xml.sax.helpers;resolution:=optional
+ </Import-Package>
+ <Private-Package>
+ org.apache.felix.ipojo.handlers.architecture,
+ org.apache.felix.ipojo.handlers.lifecycle.callback,
+ org.apache.felix.ipojo.handlers.lifecycle.controller,
+ <!-- ASM (Manipulator dependencies) -->
+ org.objectweb.asm.commons,
+ org.objectweb.asm.signature,
+ org.objectweb.asm
+ </Private-Package>
+ <Export-Package>
+ org.apache.felix.ipojo; version="${ipojo.package.version}",
+ org.apache.felix.ipojo.metadata; version="${ipojo.package.version}",
+ org.apache.felix.ipojo.architecture; version="${ipojo.package.version}",
+ org.apache.felix.ipojo.parser; version="${ipojo.package.version}",
+ org.apache.felix.ipojo.util; version="${ipojo.package.version}",
+ org.apache.felix.ipojo.handlers.dependency; version="${ipojo.package.version}",
+ org.apache.felix.ipojo.handlers.providedservice.*; version="${ipojo.package.version}",
+ 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.xml.parser; version="${ipojo.manipulator.version}",
+ org.apache.felix.ipojo.*; version="${ipojo.manipulator.version}",
+ <!-- Compendium packages -->
+ org.osgi.service.cm,
+ org.osgi.service.log
+ </Export-Package>
+ <Include-Resource>
+ META-INF/LICENSE=LICENSE,
+ META-INF/NOTICE=NOTICE, META-INF/LICENSE.asm=LICENSE.asm,
+ META-INF/DEPENDENCIES=DEPENDENCIES
+ </Include-Resource>
+ <_donotcopy>(CVS|.svn|.+.bak|~.+|metadata.xml)</_donotcopy>
+ </instructions>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-ipojo-plugin</artifactId>
+ <version>1.8.4</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>ipojo-bundle</goal>
+ </goals>
+ <configuration>
+ <ignoreAnnotations>true</ignoreAnnotations>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rat-maven-plugin</artifactId>
+ <configuration>
+ <excludeSubProjects>false</excludeSubProjects>
+ <useEclipseDefaultExcludes>true</useEclipseDefaultExcludes>
+ <useMavenDefaultExcludes>true</useMavenDefaultExcludes>
+ <excludes>
+ <param>doc/**/*</param>
+ <param>maven-eclipse.xml</param>
+ <param>.checkstyle</param>
+ <param>.externalToolBuilders/*</param>
+ <param>LICENSE.asm</param>
+ <param>.fbprefs</param>
+ <param>DEPENDENCIES</param>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <configuration>
+ <enableRulesSummary>false</enableRulesSummary>
+ <violationSeverity>warning</violationSeverity>
+ <configLocation>http://felix.apache.org/ipojo/dev/checkstyle_ipojo.xml</configLocation>
+ </configuration>
+ </plugin>
+ </plugins>
+
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>.</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>LICENSE*</include>
+ <include>NOTICE*</include>
+ <include>DEPENDENCIES*</include>
+ </includes>
+ </resource>
+ </resources>
+
+ </build>
+
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/felix/releases/org.apache.felix.ipojo.runtime-project-1.8.2</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/releases/org.apache.felix.ipojo.runtime-project-1.8.2</developerConnection>
+ <url>scm:svn:https://svn.apache.org/repos/asf/felix/releases/org.apache.felix.ipojo.runtime-project-1.8.2</url>
+ </scm>
</project>
diff --git a/core/src/main/java/org/apache/felix/ipojo/handlers/providedservice/ProvidedServiceHandler.java b/core/src/main/java/org/apache/felix/ipojo/handlers/providedservice/ProvidedServiceHandler.java
index 170275a..084255d 100644
--- a/core/src/main/java/org/apache/felix/ipojo/handlers/providedservice/ProvidedServiceHandler.java
+++ b/core/src/main/java/org/apache/felix/ipojo/handlers/providedservice/ProvidedServiceHandler.java
@@ -518,7 +518,6 @@
*/
public void addProperties(Dictionary dict) {
for (int i = 0; i < m_providedServices.length; i++) {
- System.out.println("adding properties " + dict);
m_providedServices[i].addProperties(dict);
m_providedServices[i].update();
}
diff --git a/doc/changelog.txt b/doc/changelog.txt
new file mode 100644
index 0000000..d3f343d
--- /dev/null
+++ b/doc/changelog.txt
@@ -0,0 +1,3 @@
+Version 1.8.2
+-------------
+ * Initial release
diff --git a/pom.xml b/pom.xml
index 07c3eca..a20c20f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>org.apache.felix.ipojo.runtime-project</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.8.2</version>
<name>Apache Felix iPOJO Runtime Project</name>
<packaging>pom</packaging>
@@ -117,4 +117,10 @@
</build>
</profile>
</profiles>
+
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/felix/releases/org.apache.felix.ipojo.runtime-project-1.8.2</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/releases/org.apache.felix.ipojo.runtime-project-1.8.2</developerConnection>
+ <url>scm:svn:https://svn.apache.org/repos/asf/felix/releases/org.apache.felix.ipojo.runtime-project-1.8.2</url>
+ </scm>
</project>
