diff --git a/spring-integration-smb/build.gradle b/spring-integration-smb/build.gradle index 645de4c..d94da70 100644 --- a/spring-integration-smb/build.gradle +++ b/spring-integration-smb/build.gradle @@ -22,8 +22,8 @@ repositories { } // ensure JDK 5 compatibility (GRADLE-18; INT-1578) -sourceCompatibility=1.5 -targetCompatibility=1.5 +sourceCompatibility=1.6 +targetCompatibility=1.6 ext { aspectjVersion = '1.6.8' @@ -33,12 +33,12 @@ ext { groovyVersion = '1.8.5' jacksonVersion = '1.9.2' javaxActivationVersion = '1.1.1' - junitVersion = '4.8.2' + junitVersion = '4.10' log4jVersion = '1.2.12' mockitoVersion = '1.9.0' - springVersion = '3.1.1.RELEASE' - springIntegrationVersion = '2.1.2.RELEASE' + springVersion = '3.1.3.RELEASE' + springIntegrationVersion = '2.2.0.RC2' } @@ -293,5 +293,5 @@ task dist(dependsOn: assemble) { task wrapper(type: Wrapper) { description = 'Generates gradlew[.bat] scripts' - gradleVersion = '1.0' + gradleVersion = '1.2' } diff --git a/spring-integration-smb/gradle/wrapper/gradle-wrapper.jar b/spring-integration-smb/gradle/wrapper/gradle-wrapper.jar index 81dcde6..7b359d7 100644 Binary files a/spring-integration-smb/gradle/wrapper/gradle-wrapper.jar and b/spring-integration-smb/gradle/wrapper/gradle-wrapper.jar differ diff --git a/spring-integration-smb/gradle/wrapper/gradle-wrapper.properties b/spring-integration-smb/gradle/wrapper/gradle-wrapper.properties index 082409d..b05f438 100644 --- a/spring-integration-smb/gradle/wrapper/gradle-wrapper.properties +++ b/spring-integration-smb/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Aug 17 01:34:28 EDT 2012 +#Thu Nov 08 10:44:45 EST 2012 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.0-bin.zip +distributionUrl=http\://services.gradle.org/distributions/gradle-1.2-bin.zip diff --git a/spring-integration-smb/gradlew b/spring-integration-smb/gradlew index cf12650..3851082 100755 --- a/spring-integration-smb/gradlew +++ b/spring-integration-smb/gradlew @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################## ## @@ -101,7 +101,7 @@ if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then warn "Could not set maximum file descriptor limit: $MAX_FD" fi else - warn "Could not query businessSystem maximum file descriptor limit: $MAX_FD_LIMIT" + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" fi fi diff --git a/spring-integration-smb/src/main/java/org/springframework/integration/smb/session/SmbSession.java b/spring-integration-smb/src/main/java/org/springframework/integration/smb/session/SmbSession.java index 372a344..963ea4c 100644 --- a/spring-integration-smb/src/main/java/org/springframework/integration/smb/session/SmbSession.java +++ b/spring-integration-smb/src/main/java/org/springframework/integration/smb/session/SmbSession.java @@ -35,17 +35,17 @@ import org.springframework.util.FileCopyUtils; import org.springframework.util.StringUtils; /** - * Implementation of the {@link Session} interface for Server Message Block (SMB) - * also known as Common Internet File System (CIFS). The Samba project set out to + * Implementation of the {@link Session} interface for Server Message Block (SMB) + * also known as Common Internet File System (CIFS). The Samba project set out to * create non-Windows implementations of SMB. Often Samba is thus used synonymously to SMB. - * - * SMB is an application-layer network protocol that manages shared access to files, printers + * + * SMB is an application-layer network protocol that manages shared access to files, printers * and other networked resources. * - * See Server Message Block + * See Server Message Block * for more details. * - * Inspired by the sprint-integration-ftp implementation done by Mark Fisher and Oleg Zhurakousky. + * Inspired by the sprint-integration-ftp implementation done by Mark Fisher and Oleg Zhurakousky. * * @author Markus Spann * @author Mark Fisher @@ -74,7 +74,7 @@ public class SmbSession implements Session { * @param _shareAndDir server root SMB directory * @param _replaceFile replace existing files if true * @param _useTempFile make use temporary files when writing - * @throws IOException in case of I/O errors + * @throws IOException in case of I/O errors */ SmbSession(String _host, int _port, String _domain, String _user, String _password, String _shareAndDir, boolean _replaceFile, boolean _useTempFile) throws IOException { this(new SmbShare(new SmbConfig(_host, _port, _domain, _user, _password, _shareAndDir))); @@ -179,8 +179,8 @@ public class SmbSession implements Session { } /** - * Writes contents of the specified {@link InputStream} to the remote resource - * specified by path. Remote directories are created implicitely as required. + * Writes contents of the specified {@link InputStream} to the remote resource + * specified by path. Remote directories are created implicitely as required. * @param _inputStream input stream * @param _path remote path (of a file) to write to * @throws IOException on error conditions returned by a CIFS server @@ -241,7 +241,7 @@ public class SmbSession implements Session { /** * Creates the specified remote path if not yet exists. * If the specified resource is a file rather than a path, creates all directories leading - * to that file. + * to that file. * @param _path remote path to create * @return always true (error states are express by exceptions) * @throws IOException on error conditions returned by a CIFS server @@ -362,7 +362,7 @@ public class SmbSession implements Session { } /** - * Convenience method to write the specified input stream to a remote path and return + * Convenience method to write the specified input stream to a remote path and return * the path as an SMB file object. * @param _inputStream input stream * @param _path remote path (of a file) to write to @@ -380,7 +380,7 @@ public class SmbSession implements Session { * @param _path remote path * @param _isDirectory Boolean object to indicate the path is a directory, may be null * @return SmbFile object for path - * @throws IOException in case of I/O errors + * @throws IOException in case of I/O errors */ private SmbFile createSmbFileObject(String _path, Boolean _isDirectory) throws IOException { String path = StringUtils.cleanPath(_path); @@ -389,7 +389,7 @@ public class SmbSession implements Session { } SmbFile smbFile = new SmbFile(smbShare, path); - + boolean appendFileSeparator = !path.endsWith(FILE_SEPARATOR); if (appendFileSeparator) { try { @@ -428,10 +428,10 @@ public class SmbSession implements Session { static void configureJcifs() { // TODO jcifs.Config.setProperty("jcifs.smb.client.useExtendedSecurity", "false"); // TODO jcifs.Config.setProperty("jcifs.smb.client.disablePlainTextPasswords", "false"); - + // set JCIFS SMB client library' log level unless already configured by system property final String sysPropLogLevel = "jcifs.util.loglevel"; - + if (jcifs.Config.getProperty(sysPropLogLevel) == null) { // set log level according to this class' logger's log level. Log log = LogFactory.getLog(SmbSession.class); @@ -445,4 +445,9 @@ public class SmbSession implements Session { } } + @Override + public String[] listNames(String path) throws IOException { + throw new UnsupportedOperationException("Not implemented yet"); + } + }