servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lh...@apache.org
Subject svn commit: r1085396 - in /servicemix/smx4/nmr/trunk: ./ assembly/src/main/distribution/bin/ assembly/src/main/distribution/etc/ assembly/src/main/filtered-resources/ assembly/src/main/filtered-resources/bin/ assembly/src/main/filtered-resources/etc/ n...
Date Fri, 25 Mar 2011 14:27:42 GMT
Author: lhein
Date: Fri Mar 25 14:27:41 2011
New Revision: 1085396

URL: http://svn.apache.org/viewvc?rev=1085396&view=rev
Log:
started to rework the smx4 build (see SMX4-778)

Added:
    servicemix/smx4/nmr/trunk/assembly/src/main/distribution/bin/
    servicemix/smx4/nmr/trunk/assembly/src/main/distribution/bin/start
      - copied, changed from r1083900, servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/bin/start
    servicemix/smx4/nmr/trunk/assembly/src/main/distribution/bin/start.bat
      - copied, changed from r1083900, servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/bin/start.bat
    servicemix/smx4/nmr/trunk/assembly/src/main/distribution/bin/stop
      - copied, changed from r1083900, servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/bin/stop
    servicemix/smx4/nmr/trunk/assembly/src/main/distribution/bin/stop.bat
      - copied, changed from r1083900, servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/bin/stop.bat
    servicemix/smx4/nmr/trunk/assembly/src/main/distribution/etc/
    servicemix/smx4/nmr/trunk/assembly/src/main/distribution/etc/custom.properties
      - copied, changed from r1083900, servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/etc/custom.properties
    servicemix/smx4/nmr/trunk/assembly/src/main/distribution/etc/org.apache.karaf.features.cfg
      - copied, changed from r1083900, servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
    servicemix/smx4/nmr/trunk/assembly/src/main/distribution/etc/org.apache.servicemix.jbi.cfg
      - copied, changed from r1083900, servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/etc/org.apache.servicemix.jbi.cfg
    servicemix/smx4/nmr/trunk/assembly/src/main/distribution/etc/org.apache.servicemix.nmr.cfg
      - copied, changed from r1083900, servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/etc/org.apache.servicemix.nmr.cfg
    servicemix/smx4/nmr/trunk/assembly/src/main/distribution/etc/org.ops4j.pax.logging.cfg
      - copied, changed from r1083900, servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/etc/org.ops4j.pax.logging.cfg
    servicemix/smx4/nmr/trunk/assembly/src/main/distribution/etc/users.properties
      - copied, changed from r1083900, servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/etc/users.properties
Removed:
    servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/bin/start
    servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/bin/start.bat
    servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/bin/stop
    servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/bin/stop.bat
    servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/etc/custom.properties
    servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
    servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/etc/org.apache.servicemix.jbi.cfg
    servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/etc/org.apache.servicemix.nmr.cfg
    servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/etc/org.ops4j.pax.logging.cfg
    servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/etc/users.properties
Modified:
    servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/features.xml
    servicemix/smx4/nmr/trunk/nmr/core/src/main/java/org/apache/servicemix/nmr/core/ChannelImpl.java
    servicemix/smx4/nmr/trunk/pom.xml
    servicemix/smx4/nmr/trunk/testing/support/pom.xml
    servicemix/smx4/nmr/trunk/testing/support/src/main/java/org/apache/servicemix/platform/testing/support/AbstractIntegrationTest.java
    servicemix/smx4/nmr/trunk/testing/support/src/main/resources/org/apache/servicemix/platform/testing/support/config.properties

Copied: servicemix/smx4/nmr/trunk/assembly/src/main/distribution/bin/start (from r1083900,
servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/bin/start)
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/assembly/src/main/distribution/bin/start?p2=servicemix/smx4/nmr/trunk/assembly/src/main/distribution/bin/start&p1=servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/bin/start&r1=1083900&r2=1085396&rev=1085396&view=diff
==============================================================================
    (empty)

