You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@creadur.apache.org by rd...@apache.org on 2011/11/29 16:01:57 UTC
svn commit: r1207897 - in /incubator/rat/whisker/trunk: ./
apache-whisker-xml/
apache-whisker-xml/src/main/java/org/apache/rat/whisker/legacy/app/
apache-whisker-xml/src/main/java/org/apache/rat/whisker/legacy/cli/
apache-whisker-xml/src/main/java/org/...
Author: rdonkin
Date: Tue Nov 29 15:01:53 2011
New Revision: 1207897
URL: http://svn.apache.org/viewvc?rev=1207897&view=rev
Log:
Build apache-whisker-xml module
Added:
incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/
- copied from r1207889, incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/legacy/out/
Removed:
incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/legacy/app/
incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/legacy/cli/
incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/legacy/out/
incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/legacy/scan/
incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/Engine.java
incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/LicenseAnalyst.java
incubator/rat/whisker/trunk/apache-whisker-xml/src/main/resources/org/
incubator/rat/whisker/trunk/apache-whisker-xml/src/test/java/org/
Modified:
incubator/rat/whisker/trunk/apache-whisker-xml/pom.xml
incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/ByOrganisation.java
incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/Indentation.java
incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/License.java
incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/LicenseAndOrganisationCollator.java
incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/LicenseTemplateException.java
incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/NoticeCollator.java
incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/Organisation.java
incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/Resource.java
incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/ResourceNamesCollator.java
incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/ResourceSourceAuditor.java
incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/Visitor.java
incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/WithLicense.java
incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/WithinDirectory.java
incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/Work.java
incubator/rat/whisker/trunk/pom.xml
Modified: incubator/rat/whisker/trunk/apache-whisker-xml/pom.xml
URL: http://svn.apache.org/viewvc/incubator/rat/whisker/trunk/apache-whisker-xml/pom.xml?rev=1207897&r1=1207896&r2=1207897&view=diff
==============================================================================
--- incubator/rat/whisker/trunk/apache-whisker-xml/pom.xml (original)
+++ incubator/rat/whisker/trunk/apache-whisker-xml/pom.xml Tue Nov 29 15:01:53 2011
@@ -24,37 +24,28 @@
>
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.rat.whisker</groupId>
+ <artifactId>apache-whisker</artifactId>
+ <version>0.1-SNAPSHOT</version>
+ </parent>
+
<groupId>org.apache.rat.whisker</groupId>
<artifactId>apache-rat-whisker</artifactId>
- <version>0.1-SNAPSHOT</version>
<packaging>jar</packaging>
- <dependencies>
- <dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
- <version>1.7</version>
- </dependency>
-
+ <dependencies>
<dependency>
<groupId>org.jdom</groupId>
<artifactId>jdom</artifactId>
- <version>1.1</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.0</version>
</dependency>
<dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- <version>1.2</version>
- </dependency>
-
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
@@ -62,105 +53,14 @@
</dependency>
</dependencies>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
-
-<!--
-
-=================================
-Build
--->
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.3.1</version>
- <configuration>
- <archive>
- <manifest>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
-
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <version>1.5-SNAPSHOT</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
-
- <configuration>
- <transformers>
- <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
- <manifestEntries>
- <Main-Class>org.apache.rat.whisker.legacy.cli.Main</Main-Class>
- </manifestEntries>
- </transformer>
- </transformers>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <version>0.8-SNAPSHOT</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <!--
+ <!--
================================
Project information
-->
- <name>whisker</name>
- <description></description>
- <url>http://rat.apache.org/whisker</url>
- <inceptionYear>2011</inceptionYear>
- <licenses>
- <license>
- <name>Apache License, Version 2</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- <comments>An OSI approved open source license.</comments>
- </license>
- </licenses>
- <organization>
- <name>Apache Software Foundation</name>
- <url>http://www.apache.org</url>
- </organization>
-
- <!--
-
-
- ================================
- Environment -->
- <prerequisites>
- <maven>3.0.2</maven>
- </prerequisites>
+ <name>Apache Whisker::XML</name>
+ <description>Read model from xml.</description>
+ <url>http://rat.apache.org/whisker/apache-whisker-xml</url>
</project>
Modified: incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/ByOrganisation.java
URL: http://svn.apache.org/viewvc/incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/ByOrganisation.java?rev=1207897&r1=1207889&r2=1207897&view=diff
==============================================================================
--- incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/ByOrganisation.java (original)
+++ incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/ByOrganisation.java Tue Nov 29 15:01:53 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.rat.whisker.legacy.out;
+package org.apache.rat.whisker.out;
import java.util.Collection;
import java.util.Collections;
Modified: incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/Indentation.java
URL: http://svn.apache.org/viewvc/incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/Indentation.java?rev=1207897&r1=1207889&r2=1207897&view=diff
==============================================================================
--- incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/Indentation.java (original)
+++ incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/Indentation.java Tue Nov 29 15:01:53 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.rat.whisker.legacy.out;
+package org.apache.rat.whisker.out;
import java.io.BufferedReader;
import java.io.IOException;
Modified: incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/License.java
URL: http://svn.apache.org/viewvc/incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/License.java?rev=1207897&r1=1207889&r2=1207897&view=diff
==============================================================================
--- incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/License.java (original)
+++ incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/License.java Tue Nov 29 15:01:53 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.rat.whisker.legacy.out;
+package org.apache.rat.whisker.out;
import java.util.Collection;
import java.util.Collections;
Modified: incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/LicenseAndOrganisationCollator.java
URL: http://svn.apache.org/viewvc/incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/LicenseAndOrganisationCollator.java?rev=1207897&r1=1207889&r2=1207897&view=diff
==============================================================================
--- incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/LicenseAndOrganisationCollator.java (original)
+++ incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/LicenseAndOrganisationCollator.java Tue Nov 29 15:01:53 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.rat.whisker.legacy.out;
+package org.apache.rat.whisker.out;
import java.util.Set;
import java.util.TreeSet;
Modified: incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/LicenseTemplateException.java
URL: http://svn.apache.org/viewvc/incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/LicenseTemplateException.java?rev=1207897&r1=1207889&r2=1207897&view=diff
==============================================================================
--- incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/LicenseTemplateException.java (original)
+++ incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/LicenseTemplateException.java Tue Nov 29 15:01:53 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.rat.whisker.legacy.out;
+package org.apache.rat.whisker.out;
import java.util.Collection;
import java.util.Map;
Modified: incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/NoticeCollator.java
URL: http://svn.apache.org/viewvc/incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/NoticeCollator.java?rev=1207897&r1=1207889&r2=1207897&view=diff
==============================================================================
--- incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/NoticeCollator.java (original)
+++ incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/NoticeCollator.java Tue Nov 29 15:01:53 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.rat.whisker.legacy.out;
+package org.apache.rat.whisker.out;
import java.util.Collection;
import java.util.HashMap;
Modified: incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/Organisation.java
URL: http://svn.apache.org/viewvc/incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/Organisation.java?rev=1207897&r1=1207889&r2=1207897&view=diff
==============================================================================
--- incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/Organisation.java (original)
+++ incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/Organisation.java Tue Nov 29 15:01:53 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.rat.whisker.legacy.out;
+package org.apache.rat.whisker.out;
import java.util.Map;
Modified: incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/Resource.java
URL: http://svn.apache.org/viewvc/incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/Resource.java?rev=1207897&r1=1207889&r2=1207897&view=diff
==============================================================================
--- incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/Resource.java (original)
+++ incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/Resource.java Tue Nov 29 15:01:53 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.rat.whisker.legacy.out;
+package org.apache.rat.whisker.out;
import org.apache.commons.lang.StringUtils;
import org.jdom.Element;
Modified: incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/ResourceNamesCollator.java
URL: http://svn.apache.org/viewvc/incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/ResourceNamesCollator.java?rev=1207897&r1=1207889&r2=1207897&view=diff
==============================================================================
--- incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/ResourceNamesCollator.java (original)
+++ incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/ResourceNamesCollator.java Tue Nov 29 15:01:53 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.rat.whisker.legacy.out;
+package org.apache.rat.whisker.out;
import java.util.Collection;
import java.util.TreeSet;
Modified: incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/ResourceSourceAuditor.java
URL: http://svn.apache.org/viewvc/incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/ResourceSourceAuditor.java?rev=1207897&r1=1207889&r2=1207897&view=diff
==============================================================================
--- incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/ResourceSourceAuditor.java (original)
+++ incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/ResourceSourceAuditor.java Tue Nov 29 15:01:53 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.rat.whisker.legacy.out;
+package org.apache.rat.whisker.out;
import java.util.ArrayList;
import java.util.Collection;
Modified: incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/Visitor.java
URL: http://svn.apache.org/viewvc/incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/Visitor.java?rev=1207897&r1=1207889&r2=1207897&view=diff
==============================================================================
--- incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/Visitor.java (original)
+++ incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/Visitor.java Tue Nov 29 15:01:53 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.rat.whisker.legacy.out;
+package org.apache.rat.whisker.out;
/**
*
Modified: incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/WithLicense.java
URL: http://svn.apache.org/viewvc/incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/WithLicense.java?rev=1207897&r1=1207889&r2=1207897&view=diff
==============================================================================
--- incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/WithLicense.java (original)
+++ incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/WithLicense.java Tue Nov 29 15:01:53 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.rat.whisker.legacy.out;
+package org.apache.rat.whisker.out;
import java.util.Collection;
import java.util.HashMap;
Modified: incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/WithinDirectory.java
URL: http://svn.apache.org/viewvc/incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/WithinDirectory.java?rev=1207897&r1=1207889&r2=1207897&view=diff
==============================================================================
--- incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/WithinDirectory.java (original)
+++ incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/WithinDirectory.java Tue Nov 29 15:01:53 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.rat.whisker.legacy.out;
+package org.apache.rat.whisker.out;
import java.util.ArrayList;
import java.util.Collection;
Modified: incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/Work.java
URL: http://svn.apache.org/viewvc/incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/Work.java?rev=1207897&r1=1207889&r2=1207897&view=diff
==============================================================================
--- incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/Work.java (original)
+++ incubator/rat/whisker/trunk/apache-whisker-xml/src/main/java/org/apache/rat/whisker/out/Work.java Tue Nov 29 15:01:53 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.rat.whisker.legacy.out;
+package org.apache.rat.whisker.out;
import java.util.Calendar;
import java.util.Collection;
Modified: incubator/rat/whisker/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/rat/whisker/trunk/pom.xml?rev=1207897&r1=1207896&r2=1207897&view=diff
==============================================================================
--- incubator/rat/whisker/trunk/pom.xml (original)
+++ incubator/rat/whisker/trunk/pom.xml Tue Nov 29 15:01:53 2011
@@ -73,6 +73,7 @@
<modules>
<module>apache-whisker-model</module>
<module>apache-whisker-scan</module>
+ <module>apache-whisker-xml</module>
</modules>