Author: apetrelli
Date: Tue Jun 22 15:47:51 2010
New Revision: 956929
URL: http://svn.apache.org/viewvc?rev=956929&view=rev
Log:
VELOCITYSB-4
Converted main directory in a "pom" type project.
Created "velocity-engine" module.
Moved some directories in their standard places.
Added:
velocity/sandbox/maven-reorg/engine/trunk/src/site/xdoc/
- copied from r956914, velocity/sandbox/maven-reorg/engine/trunk/xdocs/
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine/ (with props)
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine/pom.xml (with
props)
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine/src/
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine/src/main/
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine/src/main/java/
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine/src/main/resources/
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine/src/test/
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine/src/test/java/
Removed:
velocity/sandbox/maven-reorg/engine/trunk/xdocs/
Modified:
velocity/sandbox/maven-reorg/engine/trunk/pom.xml
Modified: velocity/sandbox/maven-reorg/engine/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/engine/trunk/pom.xml?rev=956929&r1=956928&r2=956929&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/engine/trunk/pom.xml (original)
+++ velocity/sandbox/maven-reorg/engine/trunk/pom.xml Tue Jun 22 15:47:51 2010
@@ -16,7 +16,7 @@
"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.
+ under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0";
@@ -26,9 +26,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache</groupId>
- <artifactId>apache</artifactId>
- <version>4</version>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity-master</artifactId>
+ <version>1-SNAPSHOT</version>
</parent>
<groupId>org.apache.velocity</groupId>
@@ -39,16 +39,10 @@
<url>http://velocity.apache.org/engine/devel/</url>
<description>Apache Velocity is a general purpose template
engine.</description>
<inceptionYear>2000</inceptionYear>
- <packaging>jar</packaging>
-
- <prerequisites>
- <maven>2.0.9</maven>
- </prerequisites>
+ <packaging>pom</packaging>
<build>
<defaultGoal>install</defaultGoal>
- <sourceDirectory>src/java</sourceDirectory>
- <testSourceDirectory>src/test</testSourceDirectory>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -56,18 +50,9 @@
<configuration>
<inputEncoding>UTF-8</inputEncoding>
<outputEncoding>UTF-8</outputEncoding>
- <xdocDirectory>${basedir}/xdocs/docs</xdocDirectory>
</configuration>
</plugin>
</plugins>
- <resources>
- <resource>
- <directory>src/java</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
</build>
<distributionManagement>
@@ -75,158 +60,8 @@
<id>velocity.apache.org</id>
<url>scpexe://people.apache.org/www/velocity.apache.org/engine/devel/</url>
</site>
- <repository>
- <id>apache.releases</id>
- <name>Apache Release Distribution Repository</name>
-
<url>scp://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository</url>
- </repository>
- <snapshotRepository>
- <id>apache.snapshots</id>
- <name>Apache Development Snapshot Repository</name>
-
<url>scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
- </snapshotRepository>
</distributionManagement>
- <developers>
- <developer>
- <name>Will Glass-Husain</name>
- <id>wglass</id>
- <email>[email protected]</email>
- <organization>Forio Business Simulations</organization>
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
-
- <developer>
- <name>Geir Magnusson Jr.</name>
- <id>geirm</id>
- <email>[email protected]</email>
- <organization>Independent (DVSL Maven)</organization>
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
-
- <developer>
- <name>Daniel Rall</name>
- <id>dlr</id>
- <email>[email protected]</email>
- <organization>CollabNet, Inc.</organization>
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
-
- <developer>
- <name>Henning P. Schmiedehausen</name>
- <id>henning</id>
- <email>[email protected]</email>
- <organization>INTERMETA - Gesellschaft für Mehrwertdienste
mbH</organization>
- <roles>
- <role>Java Developer</role>
- </roles>
- <timezone>2</timezone>
- </developer>
-
- <developer>
- <name>Nathan Bubna</name>
- <id>nbubna</id>
- <email>[email protected]</email>
- <organization>ESHA Research</organization>
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
-
- </developers>
-
- <dependencies>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2.1</version>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.4</version>
- </dependency>
- <dependency>
- <groupId>oro</groupId>
- <artifactId>oro</artifactId>
- <version>2.0.8</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>jdom</groupId>
- <artifactId>jdom</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1</version>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework</artifactId>
- </exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.12</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.3</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>logkit</groupId>
- <artifactId>logkit</artifactId>
- <version>2.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- <version>1.6</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>werken-xpath</groupId>
- <artifactId>werken-xpath</artifactId>
- <version>0.9.4</version>
- <scope>provided</scope>
- </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.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
<reporting>
<plugins>
@@ -314,10 +149,10 @@
<threshold>Low</threshold>
<effort>Max</effort>
<excludeFilterFile>build/findbugs-exclude.xml</excludeFilterFile>
- <findbugsXmlOutputDirectory>xdocs</findbugsXmlOutputDirectory>
+ <findbugsXmlOutputDirectory>xdocs</findbugsXmlOutputDirectory>
</configuration>
</plugin>
- <plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
Propchange: velocity/sandbox/maven-reorg/engine/trunk/velocity-engine/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Jun 22 15:47:51 2010
@@ -0,0 +1,2 @@
+target
+.*
Added: velocity/sandbox/maven-reorg/engine/trunk/velocity-engine/pom.xml
URL:
http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/engine/trunk/velocity-engine/pom.xml?rev=956929&view=auto
==============================================================================
--- velocity/sandbox/maven-reorg/engine/trunk/velocity-engine/pom.xml (added)
+++ velocity/sandbox/maven-reorg/engine/trunk/velocity-engine/pom.xml Tue Jun
22 15:47:51 2010
@@ -0,0 +1,98 @@
+<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";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>velocity</artifactId>
+ <groupId>org.apache.velocity</groupId>
+ <version>1.7-SNAPSHOT</version>
+ </parent>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity-engine</artifactId>
+ <version>1.7-SNAPSHOT</version>
+ <name>Velocity - Engine</name>
+ <dependencies>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.4</version>
+ </dependency>
+ <dependency>
+ <groupId>oro</groupId>
+ <artifactId>oro</artifactId>
+ <version>2.0.8</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>jdom</groupId>
+ <artifactId>jdom</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1</version>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.12</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.3</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>logkit</groupId>
+ <artifactId>logkit</artifactId>
+ <version>2.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.6</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>werken-xpath</groupId>
+ <artifactId>werken-xpath</artifactId>
+ <version>0.9.4</version>
+ <scope>provided</scope>
+ </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.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Propchange: velocity/sandbox/maven-reorg/engine/trunk/velocity-engine/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: velocity/sandbox/maven-reorg/engine/trunk/velocity-engine/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
