complete new implementation with support for service properties and detection of circular dependencies
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1406753 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/webconsole-plugins/servicediagnostics/sample/pom.xml b/webconsole-plugins/servicediagnostics/sample/pom.xml
index 1929970..164e6ce 100644
--- a/webconsole-plugins/servicediagnostics/sample/pom.xml
+++ b/webconsole-plugins/servicediagnostics/sample/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>servicediagnostics.parent</artifactId>
- <version>0.1.1-SNAPSHOT</version>
+ <version>0.1.1</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
@@ -16,17 +16,60 @@
<packaging>bundle</packaging>
<name>Sample Services and Launcher for Service Diagnostics</name>
+ <repositories>
+ <repository>
+ <id>com.springsource.repository.bundles.release</id>
+ <name>SpringSource Enterprise Bundle Repository - SpringSource Bundle Releases</name>
+ <url>http://repository.springsource.com/maven/bundles/release</url>
+ </repository>
+ <repository>
+ <id>com.springsource.repository.bundles.external</id>
+ <name>SpringSource Enterprise Bundle Repository - External Bundle Releases</name>
+ <url>http://repository.springsource.com/maven/bundles/external</url>
+ </repository>
+ </repositories>
+
<dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>${project.groupId}.servicediagnostics.plugin</artifactId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>0.1.2-SNAPSHOT</version>
</dependency>
<!-- runtime dependencies. added to populate the local repository -->
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.webconsole.plugins.shell</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.webconsole.plugins.ds</artifactId>
+ <version>1.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>com.springsource.org.apache.commons.fileupload</artifactId>
+ <version>1.2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>com.springsource.org.apache.commons.io</artifactId>
+ <version>1.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>json</artifactId>
+ <version>20090211_1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.dependencymanager.shell</artifactId>
+ <version>3.0.0</version>
+ </dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.main</artifactId>
- <version>3.2.2</version>
+ <version>4.0.3</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -36,13 +79,12 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.shell</artifactId>
- <version>1.4.2</version>
+ <version>1.4.3</version>
</dependency>
<dependency>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-library</artifactId>
- <version>2.9.1</version>
- <scope>provided</scope>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.scala-library</artifactId>
+ <version>2.9.1_3</version>
</dependency>
</dependencies>
@@ -60,6 +102,7 @@
<instructions>
<Bundle-Category>samples</Bundle-Category>
<Bundle-SymbolicName> ${project.artifactId} </Bundle-SymbolicName>
+ <Bundle-Activator> org.apache.felix.servicediagnostics.sample.TestDM </Bundle-Activator>
<Service-Component> * </Service-Component>
<Private-Package>
org.apache.felix.servicediagnostics.sample
@@ -68,11 +111,8 @@
!aQute.bnd.annotation.component,!org.apache.felix.main,sun.misc*;resolution:=optional,*
</Import-Package>
<Include-Resource>
- {maven-resources},scala-library-2.9.1.jar
+ {maven-resources}
</Include-Resource>
- <Bundle-ClassPath>
- ., scala-library-2.9.1.jar
- </Bundle-ClassPath>
</instructions>
</configuration>
</plugin>