Copied: servicemix/smx4/nmr/trunk/assembly/src/main/distribution/bin/start.bat (from r1083900,
servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/bin/start.bat)
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/assembly/src/main/distribution/bin/start.bat?p2=servicemix/smx4/nmr/trunk/assembly/src/main/distribution/bin/start.bat&p1=servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/bin/start.bat&r1=1083900&r2=1085396&rev=1085396&view=diff
==============================================================================
    (empty)

Copied: servicemix/smx4/nmr/trunk/assembly/src/main/distribution/bin/stop (from r1083900,
servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/bin/stop)
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/assembly/src/main/distribution/bin/stop?p2=servicemix/smx4/nmr/trunk/assembly/src/main/distribution/bin/stop&p1=servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/bin/stop&r1=1083900&r2=1085396&rev=1085396&view=diff
==============================================================================
    (empty)

Copied: servicemix/smx4/nmr/trunk/assembly/src/main/distribution/bin/stop.bat (from r1083900,
servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/bin/stop.bat)
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/assembly/src/main/distribution/bin/stop.bat?p2=servicemix/smx4/nmr/trunk/assembly/src/main/distribution/bin/stop.bat&p1=servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/bin/stop.bat&r1=1083900&r2=1085396&rev=1085396&view=diff
==============================================================================
    (empty)

Copied: servicemix/smx4/nmr/trunk/assembly/src/main/distribution/etc/custom.properties (from
r1083900, servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/etc/custom.properties)
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/assembly/src/main/distribution/etc/custom.properties?p2=servicemix/smx4/nmr/trunk/assembly/src/main/distribution/etc/custom.properties&p1=servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/etc/custom.properties&r1=1083900&r2=1085396&rev=1085396&view=diff
==============================================================================
    (empty)

Copied: servicemix/smx4/nmr/trunk/assembly/src/main/distribution/etc/org.apache.karaf.features.cfg
(from r1083900, servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg)
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/assembly/src/main/distribution/etc/org.apache.karaf.features.cfg?p2=servicemix/smx4/nmr/trunk/assembly/src/main/distribution/etc/org.apache.karaf.features.cfg&p1=servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg&r1=1083900&r2=1085396&rev=1085396&view=diff
==============================================================================
    (empty)

Copied: servicemix/smx4/nmr/trunk/assembly/src/main/distribution/etc/org.apache.servicemix.jbi.cfg
(from r1083900, servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/etc/org.apache.servicemix.jbi.cfg)
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/assembly/src/main/distribution/etc/org.apache.servicemix.jbi.cfg?p2=servicemix/smx4/nmr/trunk/assembly/src/main/distribution/etc/org.apache.servicemix.jbi.cfg&p1=servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/etc/org.apache.servicemix.jbi.cfg&r1=1083900&r2=1085396&rev=1085396&view=diff
==============================================================================
    (empty)

Copied: servicemix/smx4/nmr/trunk/assembly/src/main/distribution/etc/org.apache.servicemix.nmr.cfg
(from r1083900, servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/etc/org.apache.servicemix.nmr.cfg)
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/assembly/src/main/distribution/etc/org.apache.servicemix.nmr.cfg?p2=servicemix/smx4/nmr/trunk/assembly/src/main/distribution/etc/org.apache.servicemix.nmr.cfg&p1=servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/etc/org.apache.servicemix.nmr.cfg&r1=1083900&r2=1085396&rev=1085396&view=diff
==============================================================================
    (empty)

Copied: servicemix/smx4/nmr/trunk/assembly/src/main/distribution/etc/org.ops4j.pax.logging.cfg
(from r1083900, servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/etc/org.ops4j.pax.logging.cfg)
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/assembly/src/main/distribution/etc/org.ops4j.pax.logging.cfg?p2=servicemix/smx4/nmr/trunk/assembly/src/main/distribution/etc/org.ops4j.pax.logging.cfg&p1=servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/etc/org.ops4j.pax.logging.cfg&r1=1083900&r2=1085396&rev=1085396&view=diff
==============================================================================
    (empty)

