diff --git a/org.springframework.integration.file/src/main/java/org/springframework/integration/file/config/FileInboundChannelAdapterParser.java b/org.springframework.integration.file/src/main/java/org/springframework/integration/file/config/FileInboundChannelAdapterParser.java
index 04bf84d83f..f85cd5537a 100644
--- a/org.springframework.integration.file/src/main/java/org/springframework/integration/file/config/FileInboundChannelAdapterParser.java
+++ b/org.springframework.integration.file/src/main/java/org/springframework/integration/file/config/FileInboundChannelAdapterParser.java
@@ -1,13 +1,35 @@
+/*
+ * Copyright 2002-2008 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (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
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.springframework.integration.file.config;
 
+import org.w3c.dom.Element;
+
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.BeanDefinitionReaderUtils;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.integration.config.AbstractPollingInboundChannelAdapterParser;
 import org.springframework.integration.file.PollableFileSource;
 import org.springframework.util.StringUtils;
-import org.w3c.dom.Element;
 
+/**
+ * Parser for the <inbound-channel-adapter> element of the 'file' namespace.
+ * 
+ * @author Iwein Fuld
+ */
 public class FileInboundChannelAdapterParser extends AbstractPollingInboundChannelAdapterParser {
 
 	@Override
diff --git a/org.springframework.integration.file/src/main/java/org/springframework/integration/file/config/FileNamespaceHandler.java b/org.springframework.integration.file/src/main/java/org/springframework/integration/file/config/FileNamespaceHandler.java
index 4f043c3c44..23a813e391 100644
--- a/org.springframework.integration.file/src/main/java/org/springframework/integration/file/config/FileNamespaceHandler.java
+++ b/org.springframework.integration.file/src/main/java/org/springframework/integration/file/config/FileNamespaceHandler.java
@@ -1,7 +1,28 @@
+/*
+ * Copyright 2002-2008 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (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
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.springframework.integration.file.config;
 
 import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
 
+/**
+ * Namespace handler for Spring Integration's 'file' namespace.
+ * 
+ * @author Iwein Fuld
+ */
 public class FileNamespaceHandler extends NamespaceHandlerSupport {
 
 	public void init() {
diff --git a/org.springframework.integration.file/src/main/java/org/springframework/integration/file/config/spring-integration-file-1.0.xsd b/org.springframework.integration.file/src/main/java/org/springframework/integration/file/config/spring-integration-file-1.0.xsd
index 21df8bb4ef..f65546df9e 100644
--- a/org.springframework.integration.file/src/main/java/org/springframework/integration/file/config/spring-integration-file-1.0.xsd
+++ b/org.springframework.integration.file/src/main/java/org/springframework/integration/file/config/spring-integration-file-1.0.xsd
@@ -14,14 +14,14 @@
 
 	<xsd:annotation>
 		<xsd:documentation><![CDATA[
-	Defines the configuration elements for Spring Integration Stream-based Channel Adapters.
+	Defines the configuration elements for Spring Integration File Adapters.
 		]]></xsd:documentation>
 	</xsd:annotation>
 
 	<xsd:element name="inbound-channel-adapter">
 		<xsd:annotation>
 			<xsd:documentation>
-	Configures a source that reads from stdin (System.in).
+	Configures an inbound Channel Adapter that polls a directory.
 			</xsd:documentation>
 		</xsd:annotation>
 		<xsd:complexType>
diff --git a/org.springframework.integration.file/src/test/java/org/springframework/integration/file/CompositeFileFilterTest.java b/org.springframework.integration.file/src/test/java/org/springframework/integration/file/CompositeFileFilterTest.java
index 4b690944b3..4640ebc7bc 100644
--- a/org.springframework.integration.file/src/test/java/org/springframework/integration/file/CompositeFileFilterTest.java
+++ b/org.springframework.integration.file/src/test/java/org/springframework/integration/file/CompositeFileFilterTest.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.integration.file;
 
 import static org.easymock.EasyMock.expect;
diff --git a/org.springframework.integration.file/src/test/java/org/springframework/integration/file/TestFileFilter.java b/org.springframework.integration.file/src/test/java/org/springframework/integration/file/TestFileFilter.java
index 196a1bb49c..41b1ec106b 100644
--- a/org.springframework.integration.file/src/test/java/org/springframework/integration/file/TestFileFilter.java
+++ b/org.springframework.integration.file/src/test/java/org/springframework/integration/file/TestFileFilter.java
@@ -1,9 +1,28 @@
+/*
+ * Copyright 2002-2008 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (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
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.springframework.integration.file;
 
 import java.io.File;
 import java.util.Arrays;
 import java.util.List;
 
+/**
+ * @author Iwein Fuld
+ */
 public class TestFileFilter implements FileListFilter {
 
 	public List<File> filterFiles(File[] files) {
diff --git a/org.springframework.integration.file/src/test/java/org/springframework/integration/file/config/FileInboundChannelAdapterParserTests.java b/org.springframework.integration.file/src/test/java/org/springframework/integration/file/config/FileInboundChannelAdapterParserTests.java
index d55abb6bc3..72b4bf77b7 100644
--- a/org.springframework.integration.file/src/test/java/org/springframework/integration/file/config/FileInboundChannelAdapterParserTests.java
+++ b/org.springframework.integration.file/src/test/java/org/springframework/integration/file/config/FileInboundChannelAdapterParserTests.java
@@ -33,7 +33,7 @@ import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 /**
- * @author Mark Fisher
+ * @author Iwein Fuld
  */
 @ContextConfiguration
 @RunWith(SpringJUnit4ClassRunner.class)
@@ -58,7 +58,7 @@ public class FileInboundChannelAdapterParserTests {
 	
 	@Test
 	public void inputDirectory() {	
-		assertEquals("'inputDir' should be set",System.getProperty("java.io.tmpdir"), ((File) accessor.getPropertyValue("inputDirectory")).getPath());
+		assertEquals("'inputDirectory' should be set",System.getProperty("java.io.tmpdir"), ((File) accessor.getPropertyValue("inputDirectory")).getPath());
 	}
 	
 	@Test