Author: clement
Date: Mon Apr 12 06:27:58 2010
New Revision: 933107
URL: http://svn.apache.org/viewvc?rev=933107&view=rev
Log:
Prepare the release process:
- revert to metadata 1.4
- apply fix for Felix-2268
- increase version number for the iPOJO exposed package, and imported packages
(added by the manipulator)
Modified:
felix/trunk/ipojo/ant/pom.xml
felix/trunk/ipojo/api/src/main/java/org/apache/felix/ipojo/api/PrimitiveComponentType.java
felix/trunk/ipojo/api/src/main/java/org/apache/felix/ipojo/api/Service.java
felix/trunk/ipojo/core/pom.xml
felix/trunk/ipojo/examples/property-handler/PropertyHandler/pom.xml
felix/trunk/ipojo/handler/transaction/pom.xml
felix/trunk/ipojo/junit4osgi/junit4osgi/pom.xml
felix/trunk/ipojo/manipulator/pom.xml
felix/trunk/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulator/Pojoization.java
felix/trunk/ipojo/plugin/pom.xml
felix/trunk/ipojo/pom.xml
felix/trunk/ipojo/tests/bundleAsiPOJO/bundleAsiPOJO/pom.xml
Modified: felix/trunk/ipojo/ant/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/ant/pom.xml?rev=933107&r1=933106&r2=933107&view=diff
==============================================================================
--- felix/trunk/ipojo/ant/pom.xml (original)
+++ felix/trunk/ipojo/ant/pom.xml Mon Apr 12 06:27:58 2010
@@ -41,7 +41,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.metadata</artifactId>
- <version>${pom.version}</version>
+ <version>1.4.0</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -69,6 +69,7 @@
<configuration>
<instructions>
<Bundle-Name>iPOJO Ant Task</Bundle-Name>
+ <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Bundle-Vendor> The Apache Software Foundation </Bundle-Vendor>
<Bundle-Description> iPOJO Ant Task </Bundle-Description>
<Bundle-DocURL>http://felix.apache.org/site/ipojo-ant-task.html</Bundle-DocURL>
Modified:
felix/trunk/ipojo/api/src/main/java/org/apache/felix/ipojo/api/PrimitiveComponentType.java
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/api/src/main/java/org/apache/felix/ipojo/api/PrimitiveComponentType.java?rev=933107&r1=933106&r2=933107&view=diff
==============================================================================
---
felix/trunk/ipojo/api/src/main/java/org/apache/felix/ipojo/api/PrimitiveComponentType.java
(original)
+++
felix/trunk/ipojo/api/src/main/java/org/apache/felix/ipojo/api/PrimitiveComponentType.java
Mon Apr 12 06:27:58 2010
@@ -524,5 +524,22 @@ public class PrimitiveComponentType exte
m_properties.add(prop);
return this;
}
+
+ /**
+ * Adds a configuration property.
+ * @param key the key
+ * @param obj the value (can be <code>null</code>)
+ * @return the current component type
+ */
+ public PrimitiveComponentType addProperty(String key, Object obj) {
+ String value = null;
+ if (obj != null) {
+ value = obj.toString();
+ }
+
+ addProperty(new Property().setName(key)
+ .setValue(value));
+ return this;
+ }
}
Modified:
felix/trunk/ipojo/api/src/main/java/org/apache/felix/ipojo/api/Service.java
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/api/src/main/java/org/apache/felix/ipojo/api/Service.java?rev=933107&r1=933106&r2=933107&view=diff
==============================================================================
--- felix/trunk/ipojo/api/src/main/java/org/apache/felix/ipojo/api/Service.java
(original)
+++ felix/trunk/ipojo/api/src/main/java/org/apache/felix/ipojo/api/Service.java
Mon Apr 12 06:27:58 2010
@@ -180,6 +180,27 @@ public class Service implements HandlerC
m_properties.add(ps);
return this;
}
+
+ /**
+ * Adds a service property.
+ * @param key the property key
+ * @param obj the initial value (can be <code>null</code>)
+ * @return the current service object.
+ */
+ public Service addProperty(String key, Object obj) {
+ Class clazz = String.class;
+ String value = null;
+ if (obj != null) {
+ clazz = obj.getClass();
+ value = obj.toString();
+ }
+
+ addProperty(new ServiceProperty().setName(key)
+ .setType(clazz.getName())
+ .setValue(value));
+
+ return this;
+ }
/**
* Sets the provided service specification.
Modified: felix/trunk/ipojo/core/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/core/pom.xml?rev=933107&r1=933106&r2=933107&view=diff
==============================================================================
--- felix/trunk/ipojo/core/pom.xml (original)
+++ felix/trunk/ipojo/core/pom.xml Mon Apr 12 06:27:58 2010
@@ -55,7 +55,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.metadata</artifactId>
- <version>${pom.version}</version>
+ <version>1.4.0</version>
</dependency>
<dependency>
<groupId>asm</groupId>
Modified: felix/trunk/ipojo/examples/property-handler/PropertyHandler/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/examples/property-handler/PropertyHandler/pom.xml?rev=933107&r1=933106&r2=933107&view=diff
==============================================================================
--- felix/trunk/ipojo/examples/property-handler/PropertyHandler/pom.xml
(original)
+++ felix/trunk/ipojo/examples/property-handler/PropertyHandler/pom.xml Mon Apr
12 06:27:58 2010
@@ -34,7 +34,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.metadata</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.4.0</version>
</dependency>
</dependencies>
<build>
Modified: felix/trunk/ipojo/handler/transaction/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/handler/transaction/pom.xml?rev=933107&r1=933106&r2=933107&view=diff
==============================================================================
--- felix/trunk/ipojo/handler/transaction/pom.xml (original)
+++ felix/trunk/ipojo/handler/transaction/pom.xml Mon Apr 12 06:27:58 2010
@@ -85,7 +85,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.metadata
</artifactId>
- <version>${pom.version}</version>
+ <version>1.4.0</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
Modified: felix/trunk/ipojo/junit4osgi/junit4osgi/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/junit4osgi/junit4osgi/pom.xml?rev=933107&r1=933106&r2=933107&view=diff
==============================================================================
--- felix/trunk/ipojo/junit4osgi/junit4osgi/pom.xml (original)
+++ felix/trunk/ipojo/junit4osgi/junit4osgi/pom.xml Mon Apr 12 06:27:58 2010
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.metadata</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.4.0</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: felix/trunk/ipojo/manipulator/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/pom.xml?rev=933107&r1=933106&r2=933107&view=diff
==============================================================================
--- felix/trunk/ipojo/manipulator/pom.xml (original)
+++ felix/trunk/ipojo/manipulator/pom.xml Mon Apr 12 06:27:58 2010
@@ -49,7 +49,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.metadata</artifactId>
- <version>${pom.version}</version>
+ <version>1.4.0</version>
</dependency>
</dependencies>
<build>
@@ -62,6 +62,7 @@
<configuration>
<instructions>
<Bundle-Name>iPOJO Manipulator</Bundle-Name>
+ <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Bundle-Vendor> The Apache Software Foundation </Bundle-Vendor>
<Bundle-Description> iPOJO Manipulator </Bundle-Description>
<Export-Package> org.apache.felix.ipojo.manipulator
Modified:
felix/trunk/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulator/Pojoization.java
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulator/Pojoization.java?rev=933107&r1=933106&r2=933107&view=diff
==============================================================================
---
felix/trunk/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulator/Pojoization.java
(original)
+++
felix/trunk/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulator/Pojoization.java
Mon Apr 12 06:27:58 2010
@@ -67,7 +67,7 @@ public class Pojoization {
/**
* iPOJO Imported Package Version.
*/
- public static final String IPOJO_PACKAGE_VERSION = " 1.4.0";
+ public static final String IPOJO_PACKAGE_VERSION = " 1.6.0";
/**
* List of component types.
Modified: felix/trunk/ipojo/plugin/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/plugin/pom.xml?rev=933107&r1=933106&r2=933107&view=diff
==============================================================================
--- felix/trunk/ipojo/plugin/pom.xml (original)
+++ felix/trunk/ipojo/plugin/pom.xml Mon Apr 12 06:27:58 2010
@@ -67,7 +67,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.metadata</artifactId>
- <version>${pom.version}</version>
+ <version>1.4.0</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
Modified: felix/trunk/ipojo/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/pom.xml?rev=933107&r1=933106&r2=933107&view=diff
==============================================================================
--- felix/trunk/ipojo/pom.xml (original)
+++ felix/trunk/ipojo/pom.xml Mon Apr 12 06:27:58 2010
@@ -45,7 +45,8 @@
<module>handler/whiteboard</module>
<module>api</module>
<module>online-manipulator</module>
- <module>junit4osgi</module>
+ <!-- remove junit4osgi during the release process
+ <module>junit4osgi</module> -->
</modules>
Modified: felix/trunk/ipojo/tests/bundleAsiPOJO/bundleAsiPOJO/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/bundleAsiPOJO/bundleAsiPOJO/pom.xml?rev=933107&r1=933106&r2=933107&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/bundleAsiPOJO/bundleAsiPOJO/pom.xml (original)
+++ felix/trunk/ipojo/tests/bundleAsiPOJO/bundleAsiPOJO/pom.xml Mon Apr 12
06:27:58 2010
@@ -29,7 +29,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.manipulator</artifactId>
- <version>${pom.version}</version>
+ <version>1.4.0</version>
</dependency>
<dependency>
<groupId>xerces</groupId>
