Permalink
Browse files

Default to JDK5

  • Loading branch information...
1 parent dd05b81 commit da68a524120f1ed56fd760f794dcd2ee2774d13c @jcaddel committed Jan 19, 2011
@@ -1,9 +1,16 @@
-#Thu Jun 17 09:14:23 MST 2010
-encoding//src/test/java=UTF-8
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+#Tue Jan 18 18:10:39 MST 2011
eclipse.preferences.version=1
-encoding//src/test/resources=UTF-8
-org.eclipse.jdt.core.compiler.source=1.6
encoding//src/main/java=UTF-8
encoding//src/main/resources=UTF-8
-org.eclipse.jdt.core.compiler.compliance=1.6
+encoding//src/test/java=UTF-8
+encoding//src/test/resources=UTF-8
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
View
@@ -3,7 +3,7 @@
<parent>
<groupId>org.kuali</groupId>
<artifactId>kuali</artifactId>
- <version>69</version>
+ <version>70</version>
</parent>
<groupId>org.kuali.maven</groupId>
<artifactId>kuali-wagon-s3</artifactId>
@@ -59,7 +59,6 @@ protected AbstractWagon(final boolean supportsDirectoryCopy) {
this.supportsDirectoryCopy = supportsDirectoryCopy;
}
- @Override
public final void addSessionListener(final SessionListener listener) {
if (listener.getClass().equals(Debug.class)) {
// This is a junky listener that spews things to System.out in an ugly way
@@ -72,17 +71,14 @@ protected final SessionListenerSupport getSessionListeners() {
return sessionListeners;
}
- @Override
public final boolean hasSessionListener(final SessionListener listener) {
return sessionListeners.hasListener(listener);
}
- @Override
public final void removeSessionListener(final SessionListener listener) {
sessionListeners.removeListener(listener);
}
- @Override
public final void addTransferListener(final TransferListener listener) {
transferListeners.addListener(listener);
}
@@ -91,50 +87,42 @@ protected final TransferListenerSupport getTransferListeners() {
return transferListeners;
}
- @Override
public final boolean hasTransferListener(final TransferListener listener) {
return transferListeners.hasListener(listener);
}
- @Override
public final void removeTransferListener(final TransferListener listener) {
transferListeners.removeListener(listener);
}
- @Override
public final Repository getRepository() {
return repository;
}
- @Override
public final boolean isInteractive() {
return interactive;
}
- @Override
public final void setInteractive(final boolean interactive) {
this.interactive = interactive;
}
- @Override
public final void connect(final Repository source) throws ConnectionException, AuthenticationException {
doConnect(source, null, null);
}
- @Override
public final void connect(final Repository source, final ProxyInfo proxyInfo) throws ConnectionException,
AuthenticationException {
connect(source, null, proxyInfo);
}
- @Override
- public final void connect(final Repository source, final AuthenticationInfo authenticationInfo) throws ConnectionException,
- AuthenticationException {
+ public final void connect(final Repository source, final AuthenticationInfo authenticationInfo)
+ throws ConnectionException, AuthenticationException {
doConnect(source, authenticationInfo, null);
}
- protected void doConnect(final Repository source, final AuthenticationInfo authenticationInfo, final ProxyInfo proxyInfo)
- throws ConnectionException, AuthenticationException {
+ protected void doConnect(final Repository source, final AuthenticationInfo authenticationInfo,
+ final ProxyInfo proxyInfo) throws ConnectionException, AuthenticationException {
repository = source;
sessionListeners.fireSessionOpening();
try {
@@ -153,13 +141,11 @@ protected void doConnect(final Repository source, final AuthenticationInfo authe
sessionListeners.fireSessionOpened();
}
- @Override
- public final void connect(final Repository source, final AuthenticationInfo authenticationInfo, final ProxyInfo proxyInfo)
- throws ConnectionException, AuthenticationException {
+ public final void connect(final Repository source, final AuthenticationInfo authenticationInfo,
+ final ProxyInfo proxyInfo) throws ConnectionException, AuthenticationException {
doConnect(source, authenticationInfo, proxyInfo);
}
- @Override
public final void disconnect() throws ConnectionException {
sessionListeners.fireSessionDisconnecting();
try {
@@ -175,7 +161,6 @@ public final void disconnect() throws ConnectionException {
sessionListeners.fireSessionDisconnected();
}
- @Override
public final void get(final String resourceName, final File destination) throws TransferFailedException,
ResourceDoesNotExistException, AuthorizationException {
Resource resource = new Resource(resourceName);
@@ -198,7 +183,6 @@ public final void get(final String resourceName, final File destination) throws
}
}
- @Override
@SuppressWarnings("rawtypes")
public final List getFileList(final String destinationDirectory) throws TransferFailedException,
ResourceDoesNotExistException, AuthorizationException {
@@ -216,7 +200,6 @@ public final List getFileList(final String destinationDirectory) throws Transfer
}
}
- @Override
public final boolean getIfNewer(final String resourceName, final File destination, final long timestamp)
throws TransferFailedException, ResourceDoesNotExistException, AuthorizationException {
Resource resource = new Resource(resourceName);
@@ -239,12 +222,10 @@ public final boolean getIfNewer(final String resourceName, final File destinatio
}
}
- @Override
public final void openConnection() throws ConnectionException, AuthenticationException {
// Nothing to do here (never called by the wagon manager)
}
- @Override
public final void put(final File source, final String destination) throws TransferFailedException,
ResourceDoesNotExistException, AuthorizationException {
Resource resource = new Resource(destination);
@@ -273,9 +254,8 @@ public final void put(final File source, final String destination) throws Transf
* system as the key to the file in the bucket. The S3 bucket does not contain a separate key for the directory
* itself.
*/
- @Override
- public final void putDirectory(final File sourceDirectory, final String destinationDirectory) throws TransferFailedException,
- ResourceDoesNotExistException, AuthorizationException {
+ public final void putDirectory(final File sourceDirectory, final String destinationDirectory)
+ throws TransferFailedException, ResourceDoesNotExistException, AuthorizationException {
// Cycle through all the files in this directory
for (File f : sourceDirectory.listFiles()) {
// We hit a directory
@@ -289,8 +269,8 @@ public final void putDirectory(final File sourceDirectory, final String destinat
}
}
- @Override
- public final boolean resourceExists(final String resourceName) throws TransferFailedException, AuthorizationException {
+ public final boolean resourceExists(final String resourceName) throws TransferFailedException,
+ AuthorizationException {
try {
return doesRemoteResourceExist(resourceName);
} catch (TransferFailedException e) {
@@ -303,7 +283,6 @@ public final boolean resourceExists(final String resourceName) throws TransferFa
}
}
- @Override
public final boolean supportsDirectoryCopy() {
return supportsDirectoryCopy;
}
@@ -395,24 +374,20 @@ protected abstract void getResource(String resourceName, File destination, Trans
*/
protected abstract void putResource(File source, String destination, TransferProgress progress) throws Exception;
- @Override
- public void connect(final Repository source, final AuthenticationInfo authenticationInfo, final ProxyInfoProvider proxyInfoProvider)
- throws ConnectionException, AuthenticationException {
+ public void connect(final Repository source, final AuthenticationInfo authenticationInfo,
+ final ProxyInfoProvider proxyInfoProvider) throws ConnectionException, AuthenticationException {
doConnect(source, authenticationInfo, null);
}
- @Override
public void connect(final Repository source, final ProxyInfoProvider proxyInfoProvider) throws ConnectionException,
AuthenticationException {
doConnect(source, null, null);
}
- @Override
public int getTimeout() {
return this.timeout;
}
- @Override
public void setTimeout(final int timeoutValue) {
this.timeout = timeoutValue;
}
@@ -21,27 +21,23 @@
SimpleFormatter formatter = new SimpleFormatter();
SessionTracker sessionTracker = new SessionTracker();
- @Override
public void transferCompleted(final TransferEvent transferEvent) {
TransferTracker tt = sessionTracker.getCurrentTransfer();
tt.setCompleted(System.currentTimeMillis());
// System.out.println();
// log(tt.toString());
}
- @Override
public void transferError(final TransferEvent transferEvent) {
log.error("Transfer error: " + transferEvent.getException(), transferEvent.getException());
}
- @Override
public void transferInitiated(final TransferEvent transferEvent) {
sessionTracker.addTransfer(new TransferTracker());
TransferTracker tt = sessionTracker.getCurrentTransfer();
tt.setInitiated(System.currentTimeMillis());
}
- @Override
public void transferProgress(final TransferEvent transferEvent, final byte[] buffer, final int length) {
// No bytes were actually read
if (length == -1) {
@@ -52,7 +48,6 @@ public void transferProgress(final TransferEvent transferEvent, final byte[] buf
tt.setByteCount(byteCount);
}
- @Override
public void transferStarted(final TransferEvent transferEvent) {
TransferTracker tt = sessionTracker.getCurrentTransfer();
tt.setStarted(System.currentTimeMillis());
@@ -80,15 +75,13 @@ protected String getNormalizedURI(final String uri) {
/**
* @see SessionListener#sessionOpening(SessionEvent)
*/
- @Override
public void sessionOpening(final SessionEvent sessionEvent) {
sessionTracker.addSessionEvent(sessionEvent);
}
/**
* @see SessionListener#sessionOpened(SessionEvent)
*/
- @Override
public void sessionOpened(final SessionEvent sessionEvent) {
sessionTracker.addSessionEvent(sessionEvent);
sessionTracker.setOpened(System.currentTimeMillis());
@@ -98,7 +91,6 @@ public void sessionOpened(final SessionEvent sessionEvent) {
/**
* @see SessionListener#sessionDisconnecting(SessionEvent)
*/
- @Override
public void sessionDisconnecting(final SessionEvent sessionEvent) {
sessionTracker.addSessionEvent(sessionEvent);
sessionTracker.setDisconnecting(System.currentTimeMillis());
@@ -108,7 +100,6 @@ public void sessionDisconnecting(final SessionEvent sessionEvent) {
/**
* @see SessionListener#sessionDisconnected(SessionEvent)
*/
- @Override
public void sessionDisconnected(final SessionEvent sessionEvent) {
sessionTracker.addSessionEvent(sessionEvent);
// log(sessionEvent.getWagon().getRepository().getUrl() + " - Disconnected");
@@ -133,7 +124,6 @@ public void sessionDisconnected(final SessionEvent sessionEvent) {
/**
* @see SessionListener#sessionConnectionRefused(SessionEvent)
*/
- @Override
public void sessionConnectionRefused(final SessionEvent sessionEvent) {
sessionTracker.addSessionEvent(sessionEvent);
log.warn(sessionEvent.getWagon().getRepository().getUrl() + " - Connection refused");
@@ -142,7 +132,6 @@ public void sessionConnectionRefused(final SessionEvent sessionEvent) {
/**
* @see SessionListener#sessionLoggedIn(SessionEvent)
*/
- @Override
public void sessionLoggedIn(final SessionEvent sessionEvent) {
sessionTracker.addSessionEvent(sessionEvent);
sessionTracker.setLoggedIn(System.currentTimeMillis());
@@ -152,20 +141,17 @@ public void sessionLoggedIn(final SessionEvent sessionEvent) {
/**
* @see SessionListener#sessionLoggedOff(SessionEvent)
*/
- @Override
public void sessionLoggedOff(final SessionEvent sessionEvent) {
sessionTracker.addSessionEvent(sessionEvent);
sessionTracker.setLoggedOff(System.currentTimeMillis());
log.info("Logged off - " + sessionEvent.getWagon().getRepository().getHost());
}
- @Override
public void sessionError(final SessionEvent sessionEvent) {
sessionTracker.addSessionEvent(sessionEvent);
log.error("Session error: " + sessionEvent.getException(), sessionEvent.getException());
}
- @Override
public void debug(final String message) {
log.debug(message);
}

0 comments on commit da68a52

Please sign in to comment.