Author: ggregory
Date: Tue Sep 20 18:16:19 2011
New Revision: 1173287
URL: http://svn.apache.org/viewvc?rev=1173287&view=rev
Log:
[CODEC-129] Use standard Maven directory layout.
Added:
commons/proper/codec/trunk/src/main/assembly/
- copied from r1173189, commons/proper/codec/trunk/src/assembly/
commons/proper/codec/trunk/src/main/java/
- copied from r1173190, commons/proper/codec/trunk/src/java/
commons/proper/codec/trunk/src/main/resources/
- copied from r1173189, commons/proper/codec/trunk/src/resources/
commons/proper/codec/trunk/src/test/java/
commons/proper/codec/trunk/src/test/java/org/
- copied from r1173189, commons/proper/codec/trunk/src/test/org/
Removed:
commons/proper/codec/trunk/src/assembly/
commons/proper/codec/trunk/src/java/
commons/proper/codec/trunk/src/resources/
commons/proper/codec/trunk/src/test/org/
Modified:
commons/proper/codec/trunk/pom.xml
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/BeiderMorseEncoder.java
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/Lang.java
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/Languages.java
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/NameType.java
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/PhoneticEngine.java
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/ResourceConstants.java
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/Rule.java
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/RuleType.java
commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/language/bm/BeiderMorseEncoderTest.java
commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/language/bm/LanguageGuessingTest.java
commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/language/bm/PhoneticEngineTest.java
commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/language/bm/RuleTest.java
Modified: commons/proper/codec/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/codec/trunk/pom.xml?rev=1173287&r1=1173286&r2=1173287&view=diff
==============================================================================
--- commons/proper/codec/trunk/pom.xml (original)
+++ commons/proper/codec/trunk/pom.xml Tue Sep 20 18:16:19 2011
@@ -201,7 +201,7 @@ limitations under the License.
<maven.compile.source>1.5</maven.compile.source>
<maven.compile.target>1.5</maven.compile.target>
<commons.componentid>codec</commons.componentid>
- <commons.release.version>2.0</commons.release.version>
+ <commons.release.version>1.6</commons.release.version>
<!-- The RC version used in the staging repository URL. -->
<commons.rc.version>RC1</commons.rc.version>
<commons.jira.id>CODEC</commons.jira.id>
@@ -213,13 +213,11 @@ limitations under the License.
<commons.javadoc.java.link>http://download.oracle.com/javase/1.5.0/docs/api/</commons.javadoc.java.link>
</properties>
<build>
- <sourceDirectory>src/java</sourceDirectory>
<resources>
<resource>
- <directory>src/resources</directory>
+ <directory>src/main/resources</directory>
</resource>
</resources>
- <testSourceDirectory>src/test</testSourceDirectory>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -248,10 +246,10 @@ limitations under the License.
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
- <descriptors>
- <descriptor>src/assembly/bin.xml</descriptor>
- <descriptor>src/assembly/src.xml</descriptor>
- </descriptors>
+<!-- <descriptors> -->
+<!-- <descriptor>src/assembly/bin.xml</descriptor> -->
+<!-- <descriptor>src/assembly/src.xml</descriptor> -->
+<!-- </descriptors> -->
<tarLongFileMode>gnu</tarLongFileMode>
</configuration>
</plugin>
@@ -262,7 +260,7 @@ limitations under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changes-plugin</artifactId>
- <version>2.4</version>
+ <version>2.6</version>
<configuration>
<xmlPath>${basedir}/src/changes/changes.xml</xmlPath>
<issueLinkTemplate>%URL%/%ISSUE%</issueLinkTemplate>
Modified:
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/BeiderMorseEncoder.java
URL:
http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/BeiderMorseEncoder.java?rev=1173287&r1=1173190&r2=1173287&view=diff
==============================================================================
---
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/BeiderMorseEncoder.java
(original)
+++
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/BeiderMorseEncoder.java
Tue Sep 20 18:16:19 2011
@@ -33,7 +33,7 @@ import org.apache.commons.codec.StringEn
* </p>
*
* @author Apache Software Foundation
- * @since 2.0
+ * @since 1.6
*/
public class BeiderMorseEncoder implements StringEncoder {
// a cached object
Modified:
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/Lang.java
URL:
http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/Lang.java?rev=1173287&r1=1173190&r2=1173287&view=diff
==============================================================================
---
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/Lang.java
(original)
+++
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/Lang.java
Tue Sep 20 18:16:19 2011
@@ -68,7 +68,7 @@ import java.util.regex.Pattern;
* Port of lang.php
*
* @author Apache Software Foundation
- * @since 2.0
+ * @since 1.6
*/
public class Lang {
Modified:
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/Languages.java
URL:
http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/Languages.java?rev=1173287&r1=1173190&r2=1173287&view=diff
==============================================================================
---
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/Languages.java
(original)
+++
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/Languages.java
Tue Sep 20 18:16:19 2011
@@ -50,7 +50,7 @@ import java.util.Set;
* </p>
*
* @author Apache Software Foundation
- * @since 2.0
+ * @since 1.6
*/
public class Languages {
Modified:
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/NameType.java
URL:
http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/NameType.java?rev=1173287&r1=1173190&r2=1173287&view=diff
==============================================================================
---
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/NameType.java
(original)
+++
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/NameType.java
Tue Sep 20 18:16:19 2011
@@ -21,7 +21,7 @@ package org.apache.commons.codec.languag
* Supported types of names. Unless you are matching particular family names,
use {@link #GENERIC}.
*
* @author Apache Software Foundation
- * @since 2.0
+ * @since 1.6
*/
public enum NameType {
Modified:
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/PhoneticEngine.java
URL:
http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/PhoneticEngine.java?rev=1173287&r1=1173190&r2=1173287&view=diff
==============================================================================
---
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/PhoneticEngine.java
(original)
+++
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/PhoneticEngine.java
Tue Sep 20 18:16:19 2011
@@ -47,7 +47,7 @@ import java.util.TreeSet;
* </p>
*
* @author Apache Software Foundation
- * @since 2.0
+ * @since 1.6
*/
public class PhoneticEngine {
Modified:
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/ResourceConstants.java
URL:
http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/ResourceConstants.java?rev=1173287&r1=1173190&r2=1173287&view=diff
==============================================================================
---
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/ResourceConstants.java
(original)
+++
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/ResourceConstants.java
Tue Sep 20 18:16:19 2011
@@ -21,7 +21,7 @@ package org.apache.commons.codec.languag
* Constants used to process resource files.
*
* @author Apache Software Foundation
- * @since 2.0
+ * @since 1.6
*/
class ResourceConstants {
Modified:
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/Rule.java
URL:
http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/Rule.java?rev=1173287&r1=1173190&r2=1173287&view=diff
==============================================================================
---
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/Rule.java
(original)
+++
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/Rule.java
Tue Sep 20 18:16:19 2011
@@ -77,7 +77,7 @@ import java.util.regex.Pattern;
* </p>
*
* @author Apache Software Foundation
- * @since 2.0
+ * @since 1.6
*/
public class Rule {
Modified:
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/RuleType.java
URL:
http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/RuleType.java?rev=1173287&r1=1173190&r2=1173287&view=diff
==============================================================================
---
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/RuleType.java
(original)
+++
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/RuleType.java
Tue Sep 20 18:16:19 2011
@@ -21,7 +21,7 @@ package org.apache.commons.codec.languag
* Types of rule.
*
* @author Apache Software Foundation
- * @since 2.0
+ * @since 1.6
*/
public enum RuleType {
Modified:
commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/language/bm/BeiderMorseEncoderTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/language/bm/BeiderMorseEncoderTest.java?rev=1173287&r1=1173189&r2=1173287&view=diff
==============================================================================
---
commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/language/bm/BeiderMorseEncoderTest.java
(original)
+++
commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/language/bm/BeiderMorseEncoderTest.java
Tue Sep 20 18:16:19 2011
@@ -30,7 +30,7 @@ import org.junit.Test;
* Tests BeiderMorseEncoder.
*
* @author Apache Software Foundation
- * @since 2.0
+ * @since 1.6
*/
public class BeiderMorseEncoderTest extends StringEncoderAbstractTest {
private static final char[] TEST_CHARS = new char[] { 'a', 'b', 'c', 'd',
'e', 'f', 'g', 'h', 'o', 'u' };
Modified:
commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/language/bm/LanguageGuessingTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/language/bm/LanguageGuessingTest.java?rev=1173287&r1=1173189&r2=1173287&view=diff
==============================================================================
---
commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/language/bm/LanguageGuessingTest.java
(original)
+++
commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/language/bm/LanguageGuessingTest.java
Tue Sep 20 18:16:19 2011
@@ -30,7 +30,7 @@ import org.junit.runners.Parameterized;
* Tests guessLanguages API.
*
* @author Apache Software Foundation
- * @since 2.0
+ * @since 1.6
*/
@RunWith(Parameterized.class)
public class LanguageGuessingTest {
Modified:
commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/language/bm/PhoneticEngineTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/language/bm/PhoneticEngineTest.java?rev=1173287&r1=1173189&r2=1173287&view=diff
==============================================================================
---
commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/language/bm/PhoneticEngineTest.java
(original)
+++
commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/language/bm/PhoneticEngineTest.java
Tue Sep 20 18:16:19 2011
@@ -30,7 +30,7 @@ import org.junit.runners.Parameterized;
* Tests PhoneticEngine.
*
* @author Apache Software Foundation
- * @since 2.0
+ * @since 1.6
*/
@RunWith(Parameterized.class)
public class PhoneticEngineTest {
Modified:
commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/language/bm/RuleTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/language/bm/RuleTest.java?rev=1173287&r1=1173189&r2=1173287&view=diff
==============================================================================
---
commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/language/bm/RuleTest.java
(original)
+++
commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/language/bm/RuleTest.java
Tue Sep 20 18:16:19 2011
@@ -28,7 +28,7 @@ import org.junit.Test;
* Tests Rule.
*
* @author Apache Software Foundation
- * @since 2.0
+ * @since 1.6
*/
public class RuleTest {
private static class NegativeIntegerBaseMatcher extends
BaseMatcher<Integer> {
