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/07/03 15:16:27 UTC
svn commit: r790900 [1/2] - in /felix/trunk/ipojo: ant/ api/ arch/
composite/ core/ core/src/main/resources/ handler/eventadmin/
handler/extender/ handler/jmx/ handler/temporal/ handler/transaction/
handler/whiteboard/ manipulator/ manipulator/src/main...
Author: clement
Date: Fri Jul 3 13:16:24 2009
New Revision: 790900
URL: http://svn.apache.org/viewvc?rev=790900&view=rev
Log:
Fix version number consistently
Modified:
felix/trunk/ipojo/ant/pom.xml
felix/trunk/ipojo/api/pom.xml
felix/trunk/ipojo/arch/pom.xml
felix/trunk/ipojo/composite/pom.xml
felix/trunk/ipojo/core/pom.xml
felix/trunk/ipojo/core/src/main/resources/core.xsd
felix/trunk/ipojo/handler/eventadmin/pom.xml
felix/trunk/ipojo/handler/extender/pom.xml
felix/trunk/ipojo/handler/jmx/pom.xml
felix/trunk/ipojo/handler/temporal/pom.xml
felix/trunk/ipojo/handler/transaction/pom.xml
felix/trunk/ipojo/handler/whiteboard/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/manipulator/src/main/resources/core.xsd
felix/trunk/ipojo/online-manipulator/pom.xml
felix/trunk/ipojo/plugin/pom.xml
felix/trunk/ipojo/tests/api/pom.xml
felix/trunk/ipojo/tests/api/src/test/java/org/apache/felix/ipojo/tests/api/CompositeTest.java
felix/trunk/ipojo/tests/api/src/test/java/org/apache/felix/ipojo/tests/api/ExternalHandlerTest.java
felix/trunk/ipojo/tests/api/src/test/java/org/apache/felix/ipojo/tests/api/PrimitiveComponentTest.java
felix/trunk/ipojo/tests/api/src/test/java/org/apache/felix/ipojo/tests/api/SingletonComponentTest.java
felix/trunk/ipojo/tests/bundleAsiPOJO/bundleAsiPOJO/pom.xml
felix/trunk/ipojo/tests/bundleAsiPOJO/bundleAsiPOJO/src/main/java/org/apache/felix/ipojo/tinybundles/BundleAsiPOJO.java
felix/trunk/ipojo/tests/bundleAsiPOJO/tests/consumer.xml
felix/trunk/ipojo/tests/bundleAsiPOJO/tests/pom.xml
felix/trunk/ipojo/tests/bundleAsiPOJO/tests/provider.xml
felix/trunk/ipojo/tests/bundleAsiPOJO/tests/src/test/java/org/apache/felix/ipojo/tinybundles/tests/BundleCreationTest.java
felix/trunk/ipojo/tests/composite/composite-runtime/pom.xml
felix/trunk/ipojo/tests/composite/composite-runtime/src/main/resources/metadata.xml
felix/trunk/ipojo/tests/composite/import-export/pom.xml
felix/trunk/ipojo/tests/composite/import-export/src/main/resources/metadata.xml
felix/trunk/ipojo/tests/composite/service-instance/pom.xml
felix/trunk/ipojo/tests/composite/service-instance/src/main/resources/metadata.xml
felix/trunk/ipojo/tests/composite/service-providing/pom.xml
felix/trunk/ipojo/tests/composite/service-providing/src/main/resources/metadata.xml
felix/trunk/ipojo/tests/core/annotations/pom.xml
felix/trunk/ipojo/tests/core/bad-configurations/pom.xml
felix/trunk/ipojo/tests/core/configadmin/pom.xml
felix/trunk/ipojo/tests/core/configadmin/src/main/resources/metadata.xml
felix/trunk/ipojo/tests/core/configuration/pom.xml
felix/trunk/ipojo/tests/core/configuration/src/main/resources/metadata.xml
felix/trunk/ipojo/tests/core/external-handlers/pom.xml
felix/trunk/ipojo/tests/core/external-handlers/src/main/resources/metadata.xml
felix/trunk/ipojo/tests/core/factories/pom.xml
felix/trunk/ipojo/tests/core/factories/src/main/resources/metadata.xml
felix/trunk/ipojo/tests/core/factory-version/cons.xml
felix/trunk/ipojo/tests/core/factory-version/instances.xml
felix/trunk/ipojo/tests/core/factory-version/pom.xml
felix/trunk/ipojo/tests/core/factory-version/provider-v1.1.xml
felix/trunk/ipojo/tests/core/factory-version/provider-v1.xml
felix/trunk/ipojo/tests/core/factory-version/src/test/java/org/apache/felix/ipojo/tests/core/FactoryVersionTest.java
felix/trunk/ipojo/tests/core/factory-version/src/test/java/org/apache/felix/ipojo/tests/core/VersionConflictTest.java
felix/trunk/ipojo/tests/core/factory-version/vprovider-v1.xml
felix/trunk/ipojo/tests/core/factory-version/vprovider-v2.xml
felix/trunk/ipojo/tests/core/lifecycle-callback/pom.xml
felix/trunk/ipojo/tests/core/lifecycle-callback/src/main/resources/metadata.xml
felix/trunk/ipojo/tests/core/lifecycle-controller/pom.xml
felix/trunk/ipojo/tests/core/service-dependency-bindingpolicy/pom.xml
felix/trunk/ipojo/tests/core/service-dependency-bindingpolicy/src/main/resources/metadata.xml
felix/trunk/ipojo/tests/core/service-dependency-comparator/pom.xml
felix/trunk/ipojo/tests/core/service-dependency-comparator/src/main/resources/metadata.xml
felix/trunk/ipojo/tests/core/service-dependency-filter/pom.xml
felix/trunk/ipojo/tests/core/service-dependency-filter/src/main/resources/metadata.xml
felix/trunk/ipojo/tests/core/service-dependency/pom.xml
felix/trunk/ipojo/tests/core/service-dependency/src/main/resources/metadata.xml
felix/trunk/ipojo/tests/core/service-providing-strategies/pom.xml
felix/trunk/ipojo/tests/core/service-providing-strategies/src/main/resources/metadata.xml
felix/trunk/ipojo/tests/core/service-providing/pom.xml
felix/trunk/ipojo/tests/core/service-providing/src/main/resources/metadata.xml
felix/trunk/ipojo/tests/handler/eventadmin/pom.xml
felix/trunk/ipojo/tests/handler/eventadmin/src/main/resources/metadata.xml
felix/trunk/ipojo/tests/handler/temporal/pom.xml
felix/trunk/ipojo/tests/handler/temporal/src/main/resources/metadata.xml
felix/trunk/ipojo/tests/handler/transaction/pom.xml
felix/trunk/ipojo/tests/handler/whiteboard/pom.xml
felix/trunk/ipojo/tests/manipulator/creation/pom.xml
felix/trunk/ipojo/tests/manipulator/creation/src/main/resources/metadata.xml
felix/trunk/ipojo/tests/manipulator/manipulation/pom.xml
felix/trunk/ipojo/tests/manipulator/manipulation/src/main/resources/metadata.xml
felix/trunk/ipojo/tests/manipulator/manipulator-java5/pom.xml
felix/trunk/ipojo/tests/manipulator/manipulator-java5/src/main/resources/metadata.xml
felix/trunk/ipojo/tests/manipulator/metadata/pom.xml
felix/trunk/ipojo/tests/manipulator/metadata/src/main/resources/metadata.xml
felix/trunk/ipojo/tests/manipulator/primitives/pom.xml
felix/trunk/ipojo/tests/manipulator/primitives/src/main/resources/metadata.xml
felix/trunk/ipojo/tests/online-manipulator/pom.xml
felix/trunk/ipojo/tests/online-manipulator/src/test/java/consumer.xml
felix/trunk/ipojo/tests/online-manipulator/src/test/java/org/apache/felix/org/apache/felix/ipojo/online/manipulator/test/OnlineManipulatorTest.java
felix/trunk/ipojo/tests/online-manipulator/src/test/java/provider.xml
felix/trunk/ipojo/webconsole-plugin/pom.xml
Modified: felix/trunk/ipojo/ant/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/ant/pom.xml?rev=790900&r1=790899&r2=790900&view=diff
==============================================================================
--- felix/trunk/ipojo/ant/pom.xml (original)
+++ felix/trunk/ipojo/ant/pom.xml Fri Jul 3 13:16:24 2009
@@ -33,12 +33,12 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.metadata</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>${pom.version}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.manipulator</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>${pom.version}</version>
</dependency>
<dependency>
<groupId>xerces</groupId>
Modified: felix/trunk/ipojo/api/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/api/pom.xml?rev=790900&r1=790899&r2=790900&view=diff
==============================================================================
--- felix/trunk/ipojo/api/pom.xml (original)
+++ felix/trunk/ipojo/api/pom.xml Fri Jul 3 13:16:24 2009
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -40,7 +40,7 @@
<Bundle-SymbolicName>${pom.artifactId}
</Bundle-SymbolicName>
<Import-Package>
- !org.objectweb.asm.tree,
+ !org.objectweb.asm.tree,
org.apache.felix.ipojo.composite;resolution:=optional,
*
</Import-Package>
@@ -54,7 +54,7 @@
<Include-Resource> META-INF/LICENCE=LICENSE,
META-INF/NOTICE=NOTICE, META-INF/LICENSE.asm=LICENSE.asm
</Include-Resource>
-
+
</instructions>
</configuration>
</plugin>
@@ -84,24 +84,24 @@
<configLocation>http://felix.apache.org/ipojo/dev/checkstyle_ipojo.xml</configLocation>
</configuration>
</plugin>
-
+
</plugins>
</build>
<dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>${pom.version}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.composite</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>${pom.version}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.manipulator</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>${pom.version}</version>
</dependency>
<dependency>
<groupId>asm</groupId>
Modified: felix/trunk/ipojo/arch/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/arch/pom.xml?rev=790900&r1=790899&r2=790900&view=diff
==============================================================================
--- felix/trunk/ipojo/arch/pom.xml (original)
+++ felix/trunk/ipojo/arch/pom.xml Fri Jul 3 13:16:24 2009
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>${pom.version}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -53,10 +53,10 @@
<Bundle-Name>Apache Felix iPOJO Arch Command</Bundle-Name>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Bundle-Vendor> The Apache Software Foundation </Bundle-Vendor>
- <Bundle-Description> iPOJO Arch command for Felix
+ <Bundle-Description> iPOJO Arch command for Felix
</Bundle-Description>
<Bundle-DocURL>
- http://felix.apache.org/site/architecture-handler.html
+ http://felix.apache.org/site/architecture-handler.html
</Bundle-DocURL>
<Private-Package> org.apache.felix.ipojo.arch </Private-Package>
<Include-Resource> META-INF/LICENCE=LICENSE,
@@ -67,7 +67,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-ipojo-plugin</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>${pom.version}</version>
<executions>
<execution>
<goals>
Modified: felix/trunk/ipojo/composite/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/composite/pom.xml?rev=790900&r1=790899&r2=790900&view=diff
==============================================================================
--- felix/trunk/ipojo/composite/pom.xml (original)
+++ felix/trunk/ipojo/composite/pom.xml Fri Jul 3 13:16:24 2009
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -29,11 +29,11 @@
<artifactId>org.apache.felix.ipojo.composite</artifactId>
<groupId>org.apache.felix</groupId>
<version>1.3.0-SNAPSHOT</version>
-
+
<properties>
- <ipojo.package.version>1.2.0</ipojo.package.version>
+ <ipojo.package.version>1.4.0</ipojo.package.version>
</properties>
-
+
<dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -43,12 +43,12 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.manipulator</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>${pom.version}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>${pom.version}</version>
</dependency>
</dependencies>
<build>
@@ -63,36 +63,36 @@
<Bundle-Name>Apache Felix iPOJO Composite</Bundle-Name>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Bundle-Vendor> The Apache Software Foundation </Bundle-Vendor>
- <Bundle-Description> iPOJO Composititon Framework
+ <Bundle-Description> iPOJO Composititon Framework
</Bundle-Description>
<Bundle-DocURL>
- http://felix.apache.org/site/apache-felix-ipojo.html
+ http://felix.apache.org/site/apache-felix-ipojo.html
</Bundle-DocURL>
- <Import-Package>
+ <Import-Package>
org.apache.felix.ipojo,
org.apache.felix.ipojo.architecture,
- org.apache.felix.ipojo.context,
+ org.apache.felix.ipojo.context,
org.apache.felix.ipojo.metadata,
- org.apache.felix.ipojo.parser,
+ org.apache.felix.ipojo.parser,
org.apache.felix.ipojo.util,
org.osgi.framework;version=1.3 </Import-Package>
- <Private-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
</Private-Package>
- <Export-Package>
+ <Export-Package>
org.apache.felix.ipojo.composite; version="${ipojo.package.version}" ,
!org.objectweb.asm.xml*,
org.objectweb.asm*;-split-package:=merge-first ,
org.apache.felix.ipojo.manipulation
</Export-Package>
<Include-Resource> META-INF/LICENSE=LICENSE,
- META-INF/NOTICE=NOTICE, META-INF/LICENSE.asm=LICENSE.asm
+ META-INF/NOTICE=NOTICE, META-INF/LICENSE.asm=LICENSE.asm
</Include-Resource>
<IPOJO-Extension>
- composite:org.apache.felix.ipojo.composite.CompositeFactory
+ composite:org.apache.felix.ipojo.composite.CompositeFactory
</IPOJO-Extension>
<_donotcopy> (CVS|.svn|.+.bak|~.+|metadata.xml) </_donotcopy>
</instructions>
@@ -101,7 +101,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-ipojo-plugin</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>${pom.version}</version>
<executions>
<execution>
<goals>
Modified: felix/trunk/ipojo/core/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/core/pom.xml?rev=790900&r1=790899&r2=790900&view=diff
==============================================================================
--- felix/trunk/ipojo/core/pom.xml (original)
+++ felix/trunk/ipojo/core/pom.xml Fri Jul 3 13:16:24 2009
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -29,11 +29,11 @@
<artifactId>org.apache.felix.ipojo</artifactId>
<groupId>org.apache.felix</groupId>
<version>1.3.0-SNAPSHOT</version>
-
+
<properties>
- <ipojo.package.version>1.3.0</ipojo.package.version>
+ <ipojo.package.version>1.4.0</ipojo.package.version>
</properties>
-
+
<dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -48,7 +48,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.metadata</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>${pom.version}</version>
</dependency>
<dependency>
<groupId>asm</groupId>
@@ -75,28 +75,28 @@
<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> org.apache.felix.ipojo.Extender
</Bundle-Activator>
<Bundle-DocURL>
- http://felix.apache.org/site/apache-felix-ipojo.html
+ 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
+ handler:org.apache.felix.ipojo.HandlerManagerFactory
</IPOJO-Extension>
- <Import-Package>
- org.osgi.framework;version=1.3, <!-- To support KF 2 -->
+ <Import-Package>
+ org.osgi.framework;version=1.3, <!-- To support KF 2 -->
org.osgi.service.cm,
- org.osgi.service.log,
+ org.osgi.service.log,
!net.sourceforge.cobertura.* <!-- To support code coverage -->
</Import-Package>
- <Private-Package>
+ <Private-Package>
org.apache.felix.ipojo.handlers.architecture,
org.apache.felix.ipojo.handlers.lifecycle.callback,
org.apache.felix.ipojo.handlers.lifecycle.controller,
org.objectweb.asm
</Private-Package>
- <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}",
@@ -106,12 +106,12 @@
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
+ org.osgi.service.cm,
+ org.osgi.service.log
</Export-Package>
- <Include-Resource>
+ <Include-Resource>
META-INF/LICENCE=LICENSE,
- META-INF/NOTICE=NOTICE
+ META-INF/NOTICE=NOTICE
</Include-Resource>
<_donotcopy> (CVS|.svn|.+.bak|~.+|metadata.xml) </_donotcopy>
</instructions>
@@ -120,7 +120,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-ipojo-plugin</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>${pom.version}</version>
<executions>
<execution>
<goals>
Modified: felix/trunk/ipojo/core/src/main/resources/core.xsd
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/core/src/main/resources/core.xsd?rev=790900&r1=790899&r2=790900&view=diff
==============================================================================
--- felix/trunk/ipojo/core/src/main/resources/core.xsd (original)
+++ felix/trunk/ipojo/core/src/main/resources/core.xsd Fri Jul 3 13:16:24 2009
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -107,6 +107,11 @@
<xs:documentation>The (unique) name of the instance.</xs:documentation>
</xs:annotation>
</xs:attribute>
+ <xs:attribute name="version" type="xs:string" use="optional">
+ <xs:annotation>
+ <xs:documentation>The version of the factory to use.</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
</xs:extension>
</xs:complexContent>
</xs:complexType>
@@ -201,6 +206,10 @@
<xs:annotation>
<xs:documentation>Factory method called to create POJO objects instead of the constructor. The specified method must be a static method of the implementation class returning an instance of this implementation class. The factory method can receive the bundle context in argument.</xs:documentation>
</xs:annotation></xs:attribute>
+ <xs:attribute name="version" type="xs:string" use="optional">
+ <xs:annotation>
+ <xs:documentation>Set the version of this component type</xs:documentation>
+ </xs:annotation></xs:attribute>
</xs:complexType>
<xs:complexType name="RequiresType">
<xs:annotation>
@@ -216,14 +225,14 @@
</xs:annotation>
</xs:element>
</xs:sequence>
-
+
<xs:attribute name="interface" type="xs:string"
use="prohibited">
<xs:annotation>
<xs:documentation>The interface describing the required service type. This attribute is needed only when using aggregate dependencies with field injection and when the type of this field is a list, vector, collection and set. This attribute is deprecated, use 'specification'.</xs:documentation>
</xs:annotation>
</xs:attribute>
-
+
<xs:attribute name="field" type="xs:string"
use="optional">
<xs:annotation>
@@ -251,7 +260,7 @@
<xs:documentation>Specific service provider. The dependency can only be fulfilled by the component with the matching name, or by the service with a matching PID.</xs:documentation>
</xs:annotation>
</xs:attribute>
-
+
<xs:attribute name="scope" use="optional">
<xs:simpleType>
<xs:restriction base="xs:string">
@@ -413,8 +422,12 @@
<xs:annotation>
<xs:documentation>Unique identifier used to reconfigure components properties (via Managed Services) with the Configuration Admin.</xs:documentation>
</xs:annotation></xs:attribute>
+ <xs:attribute name="updated" type="xs:string" use="optional">
+ <xs:annotation>
+ <xs:documentation>Method called when a reconfiguration is done</xs:documentation>
+ </xs:annotation></xs:attribute>
</xs:complexType>
-
+
<xs:complexType name="ServiceDependencyType">
<xs:attribute name="specification" type="xs:string" use="optional">
<xs:annotation>
Modified: felix/trunk/ipojo/handler/eventadmin/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/handler/eventadmin/pom.xml?rev=790900&r1=790899&r2=790900&view=diff
==============================================================================
--- felix/trunk/ipojo/handler/eventadmin/pom.xml (original)
+++ felix/trunk/ipojo/handler/eventadmin/pom.xml Fri Jul 3 13:16:24 2009
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -32,7 +32,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>${pom.version}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -58,10 +58,10 @@
version="1.2.0"</Export-Package>
<Bundle-Name>${pom.name}</Bundle-Name>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
- <Bundle-Description> iPOJO Event Admin Handlers
+ <Bundle-Description> iPOJO Event Admin Handlers
</Bundle-Description>
<Bundle-DocURL>
- http://felix.apache.org/site/event-admin-handlers.html
+ http://felix.apache.org/site/event-admin-handlers.html
</Bundle-DocURL>
<Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
<Include-Resource> META-INF/LICENCE=LICENSE,
@@ -72,7 +72,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-ipojo-plugin</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>${pom.version}</version>
<executions>
<execution>
<goals>
Modified: felix/trunk/ipojo/handler/extender/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/handler/extender/pom.xml?rev=790900&r1=790899&r2=790900&view=diff
==============================================================================
--- felix/trunk/ipojo/handler/extender/pom.xml (original)
+++ felix/trunk/ipojo/handler/extender/pom.xml Fri Jul 3 13:16:24 2009
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>${pom.version}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -50,12 +50,12 @@
<configuration>
<instructions>
<Bundle-Vendor> The Apache Software Foundation </Bundle-Vendor>
- <Bundle-Description> iPOJO Extender Pattern Handler
+ <Bundle-Description> iPOJO Extender Pattern Handler
</Bundle-Description>
<Bundle-DocURL>
- http://felix.apache.org/site/extender-pattern-handler.html
+ http://felix.apache.org/site/extender-pattern-handler.html
</Bundle-DocURL>
- <Private-Package> org.apache.felix.ipojo.handler.extender
+ <Private-Package> org.apache.felix.ipojo.handler.extender
</Private-Package>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Bundle-Name>${pom.name}</Bundle-Name>
@@ -67,7 +67,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-ipojo-plugin</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>${pom.version}</version>
<executions>
<execution>
<goals>
Modified: felix/trunk/ipojo/handler/jmx/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/handler/jmx/pom.xml?rev=790900&r1=790899&r2=790900&view=diff
==============================================================================
--- felix/trunk/ipojo/handler/jmx/pom.xml (original)
+++ felix/trunk/ipojo/handler/jmx/pom.xml Fri Jul 3 13:16:24 2009
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -32,7 +32,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>${pom.version}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -49,14 +49,14 @@
<version>1.4.3</version>
<configuration>
<instructions>
- <Private-Package> org.apache.felix.ipojo.handlers.jmx
+ <Private-Package> org.apache.felix.ipojo.handlers.jmx
</Private-Package>
<Bundle-Name>${pom.name}</Bundle-Name>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
<Bundle-Description> iPOJO JMX Handler </Bundle-Description>
<Bundle-DocURL>
- http://felix.apache.org/site/ipojo-jmx-handler.html
+ http://felix.apache.org/site/ipojo-jmx-handler.html
</Bundle-DocURL>
<Include-Resource> META-INF/LICENCE=LICENSE,
META-INF/NOTICE=NOTICE </Include-Resource>
@@ -74,7 +74,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-ipojo-plugin</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>${pom.version}</version>
<executions>
<execution>
<goals>
Modified: felix/trunk/ipojo/handler/temporal/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/handler/temporal/pom.xml?rev=790900&r1=790899&r2=790900&view=diff
==============================================================================
--- felix/trunk/ipojo/handler/temporal/pom.xml (original)
+++ felix/trunk/ipojo/handler/temporal/pom.xml Fri Jul 3 13:16:24 2009
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -38,7 +38,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>${pom.version}</version>
</dependency>
<dependency>
<groupId>asm</groupId>
@@ -61,18 +61,18 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Private-Package>
+ <Private-Package>
org.apache.felix.ipojo.handler.temporal,
- org.objectweb.asm
+ org.objectweb.asm
</Private-Package>
<Bundle-Name>${pom.name}</Bundle-Name>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Import-Package>!org.objectweb.asm.tree, *</Import-Package>
<Bundle-Vendor> The Apache Software Foundation </Bundle-Vendor>
- <Bundle-Description> iPOJO Temporal Dependency Handler
+ <Bundle-Description> iPOJO Temporal Dependency Handler
</Bundle-Description>
<Bundle-DocURL>
- http://felix.apache.org/site/temporal-service-dependency.html
+ http://felix.apache.org/site/temporal-service-dependency.html
</Bundle-DocURL>
<Include-Resource> META-INF/LICENCE=LICENSE,
META-INF/LICENCE.asm=LICENSE.asm,
@@ -84,7 +84,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-ipojo-plugin</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>${pom.version}</version>
<executions>
<execution>
<goals>
Modified: felix/trunk/ipojo/handler/transaction/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/handler/transaction/pom.xml?rev=790900&r1=790899&r2=790900&view=diff
==============================================================================
--- felix/trunk/ipojo/handler/transaction/pom.xml (original)
+++ felix/trunk/ipojo/handler/transaction/pom.xml Fri Jul 3 13:16:24 2009
@@ -24,7 +24,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-ipojo-plugin</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>${pom.version}</version>
<executions>
<execution>
<goals>
@@ -48,12 +48,12 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>${pom.version}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.metadata</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>${pom.version}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
Modified: felix/trunk/ipojo/handler/whiteboard/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/handler/whiteboard/pom.xml?rev=790900&r1=790899&r2=790900&view=diff
==============================================================================
--- felix/trunk/ipojo/handler/whiteboard/pom.xml (original)
+++ felix/trunk/ipojo/handler/whiteboard/pom.xml Fri Jul 3 13:16:24 2009
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>${pom.version}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -52,12 +52,12 @@
<Bundle-Name>${pom.name}</Bundle-Name>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Bundle-Vendor> The Apache Software Foundation </Bundle-Vendor>
- <Bundle-Description> iPOJO White-Board Pattern Handler
+ <Bundle-Description> iPOJO White-Board Pattern Handler
</Bundle-Description>
<Bundle-DocURL>
- http://felix.apache.org/site/white-board-pattern-handler.html
+ http://felix.apache.org/site/white-board-pattern-handler.html
</Bundle-DocURL>
- <Private-Package> org.apache.felix.ipojo.handler.wbp
+ <Private-Package> org.apache.felix.ipojo.handler.wbp
</Private-Package>
<Bundle-Name>${pom.name}</Bundle-Name>
<Include-Resource> META-INF/LICENCE=LICENSE,
@@ -68,7 +68,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-ipojo-plugin</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>${pom.version}</version>
<executions>
<execution>
<goals>
Modified: felix/trunk/ipojo/manipulator/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/pom.xml?rev=790900&r1=790899&r2=790900&view=diff
==============================================================================
--- felix/trunk/ipojo/manipulator/pom.xml (original)
+++ felix/trunk/ipojo/manipulator/pom.xml Fri Jul 3 13:16:24 2009
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -44,7 +44,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.metadata</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>${pom.version}</version>
</dependency>
</dependencies>
<build>
@@ -59,7 +59,7 @@
<Bundle-Name>iPOJO Manipulator</Bundle-Name>
<Bundle-Vendor> The Apache Software Foundation </Bundle-Vendor>
<Bundle-Description> iPOJO Manipulator </Bundle-Description>
- <Export-Package> org.apache.felix.ipojo.manipulator
+ <Export-Package> org.apache.felix.ipojo.manipulator
</Export-Package>
<Private-Package> org.apache.felix.ipojo.manipulation,
org.apache.felix.ipojo.manipulation.annotations,
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=790900&r1=790899&r2=790900&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 Fri Jul 3 13:16:24 2009
@@ -1,4 +1,4 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -66,7 +66,7 @@
/**
* iPOJO Imported Package Version.
*/
- public static final String IPOJO_PACKAGE_VERSION = " 1.3.0";
+ public static final String IPOJO_PACKAGE_VERSION = " 1.4.0";
/**
* List of component types.
Modified: felix/trunk/ipojo/manipulator/src/main/resources/core.xsd
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/src/main/resources/core.xsd?rev=790900&r1=790899&r2=790900&view=diff
==============================================================================
--- felix/trunk/ipojo/manipulator/src/main/resources/core.xsd (original)
+++ felix/trunk/ipojo/manipulator/src/main/resources/core.xsd Fri Jul 3 13:16:24 2009
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -107,6 +107,11 @@
<xs:documentation>The (unique) name of the instance.</xs:documentation>
</xs:annotation>
</xs:attribute>
+ <xs:attribute name="version" type="xs:string" use="optional">
+ <xs:annotation>
+ <xs:documentation>The version of the factory to use.</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
</xs:extension>
</xs:complexContent>
</xs:complexType>
@@ -201,6 +206,10 @@
<xs:annotation>
<xs:documentation>Factory method called to create POJO objects instead of the constructor. The specified method must be a static method of the implementation class returning an instance of this implementation class. The factory method can receive the bundle context in argument.</xs:documentation>
</xs:annotation></xs:attribute>
+ <xs:attribute name="version" type="xs:string" use="optional">
+ <xs:annotation>
+ <xs:documentation>Set the version of this component type</xs:documentation>
+ </xs:annotation></xs:attribute>
</xs:complexType>
<xs:complexType name="RequiresType">
<xs:annotation>
@@ -216,14 +225,14 @@
</xs:annotation>
</xs:element>
</xs:sequence>
-
+
<xs:attribute name="interface" type="xs:string"
use="prohibited">
<xs:annotation>
<xs:documentation>The interface describing the required service type. This attribute is needed only when using aggregate dependencies with field injection and when the type of this field is a list, vector, collection and set. This attribute is deprecated, use 'specification'.</xs:documentation>
</xs:annotation>
</xs:attribute>
-
+
<xs:attribute name="field" type="xs:string"
use="optional">
<xs:annotation>
@@ -251,7 +260,7 @@
<xs:documentation>Specific service provider. The dependency can only be fulfilled by the component with the matching name, or by the service with a matching PID.</xs:documentation>
</xs:annotation>
</xs:attribute>
-
+
<xs:attribute name="scope" use="optional">
<xs:simpleType>
<xs:restriction base="xs:string">
@@ -309,7 +318,7 @@
</xs:attribute>
</xs:complexType>
<xs:element name="provides" type="ProvidesType" id="provides"></xs:element>
- <xs:complexType name="ProvidesType">
+ <xs:complexType name="ProvidesType">
<xs:annotation>
<xs:documentation>Provided service(s) description.</xs:documentation>
</xs:annotation>
@@ -397,7 +406,7 @@
<xs:element name="properties" type="PropertiesType" id="properties"></xs:element>
<xs:complexType name="PropertiesType">
<xs:annotation>
- <xs:documentation>List configuration properties. This field will receive the property value.</xs:documentation>
+ <xs:documentation>List of component, instance or service properties. This field will receive the property value.</xs:documentation>
</xs:annotation>
<xs:sequence minOccurs="0" maxOccurs="unbounded">
<xs:element name="property" type="PropertyType">
@@ -415,10 +424,10 @@
</xs:annotation></xs:attribute>
<xs:attribute name="updated" type="xs:string" use="optional">
<xs:annotation>
- <xs:documentation>Updated method called when a reconfiguration is done</xs:documentation>
+ <xs:documentation>Method called when a reconfiguration is done</xs:documentation>
</xs:annotation></xs:attribute>
</xs:complexType>
-
+
<xs:complexType name="ServiceDependencyType">
<xs:attribute name="specification" type="xs:string" use="optional">
<xs:annotation>
Modified: felix/trunk/ipojo/online-manipulator/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/online-manipulator/pom.xml?rev=790900&r1=790899&r2=790900&view=diff
==============================================================================
--- felix/trunk/ipojo/online-manipulator/pom.xml (original)
+++ felix/trunk/ipojo/online-manipulator/pom.xml Fri Jul 3 13:16:24 2009
@@ -45,7 +45,7 @@
org.apache.felix.ipojo.manipulation,
org.apache.felix.ipojo.manipulation.annotations,
org.objectweb.asm.commons, org.objectweb.asm </Export-Package>
- <Import-Package> !org.objectweb.asm.tree, !sun.io, *
+ <Import-Package> !org.objectweb.asm.tree, !sun.io, org.osgi.framework;version=1.3, *
</Import-Package>
<!-- <Embed-Dependency>xercesImpl|xml-resolver</Embed-Dependency> -->
</instructions>
@@ -54,7 +54,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-ipojo-plugin</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>${pom.version}</version>
<executions>
<execution>
<goals>
@@ -91,7 +91,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.manipulator</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>${pom.version}</version>
</dependency>
<dependency>
<groupId>asm</groupId>
Modified: felix/trunk/ipojo/plugin/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/plugin/pom.xml?rev=790900&r1=790899&r2=790900&view=diff
==============================================================================
--- felix/trunk/ipojo/plugin/pom.xml (original)
+++ felix/trunk/ipojo/plugin/pom.xml Fri Jul 3 13:16:24 2009
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -59,12 +59,12 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.metadata</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>${pom.version}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.manipulator</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>${pom.version}</version>
</dependency>
</dependencies>
<build>
Modified: felix/trunk/ipojo/tests/api/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/api/pom.xml?rev=790900&r1=790899&r2=790900&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/api/pom.xml (original)
+++ felix/trunk/ipojo/tests/api/pom.xml Fri Jul 3 13:16:24 2009
@@ -54,29 +54,29 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>${pom.version}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.api</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>${pom.version}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.composite</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>${pom.version}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.manipulator</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>${pom.version}</version>
</dependency>
<!-- For external handlermanagement -->
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.handler.whiteboard</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>${pom.version}</version>
</dependency>
<!--
Modified: felix/trunk/ipojo/tests/api/src/test/java/org/apache/felix/ipojo/tests/api/CompositeTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/api/src/test/java/org/apache/felix/ipojo/tests/api/CompositeTest.java?rev=790900&r1=790899&r2=790900&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/api/src/test/java/org/apache/felix/ipojo/tests/api/CompositeTest.java (original)
+++ felix/trunk/ipojo/tests/api/src/test/java/org/apache/felix/ipojo/tests/api/CompositeTest.java Fri Jul 3 13:16:24 2009
@@ -3,9 +3,13 @@
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.junit.Assert.assertThat;
+import static org.ops4j.pax.exam.CoreOptions.equinox;
+import static org.ops4j.pax.exam.CoreOptions.felix;
+import static org.ops4j.pax.exam.CoreOptions.knopflerfish;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.options;
import static org.ops4j.pax.exam.CoreOptions.provision;
+import static org.ops4j.pax.exam.MavenUtils.asInProject;
import org.apache.felix.ipojo.ComponentInstance;
import org.apache.felix.ipojo.ConfigurationException;
@@ -32,34 +36,36 @@
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
-import static org.ops4j.pax.exam.MavenUtils.*;
@RunWith( JUnit4TestRunner.class )
public class CompositeTest {
-
+
@Inject
private BundleContext context;
-
+
private OSGiHelper osgi;
-
+
private IPOJOHelper ipojo;
-
+
@Before
public void init() {
osgi = new OSGiHelper(context);
ipojo = new IPOJOHelper(context);
}
-
+
@After
public void stop() {
ipojo.dispose();
osgi.dispose();
}
-
+
@Configuration
- public static Option[] configure() {
+ public static Option[] configure() {
Option[] opt = options(
+ felix(),
+ equinox(),
+ knopflerfish(),
provision(
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.ipojo").version(asInProject()),
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.ipojo.composite").version(asInProject()),
@@ -74,63 +80,63 @@
// Define the component types
PrimitiveComponentType prov = createAProvider();
PrimitiveComponentType cons = createAConsumer();
-
+
CompositeComponentType type = new CompositeComponentType()
.setBundleContext(context)
.setComponentTypeName("comp1")
.addInstance(new Instance(prov.getFactory().getName()))
.addInstance(new Instance(cons.getFactory().getName()));
-
+
ComponentInstance ci = type.createInstance();
-
+
assertThat("ci is valid", ci.getState(), is(ComponentInstance.VALID));
-
+
// Stop cons
cons.stop();
assertThat("ci is invalid", ci.getState(), is(ComponentInstance.INVALID));
-
+
// Restart cons
cons.start();
assertThat("ci is valid - 2", ci.getState(), is(ComponentInstance.VALID));
}
-
+
@Test
public void createACompositeWithAnInstantiatedService() throws UnacceptableConfiguration, MissingHandlerException, ConfigurationException {
// Define the component types
PrimitiveComponentType prov = createAProvider();
prov.start();
PrimitiveComponentType cons = createAConsumer();
-
- ServiceReference[] refs = osgi.getServiceReferences(Factory.class.getName(),
+
+ ServiceReference[] refs = osgi.getServiceReferences(Factory.class.getName(),
"(component.providedServiceSpecifications=" + Foo.class.getName() +")");
assertThat(refs.length, is(not(0)));
-
+
Factory factory = (Factory) osgi.getServiceObject(refs[0]);
System.out.println(factory.getComponentDescription().getDescription());
-
+
CompositeComponentType type = new CompositeComponentType()
.setBundleContext(context)
.setComponentTypeName("comp2")
.addSubService(new InstantiatedService().setSpecification(Foo.class.getName()))
.addInstance(new Instance(cons.getFactory().getName()));
-
+
ComponentInstance ci = type.createInstance();
-
+
System.out.println(ci.getInstanceDescription().getDescription());
-
+
assertThat("ci is valid", ci.getState(), is(ComponentInstance.VALID));
-
+
// Stop prov
prov.stop();
assertThat("ci is invalid", ci.getState(), is(ComponentInstance.INVALID));
-
+
// Restart prov
prov.start();
assertThat("ci is valid - 2", ci.getState(), is(ComponentInstance.VALID));
}
-
+
@Test
public void createACompositeWithAnOptionalInstantiatedService() throws UnacceptableConfiguration, MissingHandlerException, ConfigurationException {
// Define the component types
@@ -141,55 +147,55 @@
.setBundleContext(context)
.setComponentTypeName("comp3")
.addSubService(new InstantiatedService().setSpecification(Foo.class.getName()).setOptional(true));
-
+
ComponentInstance ci = type.createInstance();
-
+
assertThat("ci is valid", ci.getState(), is(ComponentInstance.VALID));
-
+
// Stop prov
prov.stop();
assertThat("ci is valid - 1", ci.getState(), is(ComponentInstance.VALID));
-
+
// Restart prov
prov.start();
assertThat("ci is valid - 2", ci.getState(), is(ComponentInstance.VALID));
}
-
+
@Test
public void createACompositeWithAnImportedService() throws UnacceptableConfiguration, MissingHandlerException, ConfigurationException {
// Define the component types
PrimitiveComponentType prov = createAProvider();
prov.createInstance();
PrimitiveComponentType cons = createAConsumer();
-
- ServiceReference[] refs = osgi.getServiceReferences(Factory.class.getName(),
+
+ ServiceReference[] refs = osgi.getServiceReferences(Factory.class.getName(),
"(component.providedServiceSpecifications=" + Foo.class.getName() +")");
assertThat(refs.length, is(not(0)));
-
+
CompositeComponentType type = new CompositeComponentType()
.setBundleContext(context)
.setComponentTypeName("comp2")
.addSubService(new ImportedService().setSpecification(Foo.class.getName()))
.addInstance(new Instance(cons.getFactory().getName()));
-
+
ComponentInstance ci = type.createInstance();
-
+
System.out.println(ci.getInstanceDescription().getDescription());
-
+
assertThat("ci is valid", ci.getState(), is(ComponentInstance.VALID));
-
+
// Stop prov
prov.stop();
assertThat("ci is invalid", ci.getState(), is(ComponentInstance.INVALID));
-
+
// Restart prov
prov.start();
prov.createInstance();
assertThat("ci is valid - 2", ci.getState(), is(ComponentInstance.VALID));
}
-
+
@Test
public void createACompositeWithAnOptionalImportedService() throws UnacceptableConfiguration, MissingHandlerException, ConfigurationException {
// Define the component types
@@ -200,22 +206,22 @@
.setBundleContext(context)
.setComponentTypeName("comp3")
.addSubService(new ImportedService().setSpecification(Foo.class.getName()).setOptional(true));
-
+
ComponentInstance ci = type.createInstance();
-
+
assertThat("ci is valid", ci.getState(), is(ComponentInstance.VALID));
-
+
// Stop prov
prov.stop();
assertThat("ci is valid - 1", ci.getState(), is(ComponentInstance.VALID));
-
+
// Restart prov
prov.start();
prov.createInstance();
assertThat("ci is valid - 2", ci.getState(), is(ComponentInstance.VALID));
}
-
+
@Test
public void createACompositeWithExportingAService() throws UnacceptableConfiguration, MissingHandlerException, ConfigurationException {
// Define the component types
@@ -223,25 +229,25 @@
prov.start();
PrimitiveComponentType cons = createAConsumer();
ComponentInstance c = cons.createInstance();
-
+
CompositeComponentType type = new CompositeComponentType()
.setBundleContext(context)
.setComponentTypeName("compExport")
.addSubService(new InstantiatedService().setSpecification(Foo.class.getName()))
.addService(new ExportedService().setSpecification(Foo.class.getName()));
-
+
ComponentInstance ci = type.createInstance();
-
+
assertThat("ci is valid", ci.getState(), is(ComponentInstance.VALID));
assertThat("c is valid", c.getState(), is(ComponentInstance.VALID));
-
-
+
+
// Stop prov
prov.stop();
assertThat("ci is invalid", ci.getState(), is(ComponentInstance.INVALID));
assertThat("c is invalid", c.getState(), is(ComponentInstance.INVALID));
-
+
// Restart prov
prov.start();
assertThat("ci is valid - 2", ci.getState(), is(ComponentInstance.VALID));
@@ -249,7 +255,7 @@
}
-
+
private PrimitiveComponentType createAProvider() {
return new PrimitiveComponentType()
.setBundleContext(context)
@@ -257,7 +263,7 @@
.setPublic(true)
.addService(new Service()); // Provide the FooService
}
-
+
private PrimitiveComponentType createAConsumer() {
return new PrimitiveComponentType()
.setBundleContext(context)
Modified: felix/trunk/ipojo/tests/api/src/test/java/org/apache/felix/ipojo/tests/api/ExternalHandlerTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/api/src/test/java/org/apache/felix/ipojo/tests/api/ExternalHandlerTest.java?rev=790900&r1=790899&r2=790900&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/api/src/test/java/org/apache/felix/ipojo/tests/api/ExternalHandlerTest.java (original)
+++ felix/trunk/ipojo/tests/api/src/test/java/org/apache/felix/ipojo/tests/api/ExternalHandlerTest.java Fri Jul 3 13:16:24 2009
@@ -3,6 +3,9 @@
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.junit.Assert.assertThat;
+import static org.ops4j.pax.exam.CoreOptions.equinox;
+import static org.ops4j.pax.exam.CoreOptions.felix;
+import static org.ops4j.pax.exam.CoreOptions.knopflerfish;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.options;
import static org.ops4j.pax.exam.CoreOptions.provision;
@@ -26,29 +29,32 @@
@RunWith( JUnit4TestRunner.class )
public class ExternalHandlerTest {
-
+
@Inject
private BundleContext context;
-
+
private OSGiHelper osgi;
-
+
private IPOJOHelper ipojo;
-
+
@Before
public void init() {
osgi = new OSGiHelper(context);
ipojo = new IPOJOHelper(context);
}
-
+
@After
public void stop() {
ipojo.dispose();
osgi.dispose();
}
-
+
@Configuration
- public static Option[] configure() {
+ public static Option[] configure() {
Option[] opt = options(
+ felix(),
+ equinox(),
+ knopflerfish(),
provision(
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.ipojo").version(asInProject()),
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.ipojo.api").version(asInProject()),
@@ -57,7 +63,7 @@
);
return opt;
}
-
+
@Test
public void createAHost() throws Exception {
PrimitiveComponentType type = createAWhiteboardHost();
@@ -66,7 +72,7 @@
HandlerDescription hd = ci.getInstanceDescription().getHandlerDescription(Whiteboard.NAMESPACE + ":" + Whiteboard.NAME);
assertThat (hd, is (notNullValue()));
}
-
+
@Test
public void createDoubleHost() throws Exception {
PrimitiveComponentType type = createASecondWhiteboardHost();
@@ -75,7 +81,7 @@
HandlerDescription hd = ci.getInstanceDescription().getHandlerDescription(Whiteboard.NAMESPACE + ":" + Whiteboard.NAME);
assertThat (hd, is (notNullValue()));
}
-
+
private PrimitiveComponentType createAWhiteboardHost() {
return new PrimitiveComponentType()
.setBundleContext(context)
@@ -86,7 +92,7 @@
.setFilter("(foo=foo)")
);
}
-
+
private PrimitiveComponentType createASecondWhiteboardHost() {
return new PrimitiveComponentType()
.setBundleContext(context)
Modified: felix/trunk/ipojo/tests/api/src/test/java/org/apache/felix/ipojo/tests/api/PrimitiveComponentTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/api/src/test/java/org/apache/felix/ipojo/tests/api/PrimitiveComponentTest.java?rev=790900&r1=790899&r2=790900&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/api/src/test/java/org/apache/felix/ipojo/tests/api/PrimitiveComponentTest.java (original)
+++ felix/trunk/ipojo/tests/api/src/test/java/org/apache/felix/ipojo/tests/api/PrimitiveComponentTest.java Fri Jul 3 13:16:24 2009
@@ -4,6 +4,9 @@
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
+import static org.ops4j.pax.exam.CoreOptions.equinox;
+import static org.ops4j.pax.exam.CoreOptions.felix;
+import static org.ops4j.pax.exam.CoreOptions.knopflerfish;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.options;
import static org.ops4j.pax.exam.CoreOptions.provision;
@@ -57,6 +60,9 @@
@Configuration
public static Option[] configure() {
Option[] opt = options(
+ felix(),
+ equinox(),
+ knopflerfish(),
provision(
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.ipojo").version(asInProject()),
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.ipojo.api").version(asInProject())
Modified: felix/trunk/ipojo/tests/api/src/test/java/org/apache/felix/ipojo/tests/api/SingletonComponentTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/api/src/test/java/org/apache/felix/ipojo/tests/api/SingletonComponentTest.java?rev=790900&r1=790899&r2=790900&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/api/src/test/java/org/apache/felix/ipojo/tests/api/SingletonComponentTest.java (original)
+++ felix/trunk/ipojo/tests/api/src/test/java/org/apache/felix/ipojo/tests/api/SingletonComponentTest.java Fri Jul 3 13:16:24 2009
@@ -5,6 +5,9 @@
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.fail;
+import static org.ops4j.pax.exam.CoreOptions.equinox;
+import static org.ops4j.pax.exam.CoreOptions.felix;
+import static org.ops4j.pax.exam.CoreOptions.knopflerfish;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.options;
import static org.ops4j.pax.exam.CoreOptions.provision;
@@ -36,29 +39,32 @@
@RunWith( JUnit4TestRunner.class )
public class SingletonComponentTest {
-
+
@Inject
private BundleContext context;
-
+
private OSGiHelper osgi;
-
+
private IPOJOHelper ipojo;
-
+
@Before
public void init() {
osgi = new OSGiHelper(context);
ipojo = new IPOJOHelper(context);
}
-
+
@After
public void stop() {
ipojo.dispose();
osgi.dispose();
}
-
+
@Configuration
- public static Option[] configure() {
+ public static Option[] configure() {
Option[] opt = options(
+ felix(),
+ equinox(),
+ knopflerfish(),
provision(
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.ipojo").version(asInProject()),
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.ipojo.api").version(asInProject())
@@ -81,7 +87,7 @@
assertThat(ref, is(notNullValue()));
}
-
+
@Test
public void killTheFactory() throws Exception {
assertThat( context, is( notNullValue() ) );
@@ -99,7 +105,7 @@
.getInstanceName());
assertThat(ref, is(nullValue()));
}
-
+
@Test
public void createAServiceCons() throws Exception {
assertThat( context, is( notNullValue() ) );
@@ -111,77 +117,77 @@
is(ComponentInstance.INVALID));
}
-
+
@Test
public void createBoth() throws Exception {
ComponentInstance cons = createAConsumer().create();
// cons is invalid
assertThat("cons is invalid", cons.getState(), is(ComponentInstance.INVALID));
-
+
ComponentInstance prov = createAProvider().create();
assertThat("prov is valid", prov.getState(), is(ComponentInstance.VALID));
assertThat("cons is valid", cons.getState(), is(ComponentInstance.VALID));
}
-
+
@Test
public void createTwoCons() throws Exception {
ComponentInstance cons1 = createAConsumer().create();
// cons is invalid
assertThat("cons is invalid", cons1.getState(), is(ComponentInstance.INVALID));
-
+
ComponentInstance prov = createAProvider().create();
assertThat("prov is valid", prov.getState(), is(ComponentInstance.VALID));
assertThat("cons is valid", cons1.getState(), is(ComponentInstance.VALID));
-
+
ComponentInstance cons2 = createAnOptionalConsumer().create();
-
+
assertThat("cons2 is valid", cons2.getState(), is(ComponentInstance.VALID));
-
+
prov.stop();
assertThat("cons is invalid", cons1.getState(), is(ComponentInstance.INVALID));
assertThat("cons2 is valid", cons2.getState(), is(ComponentInstance.VALID));
}
-
+
@Test
@Ignore
public void setObject() throws Exception {
ComponentInstance cons = createAConsumer().setObject(new MyComponentImpl(5)).create();
// cons is invalid
assertThat("cons is invalid", cons.getState(), is(ComponentInstance.INVALID));
-
+
ComponentInstance prov = createAProvider().create();
assertThat("prov is valid", prov.getState(), is(ComponentInstance.VALID));
assertThat("cons is valid", cons.getState(), is(ComponentInstance.VALID));
-
+
}
-
+
private SingletonComponentType createAProvider() {
PrimitiveComponentType type = new SingletonComponentType()
.setBundleContext(context)
.setClassName(FooImpl.class.getName())
.addService(new Service()); // Provide the FooService
-
+
return (SingletonComponentType) type;
}
-
+
private SingletonComponentType createAConsumer() {
PrimitiveComponentType type = new SingletonComponentType()
.setBundleContext(context)
.setClassName(org.example.service.impl.MyComponentImpl.class.getName())
.addDependency(new Dependency().setField("myFoo"))
.setValidateMethod("start");
-
+
return (SingletonComponentType) type;
}
-
+
private SingletonComponentType createAnOptionalConsumer() {
PrimitiveComponentType type = new SingletonComponentType()
.setBundleContext(context)
.setClassName(org.example.service.impl.MyComponentImpl.class.getName())
.addDependency(new Dependency().setField("myFoo").setOptional(true))
.setValidateMethod("start");
-
+
return (SingletonComponentType) type;
}
Modified: felix/trunk/ipojo/tests/bundleAsiPOJO/bundleAsiPOJO/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/bundleAsiPOJO/bundleAsiPOJO/pom.xml?rev=790900&r1=790899&r2=790900&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/bundleAsiPOJO/bundleAsiPOJO/pom.xml (original)
+++ felix/trunk/ipojo/tests/bundleAsiPOJO/bundleAsiPOJO/pom.xml Fri Jul 3 13:16:24 2009
@@ -23,7 +23,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.manipulator</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>${pom.version}</version>
</dependency>
<dependency>
<groupId>xerces</groupId>
Modified: felix/trunk/ipojo/tests/bundleAsiPOJO/bundleAsiPOJO/src/main/java/org/apache/felix/ipojo/tinybundles/BundleAsiPOJO.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/bundleAsiPOJO/bundleAsiPOJO/src/main/java/org/apache/felix/ipojo/tinybundles/BundleAsiPOJO.java?rev=790900&r1=790899&r2=790900&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/bundleAsiPOJO/bundleAsiPOJO/src/main/java/org/apache/felix/ipojo/tinybundles/BundleAsiPOJO.java (original)
+++ felix/trunk/ipojo/tests/bundleAsiPOJO/bundleAsiPOJO/src/main/java/org/apache/felix/ipojo/tinybundles/BundleAsiPOJO.java Fri Jul 3 13:16:24 2009
@@ -60,7 +60,7 @@
}
}
e.printStackTrace();
- throw new RuntimeException(e.getMessage());
+ throw new RuntimeException(e.getMessage() + " : " + list);
}
}
Modified: felix/trunk/ipojo/tests/bundleAsiPOJO/tests/consumer.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/bundleAsiPOJO/tests/consumer.xml?rev=790900&r1=790899&r2=790900&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/bundleAsiPOJO/tests/consumer.xml (original)
+++ felix/trunk/ipojo/tests/bundleAsiPOJO/tests/consumer.xml Fri Jul 3 13:16:24 2009
@@ -1,3 +1,5 @@
-<ipojo>
-<instance component="org.apache.felix.ipojo.pax.tinybundles.tests.impl.Consumer"/>
+<ipojo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="org.apache.felix.ipojo http://felix.apache.org/ipojo/schemas/SNAPSHOT/core.xsd"
+ xmlns="org.apache.felix.ipojo">
+ <instance component="org.apache.felix.ipojo.pax.tinybundles.tests.impl.Consumer"/>
</ipojo>
\ No newline at end of file
Modified: felix/trunk/ipojo/tests/bundleAsiPOJO/tests/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/bundleAsiPOJO/tests/pom.xml?rev=790900&r1=790899&r2=790900&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/bundleAsiPOJO/tests/pom.xml (original)
+++ felix/trunk/ipojo/tests/bundleAsiPOJO/tests/pom.xml Fri Jul 3 13:16:24 2009
@@ -4,7 +4,7 @@
<groupId>ipojo.tests</groupId>
<artifactId>org.apache.felix.ipojo.tinybundle.bundleAsiPOJO.test</artifactId>
<packaging>jar</packaging>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
<name>bundleAsiPOJO Tests</name>
<build>
<plugins>
@@ -98,19 +98,21 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.tinybundles.bundleAsiPOJO</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>${pom.version}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.annotations</artifactId>
- <version>1.2.0</version>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.ipojo</artifactId>
+ <version>${pom.version}</version>
</dependency>
</dependencies>
-
-
-
<repositories>
<repository>
<id>ops4j.releases</id>
Modified: felix/trunk/ipojo/tests/bundleAsiPOJO/tests/provider.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/bundleAsiPOJO/tests/provider.xml?rev=790900&r1=790899&r2=790900&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/bundleAsiPOJO/tests/provider.xml (original)
+++ felix/trunk/ipojo/tests/bundleAsiPOJO/tests/provider.xml Fri Jul 3 13:16:24 2009
@@ -1,6 +1,8 @@
-<ipojo>
-<component classname="org.apache.felix.ipojo.pax.tinybundles.tests.impl.MyProvider">
- <provides/>
-</component>
-<instance component="org.apache.felix.ipojo.pax.tinybundles.tests.impl.MyProvider"/>
+<ipojo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="org.apache.felix.ipojo http://felix.apache.org/ipojo/schemas/SNAPSHOT/core.xsd"
+ xmlns="org.apache.felix.ipojo">
+ <component classname="org.apache.felix.ipojo.pax.tinybundles.tests.impl.MyProvider">
+ <provides/>
+ </component>
+ <instance component="org.apache.felix.ipojo.pax.tinybundles.tests.impl.MyProvider"/>
</ipojo>
\ No newline at end of file
Modified: felix/trunk/ipojo/tests/bundleAsiPOJO/tests/src/test/java/org/apache/felix/ipojo/tinybundles/tests/BundleCreationTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/bundleAsiPOJO/tests/src/test/java/org/apache/felix/ipojo/tinybundles/tests/BundleCreationTest.java?rev=790900&r1=790899&r2=790900&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/bundleAsiPOJO/tests/src/test/java/org/apache/felix/ipojo/tinybundles/tests/BundleCreationTest.java (original)
+++ felix/trunk/ipojo/tests/bundleAsiPOJO/tests/src/test/java/org/apache/felix/ipojo/tinybundles/tests/BundleCreationTest.java Fri Jul 3 13:16:24 2009
@@ -4,6 +4,11 @@
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.options;
import static org.ops4j.pax.exam.CoreOptions.provision;
+import static org.ops4j.pax.exam.CoreOptions.felix;
+import static org.ops4j.pax.exam.CoreOptions.equinox;
+import static org.ops4j.pax.exam.CoreOptions.knopflerfish;
+import static org.ops4j.pax.exam.MavenUtils.asInProject;
+
import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.asURL;
import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle;
import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.with;
@@ -47,16 +52,19 @@
}
return options(
+ felix(),
+ equinox(),
+ knopflerfish(),
provision(
- mavenBundle()
- .groupId( "org.ops4j.pax.tinybundles" )
- .artifactId( "pax-tinybundles-core" )
- .version( "0.5.0-SNAPSHOT" )),
+ mavenBundle()
+ .groupId( "org.ops4j.pax.swissbox" )
+ .artifactId( "pax-swissbox-tinybundles" )
+ .version( asInProject() )),
provision(
mavenBundle()
.groupId("org.apache.felix")
.artifactId("org.apache.felix.ipojo")
- .version("1.3.0-SNAPSHOT")
+ .version ( asInProject() )
),
provision(
newBundle()
Modified: felix/trunk/ipojo/tests/composite/composite-runtime/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/composite/composite-runtime/pom.xml?rev=790900&r1=790899&r2=790900&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/composite/composite-runtime/pom.xml (original)
+++ felix/trunk/ipojo/tests/composite/composite-runtime/pom.xml Fri Jul 3 13:16:24 2009
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -27,17 +27,17 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>${pom.version}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.composite</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>${pom.version}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.metadata</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>${pom.version}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -82,7 +82,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-ipojo-plugin</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>${pom.version}</version>
<executions>
<execution>
<goals>
Modified: felix/trunk/ipojo/tests/composite/composite-runtime/src/main/resources/metadata.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/composite/composite-runtime/src/main/resources/metadata.xml?rev=790900&r1=790899&r2=790900&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/composite/composite-runtime/src/main/resources/metadata.xml (original)
+++ felix/trunk/ipojo/tests/composite/composite-runtime/src/main/resources/metadata.xml Fri Jul 3 13:16:24 2009
@@ -1,7 +1,7 @@
<ipojo
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="org.apache.felix.ipojo http://felix.apache.org/ipojo/schemas/1.1.0-SNAPSHOT/core.xsd
- org.apache.felix.composite http://felix.apache.org/ipojo/schemas/1.1.0-SNAPSHOT/composite.xsd"
+ xsi:schemaLocation="org.apache.felix.ipojo http://felix.apache.org/ipojo/schemas/SNAPSHOT/core.xsd
+ org.apache.felix.composite http://felix.apache.org/ipojo/schemas/SNAPSHOT/composite.xsd"
xmlns="org.apache.felix.ipojo"
xmlns:comp="org.apache.felix.ipojo.composite"
xmlns:cs="org.apache.felix.ipojo.test.composite.handler.CheckServiceHandler">
@@ -76,13 +76,13 @@
<property name="baz" type="java.lang.String" value="bar" />
</provides>
</component>
-
+
<component
classname="org.apache.felix.ipojo.test.composite.component.BazProviderType1"
name="BazProviderType">
<provides />
</component>
-
+
<component
classname="org.apache.felix.ipojo.test.composite.component.TataProvider"
name="tata">
@@ -100,14 +100,14 @@
name="totoglue">
<requires field="m_toto" scope="composite" />
</component>
-
+
<!-- Composite -->
<comp:composite name="composite.empty" architecture="true">
</comp:composite>
-
+
<component classname="org.apache.felix.ipojo.test.composite.component.Baz2CheckProvider" name="Baz2CheckProvider" architecture="true">
<requires field="fs" scope="composite"/>
<provides/>
</component>
-
+
</ipojo>
Modified: felix/trunk/ipojo/tests/composite/import-export/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/composite/import-export/pom.xml?rev=790900&r1=790899&r2=790900&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/composite/import-export/pom.xml (original)
+++ felix/trunk/ipojo/tests/composite/import-export/pom.xml Fri Jul 3 13:16:24 2009
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -27,17 +27,17 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>${pom.version}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.composite</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>${pom.version}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.metadata</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>${pom.version}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -57,7 +57,7 @@
<dependency>
<groupId>ipojo.tests</groupId>
<artifactId>tests.composite</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>${pom.version}</version>
</dependency>
</dependencies>
<build>
@@ -84,7 +84,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-ipojo-plugin</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>${pom.version}</version>
<executions>
<execution>
<goals>
Modified: felix/trunk/ipojo/tests/composite/import-export/src/main/resources/metadata.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/composite/import-export/src/main/resources/metadata.xml?rev=790900&r1=790899&r2=790900&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/composite/import-export/src/main/resources/metadata.xml (original)
+++ felix/trunk/ipojo/tests/composite/import-export/src/main/resources/metadata.xml Fri Jul 3 13:16:24 2009
@@ -1,7 +1,7 @@
<ipojo
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="org.apache.felix.ipojo http://felix.apache.org/ipojo/schemas/1.1.0-SNAPSHOT/core.xsd
- org.apache.felix.composite http://felix.apache.org/ipojo/schemas/1.1.0-SNAPSHOT/composite.xsd"
+ xsi:schemaLocation="org.apache.felix.ipojo http://felix.apache.org/ipojo/schemas/SNAPSHOT/core.xsd
+ org.apache.felix.composite http://felix.apache.org/ipojo/schemas/SNAPSHOT/composite.xsd"
xmlns="org.apache.felix.ipojo"
xmlns:comp="org.apache.felix.ipojo.composite"
xmlns:cs="org.apache.felix.ipojo.test.composite.handler.CheckServiceHandler">
Modified: felix/trunk/ipojo/tests/composite/service-instance/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/composite/service-instance/pom.xml?rev=790900&r1=790899&r2=790900&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/composite/service-instance/pom.xml (original)
+++ felix/trunk/ipojo/tests/composite/service-instance/pom.xml Fri Jul 3 13:16:24 2009
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -27,17 +27,17 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>${pom.version}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.composite</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>${pom.version}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.metadata</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>${pom.version}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -57,7 +57,7 @@
<dependency>
<groupId>ipojo.tests</groupId>
<artifactId>tests.composite</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>${pom.version}</version>
</dependency>
</dependencies>
<build>
@@ -73,7 +73,7 @@
${pom.artifactId}
</Bundle-SymbolicName>
<Private-Package>
- org.apache.felix.ipojo.test.composite.instantiator*, org.apache.felix.ipojo.test.composite.instance, org.apache.felix.ipojo.test.instance
+ org.apache.felix.ipojo.test.composite.instantiator*, org.apache.felix.ipojo.test.composite.instance, org.apache.felix.ipojo.test.instance
</Private-Package>
<Export-Package>org.apache.felix.ipojo.test.instance.service</Export-Package>
<Test-Suite>
@@ -85,7 +85,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-ipojo-plugin</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>${pom.version}</version>
<executions>
<execution>
<goals>
Modified: felix/trunk/ipojo/tests/composite/service-instance/src/main/resources/metadata.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/composite/service-instance/src/main/resources/metadata.xml?rev=790900&r1=790899&r2=790900&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/composite/service-instance/src/main/resources/metadata.xml (original)
+++ felix/trunk/ipojo/tests/composite/service-instance/src/main/resources/metadata.xml Fri Jul 3 13:16:24 2009
@@ -1,7 +1,7 @@
<ipojo
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="org.apache.felix.ipojo http://felix.apache.org/ipojo/schemas/1.1.0-SNAPSHOT/core.xsd
- org.apache.felix.composite http://felix.apache.org/ipojo/schemas/1.1.0-SNAPSHOT/composite.xsd"
+ xsi:schemaLocation="org.apache.felix.ipojo http://felix.apache.org/ipojo/schemas/SNAPSHOT/core.xsd
+ org.apache.felix.composite http://felix.apache.org/ipojo/schemas/SNAPSHOT/composite.xsd"
xmlns="org.apache.felix.ipojo"
xmlns:comp="org.apache.felix.ipojo.composite"
xmlns:cs="org.apache.felix.ipojo.test.composite.handler.CheckServiceHandler">
Modified: felix/trunk/ipojo/tests/composite/service-providing/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/composite/service-providing/pom.xml?rev=790900&r1=790899&r2=790900&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/composite/service-providing/pom.xml (original)
+++ felix/trunk/ipojo/tests/composite/service-providing/pom.xml Fri Jul 3 13:16:24 2009
@@ -6,9 +6,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -27,17 +27,17 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>${pom.version}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.composite</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>${pom.version}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.metadata</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>${pom.version}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -57,7 +57,7 @@
<dependency>
<groupId>ipojo.tests</groupId>
<artifactId>tests.composite</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>${pom.version}</version>
</dependency>
</dependencies>
<build>
@@ -76,7 +76,7 @@
org.apache.felix.ipojo.test.composite.provides, org.apache.felix.ipojo.test.composite.test
</Private-Package>
<Test-Suite>
- org.apache.felix.ipojo.test.composite.test.CompositeTest, org.apache.felix.ipojo.test.composite.provides.ProvidesTestSuite
+ org.apache.felix.ipojo.test.composite.test.CompositeTest, org.apache.felix.ipojo.test.composite.provides.ProvidesTestSuite
</Test-Suite>
</instructions>
</configuration>
@@ -84,7 +84,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-ipojo-plugin</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>${pom.version}</version>
<executions>
<execution>
<goals>
Modified: felix/trunk/ipojo/tests/composite/service-providing/src/main/resources/metadata.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/composite/service-providing/src/main/resources/metadata.xml?rev=790900&r1=790899&r2=790900&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/composite/service-providing/src/main/resources/metadata.xml (original)
+++ felix/trunk/ipojo/tests/composite/service-providing/src/main/resources/metadata.xml Fri Jul 3 13:16:24 2009
@@ -1,7 +1,7 @@
<ipojo
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="org.apache.felix.ipojo http://felix.apache.org/ipojo/schemas/1.1.0-SNAPSHOT/core.xsd
- org.apache.felix.composite http://felix.apache.org/ipojo/schemas/1.1.0-SNAPSHOT/composite.xsd"
+ xsi:schemaLocation="org.apache.felix.ipojo http://felix.apache.org/ipojo/schemas/SNAPSHOT/core.xsd
+ org.apache.felix.composite http://felix.apache.org/ipojo/schemas/SNAPSHOT/composite.xsd"
xmlns="org.apache.felix.ipojo"
xmlns:comp="org.apache.felix.ipojo.composite">
<comp:composite name="composite.test.3" architecture="true">