Author: srowen
Date: Mon Jun 6 10:15:29 2011
New Revision: 1132578
URL: http://svn.apache.org/viewvc?rev=1132578&view=rev
Log:
MAHOUT-724 merge eclipse into buildtools module
Added:
mahout/trunk/buildtools/Eclipse-Lucene-Codestyle.xml (contents, props
changed)
- copied, changed from r1132444,
mahout/trunk/eclipse/Eclipse-Lucene-Codestyle.xml
mahout/trunk/buildtools/MahoutCleanUp.xml (contents, props changed)
- copied, changed from r1132444, mahout/trunk/eclipse/MahoutCleanUp.xml
mahout/trunk/buildtools/addcheckstyle.xsl (contents, props changed)
- copied, changed from r1132444, mahout/trunk/eclipse/addcheckstyle.xsl
mahout/trunk/buildtools/apache-header.txt (contents, props changed)
- copied, changed from r1132444, mahout/trunk/eclipse/apache-header.txt
mahout/trunk/buildtools/codetemplates.xml (contents, props changed)
- copied, changed from r1132444, mahout/trunk/eclipse/codetemplates.xml
mahout/trunk/buildtools/setup-eclipse-workspace.xml (contents, props
changed)
- copied, changed from r1132444,
mahout/trunk/eclipse/setup-eclipse-workspace.xml
mahout/trunk/buildtools/src/main/resources/findbugs-exclude.xml
(contents, props changed)
- copied, changed from r1132444,
mahout/trunk/eclipse/src/main/resources/findbugs-exclude.xml
mahout/trunk/buildtools/src/main/resources/mahout-eclipse-checkstyle
- copied unchanged from r1132444,
mahout/trunk/eclipse/src/main/resources/mahout-eclipse-checkstyle
mahout/trunk/buildtools/src/main/resources/mahout-eclipse-pmd
- copied unchanged from r1132444,
mahout/trunk/eclipse/src/main/resources/mahout-eclipse-pmd
mahout/trunk/buildtools/template.checkstyle-config.xml (contents, props
changed)
- copied, changed from r1132444,
mahout/trunk/eclipse/template.checkstyle-config.xml
mahout/trunk/buildtools/xmltemplates.xml (contents, props changed)
- copied, changed from r1132444, mahout/trunk/eclipse/xmltemplates.xml
Removed:
mahout/trunk/eclipse/
Modified:
mahout/trunk/.gitignore
mahout/trunk/buildtools/pom.xml
mahout/trunk/pom.xml
Modified: mahout/trunk/.gitignore
URL:
http://svn.apache.org/viewvc/mahout/trunk/.gitignore?rev=1132578&r1=1132577&r2=1132578&view=diff
==============================================================================
--- mahout/trunk/.gitignore (original)
+++ mahout/trunk/.gitignore Mon Jun 6 10:15:29 2011
@@ -8,7 +8,6 @@ math/target/*
examples/target/*
buildtools/target/*
integration/target/*
-eclipse/target/*
.settings/
buildtools/.settings/
core/.settings/
@@ -17,7 +16,6 @@ core/input/
core/output/
core/testdata/
distribution/.settings/
-eclipse/.settings/
examples/.settings/
foo
math-tests/
Copied: mahout/trunk/buildtools/Eclipse-Lucene-Codestyle.xml (from r1132444,
mahout/trunk/eclipse/Eclipse-Lucene-Codestyle.xml)
URL:
http://svn.apache.org/viewvc/mahout/trunk/buildtools/Eclipse-Lucene-Codestyle.xml?p2=mahout/trunk/buildtools/Eclipse-Lucene-Codestyle.xml&p1=mahout/trunk/eclipse/Eclipse-Lucene-Codestyle.xml&r1=1132444&r2=1132578&rev=1132578&view=diff
==============================================================================
(empty)
Propchange: mahout/trunk/buildtools/Eclipse-Lucene-Codestyle.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: mahout/trunk/buildtools/Eclipse-Lucene-Codestyle.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Copied: mahout/trunk/buildtools/MahoutCleanUp.xml (from r1132444,
mahout/trunk/eclipse/MahoutCleanUp.xml)
URL:
http://svn.apache.org/viewvc/mahout/trunk/buildtools/MahoutCleanUp.xml?p2=mahout/trunk/buildtools/MahoutCleanUp.xml&p1=mahout/trunk/eclipse/MahoutCleanUp.xml&r1=1132444&r2=1132578&rev=1132578&view=diff
==============================================================================
(empty)
Propchange: mahout/trunk/buildtools/MahoutCleanUp.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: mahout/trunk/buildtools/MahoutCleanUp.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Copied: mahout/trunk/buildtools/addcheckstyle.xsl (from r1132444,
mahout/trunk/eclipse/addcheckstyle.xsl)
URL:
http://svn.apache.org/viewvc/mahout/trunk/buildtools/addcheckstyle.xsl?p2=mahout/trunk/buildtools/addcheckstyle.xsl&p1=mahout/trunk/eclipse/addcheckstyle.xsl&r1=1132444&r2=1132578&rev=1132578&view=diff
==============================================================================
(empty)
Propchange: mahout/trunk/buildtools/addcheckstyle.xsl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: mahout/trunk/buildtools/addcheckstyle.xsl
------------------------------------------------------------------------------
svn:mime-type = text/xml
Copied: mahout/trunk/buildtools/apache-header.txt (from r1132444,
mahout/trunk/eclipse/apache-header.txt)
URL:
http://svn.apache.org/viewvc/mahout/trunk/buildtools/apache-header.txt?p2=mahout/trunk/buildtools/apache-header.txt&p1=mahout/trunk/eclipse/apache-header.txt&r1=1132444&r2=1132578&rev=1132578&view=diff
==============================================================================
(empty)
Propchange: mahout/trunk/buildtools/apache-header.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: mahout/trunk/buildtools/apache-header.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: mahout/trunk/buildtools/codetemplates.xml (from r1132444,
mahout/trunk/eclipse/codetemplates.xml)
URL:
http://svn.apache.org/viewvc/mahout/trunk/buildtools/codetemplates.xml?p2=mahout/trunk/buildtools/codetemplates.xml&p1=mahout/trunk/eclipse/codetemplates.xml&r1=1132444&r2=1132578&rev=1132578&view=diff
==============================================================================
(empty)
Propchange: mahout/trunk/buildtools/codetemplates.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: mahout/trunk/buildtools/codetemplates.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: mahout/trunk/buildtools/pom.xml
URL:
http://svn.apache.org/viewvc/mahout/trunk/buildtools/pom.xml?rev=1132578&r1=1132577&r2=1132578&view=diff
==============================================================================
--- mahout/trunk/buildtools/pom.xml (original)
+++ mahout/trunk/buildtools/pom.xml Mon Jun 6 10:15:29 2011
@@ -32,4 +32,70 @@
<packaging>jar</packaging>
+ <profiles>
+ <profile>
+ <id>setup-eclipse-workspace</id>
+ <properties>
+ <eclipse.workspace.dir>${basedir}/../workspace</eclipse.workspace.dir>
+ </properties>
+ <build>
+ <defaultGoal>process-test-sources</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <version>2.8</version>
+ <inherited>false</inherited>
+ <executions>
+ <execution>
+ <id>setup.eclipse.workspace</id>
+ <phase>process-test-sources</phase>
+ <goals>
+ <goal>configure-workspace</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <workspace>${eclipse.workspace.dir}</workspace>
+
<workspaceCodeStylesURL>file:Eclipse-Lucene-Codestyle.xml</workspaceCodeStylesURL>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <inherited>false</inherited>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-nodeps</artifactId>
+ <version>1.7.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-trax</artifactId>
+ <version>1.7.1</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>setup.workspace</id>
+ <phase>validate</phase>
+ <configuration>
+ <tasks>
+ <ant antfile="${basedir}/setup-eclipse-workspace.xml">
+ <target name="main" />
+ </ant>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>
Copied: mahout/trunk/buildtools/setup-eclipse-workspace.xml (from r1132444,
mahout/trunk/eclipse/setup-eclipse-workspace.xml)
URL:
http://svn.apache.org/viewvc/mahout/trunk/buildtools/setup-eclipse-workspace.xml?p2=mahout/trunk/buildtools/setup-eclipse-workspace.xml&p1=mahout/trunk/eclipse/setup-eclipse-workspace.xml&r1=1132444&r2=1132578&rev=1132578&view=diff
==============================================================================
(empty)
Propchange: mahout/trunk/buildtools/setup-eclipse-workspace.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: mahout/trunk/buildtools/setup-eclipse-workspace.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Copied: mahout/trunk/buildtools/src/main/resources/findbugs-exclude.xml (from
r1132444, mahout/trunk/eclipse/src/main/resources/findbugs-exclude.xml)
URL:
http://svn.apache.org/viewvc/mahout/trunk/buildtools/src/main/resources/findbugs-exclude.xml?p2=mahout/trunk/buildtools/src/main/resources/findbugs-exclude.xml&p1=mahout/trunk/eclipse/src/main/resources/findbugs-exclude.xml&r1=1132444&r2=1132578&rev=1132578&view=diff
==============================================================================
(empty)
Propchange: mahout/trunk/buildtools/src/main/resources/findbugs-exclude.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: mahout/trunk/buildtools/src/main/resources/findbugs-exclude.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: mahout/trunk/buildtools/template.checkstyle-config.xml (from r1132444,
mahout/trunk/eclipse/template.checkstyle-config.xml)
URL:
http://svn.apache.org/viewvc/mahout/trunk/buildtools/template.checkstyle-config.xml?p2=mahout/trunk/buildtools/template.checkstyle-config.xml&p1=mahout/trunk/eclipse/template.checkstyle-config.xml&r1=1132444&r2=1132578&rev=1132578&view=diff
==============================================================================
(empty)
Propchange: mahout/trunk/buildtools/template.checkstyle-config.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: mahout/trunk/buildtools/template.checkstyle-config.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Copied: mahout/trunk/buildtools/xmltemplates.xml (from r1132444,
mahout/trunk/eclipse/xmltemplates.xml)
URL:
http://svn.apache.org/viewvc/mahout/trunk/buildtools/xmltemplates.xml?p2=mahout/trunk/buildtools/xmltemplates.xml&p1=mahout/trunk/eclipse/xmltemplates.xml&r1=1132444&r2=1132578&rev=1132578&view=diff
==============================================================================
(empty)
Propchange: mahout/trunk/buildtools/xmltemplates.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: mahout/trunk/buildtools/xmltemplates.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: mahout/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/mahout/trunk/pom.xml?rev=1132578&r1=1132577&r2=1132578&view=diff
==============================================================================
--- mahout/trunk/pom.xml (original)
+++ mahout/trunk/pom.xml Mon Jun 6 10:15:29 2011
@@ -440,7 +440,7 @@
<dependencies>
<dependency>
<groupId>org.apache.mahout</groupId>
- <artifactId>mahout-eclipse-support</artifactId>
+ <artifactId>mahout-buildtools</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
@@ -516,7 +516,7 @@
<configuration>
<rulesets>
<!-- classpath -->
-
<ruleset>../eclipse/src/main/resources/mahout-pmd-ruleset.xml</ruleset>
+
<ruleset>../buildtools/src/main/resources/mahout-pmd-ruleset.xml</ruleset>
</rulesets>
<sourceEncoding>UTF-8</sourceEncoding>
<targetJdk>1.5</targetJdk>
@@ -591,7 +591,6 @@
</build>
<modules>
<module>buildtools</module>
- <module>eclipse</module>
<module>math</module>
<module>core</module>
<module>integration</module>
@@ -752,7 +751,7 @@
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.6</version>
<configuration>
-
<configLocation>${project.build.directory}/../../eclipse/src/main/resources/mahout-checkstyle.xml</configLocation>
+
<configLocation>${project.build.directory}/../../buildtools/src/main/resources/mahout-checkstyle.xml</configLocation>
<consoleOutput>true</consoleOutput>
</configuration>
</plugin>
@@ -782,7 +781,7 @@
<version>2.5</version>
<configuration>
<rulesets>
-
<ruleset>../eclipse/src/main/resources/mahout-pmd-ruleset.xml</ruleset>
+
<ruleset>../buildtools/src/main/resources/mahout-pmd-ruleset.xml</ruleset>
</rulesets>
<sourceEncoding>UTF-8</sourceEncoding>
<targetJdk>1.5</targetJdk>
@@ -818,7 +817,7 @@
<!--omitVisitors>FindDeadLocalStores,UnreadFields</omitVisitors-->
<debug>true</debug>
<relaxed>true</relaxed>
-
<excludeFilterFile>../eclipse/src/main/resources/findbugs-exclude.xml</excludeFilterFile>
+
<excludeFilterFile>../buildtools/src/main/resources/findbugs-exclude.xml</excludeFilterFile>
</configuration>
</plugin>
<plugin>
