commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dmei...@apache.org
Subject svn commit: r775615 [1/2] - in /commons/sandbox/resources/trunk: ./ conf/ src/assembly/ src/main/java/org/apache/commons/resources/ src/main/java/org/apache/commons/resources/impl/ src/main/java/org/apache/commons/resources/util/ src/site/ src/site/res...
Date Sun, 17 May 2009 09:45:59 GMT
Author: dmeikle
Date: Sun May 17 09:45:58 2009
New Revision: 775615

URL: http://svn.apache.org/viewvc?rev=775615&view=rev
Log:
Added Maven2 build and updated license headers.

Added:
    commons/sandbox/resources/trunk/pom.xml
    commons/sandbox/resources/trunk/src/assembly/
    commons/sandbox/resources/trunk/src/assembly/bin.xml
    commons/sandbox/resources/trunk/src/assembly/src.xml
    commons/sandbox/resources/trunk/src/site/
    commons/sandbox/resources/trunk/src/site/resources/
    commons/sandbox/resources/trunk/src/site/resources/images/
    commons/sandbox/resources/trunk/src/site/resources/images/logo.png   (with props)
    commons/sandbox/resources/trunk/src/site/site.xml
Modified:
    commons/sandbox/resources/trunk/conf/LicenseCheckStyle.txt
    commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/Message.java
    commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/MessageList.java
    commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/Messages.java
    commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/Resources.java
    commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/ResourcesException.java
    commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/ResourcesFactory.java
    commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/ResourcesKeyException.java
    commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/impl/BasicMessage.java
    commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/impl/BasicMessageList.java
    commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/impl/CollectionResourcesBase.java
    commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/impl/DatabaseBasicMessage.java
    commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/impl/JDBCResources.java
    commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/impl/JDBCResourcesFactory.java
    commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/impl/PropertyResources.java
    commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/impl/PropertyResourcesFactory.java
    commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/impl/ResourceBundleResources.java
    commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/impl/ResourceBundleResourcesFactory.java
    commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/impl/ResourcesBase.java
    commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/impl/ResourcesFactoryBase.java
    commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/impl/WebappPropertyResources.java
    commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/impl/WebappPropertyResourcesFactory.java
    commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/impl/WebappResourcesFactoryBase.java
    commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/impl/WebappXMLResources.java
    commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/impl/WebappXMLResourcesFactory.java
    commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/impl/XMLResources.java
    commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/impl/XMLResourcesFactory.java
    commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/util/IteratorEnumeration.java
    commons/sandbox/resources/trunk/src/test/java/org/apache/commons/resources/MessagesTestCase.java
    commons/sandbox/resources/trunk/src/test/java/org/apache/commons/resources/impl/BasicMessageListTestCase.java
    commons/sandbox/resources/trunk/src/test/java/org/apache/commons/resources/impl/BasicMessageTestCase.java
    commons/sandbox/resources/trunk/src/test/java/org/apache/commons/resources/impl/CollResources.java
    commons/sandbox/resources/trunk/src/test/java/org/apache/commons/resources/impl/CollResourcesFactory.java
    commons/sandbox/resources/trunk/src/test/java/org/apache/commons/resources/impl/CollectionResourcesBaseTestCase.java
    commons/sandbox/resources/trunk/src/test/java/org/apache/commons/resources/impl/JDBCResourcesTestCase.java
    commons/sandbox/resources/trunk/src/test/java/org/apache/commons/resources/impl/PropertyResourcesTestCase.java
    commons/sandbox/resources/trunk/src/test/java/org/apache/commons/resources/impl/ResourceBundleResourcesFactoryTestCase.java
    commons/sandbox/resources/trunk/src/test/java/org/apache/commons/resources/impl/ResourceBundleResourcesTestCase.java
    commons/sandbox/resources/trunk/src/test/java/org/apache/commons/resources/impl/ResourcesBaseMethodTestCase.java
    commons/sandbox/resources/trunk/src/test/java/org/apache/commons/resources/impl/ResourcesBaseTestCase.java
    commons/sandbox/resources/trunk/src/test/java/org/apache/commons/resources/impl/ResourcesFactoryBaseTestCase.java
    commons/sandbox/resources/trunk/src/test/java/org/apache/commons/resources/impl/TestResources.java
    commons/sandbox/resources/trunk/src/test/java/org/apache/commons/resources/impl/TestResourcesFactory.java
    commons/sandbox/resources/trunk/src/test/java/org/apache/commons/resources/impl/XMLResourcesTestCase.java
    commons/sandbox/resources/trunk/src/test/java/org/apache/commons/resources/util/IteratorEnumerationTestCase.java

Modified: commons/sandbox/resources/trunk/conf/LicenseCheckStyle.txt
URL: http://svn.apache.org/viewvc/commons/sandbox/resources/trunk/conf/LicenseCheckStyle.txt?rev=775615&r1=775614&r2=775615&view=diff
==============================================================================
--- commons/sandbox/resources/trunk/conf/LicenseCheckStyle.txt (original)
+++ commons/sandbox/resources/trunk/conf/LicenseCheckStyle.txt Sun May 17 09:45:58 2009
@@ -1,22 +1,16 @@
 /*
- * $Id$
- * $Revision$
- * $Date$
- *
- * ====================================================================
- *
- *  Copyright 2003-2004 The Apache Software Foundation
- *
- *  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
+ * 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.
+ * The ASF licenses this file to You 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.
- *
+ * 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.
  */

