You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ff...@apache.org on 2010/07/02 09:51:27 UTC
svn commit: r959901 - in /servicemix/smx4/nmr/trunk: ./ assembly/
assembly/src/main/descriptors/ assembly/src/main/filtered-resources/
assembly/src/main/filtered-resources/etc/ branding/
jbi/cluster/engine/src/test/java/org/apache/servicemix/jbi/cluste...
Author: ffang
Date: Fri Jul 2 07:51:25 2010
New Revision: 959901
URL: http://svn.apache.org/viewvc?rev=959901&view=rev
Log:
[SMX4NMR-199]upgrade to use new karaf artifacts and use latest karaf snapshot
Added:
servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
- copied, changed from r959862, servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/etc/org.apache.felix.karaf.features.cfg
Removed:
servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/etc/org.apache.felix.karaf.features.cfg
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/etc/config.properties
servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/features.xml
servicemix/smx4/nmr/trunk/branding/pom.xml
servicemix/smx4/nmr/trunk/jbi/cluster/engine/src/test/java/org/apache/servicemix/jbi/cluster/engine/ActiveMQClusterEndpointLoadTest.java
servicemix/smx4/nmr/trunk/jbi/cluster/engine/src/test/java/org/apache/servicemix/jbi/cluster/engine/ActiveMQInOnlyClusterEndpointTest.java
servicemix/smx4/nmr/trunk/jbi/cluster/engine/src/test/java/org/apache/servicemix/jbi/cluster/engine/ActiveMQInOutClusterEndpointTest.java
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/StopCommand.java
servicemix/smx4/nmr/trunk/jbi/commands/src/main/resources/org/apache/servicemix/jbi/commands/ListCommand.properties
servicemix/smx4/nmr/trunk/jbi/commands/src/main/resources/org/apache/servicemix/jbi/commands/ShutdownCommand.properties
servicemix/smx4/nmr/trunk/jbi/commands/src/main/resources/org/apache/servicemix/jbi/commands/StartCommand.properties
servicemix/smx4/nmr/trunk/jbi/commands/src/main/resources/org/apache/servicemix/jbi/commands/StopCommand.properties
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/DeployServiceAssemblyTask.java
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/InstallComponentTask.java
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/InstallSharedLibraryTask.java
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/ListServiceAssembliesTask.java
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/ShutDownComponentTask.java
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/ShutDownServiceAssemblyTask.java
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/StartComponentTask.java
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/StartServiceAssemblyTask.java
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/StopComponentTask.java
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/StopServiceAssemblyTask.java
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/UndeployServiceAssemblyTask.java
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/UninstallComponentTask.java
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/UninstallSharedLibraryTask.java
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/utils/FileUtil.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/osgi/src/main/java/org/apache/servicemix/jbi/osgi/PassThroughConverter.java
servicemix/smx4/nmr/trunk/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/ComponentRegistry.java
servicemix/smx4/nmr/trunk/nmr/api/src/main/java/org/apache/servicemix/nmr/api/Pattern.java
servicemix/smx4/nmr/trunk/nmr/api/src/main/java/org/apache/servicemix/nmr/api/Role.java
servicemix/smx4/nmr/trunk/nmr/api/src/main/java/org/apache/servicemix/nmr/api/Status.java
servicemix/smx4/nmr/trunk/nmr/api/src/main/java/org/apache/servicemix/nmr/api/Type.java
servicemix/smx4/nmr/trunk/nmr/api/src/test/java/org/apache/servicemix/nmr/api/OsgiExample.java
servicemix/smx4/nmr/trunk/nmr/audit/pom.xml
servicemix/smx4/nmr/trunk/nmr/audit/src/main/java/org/apache/servicemix/nmr/audit/AuditorQueryMBean.java
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/lucene/LuceneIndexer.java
servicemix/smx4/nmr/trunk/nmr/commands/pom.xml
servicemix/smx4/nmr/trunk/nmr/commands/src/main/java/org/apache/servicemix/nmr/commands/NmrCommandSupport.java
servicemix/smx4/nmr/trunk/nmr/commands/src/main/resources/org/apache/servicemix/nmr/commands/ListCommand.properties
servicemix/smx4/nmr/trunk/nmr/core/pom.xml
servicemix/smx4/nmr/trunk/nmr/core/src/main/java/org/apache/servicemix/nmr/core/util/MapToDictionary.java
servicemix/smx4/nmr/trunk/nmr/pom.xml
servicemix/smx4/nmr/trunk/nmr/spring/src/test/java/org/apache/servicemix/nmr/spring/BundleExtTest.java
servicemix/smx4/nmr/trunk/pom.xml
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
Modified: servicemix/smx4/nmr/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/assembly/pom.xml?rev=959901&r1=959900&r2=959901&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/assembly/pom.xml Fri Jul 2 07:51:25 2010
@@ -34,18 +34,18 @@
<dependencies>
<dependency>
- <groupId>org.apache.felix.karaf</groupId>
- <artifactId>apache-felix-karaf</artifactId>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>apache-karaf</artifactId>
<type>zip</type>
</dependency>
<dependency>
- <groupId>org.apache.felix.karaf</groupId>
- <artifactId>apache-felix-karaf</artifactId>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>apache-karaf</artifactId>
<type>tar.gz</type>
</dependency>
<dependency>
- <groupId>org.apache.felix.karaf</groupId>
- <artifactId>apache-felix-karaf</artifactId>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>apache-karaf</artifactId>
<classifier>features</classifier>
<type>xml</type>
</dependency>
@@ -211,7 +211,7 @@
<tasks>
<taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.plugin.classpath" />
<property name="ant.regexp.regexpimpl" value="org.apache.tools.ant.util.regexp.Jdk14RegexpRegexp" />
- <property name="mv" value="${felix.karaf.version}" />
+ <property name="mv" value="${karaf.version}" />
<echo message="Maven version: ${mv}" />
<propertyregex property="ov.p1" input="${mv}" regexp="(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:[^a-zA-Z0-9](.*))?" replace="\1" defaultValue="0" />
<propertyregex property="ov.p2" input="${mv}" regexp="(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:[^a-zA-Z0-9](.*))?" replace=".\2" defaultValue=".0" />
@@ -259,8 +259,8 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>org.apache.felix.karaf</groupId>
- <artifactId>apache-felix-karaf</artifactId>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>apache-karaf</artifactId>
<type>tar.gz</type>
<outputDirectory>target/dependencies/unix</outputDirectory>
</artifactItem>
@@ -276,8 +276,8 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>org.apache.felix.karaf</groupId>
- <artifactId>apache-felix-karaf</artifactId>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>apache-karaf</artifactId>
<type>zip</type>
<outputDirectory>target/dependencies/win</outputDirectory>
</artifactItem>
@@ -309,9 +309,9 @@
</executions>
</plugin>
<plugin>
- <groupId>org.apache.felix.karaf.tooling</groupId>
+ <groupId>org.apache.karaf.tooling</groupId>
<artifactId>features-maven-plugin</artifactId>
- <version>${felix.karaf.version}</version>
+ <version>${karaf.version}</version>
<executions>
<execution>
<id>add-features-to-repo</id>
@@ -321,7 +321,7 @@
</goals>
<configuration>
<descriptors>
- <descriptor>mvn:org.apache.felix.karaf/apache-felix-karaf/${felix.karaf.version}/xml/features</descriptor>
+ <descriptor>mvn:org.apache.karaf/apache-karaf/${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=959901&r1=959900&r2=959901&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 Fri Jul 2 07:51:25 2010
@@ -26,12 +26,12 @@
<!-- Expanded Karaf -->
<fileSet>
- <directory>${basedir}/target/dependencies/unix/apache-felix-karaf-${felix.karaf.version}</directory>
+ <directory>${basedir}/target/dependencies/unix/apache-karaf-${karaf.version}</directory>
<outputDirectory>/</outputDirectory>
<excludes>
<exclude>bin/**</exclude>
<exclude>demos/**</exclude>
- <exclude>etc/org.apache.felix.karaf.features.cfg</exclude>
+ <exclude>etc/org.apache.karaf.features.cfg</exclude>
<exclude>etc/org.ops4j.pax.logging.cfg</exclude>
<exclude>etc/config.properties</exclude>
<exclude>LICENSE</exclude>
@@ -44,7 +44,7 @@
<!-- Copy over bin/admin separately to get the correct file mode -->
<fileSet>
- <directory>${basedir}/target/dependencies/unix/apache-felix-karaf-${felix.karaf.version}</directory>
+ <directory>${basedir}/target/dependencies/unix/apache-karaf-${karaf.version}</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>bin/admin</include>
@@ -104,7 +104,7 @@
<files>
<file>
- <source>${basedir}/target/dependencies/unix/apache-felix-karaf-${felix.karaf.version}/bin/karaf</source>
+ <source>${basedir}/target/dependencies/unix/apache-karaf-${karaf.version}/bin/karaf</source>
<outputDirectory>/bin/</outputDirectory>
<destName>nmr</destName>
<fileMode>0755</fileMode>
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=959901&r1=959900&r2=959901&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 Fri Jul 2 07:51:25 2010
@@ -26,12 +26,12 @@
<!-- Expanded Karaf -->
<fileSet>
- <directory>${basedir}/target/dependencies/win/apache-felix-karaf-${felix.karaf.version}</directory>
+ <directory>${basedir}/target/dependencies/win/apache-karaf-${karaf.version}</directory>
<outputDirectory>/</outputDirectory>
<excludes>
<exclude>bin/**</exclude>
<exclude>demos/**</exclude>
- <exclude>etc/org.apache.felix.karaf.features.cfg</exclude>
+ <exclude>etc/org.apache.karaf.features.cfg</exclude>
<exclude>etc/org.ops4j.pax.logging.cfg</exclude>
<exclude>etc/config.properties</exclude>
<exclude>LICENSE</exclude>
@@ -44,7 +44,7 @@
<!-- Copy over bin/admin.bat separately to get the correct file mode -->
<fileSet>
- <directory>${basedir}/target/dependencies/win/apache-felix-karaf-${felix.karaf.version}</directory>
+ <directory>${basedir}/target/dependencies/win/apache-karaf-${karaf.version}</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>bin/admin.bat</include>
@@ -104,7 +104,7 @@
<files>
<file>
- <source>${basedir}/target/dependencies/win/apache-felix-karaf-${felix.karaf.version}/bin/karaf.bat</source>
+ <source>${basedir}/target/dependencies/win/apache-karaf-${karaf.version}/bin/karaf.bat</source>
<outputDirectory>/bin/</outputDirectory>
<destName>nmr.bat</destName>
<fileMode>0755</fileMode>
Modified: 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=959901&r1=959900&r2=959901&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/etc/config.properties (original)
+++ servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/etc/config.properties Fri Jul 2 07:51:25 2010
@@ -38,9 +38,9 @@ org.osgi.framework.system.packages=org.o
${jre-${java.specification.version}}
org.osgi.framework.system.packages.extra=\
- org.apache.felix.karaf.branding, \
- org.apache.felix.karaf.jaas.boot; version=${karaf.osgi.version}, \
- org.apache.felix.karaf.version; version=${karaf.osgi.version}
+ org.apache.karaf.branding, \
+ org.apache.karaf.jaas.boot; version=${karaf.osgi.version}, \
+ org.apache.karaf.version; version=${karaf.osgi.version}
org.osgi.framework.bootdelegation=sun.*,com.sun*
Copied: servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg (from r959862, 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.karaf.features.cfg?p2=servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg&p1=servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/etc/org.apache.felix.karaf.features.cfg&r1=959862&r2=959901&rev=959901&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/etc/org.apache.felix.karaf.features.cfg (original)
+++ servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg Fri Jul 2 07:51:25 2010
@@ -20,7 +20,7 @@
#
# 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
+featuresRepositories=mvn:org.apache.karaf/apache-karaf/${karaf.version}/xml/features,mvn:org.apache.servicemix.nmr/apache-servicemix-nmr/${version}/xml/features
#
# Comma separated list of features to install at startup
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=959901&r1=959900&r2=959901&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 Fri Jul 2 07:51:25 2010
@@ -16,7 +16,7 @@
limitations under the License.
-->
<features>
- <repository>mvn:org.apache.felix.karaf/apache-felix-karaf/${felix.karaf.version}/xml/features</repository>
+ <repository>mvn:org.apache.karaf/apache-karaf/${karaf.version}/xml/features</repository>
<feature name="naming" version="${version}">
<bundle>mvn:org.apache.servicemix.naming/org.apache.servicemix.naming/${pom.version}</bundle>
</feature>
Modified: servicemix/smx4/nmr/trunk/branding/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/branding/pom.xml?rev=959901&r1=959900&r2=959901&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/branding/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/branding/pom.xml Fri Jul 2 07:51:25 2010
@@ -52,7 +52,7 @@
<Import-Package>*</Import-Package>
<Private-Package>!*</Private-Package>
<Export-Package>
- org.apache.felix.karaf.branding
+ org.apache.karaf.branding
</Export-Package>
<Spring-Context>*;publish-context:=false</Spring-Context>
</instructions>
Modified: servicemix/smx4/nmr/trunk/jbi/cluster/engine/src/test/java/org/apache/servicemix/jbi/cluster/engine/ActiveMQClusterEndpointLoadTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/cluster/engine/src/test/java/org/apache/servicemix/jbi/cluster/engine/ActiveMQClusterEndpointLoadTest.java?rev=959901&r1=959900&r2=959901&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/cluster/engine/src/test/java/org/apache/servicemix/jbi/cluster/engine/ActiveMQClusterEndpointLoadTest.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/cluster/engine/src/test/java/org/apache/servicemix/jbi/cluster/engine/ActiveMQClusterEndpointLoadTest.java Fri Jul 2 07:51:25 2010
@@ -50,4 +50,4 @@ public class ActiveMQClusterEndpointLoad
return pool;
}
-}
\ No newline at end of file
+}
Modified: servicemix/smx4/nmr/trunk/jbi/cluster/engine/src/test/java/org/apache/servicemix/jbi/cluster/engine/ActiveMQInOnlyClusterEndpointTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/cluster/engine/src/test/java/org/apache/servicemix/jbi/cluster/engine/ActiveMQInOnlyClusterEndpointTest.java?rev=959901&r1=959900&r2=959901&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/cluster/engine/src/test/java/org/apache/servicemix/jbi/cluster/engine/ActiveMQInOnlyClusterEndpointTest.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/cluster/engine/src/test/java/org/apache/servicemix/jbi/cluster/engine/ActiveMQInOnlyClusterEndpointTest.java Fri Jul 2 07:51:25 2010
@@ -53,4 +53,4 @@ public class ActiveMQInOnlyClusterEndpoi
return pool;
}
-}
\ No newline at end of file
+}
Modified: servicemix/smx4/nmr/trunk/jbi/cluster/engine/src/test/java/org/apache/servicemix/jbi/cluster/engine/ActiveMQInOutClusterEndpointTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/cluster/engine/src/test/java/org/apache/servicemix/jbi/cluster/engine/ActiveMQInOutClusterEndpointTest.java?rev=959901&r1=959900&r2=959901&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/cluster/engine/src/test/java/org/apache/servicemix/jbi/cluster/engine/ActiveMQInOutClusterEndpointTest.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/cluster/engine/src/test/java/org/apache/servicemix/jbi/cluster/engine/ActiveMQInOutClusterEndpointTest.java Fri Jul 2 07:51:25 2010
@@ -44,4 +44,4 @@ public class ActiveMQInOutClusterEndpoin
return pool;
}
-}
\ No newline at end of file
+}
Modified: servicemix/smx4/nmr/trunk/jbi/commands/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/commands/pom.xml?rev=959901&r1=959900&r2=959901&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/commands/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/commands/pom.xml Fri Jul 2 07:51:25 2010
@@ -37,9 +37,9 @@
<artifactId>org.apache.servicemix.jbi.deployer</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.felix.karaf.shell</groupId>
- <artifactId>org.apache.felix.karaf.shell.console</artifactId>
- <version>${felix.karaf.version}</version>
+ <groupId>org.apache.karaf.shell</groupId>
+ <artifactId>org.apache.karaf.shell.console</artifactId>
+ <version>${karaf.version}</version>
</dependency>
</dependencies>
@@ -54,7 +54,7 @@
<Import-Package>
org.osgi.service.command,
org.apache.felix.gogo.commands,
- org.apache.felix.karaf.shell.console,
+ org.apache.karaf.shell.console,
*
</Import-Package>
<Export-Package>${project.artifactId}*;version=${project.version}</Export-Package>
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=959901&r1=959900&r2=959901&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 Fri Jul 2 07:51:25 2010
@@ -21,8 +21,8 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import org.apache.felix.karaf.shell.console.Completer;
-import org.apache.felix.karaf.shell.console.completer.StringsCompleter;
+import org.apache.karaf.shell.console.Completer;
+import org.apache.karaf.shell.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,7 +31,7 @@ import org.osgi.framework.ServiceReferen
import org.springframework.osgi.context.BundleContextAware;
/**
- * {@link org.apache.felix.karaf.shell.console.Completer} for JBI artifacts.
+ * {@link org.apache.karaf.shell.console.Completer} for JBI artifacts.
*/
public class JbiCommandCompleter implements Completer, BundleContextAware {
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=959901&r1=959900&r2=959901&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 Fri Jul 2 07:51:25 2010
@@ -19,7 +19,7 @@ package org.apache.servicemix.jbi.comman
import java.util.ArrayList;
import java.util.List;
-import org.apache.felix.karaf.shell.console.OsgiCommandSupport;
+import org.apache.karaf.shell.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/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=959901&r1=959900&r2=959901&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 Fri Jul 2 07:51:25 2010
@@ -30,4 +30,4 @@ public class StopCommand extends JbiLife
protected void handle(LifeCycleMBean artifact) throws JBIException {
artifact.stop();
}
-}
\ No newline at end of file
+}
Modified: servicemix/smx4/nmr/trunk/jbi/commands/src/main/resources/org/apache/servicemix/jbi/commands/ListCommand.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/commands/src/main/resources/org/apache/servicemix/jbi/commands/ListCommand.properties?rev=959901&r1=959900&r2=959901&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/commands/src/main/resources/org/apache/servicemix/jbi/commands/ListCommand.properties (original)
+++ servicemix/smx4/nmr/trunk/jbi/commands/src/main/resources/org/apache/servicemix/jbi/commands/ListCommand.properties Fri Jul 2 07:51:25 2010
@@ -24,4 +24,4 @@
command.description=List JBI endpoints.
command.manual=\
- TODO: date manual
\ No newline at end of file
+ TODO: date manual
Modified: servicemix/smx4/nmr/trunk/jbi/commands/src/main/resources/org/apache/servicemix/jbi/commands/ShutdownCommand.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/commands/src/main/resources/org/apache/servicemix/jbi/commands/ShutdownCommand.properties?rev=959901&r1=959900&r2=959901&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/commands/src/main/resources/org/apache/servicemix/jbi/commands/ShutdownCommand.properties (original)
+++ servicemix/smx4/nmr/trunk/jbi/commands/src/main/resources/org/apache/servicemix/jbi/commands/ShutdownCommand.properties Fri Jul 2 07:51:25 2010
@@ -24,4 +24,4 @@
command.description=Shutdown a JBI artifact.
command.manual=\
- TODO: date manual
\ No newline at end of file
+ TODO: date manual
Modified: servicemix/smx4/nmr/trunk/jbi/commands/src/main/resources/org/apache/servicemix/jbi/commands/StartCommand.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/commands/src/main/resources/org/apache/servicemix/jbi/commands/StartCommand.properties?rev=959901&r1=959900&r2=959901&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/commands/src/main/resources/org/apache/servicemix/jbi/commands/StartCommand.properties (original)
+++ servicemix/smx4/nmr/trunk/jbi/commands/src/main/resources/org/apache/servicemix/jbi/commands/StartCommand.properties Fri Jul 2 07:51:25 2010
@@ -24,4 +24,4 @@
command.description=Start a JBI artifact.
command.manual=\
- TODO: date manual
\ No newline at end of file
+ TODO: date manual
Modified: servicemix/smx4/nmr/trunk/jbi/commands/src/main/resources/org/apache/servicemix/jbi/commands/StopCommand.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/commands/src/main/resources/org/apache/servicemix/jbi/commands/StopCommand.properties?rev=959901&r1=959900&r2=959901&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/commands/src/main/resources/org/apache/servicemix/jbi/commands/StopCommand.properties (original)
+++ servicemix/smx4/nmr/trunk/jbi/commands/src/main/resources/org/apache/servicemix/jbi/commands/StopCommand.properties Fri Jul 2 07:51:25 2010
@@ -24,4 +24,4 @@
command.description=Stop a JBI artifact.
command.manual=\
- TODO: date manual
\ No newline at end of file
+ TODO: date manual
Modified: servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/DeployServiceAssemblyTask.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/DeployServiceAssemblyTask.java?rev=959901&r1=959900&r2=959901&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/DeployServiceAssemblyTask.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/DeployServiceAssemblyTask.java Fri Jul 2 07:51:25 2010
@@ -75,4 +75,4 @@ public class DeployServiceAssemblyTask e
acs.deployServiceAssembly(location, deferExceptions);
}
-}
\ No newline at end of file
+}
Modified: servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/InstallComponentTask.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/InstallComponentTask.java?rev=959901&r1=959900&r2=959901&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/InstallComponentTask.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/InstallComponentTask.java Fri Jul 2 07:51:25 2010
@@ -139,4 +139,4 @@ public class InstallComponentTask extend
}
}
-}
\ No newline at end of file
+}
Modified: servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/InstallSharedLibraryTask.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/InstallSharedLibraryTask.java?rev=959901&r1=959900&r2=959901&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/InstallSharedLibraryTask.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/InstallSharedLibraryTask.java Fri Jul 2 07:51:25 2010
@@ -75,4 +75,4 @@ public class InstallSharedLibraryTask ex
acs.installSharedLibrary(location, deferExceptions);
}
-}
\ No newline at end of file
+}
Modified: servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/ListServiceAssembliesTask.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/ListServiceAssembliesTask.java?rev=959901&r1=959900&r2=959901&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/ListServiceAssembliesTask.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/ListServiceAssembliesTask.java Fri Jul 2 07:51:25 2010
@@ -103,4 +103,4 @@ public class ListServiceAssembliesTask e
log(result, Project.MSG_WARN);
}
-}
\ No newline at end of file
+}
Modified: servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/ShutDownComponentTask.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/ShutDownComponentTask.java?rev=959901&r1=959900&r2=959901&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/ShutDownComponentTask.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/ShutDownComponentTask.java Fri Jul 2 07:51:25 2010
@@ -54,4 +54,4 @@ public class ShutDownComponentTask exten
acs.shutdownComponent(name);
}
-}
\ No newline at end of file
+}
Modified: servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/ShutDownServiceAssemblyTask.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/ShutDownServiceAssemblyTask.java?rev=959901&r1=959900&r2=959901&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/ShutDownServiceAssemblyTask.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/ShutDownServiceAssemblyTask.java Fri Jul 2 07:51:25 2010
@@ -54,4 +54,4 @@ public class ShutDownServiceAssemblyTask
acs.shutdownServiceAssembly(name);
}
-}
\ No newline at end of file
+}
Modified: servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/StartComponentTask.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/StartComponentTask.java?rev=959901&r1=959900&r2=959901&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/StartComponentTask.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/StartComponentTask.java Fri Jul 2 07:51:25 2010
@@ -54,4 +54,4 @@ public class StartComponentTask extends
acs.startComponent(name);
}
-}
\ No newline at end of file
+}
Modified: servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/StartServiceAssemblyTask.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/StartServiceAssemblyTask.java?rev=959901&r1=959900&r2=959901&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/StartServiceAssemblyTask.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/StartServiceAssemblyTask.java Fri Jul 2 07:51:25 2010
@@ -54,4 +54,4 @@ public class StartServiceAssemblyTask ex
acs.startServiceAssembly(name);
}
-}
\ No newline at end of file
+}
Modified: servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/StopComponentTask.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/StopComponentTask.java?rev=959901&r1=959900&r2=959901&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/StopComponentTask.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/StopComponentTask.java Fri Jul 2 07:51:25 2010
@@ -54,4 +54,4 @@ public class StopComponentTask extends J
acs.stopComponent(name);
}
-}
\ No newline at end of file
+}
Modified: servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/StopServiceAssemblyTask.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/StopServiceAssemblyTask.java?rev=959901&r1=959900&r2=959901&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/StopServiceAssemblyTask.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/StopServiceAssemblyTask.java Fri Jul 2 07:51:25 2010
@@ -54,4 +54,4 @@ public class StopServiceAssemblyTask ext
acs.stopServiceAssembly(name);
}
-}
\ No newline at end of file
+}
Modified: servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/UndeployServiceAssemblyTask.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/UndeployServiceAssemblyTask.java?rev=959901&r1=959900&r2=959901&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/UndeployServiceAssemblyTask.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/UndeployServiceAssemblyTask.java Fri Jul 2 07:51:25 2010
@@ -54,4 +54,4 @@ public class UndeployServiceAssemblyTask
acs.undeployServiceAssembly(name);
}
-}
\ No newline at end of file
+}
Modified: servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/UninstallComponentTask.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/UninstallComponentTask.java?rev=959901&r1=959900&r2=959901&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/UninstallComponentTask.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/UninstallComponentTask.java Fri Jul 2 07:51:25 2010
@@ -54,4 +54,4 @@ public class UninstallComponentTask exte
acs.uninstallComponent(name);
}
-}
\ No newline at end of file
+}
Modified: servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/UninstallSharedLibraryTask.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/UninstallSharedLibraryTask.java?rev=959901&r1=959900&r2=959901&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/UninstallSharedLibraryTask.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/task/UninstallSharedLibraryTask.java Fri Jul 2 07:51:25 2010
@@ -54,4 +54,4 @@ public class UninstallSharedLibraryTask
acs.uninstallSharedLibrary(name);
}
-}
\ No newline at end of file
+}
Modified: servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/utils/FileUtil.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/utils/FileUtil.java?rev=959901&r1=959900&r2=959901&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/utils/FileUtil.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/utils/FileUtil.java Fri Jul 2 07:51:25 2010
@@ -173,4 +173,4 @@ public final class FileUtil {
return result;
}
-}
\ No newline at end of file
+}
Modified: servicemix/smx4/nmr/trunk/jbi/itests/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/itests/pom.xml?rev=959901&r1=959900&r2=959901&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/itests/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/itests/pom.xml Fri Jul 2 07:51:25 2010
@@ -225,39 +225,39 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.felix.karaf</groupId>
- <artifactId>org.apache.felix.karaf.management</artifactId>
- <version>${felix.karaf.version}</version>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.management</artifactId>
+ <version>${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>
+ <groupId>org.apache.karaf.jaas</groupId>
+ <artifactId>org.apache.karaf.jaas.boot</artifactId>
+ <version>${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>
+ <groupId>org.apache.karaf.jaas</groupId>
+ <artifactId>org.apache.karaf.jaas.config</artifactId>
+ <version>${karaf.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.felix.karaf.shell</groupId>
- <artifactId>org.apache.felix.karaf.shell.console</artifactId>
- <version>${felix.karaf.version}</version>
+ <groupId>org.apache.karaf.shell</groupId>
+ <artifactId>org.apache.karaf.shell.console</artifactId>
+ <version>${karaf.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.felix.karaf.shell</groupId>
- <artifactId>org.apache.felix.karaf.shell.osgi</artifactId>
- <version>${felix.karaf.version}</version>
+ <groupId>org.apache.karaf.shell</groupId>
+ <artifactId>org.apache.karaf.shell.osgi</artifactId>
+ <version>${karaf.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.felix.karaf.shell</groupId>
- <artifactId>org.apache.felix.karaf.shell.log</artifactId>
- <version>${felix.karaf.version}</version>
+ <groupId>org.apache.karaf.shell</groupId>
+ <artifactId>org.apache.karaf.shell.log</artifactId>
+ <version>${karaf.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.felix.karaf</groupId>
- <artifactId>org.apache.felix.karaf.main</artifactId>
- <version>${felix.karaf.version}</version>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.main</artifactId>
+ <version>${karaf.version}</version>
</dependency>
<dependency>
<groupId>org.apache.mina</groupId>
Modified: servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/IntegrationTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/IntegrationTest.java?rev=959901&r1=959900&r2=959901&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/IntegrationTest.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/IntegrationTest.java Fri Jul 2 07:51:25 2010
@@ -248,9 +248,9 @@ public class IntegrationTest extends Abs
// hack system packages
- systemPackages("org.apache.felix.karaf.main.spi;version=1.6.0", "org.apache.felix.karaf.jaas.boot;version=1.6.0"),
- bootClasspathLibrary(mavenBundle("org.apache.felix.karaf.jaas", "org.apache.felix.karaf.jaas.boot")).afterFramework(),
- bootClasspathLibrary(mavenBundle("org.apache.felix.karaf", "org.apache.felix.karaf.main")).afterFramework(),
+ systemPackages("org.apache.karaf.main.spi;version=1.6.0", "org.apache.karaf.jaas.boot;version=1.6.0"),
+ bootClasspathLibrary(mavenBundle("org.apache.karaf.jaas", "org.apache.karaf.jaas.boot")).afterFramework(),
+ bootClasspathLibrary(mavenBundle("org.apache.karaf", "org.apache.karaf.main")).afterFramework(),
bootClasspathLibrary(mavenBundle("org.apache.geronimo.specs", "geronimo-jta_1.1_spec")).beforeFramework(),
// Log
@@ -266,12 +266,12 @@ public class IntegrationTest extends Abs
// Bundles
mavenBundle("org.apache.mina", "mina-core"),
mavenBundle("org.apache.sshd", "sshd-core"),
- mavenBundle("org.apache.felix.karaf", "org.apache.felix.karaf.management"),
- mavenBundle("org.apache.felix.karaf.jaas", "org.apache.felix.karaf.jaas.config"),
+ mavenBundle("org.apache.karaf", "org.apache.karaf.management"),
+ mavenBundle("org.apache.karaf.jaas", "org.apache.karaf.jaas.config"),
mavenBundle("org.apache.felix.gogo", "org.apache.felix.gogo.runtime"),
- mavenBundle("org.apache.felix.karaf.shell", "org.apache.felix.karaf.shell.console"),
- mavenBundle("org.apache.felix.karaf.shell", "org.apache.felix.karaf.shell.osgi"),
- mavenBundle("org.apache.felix.karaf.shell", "org.apache.felix.karaf.shell.log").noStart(),
+ mavenBundle("org.apache.karaf.shell", "org.apache.karaf.shell.console"),
+ mavenBundle("org.apache.karaf.shell", "org.apache.karaf.shell.osgi"),
+ mavenBundle("org.apache.karaf.shell", "org.apache.karaf.shell.log").noStart(),
equinox(),
Modified: servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/ManagementTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/ManagementTest.java?rev=959901&r1=959900&r2=959901&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/ManagementTest.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/ManagementTest.java Fri Jul 2 07:51:25 2010
@@ -266,9 +266,9 @@ public class ManagementTest extends Abst
),
// hack system packages
- systemPackages("org.apache.felix.karaf.main.spi;version=1.0.0", "org.apache.felix.karaf.jaas.boot;version=0.9.0"),
- bootClasspathLibrary(mavenBundle("org.apache.felix.karaf.jaas", "org.apache.felix.karaf.jaas.boot")).afterFramework(),
- bootClasspathLibrary(mavenBundle("org.apache.felix.karaf", "org.apache.felix.karaf.main")).afterFramework(),
+ systemPackages("org.apache.karaf.main.spi;version=1.0.0", "org.apache.karaf.jaas.boot;version=0.9.0"),
+ bootClasspathLibrary(mavenBundle("org.apache.karaf.jaas", "org.apache.karaf.jaas.boot")).afterFramework(),
+ bootClasspathLibrary(mavenBundle("org.apache.karaf", "org.apache.karaf.main")).afterFramework(),
bootClasspathLibrary(mavenBundle("org.apache.geronimo.specs", "geronimo-jta_1.1_spec")).beforeFramework(),
// Log
@@ -284,12 +284,12 @@ public class ManagementTest extends Abst
// Bundles
mavenBundle("org.apache.mina", "mina-core"),
mavenBundle("org.apache.sshd", "sshd-core"),
- mavenBundle("org.apache.felix.karaf.jaas", "org.apache.felix.karaf.jaas.config"),
+ mavenBundle("org.apache.karaf.jaas", "org.apache.karaf.jaas.config"),
mavenBundle("org.apache.felix.gogo", "org.apache.felix.gogo.runtime"),
- mavenBundle("org.apache.felix.karaf.shell", "org.apache.felix.karaf.shell.console"),
- mavenBundle("org.apache.felix.karaf.shell", "org.apache.felix.karaf.shell.osgi"),
- mavenBundle("org.apache.felix.karaf.shell", "org.apache.felix.karaf.shell.log").noStart(),
- mavenBundle("org.apache.felix.karaf", "org.apache.felix.karaf.management"),
+ mavenBundle("org.apache.karaf.shell", "org.apache.karaf.shell.console"),
+ mavenBundle("org.apache.karaf.shell", "org.apache.karaf.shell.osgi"),
+ mavenBundle("org.apache.karaf.shell", "org.apache.karaf.shell.log").noStart(),
+ mavenBundle("org.apache.karaf", "org.apache.karaf.management"),
equinox(),
Modified: servicemix/smx4/nmr/trunk/jbi/osgi/src/main/java/org/apache/servicemix/jbi/osgi/PassThroughConverter.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/osgi/src/main/java/org/apache/servicemix/jbi/osgi/PassThroughConverter.java?rev=959901&r1=959900&r2=959901&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/osgi/src/main/java/org/apache/servicemix/jbi/osgi/PassThroughConverter.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/osgi/src/main/java/org/apache/servicemix/jbi/osgi/PassThroughConverter.java Fri Jul 2 07:51:25 2010
@@ -38,4 +38,4 @@ public class PassThroughConverter implem
public Object convert(Object sourceObject, ReifiedType targetType) throws Exception {
return sourceObject;
}
-}
\ No newline at end of file
+}
Modified: servicemix/smx4/nmr/trunk/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/ComponentRegistry.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/ComponentRegistry.java?rev=959901&r1=959900&r2=959901&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/ComponentRegistry.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/ComponentRegistry.java Fri Jul 2 07:51:25 2010
@@ -46,4 +46,4 @@ public interface ComponentRegistry exten
*/
ComponentContext createComponentContext();
-}
\ No newline at end of file
+}
Modified: servicemix/smx4/nmr/trunk/nmr/api/src/main/java/org/apache/servicemix/nmr/api/Pattern.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/api/src/main/java/org/apache/servicemix/nmr/api/Pattern.java?rev=959901&r1=959900&r2=959901&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/api/src/main/java/org/apache/servicemix/nmr/api/Pattern.java (original)
+++ servicemix/smx4/nmr/trunk/nmr/api/src/main/java/org/apache/servicemix/nmr/api/Pattern.java Fri Jul 2 07:51:25 2010
@@ -72,4 +72,4 @@ public enum Pattern {
map.put("http://www.w3.org/2006/01/wsdl/" + name, mep);
}
}
-}
\ No newline at end of file
+}
Modified: servicemix/smx4/nmr/trunk/nmr/api/src/main/java/org/apache/servicemix/nmr/api/Role.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/api/src/main/java/org/apache/servicemix/nmr/api/Role.java?rev=959901&r1=959900&r2=959901&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/api/src/main/java/org/apache/servicemix/nmr/api/Role.java (original)
+++ servicemix/smx4/nmr/trunk/nmr/api/src/main/java/org/apache/servicemix/nmr/api/Role.java Fri Jul 2 07:51:25 2010
@@ -30,4 +30,4 @@ public enum Role {
/** The endpoint processing the exchange is the provider */
Provider,
-}
\ No newline at end of file
+}
Modified: servicemix/smx4/nmr/trunk/nmr/api/src/main/java/org/apache/servicemix/nmr/api/Status.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/api/src/main/java/org/apache/servicemix/nmr/api/Status.java?rev=959901&r1=959900&r2=959901&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/api/src/main/java/org/apache/servicemix/nmr/api/Status.java (original)
+++ servicemix/smx4/nmr/trunk/nmr/api/src/main/java/org/apache/servicemix/nmr/api/Status.java Fri Jul 2 07:51:25 2010
@@ -32,4 +32,4 @@ public enum Status {
/** The exchange is terminated with an error */
Error,
-}
\ No newline at end of file
+}
Modified: servicemix/smx4/nmr/trunk/nmr/api/src/main/java/org/apache/servicemix/nmr/api/Type.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/api/src/main/java/org/apache/servicemix/nmr/api/Type.java?rev=959901&r1=959900&r2=959901&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/api/src/main/java/org/apache/servicemix/nmr/api/Type.java (original)
+++ servicemix/smx4/nmr/trunk/nmr/api/src/main/java/org/apache/servicemix/nmr/api/Type.java Fri Jul 2 07:51:25 2010
@@ -26,4 +26,4 @@ public enum Type {
In,
Out,
Fault
-}
\ No newline at end of file
+}
Modified: servicemix/smx4/nmr/trunk/nmr/api/src/test/java/org/apache/servicemix/nmr/api/OsgiExample.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/api/src/test/java/org/apache/servicemix/nmr/api/OsgiExample.java?rev=959901&r1=959900&r2=959901&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/api/src/test/java/org/apache/servicemix/nmr/api/OsgiExample.java (original)
+++ servicemix/smx4/nmr/trunk/nmr/api/src/test/java/org/apache/servicemix/nmr/api/OsgiExample.java Fri Jul 2 07:51:25 2010
@@ -92,4 +92,4 @@ public class OsgiExample {
}
}
-}
\ No newline at end of file
+}
Modified: servicemix/smx4/nmr/trunk/nmr/audit/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/audit/pom.xml?rev=959901&r1=959900&r2=959901&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/audit/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/nmr/audit/pom.xml Fri Jul 2 07:51:25 2010
@@ -45,13 +45,13 @@
<artifactId>spring-beans</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.felix.karaf</groupId>
- <artifactId>org.apache.felix.karaf.main</artifactId>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.main</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.felix.karaf.shell</groupId>
- <artifactId>org.apache.felix.karaf.shell.console</artifactId>
- <version>${felix.karaf.version}</version>
+ <groupId>org.apache.karaf.shell</groupId>
+ <artifactId>org.apache.karaf.shell.console</artifactId>
+ <version>${karaf.version}</version>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
@@ -81,7 +81,7 @@
<Import-Package>
org.osgi.service.command,
org.apache.felix.gogo.commands,
- org.apache.felix.karaf.shell.console,
+ org.apache.karaf.shell.console,
org.apache.lucene*;resolution:=optional,
org.apache.servicemix.nmr.core,
*
Modified: servicemix/smx4/nmr/trunk/nmr/audit/src/main/java/org/apache/servicemix/nmr/audit/AuditorQueryMBean.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/audit/src/main/java/org/apache/servicemix/nmr/audit/AuditorQueryMBean.java?rev=959901&r1=959900&r2=959901&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/audit/src/main/java/org/apache/servicemix/nmr/audit/AuditorQueryMBean.java (original)
+++ servicemix/smx4/nmr/trunk/nmr/audit/src/main/java/org/apache/servicemix/nmr/audit/AuditorQueryMBean.java Fri Jul 2 07:51:25 2010
@@ -46,4 +46,4 @@ public interface AuditorQueryMBean exten
* @throws AuditorException if an error occurs
*/
String[] getExchangeIds(String field, String fieldValue) throws AuditorException;
-}
\ No newline at end of file
+}
Modified: servicemix/smx4/nmr/trunk/nmr/audit/src/main/java/org/apache/servicemix/nmr/audit/commands/AuditCommandSupport.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/audit/src/main/java/org/apache/servicemix/nmr/audit/commands/AuditCommandSupport.java?rev=959901&r1=959900&r2=959901&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/audit/src/main/java/org/apache/servicemix/nmr/audit/commands/AuditCommandSupport.java (original)
+++ servicemix/smx4/nmr/trunk/nmr/audit/src/main/java/org/apache/servicemix/nmr/audit/commands/AuditCommandSupport.java Fri Jul 2 07:51:25 2010
@@ -16,7 +16,7 @@
*/
package org.apache.servicemix.nmr.audit.commands;
-import org.apache.felix.karaf.shell.console.OsgiCommandSupport;
+import org.apache.karaf.shell.console.OsgiCommandSupport;
import org.apache.servicemix.nmr.audit.AuditorMBean;
import org.osgi.framework.ServiceReference;
Modified: servicemix/smx4/nmr/trunk/nmr/audit/src/main/java/org/apache/servicemix/nmr/audit/lucene/LuceneIndexer.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/audit/src/main/java/org/apache/servicemix/nmr/audit/lucene/LuceneIndexer.java?rev=959901&r1=959900&r2=959901&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/audit/src/main/java/org/apache/servicemix/nmr/audit/lucene/LuceneIndexer.java (original)
+++ servicemix/smx4/nmr/trunk/nmr/audit/src/main/java/org/apache/servicemix/nmr/audit/lucene/LuceneIndexer.java Fri Jul 2 07:51:25 2010
@@ -113,4 +113,4 @@ public class LuceneIndexer {
}
}
}
-}
\ No newline at end of file
+}
Modified: servicemix/smx4/nmr/trunk/nmr/commands/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/commands/pom.xml?rev=959901&r1=959900&r2=959901&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/commands/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/nmr/commands/pom.xml Fri Jul 2 07:51:25 2010
@@ -37,9 +37,9 @@
<artifactId>org.apache.servicemix.nmr.core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.felix.karaf.shell</groupId>
- <artifactId>org.apache.felix.karaf.shell.console</artifactId>
- <version>${felix.karaf.version}</version>
+ <groupId>org.apache.karaf.shell</groupId>
+ <artifactId>org.apache.karaf.shell.console</artifactId>
+ <version>${karaf.version}</version>
</dependency>
</dependencies>
@@ -54,7 +54,7 @@
<Import-Package>
org.osgi.service.command,
org.apache.felix.gogo.commands,
- org.apache.felix.karaf.shell.console,
+ org.apache.karaf.shell.console,
*
</Import-Package>
<Export-Package>${project.artifactId}*;version=${project.version}</Export-Package>
Modified: servicemix/smx4/nmr/trunk/nmr/commands/src/main/java/org/apache/servicemix/nmr/commands/NmrCommandSupport.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/commands/src/main/java/org/apache/servicemix/nmr/commands/NmrCommandSupport.java?rev=959901&r1=959900&r2=959901&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/commands/src/main/java/org/apache/servicemix/nmr/commands/NmrCommandSupport.java (original)
+++ servicemix/smx4/nmr/trunk/nmr/commands/src/main/java/org/apache/servicemix/nmr/commands/NmrCommandSupport.java Fri Jul 2 07:51:25 2010
@@ -18,7 +18,7 @@ package org.apache.servicemix.nmr.comman
import java.util.List;
import org.apache.servicemix.nmr.api.Endpoint;
-import org.apache.felix.karaf.shell.console.OsgiCommandSupport;
+import org.apache.karaf.shell.console.OsgiCommandSupport;
/**
* Base class for NMR related commands
Modified: servicemix/smx4/nmr/trunk/nmr/commands/src/main/resources/org/apache/servicemix/nmr/commands/ListCommand.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/commands/src/main/resources/org/apache/servicemix/nmr/commands/ListCommand.properties?rev=959901&r1=959900&r2=959901&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/commands/src/main/resources/org/apache/servicemix/nmr/commands/ListCommand.properties (original)
+++ servicemix/smx4/nmr/trunk/nmr/commands/src/main/resources/org/apache/servicemix/nmr/commands/ListCommand.properties Fri Jul 2 07:51:25 2010
@@ -24,4 +24,4 @@
command.description=List NMR endpoints.
command.manual=\
- TODO: date manual
\ No newline at end of file
+ TODO: date manual
Modified: servicemix/smx4/nmr/trunk/nmr/core/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/core/pom.xml?rev=959901&r1=959900&r2=959901&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/core/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/nmr/core/pom.xml Fri Jul 2 07:51:25 2010
@@ -63,8 +63,8 @@
<!-- Put this dependency before the following one to avoid a classloader problem
when running junit tests -->
<dependency>
- <groupId>org.apache.felix.karaf</groupId>
- <artifactId>org.apache.felix.karaf.main</artifactId>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.main</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: servicemix/smx4/nmr/trunk/nmr/core/src/main/java/org/apache/servicemix/nmr/core/util/MapToDictionary.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/core/src/main/java/org/apache/servicemix/nmr/core/util/MapToDictionary.java?rev=959901&r1=959900&r2=959901&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/core/src/main/java/org/apache/servicemix/nmr/core/util/MapToDictionary.java (original)
+++ servicemix/smx4/nmr/trunk/nmr/core/src/main/java/org/apache/servicemix/nmr/core/util/MapToDictionary.java Fri Jul 2 07:51:25 2010
@@ -73,4 +73,4 @@ public class MapToDictionary extends Dic
public String toString() {
return m_map.toString();
}
-}
\ No newline at end of file
+}
Modified: servicemix/smx4/nmr/trunk/nmr/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/pom.xml?rev=959901&r1=959900&r2=959901&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/nmr/pom.xml Fri Jul 2 07:51:25 2010
@@ -41,4 +41,4 @@
<module>audit</module>
</modules>
-</project>
\ No newline at end of file
+</project>
Modified: servicemix/smx4/nmr/trunk/nmr/spring/src/test/java/org/apache/servicemix/nmr/spring/BundleExtTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/spring/src/test/java/org/apache/servicemix/nmr/spring/BundleExtTest.java?rev=959901&r1=959900&r2=959901&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/spring/src/test/java/org/apache/servicemix/nmr/spring/BundleExtTest.java (original)
+++ servicemix/smx4/nmr/trunk/nmr/spring/src/test/java/org/apache/servicemix/nmr/spring/BundleExtTest.java Fri Jul 2 07:51:25 2010
@@ -58,4 +58,4 @@ public class BundleExtTest extends TestC
assertEquals("bundle://" + bundleId + "///schema.xsd", str);
}
-}
\ No newline at end of file
+}
Modified: servicemix/smx4/nmr/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/pom.xml?rev=959901&r1=959900&r2=959901&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/pom.xml Fri Jul 2 07:51:25 2010
@@ -94,7 +94,7 @@
<felix.framework.version>3.0.1</felix.framework.version>
<felix.bundlerepository.version>1.6.4</felix.bundlerepository.version>
<felix.prefs.version>1.0.4</felix.prefs.version>
- <felix.karaf.version>1.6.0</felix.karaf.version>
+ <karaf.version>1.99.0-SNAPSHOT</karaf.version>
<felix.fileinstall.version>3.0.0</felix.fileinstall.version>
<felix.gogo.version>0.4.0</felix.gogo.version>
<osgi.core.version>4.2.0</osgi.core.version>
@@ -520,14 +520,14 @@
<version>${junit.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.felix.karaf.shell</groupId>
- <artifactId>org.apache.felix.karaf.shell.core</artifactId>
- <version>${felix.karaf.version}</version>
+ <groupId>org.apache.karaf.shell</groupId>
+ <artifactId>org.apache.karaf.shell.core</artifactId>
+ <version>${karaf.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.felix.karaf</groupId>
- <artifactId>org.apache.felix.karaf.filemonitor</artifactId>
- <version>${felix.karaf.version}</version>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.filemonitor</artifactId>
+ <version>${karaf.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.felix</groupId>
@@ -536,14 +536,14 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.felix.karaf</groupId>
- <artifactId>org.apache.felix.karaf.management</artifactId>
- <version>${felix.karaf.version}</version>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.management</artifactId>
+ <version>${karaf.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.felix.karaf.testing</groupId>
- <artifactId>org.apache.felix.karaf.testing.support</artifactId>
- <version>${felix.karaf.version}</version>
+ <groupId>org.apache.karaf.testing</groupId>
+ <artifactId>org.apache.karaf.testing.support</artifactId>
+ <version>${karaf.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.felix</groupId>
@@ -649,9 +649,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.felix.karaf</groupId>
- <artifactId>org.apache.felix.karaf.main</artifactId>
- <version>${felix.karaf.version}</version>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.main</artifactId>
+ <version>${karaf.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.felix</groupId>
@@ -666,21 +666,21 @@
<type>xml</type>
</dependency>
<dependency>
- <groupId>org.apache.felix.karaf</groupId>
- <artifactId>apache-felix-karaf</artifactId>
- <version>${felix.karaf.version}</version>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>apache-karaf</artifactId>
+ <version>${karaf.version}</version>
<type>zip</type>
</dependency>
<dependency>
- <groupId>org.apache.felix.karaf</groupId>
- <artifactId>apache-felix-karaf</artifactId>
- <version>${felix.karaf.version}</version>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>apache-karaf</artifactId>
+ <version>${karaf.version}</version>
<type>tar.gz</type>
</dependency>
<dependency>
- <groupId>org.apache.felix.karaf</groupId>
- <artifactId>apache-felix-karaf</artifactId>
- <version>${felix.karaf.version}</version>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>apache-karaf</artifactId>
+ <version>${karaf.version}</version>
<classifier>features</classifier>
<type>xml</type>
</dependency>
Modified: servicemix/smx4/nmr/trunk/transaction/src/main/java/javax/resource/spi/XATerminator.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/transaction/src/main/java/javax/resource/spi/XATerminator.java?rev=959901&r1=959900&r2=959901&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/transaction/src/main/java/javax/resource/spi/XATerminator.java (original)
+++ servicemix/smx4/nmr/trunk/transaction/src/main/java/javax/resource/spi/XATerminator.java Fri Jul 2 07:51:25 2010
@@ -41,4 +41,4 @@ public interface XATerminator {
public Xid[] recover(int flag) throws XAException;
public void rollback(Xid xid) throws XAException;
-}
\ No newline at end of file
+}
Modified: servicemix/smx4/nmr/trunk/transaction/src/main/java/org/apache/servicemix/transaction/Activator.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/transaction/src/main/java/org/apache/servicemix/transaction/Activator.java?rev=959901&r1=959900&r2=959901&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/transaction/src/main/java/org/apache/servicemix/transaction/Activator.java (original)
+++ servicemix/smx4/nmr/trunk/transaction/src/main/java/org/apache/servicemix/transaction/Activator.java Fri Jul 2 07:51:25 2010
@@ -98,4 +98,4 @@ public class Activator implements Bundle
}
}
-}
\ No newline at end of file
+}