Author: sebb
Date: Tue Sep 16 10:19:36 2014
New Revision: 1625236
URL: http://svn.apache.org/r1625236
Log:
Tab police
Modified:
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/config/SourceCodeManagementSystems.java
creadur/rat/trunk/apache-rat-core/src/main/resources/org/apache/rat/plain-rat.xsl
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/config/SourceCodeManagementSystemsTest.java
creadur/rat/trunk/apache-rat-core/src/test/resources/binaries/UTF16_with_signature.xml
creadur/rat/trunk/apache-rat-core/src/test/resources/binaries/UTF8_with_signature.xml
creadur/rat/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/ExclusionHelper.java
creadur/rat/trunk/apache-rat-plugin/src/test/java/org/apache/rat/mp/ExclusionHelperTest.java
Modified:
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/config/SourceCodeManagementSystems.java
URL:
http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/config/SourceCodeManagementSystems.java?rev=1625236&r1=1625235&r2=1625236&view=diff
==============================================================================
---
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/config/SourceCodeManagementSystems.java
(original)
+++
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/config/SourceCodeManagementSystems.java
Tue Sep 16 10:19:36 2014
@@ -22,74 +22,74 @@ import java.util.ArrayList;
import java.util.List;
public enum SourceCodeManagementSystems {
- SUBVERSION(".svn", null), //
- GIT(".git", ".gitignore"), //
- BAZAAR(".bzr", ".bzrignore"), //
- MERCURIAL(".hg", ".hgignore"), //
- CVS("CVS", ".cvsignore")
- //
- ;
-
- /**
- * Technical directory of that SCM which contains SCM internals.
- */
- private String directory;
- /**
- * If there is a external way to configure files to be ignored: name of
this
- * file, <code>null</code> otherwise.
- */
- private String ignoreFile;
-
- private SourceCodeManagementSystems(String directory, String
ignoreFile) {
- this.directory = directory;
- this.ignoreFile = ignoreFile;
- }
-
- /**
- * If an ignore file exists it's added as
- *
- * <pre>
- * *⁄.scm⁄*
- * </pre>
- *
- * . Otherwise the technical directory of the SCM is added as
- *
- * <pre>
- * **⁄.scmignore
- * </pre>
- *
- * to be used as exclusion during RAT runs.
- *
- * @return list of excludes if the current SCM is used.
- */
- public List<String> getExclusions() {
- List<String> excludes = new ArrayList<String>(2);
-
- if (hasIgnoreFile()) {
- excludes.add("**/" + ignoreFile);
- }
- excludes.add("*/" + directory + "/*");
-
- return excludes;
- }
-
- public Boolean hasIgnoreFile() {
- return ignoreFile != null && ignoreFile.length() != 0;
- }
-
- /**
- * Calls {@link #getExclusions()} on each SCM to generate a global list
of
- * exclusions to be used during RAT runs.
- *
- * @return the global list of exclusions usable for all known SCM.
- */
- public static List<String> getPluginExclusions() {
- List<String> pluginExclusions = new ArrayList<String>();
-
- for (SourceCodeManagementSystems scm : values()) {
- pluginExclusions.addAll(scm.getExclusions());
- }
+ SUBVERSION(".svn", null), //
+ GIT(".git", ".gitignore"), //
+ BAZAAR(".bzr", ".bzrignore"), //
+ MERCURIAL(".hg", ".hgignore"), //
+ CVS("CVS", ".cvsignore")
+ //
+ ;
+
+ /**
+ * Technical directory of that SCM which contains SCM internals.
+ */
+ private String directory;
+ /**
+ * If there is a external way to configure files to be ignored: name of
this
+ * file, <code>null</code> otherwise.
+ */
+ private String ignoreFile;
+
+ private SourceCodeManagementSystems(String directory, String ignoreFile) {
+ this.directory = directory;
+ this.ignoreFile = ignoreFile;
+ }
+
+ /**
+ * If an ignore file exists it's added as
+ *
+ * <pre>
+ * *⁄.scm⁄*
+ * </pre>
+ *
+ * . Otherwise the technical directory of the SCM is added as
+ *
+ * <pre>
+ * **⁄.scmignore
+ * </pre>
+ *
+ * to be used as exclusion during RAT runs.
+ *
+ * @return list of excludes if the current SCM is used.
+ */
+ public List<String> getExclusions() {
+ List<String> excludes = new ArrayList<String>(2);
+
+ if (hasIgnoreFile()) {
+ excludes.add("**/" + ignoreFile);
+ }
+ excludes.add("*/" + directory + "/*");
+
+ return excludes;
+ }
+
+ public Boolean hasIgnoreFile() {
+ return ignoreFile != null && ignoreFile.length() != 0;
+ }
+
+ /**
+ * Calls {@link #getExclusions()} on each SCM to generate a global list of
+ * exclusions to be used during RAT runs.
+ *
+ * @return the global list of exclusions usable for all known SCM.
+ */
+ public static List<String> getPluginExclusions() {
+ List<String> pluginExclusions = new ArrayList<String>();
+
+ for (SourceCodeManagementSystems scm : values()) {
+ pluginExclusions.addAll(scm.getExclusions());
+ }
- return pluginExclusions;
- }
+ return pluginExclusions;
+ }
}
\ No newline at end of file
Modified:
creadur/rat/trunk/apache-rat-core/src/main/resources/org/apache/rat/plain-rat.xsl
URL:
http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/main/resources/org/apache/rat/plain-rat.xsl?rev=1625236&r1=1625235&r2=1625236&view=diff
==============================================================================
---
creadur/rat/trunk/apache-rat-core/src/main/resources/org/apache/rat/plain-rat.xsl
(original)
+++
creadur/rat/trunk/apache-rat-core/src/main/resources/org/apache/rat/plain-rat.xsl
Tue Sep 16 10:19:36 2014
@@ -63,15 +63,15 @@ Archives:
Notices, licenses etc will be marked N
<xsl:for-each select='descendant::resource'>
<xsl:choose>
- <xsl:when test='license-approval/@name="false"'>!</xsl:when>
- <xsl:otherwise><xsl:text> </xsl:text></xsl:otherwise>
+ <xsl:when test='license-approval/@name="false"'>!</xsl:when>
+ <xsl:otherwise><xsl:text> </xsl:text></xsl:otherwise>
</xsl:choose>
<xsl:choose>
- <xsl:when test='type/@name="notice"'>N </xsl:when>
- <xsl:when test='type/@name="archive"'>A </xsl:when>
- <xsl:when test='type/@name="binary"'>B </xsl:when>
- <xsl:when test='type/@name="standard"'><xsl:value-of
select='header-type/@name'/></xsl:when>
- <xsl:otherwise>!!!!!</xsl:otherwise>
+ <xsl:when test='type/@name="notice"'>N </xsl:when>
+ <xsl:when test='type/@name="archive"'>A </xsl:when>
+ <xsl:when test='type/@name="binary"'>B </xsl:when>
+ <xsl:when test='type/@name="standard"'><xsl:value-of
select='header-type/@name'/></xsl:when>
+ <xsl:otherwise>!!!!!</xsl:otherwise>
</xsl:choose>
<xsl:text> </xsl:text>
<xsl:value-of select='@name'/>
Modified:
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/config/SourceCodeManagementSystemsTest.java
URL:
http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/config/SourceCodeManagementSystemsTest.java?rev=1625236&r1=1625235&r2=1625236&view=diff
==============================================================================
---
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/config/SourceCodeManagementSystemsTest.java
(original)
+++
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/config/SourceCodeManagementSystemsTest.java
Tue Sep 16 10:19:36 2014
@@ -25,32 +25,32 @@ import org.junit.Test;
public class SourceCodeManagementSystemsTest {
- @Test
- public void testSubversionAndNumberOfSCMSystems() {
- assertFalse("SVN does not have any external ignore files.",
SUBVERSION.hasIgnoreFile());
-
- int hasIgnore = 0;
- int hasNoIgnore = 0;
- for(SourceCodeManagementSystems scm : values()) {
- if(scm.hasIgnoreFile()) {
- hasIgnore++;
- } else {
- hasNoIgnore++;
- }
- }
-
- assertEquals("Did you change the number of SCMs?", 4,
hasIgnore);
- assertEquals("Did you add a new SCM without ignoreFile?", 1,
hasNoIgnore);
- assertEquals("Amount of SCM has changed.", values().length,
hasIgnore+hasNoIgnore);
- }
-
- @Test
- public void testPluginExcludeLists() {
- assertEquals(1, SUBVERSION.getExclusions().size());
- assertEquals(2, GIT.getExclusions().size());
-
- assertEquals("Did you change the number of SCM systems?", 9,
getPluginExclusions().size());
- assertEquals("Did you change the number of SCM systems?", 5,
values().length);
- }
+ @Test
+ public void testSubversionAndNumberOfSCMSystems() {
+ assertFalse("SVN does not have any external ignore files.",
SUBVERSION.hasIgnoreFile());
+
+ int hasIgnore = 0;
+ int hasNoIgnore = 0;
+ for(SourceCodeManagementSystems scm : values()) {
+ if(scm.hasIgnoreFile()) {
+ hasIgnore++;
+ } else {
+ hasNoIgnore++;
+ }
+ }
+
+ assertEquals("Did you change the number of SCMs?", 4, hasIgnore);
+ assertEquals("Did you add a new SCM without ignoreFile?", 1,
hasNoIgnore);
+ assertEquals("Amount of SCM has changed.", values().length,
hasIgnore+hasNoIgnore);
+ }
+
+ @Test
+ public void testPluginExcludeLists() {
+ assertEquals(1, SUBVERSION.getExclusions().size());
+ assertEquals(2, GIT.getExclusions().size());
+
+ assertEquals("Did you change the number of SCM systems?", 9,
getPluginExclusions().size());
+ assertEquals("Did you change the number of SCM systems?", 5,
values().length);
+ }
}
Modified:
creadur/rat/trunk/apache-rat-core/src/test/resources/binaries/UTF16_with_signature.xml
URL:
http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/test/resources/binaries/UTF16_with_signature.xml?rev=1625236&r1=1625235&r2=1625236&view=diff
==============================================================================
Binary files - no diff available.
Modified:
creadur/rat/trunk/apache-rat-core/src/test/resources/binaries/UTF8_with_signature.xml
URL:
http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/test/resources/binaries/UTF8_with_signature.xml?rev=1625236&r1=1625235&r2=1625236&view=diff
==============================================================================
Binary files - no diff available.
Modified:
creadur/rat/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/ExclusionHelper.java
URL:
http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/ExclusionHelper.java?rev=1625236&r1=1625235&r2=1625236&view=diff
==============================================================================
---
creadur/rat/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/ExclusionHelper.java
(original)
+++
creadur/rat/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/ExclusionHelper.java
Tue Sep 16 10:19:36 2014
@@ -32,83 +32,83 @@ import org.codehaus.plexus.util.Director
* This class encapsulates the file/directory exclusion handling of RAT.
*/
public final class ExclusionHelper {
- /**
- * The Maven specific default excludes.
- */
- static final List<String> MAVEN_DEFAULT_EXCLUDES = Collections
- .unmodifiableList(Arrays.asList(//
- "target/**/*", //
- "cobertura.ser", //
- "release.properties", //
- "pom.xml.releaseBackup"));
-
- /**
- * The Eclipse specific default excludes.
- */
- static final List<String> ECLIPSE_DEFAULT_EXCLUDES = Collections
- .unmodifiableList(Arrays.asList(".classpath",//
- ".project", //
- ".settings/**/*"));
-
- /**
- * The IDEA specific default excludes.
- */
- static final List<String> IDEA_DEFAULT_EXCLUDES = Collections
- .unmodifiableList(Arrays.asList(//
- "*.iml", //
- "*.ipr", //
- "*.iws", //
- ".idea/**/*"));
-
- static void addPlexusAndScmDefaults(Log log, final boolean
useDefaultExcludes,
- final Set<String> excludeList1) {
- if (useDefaultExcludes) {
- log.debug("Adding plexus default exclusions...");
- Collections.addAll(excludeList1,
DirectoryScanner.DEFAULTEXCLUDES);
- log.debug("Adding SCM default exclusions...");
- excludeList1.addAll(//
-
SourceCodeManagementSystems.getPluginExclusions());
- } else {
- log.debug("rat.useDefaultExcludes set to false. "
- + "Plexus and SCM default exclusions
will not be added");
- }
- }
-
- static void addMavenDefaults(Log log, boolean useMavenDefaultExcludes,
- final Set<String> excludeList) {
- if (useMavenDefaultExcludes) {
- log.debug("Adding exclusions often needed by Maven
projects...");
- excludeList.addAll(MAVEN_DEFAULT_EXCLUDES);
- } else {
- log.debug("rat.useMavenDefaultExcludes set to false. "
- + "Exclusions often needed by Maven
projects will not be added.");
- }
- }
-
- static void addEclipseDefaults(Log log, boolean
useEclipseDefaultExcludes,
- final Set<String> excludeList) {
- if (useEclipseDefaultExcludes) {
- log.debug("Adding exclusions often needed by projects "
- + "developed in Eclipse...");
- excludeList.addAll(ECLIPSE_DEFAULT_EXCLUDES);
- } else {
- log.debug("rat.useEclipseDefaultExcludes set to false. "
- + "Exclusions often needed by projects
developed in "
- + "Eclipse will not be added.");
- }
- }
-
- static void addIdeaDefaults(Log log, boolean useIdeaDefaultExcludes,
- final Set<String> excludeList) {
- if (useIdeaDefaultExcludes) {
- log.debug("Adding exclusions often needed by projects "
- + "developed in IDEA...");
- excludeList.addAll(IDEA_DEFAULT_EXCLUDES);
- } else {
- log.debug("rat.useIdeaDefaultExcludes set to false. "
- + "Exclusions often needed by projects
developed in "
- + "IDEA will not be added.");
- }
- }
+ /**
+ * The Maven specific default excludes.
+ */
+ static final List<String> MAVEN_DEFAULT_EXCLUDES = Collections
+ .unmodifiableList(Arrays.asList(//
+ "target/**/*", //
+ "cobertura.ser", //
+ "release.properties", //
+ "pom.xml.releaseBackup"));
+
+ /**
+ * The Eclipse specific default excludes.
+ */
+ static final List<String> ECLIPSE_DEFAULT_EXCLUDES = Collections
+ .unmodifiableList(Arrays.asList(".classpath",//
+ ".project", //
+ ".settings/**/*"));
+
+ /**
+ * The IDEA specific default excludes.
+ */
+ static final List<String> IDEA_DEFAULT_EXCLUDES = Collections
+ .unmodifiableList(Arrays.asList(//
+ "*.iml", //
+ "*.ipr", //
+ "*.iws", //
+ ".idea/**/*"));
+
+ static void addPlexusAndScmDefaults(Log log, final boolean
useDefaultExcludes,
+ final Set<String> excludeList1) {
+ if (useDefaultExcludes) {
+ log.debug("Adding plexus default exclusions...");
+ Collections.addAll(excludeList1, DirectoryScanner.DEFAULTEXCLUDES);
+ log.debug("Adding SCM default exclusions...");
+ excludeList1.addAll(//
+ SourceCodeManagementSystems.getPluginExclusions());
+ } else {
+ log.debug("rat.useDefaultExcludes set to false. "
+ + "Plexus and SCM default exclusions will not be added");
+ }
+ }
+
+ static void addMavenDefaults(Log log, boolean useMavenDefaultExcludes,
+ final Set<String> excludeList) {
+ if (useMavenDefaultExcludes) {
+ log.debug("Adding exclusions often needed by Maven projects...");
+ excludeList.addAll(MAVEN_DEFAULT_EXCLUDES);
+ } else {
+ log.debug("rat.useMavenDefaultExcludes set to false. "
+ + "Exclusions often needed by Maven projects will not be
added.");
+ }
+ }
+
+ static void addEclipseDefaults(Log log, boolean useEclipseDefaultExcludes,
+ final Set<String> excludeList) {
+ if (useEclipseDefaultExcludes) {
+ log.debug("Adding exclusions often needed by projects "
+ + "developed in Eclipse...");
+ excludeList.addAll(ECLIPSE_DEFAULT_EXCLUDES);
+ } else {
+ log.debug("rat.useEclipseDefaultExcludes set to false. "
+ + "Exclusions often needed by projects developed in "
+ + "Eclipse will not be added.");
+ }
+ }
+
+ static void addIdeaDefaults(Log log, boolean useIdeaDefaultExcludes,
+ final Set<String> excludeList) {
+ if (useIdeaDefaultExcludes) {
+ log.debug("Adding exclusions often needed by projects "
+ + "developed in IDEA...");
+ excludeList.addAll(IDEA_DEFAULT_EXCLUDES);
+ } else {
+ log.debug("rat.useIdeaDefaultExcludes set to false. "
+ + "Exclusions often needed by projects developed in "
+ + "IDEA will not be added.");
+ }
+ }
}
Modified:
creadur/rat/trunk/apache-rat-plugin/src/test/java/org/apache/rat/mp/ExclusionHelperTest.java
URL:
http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-plugin/src/test/java/org/apache/rat/mp/ExclusionHelperTest.java?rev=1625236&r1=1625235&r2=1625236&view=diff
==============================================================================
---
creadur/rat/trunk/apache-rat-plugin/src/test/java/org/apache/rat/mp/ExclusionHelperTest.java
(original)
+++
creadur/rat/trunk/apache-rat-plugin/src/test/java/org/apache/rat/mp/ExclusionHelperTest.java
Tue Sep 16 10:19:36 2014
@@ -40,69 +40,69 @@ import org.mockito.runners.MockitoJUnitR
@RunWith(MockitoJUnitRunner.class)
public class ExclusionHelperTest {
- @Mock
- Log log;
+ @Mock
+ Log log;
- @Test
- public void testNumberOfExclusions() {
- assertEquals("Did you change the number of eclipse excludes?",
3,
- ECLIPSE_DEFAULT_EXCLUDES.size());
- assertEquals("Did you change the number of idea excludes?", 4,
- IDEA_DEFAULT_EXCLUDES.size());
- assertEquals("Did you change the number of mvn excludes?", 4,
- MAVEN_DEFAULT_EXCLUDES.size());
- }
-
- @Test
- public void testAddingEclipseExclusions() {
- final Set<String> exclusion = new HashSet<String>();
- addEclipseDefaults(log, false, exclusion);
- assertTrue(exclusion.isEmpty());
- addEclipseDefaults(log, true, exclusion);
- assertEquals(3, exclusion.size());
- addEclipseDefaults(log, true, exclusion);
- assertEquals(3, exclusion.size());
- }
-
- @Test
- public void testAddingIdeaExclusions() {
- final Set<String> exclusion = new HashSet<String>();
- addIdeaDefaults(log, false, exclusion);
- assertTrue(exclusion.isEmpty());
- addIdeaDefaults(log, true, exclusion);
- assertEquals(4, exclusion.size());
- addIdeaDefaults(log, true, exclusion);
- assertEquals(4, exclusion.size());
- }
-
- @Test
- public void testAddingMavenExclusions() {
- final Set<String> exclusion = new HashSet<String>();
- addMavenDefaults(log, false, exclusion);
- assertTrue(exclusion.isEmpty());
- addMavenDefaults(log, true, exclusion);
- assertEquals(4, exclusion.size());
- addMavenDefaults(log, true, exclusion);
- assertEquals(4, exclusion.size());
- }
-
- @Test
- public void testAddingPlexusAndScmExclusion() {
- final int expectedSizeMergedFromPlexusDefaultsAndScm = (38 +
SourceCodeManagementSystems.getPluginExclusions().size());
-
- final Set<String> exclusion = new HashSet<String>();
- addPlexusAndScmDefaults(log, false, exclusion);
- assertTrue(exclusion.isEmpty());
- addPlexusAndScmDefaults(log, true, exclusion);
- assertEquals(
- "Did you upgrade plexus to get more default
excludes?",//
- expectedSizeMergedFromPlexusDefaultsAndScm,//
- exclusion.size());
- addPlexusAndScmDefaults(log, true, exclusion);
- assertEquals(
- "Did you upgrade plexus to get more default
excludes?",//
- expectedSizeMergedFromPlexusDefaultsAndScm,//
- exclusion.size());
- }
+ @Test
+ public void testNumberOfExclusions() {
+ assertEquals("Did you change the number of eclipse excludes?", 3,
+ ECLIPSE_DEFAULT_EXCLUDES.size());
+ assertEquals("Did you change the number of idea excludes?", 4,
+ IDEA_DEFAULT_EXCLUDES.size());
+ assertEquals("Did you change the number of mvn excludes?", 4,
+ MAVEN_DEFAULT_EXCLUDES.size());
+ }
+
+ @Test
+ public void testAddingEclipseExclusions() {
+ final Set<String> exclusion = new HashSet<String>();
+ addEclipseDefaults(log, false, exclusion);
+ assertTrue(exclusion.isEmpty());
+ addEclipseDefaults(log, true, exclusion);
+ assertEquals(3, exclusion.size());
+ addEclipseDefaults(log, true, exclusion);
+ assertEquals(3, exclusion.size());
+ }
+
+ @Test
+ public void testAddingIdeaExclusions() {
+ final Set<String> exclusion = new HashSet<String>();
+ addIdeaDefaults(log, false, exclusion);
+ assertTrue(exclusion.isEmpty());
+ addIdeaDefaults(log, true, exclusion);
+ assertEquals(4, exclusion.size());
+ addIdeaDefaults(log, true, exclusion);
+ assertEquals(4, exclusion.size());
+ }
+
+ @Test
+ public void testAddingMavenExclusions() {
+ final Set<String> exclusion = new HashSet<String>();
+ addMavenDefaults(log, false, exclusion);
+ assertTrue(exclusion.isEmpty());
+ addMavenDefaults(log, true, exclusion);
+ assertEquals(4, exclusion.size());
+ addMavenDefaults(log, true, exclusion);
+ assertEquals(4, exclusion.size());
+ }
+
+ @Test
+ public void testAddingPlexusAndScmExclusion() {
+ final int expectedSizeMergedFromPlexusDefaultsAndScm = (38 +
SourceCodeManagementSystems.getPluginExclusions().size());
+
+ final Set<String> exclusion = new HashSet<String>();
+ addPlexusAndScmDefaults(log, false, exclusion);
+ assertTrue(exclusion.isEmpty());
+ addPlexusAndScmDefaults(log, true, exclusion);
+ assertEquals(
+ "Did you upgrade plexus to get more default excludes?",//
+ expectedSizeMergedFromPlexusDefaultsAndScm,//
+ exclusion.size());
+ addPlexusAndScmDefaults(log, true, exclusion);
+ assertEquals(
+ "Did you upgrade plexus to get more default excludes?",//
+ expectedSizeMergedFromPlexusDefaultsAndScm,//
+ exclusion.size());
+ }
}
