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 2009/09/07 18:10:15 UTC
svn commit: r812215 [1/4] - in /servicemix/smx4/nmr/trunk: ./ assembly/
assembly/src/main/descriptors/ assembly/src/main/filtered-resources/
assembly/src/main/filtered-resources/etc/ branding/ document/
examples/interceptors/endpoint/ examples/intercep...
Author: gnodet
Date: Mon Sep 7 16:10:11 2009
New Revision: 812215
URL: http://svn.apache.org/viewvc?rev=812215&view=rev
Log:
SMX4NMR-144: Switch from servicemix-kernel to karaf
Added:
servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/etc/config.properties
servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/etc/org.apache.felix.karaf.features.cfg
servicemix/smx4/nmr/trunk/jbi/commands/src/main/resources/OSGI-INF/
servicemix/smx4/nmr/trunk/jbi/commands/src/main/resources/OSGI-INF/blueprint/
servicemix/smx4/nmr/trunk/jbi/commands/src/main/resources/OSGI-INF/blueprint/servicemix-jbi-commands.xml
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/NamingStrategy.java
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/DefaultNamingStrategy.java
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/resources/OSGI-INF/
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/resources/OSGI-INF/blueprint/
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/resources/OSGI-INF/blueprint/servicemix-jbi-deployer.xml
servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/AbstractIntegrationTest.java
servicemix/smx4/nmr/trunk/jbi/osgi/src/main/java/org/apache/servicemix/jbi/osgi/PassThroughConverter.java
servicemix/smx4/nmr/trunk/jbi/osgi/src/main/resources/OSGI-INF/
servicemix/smx4/nmr/trunk/jbi/osgi/src/main/resources/OSGI-INF/blueprint/
servicemix/smx4/nmr/trunk/jbi/osgi/src/main/resources/OSGI-INF/blueprint/servicemix-jbi.xml
servicemix/smx4/nmr/trunk/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/impl/ManagementContext.java
servicemix/smx4/nmr/trunk/naming/src/main/java/org/apache/servicemix/naming/Activator.java
servicemix/smx4/nmr/trunk/naming/src/main/java/org/apache/servicemix/naming/OSGiServicesContext.java
servicemix/smx4/nmr/trunk/naming/src/main/java/org/apache/servicemix/naming/ProxyInvocationHandler.java
servicemix/smx4/nmr/trunk/nmr/audit/src/main/resources/OSGI-INF/
servicemix/smx4/nmr/trunk/nmr/audit/src/main/resources/OSGI-INF/blueprint/
servicemix/smx4/nmr/trunk/nmr/audit/src/main/resources/OSGI-INF/blueprint/servicemix-audit-commands.xml
- copied, changed from r810983, servicemix/smx4/nmr/trunk/nmr/audit/src/main/resources/META-INF/spring/servicemix-audit-commands.xml
servicemix/smx4/nmr/trunk/nmr/commands/src/main/resources/OSGI-INF/
servicemix/smx4/nmr/trunk/nmr/commands/src/main/resources/OSGI-INF/blueprint/
servicemix/smx4/nmr/trunk/nmr/commands/src/main/resources/OSGI-INF/blueprint/servicemix-nmr-commands.xml
servicemix/smx4/nmr/trunk/nmr/management/src/main/resources/OSGI-INF/
servicemix/smx4/nmr/trunk/nmr/management/src/main/resources/OSGI-INF/blueprint/
servicemix/smx4/nmr/trunk/nmr/management/src/main/resources/OSGI-INF/blueprint/servicemix-nmr-management.xml
servicemix/smx4/nmr/trunk/nmr/osgi/src/main/java/org/apache/servicemix/nmr/osgi/PassThroughConverter.java
servicemix/smx4/nmr/trunk/nmr/osgi/src/main/resources/OSGI-INF/
servicemix/smx4/nmr/trunk/nmr/osgi/src/main/resources/OSGI-INF/blueprint/
servicemix/smx4/nmr/trunk/nmr/osgi/src/main/resources/OSGI-INF/blueprint/servicemix-nmr.xml
servicemix/smx4/nmr/trunk/testing/
servicemix/smx4/nmr/trunk/testing/pom.xml
servicemix/smx4/nmr/trunk/testing/support/
servicemix/smx4/nmr/trunk/testing/support/pom.xml
servicemix/smx4/nmr/trunk/testing/support/src/
servicemix/smx4/nmr/trunk/testing/support/src/main/
servicemix/smx4/nmr/trunk/testing/support/src/main/java/
servicemix/smx4/nmr/trunk/testing/support/src/main/java/org/
servicemix/smx4/nmr/trunk/testing/support/src/main/java/org/apache/
servicemix/smx4/nmr/trunk/testing/support/src/main/java/org/apache/servicemix/
servicemix/smx4/nmr/trunk/testing/support/src/main/java/org/apache/servicemix/platform/
servicemix/smx4/nmr/trunk/testing/support/src/main/java/org/apache/servicemix/platform/main/
servicemix/smx4/nmr/trunk/testing/support/src/main/java/org/apache/servicemix/platform/main/spi/
servicemix/smx4/nmr/trunk/testing/support/src/main/java/org/apache/servicemix/platform/main/spi/MainService.java
servicemix/smx4/nmr/trunk/testing/support/src/main/java/org/apache/servicemix/platform/testing/
servicemix/smx4/nmr/trunk/testing/support/src/main/java/org/apache/servicemix/platform/testing/support/
servicemix/smx4/nmr/trunk/testing/support/src/main/java/org/apache/servicemix/platform/testing/support/AbstractIntegrationTest.java
servicemix/smx4/nmr/trunk/testing/support/src/main/java/org/apache/servicemix/platform/testing/support/Counter.java
servicemix/smx4/nmr/trunk/testing/support/src/main/java/org/apache/servicemix/platform/testing/support/FrameworkUtil.java
servicemix/smx4/nmr/trunk/testing/support/src/main/java/org/apache/servicemix/platform/testing/support/SmxPlatform.java
servicemix/smx4/nmr/trunk/testing/support/src/main/resources/
servicemix/smx4/nmr/trunk/testing/support/src/main/resources/META-INF/
servicemix/smx4/nmr/trunk/testing/support/src/main/resources/META-INF/spring/
servicemix/smx4/nmr/trunk/testing/support/src/main/resources/META-INF/spring/testing-support.xml
servicemix/smx4/nmr/trunk/testing/support/src/main/resources/org/
servicemix/smx4/nmr/trunk/testing/support/src/main/resources/org/apache/
servicemix/smx4/nmr/trunk/testing/support/src/main/resources/org/apache/servicemix/
servicemix/smx4/nmr/trunk/testing/support/src/main/resources/org/apache/servicemix/platform/
servicemix/smx4/nmr/trunk/testing/support/src/main/resources/org/apache/servicemix/platform/testing/
servicemix/smx4/nmr/trunk/testing/support/src/main/resources/org/apache/servicemix/platform/testing/support/
servicemix/smx4/nmr/trunk/testing/support/src/main/resources/org/apache/servicemix/platform/testing/support/config.properties
servicemix/smx4/nmr/trunk/testing/support/src/test/
servicemix/smx4/nmr/trunk/testing/support/src/test/java/
servicemix/smx4/nmr/trunk/testing/support/src/test/java/org/
servicemix/smx4/nmr/trunk/testing/support/src/test/java/org/apache/
servicemix/smx4/nmr/trunk/testing/support/src/test/java/org/apache/servicemix/
servicemix/smx4/nmr/trunk/testing/support/src/test/java/org/apache/servicemix/platform/
servicemix/smx4/nmr/trunk/testing/support/src/test/java/org/apache/servicemix/platform/testing/
servicemix/smx4/nmr/trunk/testing/support/src/test/java/org/apache/servicemix/platform/testing/support/
servicemix/smx4/nmr/trunk/testing/support/src/test/java/org/apache/servicemix/platform/testing/support/AbstractIntegrationTestTest.java
servicemix/smx4/nmr/trunk/transaction/src/main/java/javax/
servicemix/smx4/nmr/trunk/transaction/src/main/java/javax/resource/
servicemix/smx4/nmr/trunk/transaction/src/main/java/javax/resource/spi/
servicemix/smx4/nmr/trunk/transaction/src/main/java/javax/resource/spi/XATerminator.java
servicemix/smx4/nmr/trunk/transaction/src/main/java/org/apache/servicemix/transaction/Activator.java
servicemix/smx4/nmr/trunk/transaction/src/main/java/org/apache/servicemix/transaction/TransactionManagerService.java
Removed:
servicemix/smx4/nmr/trunk/jbi/commands/src/main/resources/META-INF/
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/resources/META-INF/
servicemix/smx4/nmr/trunk/jbi/itests/src/test/resources/org/
servicemix/smx4/nmr/trunk/jbi/osgi/src/main/resources/META-INF/spring/
servicemix/smx4/nmr/trunk/naming/src/main/resources/META-INF/
servicemix/smx4/nmr/trunk/nmr/audit/src/main/resources/META-INF/
servicemix/smx4/nmr/trunk/nmr/commands/src/main/resources/META-INF/
servicemix/smx4/nmr/trunk/nmr/management/src/main/resources/META-INF/
servicemix/smx4/nmr/trunk/nmr/osgi/src/main/resources/META-INF/spring/
servicemix/smx4/nmr/trunk/transaction/src/main/resources/META-INF/
Modified:
servicemix/smx4/nmr/trunk/assembly/pom.xml
servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/unix-bin.xml
servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/windows-bin.xml
servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/features.xml
servicemix/smx4/nmr/trunk/branding/pom.xml
servicemix/smx4/nmr/trunk/document/pom.xml
servicemix/smx4/nmr/trunk/examples/interceptors/endpoint/README.txt
servicemix/smx4/nmr/trunk/examples/interceptors/exchange/README.txt
servicemix/smx4/nmr/trunk/jbi/cluster/config/pom.xml
servicemix/smx4/nmr/trunk/jbi/cluster/engine/pom.xml
servicemix/smx4/nmr/trunk/jbi/commands/pom.xml
servicemix/smx4/nmr/trunk/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/JbiCommandCompleter.java
servicemix/smx4/nmr/trunk/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/JbiCommandSupport.java
servicemix/smx4/nmr/trunk/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/JbiLifeCycleCommandSupport.java
servicemix/smx4/nmr/trunk/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/ListCommand.java
servicemix/smx4/nmr/trunk/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/ShutdownCommand.java
servicemix/smx4/nmr/trunk/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/StartCommand.java
servicemix/smx4/nmr/trunk/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/StopCommand.java
servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/handler/JBIDeploymentListener.java
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/AdminCommandsImpl.java
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/Deployer.java
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/DeploymentService.java
servicemix/smx4/nmr/trunk/jbi/itests/pom.xml
servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/IntegrationTest.java
servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/ManagementTest.java
servicemix/smx4/nmr/trunk/jbi/itests/src/test/resources/log4j.properties
servicemix/smx4/nmr/trunk/jbi/osgi/pom.xml
servicemix/smx4/nmr/trunk/jbi/osgi/src/main/java/org/apache/servicemix/jbi/osgi/NMRWrapper.java
servicemix/smx4/nmr/trunk/jbi/pom.xml
servicemix/smx4/nmr/trunk/naming/pom.xml
servicemix/smx4/nmr/trunk/naming/src/main/java/org/apache/servicemix/naming/GlobalInitialContextFactoryBuilder.java
servicemix/smx4/nmr/trunk/naming/src/main/java/org/apache/servicemix/naming/OSGiContext.java
servicemix/smx4/nmr/trunk/naming/src/main/java/org/apache/servicemix/naming/OSGiInitialContextFactoryBuilder.java
servicemix/smx4/nmr/trunk/nmr/audit/pom.xml
servicemix/smx4/nmr/trunk/nmr/audit/src/main/java/org/apache/servicemix/nmr/audit/commands/AuditCommandSupport.java
servicemix/smx4/nmr/trunk/nmr/audit/src/main/java/org/apache/servicemix/nmr/audit/commands/CountCommand.java
servicemix/smx4/nmr/trunk/nmr/audit/src/main/java/org/apache/servicemix/nmr/audit/commands/DeleteCommand.java
servicemix/smx4/nmr/trunk/nmr/audit/src/main/java/org/apache/servicemix/nmr/audit/commands/ExchangesCommand.java
servicemix/smx4/nmr/trunk/nmr/audit/src/main/java/org/apache/servicemix/nmr/audit/commands/FindCommand.java
servicemix/smx4/nmr/trunk/nmr/audit/src/main/java/org/apache/servicemix/nmr/audit/commands/IdsCommand.java
servicemix/smx4/nmr/trunk/nmr/commands/pom.xml
servicemix/smx4/nmr/trunk/nmr/commands/src/main/java/org/apache/servicemix/nmr/commands/ListCommand.java
servicemix/smx4/nmr/trunk/nmr/commands/src/main/java/org/apache/servicemix/nmr/commands/NmrCommandSupport.java
servicemix/smx4/nmr/trunk/nmr/core/pom.xml
servicemix/smx4/nmr/trunk/nmr/core/src/test/java/org/apache/servicemix/nmr/core/FrameworkUtil.java
servicemix/smx4/nmr/trunk/nmr/management/pom.xml
servicemix/smx4/nmr/trunk/nmr/management/src/main/java/org/apache/servicemix/nmr/management/ManagementAgent.java
servicemix/smx4/nmr/trunk/nmr/management/src/main/java/org/apache/servicemix/nmr/management/ManagementEndpointRegistry.java
servicemix/smx4/nmr/trunk/nmr/osgi/pom.xml
servicemix/smx4/nmr/trunk/nmr/osgi/src/main/java/org/apache/servicemix/nmr/osgi/OsgiServiceRegistryTracker.java
servicemix/smx4/nmr/trunk/nmr/spring/pom.xml
servicemix/smx4/nmr/trunk/pom.xml
servicemix/smx4/nmr/trunk/transaction/pom.xml
servicemix/smx4/nmr/trunk/transaction/src/main/java/org/apache/servicemix/transaction/GeronimoPlatformTransactionManager.java
Modified: servicemix/smx4/nmr/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/assembly/pom.xml?rev=812215&r1=812214&r2=812215&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/assembly/pom.xml Mon Sep 7 16:10:11 2009
@@ -34,13 +34,13 @@
<dependencies>
<dependency>
- <groupId>org.apache.servicemix.kernel</groupId>
- <artifactId>apache-servicemix-kernel</artifactId>
+ <groupId>org.apache.felix.karaf</groupId>
+ <artifactId>apache-felix-karaf</artifactId>
<type>zip</type>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.kernel</groupId>
- <artifactId>apache-servicemix-kernel</artifactId>
+ <groupId>org.apache.felix.karaf</groupId>
+ <artifactId>apache-felix-karaf</artifactId>
<type>tar.gz</type>
</dependency>
<dependency>
@@ -132,6 +132,14 @@
<artifactId>org.apache.servicemix.bundles.howl</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.aopalliance</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.cglib</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.servicemix.transaction</groupId>
<artifactId>org.apache.servicemix.transaction</artifactId>
</dependency>
@@ -155,6 +163,18 @@
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-classloader</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context-support</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>spring-osgi-extender</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>spring-osgi-annotation</artifactId>
+ </dependency>
</dependencies>
<build>
<resources>
@@ -193,8 +213,8 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>org.apache.servicemix.kernel</groupId>
- <artifactId>apache-servicemix-kernel</artifactId>
+ <groupId>org.apache.felix.karaf</groupId>
+ <artifactId>apache-felix-karaf</artifactId>
<type>tar.gz</type>
<outputDirectory>target/dependencies/unix</outputDirectory>
</artifactItem>
@@ -210,8 +230,8 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>org.apache.servicemix.kernel</groupId>
- <artifactId>apache-servicemix-kernel</artifactId>
+ <groupId>org.apache.felix.karaf</groupId>
+ <artifactId>apache-felix-karaf</artifactId>
<type>zip</type>
<outputDirectory>target/dependencies/win</outputDirectory>
</artifactItem>
@@ -238,8 +258,9 @@
</executions>
</plugin>
<plugin>
- <groupId>org.apache.servicemix.tooling</groupId>
+ <groupId>org.apache.felix.karaf.tooling</groupId>
<artifactId>features-maven-plugin</artifactId>
+ <version>${felix.karaf.version}</version>
<executions>
<execution>
<id>add-features-to-repo</id>
@@ -249,6 +270,7 @@
</goals>
<configuration>
<descriptors>
+ <descriptor>mvn:org.apache.felix.karaf/apache-felix-karaf/${felix.karaf.version}/xml/features</descriptor>
<descriptor>file:${basedir}/target/classes/features.xml</descriptor>
</descriptors>
<features>
Modified: servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/unix-bin.xml?rev=812215&r1=812214&r2=812215&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/unix-bin.xml (original)
+++ servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/unix-bin.xml Mon Sep 7 16:10:11 2009
@@ -24,14 +24,15 @@
<fileSets>
- <!-- Expanded ServiceMix Runtime -->
+ <!-- Expanded Karaf -->
<fileSet>
- <directory>${basedir}/target/dependencies/unix/apache-servicemix-kernel-${servicemix.kernel.version}</directory>
+ <directory>${basedir}/target/dependencies/unix/apache-felix-karaf-${felix.karaf.version}</directory>
<outputDirectory>/</outputDirectory>
<excludes>
<exclude>bin/**</exclude>
<exclude>demos/**</exclude>
- <exclude>etc/org.apache.servicemix.features.cfg</exclude>
+ <exclude>etc/org.apache.felix.karaf.features.cfg</exclude>
+ <exclude>etc/config.properties</exclude>
<exclude>LICENSE.txt</exclude>
<exclude>NOTICE.txt</exclude>
<exclude>README.txt</exclude>
@@ -39,9 +40,9 @@
</excludes>
</fileSet>
- <!-- Copy over bin/servicemix separately to get the correct file mode -->
+ <!-- Copy over bin/karaf separately to get the correct file mode -->
<fileSet>
- <directory>${basedir}/target/dependencies/unix/apache-servicemix-kernel-${servicemix.kernel.version}</directory>
+ <directory>${basedir}/target/dependencies/unix/apache-felix-karaf-${felix.karaf.version}</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>bin/*</include>
Modified: servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/windows-bin.xml?rev=812215&r1=812214&r2=812215&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/windows-bin.xml (original)
+++ servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/windows-bin.xml Mon Sep 7 16:10:11 2009
@@ -24,14 +24,15 @@
<fileSets>
- <!-- Expanded ServiceMix Runtime -->
+ <!-- Expanded Karaf -->
<fileSet>
- <directory>${basedir}/target/dependencies/win/apache-servicemix-kernel-${servicemix.kernel.version}</directory>
+ <directory>${basedir}/target/dependencies/win/apache-felix-karaf-${felix.karaf.version}</directory>
<outputDirectory>/</outputDirectory>
<excludes>
<exclude>bin/**</exclude>
<exclude>demos/**</exclude>
- <exclude>etc/org.apache.servicemix.features.cfg</exclude>
+ <exclude>etc/org.apache.felix.karaf.features.cfg</exclude>
+ <exclude>etc/config.properties</exclude>
<exclude>LICENSE.txt</exclude>
<exclude>NOTICE.txt</exclude>
<exclude>README.txt</exclude>
@@ -39,9 +40,9 @@
</excludes>
</fileSet>
- <!-- Copy over bin/servicemix separately to get the correct file mode -->
+ <!-- Copy over bin/karaf separately to get the correct file mode -->
<fileSet>
- <directory>${basedir}/target/dependencies/win/apache-servicemix-kernel-${servicemix.kernel.version}</directory>
+ <directory>${basedir}/target/dependencies/win/apache-felix-karaf-${felix.karaf.version}</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>bin/*</include>
Added: servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/etc/config.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/etc/config.properties?rev=812215&view=auto
==============================================================================
--- servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/etc/config.properties (added)
+++ servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/etc/config.properties Mon Sep 7 16:10:11 2009
@@ -0,0 +1,354 @@
+################################################################################
+#
+# 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 selection properties
+#
+karaf.framework=felix
+
+karaf.framework.equinox=system/org/eclipse/osgi/${equinox.version}/osgi-${equinox.version}.jar
+karaf.framework.felix=system/org/apache/felix/org.apache.felix.framework/${felix.framework.version}/org.apache.felix.framework-${felix.framework.version}.jar
+
+#
+# Framework config properties.
+#
+org.osgi.framework.system.packages=org.osgi.framework; version=1.5.0, \
+ org.osgi.framework.launch; version=1.0.0, \
+ org.osgi.framework.hooks.service; version=1.0.0, \
+ org.osgi.service.packageadmin; version=1.2.0, \
+ org.osgi.service.startlevel; version=1.1.0, \
+ org.osgi.service.url; version=1.0.0, \
+ org.osgi.util.tracker; version=1.4.0 \
+ ${jre-${java.specification.version}}
+
+org.osgi.framework.system.packages.extra=\
+ org.apache.felix.karaf.jaas.boot; version=0.9.0, \
+ org.apache.felix.karaf.version; version=0.9.0
+
+org.osgi.framework.bootdelegation=sun.*,com.sun.management*
+
+# To enable the use of the startup.properties file to control the start level:
+karaf.auto.start=startup.properties
+#felix.auto.start=all
+
+org.osgi.framework.startlevel.beginning=100
+karaf.startlevel.bundle=60
+
+#
+# Bundle config properties.
+#
+obr.repository.url=http://svn.apache.org/repos/asf/servicemix/smx4/obr-repo/repository.xml
+
+#
+# FileMonitor properties
+#
+felix.fileinstall.dir = ${karaf.base}/etc
+felix.fileinstall.filter = .*\\.cfg
+felix.fileinstall.poll = 1000
+
+
+#
+# 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.transaction; \
+# javax.transaction.xa; \
+ 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; \
+ 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.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.transaction; \
+# javax.transaction.xa; \
+ 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; \
+ version="1.6.0"
Added: servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/etc/org.apache.felix.karaf.features.cfg
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/etc/org.apache.felix.karaf.features.cfg?rev=812215&view=auto
==============================================================================
--- servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/etc/org.apache.felix.karaf.features.cfg (added)
+++ servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/etc/org.apache.felix.karaf.features.cfg Mon Sep 7 16:10:11 2009
@@ -0,0 +1,29 @@
+################################################################################
+#
+# 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.
+#
+################################################################################
+
+#
+# Comma separated list of features repositories to register by default
+#
+featuresRepositories=mvn:org.apache.felix.karaf/apache-felix-karaf/${felix.karaf.version}/xml/features,mvn:org.apache.servicemix.nmr/apache-servicemix-nmr/${version}/xml/features
+
+#
+# Comma separated list of features to install at startup
+#
+featuresBoot=jbi
+
Modified: servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/features.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/features.xml?rev=812215&r1=812214&r2=812215&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/features.xml (original)
+++ servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/features.xml Mon Sep 7 16:10:11 2009
@@ -18,18 +18,17 @@
-->
<features>
<feature name="naming" version="${version}">
- <bundle>mvn:org.apache.xbean/xbean-naming/${xbean.version}</bundle>
<bundle>mvn:org.apache.servicemix.naming/org.apache.servicemix.naming/${pom.version}</bundle>
</feature>
<feature name="transaction" version="${version}">
- <bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta.version}</bundle>
- <bundle>mvn:org.apache.geronimo.specs/geronimo-j2ee-connector_1.5_spec/${geronimo.j2ee.connector.version}</bundle>
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.howl/${howl.version}</bundle>
- <bundle>mvn:org.apache.geronimo.components/geronimo-transaction/${geronimo.transaction.version}</bundle>
- <bundle>mvn:org.springframework/spring-tx/${spring.version}</bundle>
<bundle>mvn:org.apache.servicemix.transaction/org.apache.servicemix.transaction/${version}</bundle>
</feature>
+ <feature name="document" version="${version}">
+ <feature>spring-dm</feature>
+ <bundle>mvn:org.apache.servicemix.document/org.apache.servicemix.document/${pom.version}</bundle>
+ </feature>
<feature name="nmr" version="${version}">
+ <feature>document</feature>
<!-- those two bundles are currently required for servicemix-utils to resolve -->
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix.specs.version}</bundle>
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jbi-api-1.0/${servicemix.specs.version}</bundle>
@@ -64,6 +63,7 @@
</feature>
<feature name="jbi-cluster" version="${version}">
<feature version="${version}">jbi</feature>
+ <feature>spring</feature>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo.jms.version}</bundle>
<bundle>mvn:org.springframework/spring-jms/${spring.version}</bundle>
<bundle>mvn:org.apache.servicemix.jbi.cluster/org.apache.servicemix.jbi.cluster.requestor/${pom.version}</bundle>
Modified: servicemix/smx4/nmr/trunk/branding/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/branding/pom.xml?rev=812215&r1=812214&r2=812215&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/branding/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/branding/pom.xml Mon Sep 7 16:10:11 2009
@@ -52,7 +52,7 @@
<Import-Package>*</Import-Package>
<Private-Package>!*</Private-Package>
<Export-Package>
- org.apache.servicemix.kernel.version
+ org.apache.felix.karaf.version
</Export-Package>
<Spring-Context>*;publish-context:=false</Spring-Context>
</instructions>
Modified: servicemix/smx4/nmr/trunk/document/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/document/pom.xml?rev=812215&r1=812214&r2=812215&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/document/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/document/pom.xml Mon Sep 7 16:10:11 2009
@@ -64,11 +64,6 @@
<configuration>
<instructions>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
- <Import-Package>
- org.springframework.osgi*;version="[1.2.0,2.0.0)",
- org.springframework*;version="[2.5.6,3.0.0)",
- *
- </Import-Package>
<Export-Package>${pom.artifactId},${pom.artifactId}.factory</Export-Package>
<Private-Package>${pom.artifactId}.impl</Private-Package>
<Spring-Context>*;publish-context:=false;create-asynchronously:=true</Spring-Context>
Modified: servicemix/smx4/nmr/trunk/examples/interceptors/endpoint/README.txt
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/examples/interceptors/endpoint/README.txt?rev=812215&r1=812214&r2=812215&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/examples/interceptors/endpoint/README.txt (original)
+++ servicemix/smx4/nmr/trunk/examples/interceptors/endpoint/README.txt Mon Sep 7 16:10:11 2009
@@ -22,7 +22,7 @@
-------------------------------------
Launch the ServiceMix Kernel by running
- bin/servicemix
+ bin/karaf
in the root dir of this distribution.
run:
@@ -31,7 +31,7 @@
Deploy the example on ServiceMix 4:
- using the ServiceMix console:
- osgi/install -s mvn:org.apache.servicemix.nmr.examples.interceptors/endpoint/${version}/jar
+ osgi:install -s mvn:org.apache.servicemix.nmr.examples.interceptors/endpoint/${version}/jar
Once the bundle is installed it will capture and report to the servicemix
log the endpoint register and unregister events in the NMR.
@@ -39,7 +39,7 @@
Starting and Stopping the Listener:
- using the ServiceMix console:
- osgi/start BundleID
- osgi/stop BundleID
+ osgi:start BundleID
+ osgi:stop BundleID
Note: Upon installation the Listener will automatically be started.
Modified: servicemix/smx4/nmr/trunk/examples/interceptors/exchange/README.txt
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/examples/interceptors/exchange/README.txt?rev=812215&r1=812214&r2=812215&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/examples/interceptors/exchange/README.txt (original)
+++ servicemix/smx4/nmr/trunk/examples/interceptors/exchange/README.txt Mon Sep 7 16:10:11 2009
@@ -22,7 +22,7 @@
-------------------------------------
Launch the ServiceMix Kernel by running
- bin/servicemix
+ bin/karaf
in the root dir of this distribution.
run:
@@ -31,7 +31,7 @@
Deploy the example on ServiceMix 4:
- using the ServiceMix console:
- osgi/install -s mvn:org.apache.servicemix.nmr.examples.interceptors/exchange/${version}/jar
+ osgi:install -s mvn:org.apache.servicemix.nmr.examples.interceptors/exchange/${version}/jar
Once the bundle is installed it will capture and report to the servicemix
log the sent and delivered exchanges in the NMR.
@@ -39,7 +39,7 @@
Starting and Stopping the Listener:
- using the ServiceMix console:
- osgi/start BundleID
- osgi/stop BundleID
+ osgi:start BundleID
+ osgi:stop BundleID
Note: Upon installation the Listener will automatically be started.
Modified: servicemix/smx4/nmr/trunk/jbi/cluster/config/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/cluster/config/pom.xml?rev=812215&r1=812214&r2=812215&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/cluster/config/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/cluster/config/pom.xml Mon Sep 7 16:10:11 2009
@@ -47,8 +47,6 @@
<instructions>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Import-Package>
- org.springframework.osgi*;version="[1.2.0,2.0.0)",
- org.springframework*;version="[2.5.6,3.0.0)",
javax.jms,
org.apache.servicemix.nmr.api,
org.apache.servicemix.nmr.api.event,
Modified: servicemix/smx4/nmr/trunk/jbi/cluster/engine/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/cluster/engine/pom.xml?rev=812215&r1=812214&r2=812215&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/cluster/engine/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/cluster/engine/pom.xml Mon Sep 7 16:10:11 2009
@@ -119,8 +119,6 @@
<instructions>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Import-Package>
- org.springframework.osgi*;version="[1.2.0,2.0.0)",
- org.springframework*;version="[2.5.6,3.0.0)",
*
</Import-Package>
<Spring-Context>*;publish-context:=false;create-asynchronously:=true</Spring-Context>
Modified: servicemix/smx4/nmr/trunk/jbi/commands/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/commands/pom.xml?rev=812215&r1=812214&r2=812215&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/commands/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/commands/pom.xml Mon Sep 7 16:10:11 2009
@@ -37,8 +37,9 @@
<artifactId>org.apache.servicemix.jbi.deployer</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.kernel.gshell</groupId>
- <artifactId>org.apache.servicemix.kernel.gshell.core</artifactId>
+ <groupId>org.apache.felix.karaf.gshell</groupId>
+ <artifactId>org.apache.felix.karaf.gshell.console</artifactId>
+ <version>${felix.karaf.version}</version>
</dependency>
</dependencies>
@@ -51,19 +52,16 @@
<instructions>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Import-Package>
- org.springframework.osgi*;version="[1.2.0,2.0.0)",
- org.springframework*;version="[2.5.6,3.0.0)",
- org.apache.geronimo.gshell.wisdom.command,
- org.apache.geronimo.gshell.wisdom.registry,
- org.apache.servicemix.kernel.gshell.core,
- *
+ org.osgi.service.command,
+ org.apache.felix.gogo.commands,
+ org.apache.felix.karaf.gshell.console,
+ *
</Import-Package>
- <Export-Package>${pom.artifactId}*</Export-Package>
- <Spring-Context>*;publish-context:=false;create-asynchronously:=false</Spring-Context>
+ <Export-Package>${pom.artifactId}*;version=${project.version}</Export-Package>
</instructions>
</configuration>
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: servicemix/smx4/nmr/trunk/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/JbiCommandCompleter.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/JbiCommandCompleter.java?rev=812215&r1=812214&r2=812215&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/JbiCommandCompleter.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/JbiCommandCompleter.java Mon Sep 7 16:10:11 2009
@@ -21,8 +21,8 @@
import java.util.List;
import java.util.Set;
-import jline.Completor;
-import org.apache.geronimo.gshell.console.completer.StringsCompleter;
+import org.apache.felix.karaf.gshell.console.Completer;
+import org.apache.felix.karaf.gshell.console.completer.StringsCompleter;
import org.apache.servicemix.jbi.deployer.Component;
import org.apache.servicemix.jbi.deployer.ServiceAssembly;
import org.apache.servicemix.jbi.deployer.impl.Deployer;
@@ -31,9 +31,9 @@
import org.springframework.osgi.context.BundleContextAware;
/**
- * {@link jline.Completor} for JBI artifacts.
+ * {@link org.apache.felix.karaf.gshell.console.Completer} for JBI artifacts.
*/
-public class JbiCommandCompleter implements Completor, BundleContextAware {
+public class JbiCommandCompleter implements Completer, BundleContextAware {
private BundleContext bundleContext;
Modified: servicemix/smx4/nmr/trunk/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/JbiCommandSupport.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/JbiCommandSupport.java?rev=812215&r1=812214&r2=812215&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/JbiCommandSupport.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/JbiCommandSupport.java Mon Sep 7 16:10:11 2009
@@ -19,7 +19,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.servicemix.kernel.gshell.core.OsgiCommandSupport;
+import org.apache.felix.karaf.gshell.console.OsgiCommandSupport;
import org.apache.servicemix.jbi.deployer.Component;
import org.apache.servicemix.jbi.deployer.ServiceAssembly;
import org.apache.servicemix.jbi.deployer.SharedLibrary;
Modified: servicemix/smx4/nmr/trunk/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/JbiLifeCycleCommandSupport.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/JbiLifeCycleCommandSupport.java?rev=812215&r1=812214&r2=812215&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/JbiLifeCycleCommandSupport.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/JbiLifeCycleCommandSupport.java Mon Sep 7 16:10:11 2009
@@ -20,8 +20,8 @@
import javax.jbi.management.LifeCycleMBean;
-import org.apache.geronimo.gshell.clp.Argument;
-import org.apache.geronimo.gshell.clp.Option;
+import org.apache.felix.gogo.commands.Argument;
+import org.apache.felix.gogo.commands.Option;
import org.apache.servicemix.jbi.deployer.Component;
import org.apache.servicemix.jbi.deployer.ServiceAssembly;
@@ -59,10 +59,10 @@
continue;
}
}
- io.out.println("Artifact " + artifact + " not found");
+ System.out.println("Artifact " + artifact + " not found");
}
catch (Exception e) {
- io.out.println("Error processing " + artifact + ": " + e);
+ System.out.println("Error processing " + artifact + ": " + e);
}
}
return null;
Modified: servicemix/smx4/nmr/trunk/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/ListCommand.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/ListCommand.java?rev=812215&r1=812214&r2=812215&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/ListCommand.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/ListCommand.java Mon Sep 7 16:10:11 2009
@@ -23,10 +23,12 @@
import org.apache.servicemix.jbi.deployer.Component;
import org.apache.servicemix.jbi.deployer.ServiceAssembly;
import org.apache.servicemix.jbi.deployer.SharedLibrary;
+import org.apache.felix.gogo.commands.Command;
/**
* List JBI artifacts
*/
+@Command(scope = "jbi", name = "list", description = "List JBI endpoints")
public class ListCommand extends JbiCommandSupport {
private static final int NAME_COL_LENGTH = 30;
@@ -34,38 +36,38 @@
protected Object doExecute() throws Exception {
List<SharedLibrary> libraries = getSharedLibraries();
if (libraries != null && !libraries.isEmpty()) {
- io.out.println("Shared Libraries");
- io.out.println("----------------");
+ System.out.println("Shared Libraries");
+ System.out.println("----------------");
for (SharedLibrary library : libraries) {
- io.out.println(library.getName() + " - " + library.getVersion() + " - " + (library.getDescription() != null ? library.getDescription() : ""));
+ System.out.println(library.getName() + " - " + library.getVersion() + " - " + (library.getDescription() != null ? library.getDescription() : ""));
}
- io.out.println();
+ System.out.println();
}
List<Component> components = getComponents();
if (components != null && !components.isEmpty()) {
- io.out.println("Components");
- io.out.println("----------");
- io.out.println(" State Name Description");
+ System.out.println("Components");
+ System.out.println("----------");
+ System.out.println(" State Name Description");
for (Component component : components) {
- io.out.println("[" + getStateString(component.getCurrentState())+ "] ["
+ System.out.println("[" + getStateString(component.getCurrentState())+ "] ["
+ getNameString(component.getName(), NAME_COL_LENGTH) + "] "
+ (component.getDescription() != null ? component.getDescription() : ""));
}
- io.out.println();
+ System.out.println();
}
List<ServiceAssembly> assemblies = getServiceAssemblies();
if (assemblies != null && !assemblies.isEmpty()) {
- io.out.println("Service Assemblies");
- io.out.println("------------------");
- io.out.println(" State Name Description");
+ System.out.println("Service Assemblies");
+ System.out.println("------------------");
+ System.out.println(" State Name Description");
for (ServiceAssembly assembly : assemblies) {
- io.out.println("[" + getStateString(assembly.getCurrentState())+ "] ["
+ System.out.println("[" + getStateString(assembly.getCurrentState())+ "] ["
+ getNameString(assembly.getName(), NAME_COL_LENGTH) + "] "
+ (assembly.getDescription() != null ? assembly.getDescription() : ""));
}
- io.out.println();
+ System.out.println();
}
return null; //To change body of implemented methods use File | Settings | File Templates.
}
Modified: servicemix/smx4/nmr/trunk/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/ShutdownCommand.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/ShutdownCommand.java?rev=812215&r1=812214&r2=812215&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/ShutdownCommand.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/ShutdownCommand.java Mon Sep 7 16:10:11 2009
@@ -19,13 +19,15 @@
import javax.jbi.JBIException;
import javax.jbi.management.LifeCycleMBean;
-import org.apache.geronimo.gshell.clp.Option;
+import org.apache.felix.gogo.commands.Option;
+import org.apache.felix.gogo.commands.Command;
import org.apache.servicemix.jbi.deployer.ServiceAssembly;
import org.apache.servicemix.jbi.deployer.Component;
/**
* Shutdown a JBI artifact
*/
+@Command(scope = "jbi", name = "shutdown", description = "Shutdown a JBI artifact")
public class ShutdownCommand extends JbiLifeCycleCommandSupport {
@Option(name = "--force")
@@ -42,4 +44,4 @@
artifact.shutDown();
}
}
-}
\ No newline at end of file
+}
Modified: servicemix/smx4/nmr/trunk/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/StartCommand.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/StartCommand.java?rev=812215&r1=812214&r2=812215&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/StartCommand.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/StartCommand.java Mon Sep 7 16:10:11 2009
@@ -19,9 +19,12 @@
import javax.jbi.JBIException;
import javax.jbi.management.LifeCycleMBean;
+import org.apache.felix.gogo.commands.Command;
+
/**
* Start a JBI artifact
*/
+@Command(scope = "jbi", name = "start", description = "Start a JBI artifact")
public class StartCommand extends JbiLifeCycleCommandSupport {
protected void handle(LifeCycleMBean artifact) throws JBIException {
Modified: servicemix/smx4/nmr/trunk/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/StopCommand.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/StopCommand.java?rev=812215&r1=812214&r2=812215&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/StopCommand.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/StopCommand.java Mon Sep 7 16:10:11 2009
@@ -19,9 +19,12 @@
import javax.jbi.JBIException;
import javax.jbi.management.LifeCycleMBean;
+import org.apache.felix.gogo.commands.Command;
+
/**
* Stop a JBI artifact
*/
+@Command(scope = "jbi", name = "stop", description = "Stop a JBI artifact")
public class StopCommand extends JbiLifeCycleCommandSupport {
protected void handle(LifeCycleMBean artifact) throws JBIException {
Added: servicemix/smx4/nmr/trunk/jbi/commands/src/main/resources/OSGI-INF/blueprint/servicemix-jbi-commands.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/commands/src/main/resources/OSGI-INF/blueprint/servicemix-jbi-commands.xml?rev=812215&view=auto
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/commands/src/main/resources/OSGI-INF/blueprint/servicemix-jbi-commands.xml (added)
+++ servicemix/smx4/nmr/trunk/jbi/commands/src/main/resources/OSGI-INF/blueprint/servicemix-jbi-commands.xml Mon Sep 7 16:10:11 2009
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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.
+
+-->
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
+
+ <command-bundle xmlns="http://felix.apache.org/karaf/xmlns/gshell/v1.0.0">
+ <command name="jbi/list">
+ <action class="org.apache.servicemix.jbi.commands.ListCommand" />
+ </command>
+ <command name="jbi/start">
+ <action class="org.apache.servicemix.jbi.commands.StartCommand" />
+ <completers>
+ <ref component-id="jbiArtifactsCompleter" />
+ </completers>
+ </command>
+ <command name="jbi/stop">
+ <action class="org.apache.servicemix.jbi.commands.StopCommand" />
+ <completers>
+ <ref component-id="jbiArtifactsCompleter" />
+ </completers>
+ </command>
+ <command name="jbi/shutdown">
+ <action class="org.apache.servicemix.jbi.commands.ShutdownCommand" />
+ <completers>
+ <ref component-id="jbiArtifactsCompleter" />
+ </completers>
+ </command>
+ </command-bundle>
+
+ <bean id="jbiArtifactsCompleter" class="org.apache.servicemix.jbi.commands.JbiCommandCompleter" />
+
+</blueprint>
Modified: servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml?rev=812215&r1=812214&r2=812215&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml Mon Sep 7 16:10:11 2009
@@ -41,8 +41,8 @@
<artifactId>org.apache.servicemix.jbi.runtime</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.kernel</groupId>
- <artifactId>org.apache.servicemix.kernel.filemonitor</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.fileinstall</artifactId>
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
@@ -96,15 +96,13 @@
<instructions>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Import-Package>
- org.springframework.osgi*;version="[1.2.0,2.0.0)",
- org.springframework*;version="[2.5.6,3.0.0)",
javax.transaction,
+ javax.management.loading,
org.apache.geronimo.transaction.manager;resolution:=optional,
org.apache.servicemix.jbi.runtime.impl,
*
</Import-Package>
<Export-Package>org.apache.servicemix.jbi.deployer*</Export-Package>
- <Spring-Context>*;publish-context:=false;create-asynchronously:=true</Spring-Context>
</instructions>
</configuration>
</plugin>
Added: servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/NamingStrategy.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/NamingStrategy.java?rev=812215&view=auto
==============================================================================
(empty)
Modified: servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/handler/JBIDeploymentListener.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/handler/JBIDeploymentListener.java?rev=812215&r1=812214&r2=812215&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/handler/JBIDeploymentListener.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/handler/JBIDeploymentListener.java Mon Sep 7 16:10:11 2009
@@ -25,14 +25,14 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.jbi.deployer.descriptor.DescriptorFactory;
-import org.apache.servicemix.kernel.filemonitor.DeploymentListener;
+import org.apache.felix.fileinstall.ArtifactTransformer;
/**
* A JBI DeploymentListener which transforms plain JBI artifacts to OSGi bundles.
* The deployer will recognize zip and jar files containing a JBI descriptor and
* without any OSGi manifest entries.
*/
-public class JBIDeploymentListener implements DeploymentListener {
+public class JBIDeploymentListener implements ArtifactTransformer {
private static final Log Logger = LogFactory.getLog(JBIDeploymentListener.class);
@@ -79,7 +79,7 @@
* @return the location of the transformed OSGi bundle, or <code>null</code>
* if the transformation could not take place.
*/
- public File handle(File artifact, File tmpDir) {
+ public File transform(File artifact, File tmpDir) {
try {
String bundleName = artifact.getName().substring(0, artifact.getName().length() - 4) + ".jar";
File destFile = new File(tmpDir, bundleName);
Modified: servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/AdminCommandsImpl.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/AdminCommandsImpl.java?rev=812215&r1=812214&r2=812215&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/AdminCommandsImpl.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/AdminCommandsImpl.java Mon Sep 7 16:10:11 2009
@@ -36,7 +36,7 @@
import org.springframework.beans.factory.InitializingBean;
import org.springframework.util.StringUtils;
-public class AdminCommandsImpl implements AdminCommandsService, InitializingBean, DisposableBean, Nameable {
+public class AdminCommandsImpl implements AdminCommandsService, Nameable {
private Deployer deployer;
private InstallationService installationService;
@@ -444,7 +444,7 @@
return buffer.toString();
}
- public void afterPropertiesSet() throws Exception {
+ public void init() throws Exception {
deployer.getManagementStrategy().manageObject(this);
}
Added: servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/DefaultNamingStrategy.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/DefaultNamingStrategy.java?rev=812215&view=auto
==============================================================================
(empty)
Modified: servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/Deployer.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/Deployer.java?rev=812215&r1=812214&r2=812215&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/Deployer.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/Deployer.java Mon Sep 7 16:10:11 2009
@@ -68,14 +68,11 @@
import org.osgi.service.prefs.PreferencesService;
import org.osgi.util.tracker.ServiceTracker;
import org.springframework.osgi.util.OsgiStringUtils;
-import org.springframework.osgi.context.BundleContextAware;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.beans.factory.DisposableBean;
/**
* Deployer for JBI artifacts
*/
-public class Deployer implements BundleContextAware, InitializingBean, DisposableBean, SynchronousBundleListener, LifeCycleListener {
+public class Deployer implements SynchronousBundleListener, LifeCycleListener {
public static final String NAME = "NAME";
public static final String TYPE = "TYPE";
@@ -230,7 +227,7 @@
return shutdownTimeout;
}
- public void afterPropertiesSet() throws Exception {
+ public void init() throws Exception {
// Track bundles
bundleContext.addBundleListener(this);
for (Bundle bundle : bundleContext.getBundles()) {
Modified: servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/DeploymentService.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/DeploymentService.java?rev=812215&r1=812214&r2=812215&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/DeploymentService.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/DeploymentService.java Mon Sep 7 16:10:11 2009
@@ -37,7 +37,7 @@
import org.osgi.framework.BundleContext;
import org.springframework.osgi.context.BundleContextAware;
-public class DeploymentService implements DeploymentServiceMBean, BundleContextAware {
+public class DeploymentService implements DeploymentServiceMBean {
private static final Log LOG = LogFactory.getLog(DeploymentService.class);
Added: servicemix/smx4/nmr/trunk/jbi/deployer/src/main/resources/OSGI-INF/blueprint/servicemix-jbi-deployer.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/src/main/resources/OSGI-INF/blueprint/servicemix-jbi-deployer.xml?rev=812215&view=auto
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/src/main/resources/OSGI-INF/blueprint/servicemix-jbi-deployer.xml (added)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/src/main/resources/OSGI-INF/blueprint/servicemix-jbi-deployer.xml Mon Sep 7 16:10:11 2009
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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.
+
+-->
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+ xmlns:cm="http://www.osgi.org/xmlns/blueprint-cm/v1.0.0"
+ xmlns:ext="http://geronimo.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0">
+
+ <!-- JBI Deployer -->
+ <bean id="deployer" class="org.apache.servicemix.jbi.deployer.impl.Deployer" init-method="init" destroy-method="destroy">
+ <property name="autoStart" value="true" />
+ <property name="endpointListener" ref="endpointListener" />
+ <property name="environment" ref="environment" />
+ <property name="managementStrategy" ref="managementStrategy" />
+ <property name="preferencesService" ref="preferencesService" />
+ <property name="shutdownTimeout" value="${shutdownTimeout}" />
+ <property name="bundleContext" ref="blueprintBundleContext"/>
+ </bean>
+
+ <!-- Endpoint listener -->
+ <bean id="endpointListener" class="org.apache.servicemix.jbi.deployer.artifacts.AssemblyReferencesListener" />
+
+ <!-- Deployment listener -->
+ <bean id="listener" class="org.apache.servicemix.jbi.deployer.handler.JBIDeploymentListener" />
+
+ <!-- JBI Handler -->
+ <bean id="jbiHandler" class="org.apache.servicemix.jbi.deployer.handler.URLHandler" />
+
+ <service ref="jbiHandler" interface="org.osgi.service.url.URLStreamHandlerService">
+ <service-properties>
+ <entry key="url.handler.protocol" value="jbi"/>
+ </service-properties>
+ </service>
+
+ <service ref="listener" interface="org.apache.felix.fileinstall.ArtifactTransformer" />
+
+ <service ref="endpointListener">
+ <interfaces>
+ <value>org.apache.servicemix.nmr.api.event.Listener</value>
+ <value>org.apache.servicemix.nmr.api.event.EndpointListener</value>
+ <value>org.apache.servicemix.nmr.api.event.ExchangeListener</value>
+ </interfaces>
+ </service>
+
+ <!-- Utilities -->
+ <reference id="managementStrategy" interface="org.fusesource.commons.management.ManagementStrategy" />
+
+ <!-- Services -->
+ <bean id="adminService" class="org.apache.servicemix.jbi.deployer.impl.AdminService">
+ </bean>
+ <bean id="adminCommandsService" class="org.apache.servicemix.jbi.deployer.impl.AdminCommandsImpl" init-method="init" destroy-method="destroy">
+ <property name="deployer" ref="deployer" />
+ <property name="deploymentService" ref="deploymentService" />
+ <property name="installationService" ref="installationService" />
+ </bean>
+ <bean id="installationService" class="org.apache.servicemix.jbi.deployer.impl.InstallationService">
+ <property name="deployer" ref="deployer" />
+ </bean>
+ <bean id="deploymentService" class="org.apache.servicemix.jbi.deployer.impl.DeploymentService">
+ <property name="deployer" ref="deployer" />
+ <property name="bundleContext" ref="blueprintBundleContext"/>
+ </bean>
+
+
+ <!-- Expose management service in OSGi -->
+ <service ref="adminCommandsService" interface="org.apache.servicemix.jbi.deployer.AdminCommandsService" />
+
+ <!-- Environment -->
+ <bean id="environment" class="org.apache.servicemix.jbi.runtime.impl.EnvironmentImpl">
+ <property name="transactionManagers" ref="transactionManagers" />
+ <property name="mbeanServer" ref="mbeanServer" />
+ <property name="namingContext" ref="namingContext" />
+ </bean>
+
+ <!-- Reference to the Transaction Manager -->
+ <reference-list id="transactionManagers"
+ interface="javax.transaction.TransactionManager"
+ availability="optional"
+ ext:proxy-method="greedy"/>
+
+ <!-- The InitialContext -->
+ <bean id="namingContext" class="javax.naming.InitialContext">
+ <argument><null/></argument>
+ </bean>
+
+ <!-- MBeanServer -->
+ <reference id="mbeanServer"
+ interface="javax.management.MBeanServer"
+ availability="mandatory" />
+
+ <!-- Preferences Service -->
+ <reference id="preferencesService"
+ interface="org.osgi.service.prefs.PreferencesService" />
+
+ <cm:property-placeholder persistent-id="org.apache.servicemix.jbi">
+ <cm:default-properties>
+ <cm:property name="shutdownTimeout" value="0"/>
+ </cm:default-properties>
+ </cm:property-placeholder>
+
+</blueprint>
Modified: servicemix/smx4/nmr/trunk/jbi/itests/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/itests/pom.xml?rev=812215&r1=812214&r2=812215&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/itests/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/itests/pom.xml Mon Sep 7 16:10:11 2009
@@ -31,23 +31,72 @@
<packaging>jar</packaging>
<name>Apache ServiceMix JBI Integration Tests</name>
+ <properties>
+ <ant.version>1.7.0_1</ant.version>
+ <geronimo.blueprint.version>1.0.0-SNAPSHOT</geronimo.blueprint.version>
+ </properties>
+
<dependencies>
+ <!-- Pax EXAM -->
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
- <groupId>org.apache.servicemix.kernel</groupId>
- <artifactId>org.apache.servicemix.kernel.main</artifactId>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.kernel.testing</groupId>
- <artifactId>org.apache.servicemix.kernel.testing.support</artifactId>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-container-default</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.kernel</groupId>
- <artifactId>org.apache.servicemix.kernel.filemonitor</artifactId>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-junit-extender-impl</artifactId>
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.5</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.ant</artifactId>
+ <version>${ant.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.platform.testing</groupId>
+ <artifactId>org.apache.servicemix.platform.testing.support</artifactId>
+ <version>${pom.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.fileinstall</artifactId>
+ <version>${felix.fileinstall.version}</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.aopalliance</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.cglib</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.woodstox</artifactId>
</dependency>
@@ -99,6 +148,12 @@
<groupId>org.apache.servicemix.jbi</groupId>
<artifactId>org.apache.servicemix.jbi.osgi</artifactId>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.servicemix.jbi</groupId>
@@ -106,14 +161,15 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.kernel</groupId>
- <artifactId>org.apache.servicemix.kernel.management</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.prefs</artifactId>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
@@ -167,6 +223,62 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <version>${spring.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix.karaf</groupId>
+ <artifactId>org.apache.felix.karaf.management</artifactId>
+ <version>${felix.karaf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix.karaf.jaas</groupId>
+ <artifactId>org.apache.felix.karaf.jaas.boot</artifactId>
+ <version>${felix.karaf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix.karaf.jaas</groupId>
+ <artifactId>org.apache.felix.karaf.jaas.config</artifactId>
+ <version>${felix.karaf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix.karaf.gshell</groupId>
+ <artifactId>org.apache.felix.karaf.gshell.console</artifactId>
+ <version>${felix.karaf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix.karaf.gshell</groupId>
+ <artifactId>org.apache.felix.karaf.gshell.osgi</artifactId>
+ <version>${felix.karaf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix.karaf.gshell</groupId>
+ <artifactId>org.apache.felix.karaf.gshell.log</artifactId>
+ <version>${felix.karaf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix.karaf</groupId>
+ <artifactId>org.apache.felix.karaf.main</artifactId>
+ <version>${felix.karaf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.mina</groupId>
+ <artifactId>mina-core</artifactId>
+ <version>${mina.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sshd</groupId>
+ <artifactId>sshd-core</artifactId>
+ <version>${sshd.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix.gogo</groupId>
+ <artifactId>org.apache.felix.gogo.runtime</artifactId>
+ <version>${felix.gogo.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.fusesource.commonman</groupId>
<artifactId>commons-management</artifactId>
<version>${commons.management.version}</version>
Added: servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/AbstractIntegrationTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/AbstractIntegrationTest.java?rev=812215&view=auto
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/AbstractIntegrationTest.java (added)
+++ servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/AbstractIntegrationTest.java Mon Sep 7 16:10:11 2009
@@ -0,0 +1,161 @@
+/*
+ * 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.jbi.itests;
+
+import java.util.Dictionary;
+import java.util.Properties;
+import java.io.FileInputStream;
+import java.io.File;
+import java.io.IOException;
+
+import org.ops4j.pax.exam.CoreOptions;
+import org.ops4j.pax.exam.Inject;
+import org.ops4j.pax.exam.options.MavenArtifactProvisionOption;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.Constants;
+import org.osgi.framework.Filter;
+import org.osgi.framework.FrameworkUtil;
+import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.framework.ServiceReference;
+import org.osgi.util.tracker.ServiceTracker;
+
+public abstract class AbstractIntegrationTest {
+
+ public static final long DEFAULT_TIMEOUT = 30000;
+
+ @Inject
+ protected BundleContext bundleContext;
+
+ protected <T> T getOsgiService(Class<T> type, long timeout) {
+ return getOsgiService(type, null, timeout);
+ }
+
+ protected <T> T getOsgiService(Class<T> type) {
+ return getOsgiService(type, null, DEFAULT_TIMEOUT);
+ }
+
+ protected <T> T getOsgiService(Class<T> type, String filter, long timeout) {
+ ServiceTracker tracker = null;
+ try {
+ String flt;
+ if (filter != null) {
+ if (filter.startsWith("(")) {
+ flt = "(&(" + Constants.OBJECTCLASS + "=" + type.getName() + ")" + filter + ")";
+ } else {
+ flt = "(&(" + Constants.OBJECTCLASS + "=" + type.getName() + ")(" + filter + "))";
+ }
+ } else {
+ flt = "(" + Constants.OBJECTCLASS + "=" + type.getName() + ")";
+ }
+ Filter osgiFilter = FrameworkUtil.createFilter(flt);
+ tracker = new ServiceTracker(bundleContext, osgiFilter, null);
+ tracker.open(true);
+ // Note that the tracker is not closed to keep the reference
+ // This is buggy, as the service reference may change i think
+ Object svc = type.cast(tracker.waitForService(timeout));
+ if (svc == null) {
+
+ Dictionary dic = bundleContext.getBundle().getHeaders();
+ System.err.println("Test bundle headers: " + dic);
+ ServiceReference[] refs = bundleContext.getAllServiceReferences(null, null);
+ if (refs != null) {
+ for (ServiceReference ref : refs) {
+ System.err.println("ServiceReference: " + ref);
+ }
+ } else {
+ System.err.println("No references");
+ }
+ refs = bundleContext.getAllServiceReferences(null, flt);
+ if (refs != null) {
+ for (ServiceReference ref : refs) {
+ System.err.println("Filtered ServiceReference: " + ref);
+ }
+ } else {
+ System.err.println("No filtered references");
+ }
+ throw new RuntimeException("Gave up waiting for service " + flt);
+ }
+ return type.cast(svc);
+ } catch (InvalidSyntaxException e) {
+ throw new IllegalArgumentException("Invalid filter", e);
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ protected Bundle installBundle(String groupId, String artifactId) throws Exception {
+ MavenArtifactProvisionOption mvnUrl = mavenBundle(groupId, artifactId);
+ return bundleContext.installBundle(mvnUrl.getURL());
+ }
+
+ protected Bundle installBundle(String groupId, String artifactId, String classifier, String type) throws Exception {
+ MavenArtifactProvisionOption mvnUrl = mavenBundle(groupId, artifactId);
+ return bundleContext.installBundle(mvnUrl.getURL());
+ }
+
+ protected Bundle getInstalledBundle(String symbolicName) {
+ for (Bundle b : bundleContext.getBundles()) {
+ if (b.getSymbolicName().equals(symbolicName)) {
+ return b;
+ }
+ }
+ return null;
+ }
+
+ public static MavenArtifactProvisionOption mavenBundle(String groupId, String artifactId) {
+ return mavenBundle(groupId, artifactId, null, null, null);
+ }
+
+ public static MavenArtifactProvisionOption mavenBundle(String groupId, String artifactId, String version, String classifier, String type) {
+ MavenArtifactProvisionOption m = CoreOptions.mavenBundle().groupId(groupId).artifactId(artifactId);
+ if (version != null) {
+ m.version(version);
+ } else {
+ m.versionAsInProject();
+ }
+ if (classifier != null) {
+ m.classifier(classifier);
+ }
+ if (type != null) {
+ m.type(type);
+ }
+ return m;
+ }
+
+ public static String getArtifactVersion( final String groupId, final String artifactId ) {
+ final Properties dependencies = new Properties();
+ try {
+ dependencies.load(new FileInputStream(new File(System.getProperty("basedir"), "target/classes/META-INF/maven/dependencies.properties")));
+ final String version = dependencies.getProperty( groupId + "/" + artifactId + "/version" );
+ if( version == null ) {
+ throw new RuntimeException(
+ "Could not resolve version. Do you have a dependency for " + groupId + "/" + artifactId
+ + " in your maven project?"
+ );
+ }
+ return version;
+ } catch( IOException e ) {
+ // TODO throw a better exception
+ throw new RuntimeException(
+ "Could not resolve version. Did you configured the plugin in your maven project?"
+ + "Or maybe you did not run the maven build and you are using an IDE?", e
+ );
+ }
+ }
+
+}