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/05 10:28:34 UTC
svn commit: r960482 - in /servicemix/smx4/features/trunk: ./
activemq/activemq-commands/
activemq/activemq-commands/src/main/java/org/apache/servicemix/activemq/commands/
activemq/activemq-commands/src/main/resources/OSGI-INF/blueprint/
activemq/active...
Author: ffang
Date: Mon Jul 5 08:28:33 2010
New Revision: 960482
URL: http://svn.apache.org/viewvc?rev=960482&view=rev
Log:
[SMX4-547]upgrade to use new karaf artifacts
Added:
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
- copied, changed from r959902, servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/org.apache.felix.karaf.features.cfg
Removed:
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/org.apache.felix.karaf.features.cfg
Modified:
servicemix/smx4/features/trunk/activemq/activemq-commands/pom.xml
servicemix/smx4/features/trunk/activemq/activemq-commands/src/main/java/org/apache/servicemix/activemq/commands/ActiveMQCommand.java
servicemix/smx4/features/trunk/activemq/activemq-commands/src/main/java/org/apache/servicemix/activemq/commands/ActiveMQCommandSupport.java
servicemix/smx4/features/trunk/activemq/activemq-commands/src/main/java/org/apache/servicemix/activemq/commands/CreateBrokerCommand.java
servicemix/smx4/features/trunk/activemq/activemq-commands/src/main/java/org/apache/servicemix/activemq/commands/DestroyBrokerCommand.java
servicemix/smx4/features/trunk/activemq/activemq-commands/src/main/resources/OSGI-INF/blueprint/servicemix-activemq.xml
servicemix/smx4/features/trunk/activemq/activemq-commands/src/main/resources/org/apache/servicemix/activemq/commands/AdministrationCommand.properties
servicemix/smx4/features/trunk/activemq/activemq-commands/src/main/resources/org/apache/servicemix/activemq/commands/CreateBrokerCommand.properties
servicemix/smx4/features/trunk/activemq/activemq-commands/src/main/resources/org/apache/servicemix/activemq/commands/DestroyBrokerCommand.properties
servicemix/smx4/features/trunk/assembly/pom.xml
servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml
servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/camel-features.xml
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/config.properties
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/users.properties
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
servicemix/smx4/features/trunk/branding/pom.xml
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/MultipleProducersTest.java
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ShouldRunSynchronouslyTest.java
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/decoupled.xml
servicemix/smx4/features/trunk/cxf/cxf-binding-nmr/src/main/java/org/apache/servicemix/cxf/binding/nmr/NMRConstants.java
servicemix/smx4/features/trunk/cxf/cxf-binding-nmr/src/main/resources/org/apache/servicemix/cxf/binding/nmr/interceptors/Messages.properties
servicemix/smx4/features/trunk/cxf/pom.xml
servicemix/smx4/features/trunk/examples/camel/camel-sa/pom.xml
servicemix/smx4/features/trunk/examples/camel/camel-simple-su/pom.xml
servicemix/smx4/features/trunk/examples/camel/pom.xml
servicemix/smx4/features/trunk/examples/cxf-wsdl-first/pom.xml
servicemix/smx4/features/trunk/examples/cxf-wsdl-first/wsdl-first-cxf-sa/pom.xml
servicemix/smx4/features/trunk/examples/cxf-wsdl-first/wsdl-first-cxfbc-su/pom.xml
servicemix/smx4/features/trunk/examples/cxf-wsdl-first/wsdl-first-cxfse-su/pom.xml
servicemix/smx4/features/trunk/examples/itests/tests/pom.xml
servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java
servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
servicemix/smx4/features/trunk/examples/loan-broker-bpel/loan-broker-drools-su/pom.xml
servicemix/smx4/features/trunk/examples/wsdl-first/pom.xml
servicemix/smx4/features/trunk/examples/wsdl-first/wsdl-first-http-su/pom.xml
servicemix/smx4/features/trunk/examples/wsdl-first/wsdl-first-jsr181-su/pom.xml
servicemix/smx4/features/trunk/examples/wsdl-first/wsdl-first-sa/pom.xml
servicemix/smx4/features/trunk/pom.xml
servicemix/smx4/features/trunk/war/deployer/src/main/resources/META-INF/spring/war-deployer.xml
servicemix/smx4/features/trunk/war/pom.xml
Modified: servicemix/smx4/features/trunk/activemq/activemq-commands/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/activemq/activemq-commands/pom.xml?rev=960482&r1=960481&r2=960482&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/activemq/activemq-commands/pom.xml (original)
+++ servicemix/smx4/features/trunk/activemq/activemq-commands/pom.xml Mon Jul 5 08:28:33 2010
@@ -39,9 +39,9 @@
<dependencies>
<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.osgi</groupId>
Modified: servicemix/smx4/features/trunk/activemq/activemq-commands/src/main/java/org/apache/servicemix/activemq/commands/ActiveMQCommand.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/activemq/activemq-commands/src/main/java/org/apache/servicemix/activemq/commands/ActiveMQCommand.java?rev=960482&r1=960481&r2=960482&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/activemq/activemq-commands/src/main/java/org/apache/servicemix/activemq/commands/ActiveMQCommand.java (original)
+++ servicemix/smx4/features/trunk/activemq/activemq-commands/src/main/java/org/apache/servicemix/activemq/commands/ActiveMQCommand.java Mon Jul 5 08:28:33 2010
@@ -22,11 +22,11 @@ import org.apache.felix.gogo.commands.Ar
import org.apache.felix.gogo.commands.basic.AbstractCommand;
import org.apache.felix.gogo.commands.basic.ActionPreparator;
import org.apache.felix.gogo.commands.basic.DefaultActionPreparator;
-import org.apache.felix.karaf.shell.console.BlueprintContainerAware;
-import org.apache.felix.karaf.shell.console.BundleContextAware;
-import org.apache.felix.karaf.shell.console.CompletableFunction;
-import org.apache.felix.karaf.shell.console.Completer;
-import org.apache.felix.karaf.shell.console.commands.GenericType;
+import org.apache.karaf.shell.console.BlueprintContainerAware;
+import org.apache.karaf.shell.console.BundleContextAware;
+import org.apache.karaf.shell.console.CompletableFunction;
+import org.apache.karaf.shell.console.Completer;
+import org.apache.karaf.shell.console.commands.GenericType;
import org.osgi.framework.BundleContext;
import org.osgi.service.blueprint.container.BlueprintContainer;
import org.osgi.service.blueprint.container.Converter;
Modified: servicemix/smx4/features/trunk/activemq/activemq-commands/src/main/java/org/apache/servicemix/activemq/commands/ActiveMQCommandSupport.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/activemq/activemq-commands/src/main/java/org/apache/servicemix/activemq/commands/ActiveMQCommandSupport.java?rev=960482&r1=960481&r2=960482&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/activemq/activemq-commands/src/main/java/org/apache/servicemix/activemq/commands/ActiveMQCommandSupport.java (original)
+++ servicemix/smx4/features/trunk/activemq/activemq-commands/src/main/java/org/apache/servicemix/activemq/commands/ActiveMQCommandSupport.java Mon Jul 5 08:28:33 2010
@@ -23,7 +23,7 @@ import java.util.Collection;
import org.apache.activemq.console.command.Command;
import org.apache.activemq.console.formatter.CommandShellOutputFormatter;
import org.apache.activemq.console.CommandContext;
-import org.apache.felix.karaf.shell.console.OsgiCommandSupport;
+import org.apache.karaf.shell.console.OsgiCommandSupport;
import org.apache.felix.gogo.commands.Argument;
/**
Modified: servicemix/smx4/features/trunk/activemq/activemq-commands/src/main/java/org/apache/servicemix/activemq/commands/CreateBrokerCommand.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/activemq/activemq-commands/src/main/java/org/apache/servicemix/activemq/commands/CreateBrokerCommand.java?rev=960482&r1=960481&r2=960482&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/activemq/activemq-commands/src/main/java/org/apache/servicemix/activemq/commands/CreateBrokerCommand.java (original)
+++ servicemix/smx4/features/trunk/activemq/activemq-commands/src/main/java/org/apache/servicemix/activemq/commands/CreateBrokerCommand.java Mon Jul 5 08:28:33 2010
@@ -28,7 +28,7 @@ import java.util.Scanner;
import org.apache.felix.gogo.commands.Option;
import org.apache.felix.gogo.commands.Command;
-import org.apache.felix.karaf.shell.console.OsgiCommandSupport;
+import org.apache.karaf.shell.console.OsgiCommandSupport;
/**
* @version $Rev$ $Date$
@@ -42,7 +42,7 @@ public class CreateBrokerCommand extends
/*
* (non-Javadoc)
* @see
- * org.apache.felix.karaf.shell.console.OsgiCommandSupport#doExecute()
+ * org.apache.karaf.shell.console.OsgiCommandSupport#doExecute()
*/
protected Object doExecute() throws Exception {
Modified: servicemix/smx4/features/trunk/activemq/activemq-commands/src/main/java/org/apache/servicemix/activemq/commands/DestroyBrokerCommand.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/activemq/activemq-commands/src/main/java/org/apache/servicemix/activemq/commands/DestroyBrokerCommand.java?rev=960482&r1=960481&r2=960482&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/activemq/activemq-commands/src/main/java/org/apache/servicemix/activemq/commands/DestroyBrokerCommand.java (original)
+++ servicemix/smx4/features/trunk/activemq/activemq-commands/src/main/java/org/apache/servicemix/activemq/commands/DestroyBrokerCommand.java Mon Jul 5 08:28:33 2010
@@ -20,7 +20,7 @@ import java.io.File;
import org.apache.felix.gogo.commands.Option;
import org.apache.felix.gogo.commands.Command;
-import org.apache.felix.karaf.shell.console.OsgiCommandSupport;
+import org.apache.karaf.shell.console.OsgiCommandSupport;
/**
* @version $Rev$ $Date$
Modified: servicemix/smx4/features/trunk/activemq/activemq-commands/src/main/resources/OSGI-INF/blueprint/servicemix-activemq.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/activemq/activemq-commands/src/main/resources/OSGI-INF/blueprint/servicemix-activemq.xml?rev=960482&r1=960481&r2=960482&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/activemq/activemq-commands/src/main/resources/OSGI-INF/blueprint/servicemix-activemq.xml (original)
+++ servicemix/smx4/features/trunk/activemq/activemq-commands/src/main/resources/OSGI-INF/blueprint/servicemix-activemq.xml Mon Jul 5 08:28:33 2010
@@ -42,7 +42,7 @@
<service ref="listcommand" activation="lazy" >
<interfaces>
<value>org.osgi.service.command.Function</value>
- <value>org.apache.felix.karaf.shell.console.CompletableFunction</value>
+ <value>org.apache.karaf.shell.console.CompletableFunction</value>
</interfaces>
<service-properties>
<entry key="osgi.command.scope" value="activemq"/>
@@ -68,7 +68,7 @@
<service ref="querycommand" activation="lazy" >
<interfaces>
<value>org.osgi.service.command.Function</value>
- <value>org.apache.felix.karaf.shell.console.CompletableFunction</value>
+ <value>org.apache.karaf.shell.console.CompletableFunction</value>
</interfaces>
<service-properties>
<entry key="osgi.command.scope" value="activemq"/>
@@ -94,7 +94,7 @@
<service ref="browsecommand" activation="lazy" >
<interfaces>
<value>org.osgi.service.command.Function</value>
- <value>org.apache.felix.karaf.shell.console.CompletableFunction</value>
+ <value>org.apache.karaf.shell.console.CompletableFunction</value>
</interfaces>
<service-properties>
<entry key="osgi.command.scope" value="activemq"/>
@@ -120,7 +120,7 @@
<service ref="bstatcommand" activation="lazy" >
<interfaces>
<value>org.osgi.service.command.Function</value>
- <value>org.apache.felix.karaf.shell.console.CompletableFunction</value>
+ <value>org.apache.karaf.shell.console.CompletableFunction</value>
</interfaces>
<service-properties>
<entry key="osgi.command.scope" value="activemq"/>
@@ -146,7 +146,7 @@
<service ref="purgecommand" activation="lazy" >
<interfaces>
<value>org.osgi.service.command.Function</value>
- <value>org.apache.felix.karaf.shell.console.CompletableFunction</value>
+ <value>org.apache.karaf.shell.console.CompletableFunction</value>
</interfaces>
<service-properties>
<entry key="osgi.command.scope" value="activemq"/>
@@ -162,4 +162,4 @@
</property>
</bean>
-</blueprint>
\ No newline at end of file
+</blueprint>
Modified: servicemix/smx4/features/trunk/activemq/activemq-commands/src/main/resources/org/apache/servicemix/activemq/commands/AdministrationCommand.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/activemq/activemq-commands/src/main/resources/org/apache/servicemix/activemq/commands/AdministrationCommand.properties?rev=960482&r1=960481&r2=960482&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/activemq/activemq-commands/src/main/resources/org/apache/servicemix/activemq/commands/AdministrationCommand.properties (original)
+++ servicemix/smx4/features/trunk/activemq/activemq-commands/src/main/resources/org/apache/servicemix/activemq/commands/AdministrationCommand.properties Mon Jul 5 08:28:33 2010
@@ -24,4 +24,4 @@
command.description=Parent ActiveMQ administration command.
command.manual=\
- TODO: date manual
\ No newline at end of file
+ TODO: date manual
Modified: servicemix/smx4/features/trunk/activemq/activemq-commands/src/main/resources/org/apache/servicemix/activemq/commands/CreateBrokerCommand.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/activemq/activemq-commands/src/main/resources/org/apache/servicemix/activemq/commands/CreateBrokerCommand.properties?rev=960482&r1=960481&r2=960482&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/activemq/activemq-commands/src/main/resources/org/apache/servicemix/activemq/commands/CreateBrokerCommand.properties (original)
+++ servicemix/smx4/features/trunk/activemq/activemq-commands/src/main/resources/org/apache/servicemix/activemq/commands/CreateBrokerCommand.properties Mon Jul 5 08:28:33 2010
@@ -24,4 +24,4 @@
command.description=Creates a broker instance.
command.manual=\
- TODO: date manual
\ No newline at end of file
+ TODO: date manual
Modified: servicemix/smx4/features/trunk/activemq/activemq-commands/src/main/resources/org/apache/servicemix/activemq/commands/DestroyBrokerCommand.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/activemq/activemq-commands/src/main/resources/org/apache/servicemix/activemq/commands/DestroyBrokerCommand.properties?rev=960482&r1=960481&r2=960482&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/activemq/activemq-commands/src/main/resources/org/apache/servicemix/activemq/commands/DestroyBrokerCommand.properties (original)
+++ servicemix/smx4/features/trunk/activemq/activemq-commands/src/main/resources/org/apache/servicemix/activemq/commands/DestroyBrokerCommand.properties Mon Jul 5 08:28:33 2010
@@ -24,4 +24,4 @@
command.description=Remove a broker instance.
command.manual=\
- TODO: date manual
\ No newline at end of file
+ TODO: date manual
Modified: servicemix/smx4/features/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/pom.xml?rev=960482&r1=960481&r2=960482&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/features/trunk/assembly/pom.xml Mon Jul 5 08:28:33 2010
@@ -36,9 +36,9 @@
<dependencies>
<!-- making sure all karaf dependencies are in our local Maven repo -->
<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>
<exclusions>
<exclusion>
@@ -48,15 +48,15 @@
</exclusions>
</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>
<type>xml</type>
<classifier>features</classifier>
</dependency>
@@ -961,7 +961,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" />
@@ -984,9 +984,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>
@@ -996,7 +996,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>mvn:org.apache.servicemix.nmr/apache-servicemix-nmr/${servicemix.nmr.version}/xml/features</descriptor>
<descriptor>file:${basedir}/target/classes/camel-features.xml</descriptor>
<descriptor>file:${basedir}/target/classes/features.xml</descriptor>
@@ -1079,9 +1079,9 @@
<configuration>
<artifactItems>
<artifactItem>
- <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>
<outputDirectory>target/dependencies/unix</outputDirectory>
</artifactItem>
@@ -1104,9 +1104,9 @@
<configuration>
<artifactItems>
<artifactItem>
- <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>
<outputDirectory>target/dependencies/win</outputDirectory>
</artifactItem>
Modified: servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml?rev=960482&r1=960481&r2=960482&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml Mon Jul 5 08:28:33 2010
@@ -25,13 +25,13 @@
<!-- Expanded ServiceMix Runtime -->
<fileSet>
- <directory>target/dependencies/unix/apache-felix-karaf-${felix.karaf.version}</directory>
+ <directory>target/dependencies/unix/apache-karaf-${karaf.version}</directory>
<outputDirectory>/</outputDirectory>
<excludes>
<exclude>**/demos/**</exclude>
<exclude>bin/start</exclude>
<exclude>etc/system.properties</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/users.properties</exclude>
<exclude>etc/config.properties</exclude>
@@ -45,7 +45,7 @@
<!-- Copy over bin/servicemix separately to get the correct file mode -->
<fileSet>
- <directory>target/dependencies/unix/apache-felix-karaf-${felix.karaf.version}</directory>
+ <directory>target/dependencies/unix/apache-karaf-${karaf.version}</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>bin/admin</include>
@@ -55,7 +55,7 @@
<!-- Copy over kernel demo to examples folder -->
<fileSet>
- <directory>target/dependencies/unix/apache-felix-karaf-${felix.karaf.version}/demos</directory>
+ <directory>target/dependencies/unix/apache-karaf-${karaf.version}/demos</directory>
<outputDirectory>/examples/karaf-demos</outputDirectory>
<lineEnding>unix</lineEnding>
<includes>
@@ -155,7 +155,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>servicemix</destName>
<fileMode>0755</fileMode>
Modified: servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml?rev=960482&r1=960481&r2=960482&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml Mon Jul 5 08:28:33 2010
@@ -24,13 +24,13 @@
<!-- Expanded ServiceMix Runtime -->
<fileSet>
- <directory>target/dependencies/win/apache-felix-karaf-${felix.karaf.version}</directory>
+ <directory>target/dependencies/win/apache-karaf-${karaf.version}</directory>
<outputDirectory>/</outputDirectory>
<excludes>
<exclude>**/demos/**</exclude>
<exclude>bin/start.bat</exclude>
<exclude>etc/system.properties</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/users.properties</exclude>
<exclude>etc/config.properties</exclude>
@@ -44,7 +44,7 @@
<!-- Copy over kernel demo to examples folder -->
<fileSet>
- <directory>target/dependencies/win/apache-felix-karaf-${felix.karaf.version}/demos</directory>
+ <directory>target/dependencies/win/apache-karaf-${karaf.version}/demos</directory>
<outputDirectory>/examples/karaf-demos</outputDirectory>
<lineEnding>dos</lineEnding>
<includes>
@@ -143,7 +143,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>servicemix.bat</destName>
<fileMode>0755</fileMode>
Modified: servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/camel-features.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/camel-features.xml?rev=960482&r1=960481&r2=960482&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/camel-features.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/camel-features.xml Mon Jul 5 08:28:33 2010
@@ -17,7 +17,7 @@
-->
<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='camel' version='${camel.version}'>
<feature version='${camel.version}'>camel-core</feature>
<feature version='${camel.version}'>camel-spring-osgi</feature>
@@ -34,7 +34,7 @@
<feature name='camel-spring-osgi' version='${camel.version}'>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
<feature version='2.5.6.SEC01'>spring</feature>
- <feature version='1.2.0'>spring-dm</feature>
+ <feature version='1.2.0'>spring2-dm</feature>
<bundle>mvn:org.springframework/spring-tx/2.5.6.SEC01</bundle>
<feature version='${camel.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-spring-osgi/${camel.version}</bundle>
@@ -83,7 +83,7 @@
<bundle>mvn:org.apache.cxf/cxf-bundle/2.2.6</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-io/1.3.2_3</bundle>
<feature version='${camel.version}'>camel-spring-osgi</feature>
- <feature version='${felix.karaf.version}'>http</feature>
+ <feature version='${karaf.version}'>http</feature>
<bundle>mvn:org.apache.camel/camel-cxf/${camel.version}</bundle>
</feature>
<feature name='camel-cache' version='${camel.version}'>
Modified: servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/config.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/config.properties?rev=960482&r1=960481&r2=960482&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/config.properties (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/config.properties Mon Jul 5 08:28:33 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*,javax.transaction,javax.transaction.*
Copied: servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg (from r959902, servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/org.apache.felix.karaf.features.cfg)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg?p2=servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg&p1=servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/org.apache.felix.karaf.features.cfg&r1=959902&r2=960482&rev=960482&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/org.apache.felix.karaf.features.cfg (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg Mon Jul 5 08:28:33 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/${servicemix.nmr.version}/xml/features,mvn:org.apache.servicemix/apache-servicemix/${version}/xml/features,mvn:org.apache.camel.karaf/apache-camel/${camel.version}/xml/features
+featuresRepositories=mvn:org.apache.karaf/apache-karaf/${karaf.version}/xml/features,mvn:org.apache.servicemix.nmr/apache-servicemix-nmr/${servicemix.nmr.version}/xml/features,mvn:org.apache.servicemix/apache-servicemix/${version}/xml/features,mvn:org.apache.camel.karaf/apache-camel/${camel.version}/xml/features
#
# Comma separated list of features to install at startup
Modified: servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/users.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/users.properties?rev=960482&r1=960481&r2=960482&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/users.properties (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/users.properties Mon Jul 5 08:28:33 2010
@@ -18,4 +18,4 @@
################################################################################
#
-smx=smx,admin
\ No newline at end of file
+smx=smx,admin
Modified: servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml?rev=960482&r1=960481&r2=960482&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml Mon Jul 5 08:28:33 2010
@@ -18,7 +18,7 @@
<features>
<repository>mvn:org.apache.servicemix.nmr/apache-servicemix-nmr/${servicemix.nmr.version}/xml/features</repository>
<repository>mvn:org.apache.camel.karaf/apache-camel/${camel.version}/xml/features</repository>
- <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="connector" version="${version}">
<feature version="${servicemix.nmr.version}">transaction</feature>
<bundle>mvn:org.apache.geronimo.specs/geronimo-j2ee-connector_1.5_spec/${geronimo.j2ee.connector.version}</bundle>
@@ -32,7 +32,7 @@
<bundle>mvn:org.jencks/jencks/${jencks.version}</bundle>
</feature>
<feature name="web-core" version="${version}">
- <feature version="${felix.karaf.version}">http</feature>
+ <feature version="${karaf.version}">http</feature>
<bundle>mvn:org.ops4j.pax.web/pax-web-jsp/${pax.web.version}</bundle>
</feature>
<feature name="web" version="${version}">
@@ -361,7 +361,7 @@
<!-- Default broker configuration -->
<feature name="activemq-broker" version="${version}">
- <feature>spring-dm</feature>
+ <feature>spring2-dm</feature>
<feature version="${activemq.version}">activemq</feature>
<bundle>spring:file:etc/activemq-broker.xml</bundle>
</feature>
Modified: servicemix/smx4/features/trunk/branding/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/branding/pom.xml?rev=960482&r1=960481&r2=960482&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/branding/pom.xml (original)
+++ servicemix/smx4/features/trunk/branding/pom.xml Mon Jul 5 08:28:33 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/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/MultipleProducersTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/MultipleProducersTest.java?rev=960482&r1=960481&r2=960482&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/MultipleProducersTest.java (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/MultipleProducersTest.java Mon Jul 5 08:28:33 2010
@@ -69,4 +69,4 @@ public class MultipleProducersTest exten
}
};
}
-}
\ No newline at end of file
+}
Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ShouldRunSynchronouslyTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ShouldRunSynchronouslyTest.java?rev=960482&r1=960481&r2=960482&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ShouldRunSynchronouslyTest.java (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ShouldRunSynchronouslyTest.java Mon Jul 5 08:28:33 2010
@@ -59,4 +59,4 @@ public class ShouldRunSynchronouslyTest
}
};
}
-}
\ No newline at end of file
+}
Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/decoupled.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/decoupled.xml?rev=960482&r1=960481&r2=960482&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/decoupled.xml (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/decoupled.xml Mon Jul 5 08:28:33 2010
@@ -60,4 +60,4 @@ http://www.springframework.org/schema/be
</property>
</bean>
-</beans>
\ No newline at end of file
+</beans>
Modified: servicemix/smx4/features/trunk/cxf/cxf-binding-nmr/src/main/java/org/apache/servicemix/cxf/binding/nmr/NMRConstants.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/cxf/cxf-binding-nmr/src/main/java/org/apache/servicemix/cxf/binding/nmr/NMRConstants.java?rev=960482&r1=960481&r2=960482&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/cxf/cxf-binding-nmr/src/main/java/org/apache/servicemix/cxf/binding/nmr/NMRConstants.java (original)
+++ servicemix/smx4/features/trunk/cxf/cxf-binding-nmr/src/main/java/org/apache/servicemix/cxf/binding/nmr/NMRConstants.java Mon Jul 5 08:28:33 2010
@@ -34,4 +34,4 @@ public final class NMRConstants {
private NMRConstants() {
//utility class
}
-}
\ No newline at end of file
+}
Modified: servicemix/smx4/features/trunk/cxf/cxf-binding-nmr/src/main/resources/org/apache/servicemix/cxf/binding/nmr/interceptors/Messages.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/cxf/cxf-binding-nmr/src/main/resources/org/apache/servicemix/cxf/binding/nmr/interceptors/Messages.properties?rev=960482&r1=960481&r2=960482&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/cxf/cxf-binding-nmr/src/main/resources/org/apache/servicemix/cxf/binding/nmr/interceptors/Messages.properties (original)
+++ servicemix/smx4/features/trunk/cxf/cxf-binding-nmr/src/main/resources/org/apache/servicemix/cxf/binding/nmr/interceptors/Messages.properties Mon Jul 5 08:28:33 2010
@@ -58,4 +58,4 @@ STAX_WRITE_EXC=stax write exception
NOT_EQUAL_ARG_NUM=The number of arguments is not equal
NEED_JBIBINDING=BindingInfo should be a JbiBindingInfo
NO_EXCEPTION=No exception on this message
-NO_XML_STREAM_WRITER=No XMLStreamWriter on this message
\ No newline at end of file
+NO_XML_STREAM_WRITER=No XMLStreamWriter on this message
Modified: servicemix/smx4/features/trunk/cxf/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/cxf/pom.xml?rev=960482&r1=960481&r2=960482&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/cxf/pom.xml (original)
+++ servicemix/smx4/features/trunk/cxf/pom.xml Mon Jul 5 08:28:33 2010
@@ -37,4 +37,4 @@
<module>cxf-binding-nmr</module>
</modules>
-</project>
\ No newline at end of file
+</project>
Modified: servicemix/smx4/features/trunk/examples/camel/camel-sa/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/camel/camel-sa/pom.xml?rev=960482&r1=960481&r2=960482&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/camel/camel-sa/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/camel/camel-sa/pom.xml Mon Jul 5 08:28:33 2010
@@ -54,4 +54,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: servicemix/smx4/features/trunk/examples/camel/camel-simple-su/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/camel/camel-simple-su/pom.xml?rev=960482&r1=960481&r2=960482&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/camel/camel-simple-su/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/camel/camel-simple-su/pom.xml Mon Jul 5 08:28:33 2010
@@ -61,4 +61,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: servicemix/smx4/features/trunk/examples/camel/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/camel/pom.xml?rev=960482&r1=960481&r2=960482&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/camel/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/camel/pom.xml Mon Jul 5 08:28:33 2010
@@ -97,4 +97,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: servicemix/smx4/features/trunk/examples/cxf-wsdl-first/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-wsdl-first/pom.xml?rev=960482&r1=960481&r2=960482&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-wsdl-first/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/cxf-wsdl-first/pom.xml Mon Jul 5 08:28:33 2010
@@ -118,4 +118,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: servicemix/smx4/features/trunk/examples/cxf-wsdl-first/wsdl-first-cxf-sa/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-wsdl-first/wsdl-first-cxf-sa/pom.xml?rev=960482&r1=960481&r2=960482&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-wsdl-first/wsdl-first-cxf-sa/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/cxf-wsdl-first/wsdl-first-cxf-sa/pom.xml Mon Jul 5 08:28:33 2010
@@ -55,4 +55,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: servicemix/smx4/features/trunk/examples/cxf-wsdl-first/wsdl-first-cxfbc-su/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-wsdl-first/wsdl-first-cxfbc-su/pom.xml?rev=960482&r1=960481&r2=960482&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-wsdl-first/wsdl-first-cxfbc-su/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/cxf-wsdl-first/wsdl-first-cxfbc-su/pom.xml Mon Jul 5 08:28:33 2010
@@ -49,4 +49,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: servicemix/smx4/features/trunk/examples/cxf-wsdl-first/wsdl-first-cxfse-su/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-wsdl-first/wsdl-first-cxfse-su/pom.xml?rev=960482&r1=960481&r2=960482&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-wsdl-first/wsdl-first-cxfse-su/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/cxf-wsdl-first/wsdl-first-cxfse-su/pom.xml Mon Jul 5 08:28:33 2010
@@ -117,4 +117,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: servicemix/smx4/features/trunk/examples/itests/tests/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/tests/pom.xml?rev=960482&r1=960481&r2=960482&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/tests/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/itests/tests/pom.xml Mon Jul 5 08:28:33 2010
@@ -56,9 +56,9 @@
</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>
<scope>test</scope>
</dependency>
<dependency>
Modified: servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java?rev=960482&r1=960481&r2=960482&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java (original)
+++ servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java Mon Jul 5 08:28:33 2010
@@ -116,7 +116,7 @@ public class CXFNMRIntegrationTest exten
getBundle("org.ops4j.pax.web", "pax-web-extender-whiteboard"),
getBundle("org.apache.servicemix", "servicemix-utils"),
getBundle("org.fusesource.commonman", "commons-management"),
- getBundle("org.apache.felix.karaf", "org.apache.felix.karaf.management"),
+ getBundle("org.apache.karaf", "org.apache.karaf.management"),
getBundle("org.apache.cxf", "cxf-bundle"),
getBundle("org.apache.servicemix.cxf", "org.apache.servicemix.cxf.transport.nmr"),
getBundle("org.apache.servicemix.nmr", "org.apache.servicemix.nmr.api"),
Modified: servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java?rev=960482&r1=960481&r2=960482&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java (original)
+++ servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java Mon Jul 5 08:28:33 2010
@@ -143,7 +143,7 @@ public class IntegrationTest extends Abs
getBundle("org.ops4j.pax.web", "pax-web-extender-whiteboard"),
getBundle("org.apache.servicemix", "servicemix-utils"),
getBundle("org.fusesource.commonman", "commons-management"),
- getBundle("org.apache.felix.karaf", "org.apache.felix.karaf.management"),
+ getBundle("org.apache.karaf", "org.apache.karaf.management"),
getBundle("org.apache.cxf", "cxf-bundle"),
getBundle("org.apache.servicemix.cxf", "org.apache.servicemix.cxf.transport.nmr"),
getBundle("org.apache.servicemix.nmr", "org.apache.servicemix.nmr.api"),
Modified: servicemix/smx4/features/trunk/examples/loan-broker-bpel/loan-broker-drools-su/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/loan-broker-bpel/loan-broker-drools-su/pom.xml?rev=960482&r1=960481&r2=960482&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/loan-broker-bpel/loan-broker-drools-su/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/loan-broker-bpel/loan-broker-drools-su/pom.xml Mon Jul 5 08:28:33 2010
@@ -93,4 +93,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: servicemix/smx4/features/trunk/examples/wsdl-first/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/wsdl-first/pom.xml?rev=960482&r1=960481&r2=960482&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/wsdl-first/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/wsdl-first/pom.xml Mon Jul 5 08:28:33 2010
@@ -117,4 +117,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: servicemix/smx4/features/trunk/examples/wsdl-first/wsdl-first-http-su/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/wsdl-first/wsdl-first-http-su/pom.xml?rev=960482&r1=960481&r2=960482&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/wsdl-first/wsdl-first-http-su/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/wsdl-first/wsdl-first-http-su/pom.xml Mon Jul 5 08:28:33 2010
@@ -49,4 +49,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: servicemix/smx4/features/trunk/examples/wsdl-first/wsdl-first-jsr181-su/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/wsdl-first/wsdl-first-jsr181-su/pom.xml?rev=960482&r1=960481&r2=960482&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/wsdl-first/wsdl-first-jsr181-su/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/wsdl-first/wsdl-first-jsr181-su/pom.xml Mon Jul 5 08:28:33 2010
@@ -76,4 +76,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: servicemix/smx4/features/trunk/examples/wsdl-first/wsdl-first-sa/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/wsdl-first/wsdl-first-sa/pom.xml?rev=960482&r1=960481&r2=960482&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/wsdl-first/wsdl-first-sa/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/wsdl-first/wsdl-first-sa/pom.xml Mon Jul 5 08:28:33 2010
@@ -55,4 +55,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: servicemix/smx4/features/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=960482&r1=960481&r2=960482&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/pom.xml (original)
+++ servicemix/smx4/features/trunk/pom.xml Mon Jul 5 08:28:33 2010
@@ -106,7 +106,7 @@
<felix.configadmin.version>1.2.4</felix.configadmin.version>
<felix.fileinstall.version>3.0.0</felix.fileinstall.version>
<felix.framework.version>3.0.1</felix.framework.version>
- <felix.karaf.version>1.6.0</felix.karaf.version>
+ <karaf.version>1.99.0-SNAPSHOT</karaf.version>
<felix.plugin.version>2.1.0</felix.plugin.version>
<felix.prefs.version>1.0.4</felix.prefs.version>
<flatpack.version>3.1.1_3</flatpack.version>
Modified: servicemix/smx4/features/trunk/war/deployer/src/main/resources/META-INF/spring/war-deployer.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/war/deployer/src/main/resources/META-INF/spring/war-deployer.xml?rev=960482&r1=960481&r2=960482&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/war/deployer/src/main/resources/META-INF/spring/war-deployer.xml (original)
+++ servicemix/smx4/features/trunk/war/deployer/src/main/resources/META-INF/spring/war-deployer.xml Mon Jul 5 08:28:33 2010
@@ -34,4 +34,4 @@
<osgi:service ref="warDeployer" interface="org.apache.felix.fileinstall.ArtifactTransformer" />
-</beans>
\ No newline at end of file
+</beans>
Modified: servicemix/smx4/features/trunk/war/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/war/pom.xml?rev=960482&r1=960481&r2=960482&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/war/pom.xml (original)
+++ servicemix/smx4/features/trunk/war/pom.xml Mon Jul 5 08:28:33 2010
@@ -36,4 +36,4 @@
<module>deployer</module>
</modules>
-</project>
\ No newline at end of file
+</project>