Author: gnodet
Date: Thu Mar 29 10:28:39 2007
New Revision: 523775
URL: http://svn.apache.org/viewvc?view=rev&rev=523775
Log:
SM-903: Switch to java 5
Modified:
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-file/src/main/java/org/apache/servicemix/file/FilePollerEndpoint.java
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-ftp/src/main/java/org/apache/servicemix/ftp/FtpPollerEndpoint.java
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-truezip/src/main/java/org/apache/servicemix/truezip/TrueZipPollerEndpoint.java
Modified:
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-file/src/main/java/org/apache/servicemix/file/FilePollerEndpoint.java
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-file/src/main/java/org/apache/servicemix/file/FilePollerEndpoint.java?view=diff&rev=523775&r1=523774&r2=523775
==============================================================================
---
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-file/src/main/java/org/apache/servicemix/file/FilePollerEndpoint.java
(original)
+++
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-file/src/main/java/org/apache/servicemix/file/FilePollerEndpoint.java
Thu Mar 29 10:28:39 2007
@@ -38,7 +38,7 @@
import org.apache.servicemix.locks.LockManager;
import org.apache.servicemix.locks.impl.SimpleLockManager;
-import edu.emory.mathcs.backport.java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.Lock;
/**
* A polling endpoint which looks for a file or files in a directory
Modified:
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-ftp/src/main/java/org/apache/servicemix/ftp/FtpPollerEndpoint.java
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-ftp/src/main/java/org/apache/servicemix/ftp/FtpPollerEndpoint.java?view=diff&rev=523775&r1=523774&r2=523775
==============================================================================
---
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-ftp/src/main/java/org/apache/servicemix/ftp/FtpPollerEndpoint.java
(original)
+++
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-ftp/src/main/java/org/apache/servicemix/ftp/FtpPollerEndpoint.java
Thu Mar 29 10:28:39 2007
@@ -22,6 +22,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.net.URI;
+import java.util.concurrent.locks.Lock;
import javax.jbi.JBIException;
import javax.jbi.management.DeploymentException;
@@ -41,8 +42,6 @@
import org.apache.servicemix.components.util.FileMarshaler;
import org.apache.servicemix.locks.LockManager;
import org.apache.servicemix.locks.impl.SimpleLockManager;
-
-import edu.emory.mathcs.backport.java.util.concurrent.locks.Lock;
/**
* A polling endpoint which looks for a file or files in a directory
Modified:
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-truezip/src/main/java/org/apache/servicemix/truezip/TrueZipPollerEndpoint.java
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-truezip/src/main/java/org/apache/servicemix/truezip/TrueZipPollerEndpoint.java?view=diff&rev=523775&r1=523774&r2=523775
==============================================================================
---
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-truezip/src/main/java/org/apache/servicemix/truezip/TrueZipPollerEndpoint.java
(original)
+++
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-truezip/src/main/java/org/apache/servicemix/truezip/TrueZipPollerEndpoint.java
Thu Mar 29 10:28:39 2007
@@ -16,17 +16,11 @@
*/
package org.apache.servicemix.truezip;
-// import java.io.BufferedInputStream;
-// import java.io.File;
-// import java.io.FileFilter;
-// import java.io.FileInputStream;
-// import java.io.IOException;
-// import java.io.InputStream;
-
import java.io.BufferedInputStream;
import java.io.FileFilter;
import java.io.IOException;
import java.io.InputStream;
+import java.util.concurrent.locks.Lock;
import javax.jbi.management.DeploymentException;
import javax.jbi.messaging.InOnly;
@@ -45,7 +39,6 @@
import de.schlichtherle.io.File;
import de.schlichtherle.io.FileInputStream;
-import edu.emory.mathcs.backport.java.util.concurrent.locks.Lock;
/**
* A polling endpoint which looks for a file or files in a directory and sends