Copied: servicemix/smx4/nmr/trunk/assembly/src/main/distribution/etc/users.properties (from
r1083900, servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/etc/users.properties)
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/assembly/src/main/distribution/etc/users.properties?p2=servicemix/smx4/nmr/trunk/assembly/src/main/distribution/etc/users.properties&p1=servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/etc/users.properties&r1=1083900&r2=1085396&rev=1085396&view=diff
==============================================================================
    (empty)

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=1085396&r1=1085395&r2=1085396&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 Mar 25
14:27:41 2011
@@ -45,7 +45,7 @@
     </feature>
     <feature name="jbi" version="${version}">
         <feature version="${version}">naming</feature>
-        <feature version="${aries.transaction.version}">transaction</feature>
+        <feature version="${aries.version}">transaction</feature>
         <feature version="${version}">nmr</feature>
         <feature version="${woodstox.version}">woodstox</feature>
         <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix.specs.version}</bundle>

Modified: servicemix/smx4/nmr/trunk/nmr/core/src/main/java/org/apache/servicemix/nmr/core/ChannelImpl.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/core/src/main/java/org/apache/servicemix/nmr/core/ChannelImpl.java?rev=1085396&r1=1085395&r2=1085396&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/core/src/main/java/org/apache/servicemix/nmr/core/ChannelImpl.java
(original)
+++ servicemix/smx4/nmr/trunk/nmr/core/src/main/java/org/apache/servicemix/nmr/core/ChannelImpl.java
Fri Mar 25 14:27:41 2011
@@ -16,29 +16,23 @@
  */
 package org.apache.servicemix.nmr.core;
 
-import java.util.Map;
-import java.util.concurrent.Semaphore;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-import java.util.concurrent.RejectedExecutionException;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import org.apache.servicemix.nmr.api.AbortedException;
-import org.apache.servicemix.nmr.api.Endpoint;
-import org.apache.servicemix.nmr.api.Exchange;
-import org.apache.servicemix.nmr.api.NMR;
-import org.apache.servicemix.nmr.api.Pattern;
-import org.apache.servicemix.nmr.api.Role;
-import org.apache.servicemix.nmr.api.Status;
+import org.apache.servicemix.executors.Executor;
+import org.apache.servicemix.executors.ExecutorAwareRunnable;
+import org.apache.servicemix.nmr.api.*;
 import org.apache.servicemix.nmr.api.event.ExchangeListener;
 import org.apache.servicemix.nmr.api.internal.InternalChannel;
 import org.apache.servicemix.nmr.api.internal.InternalEndpoint;
 import org.apache.servicemix.nmr.api.internal.InternalExchange;
