You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cl...@apache.org on 2013/10/08 16:09:24 UTC
svn commit: r1530276 - in /felix/trunk/ipojo/runtime: api/
api/src/main/java/org/apache/felix/ipojo/api/ composite-it/ composite/
composite/src/main/java/org/apache/felix/ipojo/composite/service/provides/
core-it/ core/ core/src/main/java/org/apache/fe...
Author: clement
Date: Tue Oct 8 14:09:24 2013
New Revision: 1530276
URL: http://svn.apache.org/r1530276
Log:
Update version
Rely when required on the new manipulator
Fix the manipulation process in api and composite (two-phased process)
Change the @since tag from 1.10.2 to 1.11.0
Modified:
felix/trunk/ipojo/runtime/api/pom.xml
felix/trunk/ipojo/runtime/api/src/main/java/org/apache/felix/ipojo/api/PrimitiveComponentType.java
felix/trunk/ipojo/runtime/composite-it/pom.xml
felix/trunk/ipojo/runtime/composite/pom.xml
felix/trunk/ipojo/runtime/composite/src/main/java/org/apache/felix/ipojo/composite/service/provides/CompositionMetadata.java
felix/trunk/ipojo/runtime/core-it/pom.xml
felix/trunk/ipojo/runtime/core/pom.xml
felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/Factory.java
felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/IPojoFactory.java
felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/dependency/impl/ServiceReferenceManager.java
felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/dependency/interceptors/ServiceBindingInterceptor.java
felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/handlers/configuration/ConfigurationHandlerDescription.java
felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/parser/MethodMetadata.java
felix/trunk/ipojo/runtime/ipojo-gogo-commands/pom.xml
Modified: felix/trunk/ipojo/runtime/api/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/api/pom.xml?rev=1530276&r1=1530275&r2=1530276&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/api/pom.xml (original)
+++ felix/trunk/ipojo/runtime/api/pom.xml Tue Oct 8 14:09:24 2013
@@ -119,7 +119,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.manipulator</artifactId>
- <version>1.10.0</version>
+ <version>1.11.0</version>
</dependency>
<dependency>
<groupId>asm</groupId>
Modified: felix/trunk/ipojo/runtime/api/src/main/java/org/apache/felix/ipojo/api/PrimitiveComponentType.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/api/src/main/java/org/apache/felix/ipojo/api/PrimitiveComponentType.java?rev=1530276&r1=1530275&r2=1530276&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/api/src/main/java/org/apache/felix/ipojo/api/PrimitiveComponentType.java (original)
+++ felix/trunk/ipojo/runtime/api/src/main/java/org/apache/felix/ipojo/api/PrimitiveComponentType.java Tue Oct 8 14:09:24 2013
@@ -461,9 +461,17 @@ public class PrimitiveComponentType exte
Manipulator manipulator = new Manipulator();
try {
byte[] array = getClassByteArray();
- byte[] newclazz = manipulator.manipulate(array);
+
+ // Step 1 - preparation
+ manipulator.prepare(array);
+
+ byte[] newclazz = new byte[0];
+ if (!manipulator.isAlreadyManipulated()) {
+ // Step 2 - manipulation
+ newclazz = manipulator.manipulate(array);
+ }
m_manipulation = manipulator.getManipulationMetadata();
- m_alreadyManipulated = newclazz.length == array.length;
+ m_alreadyManipulated = manipulator.isAlreadyManipulated();
return newclazz;
} catch (IOException e) {
throw new IllegalStateException("An exception occurs during implementation class manipulation", e);
Modified: felix/trunk/ipojo/runtime/composite-it/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/composite-it/pom.xml?rev=1530276&r1=1530275&r2=1530276&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/composite-it/pom.xml (original)
+++ felix/trunk/ipojo/runtime/composite-it/pom.xml Tue Oct 8 14:09:24 2013
@@ -40,7 +40,7 @@
<equinox.version>3.8.1.v20120830-144521</equinox.version>
<knoperflerfish.version>5.3.3</knoperflerfish.version>
- <manipulator.version>1.10.0</manipulator.version>
+ <manipulator.version>1.10.1</manipulator.version>
</properties>
<modules>
@@ -217,7 +217,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.manipulator</artifactId>
- <version>1.10.0</version>
+ <version>1.11.0</version>
</dependency>
<dependency>
Modified: felix/trunk/ipojo/runtime/composite/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/composite/pom.xml?rev=1530276&r1=1530275&r2=1530276&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/composite/pom.xml (original)
+++ felix/trunk/ipojo/runtime/composite/pom.xml Tue Oct 8 14:09:24 2013
@@ -49,7 +49,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.manipulator</artifactId>
- <version>1.10.0</version>
+ <version>1.11.0</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -112,7 +112,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-ipojo-plugin</artifactId>
- <version>1.10.0</version>
+ <version>1.10.1</version>
<executions>
<execution>
<goals>
Modified: felix/trunk/ipojo/runtime/composite/src/main/java/org/apache/felix/ipojo/composite/service/provides/CompositionMetadata.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/composite/src/main/java/org/apache/felix/ipojo/composite/service/provides/CompositionMetadata.java?rev=1530276&r1=1530275&r2=1530276&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/composite/src/main/java/org/apache/felix/ipojo/composite/service/provides/CompositionMetadata.java (original)
+++ felix/trunk/ipojo/runtime/composite/src/main/java/org/apache/felix/ipojo/composite/service/provides/CompositionMetadata.java Tue Oct 8 14:09:24 2013
@@ -236,6 +236,7 @@ public class CompositionMetadata {
byte[] pojo = POJOWriter.dump(clazz, m_name, getFieldList(), getMethodList(), m_handler);
Manipulator manipulator = new Manipulator();
try {
+ manipulator.prepare(pojo);
byte[] newclazz = manipulator.manipulate(pojo);
m_manipulation = manipulator.getManipulationMetadata();
return newclazz;
Modified: felix/trunk/ipojo/runtime/core-it/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/pom.xml?rev=1530276&r1=1530275&r2=1530276&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/pom.xml (original)
+++ felix/trunk/ipojo/runtime/core-it/pom.xml Tue Oct 8 14:09:24 2013
@@ -43,7 +43,7 @@
<equinox.version>3.9.0.v20130529-1710</equinox.version>
<knoperflerfish.version>6.0.2</knoperflerfish.version>
- <manipulator.version>1.10.2-SNAPSHOT</manipulator.version>
+ <manipulator.version>1.11.0</manipulator.version>
</properties>
<modules>
@@ -241,7 +241,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.annotations</artifactId>
- <version>1.10.2-SNAPSHOT</version>
+ <version>${manipulator.version}</version>
</dependency>
<dependency>
Modified: felix/trunk/ipojo/runtime/core/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core/pom.xml?rev=1530276&r1=1530275&r2=1530276&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core/pom.xml (original)
+++ felix/trunk/ipojo/runtime/core/pom.xml Tue Oct 8 14:09:24 2013
@@ -189,7 +189,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-ipojo-plugin</artifactId>
- <version>1.10.0</version>
+ <version>1.10.1</version>
<executions>
<execution>
<goals>
Modified: felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/Factory.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/Factory.java?rev=1530276&r1=1530275&r2=1530276&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/Factory.java (original)
+++ felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/Factory.java Tue Oct 8 14:09:24 2013
@@ -190,7 +190,7 @@ public interface Factory {
* Gets the list of instances created by the factory. The instances must be still alive.
*
* @return the list of created (and living) instances
- * @since 1.10.2
+ * @since 1.11.0
*/
List<ComponentInstance> getInstances();
@@ -198,7 +198,7 @@ public interface Factory {
* Gets the list of the names of the instances created by the factory. The instances must be still alive.
*
* @return the list of the names of created (and living) instances
- * @since 1.10.2
+ * @since 1.11.0
*/
List<String> getInstancesNames();
Modified: felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/IPojoFactory.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/IPojoFactory.java?rev=1530276&r1=1530275&r2=1530276&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/IPojoFactory.java (original)
+++ felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/IPojoFactory.java Tue Oct 8 14:09:24 2013
@@ -397,7 +397,7 @@ public abstract class IPojoFactory imple
* Gets the list of instances created by the factory. The instances must be still alive.
*
* @return the list of created (and living) instances
- * @since 1.10.2
+ * @since 1.11.0
*/
public List<ComponentInstance> getInstances() {
// m_componentInstances is a concurrent hashmap, we can create retrieve values directly.
@@ -408,7 +408,7 @@ public abstract class IPojoFactory imple
* Gets the list of the names of the instances created by the factory. The instances must be still alive.
*
* @return the list of the names of created (and living) instances
- * @since 1.10.2
+ * @since 1.11.0
*/
public List<String> getInstancesNames() {
// m_componentInstances is a concurrent hashmap, we can create retrieve values directly.
Modified: felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/dependency/impl/ServiceReferenceManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/dependency/impl/ServiceReferenceManager.java?rev=1530276&r1=1530275&r2=1530276&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/dependency/impl/ServiceReferenceManager.java (original)
+++ felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/dependency/impl/ServiceReferenceManager.java Tue Oct 8 14:09:24 2013
@@ -876,7 +876,7 @@ public class ServiceReferenceManager imp
* Gets the list of tracking interceptors attached to the current service dependency.
* @return the list of service references of the tracking interceptors participating to the resolution of the
* current service dependency. An empty list is returned is there are no participating interceptors.
- * @since 1.10.2
+ * @since 1.11.0
*/
public List<ServiceReference> getTrackingInterceptorReferences() {
try {
@@ -897,7 +897,7 @@ public class ServiceReferenceManager imp
* Gets the list of binding interceptors attached to the current service dependency.
* @return the list of service references of the binding interceptors participating to the resolution of the
* current service dependency. An empty list is returned is there are no participating interceptors.
- * @since 1.10.2
+ * @since 1.11.0
*/
public List<ServiceReference> getBindingInterceptorReferences() {
try {
@@ -919,7 +919,7 @@ public class ServiceReferenceManager imp
* be attached at a point on time, this is not a list but only one reference.
* @return the service reference of the ranking interceptor participating to the resolution of the current
* service dependency. {@code null} if no (external) ranking interceptor is currently attached.
- * @since 1.10.2
+ * @since 1.11.0
*/
public ServiceReference getRankingInterceptorReference() {
try {
Modified: felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/dependency/interceptors/ServiceBindingInterceptor.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/dependency/interceptors/ServiceBindingInterceptor.java?rev=1530276&r1=1530275&r2=1530276&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/dependency/interceptors/ServiceBindingInterceptor.java (original)
+++ felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/dependency/interceptors/ServiceBindingInterceptor.java Tue Oct 8 14:09:24 2013
@@ -34,7 +34,7 @@ import org.osgi.framework.ServiceReferen
*
* Obviously an interceptor can be plugged to several dependencies.
*
- * @since 1.10.2
+ * @since 1.11.0
*/
public interface ServiceBindingInterceptor extends DependencyInterceptor {
Modified: felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/handlers/configuration/ConfigurationHandlerDescription.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/handlers/configuration/ConfigurationHandlerDescription.java?rev=1530276&r1=1530275&r2=1530276&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/handlers/configuration/ConfigurationHandlerDescription.java (original)
+++ felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/handlers/configuration/ConfigurationHandlerDescription.java Tue Oct 8 14:09:24 2013
@@ -108,7 +108,7 @@ public class ConfigurationHandlerDescrip
* Gets a property by name.
* @param name the property name
* @return the property description with the given name, {@code null} if there is no property with the given name.
- * @since 1.10.2
+ * @since 1.11.0
*/
public PropertyDescription getPropertyByName(String name) {
for (PropertyDescription desc :m_properties) {
Modified: felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/parser/MethodMetadata.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/parser/MethodMetadata.java?rev=1530276&r1=1530275&r2=1530276&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/parser/MethodMetadata.java (original)
+++ felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/parser/MethodMetadata.java Tue Oct 8 14:09:24 2013
@@ -67,7 +67,7 @@ public class MethodMetadata {
/**
* The argument names if there were contained in the manifest.
- * @since 1.10.2
+ * @since 1.11.0
*/
private final String[] m_names;
Modified: felix/trunk/ipojo/runtime/ipojo-gogo-commands/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/ipojo-gogo-commands/pom.xml?rev=1530276&r1=1530275&r2=1530276&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/ipojo-gogo-commands/pom.xml (original)
+++ felix/trunk/ipojo/runtime/ipojo-gogo-commands/pom.xml Tue Oct 8 14:09:24 2013
@@ -99,7 +99,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-ipojo-plugin</artifactId>
- <version>1.10.0</version>
+ <version>1.10.1</version>
<executions>
<execution>
<goals>