Added: commons/sandbox/resources/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/sandbox/resources/trunk/pom.xml?rev=775615&view=auto
==============================================================================
--- commons/sandbox/resources/trunk/pom.xml (added)
+++ commons/sandbox/resources/trunk/pom.xml Sun May 17 09:45:58 2009
@@ -0,0 +1,247 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   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.
+   The ASF licenses this file to You 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.
+-->
+<project
+        xmlns="http://maven.apache.org/POM/4.0.0"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-parent</artifactId>
+        <version>11</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>commons-resources</groupId>
+    <artifactId>commons-resources</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <name>Commons Resources</name>
+
+    <inceptionYear>2001</inceptionYear>
+    <description>
+        Resources is a resources component.
+    </description>
+
+    <url>http://commons.apache.org/resources/</url>
+
+    <issueManagement>
+        <system>jira</system>
+        <url>http://issues.apache.org/jira/</url>
+    </issueManagement>
+
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/commons/dormant/resources/trunk</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/commons/dormant/resources/trunk
+        </developerConnection>
+        <url>http://svn.apache.org/viewvc/commons/dormant/resources/trunk</url>
+    </scm>
+
+    <developers>
+        <developer>
+            <name>Martin Cooper</name>
+            <id>martinc</id>
+            <email>martinc@apache.org</email>
+        </developer>
+        <developer>
+            <name>Robert Burrell Donkin</name>
+            <id>rdonkin</id>
+            <email>rdonkin hat apache.org</email>
+        </developer>
+        <developer>
+            <name>David Graham</name>
+            <id>dgraham</id>
+            <email>dgraham@apache.org</email>
+        </developer>
+        <developer>
+            <name>Craig McClanahan</name>
+            <id>craigmcc</id>
+            <email>craigmcc@apache.org</email>
+        </developer>
+        <developer>
+            <name>James Mitchell</name>
+            <id>jmitchell</id>
+            <email>jmitchell@apache.org</email>
+            <organization>EdgeTech, Inc</organization>
+        </developer>
+        <developer>
+            <name>Niall Pemberton</name>
+            <id>niallp</id>
+            <email>niallp NOSPAM apache.org</email>
+        </developer>
+        <developer>
+            <name>Daniel Rall</name>
+            <id>dlr</id>
+            <email>dlr@apache.org</email>
+        </developer>
+        <developer>
+            <name>Michael Schachter</name>
+            <id>mschachter</id>
+            <email>mschachter@apache.org</email>
+        </developer>
+        <developer>
+            <name>James Strachan</name>
+            <id>jstrachan</id>
+            <email>jstrachan@apache.org</email>
+            <organization>SpiritSoft, Inc.</organization>
+        </developer>
+        <developer>
+            <name>Jason van Zyl</name>
+            <id>jvanzyl</id>
+            <email>jvanzyl@apache.org</email>
+        </developer>
+    </developers>
+
+    <contributors>
+        <contributor>
+            <name>Dominique Plante</name>
+        </contributor>
+    </contributors>
+
+    <dependencies>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>2.3</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-beanutils</groupId>
+            <artifactId>commons-beanutils</artifactId>
+            <version>1.7.0</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-digester</groupId>
+            <artifactId>commons-digester</artifactId>
+            <version>1.6</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.0.4</version>
+        </dependency>
+        <dependency>
+            <groupId>xml-apis</groupId>
+            <artifactId>xml-apis</artifactId>
+            <version>1.0.b2</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>3.8.1</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>hsqldb</groupId>
+            <artifactId>hsqldb</artifactId>
+            <version>1.7.2.2</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <maven.compile.source>1.3</maven.compile.source>
+        <maven.compile.target>1.3</maven.compile.target>
+        <commons.componentid>resources</commons.componentid>
+        <commons.release.version>1.0</commons.release.version>
+        <commons.jira.id>RESOURCES</commons.jira.id>
+        <commons.jira.pid>12310490</commons.jira.pid>
+        <commons.osgi.import>!net.jcip.annotations,*</commons.osgi.import>
+    </properties>
+
+    <build>
+        <sourceDirectory>src/main/java</sourceDirectory>
+        <testSourceDirectory>src/test/java</testSourceDirectory>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <includes>
+                        <include>**/*TestCase.java</include>
+                    </includes>
+                    <excludes/>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <configuration>
+                    <descriptors>
+                        <descriptor>src/assembly/bin.xml</descriptor>
+                        <descriptor>src/assembly/src.xml</descriptor>
+                    </descriptors>
+                    <tarLongFileMode>gnu</tarLongFileMode>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>make-assembly</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>assembly</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-site-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>make-site</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>site</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <reporting>
+        <plugins>
+            <plugin>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <version>2.1</version>
+                <configuration>
+                    <configLocation>conf/ResourcesCheckStyle.xml</configLocation>
+                    <enableRulesSummary>false</enableRulesSummary>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>cobertura-maven-plugin</artifactId>
+                <version>2.2</version>
+            </plugin>
+            <plugin>
+                <artifactId>maven-pmd-plugin</artifactId>
+                <version>2.3</version>
+                <configuration>
+                    <targetJdk>1.3</targetJdk>
+                </configuration>
+                <reportSets>
+                    <reportSet>
+                        <reports>
+                            <report>pmd</report>
+                            <report>cpd</report>
+                        </reports>
+                    </reportSet>
+                </reportSets>
+            </plugin>
+        </plugins>
+    </reporting>
+
+</project>

Added: commons/sandbox/resources/trunk/src/assembly/bin.xml
URL: http://svn.apache.org/viewvc/commons/sandbox/resources/trunk/src/assembly/bin.xml?rev=775615&view=auto
==============================================================================
--- commons/sandbox/resources/trunk/src/assembly/bin.xml (added)
+++ commons/sandbox/resources/trunk/src/assembly/bin.xml Sun May 17 09:45:58 2009
@@ -0,0 +1,43 @@
+<!--
+ 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.
+ The ASF licenses this file to You 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.
+-->
+<assembly>
+    <id>bin</id>
+    <formats>
+        <format>tar.gz</format>
+        <format>zip</format>
+    </formats>
+    <includeSiteDirectory>false</includeSiteDirectory>
+    <fileSets>
+        <fileSet>
+            <includes>
+                <include>LICENSE.txt</include>
+                <include>NOTICE.txt</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>target</directory>
+            <outputDirectory></outputDirectory>
+            <includes>
+                <include>*.jar</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>target/site/apidocs</directory>
+            <outputDirectory>apidocs</outputDirectory>
+        </fileSet>
+    </fileSets>
+</assembly>

Added: commons/sandbox/resources/trunk/src/assembly/src.xml
URL: http://svn.apache.org/viewvc/commons/sandbox/resources/trunk/src/assembly/src.xml?rev=775615&view=auto
==============================================================================
--- commons/sandbox/resources/trunk/src/assembly/src.xml (added)
+++ commons/sandbox/resources/trunk/src/assembly/src.xml Sun May 17 09:45:58 2009
@@ -0,0 +1,40 @@
+<!--
+ 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.
+ The ASF licenses this file to You 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.
+-->
+<assembly>
+    <id>src</id>
+    <formats>
+        <format>tar.gz</format>
+        <format>zip</format>
+    </formats>
+    <baseDirectory>${project.artifactId}-${project.version}-src</baseDirectory>
+    <fileSets>
+        <fileSet>
+            <includes>
+                <include>LICENSE.txt</include>
+                <include>NOTICE.txt</include>
+                <include>pom.xml</include>
+                <include>PROPOSAL.html</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>src</directory>
+        </fileSet>
+        <fileSet>
+            <directory>xdocs</directory>
+        </fileSet>
+    </fileSets>
+</assembly>

Modified: commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/Message.java
URL: http://svn.apache.org/viewvc/commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/Message.java?rev=775615&r1=775614&r2=775615&view=diff
==============================================================================
--- commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/Message.java (original)
+++ commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/Message.java Sun May 17 09:45:58 2009
@@ -1,24 +1,18 @@
 /*
- * $Id$
- * $Revision$
- * $Date$
- *
- * ====================================================================
- *
- *  Copyright 2003-2006 The Apache Software Foundation
- *
- *  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
+ * 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.
+ * The ASF licenses this file to You 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.
- *
+ * 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.apache.commons.resources;
@@ -34,7 +28,7 @@
 public interface Message {
 
     /**
-     * <p>Return the logical name of the {@link org.apache.commons.resources.Resources} 
+     * <p>Return the logical name of the {@link org.apache.commons.resources.Resources}
      * instance this message is associated with.</p>
      *
      * @return The name of the resources instance.

Modified: commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/MessageList.java
URL: http://svn.apache.org/viewvc/commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/MessageList.java?rev=775615&r1=775614&r2=775615&view=diff
==============================================================================
--- commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/MessageList.java (original)
+++ commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/MessageList.java Sun May 17 09:45:58 2009
@@ -1,24 +1,18 @@
 /*
- * $Id$
- * $Revision$
- * $Date$
- *
- * ====================================================================
- *
- *  Copyright 2003-2006 The Apache Software Foundation
- *
- *  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
+ * 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.
+ * The ASF licenses this file to You 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.
- *
+ * 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.apache.commons.resources;
@@ -98,11 +92,11 @@
      * Clear all messages recorded by this object.
      */
     public void clear();