-import org.apache.servicemix.executors.Executor;
-import org.apache.servicemix.executors.ExecutorAwareRunnable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Map;
+import java.util.concurrent.RejectedExecutionException;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicBoolean;
+
 /**
  * The {@link org.apache.servicemix.nmr.api.Channel} implementation.
  * The channel uses an Executor (usually a thread pool)

Modified: servicemix/smx4/nmr/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/pom.xml?rev=1085396&r1=1085395&r2=1085396&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/pom.xml Fri Mar 25 14:27:41 2011
@@ -66,9 +66,10 @@
       <sonar.skippedModules>examples</sonar.skippedModules>
 
       <!-- OSGi (Felix framework, Aries, Karaf, Equinox) -->
-      <aries.transaction.version>0.3</aries.transaction.version>
+      <aries.version>0.3</aries.version>
       <felix.plugin.version>2.1.0</felix.plugin.version>
       <karaf.version>2.2.0</karaf.version>
+      <servicemix.nmr.version>${project.version}</servicemix.nmr.version>
 
       <!-- ActiveMQ -->
       <activemq.version>5.4.2</activemq.version>
@@ -79,7 +80,7 @@
       <!-- Geronimo -->
       <geronimo-jms.version>1.1.1</geronimo-jms.version>
       <geronimo-jta.version>1.1.1</geronimo-jta.version>
-      <geronimo-servlet.version>1.1.2</geronimo-servlet.version>
+      <geronimo-servlet.version>1.0</geronimo-servlet.version>
       
       <!-- Bundles -->
       <ant.bundle.version>1.7.0_4</ant.bundle.version>
@@ -91,7 +92,7 @@
       
       <!-- Components and SMX Resources -->
       <servicemix3.version>3.3.2</servicemix3.version>
-      <servicemix.components.version>2011.01</servicemix.components.version>
+      <servicemix.components.version>2011.02-SNAPSHOT</servicemix.components.version>
       <servicemix-eip.version>${servicemix.components.version}</servicemix-eip.version>
       <servicemix-http.version>${servicemix.components.version}</servicemix-http.version>
       <servicemix-jsr181.version>${servicemix.components.version}</servicemix-jsr181.version>
@@ -100,11 +101,6 @@
       <servicemix.specs.version>1.7.0</servicemix.specs.version>
       <servicemix-utils.version>1.4.0</servicemix-utils.version>
       
-      <!-- PAX -->
-      <pax.exam.version>1.2.3</pax.exam.version>
-      <pax.logging.version>1.5.3</pax.logging.version>
-      <pax.url.version>1.2.4</pax.url.version>
-      
       <!-- Spring -->
       <spring.version>3.0.5.RELEASE</spring.version>
       <spring.import.range>[2.5,4)</spring.import.range>
@@ -118,11 +114,8 @@
       <javax.mail.version>1.4.3</javax.mail.version>
       <jencks.version>2.2</jencks.version>
       <junit.version>4.7</junit.version>
-      <log4j.version>1.2.16</log4j.version>
       <lucene.version>2.4.1</lucene.version>
-      <mina.version>2.0.0-M6</mina.version>
-      <slf4j.version>1.5.8</slf4j.version>
-      <sshd.version>0.3.0</sshd.version>
+      <slf4j.version>1.6.1</slf4j.version>
       <woodstox.version>4.0.8</woodstox.version>
       <woodstox.stax2-api.version>3.0.2</woodstox.stax2-api.version>
       <xbean.version>3.7</xbean.version>
@@ -158,8 +151,9 @@
         <dependency>
             <groupId>org.apache.aries.transaction</groupId>
             <artifactId>org.apache.aries.transaction.manager</artifactId>
-            <version>${aries.transaction.version}</version>
+            <version>${aries.version}</version>
         </dependency>
+        
 
         <!-- Karaf -->
         <dependency>
@@ -194,89 +188,89 @@
         <dependency>
             <groupId>org.apache.servicemix.nmr</groupId>
             <artifactId>org.apache.servicemix.nmr.api</artifactId>
-            <version>${project.version}</version>
+            <version>${servicemix.nmr.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.nmr</groupId>
             <artifactId>org.apache.servicemix.nmr.branding</artifactId>
-            <version>${project.version}</version>
+            <version>${servicemix.nmr.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.nmr</groupId>
             <artifactId>org.apache.servicemix.nmr.commands</artifactId>
-            <version>${project.version}</version>
+            <version>${servicemix.nmr.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.nmr</groupId>
             <artifactId>org.apache.servicemix.nmr.core</artifactId>
-            <version>${project.version}</version>
+            <version>${servicemix.nmr.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.nmr</groupId>
             <artifactId>org.apache.servicemix.nmr.management</artifactId>
-            <version>${project.version}</version>
+            <version>${servicemix.nmr.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.nmr</groupId>
             <artifactId>org.apache.servicemix.nmr.osgi</artifactId>
-            <version>${project.version}</version>
+            <version>${servicemix.nmr.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.nmr</groupId>
             <artifactId>org.apache.servicemix.nmr.spring</artifactId>
-            <version>${project.version}</version>
+            <version>${servicemix.nmr.version}</version>
         </dependency>
         
         <!-- ServiceMix NMR Document -->
         <dependency>
             <groupId>org.apache.servicemix.document</groupId>
             <artifactId>org.apache.servicemix.document</artifactId>
-            <version>${project.version}</version>
+            <version>${servicemix.nmr.version}</version>
         </dependency>
         
         <!-- ServiceMix NMR JBI -->
         <dependency>
             <groupId>org.apache.servicemix.jbi</groupId>
             <artifactId>org.apache.servicemix.jbi.commands</artifactId>
-            <version>${project.version}</version>
+            <version>${servicemix.nmr.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.jbi</groupId>
             <artifactId>org.apache.servicemix.jbi.deployer</artifactId>
-            <version>${project.version}</version>
+            <version>${servicemix.nmr.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.jbi</groupId>
             <artifactId>org.apache.servicemix.jbi.osgi</artifactId>
-            <version>${project.version}</version>
+            <version>${servicemix.nmr.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.jbi</groupId>
             <artifactId>org.apache.servicemix.jbi.runtime</artifactId>
-            <version>${project.version}</version>
+            <version>${servicemix.nmr.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.jbi</groupId>
             <artifactId>org.apache.servicemix.jbi.runtime</artifactId>
-            <version>${project.version}</version>
+            <version>${servicemix.nmr.version}</version>
             <type>test-jar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.jbi.cluster</groupId>
             <artifactId>org.apache.servicemix.jbi.cluster.engine</artifactId>
-            <version>${project.version}</version>
+            <version>${servicemix.nmr.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.jbi.cluster</groupId>
             <artifactId>org.apache.servicemix.jbi.cluster.requestor</artifactId>
-            <version>${project.version}</version>
+            <version>${servicemix.nmr.version}</version>
         </dependency>
         
         <!-- ServiceMix NMR Naming -->
         <dependency>
             <groupId>org.apache.servicemix.naming</groupId>
             <artifactId>org.apache.servicemix.naming</artifactId>
-            <version>${project.version}</version>
+            <version>${servicemix.nmr.version}</version>
         </dependency>
         
         <!-- ServiceMix Components and Resources -->
@@ -398,42 +392,17 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
+            <artifactId>geronimo-servlet_3.0_spec</artifactId>
             <version>${geronimo-servlet.version}</version>
         </dependency>
                 
         <!-- Spring -->
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-aop</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-beans</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-core</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
             <artifactId>spring-jms</artifactId>
             <version>${spring.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-        
+
         <!-- Spring OSGi -->
         <dependency>
             <groupId>org.springframework.osgi</groupId>
@@ -470,75 +439,19 @@
              </exclusions>
         </dependency>
         
-        <!-- PAX Exam -->
-        <dependency>
-            <groupId>org.ops4j.pax.exam</groupId>
-            <artifactId>pax-exam</artifactId>
-            <version>${pax.exam.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.ops4j.pax.exam</groupId>
-            <artifactId>pax-exam-container-default</artifactId>
-            <version>${pax.exam.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.ops4j.pax.exam</groupId>
-            <artifactId>pax-exam-junit</artifactId>
-            <version>${pax.exam.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.ops4j.pax.exam</groupId>
-            <artifactId>pax-exam-junit-extender-impl</artifactId>
-            <version>${pax.exam.version}</version>
-        </dependency>
-        
-        <!-- PAX Logging -->
-        <dependency>
-            <groupId>org.ops4j.pax.logging</groupId>
-            <artifactId>pax-logging-api</artifactId>
-            <version>${pax.logging.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.ops4j.pax.logging</groupId>
-            <artifactId>pax-logging-service</artifactId>
-            <version>${pax.logging.version}</version>
-        </dependency>
-        
-        <!-- PAX URL -->
-        <dependency>
-            <groupId>org.ops4j.pax.url</groupId>
-            <artifactId>pax-url-mvn</artifactId>
-            <version>${pax.url.version}</version>
-        </dependency>
-        
         <!-- Bundles -->
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.ant</artifactId>
-            <version>${ant.bundle.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.aopalliance</artifactId>
             <version>${aopalliance.bundle.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.asm</artifactId>
-            <version>${asm.bundle.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.cglib</artifactId>
             <version>${cglib.bundle.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.junit</artifactId>
-            <version>${junit.bundle.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.wsdl4j</artifactId>
             <version>${wsdl4j.bundle.version}</version>
         </dependency>
@@ -560,11 +473,6 @@
             <version>${junit.version}</version>
         </dependency>
         <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>${log4j.version}</version>
-        </dependency>
-        <dependency>
             <groupId>org.apache.derby</groupId>
             <artifactId>derby</artifactId>
             <version>${derby.version}</version>
@@ -575,16 +483,6 @@
             <version>${lucene.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.mina</groupId>
-            <artifactId>mina-core</artifactId>
-            <version>${mina.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.sshd</groupId>
-            <artifactId>sshd-core</artifactId>
-            <version>${sshd.version}</version>
-        </dependency>
-        <dependency>
             <groupId>org.apache.xbean</groupId>
             <artifactId>xbean-classloader</artifactId>
             <version>${xbean.version}</version>
@@ -606,11 +504,6 @@
         </dependency>
         <dependency>
             <groupId>org.easymock</groupId>
-            <artifactId>easymock</artifactId>
-            <version>${easymock.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.easymock</groupId>
             <artifactId>easymockclassextension</artifactId>
             <version>${easymock.version}</version>
         </dependency>
@@ -631,11 +524,6 @@
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>${slf4j.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
             <version>${slf4j.version}</version>
         </dependency>

Modified: servicemix/smx4/nmr/trunk/testing/support/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/testing/support/pom.xml?rev=1085396&r1=1085395&r2=1085396&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/testing/support/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/testing/support/pom.xml Fri Mar 25 14:27:41 2011
@@ -39,6 +39,10 @@
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.aries.proxy</groupId>
+            <artifactId>org.apache.aries.proxy</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>org.osgi</groupId>
@@ -104,7 +108,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
+            <artifactId>geronimo-servlet_3.0_spec</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>

Modified: servicemix/smx4/nmr/trunk/testing/support/src/main/java/org/apache/servicemix/platform/testing/support/AbstractIntegrationTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/testing/support/src/main/java/org/apache/servicemix/platform/testing/support/AbstractIntegrationTest.java?rev=1085396&r1=1085395&r2=1085396&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/testing/support/src/main/java/org/apache/servicemix/platform/testing/support/AbstractIntegrationTest.java
(original)
+++ servicemix/smx4/nmr/trunk/testing/support/src/main/java/org/apache/servicemix/platform/testing/support/AbstractIntegrationTest.java
Fri Mar 25 14:27:41 2011
@@ -16,14 +16,6 @@
  */
 package org.apache.servicemix.platform.testing.support;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-
 import org.apache.log4j.PropertyConfigurator;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.ServiceEvent;
