Author: gertv
Date: Fri Jul 20 05:09:38 2007
New Revision: 557978
URL: http://svn.apache.org/viewvc?view=rev&rev=557978
Log:
Fix for SM-932: PMD/CheckStyle for servicemix-truezip
Modified:
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-truezip/pom.xml
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-truezip/src/main/java/org/apache/servicemix/truezip/TrueZipComponent.java
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-truezip/src/main/java/org/apache/servicemix/truezip/TrueZipPollerEndpoint.java
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-truezip/src/main/java/org/apache/servicemix/truezip/TrueZipSenderEndpoint.java
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-truezip/src/test/java/org/apache/servicemix/truezip/DynamicEndpointTest.java
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-truezip/src/test/java/org/apache/servicemix/truezip/PollDirectoryTest.java
Modified:
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-truezip/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-truezip/pom.xml?view=diff&rev=557978&r1=557977&r2=557978
==============================================================================
---
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-truezip/pom.xml
(original)
+++
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-truezip/pom.xml
Fri Jul 20 05:09:38 2007
@@ -103,8 +103,6 @@
<excludes>
<!-- exclude abstract test cases -->
<exclude>**/Abstract*.*</exclude>
-
- <exclude>**/PollDirectoryTest*</exclude>
</excludes>
</configuration>
</plugin>
Modified:
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-truezip/src/main/java/org/apache/servicemix/truezip/TrueZipComponent.java
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-truezip/src/main/java/org/apache/servicemix/truezip/TrueZipComponent.java?view=diff&rev=557978&r1=557977&r2=557978
==============================================================================
---
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-truezip/src/main/java/org/apache/servicemix/truezip/TrueZipComponent.java
(original)
+++
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-truezip/src/main/java/org/apache/servicemix/truezip/TrueZipComponent.java
Fri Jul 20 05:09:38 2007
@@ -23,12 +23,13 @@
import javax.jbi.servicedesc.ServiceEndpoint;
+import de.schlichtherle.io.File;
+
import org.apache.servicemix.common.DefaultComponent;
import org.apache.servicemix.common.Endpoint;
import org.apache.servicemix.jbi.util.IntrospectionSupport;
import org.apache.servicemix.jbi.util.URISupport;
-import de.schlichtherle.io.File;
/**
* A file based component
@@ -53,7 +54,7 @@
}
protected Class[] getEndpointClasses() {
- return new Class[] { TrueZipPollerEndpoint.class,
TrueZipSenderEndpoint.class };
+ return new Class[] {TrueZipPollerEndpoint.class,
TrueZipSenderEndpoint.class};
}
protected Endpoint getResolvedEPR(ServiceEndpoint ep) throws Exception {
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=557978&r1=557977&r2=557978
==============================================================================
---
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
Fri Jul 20 05:09:38 2007
@@ -29,6 +29,9 @@
import javax.jbi.servicedesc.ServiceEndpoint;
import javax.xml.namespace.QName;
+import de.schlichtherle.io.File;
+import de.schlichtherle.io.FileInputStream;
+
import org.apache.servicemix.common.DefaultComponent;
import org.apache.servicemix.common.ServiceUnit;
import org.apache.servicemix.common.endpoints.PollingEndpoint;
@@ -37,9 +40,6 @@
import org.apache.servicemix.locks.LockManager;
import org.apache.servicemix.locks.impl.SimpleLockManager;
-import de.schlichtherle.io.File;
-import de.schlichtherle.io.FileInputStream;
-
/**
* A polling endpoint which looks for a file or files in a directory and sends
* the files into the JBI bus as messages, deleting the files by default when
@@ -224,10 +224,8 @@
}
if (aFile.exists()) {
processFile(aFile);
- if (isDeleteFile()) {
- if (!aFile.delete()) {
- throw new IOException("Could not delete file " +
aFile);
- }
+ if (isDeleteFile() && !aFile.delete()) {
+ throw new IOException("Could not delete file " + aFile);
}
}
} catch (Exception e) {
Modified:
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-truezip/src/main/java/org/apache/servicemix/truezip/TrueZipSenderEndpoint.java
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-truezip/src/main/java/org/apache/servicemix/truezip/TrueZipSenderEndpoint.java?view=diff&rev=557978&r1=557977&r2=557978
==============================================================================
---
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-truezip/src/main/java/org/apache/servicemix/truezip/TrueZipSenderEndpoint.java
(original)
+++
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-truezip/src/main/java/org/apache/servicemix/truezip/TrueZipSenderEndpoint.java
Fri Jul 20 05:09:38 2007
@@ -25,13 +25,13 @@
import javax.jbi.messaging.NormalizedMessage;
import javax.jbi.servicedesc.ServiceEndpoint;
+import de.schlichtherle.io.File;
+import de.schlichtherle.io.FileOutputStream;
+
import org.apache.servicemix.common.endpoints.ProviderEndpoint;
import org.apache.servicemix.components.util.DefaultFileMarshaler;
import org.apache.servicemix.components.util.FileMarshaler;
import org.apache.servicemix.id.IdGenerator;
-
-import de.schlichtherle.io.File;
-import de.schlichtherle.io.FileOutputStream;
/**
* An endpoint which receives a message and writes the content to a file.
Modified:
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-truezip/src/test/java/org/apache/servicemix/truezip/DynamicEndpointTest.java
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-truezip/src/test/java/org/apache/servicemix/truezip/DynamicEndpointTest.java?view=diff&rev=557978&r1=557977&r2=557978
==============================================================================
---
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-truezip/src/test/java/org/apache/servicemix/truezip/DynamicEndpointTest.java
(original)
+++
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-truezip/src/test/java/org/apache/servicemix/truezip/DynamicEndpointTest.java
Fri Jul 20 05:09:38 2007
@@ -1,5 +1,4 @@
-/**
- *
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -7,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -22,6 +21,8 @@
import javax.jbi.messaging.MessageExchange;
import javax.jbi.servicedesc.ServiceEndpoint;
+import de.schlichtherle.io.File;
+
import org.apache.servicemix.client.DefaultServiceMixClient;
import org.apache.servicemix.client.ServiceMixClient;
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
@@ -29,8 +30,6 @@
import org.apache.servicemix.tck.SpringTestSupport;
import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
import org.springframework.context.support.AbstractXmlApplicationContext;
-
-import de.schlichtherle.io.File;
public class DynamicEndpointTest extends SpringTestSupport {
protected String dynamicURI =
"truezip://target/dynamicEndpoint.zip?truezip.tempFilePrefix=dynamicEp-";
Modified:
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-truezip/src/test/java/org/apache/servicemix/truezip/PollDirectoryTest.java
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-truezip/src/test/java/org/apache/servicemix/truezip/PollDirectoryTest.java?view=diff&rev=557978&r1=557977&r2=557978
==============================================================================
---
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-truezip/src/test/java/org/apache/servicemix/truezip/PollDirectoryTest.java
(original)
+++
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-truezip/src/test/java/org/apache/servicemix/truezip/PollDirectoryTest.java
Fri Jul 20 05:09:38 2007
@@ -1,5 +1,4 @@
-/**
- *
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -7,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -34,7 +33,7 @@
public class PollDirectoryTest extends SpringTestSupport {
- private int NUMBER = 10;
+ private static final int NUMBER = 10;
public void testSendToWriterSoItCanBePolled() throws Exception {
// now lets make a request on this endpoint
