You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2008/04/22 18:40:46 UTC
svn commit: r650573 - in /servicemix/smx4/kernel/trunk: ./ assembly/
assembly/src/main/descriptors/ assembly/src/main/filtered-resources/etc/
bundles/ bundles/ant/ bundles/aopalliance/ bundles/asm/ bundles/cglib/
bundles/junit/ bundles/mina/ bundles/xs...
Author: gnodet
Date: Tue Apr 22 09:40:22 2008
New Revision: 650573
URL: http://svn.apache.org/viewvc?rev=650573&view=rev
Log:
Use 'Apache ServiceMix' in poms, upgrade to spring 2.5.2, fix osgi testing support, remove stax api from the distribution
Added:
servicemix/smx4/kernel/trunk/testing/support/src/main/java/org/apache/servicemix/kernel/testing/support/FrameworkUtil.java
servicemix/smx4/kernel/trunk/testing/support/src/main/java/org/apache/servicemix/kernel/testing/support/SmxKernelPlatform.java
servicemix/smx4/kernel/trunk/testing/support/src/main/resources/org/
servicemix/smx4/kernel/trunk/testing/support/src/main/resources/org/apache/
servicemix/smx4/kernel/trunk/testing/support/src/main/resources/org/apache/servicemix/
servicemix/smx4/kernel/trunk/testing/support/src/main/resources/org/apache/servicemix/kernel/
servicemix/smx4/kernel/trunk/testing/support/src/main/resources/org/apache/servicemix/kernel/testing/
servicemix/smx4/kernel/trunk/testing/support/src/main/resources/org/apache/servicemix/kernel/testing/support/
servicemix/smx4/kernel/trunk/testing/support/src/main/resources/org/apache/servicemix/kernel/testing/support/felix.config.properties
Removed:
servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/CommandProxy.java
Modified:
servicemix/smx4/kernel/trunk/assembly/pom.xml
servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml
servicemix/smx4/kernel/trunk/assembly/src/main/filtered-resources/etc/startup.properties
servicemix/smx4/kernel/trunk/bundles/ant/pom.xml
servicemix/smx4/kernel/trunk/bundles/aopalliance/pom.xml
servicemix/smx4/kernel/trunk/bundles/asm/pom.xml
servicemix/smx4/kernel/trunk/bundles/cglib/pom.xml
servicemix/smx4/kernel/trunk/bundles/junit/pom.xml
servicemix/smx4/kernel/trunk/bundles/mina/pom.xml
servicemix/smx4/kernel/trunk/bundles/pom.xml
servicemix/smx4/kernel/trunk/bundles/xstream/pom.xml
servicemix/smx4/kernel/trunk/filemonitor/pom.xml
servicemix/smx4/kernel/trunk/gshell/gshell-core/pom.xml
servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/filtered-resources/org/apache/geronimo/gshell/spring/etc/startup.properties
servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/SpringCommandRegistry.java
servicemix/smx4/kernel/trunk/gshell/gshell-features/pom.xml
servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/FeaturesServiceImpl.java
servicemix/smx4/kernel/trunk/gshell/gshell-obr/pom.xml
servicemix/smx4/kernel/trunk/gshell/gshell-osgi/pom.xml
servicemix/smx4/kernel/trunk/gshell/gshell-wrapper/pom.xml
servicemix/smx4/kernel/trunk/gshell/pom.xml
servicemix/smx4/kernel/trunk/main/pom.xml
servicemix/smx4/kernel/trunk/pom.xml
servicemix/smx4/kernel/trunk/spring/pom.xml
servicemix/smx4/kernel/trunk/testing/depends-maven-plugin/pom.xml
servicemix/smx4/kernel/trunk/testing/features-maven-plugin/pom.xml
servicemix/smx4/kernel/trunk/testing/pom.xml
servicemix/smx4/kernel/trunk/testing/support/pom.xml
servicemix/smx4/kernel/trunk/testing/support/src/main/java/org/apache/servicemix/kernel/testing/support/AbstractIntegrationTest.java
Modified: servicemix/smx4/kernel/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/assembly/pom.xml?rev=650573&r1=650572&r2=650573&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/assembly/pom.xml Tue Apr 22 09:40:22 2008
@@ -31,7 +31,7 @@
<artifactId>apache-servicemix-kernel</artifactId>
<packaging>pom</packaging>
<version>1.0-m3-SNAPSHOT</version>
- <name>ServiceMix Kernel :: Assembly</name>
+ <name>Apache ServiceMix Kernel :: Assembly</name>
<dependencies>
<dependency>
@@ -173,11 +173,6 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.5_spec</artifactId>
<version>${geronimo.servlet.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-stax-api_1.0_spec</artifactId>
- <version>${geronimo.stax.version}</version>
</dependency>
</dependencies>
<build>
Modified: servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml?rev=650573&r1=650572&r2=650573&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml (original)
+++ servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml Tue Apr 22 09:40:22 2008
@@ -130,7 +130,6 @@
<include>org.apache.servicemix.kernel:org.apache.servicemix.kernel.spring</include>
<!-- GShell -->
- <include>org.apache.geronimo.specs:geronimo-stax-api_1.0_spec</include>
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.mina-${mina.version}</include>
<include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.core</include>
<include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.osgi</include>
Modified: servicemix/smx4/kernel/trunk/assembly/src/main/filtered-resources/etc/startup.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/assembly/src/main/filtered-resources/etc/startup.properties?rev=650573&r1=650572&r2=650573&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/assembly/src/main/filtered-resources/etc/startup.properties (original)
+++ servicemix/smx4/kernel/trunk/assembly/src/main/filtered-resources/etc/startup.properties Tue Apr 22 09:40:22 2008
@@ -38,7 +38,6 @@
org.apache.servicemix.bundles.aopalliance-${aopalliance.version}-${pom.version}.jar=50
org.apache.servicemix.bundles.cglib-${cglib.version}-${pom.version}.jar=50
org.apache.servicemix.bundles.mina-${mina.version}-${pom.version}.jar=50
-geronimo-stax-api_1.0_spec-${geronimo.stax.version}.jar=50
spring-aop-${spring.version}.jar=50
spring-beans-${spring.version}.jar=50
spring-context-${spring.version}.jar=50
Modified: servicemix/smx4/kernel/trunk/bundles/ant/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/bundles/ant/pom.xml?rev=650573&r1=650572&r2=650573&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/bundles/ant/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/bundles/ant/pom.xml Tue Apr 22 09:40:22 2008
@@ -34,7 +34,7 @@
<artifactId>org.apache.servicemix.bundles.ant-1.7.0</artifactId>
<packaging>bundle</packaging>
<version>1.0-m3-SNAPSHOT</version>
- <name>ServiceMix OSGI Common Bundles: ${pkgArtifactId}-${pkgVersion}</name>
+ <name>Apache ServiceMix OSGI Common Bundles: ${pkgArtifactId}-${pkgVersion}</name>
<description>
This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
</description>
Modified: servicemix/smx4/kernel/trunk/bundles/aopalliance/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/bundles/aopalliance/pom.xml?rev=650573&r1=650572&r2=650573&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/bundles/aopalliance/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/bundles/aopalliance/pom.xml Tue Apr 22 09:40:22 2008
@@ -34,7 +34,7 @@
<artifactId>org.apache.servicemix.bundles.aopalliance-1.0</artifactId>
<packaging>bundle</packaging>
<version>1.0-m3-SNAPSHOT</version>
- <name>ServiceMix OSGI Common Bundles: ${pkgArtifactId}-${pkgVersion}</name>
+ <name>Apache ServiceMix OSGI Common Bundles: ${pkgArtifactId}-${pkgVersion}</name>
<description>
This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
</description>
Modified: servicemix/smx4/kernel/trunk/bundles/asm/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/bundles/asm/pom.xml?rev=650573&r1=650572&r2=650573&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/bundles/asm/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/bundles/asm/pom.xml Tue Apr 22 09:40:22 2008
@@ -34,7 +34,7 @@
<artifactId>org.apache.servicemix.bundles.asm-2.2.3</artifactId>
<packaging>bundle</packaging>
<version>1.0-m3-SNAPSHOT</version>
- <name>ServiceMix OSGI Common Bundles: ${pkgArtifactId}-${pkgVersion}</name>
+ <name>Apache ServiceMix OSGI Common Bundles: ${pkgArtifactId}-${pkgVersion}</name>
<description>
This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
</description>
Modified: servicemix/smx4/kernel/trunk/bundles/cglib/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/bundles/cglib/pom.xml?rev=650573&r1=650572&r2=650573&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/bundles/cglib/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/bundles/cglib/pom.xml Tue Apr 22 09:40:22 2008
@@ -34,7 +34,7 @@
<artifactId>org.apache.servicemix.bundles.cglib-2.1_3</artifactId>
<packaging>bundle</packaging>
<version>1.0-m3-SNAPSHOT</version>
- <name>ServiceMix OSGI Common Bundles: ${pkgArtifactId}-${pkgVersion}</name>
+ <name>Apache ServiceMix OSGI Common Bundles: ${pkgArtifactId}-${pkgVersion}</name>
<description>
This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
</description>
Modified: servicemix/smx4/kernel/trunk/bundles/junit/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/bundles/junit/pom.xml?rev=650573&r1=650572&r2=650573&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/bundles/junit/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/bundles/junit/pom.xml Tue Apr 22 09:40:22 2008
@@ -34,7 +34,7 @@
<artifactId>org.apache.servicemix.bundles.junit-4.4</artifactId>
<packaging>bundle</packaging>
<version>1.0-m3-SNAPSHOT</version>
- <name>ServiceMix OSGI Common Bundles: ${pkgArtifactId}-${pkgVersion}</name>
+ <name>Apache ServiceMix OSGI Common Bundles: ${pkgArtifactId}-${pkgVersion}</name>
<description>
This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
</description>
Modified: servicemix/smx4/kernel/trunk/bundles/mina/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/bundles/mina/pom.xml?rev=650573&r1=650572&r2=650573&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/bundles/mina/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/bundles/mina/pom.xml Tue Apr 22 09:40:22 2008
@@ -34,7 +34,7 @@
<artifactId>org.apache.servicemix.bundles.mina-1.1.6</artifactId>
<packaging>bundle</packaging>
<version>1.0-m3-SNAPSHOT</version>
- <name>ServiceMix OSGI Common Bundles: ${pkgArtifactId}-${pkgVersion}</name>
+ <name>Apache ServiceMix OSGI Common Bundles: ${pkgArtifactId}-${pkgVersion}</name>
<description>
This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
</description>
Modified: servicemix/smx4/kernel/trunk/bundles/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/bundles/pom.xml?rev=650573&r1=650572&r2=650573&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/bundles/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/bundles/pom.xml Tue Apr 22 09:40:22 2008
@@ -31,7 +31,7 @@
<artifactId>bundles</artifactId>
<packaging>pom</packaging>
<version>1.0-m3-SNAPSHOT</version>
- <name>ServiceMix OSGI Common Bundles</name>
+ <name>Apache ServiceMix OSGI Common Bundles</name>
<modules>
<module>ant</module>
Modified: servicemix/smx4/kernel/trunk/bundles/xstream/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/bundles/xstream/pom.xml?rev=650573&r1=650572&r2=650573&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/bundles/xstream/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/bundles/xstream/pom.xml Tue Apr 22 09:40:22 2008
@@ -34,7 +34,7 @@
<artifactId>org.apache.servicemix.bundles.xstream-1.2.2</artifactId>
<packaging>bundle</packaging>
<version>1.0-m3-SNAPSHOT</version>
- <name>ServiceMix OSGI Common Bundles: ${pkgArtifactId}-${pkgVersion}</name>
+ <name>Apache ServiceMix OSGI Common Bundles: ${pkgArtifactId}-${pkgVersion}</name>
<description>
This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
</description>
Modified: servicemix/smx4/kernel/trunk/filemonitor/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/filemonitor/pom.xml?rev=650573&r1=650572&r2=650573&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/filemonitor/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/filemonitor/pom.xml Tue Apr 22 09:40:22 2008
@@ -31,7 +31,7 @@
<artifactId>org.apache.servicemix.kernel.filemonitor</artifactId>
<packaging>bundle</packaging>
<version>1.0-m3-SNAPSHOT</version>
- <name>ServiceMix Kernel :: File Monitor</name>
+ <name>Apache ServiceMix Kernel :: File Monitor</name>
<description>This bundle monitors the deploy directory for new OSGi bundles in jar form, expanded form or for configuration file changes and undeploys/redeploys them</description>
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-core/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-core/pom.xml?rev=650573&r1=650572&r2=650573&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-core/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-core/pom.xml Tue Apr 22 09:40:22 2008
@@ -31,7 +31,7 @@
<artifactId>org.apache.servicemix.kernel.gshell.core</artifactId>
<packaging>bundle</packaging>
<version>1.0-m3-SNAPSHOT</version>
- <name>ServiceMix Kernel :: GShell Core</name>
+ <name>Apache ServiceMix Kernel :: GShell Core</name>
<description>
Provides the OSGi GShell integration
@@ -43,6 +43,7 @@
com.thoughtworks.xstream*;resolution:=optional,
junit.framework*;resolution:=optional,
org.codehaus.plexus*;resolution:=optional,
+ org.apache.maven*;resolution:=optional,
org.apache.mina*;resolution:=optional,
*
</gshell.osgi.import>
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/filtered-resources/org/apache/geronimo/gshell/spring/etc/startup.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/filtered-resources/org/apache/geronimo/gshell/spring/etc/startup.properties?rev=650573&r1=650572&r2=650573&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/filtered-resources/org/apache/geronimo/gshell/spring/etc/startup.properties (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/filtered-resources/org/apache/geronimo/gshell/spring/etc/startup.properties Tue Apr 22 09:40:22 2008
@@ -38,7 +38,6 @@
org.apache.servicemix.bundles.aopalliance-${aopalliance.version}-${pom.version}.jar=50
org.apache.servicemix.bundles.cglib-${cglib.version}-${pom.version}.jar=50
org.apache.servicemix.bundles.mina-${mina.version}-${pom.version}.jar=50
-geronimo-stax-api_1.0_spec-${geronimo.stax.version}.jar=50
spring-aop-${spring.version}.jar=50
spring-beans-${spring.version}.jar=50
spring-context-${spring.version}.jar=50
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/SpringCommandRegistry.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/SpringCommandRegistry.java?rev=650573&r1=650572&r2=650573&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/SpringCommandRegistry.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/SpringCommandRegistry.java Tue Apr 22 09:40:22 2008
@@ -31,6 +31,7 @@
import org.apache.geronimo.gshell.registry.DefaultCommandRegistry;
import org.apache.geronimo.gshell.registry.DuplicateRegistrationException;
import org.apache.geronimo.gshell.registry.NotRegisteredException;
+import org.apache.geronimo.gshell.registry.RegistryException;
import org.apache.geronimo.gshell.shell.Environment;
/**
@@ -54,7 +55,7 @@
this.env = env;
}
- public void register(final Command command, Map<String, ?> properties) throws DuplicateRegistrationException {
+ public void register(final Command command, Map<String, ?> properties) throws RegistryException {
// Find command name
String name = command.getId();
if (name.lastIndexOf(':') >= 0) {
@@ -112,7 +113,7 @@
}
}
- public void unregister(final Command command, Map<String, ?> properties) throws NotRegisteredException {
+ public void unregister(final Command command, Map<String, ?> properties) throws RegistryException {
// Find command name
String name = command.getId();
if (name.lastIndexOf(':') >= 0) {
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-features/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-features/pom.xml?rev=650573&r1=650572&r2=650573&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-features/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-features/pom.xml Tue Apr 22 09:40:22 2008
@@ -31,7 +31,7 @@
<artifactId>org.apache.servicemix.kernel.gshell.features</artifactId>
<packaging>bundle</packaging>
<version>1.0-m3-SNAPSHOT</version>
- <name>ServiceMix Kernel :: GShell Features</name>
+ <name>Apache ServiceMix Kernel :: GShell Features</name>
<description>
Provides Features in GShell
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/FeaturesServiceImpl.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/FeaturesServiceImpl.java?rev=650573&r1=650572&r2=650573&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/FeaturesServiceImpl.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/FeaturesServiceImpl.java Tue Apr 22 09:40:22 2008
@@ -113,13 +113,11 @@
RepositoryImpl repo = new RepositoryImpl(url);
repositories.put(url, repo);
features = null;
- repo.load();
- /*
- Feature[] features = repo.getFeatures();
- for (int i = 0; i < features.length; i++) {
- CommandProxy cmd = new CommandProxy(features[i], bundleContext);
+ try {
+ repo.load();
+ } catch (IOException e) {
+ LOGGER.warn("Error loading features repository from url '" + url, e);
}
- */
}
public void removeRepository(URL url) {
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-obr/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-obr/pom.xml?rev=650573&r1=650572&r2=650573&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-obr/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-obr/pom.xml Tue Apr 22 09:40:22 2008
@@ -31,7 +31,7 @@
<artifactId>org.apache.servicemix.kernel.gshell.obr</artifactId>
<packaging>bundle</packaging>
<version>1.0-m3-SNAPSHOT</version>
- <name>ServiceMix Kernel :: GShell OBR Commands</name>
+ <name>Apache ServiceMix Kernel :: GShell OBR Commands</name>
<description>
Provides the OBR GShell commands
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-osgi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-osgi/pom.xml?rev=650573&r1=650572&r2=650573&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-osgi/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-osgi/pom.xml Tue Apr 22 09:40:22 2008
@@ -31,7 +31,7 @@
<artifactId>org.apache.servicemix.kernel.gshell.osgi</artifactId>
<packaging>bundle</packaging>
<version>1.0-m3-SNAPSHOT</version>
- <name>ServiceMix Kernel :: GShell OSGi Commands</name>
+ <name>Apache ServiceMix Kernel :: GShell OSGi Commands</name>
<description>
Provides the OSGi GShell commands
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-wrapper/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-wrapper/pom.xml?rev=650573&r1=650572&r2=650573&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-wrapper/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-wrapper/pom.xml Tue Apr 22 09:40:22 2008
@@ -31,7 +31,7 @@
<artifactId>org.apache.servicemix.kernel.gshell.wrapper</artifactId>
<packaging>bundle</packaging>
<version>1.0-m3-SNAPSHOT</version>
- <name>ServiceMix Kernel :: GShell Service Wrapper</name>
+ <name>Apache ServiceMix Kernel :: GShell Service Wrapper</name>
<description>
Provides the Service Wrapper GShell integration
Modified: servicemix/smx4/kernel/trunk/gshell/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/pom.xml?rev=650573&r1=650572&r2=650573&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/gshell/pom.xml Tue Apr 22 09:40:22 2008
@@ -31,7 +31,7 @@
<artifactId>gshell</artifactId>
<packaging>pom</packaging>
<version>1.0-m3-SNAPSHOT</version>
- <name>ServiceMix Kernel :: GShell</name>
+ <name>Apache ServiceMix Kernel :: GShell</name>
<modules>
<module>gshell-core</module>
Modified: servicemix/smx4/kernel/trunk/main/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/main/pom.xml?rev=650573&r1=650572&r2=650573&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/main/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/main/pom.xml Tue Apr 22 09:40:22 2008
@@ -31,7 +31,7 @@
<artifactId>org.apache.servicemix.kernel.main</artifactId>
<packaging>bundle</packaging>
<version>1.0-m3-SNAPSHOT</version>
- <name>ServiceMix Kernel :: Main</name>
+ <name>Apache ServiceMix Kernel :: Main</name>
<dependencies>
<dependency>
Modified: servicemix/smx4/kernel/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/pom.xml?rev=650573&r1=650572&r2=650573&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/pom.xml Tue Apr 22 09:40:22 2008
@@ -75,7 +75,6 @@
<felix.bundlerepository.version>1.0.2</felix.bundlerepository.version>
<felix.prefs.version>1.0.2</felix.prefs.version>
<geronimo.servlet.version>1.1.2</geronimo.servlet.version>
- <geronimo.stax.version>1.0.1</geronimo.stax.version>
<gshell.version>1.0-alpha-2-SNAPSHOT</gshell.version>
<junit.version>4.4</junit.version>
<jline.version>0.9.93</jline.version>
@@ -83,8 +82,10 @@
<mina.version>1.1.6</mina.version>
<pax.logging.version>1.0.0</pax.logging.version>
<pax.url.version>0.3.0</pax.url.version>
- <spring.osgi.version>1.0</spring.osgi.version>
- <spring.version>2.5.1</spring.version>
+ <servicemix.legal.version>1.0-SNAPSHOT</servicemix.legal.version>
+ <servicemix.spec.version>1.0-SNAPSHOT</servicemix.spec.version>
+ <spring.osgi.version>1.0.2</spring.osgi.version>
+ <spring.version>2.5.2</spring.version>
<xstream.version>1.2.2</xstream.version>
</properties>
@@ -98,7 +99,7 @@
<!-- ServiceMix repo -->
<repository>
<id>servicemix</id>
- <name>ServiceMix Repository</name>
+ <name>Apache ServiceMix Repository</name>
<url>http://svn.apache.org/repos/asf/servicemix/m2-repo</url>
</repository>
<!-- Spring Milestone repo -->
@@ -113,7 +114,7 @@
<!-- ServiceMix repo -->
<pluginRepository>
<id>servicemix</id>
- <name>ServiceMix Repository</name>
+ <name>Apache ServiceMix Repository</name>
<url>http://svn.apache.org/repos/asf/servicemix/m2-repo</url>
</pluginRepository>
</pluginRepositories>
@@ -121,6 +122,11 @@
<dependencyManagement>
<dependencies>
<dependency>
+ <groupId>org.apache.servicemix.legal</groupId>
+ <artifactId>legal</artifactId>
+ <version>${servicemix.legal.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.compendium</artifactId>
<version>${felix.compendium.version}</version>
@@ -252,8 +258,34 @@
</pluginManagement>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.0</version>
+ <executions>
+ <execution>
+ <id>copy-legal</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.servicemix.legal</groupId>
+ <artifactId>legal</artifactId>
+ <version>${servicemix.legal.version}</version>
+ <type>xml</type>
+ <outputDirectory>target/legal/</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ <stripVersion>true</stripVersion>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.0-beta-2</version>
+ <version>1.0</version>
<executions>
<execution>
<goals>
@@ -261,10 +293,14 @@
</goals>
<configuration>
<resourceBundles>
- <resourceBundle>org.apache:apache-jar-resource-bundle:1.3</resourceBundle>
+ <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
</resourceBundles>
+ <supplementalModels>
+ <supplementalModel>target/legal/legal.xml</supplementalModel>
+ </supplementalModels>
<properties>
<addLicense>true</addLicense>
+ <addArtifact>true</addArtifact>
<projectName>Apache ServiceMix</projectName>
</properties>
</configuration>
Modified: servicemix/smx4/kernel/trunk/spring/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/spring/pom.xml?rev=650573&r1=650572&r2=650573&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/spring/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/spring/pom.xml Tue Apr 22 09:40:22 2008
@@ -31,7 +31,7 @@
<artifactId>org.apache.servicemix.kernel.spring</artifactId>
<packaging>bundle</packaging>
<version>1.0-m3-SNAPSHOT</version>
- <name>ServiceMix Kernel :: Spring Deployer</name>
+ <name>Apache ServiceMix Kernel :: Spring Deployer</name>
<description>This deployer transforms a plain spring xml file to a deployable bundle</description>
Modified: servicemix/smx4/kernel/trunk/testing/depends-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/testing/depends-maven-plugin/pom.xml?rev=650573&r1=650572&r2=650573&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/testing/depends-maven-plugin/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/testing/depends-maven-plugin/pom.xml Tue Apr 22 09:40:22 2008
@@ -31,7 +31,7 @@
<artifactId>depends-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>
<version>1.0-m3-SNAPSHOT</version>
- <name>ServiceMix Kernel :: Testing - Depends plugin</name>
+ <name>Apache ServiceMix Kernel :: Testing - Depends plugin</name>
<dependencies>
<dependency>
Modified: servicemix/smx4/kernel/trunk/testing/features-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/testing/features-maven-plugin/pom.xml?rev=650573&r1=650572&r2=650573&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/testing/features-maven-plugin/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/testing/features-maven-plugin/pom.xml Tue Apr 22 09:40:22 2008
@@ -31,7 +31,7 @@
<artifactId>features-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>
<version>1.0-m3-SNAPSHOT</version>
- <name>ServiceMix Kernel :: Testing - Features plugin</name>
+ <name>Apache ServiceMix Kernel :: Testing - Features plugin</name>
<dependencies>
<dependency>
Modified: servicemix/smx4/kernel/trunk/testing/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/testing/pom.xml?rev=650573&r1=650572&r2=650573&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/testing/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/testing/pom.xml Tue Apr 22 09:40:22 2008
@@ -31,7 +31,7 @@
<artifactId>testing</artifactId>
<packaging>pom</packaging>
<version>1.0-m3-SNAPSHOT</version>
- <name>ServiceMix Kernel :: Testing</name>
+ <name>Apache ServiceMix Kernel :: Testing</name>
<modules>
<module>depends-maven-plugin</module>
Modified: servicemix/smx4/kernel/trunk/testing/support/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/testing/support/pom.xml?rev=650573&r1=650572&r2=650573&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/testing/support/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/testing/support/pom.xml Tue Apr 22 09:40:22 2008
@@ -31,7 +31,7 @@
<artifactId>org.apache.servicemix.kernel.testing.support</artifactId>
<packaging>bundle</packaging>
<version>1.0-m3-SNAPSHOT</version>
- <name>ServiceMix Kernel :: Testing - Support</name>
+ <name>Apache ServiceMix Kernel :: Testing - Support</name>
<dependencies>
<dependency>
@@ -106,11 +106,6 @@
<version>${geronimo.servlet.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-stax-api_1.0_spec</artifactId>
- <version>${geronimo.stax.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.aopalliance-1.0</artifactId>
<version>${pom.version}</version>
@@ -139,6 +134,7 @@
<configuration>
<instructions>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Import-Package>org.apache.felix*;resolution:=optional,*</Import-Package>
<Export-Package>${pom.artifactId}</Export-Package>
</instructions>
</configuration>
Modified: servicemix/smx4/kernel/trunk/testing/support/src/main/java/org/apache/servicemix/kernel/testing/support/AbstractIntegrationTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/testing/support/src/main/java/org/apache/servicemix/kernel/testing/support/AbstractIntegrationTest.java?rev=650573&r1=650572&r2=650573&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/testing/support/src/main/java/org/apache/servicemix/kernel/testing/support/AbstractIntegrationTest.java (original)
+++ servicemix/smx4/kernel/trunk/testing/support/src/main/java/org/apache/servicemix/kernel/testing/support/AbstractIntegrationTest.java Tue Apr 22 09:40:22 2008
@@ -30,7 +30,6 @@
import org.springframework.core.io.FileSystemResource;
import org.springframework.core.io.Resource;
import org.springframework.osgi.test.AbstractConfigurableBundleCreatorTests;
-import org.springframework.osgi.test.platform.Platforms;
import org.springframework.osgi.test.provisioning.ArtifactLocator;
import org.springframework.osgi.util.OsgiFilterUtils;
import org.springframework.osgi.util.OsgiListenerUtils;
@@ -41,7 +40,15 @@
static {
try {
+ File f = new File("target/smx4");
+ f.mkdirs();
+ System.setProperty("servicemix.home", f.getAbsolutePath());
+ System.setProperty("servicemix.base", f.getAbsolutePath());
+ System.setProperty("org.apache.servicemix.filemonitor.configDir", new File(f, "etc").getAbsolutePath());
+ System.setProperty("org.apache.servicemix.filemonitor.monitorDir", new File(f, "deploy").getAbsolutePath());
+ System.setProperty("org.apache.servicemix.filemonitor.generatedJarDir", new File(f, "data/generate-bundles").getAbsolutePath());
System.setProperty("bundles.configuration.location", new File("src/test/conf").getAbsolutePath());
+ System.setProperty("org.osgi.vendor.framework", "org.apache.servicemix.kernel.testing.support");
PropertyConfigurator.configure("target/test-classes/log4j.properties");
} catch (Throwable t) {}
}
@@ -54,7 +61,7 @@
if (logger.isTraceEnabled())
logger.trace("system property [" + OSGI_FRAMEWORK_SELECTOR + "] has value=" + systemProperty);
- return (systemProperty == null ? Platforms.FELIX : systemProperty);
+ return (systemProperty == null ? SmxKernelPlatform.class.getName() : systemProperty);
}
protected String getBundle(String groupId, String artifactId) {
Added: servicemix/smx4/kernel/trunk/testing/support/src/main/java/org/apache/servicemix/kernel/testing/support/FrameworkUtil.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/testing/support/src/main/java/org/apache/servicemix/kernel/testing/support/FrameworkUtil.java?rev=650573&view=auto
==============================================================================
--- servicemix/smx4/kernel/trunk/testing/support/src/main/java/org/apache/servicemix/kernel/testing/support/FrameworkUtil.java (added)
+++ servicemix/smx4/kernel/trunk/testing/support/src/main/java/org/apache/servicemix/kernel/testing/support/FrameworkUtil.java Tue Apr 22 09:40:22 2008
@@ -0,0 +1,31 @@
+/*
+ * 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 regarding copyright ownership.
+ * The ASF licenses this file 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 KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.servicemix.kernel.testing.support;
+
+import org.apache.felix.framework.FilterImpl;
+import org.osgi.framework.Filter;
+import org.osgi.framework.InvalidSyntaxException;
+
+/**
+ */
+public class FrameworkUtil {
+
+ public static Filter createFilter(String f) throws InvalidSyntaxException {
+ return new FilterImpl(f);
+ }
+
+}
Added: servicemix/smx4/kernel/trunk/testing/support/src/main/java/org/apache/servicemix/kernel/testing/support/SmxKernelPlatform.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/testing/support/src/main/java/org/apache/servicemix/kernel/testing/support/SmxKernelPlatform.java?rev=650573&view=auto
==============================================================================
--- servicemix/smx4/kernel/trunk/testing/support/src/main/java/org/apache/servicemix/kernel/testing/support/SmxKernelPlatform.java (added)
+++ servicemix/smx4/kernel/trunk/testing/support/src/main/java/org/apache/servicemix/kernel/testing/support/SmxKernelPlatform.java Tue Apr 22 09:40:22 2008
@@ -0,0 +1,193 @@
+/*
+ * 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 regarding copyright ownership.
+ * The ASF licenses this file 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 KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.servicemix.kernel.testing.support;
+
+import java.util.Properties;
+import java.net.URL;
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.Method;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+
+import org.springframework.osgi.test.platform.FelixPlatform;
+import org.springframework.osgi.test.platform.OsgiPlatform;
+import org.springframework.util.ClassUtils;
+import org.apache.felix.main.Main;
+import org.apache.felix.framework.Felix;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.Bundle;
+
+public class SmxKernelPlatform implements OsgiPlatform {
+
+ private static final Log log = LogFactory.getLog(FelixPlatform.class);
+
+ private static final String FELIX_CONF_FILE = "felix.config.properties";
+
+ private static final String FELIX_CONFIG_PROPERTY = "felix.config.properties";
+
+ private static final String FELIX_PROFILE_DIR_PROPERTY = "felix.cache.profiledir";
+
+ private BundleContext context;
+
+ private Felix platform;
+
+ private File felixStorageDir;
+
+ private Properties configurationProperties = new Properties();
+
+ protected Properties getPlatformProperties() {
+ // load Felix configuration
+ Properties props = new Properties();
+ props.putAll(getFelixConfiguration());
+ props.putAll(getLocalConfiguration());
+ return props;
+ }
+
+ public Properties getConfigurationProperties() {
+ // local properties
+ configurationProperties.putAll(getPlatformProperties());
+ // system properties
+ configurationProperties.putAll(System.getProperties());
+ return configurationProperties;
+ }
+
+ public BundleContext getBundleContext() {
+ return context;
+ }
+
+ public void start() throws Exception {
+
+ platform = new Felix(getConfigurationProperties(), null);
+ platform.start();
+
+ Bundle systemBundle = platform;
+
+ // call getBundleContext
+ final Method getContext = systemBundle.getClass().getDeclaredMethod("getBundleContext", null);
+
+ AccessController.doPrivileged(new PrivilegedAction() {
+
+ public Object run() {
+ getContext.setAccessible(true);
+ return null;
+ }
+ });
+ context = (BundleContext) getContext.invoke(systemBundle, null);
+ }
+
+ public void stop() throws Exception {
+ try {
+ platform.stop();
+ }
+ finally {
+ // remove cache folder
+ delete(felixStorageDir);
+ }
+ }
+
+ public String toString() {
+ return getClass().getName();
+ }
+
+ File createTempDir(String suffix) {
+ if (suffix == null)
+ suffix = "osgi";
+ File tempFileName;
+
+ try {
+ tempFileName = File.createTempFile("org.sfw.osgi", suffix);
+ }
+ catch (IOException ex) {
+ if (log.isWarnEnabled()) {
+ log.warn("Could not create temporary directory, returning a temp folder inside the current folder", ex);
+ }
+ return new File("./tmp-test");
+ }
+
+ tempFileName.delete(); // we want it to be a directory...
+ File tempFolder = new File(tempFileName.getAbsolutePath());
+ tempFolder.mkdir();
+ return tempFolder;
+ }
+
+ /**
+ * Configuration settings for the OSGi test run.
+ *
+ * @return
+ */
+ private Properties getLocalConfiguration() {
+ Properties props = new Properties();
+ felixStorageDir = createTempDir("felix");
+ props.setProperty(FELIX_PROFILE_DIR_PROPERTY, this.felixStorageDir.getAbsolutePath());
+ if (log.isTraceEnabled())
+ log.trace("felix storage dir is " + felixStorageDir.getAbsolutePath());
+
+ return props;
+ }
+
+ /**
+ * Loads Felix config.properties.
+ *
+ * <strong>Note</strong> the current implementation uses Felix's Main class
+ * to resolve placeholders as opposed to loading the properties manually
+ * (through JDK's Properties class or Spring's PropertiesFactoryBean).
+ *
+ * @return
+ */
+ // TODO: this method should be removed once Felix 1.0.2 is released
+ private Properties getFelixConfiguration() {
+ String location = "/".concat(ClassUtils.classPackageAsResourcePath(getClass())).concat("/").concat(FELIX_CONF_FILE);
+ URL url = getClass().getResource(location);
+ if (url == null)
+ throw new RuntimeException("cannot find felix configuration properties file:" + location);
+
+ // used with Main
+ System.getProperties().setProperty(FELIX_CONFIG_PROPERTY, url.toExternalForm());
+
+ // load config.properties (use Felix's Main for resolving placeholders)
+ return Main.loadConfigProperties();
+ }
+
+ /**
+ * Delete the given file (can be a simple file or a folder).
+ *
+ * @param file the file to be deleted
+ * @return if the deletion succeded or not
+ */
+ public static boolean delete(File file) {
+
+ // bail out quickly
+ if (file == null)
+ return false;
+
+ // recursively delete children file
+ boolean success = true;
+
+ if (file.isDirectory()) {
+ String[] children = file.list();
+ for (int i = 0; i < children.length; i++) {
+ success &= delete(new File(file, children[i]));
+ }
+ }
+
+ // The directory is now empty so delete it
+ return (success &= file.delete());
+ }
+}
Added: servicemix/smx4/kernel/trunk/testing/support/src/main/resources/org/apache/servicemix/kernel/testing/support/felix.config.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/testing/support/src/main/resources/org/apache/servicemix/kernel/testing/support/felix.config.properties?rev=650573&view=auto
==============================================================================
--- servicemix/smx4/kernel/trunk/testing/support/src/main/resources/org/apache/servicemix/kernel/testing/support/felix.config.properties (added)
+++ servicemix/smx4/kernel/trunk/testing/support/src/main/resources/org/apache/servicemix/kernel/testing/support/felix.config.properties Tue Apr 22 09:40:22 2008
@@ -0,0 +1,349 @@
+################################################################################
+#
+# 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 regarding copyright ownership.
+# The ASF licenses this file 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 KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+################################################################################
+
+#
+# Framework config properties.
+#
+org.osgi.framework.system.packages=org.osgi.framework; version=1.3.0, \
+ org.osgi.service.packageadmin; version=1.2.0, \
+ org.osgi.service.startlevel; version=1.0.0, \
+ org.osgi.service.url; version=1.0.0, \
+ org.apache.servicemix.kernel.main.spi, \
+ com.sun.management, \
+ com.sun.org.apache.xalan.internal.xsltc.trax, \
+ com.sun.org.apache.xerces.internal.dom, \
+ com.sun.org.apache.xerces.internal.jaxp, \
+ com.sun.org.apache.xerces.internal.xni, \
+ ${jre-${java.specification.version}}
+#org.osgi.framework.bootdelegation=sun.*,com.sun.*
+
+# To enable the use of the startup.properties file to control the start level:
+felix.auto.start=startup.properties
+#felix.auto.start=all
+
+felix.startlevel.framework=100
+felix.startlevel.bundle=50
+felix.cache.profiledir=${servicemix.base}/data/cache
+#framework.service.urlhandlers=false
+
+#
+# Bundle config properties.
+#
+obr.repository.url=http://svn.apache.org/repos/asf/servicemix/smx4/obr-repo/repository.xml
+
+#
+# FileMonitor properties
+#
+org.apache.servicemix.filemonitor.configDir = ${servicemix.base}/etc
+org.apache.servicemix.filemonitor.monitorDir = ${servicemix.base}/deploy
+org.apache.servicemix.filemonitor.generatedJarDir = ${servicemix.base}/data/generated-bundles
+org.apache.servicemix.filemonitor.scanInterval = 500
+
+
+#
+# Java platform package export properties.
+#
+jre-1.5= \
+ javax.accessibility; \
+ javax.activity; \
+ javax.crypto; \
+ javax.crypto.interfaces; \
+ javax.crypto.spec; \
+ javax.imageio; \
+ javax.imageio.event; \
+ javax.imageio.metadata; \
+ javax.imageio.plugins.bmp; \
+ javax.imageio.plugins.jpeg; \
+ javax.imageio.spi; \
+ javax.imageio.stream; \
+ javax.management; \
+ javax.management.loading; \
+ javax.management.modelmbean; \
+ javax.management.monitor; \
+ javax.management.openmbean; \
+ javax.management.relation; \
+ javax.management.remote; \
+ javax.management.remote.rmi; \
+ javax.management.timer; \
+ javax.naming; \
+ javax.naming.directory; \
+ javax.naming.event; \
+ javax.naming.ldap; \
+ javax.naming.spi; \
+ javax.net; \
+ javax.net.ssl; \
+ javax.print; \
+ javax.print.attribute; \
+ javax.print.attribute.standard; \
+ javax.print.event; \
+ javax.rmi; \
+ javax.rmi.CORBA; \
+ javax.rmi.ssl; \
+ javax.security.auth; \
+ javax.security.auth.callback; \
+ javax.security.auth.kerberos; \
+ javax.security.auth.login; \
+ javax.security.auth.spi; \
+ javax.security.auth.x500; \
+ javax.security.cert; \
+ javax.security.sasl; \
+ javax.sound.midi; \
+ javax.sound.midi.spi; \
+ javax.sound.sampled; \
+ javax.sound.sampled.spi; \
+ javax.sql; \
+ javax.sql.rowset; \
+ javax.sql.rowset.serial; \
+ javax.sql.rowset.spi; \
+ javax.swing; \
+ javax.swing.border; \
+ javax.swing.colorchooser; \
+ javax.swing.event; \
+ javax.swing.filechooser; \
+ javax.swing.plaf; \
+ javax.swing.plaf.basic; \
+ javax.swing.plaf.metal; \
+ javax.swing.plaf.multi; \
+ javax.swing.plaf.synth; \
+ javax.swing.table; \
+ javax.swing.text; \
+ javax.swing.text.html; \
+ javax.swing.text.html.parser; \
+ javax.swing.text.rtf; \
+ javax.swing.tree; \
+ javax.swing.undo; \
+ javax.xml; \
+ javax.xml.datatype; \
+ javax.xml.namespace; \
+ javax.xml.parsers; \
+ javax.xml.transform; \
+ javax.xml.transform.dom; \
+ javax.xml.transform.sax; \
+ javax.xml.transform.stream; \
+ javax.xml.validation; \
+ javax.xml.xpath; \
+ org.ietf.jgss; \
+ org.omg.CORBA; \
+ org.omg.CORBA_2_3; \
+ org.omg.CORBA_2_3.portable; \
+ org.omg.CORBA.DynAnyPackage; \
+ org.omg.CORBA.ORBPackage; \
+ org.omg.CORBA.portable; \
+ org.omg.CORBA.TypeCodePackage; \
+ org.omg.CosNaming; \
+ org.omg.CosNaming.NamingContextExtPackage; \
+ org.omg.CosNaming.NamingContextPackage; \
+ org.omg.Dynamic; \
+ org.omg.DynamicAny; \
+ org.omg.DynamicAny.DynAnyFactoryPackage; \
+ org.omg.DynamicAny.DynAnyPackage; \
+ org.omg.IOP; \
+ org.omg.IOP.CodecFactoryPackage; \
+ org.omg.IOP.CodecPackage; \
+ org.omg.Messaging; \
+ org.omg.PortableInterceptor; \
+ org.omg.PortableInterceptor.ORBInitInfoPackage; \
+ org.omg.PortableServer; \
+ org.omg.PortableServer.CurrentPackage; \
+ org.omg.PortableServer.POAManagerPackage; \
+ org.omg.PortableServer.POAPackage; \
+ org.omg.PortableServer.portable; \
+ org.omg.PortableServer.ServantLocatorPackage; \
+ org.omg.SendingContext; \
+ org.omg.stub.java.rmi; \
+ org.omg.stub.javax.management.remote.rmi; \
+ org.w3c.dom; \
+ org.w3c.dom.bootstrap; \
+ org.w3c.dom.css; \
+ org.w3c.dom.events; \
+ org.w3c.dom.html; \
+ org.w3c.dom.ls; \
+ org.w3c.dom.ranges; \
+ org.w3c.dom.stylesheets; \
+ org.w3c.dom.traversal; \
+ org.w3c.dom.views; \
+ org.xml.sax; \
+ org.xml.sax.ext; \
+ org.xml.sax.helpers; \
+ sun.misc; \
+ sun.reflect; \
+ version="1.5.0"
+
+jre-1.6= \
+ javax.accessibility; \
+ javax.activation; \
+ javax.activity; \
+ javax.annotation; \
+ javax.annotation.processing; \
+ javax.crypto; \
+ javax.crypto.interfaces; \
+ javax.crypto.spec; \
+ javax.imageio; \
+ javax.imageio.event; \
+ javax.imageio.metadata; \
+ javax.imageio.plugins.bmp; \
+ javax.imageio.plugins.jpeg; \
+ javax.imageio.spi; \
+ javax.imageio.stream; \
+ javax.jws; \
+ javax.jws.soap; \
+ javax.lang; \
+ javax.lang.model; \
+ javax.lang.model.element; \
+ javax.lang.model.type; \
+ javax.lang.model.util; \
+ javax.management; \
+ javax.management.loading; \
+ javax.management.modelmbean; \
+ javax.management.monitor; \
+ javax.management.openmbean; \
+ javax.management.relation; \
+ javax.management.remote; \
+ javax.management.remote.rmi; \
+ javax.management.timer; \
+ javax.naming; \
+ javax.naming.directory; \
+ javax.naming.event; \
+ javax.naming.ldap; \
+ javax.naming.spi; \
+ javax.net; \
+ javax.net.ssl; \
+ javax.print; \
+ javax.print.attribute; \
+ javax.print.attribute.standard; \
+ javax.print.event; \
+ javax.rmi; \
+ javax.rmi.CORBA; \
+ javax.rmi.ssl; \
+ javax.script; \
+ javax.security.auth; \
+ javax.security.auth.callback; \
+ javax.security.auth.kerberos; \
+ javax.security.auth.login; \
+ javax.security.auth.spi; \
+ javax.security.auth.x500; \
+ javax.security.cert; \
+ javax.security.sasl; \
+ javax.sound.midi; \
+ javax.sound.midi.spi; \
+ javax.sound.sampled; \
+ javax.sound.sampled.spi; \
+ javax.sql; \
+ javax.sql.rowset; \
+ javax.sql.rowset.serial; \
+ javax.sql.rowset.spi; \
+ javax.swing; \
+ javax.swing.border; \
+ javax.swing.colorchooser; \
+ javax.swing.event; \
+ javax.swing.filechooser; \
+ javax.swing.plaf; \
+ javax.swing.plaf.basic; \
+ javax.swing.plaf.metal; \
+ javax.swing.plaf.multi; \
+ javax.swing.plaf.synth; \
+ javax.swing.table; \
+ javax.swing.text; \
+ javax.swing.text.html; \
+ javax.swing.text.html.parser; \
+ javax.swing.text.rtf; \
+ javax.swing.tree; \
+ javax.swing.undo; \
+ javax.tools; \
+ javax.xml; \
+ javax.xml.bind; \
+ javax.xml.bind.annotation; \
+ javax.xml.bind.annotation.adapters; \
+ javax.xml.bind.attachment; \
+ javax.xml.bind.helpers; \
+ javax.xml.bind.util; \
+ javax.xml.crypto; \
+ javax.xml.crypto.dom; \
+ javax.xml.crypto.dsig; \
+ javax.xml.crypto.dsig.dom; \
+ javax.xml.crypto.dsig.keyinfo; \
+ javax.xml.crypto.dsig.spec; \
+ javax.xml.datatype; \
+ javax.xml.namespace; \
+ javax.xml.parsers; \
+ javax.xml.soap; \
+ javax.xml.stream; \
+ javax.xml.stream.events; \
+ javax.xml.stream.util; \
+ javax.xml.transform; \
+ javax.xml.transform.dom; \
+ javax.xml.transform.sax; \
+ javax.xml.transform.stax; \
+ javax.xml.transform.stream; \
+ javax.xml.validation; \
+ javax.xml.ws; \
+ javax.xml.ws.handler; \
+ javax.xml.ws.handler.soap; \
+ javax.xml.ws.http; \
+ javax.xml.ws.soap; \
+ javax.xml.ws.spi; \
+ javax.xml.xpath; \
+ org.ietf.jgss; \
+ org.omg.CORBA; \
+ org.omg.CORBA_2_3; \
+ org.omg.CORBA_2_3.portable; \
+ org.omg.CORBA.DynAnyPackage; \
+ org.omg.CORBA.ORBPackage; \
+ org.omg.CORBA.portable; \
+ org.omg.CORBA.TypeCodePackage; \
+ org.omg.CosNaming; \
+ org.omg.CosNaming.NamingContextExtPackage; \
+ org.omg.CosNaming.NamingContextPackage; \
+ org.omg.Dynamic; \
+ org.omg.DynamicAny; \
+ org.omg.DynamicAny.DynAnyFactoryPackage; \
+ org.omg.DynamicAny.DynAnyPackage; \
+ org.omg.IOP; \
+ org.omg.IOP.CodecFactoryPackage; \
+ org.omg.IOP.CodecPackage; \
+ org.omg.Messaging; \
+ org.omg.PortableInterceptor; \
+ org.omg.PortableInterceptor.ORBInitInfoPackage; \
+ org.omg.PortableServer; \
+ org.omg.PortableServer.CurrentPackage; \
+ org.omg.PortableServer.POAManagerPackage; \
+ org.omg.PortableServer.POAPackage; \
+ org.omg.PortableServer.portable; \
+ org.omg.PortableServer.ServantLocatorPackage; \
+ org.omg.SendingContext; \
+ org.omg.stub.java.rmi; \
+ org.omg.stub.javax.management.remote.rmi; \
+ org.w3c.dom; \
+ org.w3c.dom.bootstrap; \
+ org.w3c.dom.css; \
+ org.w3c.dom.events; \
+ org.w3c.dom.html; \
+ org.w3c.dom.ls; \
+ org.w3c.dom.ranges; \
+ org.w3c.dom.stylesheets; \
+ org.w3c.dom.traversal; \
+ org.w3c.dom.views; \
+ org.w3c.dom.xpath; \
+ org.xml.sax; \
+ org.xml.sax.ext; \
+ org.xml.sax.helpers; \
+ sun.misc; \
+ sun.reflect; \
+ version="1.6.0"
+