@@ -37,6 +29,13 @@ import org.springframework.osgi.util.Osg
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+
 
 public class AbstractIntegrationTest extends AbstractConfigurableBundleCreatorTests {
 
@@ -91,7 +90,7 @@ public class AbstractIntegrationTest ext
 
     protected String[] getTestFrameworkBundlesNames() {
         return new String[] {
-            getBundle("org.apache.geronimo.specs", "geronimo-servlet_2.5_spec"),
+            getBundle("org.apache.geronimo.specs", "geronimo-servlet_3.0_spec"),
             getBundle("org.osgi", "org.osgi.core"),
             getBundle("org.osgi", "org.osgi.compendium"),
             getBundle("org.apache.felix", "org.apache.felix.configadmin"),

Modified: servicemix/smx4/nmr/trunk/testing/support/src/main/resources/org/apache/servicemix/platform/testing/support/config.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/testing/support/src/main/resources/org/apache/servicemix/platform/testing/support/config.properties?rev=1085396&r1=1085395&r2=1085396&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/testing/support/src/main/resources/org/apache/servicemix/platform/testing/support/config.properties
(original)
+++ servicemix/smx4/nmr/trunk/testing/support/src/main/resources/org/apache/servicemix/platform/testing/support/config.properties
Fri Mar 25 14:27:41 2011
@@ -26,7 +26,7 @@ org.osgi.framework.system.packages=org.o
  org.osgi.service.startlevel; version=1.1.0, \
  org.osgi.service.url; version=1.0.0, \
  org.apache.servicemix.platfrom.main.spi; version=1.0.0, \
- org.osgi.util.tracker; version=1.3.3, \
+ org.osgi.util.tracker; version=1.4.0, \
  ${jre-${java.specification.version}}
 org.osgi.framework.bootdelegation=sun.*,com.sun.management*
 # To enable the use of the startup.properties file to control the start level:



Mime
View raw message