servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ccust...@apache.org
Subject svn commit: r801483 - in /servicemix/sandbox/karaf/features: ./ activemq/activemq-commands/ activemq/activemq-commands/src/main/java/org/apache/servicemix/kernel/gshell/activemq/ assembly/ branding/ camel/camel-features/ examples/itests/tests/ examples...
Date Thu, 06 Aug 2009 00:59:50 GMT
Author: ccustine
Date: Thu Aug  6 00:59:50 2009
New Revision: 801483

URL: http://svn.apache.org/viewvc?rev=801483&view=rev
Log:
Patch from SMX4-332 for review

Modified:
    servicemix/sandbox/karaf/features/activemq/activemq-commands/pom.xml
    servicemix/sandbox/karaf/features/activemq/activemq-commands/src/main/java/org/apache/servicemix/kernel/gshell/activemq/AdministrationCommand.java
    servicemix/sandbox/karaf/features/activemq/activemq-commands/src/main/java/org/apache/servicemix/kernel/gshell/activemq/CreateBrokerCommand.java
    servicemix/sandbox/karaf/features/activemq/activemq-commands/src/main/java/org/apache/servicemix/kernel/gshell/activemq/DestroyBrokerCommand.java
    servicemix/sandbox/karaf/features/assembly/pom.xml
    servicemix/sandbox/karaf/features/branding/pom.xml
    servicemix/sandbox/karaf/features/camel/camel-features/pom.xml
    servicemix/sandbox/karaf/features/examples/itests/tests/pom.xml
    servicemix/sandbox/karaf/features/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java
    servicemix/sandbox/karaf/features/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
    servicemix/sandbox/karaf/features/examples/itests/tests/src/test/resources/org/apache/servicemix/MANIFEST.MF
    servicemix/sandbox/karaf/features/pom.xml
    servicemix/sandbox/karaf/features/war/deployer/pom.xml
    servicemix/sandbox/karaf/features/war/deployer/src/main/java/org/apache/servicemix/war/deployer/WarDeploymentListener.java

Modified: servicemix/sandbox/karaf/features/activemq/activemq-commands/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/sandbox/karaf/features/activemq/activemq-commands/pom.xml?rev=801483&r1=801482&r2=801483&view=diff
==============================================================================
--- servicemix/sandbox/karaf/features/activemq/activemq-commands/pom.xml (original)
+++ servicemix/sandbox/karaf/features/activemq/activemq-commands/pom.xml Thu Aug  6 00:59:50
2009
@@ -39,9 +39,9 @@
 
     <dependencies>
       <dependency>
-        <groupId>org.apache.servicemix.kernel.gshell</groupId>
-        <artifactId>org.apache.servicemix.kernel.gshell.core</artifactId>
-        <version>${servicemix.kernel.version}</version>
+        <groupId>org.apache.felix.karaf.gshell</groupId>
+        <artifactId>org.apache.felix.karaf.gshell.console</artifactId>
+        <version>${felix.karaf.version}</version>
       </dependency>
 
         <dependency>
@@ -78,13 +78,19 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.apache.servicemix.kernel.gshell.activemq;version=${project.version};-split-package:=merge-first</Export-Package>
+                        <Export-Package>org.apache.felix.karaf.gshell.activemq;version=${project.version};-split-package:=merge-first</Export-Package>
                         <Import-Package>
                           org.apache.geronimo.gshell.wisdom.command,
-                          org.apache.servicemix.kernel.gshell.core,
                           org.apache.geronimo.gshell.wisdom.registry,
+                          org.apache.felix.gogo.commands,
                           *
                         </Import-Package>
+                        <!--Import-Package>
+                          org.apache.geronimo.gshell.wisdom.command,
+                          org.apache.felix.karaf.gshell.core,
+                          org.apache.geronimo.gshell.wisdom.registry,
+                          *
+                        </Import-Package-->
                         <Private-Package>!*</Private-Package>
                         <Spring-Context>*;publish-context:=false;create-asynchronously:=false</Spring-Context>
                     </instructions>

