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 2009/01/14 15:09:26 UTC
svn commit: r734402 - in /felix/trunk/ipojo: annotations/
annotations/src/main/java/org/apache/felix/ipojo/annotations/ ant/ arch/
composite/ core/ core/src/main/java/org/apache/felix/ipojo/
handler/eventadmin/ handler/extender/ handler/jmx/ handler/te...
Author: clement
Date: Wed Jan 14 06:07:17 2009
New Revision: 734402
URL: http://svn.apache.org/viewvc?rev=734402&view=rev
Log:
- Update the iPOJO Package Version to 1.1.0
- Cleanup pom files (useless dependencies)
- Re-add (??) the specification attribute in the @Requires for Collection field
- Update Notice file copyright
- Fix issue FELIX-876. Now the package from 'specification' attributes are imported also for primitive components
Modified:
felix/trunk/ipojo/annotations/NOTICE
felix/trunk/ipojo/annotations/pom.xml
felix/trunk/ipojo/annotations/src/main/java/org/apache/felix/ipojo/annotations/Requires.java
felix/trunk/ipojo/ant/NOTICE
felix/trunk/ipojo/ant/pom.xml
felix/trunk/ipojo/arch/NOTICE
felix/trunk/ipojo/arch/pom.xml
felix/trunk/ipojo/composite/NOTICE
felix/trunk/ipojo/composite/pom.xml
felix/trunk/ipojo/core/NOTICE
felix/trunk/ipojo/core/pom.xml
felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/Extender.java
felix/trunk/ipojo/handler/eventadmin/NOTICE
felix/trunk/ipojo/handler/eventadmin/pom.xml
felix/trunk/ipojo/handler/extender/NOTICE
felix/trunk/ipojo/handler/extender/pom.xml
felix/trunk/ipojo/handler/jmx/NOTICE
felix/trunk/ipojo/handler/jmx/pom.xml
felix/trunk/ipojo/handler/temporal/NOTICE
felix/trunk/ipojo/handler/temporal/pom.xml
felix/trunk/ipojo/handler/whiteboard/NOTICE
felix/trunk/ipojo/handler/whiteboard/pom.xml
felix/trunk/ipojo/junit4osgi/felix-command/NOTICE
felix/trunk/ipojo/junit4osgi/felix-command/pom.xml
felix/trunk/ipojo/junit4osgi/immediate-launcher/NOTICE
felix/trunk/ipojo/junit4osgi/immediate-launcher/pom.xml
felix/trunk/ipojo/junit4osgi/junit4osgi/NOTICE
felix/trunk/ipojo/junit4osgi/junit4osgi/pom.xml
felix/trunk/ipojo/junit4osgi/maven-junit4osgi-plugin/NOTICE
felix/trunk/ipojo/junit4osgi/swing-runner/NOTICE
felix/trunk/ipojo/junit4osgi/swing-runner/pom.xml
felix/trunk/ipojo/manipulator/NOTICE
felix/trunk/ipojo/manipulator/pom.xml
felix/trunk/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulation/annotations/FieldCollector.java
felix/trunk/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulator/Pojoization.java
felix/trunk/ipojo/metadata/NOTICE
felix/trunk/ipojo/metadata/pom.xml
felix/trunk/ipojo/plugin/NOTICE
felix/trunk/ipojo/plugin/src/main/resources/archetype-resources/src/main/resources/metadata.xml
Modified: felix/trunk/ipojo/annotations/NOTICE
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/annotations/NOTICE?rev=734402&r1=734401&r2=734402&view=diff
==============================================================================
--- felix/trunk/ipojo/annotations/NOTICE (original)
+++ felix/trunk/ipojo/annotations/NOTICE Wed Jan 14 06:07:17 2009
@@ -1,5 +1,5 @@
Apache Felix iPOJO Annotations
-Copyright 2008 The Apache Software Foundation
+Copyright 2008-2009 The Apache Software Foundation
I. Included Software
Modified: felix/trunk/ipojo/annotations/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/annotations/pom.xml?rev=734402&r1=734401&r2=734402&view=diff
==============================================================================
--- felix/trunk/ipojo/annotations/pom.xml (original)
+++ felix/trunk/ipojo/annotations/pom.xml Wed Jan 14 06:07:17 2009
@@ -60,6 +60,7 @@
<Include-Resource> META-INF/LICENCE=LICENSE,
META-INF/NOTICE=NOTICE </Include-Resource>
</instructions>
+ <obrRepository>NONE</obrRepository>
</configuration>
</plugin>
<plugin>
Modified: felix/trunk/ipojo/annotations/src/main/java/org/apache/felix/ipojo/annotations/Requires.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/annotations/src/main/java/org/apache/felix/ipojo/annotations/Requires.java?rev=734402&r1=734401&r2=734402&view=diff
==============================================================================
--- felix/trunk/ipojo/annotations/src/main/java/org/apache/felix/ipojo/annotations/Requires.java (original)
+++ felix/trunk/ipojo/annotations/src/main/java/org/apache/felix/ipojo/annotations/Requires.java Wed Jan 14 06:07:17 2009
@@ -78,4 +78,10 @@
* Set the from attribute.
*/
String from() default "";
+
+ /**
+ * Set the required service specification.
+ * This attribute is required for Collection field.
+ */
+ String specification() default "";
}
Modified: felix/trunk/ipojo/ant/NOTICE
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/ant/NOTICE?rev=734402&r1=734401&r2=734402&view=diff
==============================================================================
--- felix/trunk/ipojo/ant/NOTICE (original)
+++ felix/trunk/ipojo/ant/NOTICE Wed Jan 14 06:07:17 2009
@@ -1,5 +1,5 @@
Apache Felix iPOJO Ant Task
-Copyright 2008 The Apache Software Foundation
+Copyright 2008-2009 The Apache Software Foundation
I. Included Software
Modified: felix/trunk/ipojo/ant/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/ant/pom.xml?rev=734402&r1=734401&r2=734402&view=diff
==============================================================================
--- felix/trunk/ipojo/ant/pom.xml (original)
+++ felix/trunk/ipojo/ant/pom.xml Wed Jan 14 06:07:17 2009
@@ -80,6 +80,7 @@
META-INF/NOTICE=NOTICE, META-INF/LICENSE.asm=LICENSE.asm
</Include-Resource>
</instructions>
+ <obrRepository>NONE</obrRepository>
</configuration>
</plugin>
<plugin>
Modified: felix/trunk/ipojo/arch/NOTICE
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/arch/NOTICE?rev=734402&r1=734401&r2=734402&view=diff
==============================================================================
--- felix/trunk/ipojo/arch/NOTICE (original)
+++ felix/trunk/ipojo/arch/NOTICE Wed Jan 14 06:07:17 2009
@@ -1,5 +1,5 @@
Apache Felix iPOJO Arch Command
-Copyright 2008 The Apache Software Foundation
+Copyright 2008-2009 The Apache Software Foundation
I. Included Software
Modified: felix/trunk/ipojo/arch/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/arch/pom.xml?rev=734402&r1=734401&r2=734402&view=diff
==============================================================================
--- felix/trunk/ipojo/arch/pom.xml (original)
+++ felix/trunk/ipojo/arch/pom.xml Wed Jan 14 06:07:17 2009
@@ -38,11 +38,6 @@
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.ipojo.metadata</artifactId>
- <version>1.1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.shell</artifactId>
<version>1.0.2</version>
</dependency>
Modified: felix/trunk/ipojo/composite/NOTICE
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/composite/NOTICE?rev=734402&r1=734401&r2=734402&view=diff
==============================================================================
--- felix/trunk/ipojo/composite/NOTICE (original)
+++ felix/trunk/ipojo/composite/NOTICE Wed Jan 14 06:07:17 2009
@@ -1,5 +1,5 @@
Apache Felix iPOJO Composite
-Copyright 2008 The Apache Software Foundation
+Copyright 2008-2009 The Apache Software Foundation
I. Included Software
Modified: felix/trunk/ipojo/composite/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/composite/pom.xml?rev=734402&r1=734401&r2=734402&view=diff
==============================================================================
--- felix/trunk/ipojo/composite/pom.xml (original)
+++ felix/trunk/ipojo/composite/pom.xml Wed Jan 14 06:07:17 2009
@@ -30,6 +30,11 @@
<artifactId>org.apache.felix.ipojo.composite</artifactId>
<groupId>org.apache.felix</groupId>
<version>1.1.0-SNAPSHOT</version>
+
+ <properties>
+ <ipojo.package.version>1.1.0</ipojo.package.version>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -38,16 +43,6 @@
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>1.2.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.ipojo.metadata</artifactId>
- <version>1.1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.manipulator</artifactId>
<version>1.1.0-SNAPSHOT</version>
</dependency>
@@ -74,18 +69,25 @@
<Bundle-DocURL>
http://felix.apache.org/site/apache-felix-ipojo.html
</Bundle-DocURL>
- <Import-Package> org.apache.felix.ipojo,
+ <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.context,
+ org.apache.felix.ipojo.metadata,
+ org.apache.felix.ipojo.parser,
+ org.apache.felix.ipojo.util,
org.osgi.framework;version=1.3 </Import-Package>
- <Private-Package> org.apache.felix.ipojo.manipulation,
+ <Private-Package>
+ org.apache.felix.ipojo.manipulation,
org.apache.felix.ipojo.composite.architecture,
org.apache.felix.ipojo.composite.service*,
org.apache.felix.ipojo.composite.instance,
- org.apache.felix.ipojo.composite.util, !org.objectweb.asm.xml*,
- org.objectweb.asm*;-split-package:=merge-first </Private-Package>
- <Export-Package> org.apache.felix.ipojo.composite; version="0.9.0"
+ org.apache.felix.ipojo.composite.util,
+ !org.objectweb.asm.xml*,
+ org.objectweb.asm*;-split-package:=merge-first
+ </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
Modified: felix/trunk/ipojo/core/NOTICE
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/core/NOTICE?rev=734402&r1=734401&r2=734402&view=diff
==============================================================================
--- felix/trunk/ipojo/core/NOTICE (original)
+++ felix/trunk/ipojo/core/NOTICE Wed Jan 14 06:07:17 2009
@@ -1,5 +1,5 @@
Apache Felix iPOJO Runtime
-Copyright 2008 The Apache Software Foundation
+Copyright 2008-2009 The Apache Software Foundation
I. Included Software
Modified: felix/trunk/ipojo/core/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/core/pom.xml?rev=734402&r1=734401&r2=734402&view=diff
==============================================================================
--- felix/trunk/ipojo/core/pom.xml (original)
+++ felix/trunk/ipojo/core/pom.xml Wed Jan 14 06:07:17 2009
@@ -30,6 +30,11 @@
<artifactId>org.apache.felix.ipojo</artifactId>
<groupId>org.apache.felix</groupId>
<version>1.1.0-SNAPSHOT</version>
+
+ <properties>
+ <ipojo.package.version>1.1.0</ipojo.package.version>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -46,11 +51,6 @@
<artifactId>org.apache.felix.ipojo.metadata</artifactId>
<version>1.1.0-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.ipojo.manipulator</artifactId>
- <version>1.1.0-SNAPSHOT</version>
- </dependency>
</dependencies>
<build>
<plugins>
@@ -75,22 +75,30 @@
component:org.apache.felix.ipojo.ComponentFactory,
handler:org.apache.felix.ipojo.HandlerManagerFactory
</IPOJO-Extension>
- <Import-Package> org.osgi.framework;version=1.3, org.osgi.service.cm,
- org.osgi.service.log, !net.sourceforge.cobertura.* </Import-Package>
- <Private-Package> org.apache.felix.ipojo.handlers.architecture,
- org.apache.felix.ipojo.handlers.configuration,
+ <Import-Package>
+ org.osgi.framework;version=1.3, <!-- To support KF 2 -->
+ org.osgi.service.cm,
+ org.osgi.service.log,
+ !net.sourceforge.cobertura.* <!-- To support code coverage -->
+ </Import-Package>
+ <Private-Package>
+ org.apache.felix.ipojo.handlers.architecture,
org.apache.felix.ipojo.handlers.lifecycle.callback,
org.apache.felix.ipojo.handlers.lifecycle.controller
</Private-Package>
- <Export-Package> org.apache.felix.ipojo; version="0.9.0",
- org.apache.felix.ipojo.metadata; version="0.9.0",
- org.apache.felix.ipojo.architecture; version="0.9.0",
- org.apache.felix.ipojo.parser; version="0.9.0",
- org.apache.felix.ipojo.util; version="0.9.0",
- org.apache.felix.ipojo.handlers.dependency; version="0.9.0",
- org.apache.felix.ipojo.handlers.providedservice; version="0.9.0",
- org.apache.felix.ipojo.context; version="0.9.0",
- org.osgi.service.cm, org.osgi.service.log </Export-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}",
+ org.osgi.service.cm,
+ org.osgi.service.log
+ </Export-Package>
<Include-Resource> META-INF/LICENCE=LICENSE,
META-INF/NOTICE=NOTICE </Include-Resource>
<_donotcopy> (CVS|.svn|.+.bak|~.+|metadata.xml) </_donotcopy>
Modified: felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/Extender.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/Extender.java?rev=734402&r1=734401&r2=734402&view=diff
==============================================================================
--- felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/Extender.java (original)
+++ felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/Extender.java Wed Jan 14 06:07:17 2009
@@ -56,7 +56,7 @@
* This internal dispatcher helps the OSGi framework to support large
* scale applications. The internal dispatcher is disabled by default.
*/
- protected static boolean DISPATCHER_ENABLED = true;
+ static boolean DISPATCHER_ENABLED = true;
/**
* Property allowing to set if the internal dispatcher is enabled or disabled.
Modified: felix/trunk/ipojo/handler/eventadmin/NOTICE
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/handler/eventadmin/NOTICE?rev=734402&r1=734401&r2=734402&view=diff
==============================================================================
--- felix/trunk/ipojo/handler/eventadmin/NOTICE (original)
+++ felix/trunk/ipojo/handler/eventadmin/NOTICE Wed Jan 14 06:07:17 2009
@@ -1,5 +1,5 @@
Apache Felix iPOJO Event Admin Handler
-Copyright 2008 The Apache Software Foundation
+Copyright 2008-2009 The Apache Software Foundation
I. Included Software
Modified: felix/trunk/ipojo/handler/eventadmin/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/handler/eventadmin/pom.xml?rev=734402&r1=734401&r2=734402&view=diff
==============================================================================
--- felix/trunk/ipojo/handler/eventadmin/pom.xml (original)
+++ felix/trunk/ipojo/handler/eventadmin/pom.xml Wed Jan 14 06:07:17 2009
@@ -37,11 +37,6 @@
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.ipojo.metadata</artifactId>
- <version>1.1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
<version>1.0.1</version>
</dependency>
Modified: felix/trunk/ipojo/handler/extender/NOTICE
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/handler/extender/NOTICE?rev=734402&r1=734401&r2=734402&view=diff
==============================================================================
--- felix/trunk/ipojo/handler/extender/NOTICE (original)
+++ felix/trunk/ipojo/handler/extender/NOTICE Wed Jan 14 06:07:17 2009
@@ -1,5 +1,5 @@
Apache Felix iPOJO Extender Pattern Handler
-Copyright 2008 The Apache Software Foundation
+Copyright 2008-2009 The Apache Software Foundation
I. Included Software
Modified: felix/trunk/ipojo/handler/extender/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/handler/extender/pom.xml?rev=734402&r1=734401&r2=734402&view=diff
==============================================================================
--- felix/trunk/ipojo/handler/extender/pom.xml (original)
+++ felix/trunk/ipojo/handler/extender/pom.xml Wed Jan 14 06:07:17 2009
@@ -38,19 +38,9 @@
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.ipojo.metadata</artifactId>
- <version>1.1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
<version>1.0.1</version>
</dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>1.2.0</version>
- </dependency>
</dependencies>
<build>
<plugins>
Modified: felix/trunk/ipojo/handler/jmx/NOTICE
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/handler/jmx/NOTICE?rev=734402&r1=734401&r2=734402&view=diff
==============================================================================
--- felix/trunk/ipojo/handler/jmx/NOTICE (original)
+++ felix/trunk/ipojo/handler/jmx/NOTICE Wed Jan 14 06:07:17 2009
@@ -1,5 +1,5 @@
Apache Felix iPOJO JMX Handler
-Copyright 2008 The Apache Software Foundation
+Copyright 2008-2009 The Apache Software Foundation
I. Included Software
Modified: felix/trunk/ipojo/handler/jmx/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/handler/jmx/pom.xml?rev=734402&r1=734401&r2=734402&view=diff
==============================================================================
--- felix/trunk/ipojo/handler/jmx/pom.xml (original)
+++ felix/trunk/ipojo/handler/jmx/pom.xml Wed Jan 14 06:07:17 2009
@@ -37,19 +37,9 @@
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.ipojo.metadata</artifactId>
- <version>1.1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
<version>1.0.1</version>
</dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>1.2.0</version>
- </dependency>
</dependencies>
<build>
<plugins>
Modified: felix/trunk/ipojo/handler/temporal/NOTICE
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/handler/temporal/NOTICE?rev=734402&r1=734401&r2=734402&view=diff
==============================================================================
--- felix/trunk/ipojo/handler/temporal/NOTICE (original)
+++ felix/trunk/ipojo/handler/temporal/NOTICE Wed Jan 14 06:07:17 2009
@@ -1,5 +1,5 @@
Apache Felix iPOJO Temporal Dependency Handler
-Copyright 2008 The Apache Software Foundation
+Copyright 2008-2009 The Apache Software Foundation
I. Included Software
Modified: felix/trunk/ipojo/handler/temporal/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/handler/temporal/pom.xml?rev=734402&r1=734401&r2=734402&view=diff
==============================================================================
--- felix/trunk/ipojo/handler/temporal/pom.xml (original)
+++ felix/trunk/ipojo/handler/temporal/pom.xml Wed Jan 14 06:07:17 2009
@@ -38,16 +38,6 @@
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>1.2.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.ipojo.metadata</artifactId>
- <version>1.1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo</artifactId>
<version>1.1.0-SNAPSHOT</version>
</dependency>
Modified: felix/trunk/ipojo/handler/whiteboard/NOTICE
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/handler/whiteboard/NOTICE?rev=734402&r1=734401&r2=734402&view=diff
==============================================================================
--- felix/trunk/ipojo/handler/whiteboard/NOTICE (original)
+++ felix/trunk/ipojo/handler/whiteboard/NOTICE Wed Jan 14 06:07:17 2009
@@ -1,5 +1,5 @@
Apache Felix iPOJO Whiteboard Pattern Handler
-Copyright 2008 The Apache Software Foundation
+Copyright 2008-2009 The Apache Software Foundation
I. Included Software
Modified: felix/trunk/ipojo/handler/whiteboard/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/handler/whiteboard/pom.xml?rev=734402&r1=734401&r2=734402&view=diff
==============================================================================
--- felix/trunk/ipojo/handler/whiteboard/pom.xml (original)
+++ felix/trunk/ipojo/handler/whiteboard/pom.xml Wed Jan 14 06:07:17 2009
@@ -38,19 +38,9 @@
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.ipojo.metadata</artifactId>
- <version>1.1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
<version>1.0.1</version>
</dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>1.2.0</version>
- </dependency>
</dependencies>
<build>
<plugins>
Modified: felix/trunk/ipojo/junit4osgi/felix-command/NOTICE
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/junit4osgi/felix-command/NOTICE?rev=734402&r1=734401&r2=734402&view=diff
==============================================================================
--- felix/trunk/ipojo/junit4osgi/felix-command/NOTICE (original)
+++ felix/trunk/ipojo/junit4osgi/felix-command/NOTICE Wed Jan 14 06:07:17 2009
@@ -1,5 +1,5 @@
Apache Felix iPOJO junit4osgi Felix Command
-Copyright 2008 The Apache Software Foundation
+Copyright 2008-2009 The Apache Software Foundation
I. Included Software
Modified: felix/trunk/ipojo/junit4osgi/felix-command/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/junit4osgi/felix-command/pom.xml?rev=734402&r1=734401&r2=734402&view=diff
==============================================================================
--- felix/trunk/ipojo/junit4osgi/felix-command/pom.xml (original)
+++ felix/trunk/ipojo/junit4osgi/felix-command/pom.xml Wed Jan 14 06:07:17 2009
@@ -63,7 +63,7 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Bundle-Name> iPOJO OSGi Junit Runner - Felix Command
+ <Bundle-Name> Apache Felix iPOJO OSGi Junit Runner - Felix Command
</Bundle-Name>
<Bundle-SymbolicName> ${pom.artifactId}</Bundle-SymbolicName>
<Private-Package> org.apache.felix.ipojo.junit4osgi.command
Modified: felix/trunk/ipojo/junit4osgi/immediate-launcher/NOTICE
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/junit4osgi/immediate-launcher/NOTICE?rev=734402&r1=734401&r2=734402&view=diff
==============================================================================
--- felix/trunk/ipojo/junit4osgi/immediate-launcher/NOTICE (original)
+++ felix/trunk/ipojo/junit4osgi/immediate-launcher/NOTICE Wed Jan 14 06:07:17 2009
@@ -1,5 +1,5 @@
Apache Felix iPOJO junit4osgi Immediate Runner
-Copyright 2008 The Apache Software Foundation
+Copyright 2008-2009 The Apache Software Foundation
I. Included Software
Modified: felix/trunk/ipojo/junit4osgi/immediate-launcher/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/junit4osgi/immediate-launcher/pom.xml?rev=734402&r1=734401&r2=734402&view=diff
==============================================================================
--- felix/trunk/ipojo/junit4osgi/immediate-launcher/pom.xml (original)
+++ felix/trunk/ipojo/junit4osgi/immediate-launcher/pom.xml Wed Jan 14 06:07:17 2009
@@ -63,7 +63,7 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Bundle-Name> iPOJO OSGi Junit Runner - Immediate Runner
+ <Bundle-Name> Apache Felix iPOJO OSGi Junit Runner - Immediate Runner
</Bundle-Name>
<Bundle-SymbolicName> ${pom.artifactId}</Bundle-SymbolicName>
<Private-Package> org.apache.felix.ipojo.junit4osgi.command
Modified: felix/trunk/ipojo/junit4osgi/junit4osgi/NOTICE
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/junit4osgi/junit4osgi/NOTICE?rev=734402&r1=734401&r2=734402&view=diff
==============================================================================
--- felix/trunk/ipojo/junit4osgi/junit4osgi/NOTICE (original)
+++ felix/trunk/ipojo/junit4osgi/junit4osgi/NOTICE Wed Jan 14 06:07:17 2009
@@ -1,5 +1,5 @@
Apache Felix iPOJO junit4osgi Framework
-Copyright 2008 The Apache Software Foundation
+Copyright 2008-2009 The Apache Software Foundation
I. Included Software
Modified: felix/trunk/ipojo/junit4osgi/junit4osgi/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/junit4osgi/junit4osgi/pom.xml?rev=734402&r1=734401&r2=734402&view=diff
==============================================================================
--- felix/trunk/ipojo/junit4osgi/junit4osgi/pom.xml (original)
+++ felix/trunk/ipojo/junit4osgi/junit4osgi/pom.xml Wed Jan 14 06:07:17 2009
@@ -62,7 +62,7 @@
<configuration>
<instructions>
<Bundle-Name>
- iPOJO OSGi Junit Runner
+ Apache Felix iPOJO OSGi Junit Runner
</Bundle-Name>
<Bundle-SymbolicName>
${pom.artifactId}
Modified: felix/trunk/ipojo/junit4osgi/maven-junit4osgi-plugin/NOTICE
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/junit4osgi/maven-junit4osgi-plugin/NOTICE?rev=734402&r1=734401&r2=734402&view=diff
==============================================================================
--- felix/trunk/ipojo/junit4osgi/maven-junit4osgi-plugin/NOTICE (original)
+++ felix/trunk/ipojo/junit4osgi/maven-junit4osgi-plugin/NOTICE Wed Jan 14 06:07:17 2009
@@ -1,5 +1,5 @@
Apache Felix iPOJO junit4osgi Maven Plugin
-Copyright 2008 The Apache Software Foundation
+Copyright 2008-2009 The Apache Software Foundation
I. Included Software
Modified: felix/trunk/ipojo/junit4osgi/swing-runner/NOTICE
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/junit4osgi/swing-runner/NOTICE?rev=734402&r1=734401&r2=734402&view=diff
==============================================================================
--- felix/trunk/ipojo/junit4osgi/swing-runner/NOTICE (original)
+++ felix/trunk/ipojo/junit4osgi/swing-runner/NOTICE Wed Jan 14 06:07:17 2009
@@ -1,5 +1,5 @@
Apache Felix iPOJO junit4osgi Swing Runner
-Copyright 2008 The Apache Software Foundation
+Copyright 2008-2009 The Apache Software Foundation
I. Included Software
Modified: felix/trunk/ipojo/junit4osgi/swing-runner/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/junit4osgi/swing-runner/pom.xml?rev=734402&r1=734401&r2=734402&view=diff
==============================================================================
--- felix/trunk/ipojo/junit4osgi/swing-runner/pom.xml (original)
+++ felix/trunk/ipojo/junit4osgi/swing-runner/pom.xml Wed Jan 14 06:07:17 2009
@@ -56,7 +56,7 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Bundle-Name> iPOJO OSGi Junit Runner - Swing Gui</Bundle-Name>
+ <Bundle-Name>Apache Felix iPOJO OSGi Junit Runner - Swing Gui</Bundle-Name>
<Bundle-SymbolicName> ${pom.artifactId}</Bundle-SymbolicName>
<Private-Package> org.apache.felix.ipojo.junit4osgi.command
</Private-Package>
Modified: felix/trunk/ipojo/manipulator/NOTICE
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/NOTICE?rev=734402&r1=734401&r2=734402&view=diff
==============================================================================
--- felix/trunk/ipojo/manipulator/NOTICE (original)
+++ felix/trunk/ipojo/manipulator/NOTICE Wed Jan 14 06:07:17 2009
@@ -1,5 +1,5 @@
Apache Felix iPOJO Manipulator
-Copyright 2008 The Apache Software Foundation
+Copyright 2008-2009 The Apache Software Foundation
I. Included Software
Modified: felix/trunk/ipojo/manipulator/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/pom.xml?rev=734402&r1=734401&r2=734402&view=diff
==============================================================================
--- felix/trunk/ipojo/manipulator/pom.xml (original)
+++ felix/trunk/ipojo/manipulator/pom.xml Wed Jan 14 06:07:17 2009
@@ -70,6 +70,7 @@
META-INF/LICENCE.asm=LICENSE.asm, META-INF/NOTICE=NOTICE,
xsd=src/main/resources </Include-Resource>
</instructions>
+ <obrRepository>NONE</obrRepository>
</configuration>
</plugin>
<plugin>
Modified: felix/trunk/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulation/annotations/FieldCollector.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulation/annotations/FieldCollector.java?rev=734402&r1=734401&r2=734402&view=diff
==============================================================================
--- felix/trunk/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulation/annotations/FieldCollector.java (original)
+++ felix/trunk/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulation/annotations/FieldCollector.java Wed Jan 14 06:07:17 2009
@@ -230,7 +230,7 @@
req.addAttribute(new Attribute("field", m_field));
if (m_specification != null) {
- req.addAttribute(new Attribute("interface", m_specification));
+ req.addAttribute(new Attribute("specification", m_specification));
}
if (m_filter != null) {
req.addAttribute(new Attribute("filter", m_filter));
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=734402&r1=734401&r2=734402&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 Wed Jan 14 06:07:17 2009
@@ -58,6 +58,11 @@
* @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
*/
public class Pojoization {
+
+ /**
+ * iPOJO Imported Package Version.
+ */
+ public static final String IPOJO_PACKAGE_VERSION = " 1.1.0";
/**
* List of component types.
@@ -586,7 +591,7 @@
private void setImports(Attributes att) {
Map imports = parseHeader(att.getValue("Import-Package"));
Map ver = new TreeMap();
- ver.put("version", "0.9.0");
+ ver.put("version", IPOJO_PACKAGE_VERSION);
if (!imports.containsKey("org.apache.felix.ipojo")) {
imports.put("org.apache.felix.ipojo", ver);
}
@@ -773,21 +778,19 @@
}
/**
- * Get packages referenced by composite.
+ * Get packages referenced by component.
* @return the list of referenced packages.
*/
private List getReferredPackages() {
List referred = new ArrayList();
for (int i = 0; i < m_metadata.length; i++) {
- if (m_metadata[i].getName().equalsIgnoreCase("composite")) {
- Element[] elems = m_metadata[i].getElements();
- for (int j = 0; j < elems.length; j++) {
- String att = elems[j].getAttribute("specification");
- if (att != null) {
- int last = att.lastIndexOf('.');
- if (last != -1) {
- referred.add(att.substring(0, last));
- }
+ Element[] elems = m_metadata[i].getElements();
+ for (int j = 0; j < elems.length; j++) {
+ String att = elems[j].getAttribute("specification");
+ if (att != null) {
+ int last = att.lastIndexOf('.');
+ if (last != -1) {
+ referred.add(att.substring(0, last));
}
}
}
Modified: felix/trunk/ipojo/metadata/NOTICE
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/metadata/NOTICE?rev=734402&r1=734401&r2=734402&view=diff
==============================================================================
--- felix/trunk/ipojo/metadata/NOTICE (original)
+++ felix/trunk/ipojo/metadata/NOTICE Wed Jan 14 06:07:17 2009
@@ -1,5 +1,5 @@
Apache Felix iPOJO Metadata
-Copyright 2008 The Apache Software Foundation
+Copyright 2008-2009 The Apache Software Foundation
I. Included Software
Modified: felix/trunk/ipojo/metadata/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/metadata/pom.xml?rev=734402&r1=734401&r2=734402&view=diff
==============================================================================
--- felix/trunk/ipojo/metadata/pom.xml (original)
+++ felix/trunk/ipojo/metadata/pom.xml Wed Jan 14 06:07:17 2009
@@ -46,6 +46,7 @@
<Include-Resource> META-INF/LICENCE=LICENSE,
META-INF/NOTICE=NOTICE </Include-Resource>
</instructions>
+ <obrRepository>NONE</obrRepository>
</configuration>
</plugin>
<plugin>
Modified: felix/trunk/ipojo/plugin/NOTICE
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/plugin/NOTICE?rev=734402&r1=734401&r2=734402&view=diff
==============================================================================
--- felix/trunk/ipojo/plugin/NOTICE (original)
+++ felix/trunk/ipojo/plugin/NOTICE Wed Jan 14 06:07:17 2009
@@ -1,5 +1,5 @@
Apache Felix iPOJO Maven Plugin
-Copyright 2008 The Apache Software Foundation
+Copyright 2008-2009 The Apache Software Foundation
I. Included Software
Modified: felix/trunk/ipojo/plugin/src/main/resources/archetype-resources/src/main/resources/metadata.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/plugin/src/main/resources/archetype-resources/src/main/resources/metadata.xml?rev=734402&r1=734401&r2=734402&view=diff
==============================================================================
--- felix/trunk/ipojo/plugin/src/main/resources/archetype-resources/src/main/resources/metadata.xml (original)
+++ felix/trunk/ipojo/plugin/src/main/resources/archetype-resources/src/main/resources/metadata.xml Wed Jan 14 06:07:17 2009
@@ -1,7 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<iPOJO>
- <component className="$YOUR_COMPONENT_CLASS">
-
+<ipojo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="org.apache.felix.ipojo http://felix.apache.org/ipojo/schemas/CURRENT/core.xsd"
+ xmlns="org.apache.felix.ipojo">
+ <component classname="$YOUR_COMPONENT_CLASS">
+ <!-- Component type description -->
</component>
- <instance component="$YOUR_COMPONENT_CLASS"/>
-</iPOJO>
\ No newline at end of file
+ <instance component="$YOUR_COMPONENT_CLASS" />
+</ipojo>
\ No newline at end of file