-    
+
     /**
      * Determines if the MessageList's messages have been accessed one or more
-     * times.  Returns <code>true</code> if the <code>get()</code> or 
-     * <code>get(String)</code> methods are called.  
+     * times.  Returns <code>true</code> if the <code>get()</code> or
+     * <code>get(String)</code> methods are called.
      * @return <code>true</code> if the messages have been accessed one or more
      * times.
      */

Modified: commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/Messages.java
URL: http://svn.apache.org/viewvc/commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/Messages.java?rev=775615&r1=775614&r2=775615&view=diff
==============================================================================
--- commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/Messages.java (original)
+++ commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/Messages.java Sun May 17 09:45:58 2009
@@ -1,24 +1,18 @@
 /*
- * $Id$
- * $Revision$
- * $Date$
- *
- * ====================================================================
- *
- *  Copyright 2003-2005 The Apache Software Foundation
- *
- *  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
+ * 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.
+ * The ASF licenses this file to You 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.
- *
+ * 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.apache.commons.resources;
@@ -47,7 +41,7 @@
  * returned.</p>
  */
 public class Messages implements Serializable {
-    
+
 
     // ----------------------------------------------------------- Constructors
 
@@ -344,11 +338,11 @@
         if (factory == null) {
             factory = new ResourceBundleResourcesFactory();
         }
-        
+
         try {
             Resources resources = factory.getResources(name);
             return (new Messages(resources));
-            
+
         } catch (ResourcesException e) {
             return (null);
         }

Modified: commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/Resources.java
URL: http://svn.apache.org/viewvc/commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/Resources.java?rev=775615&r1=775614&r2=775615&view=diff
==============================================================================
--- commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/Resources.java (original)
+++ commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/Resources.java Sun May 17 09:45:58 2009
@@ -1,24 +1,18 @@
 /*
- * $Id$
- * $Revision$
- * $Date$
- *
- * ====================================================================
- *
- *  Copyright 2003-2005 The Apache Software Foundation
- *
- *  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
+ * 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.
+ * The ASF licenses this file to You 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.
- *
+ * 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.apache.commons.resources;
@@ -49,7 +43,7 @@
  * application resources, and other specialized approaches as desired.</p>
  *
  * <p>Different implementations of the {@link Resources} interface may apply
- * different semantics to the use of the <code>locale</code> 
+ * different semantics to the use of the <code>locale</code>
  * attribute used to perform localization.  Consult
  * the documentation for the specific {@link Resources} implementation you
  * are using for the specific details of your implementation.</p>

Modified: commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/ResourcesException.java
URL: http://svn.apache.org/viewvc/commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/ResourcesException.java?rev=775615&r1=775614&r2=775615&view=diff
==============================================================================
--- commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/ResourcesException.java (original)
+++ commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/ResourcesException.java Sun May 17 09:45:58 2009
@@ -1,24 +1,18 @@
 /*
- * $Id$
- * $Revision$
- * $Date$
- *
- * ====================================================================
- *
- *  Copyright 2003-2005 The Apache Software Foundation
- *
- *  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
+ * 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.
+ * The ASF licenses this file to You 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.
- *
+ * 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.apache.commons.resources;

Modified: commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/ResourcesFactory.java
URL: http://svn.apache.org/viewvc/commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/ResourcesFactory.java?rev=775615&r1=775614&r2=775615&view=diff
==============================================================================
--- commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/ResourcesFactory.java (original)
+++ commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/ResourcesFactory.java Sun May 17 09:45:58 2009
@@ -1,24 +1,18 @@
 /*
- * $Id$
- * $Revision$
- * $Date$
- *
- * ====================================================================
- *
- *  Copyright 2003-2005 The Apache Software Foundation
- *
- *  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
+ * 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.
+ * The ASF licenses this file to You 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.
- *
+ * 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.apache.commons.resources;
@@ -26,21 +20,21 @@
 import java.io.Serializable;
 
 /**
- * <a>A {@link org.apache.commons.resources.ResourcesFactory} 
+ * <a>A {@link org.apache.commons.resources.ResourcesFactory}
  * is a factory pattern interface for a
- * class that can create {@link org.apache.commons.resources.Resources} 
+ * class that can create {@link org.apache.commons.resources.Resources}
  * instances based on a logical
  * name that is passed to the factory.  Repeated requests to return a
- * {@link org.apache.commons.resources.Resources} instance with the same 
+ * {@link org.apache.commons.resources.Resources} instance with the same
  * name should return the same
  * {@link org.apache.commons.resources.Resources} instance each time.</p>
  *
- * <p>Implementations of {@link org.apache.commons.resources.ResourcesFactory} 
+ * <p>Implementations of {@link org.apache.commons.resources.ResourcesFactory}
  * <strong>MUST</strong>
  * include a zero-arguments constructor so that instances of the factory
  * can be dynamically created.  Therefore, configuration information
  * above and beyond the configuration String will generally be specified
- * via JavaBeans property setters on the 
+ * via JavaBeans property setters on the
  * {@link org.apache.commons.resources.ResourcesFactory}
  * implementation class.</p>
  *
@@ -54,14 +48,14 @@
  * @see org.apache.commons.resources.impl.XMLResourcesFactory
  */
 public interface ResourcesFactory extends Serializable {
-    
+
 
     // ------------------------------------------------------------- Properties
 
 
     /**
      * <p>Return the <code>returnNull</code> property value that will be
-     * configured on {@link org.apache.commons.resources.Resources} 
+     * configured on {@link org.apache.commons.resources.Resources}
      * instances created by this factory.</p>
      * @return 'true' if null is returned for invalid key values.
      */
@@ -69,8 +63,8 @@
 
 
     /**
-     * <p>Set the <code>returnNull</code> property value that will be configured on 
-     * {@link org.apache.commons.resources.Resources} instances created by this 
+     * <p>Set the <code>returnNull</code> property value that will be configured on
+     * {@link org.apache.commons.resources.Resources} instances created by this
      * factory.</p>
      *
      * @param returnNull The new value to delegate
@@ -82,16 +76,16 @@
 
 
     /**
-     * <p>Create (if necessary) and return a 
+     * <p>Create (if necessary) and return a
      * {@link org.apache.commons.resources.Resources} instance
      * for the specified logical name, with a default configuration.</p>
      *
-     * @param name Logical name of the 
+     * @param name Logical name of the
      * {@link org.apache.commons.resources.Resources} instance to
      *  be returned
      * @return The resources instance.
      *
-     * @exception ResourcesException if a 
+     * @exception ResourcesException if a
      * {@link org.apache.commons.resources.Resources} instance
      *  of the specified logical name cannot be returned.
      */
@@ -99,20 +93,20 @@
 
 
     /**
-     * <p>Create (if necessary) and return a 
+     * <p>Create (if necessary) and return a
      * {@link org.apache.commons.resources.Resources} instance
      * for the specified logical name, with a configuration based on
      * the specified configuration String.</p>
      *
-     * @param name Logical name of the 
+     * @param name Logical name of the
      * {@link org.apache.commons.resources.Resources} instance to be returned
      * @param config Configuration string for this resource (meaning
-     *  is dependent upon the {@link org.apache.commons.resources.ResourcesFactory} 
+     *  is dependent upon the {@link org.apache.commons.resources.ResourcesFactory}
      * implementation being utilized), or <code>null</code> for the default
      *  configuration
      * @return The resources.
      *
-     * @exception ResourcesException if a 
+     * @exception ResourcesException if a
      * {@link org.apache.commons.resources.Resources} instance
      *  of the specified logical name cannot be returned.
      */
@@ -120,7 +114,7 @@
 
 
     /**
-     * <p>Release any internal references to 
+     * <p>Release any internal references to
      * {@link org.apache.commons.resources.Resources} instances
      * that have been returned previously, after calling the
      * <code>destroy()</code> method of each such instance.</p>

Modified: commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/ResourcesKeyException.java
URL: http://svn.apache.org/viewvc/commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/ResourcesKeyException.java?rev=775615&r1=775614&r2=775615&view=diff
==============================================================================
--- commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/ResourcesKeyException.java (original)
+++ commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/ResourcesKeyException.java Sun May 17 09:45:58 2009
@@ -1,24 +1,18 @@
 /*
- * $Id$
- * $Revision$
- * $Date$
- *
- * ====================================================================
- *
- *  Copyright 2003-2005 The Apache Software Foundation
- *
- *  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
+ * 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.
+ * The ASF licenses this file to You 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.
- *
+ * 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.apache.commons.resources;

Modified: commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/impl/BasicMessage.java
URL: http://svn.apache.org/viewvc/commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/impl/BasicMessage.java?rev=775615&r1=775614&r2=775615&view=diff
==============================================================================
--- commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/impl/BasicMessage.java (original)
+++ commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/impl/BasicMessage.java Sun May 17 09:45:58 2009
@@ -1,24 +1,18 @@
 /*
- * $Id$
- * $Revision$
- * $Date$
- *
- * ====================================================================
- *
- *  Copyright 2003-2006 The Apache Software Foundation
- *
- *  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
+ * 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.
+ * The ASF licenses this file to You 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.
- *
+ * 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.apache.commons.resources.impl;
@@ -35,11 +29,11 @@
 public class BasicMessage implements Serializable, Message {
 
     /**
-     * The logical name of the {@link org.apache.commons.resources.Resources} 
+     * The logical name of the {@link org.apache.commons.resources.Resources}
      * instance this message is associated with (optional).
      */
     private String resourcesName;
-    
+
     /**
      * The message key for this message.
      */
@@ -56,7 +50,7 @@
     public BasicMessage() {
         super();
     }
-    
+
     /**
      * Construct a message with no replacement values.
      *
@@ -140,7 +134,7 @@
     }
 
     /**
-     * <p>Return the logical name of the {@link org.apache.commons.resources.Resources} 
+     * <p>Return the logical name of the {@link org.apache.commons.resources.Resources}
      * instance this message is associated with.</p>
      *
      * @return The name of the resources instance.
@@ -150,7 +144,7 @@
     }
 
     /**
-     * <p>Set the logical name of the {@link org.apache.commons.resources.Resources} 
+     * <p>Set the logical name of the {@link org.apache.commons.resources.Resources}
      * instance this message is associated with.</p>
      *
      * @param resourcesName The name of the resources instance.
@@ -165,7 +159,7 @@
     public String getKey() {
         return (this.key);
     }
-    
+
     /**
      * Set the key for the message.
      *
@@ -190,14 +184,14 @@
     }
 
     /**
-     * Returns a String in the format: resourcesName:key[value0, value1, etc]. 
+     * Returns a String in the format: resourcesName:key[value0, value1, etc].
      * @see java.lang.Object#toString()
      */
     public String toString() {
         StringBuffer buff = new StringBuffer();
         if (this.resourcesName != null) {
             buff.append(this.resourcesName);
-            buff.append(":"); 
+            buff.append(":");
         }
         buff.append(this.key);
         buff.append("[");
@@ -212,7 +206,7 @@
                 if (i < this.values.length - 1) {
                     buff.append(", ");
                 }
-                
+
             }
         }
 

Modified: commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/impl/BasicMessageList.java
URL: http://svn.apache.org/viewvc/commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/impl/BasicMessageList.java?rev=775615&r1=775614&r2=775615&view=diff
==============================================================================
--- commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/impl/BasicMessageList.java (original)
+++ commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/impl/BasicMessageList.java Sun May 17 09:45:58 2009
@@ -1,24 +1,18 @@
 /*
- * $Id$
- * $Revision$
- * $Date$
- *
- * ====================================================================
- *
- *  Copyright 2003-2006 The Apache Software Foundation
- *
- *  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
+ * 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.
+ * The ASF licenses this file to You 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.
- *
+ * 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.apache.commons.resources.impl;
@@ -50,7 +44,7 @@
             return ((MessageItem) o1).getOrder() - ((MessageItem) o2).getOrder();
         }
     };
-    
+
     /**
      * Have the messages been retrieved from this object?
      */
@@ -105,7 +99,7 @@
      *
      * @param globalMessageKey The new default global message key
      * @param messages The messages to be initially added to this object.
-     * 
+     *
      */
     public BasicMessageList(String globalMessageKey, MessageList messages) {
         super();
@@ -202,11 +196,11 @@
     public void clear() {
         this.messages.clear();
     }
-    
+
     /**
      * Determines if the MessageList's messages have been accessed one or more
-     * times.  Returns <code>true</code> if the <code>get()</code> or 
-     * <code>get(String)</code> methods are called.  
+     * times.  Returns <code>true</code> if the <code>get()</code> or
+     * <code>get(String)</code> methods are called.
      * @return <code>true</code> if the messages have been accessed one or more
      * times.
      */
@@ -231,7 +225,7 @@
      */
     public Iterator get() {
         this.accessed = true;
-        
+
         if (messages.isEmpty()) {
             return Collections.EMPTY_LIST.iterator();
         }
@@ -267,9 +261,9 @@
      */
     public Iterator get(String property) {
         this.accessed = true;
-        
+
         MessageItem item = (MessageItem) messages.get(property);
-        
+
         return (item == null)
             ? Collections.EMPTY_LIST.iterator()
             : item.getList().iterator();
@@ -320,19 +314,19 @@
 
         return (ami == null) ? 0 : ami.getList().size();
     }
-    
+
     /**
-     * Returns a String representation of this MessageList's 
+     * Returns a String representation of this MessageList's
      * [property name]=[message list] mapping.
      * @see java.lang.Object#toString()
-     */    
+     */
     public String toString() {
         return this.messages.toString();
     }
 
     /**
      * Holds messages for a specified property.
-     */    
+     */
     protected static class MessageItem implements Serializable {
 
         /**

Modified: commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/impl/CollectionResourcesBase.java
URL: http://svn.apache.org/viewvc/commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/impl/CollectionResourcesBase.java?rev=775615&r1=775614&r2=775615&view=diff
==============================================================================
--- commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/impl/CollectionResourcesBase.java (original)
+++ commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/impl/CollectionResourcesBase.java Sun May 17 09:45:58 2009
@@ -1,24 +1,18 @@
 /*
- * $Id$
- * $Revision$
- * $Date$
- *
- * ====================================================================
- *
- *  Copyright 2003-2005 The Apache Software Foundation
- *
- *  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
+ * 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.
+ * The ASF licenses this file to You 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.
- *
+ * 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.apache.commons.resources.impl;
@@ -38,7 +32,7 @@
 import org.apache.commons.resources.ResourcesKeyException;
 
 /**
- * <p>Abstract base classes for 
+ * <p>Abstract base classes for
  * {@link org.apache.commons.resources.Resources} implementations that
  * store their name-value mappings for each supported <code>Locale</code>
  * in a URL-accessible resource file with a common base URL.  Subclasses
@@ -182,7 +176,7 @@
             if (map.containsKey(key)) {
                 Object object  = map.get(key);
                 if (getLog().isTraceEnabled()) {
-                    getLog().trace("Retrieved object for key '" + key + 
+                    getLog().trace("Retrieved object for key '" + key +
                                    "' and locale '" + locale +
                                    "' is '" + object + "'");
                 }
@@ -191,7 +185,7 @@
         }
 
         if (getLog().isTraceEnabled()) {
-            getLog().trace("No message found for key '" + key + 
+            getLog().trace("No message found for key '" + key +
                            "' and locale '" + locale + "'");
         }
 
@@ -337,7 +331,7 @@
      * always attempt to retrieve the specified resource and load it
      * appropriately.</p>
      *
-     * @param baseUrl Base URL of the resource files for this 
+     * @param baseUrl Base URL of the resource files for this
      * {@link org.apache.commons.resources.Resources} instance
      * @param locale <code>Locale</code> for which name-value mappings
      *  are requested

Modified: commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/impl/DatabaseBasicMessage.java
URL: http://svn.apache.org/viewvc/commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/impl/DatabaseBasicMessage.java?rev=775615&r1=775614&r2=775615&view=diff
==============================================================================
--- commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/impl/DatabaseBasicMessage.java (original)
+++ commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/impl/DatabaseBasicMessage.java Sun May 17 09:45:58 2009
@@ -1,36 +1,26 @@
 /*
- * $Id$
- * $Revision$
- * $Date$
- *
- * ====================================================================
- *
- *  Copyright 2003-2005 The Apache Software Foundation
- *
- *  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
+ * 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.
+ * The ASF licenses this file to You 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.
- *
+ * 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.apache.commons.resources.impl;
 
-
-
-
-
 /**
- * BasicMessage to allow standard ORM 
+ * BasicMessage to allow standard ORM
  * configuration (no complex keys).
- * 
+ *
  * @author James Mitchell
  *
  */
@@ -54,9 +44,9 @@
     public DatabaseBasicMessage(String locale, String key, Object[] values) {
         super(key, values);
         this.locale = locale;
-        
+
     }
-    
+
     private String locale = null;
 
     /**
@@ -94,17 +84,17 @@
     public String getValue() {
         Object[] values = getValues();
         if (values == null || values.length < 1) {
-            throw new IllegalStateException("The retrived value for msg " + 
+            throw new IllegalStateException("The retrived value for msg " +
                     getKey() + "was null");
         }
         if (values.length > 1) {
             throw new IllegalStateException("There were more than one values " +
-                    "retrived value for msg " + 
+                    "retrived value for msg " +
                     getKey());
         }
         return (String)getValues()[0];
     }
-    
+
     /**
      * Compare this message to another.
      *
@@ -113,7 +103,7 @@
      */
     public boolean equals(Object obj) {
         if (obj instanceof DatabaseBasicMessage){
-            if (((DatabaseBasicMessage)obj).getKey().equals(getKey()) && 
+            if (((DatabaseBasicMessage)obj).getKey().equals(getKey()) &&
                     ((DatabaseBasicMessage)obj).getLocale().equals(this.locale)){
                 return true;
             }

Modified: commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/impl/JDBCResources.java
URL: http://svn.apache.org/viewvc/commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/impl/JDBCResources.java?rev=775615&r1=775614&r2=775615&view=diff
==============================================================================
--- commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/impl/JDBCResources.java (original)
+++ commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/impl/JDBCResources.java Sun May 17 09:45:58 2009
@@ -1,24 +1,18 @@
 /*
- * $Id$
- * $Revision$
- * $Date$
- *
- * ====================================================================
- *
- *  Copyright 2003-2005 The Apache Software Foundation
- *
- *  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
+ * 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.
+ * The ASF licenses this file to You 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.
- *
+ * 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.apache.commons.resources.impl;
@@ -40,19 +34,19 @@
 import org.apache.commons.logging.LogFactory;
 
 /**
- * <p>Concrete implementation of 
+ * <p>Concrete implementation of
  * {@link org.apache.commons.resources.Resources} that retrieves message
  * key value pairs using JDBC. For this specific implementation, database
  * connection properties and <code>Locale</code> for which the document's
  * messages apply are specified via property files. Resources are looked up in
- * a hierarchy of database values in a manner identical to that 
+ * a hierarchy of database values in a manner identical to that
  * performed by <code>java.util.ResourceBundle.getBundle().</code>.
- * 
+ *
  * </p>
  *
  * <p>The base URL passed to our constructor must contain the base name
  * of a properties file that holds the JDBC datasource configuration.</p>
- * 
+ *
  * <p>
  * The expected format of the required properties file might look like this:<br>
  * <code><pre>
@@ -60,17 +54,17 @@
  * jdbc.connect.url                  = jdbc:mysql://localhost/resources
  * jdbc.connect.login                = resourcesTest
  * jdbc.connect.password             = resourcesTest
- * 
+ *
  * jdbc.sql.db                       = resources
  * jdbc.sql.table                    = resources
  * jdbc.sql.locale.column            = locale
  * jdbc.sql.key.column               = msgKey
  * jdbc.sql.val.column               = val
- * 
+ *
  * org.apache.commons.resource.CACHE = true
- * 
+ *
  * </pre></code>
- * 
+ *
  * </p>
  *
  * @author James Mitchell
@@ -86,7 +80,7 @@
     // ----------------------------------------------------------- Constructors
 
     /**
-     * <p>Create a new 
+     * <p>Create a new
      * {@link org.apache.commons.resources.Resources} instance with the specified
      * logical name and base resource URL.</p>
      *
@@ -118,7 +112,7 @@
      * always attempt to retrieve the specified resource and load it
      * appropriately.</p>
      *
-     * @param baseUrl Base URL of the resource files for this 
+     * @param baseUrl Base URL of the resource files for this
      * {@link org.apache.commons.resources.Resources} instance
      * @param locale <code>Locale</code> for which name-value mappings
      *  are requested
@@ -132,7 +126,7 @@
         }
 
         Properties props = new Properties();
-        //getLocaleSuffix(locale) + 
+        //getLocaleSuffix(locale) +
         String name = baseUrl + ".properties";
         InputStream stream = null;
 
@@ -201,7 +195,7 @@
         }
         return properties;
 
-        
+
 
     }
 
@@ -211,21 +205,21 @@
      * @param connectionProps The connection properties used to instantiate
      * a JDBC connection.
      */
-    private Properties loadData(Locale locale, Properties connectionProps) 
-        throws InstantiationException, IllegalAccessException, 
+    private Properties loadData(Locale locale, Properties connectionProps)
+        throws InstantiationException, IllegalAccessException,
         ClassNotFoundException, SQLException {
-        
+
         String driver = connectionProps.getProperty("jdbc.connect.driver");
         String url    = connectionProps.getProperty("jdbc.connect.url");
         String user = connectionProps.getProperty("jdbc.connect.login");
         String pass = connectionProps.getProperty("jdbc.connect.password");
-        
+
         String table = connectionProps.getProperty("jdbc.sql.table");
         String localeColumn = connectionProps.getProperty("jdbc.sql.locale.column");
         String keyColumn    = connectionProps.getProperty("jdbc.sql.key.column");
         String valColumn    = connectionProps.getProperty("jdbc.sql.val.column");
         Properties pairs = new Properties();
-        
+
         Connection con = null;
         PreparedStatement stmt = null;
         ResultSet rs = null;
@@ -233,7 +227,7 @@
             Class.forName(driver).newInstance();
             con = DriverManager.getConnection(url, user, pass);
 
-            String query = "SELECT " + keyColumn + ", " + valColumn + 
+            String query = "SELECT " + keyColumn + ", " + valColumn +
                     " FROM " + table + " where " + localeColumn + "= '" + locale + "'";
             stmt = con.prepareStatement(query);
             rs = stmt.executeQuery();

Modified: commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/impl/JDBCResourcesFactory.java
URL: http://svn.apache.org/viewvc/commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/impl/JDBCResourcesFactory.java?rev=775615&r1=775614&r2=775615&view=diff
==============================================================================
--- commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/impl/JDBCResourcesFactory.java (original)
+++ commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/impl/JDBCResourcesFactory.java Sun May 17 09:45:58 2009
@@ -1,24 +1,18 @@
 /*
- * $Id$
- * $Revision$
- * $Date$
- *
- * ====================================================================
- *
- *  Copyright 2003-2005 The Apache Software Foundation
- *
- *  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
+ * 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.
+ * The ASF licenses this file to You 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.
- *
+ * 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.apache.commons.resources.impl;
@@ -27,14 +21,14 @@
 import org.apache.commons.resources.ResourcesException;
 
 /**
- * <p>Concrete implementation of 
+ * <p>Concrete implementation of
  * {@link org.apache.commons.resources.ResourcesFactory} that creates
- * {@link org.apache.commons.resources.Resources} instances that wraps 
- * a JDBC database connection and retrieves values for the given 
- * <code>Locale</code> and have name suffixes reflecting the 
+ * {@link org.apache.commons.resources.Resources} instances that wraps
+ * a JDBC database connection and retrieves values for the given
+ * <code>Locale</code> and have name suffixes reflecting the
  * <code>Locale</code> for which the document's messages apply.
- * For this specific implementation, resources are looked up in 
- * a hierarchy of database values in a manner identical to that 
+ * For this specific implementation, resources are looked up in
+ * a hierarchy of database values in a manner identical to that
  * performed by <code>java.util.ResourceBundle.getBundle().</code>.
  *
  * @author James Mitchell
@@ -47,17 +41,17 @@
 
 
     /**
-     * <p>Create and return a new {@link org.apache.commons.resources.Resources} 
+     * <p>Create and return a new {@link org.apache.commons.resources.Resources}
      * instance with the specified logical name, after calling its <code>init()</code>
      * method and delegating the relevant properties.</p>
      *
-     * @param name Logical name of the {@link org.apache.commons.resources.Resources} 
+     * @param name Logical name of the {@link org.apache.commons.resources.Resources}
      * instance to create
-     * 
+     *
      * @param config Configuration string for this resource (if any)
      * @return The new Resources instance.
      *
-     * @exception ResourcesException if a {@link org.apache.commons.resources.Resources} 
+     * @exception ResourcesException if a {@link org.apache.commons.resources.Resources}
      * instance of the specified logical name cannot be created.
      */
     protected Resources createResources(String name, String config) {

Modified: commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/impl/PropertyResources.java
URL: http://svn.apache.org/viewvc/commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/impl/PropertyResources.java?rev=775615&r1=775614&r2=775615&view=diff
==============================================================================
--- commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/impl/PropertyResources.java (original)
+++ commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/impl/PropertyResources.java Sun May 17 09:45:58 2009
@@ -1,24 +1,18 @@
 /*
- * $Id$
- * $Revision$
- * $Date$
- *
- * ====================================================================
- *
- *  Copyright 2003-2005 The Apache Software Foundation
- *
- *  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
+ * 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.
+ * The ASF licenses this file to You 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.
- *
+ * 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.apache.commons.resources.impl;
@@ -35,7 +29,7 @@
 import org.apache.commons.logging.LogFactory;
 
 /**
- * <p>Concrete implementation of 
+ * <p>Concrete implementation of
  * {@link org.apache.commons.resources.Resources} that wraps a family
  * (one per <code>Locale</code>) of properties files that share a base URL
  * and have name suffixes reflecting the <code>Locale</code> for which
@@ -62,7 +56,7 @@
     // ----------------------------------------------------------- Constructors
 
     /**
-     * <p>Create a new 
+     * <p>Create a new
      * {@link org.apache.commons.resources.Resources} instance with the specified
      * logical name and base resource URL.</p>
      *
@@ -95,7 +89,7 @@
      * always attempt to retrieve the specified resource and load it
      * appropriately.</p>
      *
-     * @param baseUrl Base URL of the resource files for this 
+     * @param baseUrl Base URL of the resource files for this
      * {@link org.apache.commons.resources.Resources} instance
      * @param locale <code>Locale</code> for which name-value mappings
      *  are requested

Modified: commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/impl/PropertyResourcesFactory.java
URL: http://svn.apache.org/viewvc/commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/impl/PropertyResourcesFactory.java?rev=775615&r1=775614&r2=775615&view=diff
==============================================================================
--- commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/impl/PropertyResourcesFactory.java (original)
+++ commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/impl/PropertyResourcesFactory.java Sun May 17 09:45:58 2009
@@ -1,24 +1,18 @@
 /*
- * $Id$
- * $Revision$
- * $Date$
- *
- * ====================================================================
- *
- *  Copyright 2003-2005 The Apache Software Foundation
- *
- *  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
+ * 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.
+ * The ASF licenses this file to You 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.
- *
+ * 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.apache.commons.resources.impl;
@@ -27,13 +21,13 @@
 import org.apache.commons.resources.ResourcesException;
 
 /**
- * <p>Concrete implementation of 
+ * <p>Concrete implementation of
  * {@link org.apache.commons.resources.ResourcesFactory} that creates
- * {@link org.apache.commons.resources.Resources} instances that wrap 
+ * {@link org.apache.commons.resources.Resources} instances that wrap
  * a family (one per Locale) of properties files that share a base URL
- * and have name suffices reflecting the Locale for which the document's 
- * messages apply.  Resources are looked up in a hierarchy of documents 
- * in a manner identical to that performed by 
+ * and have name suffices reflecting the Locale for which the document's
+ * messages apply.  Resources are looked up in a hierarchy of documents
+ * in a manner identical to that performed by
  * <code>java.util.ResourceBundle.getBundle()</code>.</p>
  *
  * <p>The configuration variable passed to the <code>createResources()</code>
@@ -52,17 +46,17 @@
 
 
     /**
-     * <p>Create and return a new {@link org.apache.commons.resources.Resources} 
+     * <p>Create and return a new {@link org.apache.commons.resources.Resources}
      * instance with the specified logical name, after calling its <code>init()</code>
      * method and delegating the relevant properties.</p>
      *
-     * @param name Logical name of the {@link org.apache.commons.resources.Resources} 
+     * @param name Logical name of the {@link org.apache.commons.resources.Resources}
      * instance to create
-     * 
+     *
      * @param config Configuration string for this resource (if any)
      * @return The new Resources instance.
      *
-     * @exception ResourcesException if a {@link org.apache.commons.resources.Resources} 
+     * @exception ResourcesException if a {@link org.apache.commons.resources.Resources}
      * instance of the specified logical name cannot be created.
      */
     protected Resources createResources(String name, String config) {

Modified: commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/impl/ResourceBundleResources.java
URL: http://svn.apache.org/viewvc/commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/impl/ResourceBundleResources.java?rev=775615&r1=775614&r2=775615&view=diff
==============================================================================
--- commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/impl/ResourceBundleResources.java (original)
+++ commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/impl/ResourceBundleResources.java Sun May 17 09:45:58 2009
@@ -1,24 +1,18 @@
 /*
- * $Id$
- * $Revision$
- * $Date$
- *
- * ====================================================================
- *
- *  Copyright 2003-2005 The Apache Software Foundation
- *
- *  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
+ * 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.
+ * The ASF licenses this file to You 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.
- *
+ * 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.apache.commons.resources.impl;
@@ -36,7 +30,7 @@
 import org.apache.commons.resources.util.IteratorEnumeration;
 
 /**
- * <p>Concrete implementation of 
+ * <p>Concrete implementation of
  * {@link org.apache.commons.resources.Resources} that wraps a set
  * (one per Locale) of <code>java.util.ResourceBundle</code> instances
  * that share a common base name.</p>
@@ -53,7 +47,7 @@
 
 
     /**
-     * <p>Create a new {@link org.apache.commons.resources.Resources} 
+     * <p>Create a new {@link org.apache.commons.resources.Resources}
      * instance with the specified
      * logical name and bundle base name.</p>
      *
@@ -104,7 +98,7 @@
         try {
             ResourceBundle bundle = getBundle(null);
             return new IteratorEnumeration(bundle.getKeys());
-            
+
         } catch (MissingResourceException e) {
             return Collections.EMPTY_LIST.iterator();
         }
@@ -142,15 +136,15 @@
             ResourceBundle bundle = getBundle(locale);
             Object object = bundle.getObject(key);
             if (getLog().isTraceEnabled()) {
-                getLog().trace("Retrieved object for key '" + key + 
+                getLog().trace("Retrieved object for key '" + key +
                                "' and locale '" + locale +
                                "' is '" + object + "'");
             }
             return object;
-            
+
         } catch (MissingResourceException e) {
             if (getLog().isTraceEnabled()) {
-                getLog().trace("No resource found for key '" + key + 
+                getLog().trace("No resource found for key '" + key +
                                "' and locale '" + locale + "'");
             }
             if (isReturnNull()) {
@@ -205,11 +199,11 @@
     protected ClassLoader getClassLoader() {
 
         ClassLoader loader = Thread.currentThread().getContextClassLoader();
-        
+
         if (loader == null) {
             loader = this.getClass().getClassLoader();
         }
-        
+
         return (loader);
 
     }

Modified: commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/impl/ResourceBundleResourcesFactory.java
URL: http://svn.apache.org/viewvc/commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/impl/ResourceBundleResourcesFactory.java?rev=775615&r1=775614&r2=775615&view=diff
==============================================================================
--- commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/impl/ResourceBundleResourcesFactory.java (original)
+++ commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/impl/ResourceBundleResourcesFactory.java Sun May 17 09:45:58 2009
@@ -1,24 +1,18 @@
 /*
- * $Id$
- * $Revision$
- * $Date$
- *
- * ====================================================================
- *
- *  Copyright 2003-2005 The Apache Software Foundation
- *
- *  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
+ * 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.
+ * The ASF licenses this file to You 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.
- *
+ * 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.apache.commons.resources.impl;
@@ -36,7 +30,7 @@
  * that is to be wrapped.</p>
  */
 public class ResourceBundleResourcesFactory extends ResourcesFactoryBase {
-    
+
 
     // --------------------------------------------------------- Public Methods
 

Modified: commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/impl/ResourcesBase.java
URL: http://svn.apache.org/viewvc/commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/impl/ResourcesBase.java?rev=775615&r1=775614&r2=775615&view=diff
==============================================================================
--- commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/impl/ResourcesBase.java (original)
+++ commons/sandbox/resources/trunk/src/main/java/org/apache/commons/resources/impl/ResourcesBase.java Sun May 17 09:45:58 2009
@@ -1,24 +1,18 @@
 /*
- * $Id$
- * $Revision$
- * $Date$
- *
- * ====================================================================
- *
- *  Copyright 2003-2005 The Apache Software Foundation
- *
- *  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
+ * 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.
+ * The ASF licenses this file to You 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.
- *
+ * 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.apache.commons.resources.impl;
@@ -37,14 +31,14 @@
 import org.apache.commons.resources.ResourcesKeyException; // for javadoc/checkstyle
 
 /**
- * <p>Convenience base class for 
+ * <p>Convenience base class for
  * {@link org.apache.commons.resources.Resources} implementations.</p>
  *
  * <p>Default implementations of the content retrieval methods are provided
  * for all methods except <code>getObject()</code>.  The default methods for
  * the other content retrieval methods are coded in terms of
  * <code>getString()</code>, on the assumption that most uses of
- * {@link org.apache.commons.resources.Resources} are of this type.  
+ * {@link org.apache.commons.resources.Resources} are of this type.
  * However, they can be easily overridden as needed.</p>
  *
  * @see org.apache.commons.resources.impl.CollectionResourcesBase
@@ -62,7 +56,7 @@
 
 
     /**
-     * <p>Create a new {@link org.apache.commons.resources.Resources} instance 
+     * <p>Create a new {@link org.apache.commons.resources.Resources} instance
      * with no name.</p>
      */
     public ResourcesBase() {
@@ -73,7 +67,7 @@
 
 
     /**
-     * <p>Create a new {@link org.apache.commons.resources.Resources} instance 
+     * <p>Create a new {@link org.apache.commons.resources.Resources} instance
      * with the specified logical name.</p>
      *
      * @param name Logical name of the new instance
@@ -89,7 +83,7 @@
 
 
     /**
-     * <p>The logical name of this {@link org.apache.commons.resources.Resources} 
+     * <p>The logical name of this {@link org.apache.commons.resources.Resources}
      * instance.</p>
      */
     private String name = null;
@@ -112,7 +106,7 @@
 
     /**
      * <p>This must be called to initialize the data content of this
-     * {@link org.apache.commons.resources.Resources} instance, before 
+     * {@link org.apache.commons.resources.Resources} instance, before
      * any of the <code>getXxx()</code> methods are called.</p>
      *
      * <p>The default implementation does nothing.</p>
@@ -156,7 +150,7 @@
 
 
     /**
-     * <p>Return the logical name of this {@link org.apache.commons.resources.Resources} 
+     * <p>Return the logical name of this {@link org.apache.commons.resources.Resources}
      * instance.</p>
      *
      * @return The name of this resources instance.
@@ -434,7 +428,7 @@
         int arrayLth = 0;
         try {
             while (true) {
-                char[] buffer = new char[bufferSize]; 
+                char[] buffer = new char[bufferSize];
                 int bufferLth = reader.read(buffer);
                 if (bufferLth < 0) {
                     break;
@@ -468,7 +462,7 @@
         int arrayLth = 0;
         try {
             while (true) {
-                byte[] buffer = new byte[bufferSize]; 
+                byte[] buffer = new byte[bufferSize];
                 int bufferLth = inputStream.read(buffer);
                 if (bufferLth < 0) {
                     break;



Mime
View raw message