You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ri...@apache.org on 2007/08/23 17:29:22 UTC
svn commit: r569043 - in /felix/trunk: examples/ examples/dictionaryclient/
examples/dictionaryclient2/ examples/dictionaryservice.itest/
examples/dictionaryservice/ examples/eventlistener/
examples/extenderbased.circle/ examples/extenderbased.host/ ex...
Author: rickhall
Date: Thu Aug 23 08:29:20 2007
New Revision: 569043
URL: http://svn.apache.org/viewvc?rev=569043&view=rev
Log:
Modified all examples to use maven-bundle-plugin and to use released
artifacts where possible.
Modified:
felix/trunk/examples/dictionaryclient/pom.xml
felix/trunk/examples/dictionaryclient2/pom.xml
felix/trunk/examples/dictionaryservice.itest/pom.xml
felix/trunk/examples/dictionaryservice/pom.xml
felix/trunk/examples/eventlistener/pom.xml
felix/trunk/examples/extenderbased.circle/pom.xml
felix/trunk/examples/extenderbased.host/pom.xml
felix/trunk/examples/extenderbased.square/pom.xml
felix/trunk/examples/extenderbased.triangle/pom.xml
felix/trunk/examples/frenchdictionary/pom.xml
felix/trunk/examples/pom.xml
felix/trunk/examples/servicebased.circle/pom.xml
felix/trunk/examples/servicebased.host/pom.xml
felix/trunk/examples/servicebased.square/pom.xml
felix/trunk/examples/servicebased.triangle/pom.xml
felix/trunk/examples/spellcheckbinder/pom.xml
felix/trunk/examples/spellcheckclient/pom.xml
felix/trunk/examples/spellcheckscr/pom.xml
felix/trunk/examples/spellcheckservice/pom.xml
felix/trunk/org.apache.felix.daemon/pom.xml
felix/trunk/pom/pom.xml
Modified: felix/trunk/examples/dictionaryclient/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/examples/dictionaryclient/pom.xml?rev=569043&r1=569042&r2=569043&view=diff
==============================================================================
--- felix/trunk/examples/dictionaryclient/pom.xml (original)
+++ felix/trunk/examples/dictionaryclient/pom.xml Thu Aug 23 08:29:20 2007
@@ -6,15 +6,15 @@
<relativePath>../../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <packaging>osgi-bundle</packaging>
- <name>Apache Felix Examples: Dictionary Client</name>
+ <packaging>bundle</packaging>
+ <name>Apache Felix Example Dictionary Client</name>
<artifactId>org.apache.felix.examples.dictionaryclient</artifactId>
<version>0.9.0-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -27,24 +27,25 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix.plugins</groupId>
- <artifactId>maven-osgi-plugin</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>1.0.0</version>
<extensions>true</extensions>
<configuration>
- <osgiManifest>
- <bundleName>Dictionary Client Example</bundleName>
- <bundleVendor>Apache Software Foundation</bundleVendor>
- <bundleDescription>
+ <instructions>
+ <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Bundle-Name>Example Dictionary Client</Bundle-Name>
+ <Bundle-Vendor>Apache Software Foundation</Bundle-Vendor>
+ <Bundle-Description>
A bundle using the dictionary service if it finds it at startup.
- </bundleDescription>
- <bundleActivator>
+ </Bundle-Description>
+ <Bundle-Activator>
org.apache.felix.examples.dictionaryclient.Activator
- </bundleActivator>
- <importPackage>
- org.osgi.framework, org.apache.felix.examples.dictionaryservice
- </importPackage>
- </osgiManifest>
+ </Bundle-Activator>
+ <Private-Package>
+ org.apache.felix.examples.dictionaryclient.*
+ </Private-Package>
+ </instructions>
</configuration>
</plugin>
</plugins>
Modified: felix/trunk/examples/dictionaryclient2/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/examples/dictionaryclient2/pom.xml?rev=569043&r1=569042&r2=569043&view=diff
==============================================================================
--- felix/trunk/examples/dictionaryclient2/pom.xml (original)
+++ felix/trunk/examples/dictionaryclient2/pom.xml Thu Aug 23 08:29:20 2007
@@ -6,15 +6,15 @@
<relativePath>../../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <packaging>osgi-bundle</packaging>
- <name>Apache Felix Examples: Dynamic Dictionary Client</name>
+ <packaging>bundle</packaging>
+ <name>Apache Felix Example Dynamic Dictionary Client</name>
<artifactId>org.apache.felix.examples.dictionaryclient2</artifactId>
<version>0.9.0-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -27,24 +27,25 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix.plugins</groupId>
- <artifactId>maven-osgi-plugin</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>1.0.0</version>
<extensions>true</extensions>
<configuration>
- <osgiManifest>
- <bundleName>Dynamic Dictionary Client Example</bundleName>
- <bundleVendor>Apache Software Foundation</bundleVendor>
- <bundleDescription>
+ <instructions>
+ <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Bundle-Name>Example Dynamic Dictionary Client</Bundle-Name>
+ <Bundle-Vendor>Apache Software Foundation</Bundle-Vendor>
+ <Bundle-Description>
A client bundle with more complex requirements for the dictionary.
- </bundleDescription>
- <bundleActivator>
+ </Bundle-Description>
+ <Bundle-Activator>
org.apache.felix.examples.dictionaryclient2.Activator
- </bundleActivator>
- <importPackage>
- org.osgi.framework, org.apache.felix.examples.dictionaryservice
- </importPackage>
- </osgiManifest>
+ </Bundle-Activator>
+ <Private-Package>
+ org.apache.felix.examples.dictionaryclient2.*
+ </Private-Package>
+ </instructions>
</configuration>
</plugin>
</plugins>
Modified: felix/trunk/examples/dictionaryservice.itest/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/examples/dictionaryservice.itest/pom.xml?rev=569043&r1=569042&r2=569043&view=diff
==============================================================================
--- felix/trunk/examples/dictionaryservice.itest/pom.xml (original)
+++ felix/trunk/examples/dictionaryservice.itest/pom.xml Thu Aug 23 08:29:20 2007
@@ -7,14 +7,14 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>bundle</packaging>
- <name>Apache Felix Examples: Dictionary Service Integration Test</name>
+ <name>Apache Felix Example Dictionary Service Integration Test</name>
<artifactId>org.apache.felix.examples.dictionaryservice.itest</artifactId>
<version>0.9.0-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -59,12 +59,15 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
- <Private-Package>org.apache.felix.examples.dictionaryservice.itest.*</Private-Package>
- <Bundle-Name>Dictionary Integration Test Example</Bundle-Name>
+ <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Private-Package>
+ org.apache.felix.examples.dictionaryservice.itest.*
+ </Private-Package>
+ <Bundle-Name>Example Dictionary Integration Test</Bundle-Name>
<Bundle-Vendor>Apache Software Foundation</Bundle-Vendor>
<Bundle-Description>
A bundle using the dictionary service to test it.
Modified: felix/trunk/examples/dictionaryservice/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/examples/dictionaryservice/pom.xml?rev=569043&r1=569042&r2=569043&view=diff
==============================================================================
--- felix/trunk/examples/dictionaryservice/pom.xml (original)
+++ felix/trunk/examples/dictionaryservice/pom.xml Thu Aug 23 08:29:20 2007
@@ -6,42 +6,43 @@
<relativePath>../../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <packaging>osgi-bundle</packaging>
- <name>Apache Felix Examples: English Dictionary Service</name>
+ <packaging>bundle</packaging>
+ <name>Apache Felix Example English Dictionary Service</name>
<artifactId>org.apache.felix.examples.dictionaryservice</artifactId>
<version>0.9.0-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.0</version>
<scope>provided</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix.plugins</groupId>
- <artifactId>maven-osgi-plugin</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>1.0.0</version>
<extensions>true</extensions>
<configuration>
- <osgiManifest>
- <bundleName>English Dictionary Example</bundleName>
- <bundleVendor>Apache Software Foundation</bundleVendor>
- <bundleDescription>
+ <instructions>
+ <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Bundle-Name>Example English Dictionary</Bundle-Name>
+ <Bundle-Vendor>Apache Software Foundation</Bundle-Vendor>
+ <Bundle-Description>
A bundle that registersan English dictionary service.
- </bundleDescription>
- <bundleActivator>
+ </Bundle-Description>
+ <Bundle-Activator>
org.apache.felix.examples.dictionaryservice.impl.Activator
- </bundleActivator>
- <exportPackage>
+ </Bundle-Activator>
+ <Export-Package>
org.apache.felix.examples.dictionaryservice
- </exportPackage>
- <importPackage>
- org.osgi.framework
- </importPackage>
- </osgiManifest>
+ </Export-Package>
+ <Private-Package>
+ org.apache.felix.examples.dictionaryservice.*
+ </Private-Package>
+ </instructions>
</configuration>
</plugin>
</plugins>
Modified: felix/trunk/examples/eventlistener/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/examples/eventlistener/pom.xml?rev=569043&r1=569042&r2=569043&view=diff
==============================================================================
--- felix/trunk/examples/eventlistener/pom.xml (original)
+++ felix/trunk/examples/eventlistener/pom.xml Thu Aug 23 08:29:20 2007
@@ -6,41 +6,39 @@
<relativePath>../../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <packaging>osgi-bundle</packaging>
- <name>Apache Felix Examples: Service Event Listener</name>
+ <packaging>bundle</packaging>
+ <name>Apache Felix Example Service Event Listener</name>
<artifactId>org.apache.felix.examples.eventlistener</artifactId>
<version>0.9.0-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.0</version>
<scope>provided</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix.plugins</groupId>
- <artifactId>maven-osgi-plugin</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>1.0.0</version>
<extensions>true</extensions>
<configuration>
- <osgiManifest>
- <bundleName>Service listener example</bundleName>
- <bundleDescription>
+ <instructions>
+ <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Bundle-Name>Example Service Listener</Bundle-Name>
+ <Bundle-Description>
Bundle listening for service events: displays a message on startup and when service events occur.
- </bundleDescription>
- <bundleActivator>
+ </Bundle-Description>
+ <Bundle-Activator>
org.apache.felix.examples.eventlistener.Activator
- </bundleActivator>
- <bundleSymbolicName>
- org.apache.felix.examples.eventlistener
- </bundleSymbolicName>
- <importPackage>
- org.osgi.framework
- </importPackage>
- </osgiManifest>
+ </Bundle-Activator>
+ <Private-Package>
+ org.apache.felix.examples.eventlistener.*
+ </Private-Package>
+ </instructions>
</configuration>
</plugin>
</plugins>
Modified: felix/trunk/examples/extenderbased.circle/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/examples/extenderbased.circle/pom.xml?rev=569043&r1=569042&r2=569043&view=diff
==============================================================================
--- felix/trunk/examples/extenderbased.circle/pom.xml (original)
+++ felix/trunk/examples/extenderbased.circle/pom.xml Thu Aug 23 08:29:20 2007
@@ -35,7 +35,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.0</version>
</dependency>
<dependency>
<groupId>org.apache.felix.example</groupId>
@@ -48,7 +48,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -61,19 +61,4 @@
</plugin>
</plugins>
</build>
- <pluginRepositories>
- <pluginRepository>
- <id>apache.snapshots</id>
- <name>snapshot plugins</name>
- <url>
- http://people.apache.org/repo/m2-snapshot-repository
- </url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
</project>
Modified: felix/trunk/examples/extenderbased.host/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/examples/extenderbased.host/pom.xml?rev=569043&r1=569042&r2=569043&view=diff
==============================================================================
--- felix/trunk/examples/extenderbased.host/pom.xml (original)
+++ felix/trunk/examples/extenderbased.host/pom.xml Thu Aug 23 08:29:20 2007
@@ -35,7 +35,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0</version>
</dependency>
</dependencies>
<build>
@@ -43,7 +43,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -57,19 +57,4 @@
</plugin>
</plugins>
</build>
- <pluginRepositories>
- <pluginRepository>
- <id>apache.snapshots</id>
- <name>snapshot plugins</name>
- <url>
- http://people.apache.org/repo/m2-snapshot-repository
- </url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
</project>
Modified: felix/trunk/examples/extenderbased.square/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/examples/extenderbased.square/pom.xml?rev=569043&r1=569042&r2=569043&view=diff
==============================================================================
--- felix/trunk/examples/extenderbased.square/pom.xml (original)
+++ felix/trunk/examples/extenderbased.square/pom.xml Thu Aug 23 08:29:20 2007
@@ -35,7 +35,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.0</version>
</dependency>
<dependency>
<groupId>org.apache.felix.example</groupId>
@@ -48,7 +48,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -61,19 +61,4 @@
</plugin>
</plugins>
</build>
- <pluginRepositories>
- <pluginRepository>
- <id>apache.snapshots</id>
- <name>snapshot plugins</name>
- <url>
- http://people.apache.org/repo/m2-snapshot-repository
- </url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
</project>
Modified: felix/trunk/examples/extenderbased.triangle/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/examples/extenderbased.triangle/pom.xml?rev=569043&r1=569042&r2=569043&view=diff
==============================================================================
--- felix/trunk/examples/extenderbased.triangle/pom.xml (original)
+++ felix/trunk/examples/extenderbased.triangle/pom.xml Thu Aug 23 08:29:20 2007
@@ -35,7 +35,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.0</version>
</dependency>
<dependency>
<groupId>org.apache.felix.example</groupId>
@@ -48,7 +48,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -61,19 +61,4 @@
</plugin>
</plugins>
</build>
- <pluginRepositories>
- <pluginRepository>
- <id>apache.snapshots</id>
- <name>snapshot plugins</name>
- <url>
- http://people.apache.org/repo/m2-snapshot-repository
- </url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
</project>
Modified: felix/trunk/examples/frenchdictionary/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/examples/frenchdictionary/pom.xml?rev=569043&r1=569042&r2=569043&view=diff
==============================================================================
--- felix/trunk/examples/frenchdictionary/pom.xml (original)
+++ felix/trunk/examples/frenchdictionary/pom.xml Thu Aug 23 08:29:20 2007
@@ -6,15 +6,15 @@
<relativePath>../../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <packaging>osgi-bundle</packaging>
- <name>Apache Felix Examples: French Dictionary Service</name>
+ <packaging>bundle</packaging>
+ <name>Apache Felix Example French Dictionary Service</name>
<artifactId>org.apache.felix.examples.frenchdictionary</artifactId>
<version>0.9.0-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -27,24 +27,25 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix.plugins</groupId>
- <artifactId>maven-osgi-plugin</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>1.0.0</version>
<extensions>true</extensions>
<configuration>
- <osgiManifest>
- <bundleName>French Dictionary Example</bundleName>
- <bundleVendor>Apache Software Foundation</bundleVendor>
- <bundleDescription>
+ <instructions>
+ <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Bundle-Name>Example French Dictionary</Bundle-Name>
+ <Bundle-Vendor>Apache Software Foundation</Bundle-Vendor>
+ <Bundle-Description>
A bundle that registers a French dictionary service.
- </bundleDescription>
- <bundleActivator>
+ </Bundle-Description>
+ <Bundle-Activator>
org.apache.felix.examples.frenchdictionary.Activator
- </bundleActivator>
- <importPackage>
- org.osgi.framework, org.apache.felix.examples.dictionaryservice
- </importPackage>
- </osgiManifest>
+ </Bundle-Activator>
+ <Private-Package>
+ org.apache.felix.examples.frenchdictionary.*
+ </Private-Package>
+ </instructions>
</configuration>
</plugin>
</plugins>
Modified: felix/trunk/examples/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/examples/pom.xml?rev=569043&r1=569042&r2=569043&view=diff
==============================================================================
--- felix/trunk/examples/pom.xml (original)
+++ felix/trunk/examples/pom.xml Thu Aug 23 08:29:20 2007
@@ -21,15 +21,6 @@
</property>
</activation>
<modules>
- <module>eventlistener</module>
- <module>dictionaryservice</module>
- <module>dictionaryservice.itest</module>
- <module>frenchdictionary</module>
- <module>dictionaryclient</module>
- <module>dictionaryclient2</module>
- <module>spellcheckservice</module>
- <module>spellcheckclient</module>
- <module>spellcheckbinder</module>
</modules>
</profile>
<profile>
@@ -41,6 +32,15 @@
</property>
</activation>
<modules>
+ <module>eventlistener</module>
+ <module>dictionaryservice</module>
+ <module>dictionaryservice.itest</module>
+ <module>frenchdictionary</module>
+ <module>dictionaryclient</module>
+ <module>dictionaryclient2</module>
+ <module>spellcheckservice</module>
+ <module>spellcheckclient</module>
+ <module>spellcheckbinder</module>
<module>spellcheckscr</module>
<module>servicebased.host</module>
<module>servicebased.circle</module>
Modified: felix/trunk/examples/servicebased.circle/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/examples/servicebased.circle/pom.xml?rev=569043&r1=569042&r2=569043&view=diff
==============================================================================
--- felix/trunk/examples/servicebased.circle/pom.xml (original)
+++ felix/trunk/examples/servicebased.circle/pom.xml Thu Aug 23 08:29:20 2007
@@ -35,7 +35,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.0</version>
</dependency>
<dependency>
<groupId>org.apache.felix.example</groupId>
@@ -48,7 +48,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -59,19 +59,4 @@
</plugin>
</plugins>
</build>
- <pluginRepositories>
- <pluginRepository>
- <id>apache.snapshots</id>
- <name>snapshot plugins</name>
- <url>
- http://people.apache.org/repo/m2-snapshot-repository
- </url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
</project>
Modified: felix/trunk/examples/servicebased.host/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/examples/servicebased.host/pom.xml?rev=569043&r1=569042&r2=569043&view=diff
==============================================================================
--- felix/trunk/examples/servicebased.host/pom.xml (original)
+++ felix/trunk/examples/servicebased.host/pom.xml Thu Aug 23 08:29:20 2007
@@ -35,7 +35,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0</version>
</dependency>
</dependencies>
<build>
@@ -43,7 +43,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -57,19 +57,4 @@
</plugin>
</plugins>
</build>
- <pluginRepositories>
- <pluginRepository>
- <id>apache.snapshots</id>
- <name>snapshot plugins</name>
- <url>
- http://people.apache.org/repo/m2-snapshot-repository
- </url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
</project>
Modified: felix/trunk/examples/servicebased.square/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/examples/servicebased.square/pom.xml?rev=569043&r1=569042&r2=569043&view=diff
==============================================================================
--- felix/trunk/examples/servicebased.square/pom.xml (original)
+++ felix/trunk/examples/servicebased.square/pom.xml Thu Aug 23 08:29:20 2007
@@ -35,7 +35,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.0</version>
</dependency>
<dependency>
<groupId>org.apache.felix.example</groupId>
@@ -48,7 +48,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -59,19 +59,4 @@
</plugin>
</plugins>
</build>
- <pluginRepositories>
- <pluginRepository>
- <id>apache.snapshots</id>
- <name>snapshot plugins</name>
- <url>
- http://people.apache.org/repo/m2-snapshot-repository
- </url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
</project>
Modified: felix/trunk/examples/servicebased.triangle/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/examples/servicebased.triangle/pom.xml?rev=569043&r1=569042&r2=569043&view=diff
==============================================================================
--- felix/trunk/examples/servicebased.triangle/pom.xml (original)
+++ felix/trunk/examples/servicebased.triangle/pom.xml Thu Aug 23 08:29:20 2007
@@ -35,7 +35,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.0</version>
</dependency>
<dependency>
<groupId>org.apache.felix.example</groupId>
@@ -48,7 +48,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -59,19 +59,4 @@
</plugin>
</plugins>
</build>
- <pluginRepositories>
- <pluginRepository>
- <id>apache.snapshots</id>
- <name>snapshot plugins</name>
- <url>
- http://people.apache.org/repo/m2-snapshot-repository
- </url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
</project>
Modified: felix/trunk/examples/spellcheckbinder/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/examples/spellcheckbinder/pom.xml?rev=569043&r1=569042&r2=569043&view=diff
==============================================================================
--- felix/trunk/examples/spellcheckbinder/pom.xml (original)
+++ felix/trunk/examples/spellcheckbinder/pom.xml Thu Aug 23 08:29:20 2007
@@ -6,15 +6,15 @@
<relativePath>../../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <packaging>osgi-bundle</packaging>
- <name>Apache Felix Examples: Spell Check w/ Service Binder</name>
+ <packaging>bundle</packaging>
+ <name>Apache Felix Example Spell Check w/ Service Binder</name>
<artifactId>org.apache.felix.examples.spellcheckbinder</artifactId>
<version>0.9.0-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -39,30 +39,26 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix.plugins</groupId>
- <artifactId>maven-osgi-plugin</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>1.0.0</version>
<extensions>true</extensions>
<configuration>
- <osgiManifest>
- <entries>
- <property>
- <name>Metadata-Location</name>
- <value>metadata.xml</value>
- </property>
- </entries>
- <bundleName>Spell Check w/ ServiceBinder Example</bundleName>
- <bundleVendor>Apache Software Foundation</bundleVendor>
- <bundleDescription>
+ <instructions>
+ <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Metadata-Location>metadata.xml</Metadata-Location>
+ <Bundle-Name>Example Spell Check w/ Service Binder</Bundle-Name>
+ <Bundle-Vendor>Apache Software Foundation</Bundle-Vendor>
+ <Bundle-Description>
A bundle that registers a spell checking service based on service binder.
- </bundleDescription>
- <bundleActivator>
+ </Bundle-Description>
+ <Bundle-Activator>
org.apache.felix.examples.spellcheckbinder.Activator
- </bundleActivator>
- <importPackage>
- org.osgi.framework, org.apache.felix.examples.dictionaryservice, org.apache.felix.servicebinder, org.apache.felix.examples.spellcheckservice
- </importPackage>
- </osgiManifest>
+ </Bundle-Activator>
+ <Private-Package>
+ org.apache.felix.examples.spellcheckbinder.*
+ </Private-Package>
+ </instructions>
</configuration>
</plugin>
</plugins>
Modified: felix/trunk/examples/spellcheckclient/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/examples/spellcheckclient/pom.xml?rev=569043&r1=569042&r2=569043&view=diff
==============================================================================
--- felix/trunk/examples/spellcheckclient/pom.xml (original)
+++ felix/trunk/examples/spellcheckclient/pom.xml Thu Aug 23 08:29:20 2007
@@ -6,15 +6,15 @@
<relativePath>../../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <packaging>osgi-bundle</packaging>
- <name>Apache Felix Examples: Spell Check Client</name>
+ <packaging>bundle</packaging>
+ <name>Apache Felix Example Spell Check Client</name>
<artifactId>org.apache.felix.examples.spellcheckclient</artifactId>
<version>0.9.0-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -27,24 +27,25 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix.plugins</groupId>
- <artifactId>maven-osgi-plugin</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>1.0.0</version>
<extensions>true</extensions>
<configuration>
- <osgiManifest>
- <bundleName>Spell Check Client Example</bundleName>
- <bundleVendor>Apache Software Foundation</bundleVendor>
- <bundleDescription>
+ <instructions>
+ <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Bundle-Name>Example Spell Check Client</Bundle-Name>
+ <Bundle-Vendor>Apache Software Foundation</Bundle-Vendor>
+ <Bundle-Description>
A bundle using the spell check service.
- </bundleDescription>
- <bundleActivator>
+ </Bundle-Description>
+ <Bundle-Activator>
org.apache.felix.examples.spellcheckclient.Activator
- </bundleActivator>
- <importPackage>
- org.osgi.framework, org.apache.felix.examples.spellcheckservice
- </importPackage>
- </osgiManifest>
+ </Bundle-Activator>
+ <Private-Package>
+ org.apache.felix.examples.spellcheckclient.*
+ </Private-Package>
+ </instructions>
</configuration>
</plugin>
</plugins>
Modified: felix/trunk/examples/spellcheckscr/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/examples/spellcheckscr/pom.xml?rev=569043&r1=569042&r2=569043&view=diff
==============================================================================
--- felix/trunk/examples/spellcheckscr/pom.xml (original)
+++ felix/trunk/examples/spellcheckscr/pom.xml Thu Aug 23 08:29:20 2007
@@ -30,7 +30,7 @@
<modelVersion>4.0.0</modelVersion>
<packaging>bundle</packaging>
- <name>Apache Felix Examples: Spell Check w/ SCR</name>
+ <name>Apache Felix Example Spell Check w/ SCR</name>
<artifactId>org.apache.felix.examples.spellcheckscr</artifactId>
<version>0.9.0-SNAPSHOT</version>
<description>${description}</description>
@@ -39,7 +39,7 @@
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -61,11 +61,10 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
- <!-- docs in http://cwiki.apache.org/FELIX/bundle-plugin-for-maven-bnd.html and http://cwiki.apache.org/FELIX/osgi-plugin-for-maven-2.html -->
<Private-Package>${pom.artifactId}.*</Private-Package>
<Import-Package>*</Import-Package>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
Modified: felix/trunk/examples/spellcheckservice/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/examples/spellcheckservice/pom.xml?rev=569043&r1=569042&r2=569043&view=diff
==============================================================================
--- felix/trunk/examples/spellcheckservice/pom.xml (original)
+++ felix/trunk/examples/spellcheckservice/pom.xml Thu Aug 23 08:29:20 2007
@@ -6,15 +6,15 @@
<relativePath>../../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <packaging>osgi-bundle</packaging>
- <name>Apache Felix Examples: Spell Check Service</name>
+ <packaging>bundle</packaging>
+ <name>Apache Felix Example Spell Check Service</name>
<artifactId>org.apache.felix.examples.spellcheckservice</artifactId>
<version>0.9.0-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -27,27 +27,25 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix.plugins</groupId>
- <artifactId>maven-osgi-plugin</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>1.0.0</version>
<extensions>true</extensions>
<configuration>
- <osgiManifest>
- <bundleName>Spell Check Service Example</bundleName>
- <bundleVendor>Apache Software Foundation</bundleVendor>
- <bundleDescription>
+ <instructions>
+ <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Bundle-Name>Example Spell Check Service</Bundle-Name>
+ <Bundle-Vendor>Apache Software Foundation</Bundle-Vendor>
+ <Bundle-Description>
A bundle that registers a spell checking service.
- </bundleDescription>
- <bundleActivator>
+ </Bundle-Description>
+ <Bundle-Activator>
org.apache.felix.examples.spellcheckservice.impl.Activator
- </bundleActivator>
- <importPackage>
- org.osgi.framework, org.apache.felix.examples.dictionaryservice
- </importPackage>
- <exportPackage>
- org.apache.felix.examples.spellcheckservice
- </exportPackage>
- </osgiManifest>
+ </Bundle-Activator>
+ <Export-Package>
+ org.apache.felix.examples.spellcheckservice.*
+ </Export-Package>
+ </instructions>
</configuration>
</plugin>
</plugins>
Modified: felix/trunk/org.apache.felix.daemon/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/org.apache.felix.daemon/pom.xml?rev=569043&r1=569042&r2=569043&view=diff
==============================================================================
--- felix/trunk/org.apache.felix.daemon/pom.xml (original)
+++ felix/trunk/org.apache.felix.daemon/pom.xml Thu Aug 23 08:29:20 2007
@@ -14,7 +14,7 @@
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>org.apache.felix.framework</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.directory.daemon</groupId>
Modified: felix/trunk/pom/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/pom/pom.xml?rev=569043&r1=569042&r2=569043&view=diff
==============================================================================
--- felix/trunk/pom/pom.xml (original)
+++ felix/trunk/pom/pom.xml Thu Aug 23 08:29:20 2007
@@ -153,6 +153,8 @@
<module>../ipojo/arch</module>
<module>../mosgi</module>
+
+ <module>../examples</module>
</modules>
</profile>
@@ -166,8 +168,6 @@
</activation>
<modules>
<module>../org.apache.felix.daemon</module>
-
- <module>../examples</module>
<module>../upnp.extra</module>
<module>../upnp.basedriver</module>