Author: apetrelli
Date: Mon Jul 26 14:13:44 2010
New Revision: 979297
URL: http://svn.apache.org/viewvc?rev=979297&view=rev
Log:
VELOCITYSB-8
Moved code to modules.
Added:
velocity/sandbox/maven-reorg/dvsl/trunk/velocity-dvsl-ant/src/main/java/org/
velocity/sandbox/maven-reorg/dvsl/trunk/velocity-dvsl-ant/src/main/java/org/apache/
velocity/sandbox/maven-reorg/dvsl/trunk/velocity-dvsl-ant/src/main/java/org/apache/dvsl/
velocity/sandbox/maven-reorg/dvsl/trunk/velocity-dvsl-ant/src/main/java/org/apache/dvsl/AntLogChute.java
- copied unchanged from r979269,
velocity/sandbox/maven-reorg/dvsl/trunk/src/java/org/apache/dvsl/AntLogChute.java
velocity/sandbox/maven-reorg/dvsl/trunk/velocity-dvsl-ant/src/main/java/org/apache/dvsl/AntLogSystem.java
- copied unchanged from r979269,
velocity/sandbox/maven-reorg/dvsl/trunk/src/java/org/apache/dvsl/AntLogSystem.java
velocity/sandbox/maven-reorg/dvsl/trunk/velocity-dvsl-ant/src/main/java/org/apache/dvsl/DVSLTask.java
- copied unchanged from r979269,
velocity/sandbox/maven-reorg/dvsl/trunk/src/java/org/apache/dvsl/DVSLTask.java
velocity/sandbox/maven-reorg/dvsl/trunk/velocity-dvsl-ant/src/main/java/org/apache/tools/
- copied from r979269,
velocity/sandbox/maven-reorg/dvsl/trunk/src/java/org/apache/tools/
velocity/sandbox/maven-reorg/dvsl/trunk/velocity-dvsl/src/main/java/
- copied from r979269, velocity/sandbox/maven-reorg/dvsl/trunk/src/java/
velocity/sandbox/maven-reorg/dvsl/trunk/velocity-dvsl/src/main/resources/org/
velocity/sandbox/maven-reorg/dvsl/trunk/velocity-dvsl/src/main/resources/org/apache/
velocity/sandbox/maven-reorg/dvsl/trunk/velocity-dvsl/src/main/resources/org/apache/dvsl/
velocity/sandbox/maven-reorg/dvsl/trunk/velocity-dvsl/src/main/resources/org/apache/dvsl/resource/
- copied from r979269,
velocity/sandbox/maven-reorg/dvsl/trunk/src/java/org/apache/dvsl/resource/
velocity/sandbox/maven-reorg/dvsl/trunk/velocity-dvsl/src/test/java/
- copied from r979269, velocity/sandbox/maven-reorg/dvsl/trunk/src/test/
velocity/sandbox/maven-reorg/dvsl/trunk/velocity-dvsl/src/test/resources/site.dvsl
- copied unchanged from r979269,
velocity/sandbox/maven-reorg/dvsl/trunk/src/test/site.dvsl
velocity/sandbox/maven-reorg/dvsl/trunk/velocity-dvsl/src/test/resources/user-guide.xml
- copied unchanged from r979269,
velocity/sandbox/maven-reorg/dvsl/trunk/src/test/user-guide.xml
Removed:
velocity/sandbox/maven-reorg/dvsl/trunk/src/conf/
velocity/sandbox/maven-reorg/dvsl/trunk/src/java/
velocity/sandbox/maven-reorg/dvsl/trunk/src/test/
velocity/sandbox/maven-reorg/dvsl/trunk/velocity-dvsl-ant/src/main/java/org/apache/tools/dvsl/DVSL.java
velocity/sandbox/maven-reorg/dvsl/trunk/velocity-dvsl/src/main/java/org/apache/dvsl/AntLogChute.java
velocity/sandbox/maven-reorg/dvsl/trunk/velocity-dvsl/src/main/java/org/apache/dvsl/AntLogSystem.java
velocity/sandbox/maven-reorg/dvsl/trunk/velocity-dvsl/src/main/java/org/apache/dvsl/DVSLTask.java
velocity/sandbox/maven-reorg/dvsl/trunk/velocity-dvsl/src/main/java/org/apache/dvsl/resource/
velocity/sandbox/maven-reorg/dvsl/trunk/velocity-dvsl/src/main/java/org/apache/tools/
velocity/sandbox/maven-reorg/dvsl/trunk/velocity-dvsl/src/test/java/site.dvsl
velocity/sandbox/maven-reorg/dvsl/trunk/velocity-dvsl/src/test/java/user-guide.xml
Modified:
velocity/sandbox/maven-reorg/dvsl/trunk/pom.xml
velocity/sandbox/maven-reorg/dvsl/trunk/src/site/site.xml
velocity/sandbox/maven-reorg/dvsl/trunk/velocity-dvsl-ant/pom.xml
velocity/sandbox/maven-reorg/dvsl/trunk/velocity-dvsl/pom.xml
velocity/sandbox/maven-reorg/dvsl/trunk/velocity-dvsl/src/test/java/org/apache/dvsl/GrinderTest.java
Modified: velocity/sandbox/maven-reorg/dvsl/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/dvsl/trunk/pom.xml?rev=979297&r1=979296&r2=979297&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/dvsl/trunk/pom.xml (original)
+++ velocity/sandbox/maven-reorg/dvsl/trunk/pom.xml Mon Jul 26 14:13:44 2010
@@ -41,6 +41,14 @@
<outputEncoding>UTF-8</outputEncoding>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
</plugins>
</build>
Modified: velocity/sandbox/maven-reorg/dvsl/trunk/src/site/site.xml
URL:
http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/dvsl/trunk/src/site/site.xml?rev=979297&r1=979296&r2=979297&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/dvsl/trunk/src/site/site.xml (original)
+++ velocity/sandbox/maven-reorg/dvsl/trunk/src/site/site.xml Mon Jul 26
14:13:44 2010
@@ -15,7 +15,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 name="Apache DVSL">
@@ -32,10 +32,10 @@
</bannerRight>
<poweredBy>
- <logo name="Apache Velocity"
+ <logo name="Apache Velocity"
href="http://velocity.apache.org/";
img="/images/pbv90x30.png" />
- <logo name="Velocity News Feed"
+ <logo name="Velocity News Feed"
href="http://velocity.apache.org/rss/news.rss";
img="/images/feed-icon-24x24.jpg" />
</poweredBy>
@@ -87,6 +87,7 @@
</menu>
<menu ref="reports" />
+ <menu ref="modules" />
</body>
</project>
Modified: velocity/sandbox/maven-reorg/dvsl/trunk/velocity-dvsl-ant/pom.xml
URL:
http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/dvsl/trunk/velocity-dvsl-ant/pom.xml?rev=979297&r1=979296&r2=979297&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/dvsl/trunk/velocity-dvsl-ant/pom.xml (original)
+++ velocity/sandbox/maven-reorg/dvsl/trunk/velocity-dvsl-ant/pom.xml Mon Jul
26 14:13:44 2010
@@ -10,4 +10,17 @@
<version>1.1.0-SNAPSHOT</version>
<name>Apache Velocity DVSL - Ant integration</name>
<description>Ant Task to use DVSL in Ant build files.</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity-dvsl</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.7.0</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
</project>
\ No newline at end of file
Modified: velocity/sandbox/maven-reorg/dvsl/trunk/velocity-dvsl/pom.xml
URL:
http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/dvsl/trunk/velocity-dvsl/pom.xml?rev=979297&r1=979296&r2=979297&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/dvsl/trunk/velocity-dvsl/pom.xml (original)
+++ velocity/sandbox/maven-reorg/dvsl/trunk/velocity-dvsl/pom.xml Mon Jul 26
14:13:44 2010
@@ -1,13 +1,58 @@
-<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/xsd/maven-4.0.0.xsd";>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>velocity-dvsl-parent</artifactId>
+<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/xsd/maven-4.0.0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>velocity-dvsl-parent</artifactId>
+ <groupId>org.apache.velocity</groupId>
+ <version>1.1.0-SNAPSHOT</version>
+ </parent>
<groupId>org.apache.velocity</groupId>
+ <artifactId>velocity-dvsl</artifactId>
<version>1.1.0-SNAPSHOT</version>
- </parent>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity-dvsl</artifactId>
- <version>1.1.0-SNAPSHOT</version>
- <name>Apache Velocity DVSL</name>
- <description>DVSL core library</description>
+ <name>Apache Velocity DVSL</name>
+ <description>DVSL core library</description>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ </manifest>
+ <manifestEntries>
+ <extensionName>velocity-dvsl</extensionName>
+ <mainClass>org.apache.dvsl.DVSL</mainClass>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>velocity</groupId>
+ <artifactId>velocity</artifactId>
+ <version>1.5</version>
+ </dependency>
+ <dependency>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <version>1.6.1</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
+ <version>1.1.1</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
</project>
\ No newline at end of file
Modified:
velocity/sandbox/maven-reorg/dvsl/trunk/velocity-dvsl/src/test/java/org/apache/dvsl/GrinderTest.java
URL:
http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/dvsl/trunk/velocity-dvsl/src/test/java/org/apache/dvsl/GrinderTest.java?rev=979297&r1=979269&r2=979297&view=diff
==============================================================================
---
velocity/sandbox/maven-reorg/dvsl/trunk/velocity-dvsl/src/test/java/org/apache/dvsl/GrinderTest.java
(original)
+++
velocity/sandbox/maven-reorg/dvsl/trunk/velocity-dvsl/src/test/java/org/apache/dvsl/GrinderTest.java
Mon Jul 26 14:13:44 2010
@@ -19,9 +19,8 @@ package org.apache.dvsl;
* under the License.
*/
-import java.io.StringReader;
+import java.io.InputStreamReader;
import java.io.StringWriter;
-import java.io.FileReader;
import junit.framework.TestCase;
@@ -42,8 +41,8 @@ public class GrinderTest
* use simple in-memory style and input strings
*/
- private String dvslstyle = "src/test/site.dvsl";
- private String input = "src/test/user-guide.xml";
+ private String dvslstyle = "/site.dvsl";
+ private String input = "/user-guide.xml";
public GrinderTest( String name )
{
@@ -59,6 +58,7 @@ public class GrinderTest
}
catch( Exception e )
{
+ e.printStackTrace();
fail( e.getMessage() );
}
}
@@ -76,7 +76,7 @@ public class GrinderTest
* register the stylesheet
*/
- dvsl.setStylesheet( new FileReader(dvslstyle) );
+ dvsl.setStylesheet( new
InputStreamReader(getClass().getResourceAsStream(dvslstyle)) );
/*
* render the document as a Reader
@@ -84,12 +84,9 @@ public class GrinderTest
StringWriter sw = new StringWriter();
SAXReader sr = new SAXReader();
- Document document = sr.read( new FileReader(input ));
+ Document document = sr.read( new
InputStreamReader(getClass().getResourceAsStream(input)) );
sw = new StringWriter();
- while(true)
- {
- dvsl.transform( document, sw );
- }
+ dvsl.transform( document, sw );
}
}