Modified: servicemix/sandbox/karaf/features/activemq/activemq-commands/src/main/java/org/apache/servicemix/kernel/gshell/activemq/AdministrationCommand.java
URL: http://svn.apache.org/viewvc/servicemix/sandbox/karaf/features/activemq/activemq-commands/src/main/java/org/apache/servicemix/kernel/gshell/activemq/AdministrationCommand.java?rev=801483&r1=801482&r2=801483&view=diff
==============================================================================
--- servicemix/sandbox/karaf/features/activemq/activemq-commands/src/main/java/org/apache/servicemix/kernel/gshell/activemq/AdministrationCommand.java
(original)
+++ servicemix/sandbox/karaf/features/activemq/activemq-commands/src/main/java/org/apache/servicemix/kernel/gshell/activemq/AdministrationCommand.java
Thu Aug  6 00:59:50 2009
@@ -23,9 +23,8 @@
 import org.apache.activemq.console.command.Command;
 import org.apache.activemq.console.formatter.CommandShellOutputFormatter;
 import org.apache.activemq.console.CommandContext;
-import org.apache.geronimo.gshell.clp.Argument;
-import org.apache.geronimo.gshell.command.Arguments;
-import org.apache.servicemix.kernel.gshell.core.OsgiCommandSupport;
+import org.apache.felix.gogo.commands.Argument;
+import org.apache.felix.karaf.gshell.console.OsgiCommandSupport;
 
 /**
  * @version $Rev$ $Date$
@@ -38,10 +37,10 @@
     private Collection<String> arguments = null;
 
   protected Object doExecute() throws Exception {
-    final String[] args = Arguments.toStringArray(arguments.toArray());
+    final String[] args = toStringArray(arguments.toArray());
 
     CommandContext context2 = new CommandContext();
-    context2.setFormatter(new CommandShellOutputFormatter(io.outputStream));
+    context2.setFormatter(new CommandShellOutputFormatter(System.out));
     Command currentCommand = command.getClass().newInstance();
 
     try {
@@ -81,4 +80,12 @@
     public void setCommand(Command command) {
         this.command = command;
     }
+
+    public static String[] toStringArray(Object args[]) {
+        String strings[] = new String[args.length];
+        for(int i = 0; i < args.length; i++) {
+            strings[i] = String.valueOf(args[i]);
+        }
+        return strings;
+    }
 }

Modified: servicemix/sandbox/karaf/features/activemq/activemq-commands/src/main/java/org/apache/servicemix/kernel/gshell/activemq/CreateBrokerCommand.java
URL: http://svn.apache.org/viewvc/servicemix/sandbox/karaf/features/activemq/activemq-commands/src/main/java/org/apache/servicemix/kernel/gshell/activemq/CreateBrokerCommand.java?rev=801483&r1=801482&r2=801483&view=diff
==============================================================================
--- servicemix/sandbox/karaf/features/activemq/activemq-commands/src/main/java/org/apache/servicemix/kernel/gshell/activemq/CreateBrokerCommand.java
(original)
+++ servicemix/sandbox/karaf/features/activemq/activemq-commands/src/main/java/org/apache/servicemix/kernel/gshell/activemq/CreateBrokerCommand.java
Thu Aug  6 00:59:50 2009
@@ -26,8 +26,8 @@
 import java.util.Map;
 import java.util.Scanner;
 
-import org.apache.geronimo.gshell.clp.Option;
-import org.apache.servicemix.kernel.gshell.core.OsgiCommandSupport;
+import org.apache.felix.gogo.commands.Option;
+import org.apache.felix.karaf.gshell.console.OsgiCommandSupport;
 
 /**
  * @version $Rev$ $Date$
@@ -41,7 +41,7 @@
     /*
      * (non-Javadoc)
      * @see
-     * org.apache.servicemix.kernel.gshell.core.OsgiCommandSupport#doExecute()
+     * org.apache.felix.karaf.gshell.console.OsgiCommandSupport#doExecute()
      */
     protected Object doExecute() throws Exception {
 
@@ -57,11 +57,11 @@
             File configFile = new File(deploy, name + "-broker.xml");
             copyFilteredResourceTo(configFile, "broker.xml", props);
 
-            io.out.println("");
-            io.out.println("Default ActiveMQ Broker (" + name + ") configuration file created
at: "
+            System.out.println("");
+            System.out.println("Default ActiveMQ Broker (" + name + ") configuration file
created at: "
                            + configFile.getPath());
-            io.out.println("Please review the configuration and modify to suite your needs.
 ");
-            io.out.println("");
+            System.out.println("Please review the configuration and modify to suite your
needs.  ");
+            System.out.println("");
 
         } catch (Exception e) {
             e.printStackTrace();
@@ -74,7 +74,7 @@
     private void copyFilteredResourceTo(File outFile, String resource, HashMap<String,
String> props)
         throws Exception {
         if (!outFile.exists()) {
-            io.out.println("Creating file: @|green " + outFile.getPath() + "|");
+            System.out.println("Creating file: @|green " + outFile.getPath() + "|");
             InputStream is = CreateBrokerCommand.class.getResourceAsStream(resource);
             try {
                 // Read it line at a time so that we can use the platform line
@@ -94,7 +94,7 @@
                 safeClose(is);
             }
         } else {
-            io.out.println("@|red File allready exists|. Move it out of the way if you want
it re-created: "
+            System.out.println("@|red File allready exists|. Move it out of the way if you
want it re-created: "
                            + outFile.getPath() + "");
         }
     }
@@ -131,7 +131,7 @@
 
     private void mkdir(File file) {
         if (!file.exists()) {
-            io.out.println("Creating missing directory: @|green " + file.getPath() + "|");
+            System.out.println("Creating missing directory: @|green " + file.getPath() +
"|");
             file.mkdirs();
         }
     }

Modified: servicemix/sandbox/karaf/features/activemq/activemq-commands/src/main/java/org/apache/servicemix/kernel/gshell/activemq/DestroyBrokerCommand.java
URL: http://svn.apache.org/viewvc/servicemix/sandbox/karaf/features/activemq/activemq-commands/src/main/java/org/apache/servicemix/kernel/gshell/activemq/DestroyBrokerCommand.java?rev=801483&r1=801482&r2=801483&view=diff
==============================================================================
--- servicemix/sandbox/karaf/features/activemq/activemq-commands/src/main/java/org/apache/servicemix/kernel/gshell/activemq/DestroyBrokerCommand.java
(original)
+++ servicemix/sandbox/karaf/features/activemq/activemq-commands/src/main/java/org/apache/servicemix/kernel/gshell/activemq/DestroyBrokerCommand.java
Thu Aug  6 00:59:50 2009
@@ -18,8 +18,8 @@
 
 import java.io.File;
 
-import org.apache.geronimo.gshell.clp.Option;
-import org.apache.servicemix.kernel.gshell.core.OsgiCommandSupport;
+import org.apache.felix.gogo.commands.Option;
+import org.apache.felix.karaf.gshell.console.OsgiCommandSupport;
 
 /**
  * @version $Rev$ $Date$
@@ -40,10 +40,10 @@
 
             configFile.delete();
 
-            io.out.println("");
-            io.out.println("Default ActiveMQ Broker (" + name + ") configuration file created
at: "
+            System.out.println("");
+            System.out.println("Default ActiveMQ Broker (" + name + ") configuration file
created at: "
                            + configFile.getPath() + " removed.");
-            io.out.println("");
+            System.out.println("");
 
         } catch (Exception e) {
             e.printStackTrace();

Modified: servicemix/sandbox/karaf/features/assembly/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/sandbox/karaf/features/assembly/pom.xml?rev=801483&r1=801482&r2=801483&view=diff
==============================================================================
--- servicemix/sandbox/karaf/features/assembly/pom.xml (original)
+++ servicemix/sandbox/karaf/features/assembly/pom.xml Thu Aug  6 00:59:50 2009
@@ -34,11 +34,11 @@
     <name>Apache ServiceMix :: Assembly</name>
 
     <dependencies>
-        <!-- making sure all kernel dependencies are in our local Maven repo -->
+        <!-- making sure all karaf dependencies are in our local Maven repo -->
         <dependency>
-            <groupId>org.apache.servicemix.kernel</groupId>
-            <artifactId>apache-servicemix-kernel</artifactId>
-            <version>${servicemix.kernel.version}</version>
+            <groupId>org.apache.felix.karaf</groupId>
+            <artifactId>apache-felix-karaf</artifactId>
+            <version>${felix.karaf.version}</version>
             <type>zip</type>
             <exclusions>
 	            <exclusion>
@@ -48,9 +48,9 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.apache.servicemix.kernel</groupId>
-            <artifactId>apache-servicemix-kernel</artifactId>
-            <version>${servicemix.kernel.version}</version>
+            <groupId>org.apache.felix.karaf</groupId>
+            <artifactId>apache-felix-karaf</artifactId>
+            <version>${felix.karaf.version}</version>
             <type>tar.gz</type>
         </dependency>
         <!-- let's grab all the NMR dependencies as well -->
@@ -939,9 +939,9 @@
                         <configuration>
                             <artifactItems>
                                 <artifactItem>
-                                    <groupId>org.apache.servicemix.kernel</groupId>
-                                    <artifactId>apache-servicemix-kernel</artifactId>
-                                    <version>${servicemix.kernel.version}</version>
+                                    <groupId>org.apache.felix.karaf</groupId>
+                                    <artifactId>apache-felix-karaf</artifactId>
+                                    <version>${felix.karaf.version}</version>
                                     <type>tar.gz</type>
                                     <outputDirectory>target/dependencies/unix</outputDirectory>
                                 </artifactItem>
@@ -964,9 +964,9 @@
                         <configuration>
                             <artifactItems>
                                 <artifactItem>
-                                    <groupId>org.apache.servicemix.kernel</groupId>
-                                    <artifactId>apache-servicemix-kernel</artifactId>
-                                    <version>${servicemix.kernel.version}</version>
+                                    <groupId>org.apache.felix.karaf</groupId>
+                                    <artifactId>apache-felix-karaf</artifactId>
+                                    <version>${felix.karaf.version}</version>
                                     <type>zip</type>
                                     <outputDirectory>target/dependencies/win</outputDirectory>
                                 </artifactItem>

Modified: servicemix/sandbox/karaf/features/branding/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/sandbox/karaf/features/branding/pom.xml?rev=801483&r1=801482&r2=801483&view=diff
==============================================================================
--- servicemix/sandbox/karaf/features/branding/pom.xml (original)
+++ servicemix/sandbox/karaf/features/branding/pom.xml Thu Aug  6 00:59:50 2009
@@ -52,7 +52,7 @@
                         <Import-Package>*</Import-Package>
                         <Private-Package>!*</Private-Package>
                         <Export-Package>
-                            org.apache.servicemix.kernel.version        
+                            org.apache.felix.karaf.version        
                         </Export-Package>
                         <Spring-Context>*;publish-context:=false</Spring-Context>
                     </instructions>

Modified: servicemix/sandbox/karaf/features/camel/camel-features/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/sandbox/karaf/features/camel/camel-features/pom.xml?rev=801483&r1=801482&r2=801483&view=diff
==============================================================================
--- servicemix/sandbox/karaf/features/camel/camel-features/pom.xml (original)
+++ servicemix/sandbox/karaf/features/camel/camel-features/pom.xml Thu Aug  6 00:59:50 2009
@@ -92,7 +92,7 @@
                 <goal>generate-features-xml</goal>
               </goals>
               <configuration>
-                <kernelVersion>${servicemix.kernel.version}</kernelVersion>
+                <kernelVersion>${felix.karaf.version}</kernelVersion>
                 <bundles>target/classes/bundles.properties</bundles>
               </configuration>
             </execution>

Modified: servicemix/sandbox/karaf/features/examples/itests/tests/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/sandbox/karaf/features/examples/itests/tests/pom.xml?rev=801483&r1=801482&r2=801483&view=diff
==============================================================================
--- servicemix/sandbox/karaf/features/examples/itests/tests/pom.xml (original)
+++ servicemix/sandbox/karaf/features/examples/itests/tests/pom.xml Thu Aug  6 00:59:50 2009
@@ -33,33 +33,16 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.servicemix.kernel</groupId>
-            <artifactId>org.apache.servicemix.kernel.main</artifactId>
-            <version>${servicemix.kernel.version}</version>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.felix</groupId>
-                    <artifactId>org.osgi.core</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.kernel.testing</groupId>
-            <artifactId>org.apache.servicemix.kernel.testing.support</artifactId>
-            <version>${servicemix.kernel.version}</version>
+            <groupId>org.apache.servicemix.platform.testing</groupId>
+            <artifactId>org.apache.servicemix.platform.testing.support</artifactId>
+            <version>${servicemix.nmr.version}</version>
+            <!--version>1.1.0-SNAPSHOT</version-->
             <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.felix</groupId>
-                    <artifactId>org.osgi.core</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.apache.servicemix.kernel</groupId>
-            <artifactId>org.apache.servicemix.kernel.filemonitor</artifactId>
-            <version>${servicemix.kernel.version}</version>
+            <groupId>org.apache.felix.karaf.deployer</groupId>
+            <artifactId>org.apache.felix.karaf.deployer.filemonitor</artifactId>
+            <version>${felix.karaf.version}</version>
             <scope>test</scope>
             <exclusions>
                 <exclusion>

Modified: servicemix/sandbox/karaf/features/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java
URL: http://svn.apache.org/viewvc/servicemix/sandbox/karaf/features/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java?rev=801483&r1=801482&r2=801483&view=diff
==============================================================================
--- servicemix/sandbox/karaf/features/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java
(original)
+++ servicemix/sandbox/karaf/features/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java
Thu Aug  6 00:59:50 2009
@@ -32,13 +32,13 @@
 import org.apache.cxf.Bus;
 import org.apache.servicemix.examples.cxf.HelloWorld;
 import org.apache.servicemix.jbi.jaxp.StringSource;
-import org.apache.servicemix.kernel.testing.support.AbstractIntegrationTest;
 import org.apache.servicemix.nmr.api.Channel;
 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.Status;
+import org.apache.servicemix.platform.testing.support.AbstractIntegrationTest;
 import org.springframework.osgi.test.platform.OsgiPlatform;
 import org.osgi.framework.Constants;
 import org.osgi.framework.ServiceReference;

Modified: servicemix/sandbox/karaf/features/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
URL: http://svn.apache.org/viewvc/servicemix/sandbox/karaf/features/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java?rev=801483&r1=801482&r2=801483&view=diff
==============================================================================
--- servicemix/sandbox/karaf/features/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
(original)
+++ servicemix/sandbox/karaf/features/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
Thu Aug  6 00:59:50 2009
@@ -32,13 +32,13 @@
 import org.apache.cxf.Bus;
 import org.apache.servicemix.examples.cxf.HelloWorld;
 import org.apache.servicemix.jbi.jaxp.StringSource;
-import org.apache.servicemix.kernel.testing.support.AbstractIntegrationTest;
 import org.apache.servicemix.nmr.api.Channel;
 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.Status;
+import org.apache.servicemix.platform.testing.support.AbstractIntegrationTest;
 import org.springframework.osgi.test.platform.OsgiPlatform;
 import org.osgi.framework.Constants;
 import org.osgi.framework.ServiceReference;

Modified: servicemix/sandbox/karaf/features/examples/itests/tests/src/test/resources/org/apache/servicemix/MANIFEST.MF
URL: http://svn.apache.org/viewvc/servicemix/sandbox/karaf/features/examples/itests/tests/src/test/resources/org/apache/servicemix/MANIFEST.MF?rev=801483&r1=801482&r2=801483&view=diff
==============================================================================
--- servicemix/sandbox/karaf/features/examples/itests/tests/src/test/resources/org/apache/servicemix/MANIFEST.MF
(original)
+++ servicemix/sandbox/karaf/features/examples/itests/tests/src/test/resources/org/apache/servicemix/MANIFEST.MF
Thu Aug  6 00:59:50 2009
@@ -28,5 +28,5 @@
  org.springframework.osgi.test.platform,
  org.apache.servicemix.nmr.api,
  org.apache.servicemix.nmr.core,
- org.apache.servicemix.kernel.testing.support,
+ org.apache.servicemix.platform.testing.support,
  org.springframework.osgi.util

Modified: servicemix/sandbox/karaf/features/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/sandbox/karaf/features/pom.xml?rev=801483&r1=801482&r2=801483&view=diff
==============================================================================
--- servicemix/sandbox/karaf/features/pom.xml (original)
+++ servicemix/sandbox/karaf/features/pom.xml Thu Aug  6 00:59:50 2009
@@ -173,8 +173,8 @@
       <servicemix3.version>3.3</servicemix3.version>
       <servicemix-utils.version>1.1.0</servicemix-utils.version>
       <servicemix.legal.version>1.0</servicemix.legal.version>
-      <servicemix.kernel.version>1.1.0</servicemix.kernel.version>
-      <servicemix.nmr.version>1.0.0</servicemix.nmr.version>
+      <felix.karaf.version>1.2.0-SNAPSHOT</felix.karaf.version>
+      <servicemix.nmr.version>1.1.0-SNAPSHOT</servicemix.nmr.version>
       <servicemix.specs.version>1.3.0</servicemix.specs.version>
 
       <servicemix-shared-version>2009.01</servicemix-shared-version>

Modified: servicemix/sandbox/karaf/features/war/deployer/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/sandbox/karaf/features/war/deployer/pom.xml?rev=801483&r1=801482&r2=801483&view=diff
==============================================================================
--- servicemix/sandbox/karaf/features/war/deployer/pom.xml (original)
+++ servicemix/sandbox/karaf/features/war/deployer/pom.xml Thu Aug  6 00:59:50 2009
@@ -35,9 +35,9 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.servicemix.kernel</groupId>
-            <artifactId>org.apache.servicemix.kernel.filemonitor</artifactId>
-            <version>${servicemix.kernel.version}</version>
+            <groupId>org.apache.felix.karaf.deployer</groupId>
+            <artifactId>org.apache.felix.karaf.deployer.filemonitor</artifactId>
+            <version>${felix.karaf.version}</version>
         </dependency>
         <dependency>
             <groupId>commons-logging</groupId>

Modified: servicemix/sandbox/karaf/features/war/deployer/src/main/java/org/apache/servicemix/war/deployer/WarDeploymentListener.java
URL: http://svn.apache.org/viewvc/servicemix/sandbox/karaf/features/war/deployer/src/main/java/org/apache/servicemix/war/deployer/WarDeploymentListener.java?rev=801483&r1=801482&r2=801483&view=diff
==============================================================================
--- servicemix/sandbox/karaf/features/war/deployer/src/main/java/org/apache/servicemix/war/deployer/WarDeploymentListener.java
(original)
+++ servicemix/sandbox/karaf/features/war/deployer/src/main/java/org/apache/servicemix/war/deployer/WarDeploymentListener.java
Thu Aug  6 00:59:50 2009
@@ -26,7 +26,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.servicemix.kernel.filemonitor.DeploymentListener;
+import org.apache.felix.karaf.deployer.filemonitor.DeploymentListener;
 
 
 public class WarDeploymentListener implements DeploymentListener {



Mime
View raw message