Author: pramirez
Date: Sat Apr 27 20:57:00 2013
New Revision: 1476669
URL: http://svn.apache.org/r1476669
Log:
OODT-606 Make it so only abolute path is required to config. Allow environment
variables to flow through
Modified:
oodt/trunk/pge/src/main/java/org/apache/oodt/cas/pge/writers/VelocityConfigFileWriter.java
oodt/trunk/pge/src/test/java/org/apache/oodt/cas/pge/writers/VelocityConfigFileWriterTest.java
oodt/trunk/pge/src/test/resources/test-config.vm
Modified:
oodt/trunk/pge/src/main/java/org/apache/oodt/cas/pge/writers/VelocityConfigFileWriter.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/pge/src/main/java/org/apache/oodt/cas/pge/writers/VelocityConfigFileWriter.java?rev=1476669&r1=1476668&r2=1476669&view=diff
==============================================================================
---
oodt/trunk/pge/src/main/java/org/apache/oodt/cas/pge/writers/VelocityConfigFileWriter.java
(original)
+++
oodt/trunk/pge/src/main/java/org/apache/oodt/cas/pge/writers/VelocityConfigFileWriter.java
Sat Apr 27 20:57:00 2013
@@ -58,13 +58,16 @@ public class VelocityConfigFileWriter im
VelocityMetadata velocityMetadata = new VelocityMetadata(metadata);
try {
// Velocity requires you to set a path of where to look for
- // templates.
- // This path defaults to . if not set.
- Velocity.setProperty("file.resource.loader.path", args[0]);
+ // templates. This path defaults to . if not set.
+ int slashIndex = ((String) args[0]).lastIndexOf('/');
+ String templatePath = ((String) args[0]).substring(0, slashIndex);
+ Velocity.setProperty("file.resource.loader.path", templatePath);
Velocity.init();
VelocityContext context = new VelocityContext();
context.put("metadata", velocityMetadata);
- Template template = Velocity.getTemplate((String) args[1]);
+ context.put("env", System.getenv());
+ String templateName = ((String) args[0]).substring(slashIndex);
+ Template template = Velocity.getTemplate(templateName);
StringWriter sw = new StringWriter();
template.merge(context, sw);
FileUtils.writeStringToFile(configFile, sw.toString());
Modified:
oodt/trunk/pge/src/test/java/org/apache/oodt/cas/pge/writers/VelocityConfigFileWriterTest.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/pge/src/test/java/org/apache/oodt/cas/pge/writers/VelocityConfigFileWriterTest.java?rev=1476669&r1=1476668&r2=1476669&view=diff
==============================================================================
---
oodt/trunk/pge/src/test/java/org/apache/oodt/cas/pge/writers/VelocityConfigFileWriterTest.java
(original)
+++
oodt/trunk/pge/src/test/java/org/apache/oodt/cas/pge/writers/VelocityConfigFileWriterTest.java
Sat Apr 27 20:57:00 2013
@@ -43,14 +43,13 @@ public class VelocityConfigFileWriterTes
metadata.addMetadata("conference", "ApacheCon");
File config = File.createTempFile("config", ".out");
try {
- vcfw.generateFile(config.toString(), metadata, LOG, url.getFile()
- .substring(0, url.getFile().lastIndexOf('/')), "test-config.vm");
+ vcfw.generateFile(config.toString(), metadata, LOG, url.getFile());
} catch (Exception e) {
e.printStackTrace();
fail(e.getMessage());
}
String output = FileUtils.readFileToString(config);
- assertEquals("Welcome to ApacheCon Chris Paul!", output);
+ assertEquals(System.getenv().get("USER") + " Welcomes to ApacheCon Chris
Paul!", output);
config.delete();
}
Modified: oodt/trunk/pge/src/test/resources/test-config.vm
URL:
http://svn.apache.org/viewvc/oodt/trunk/pge/src/test/resources/test-config.vm?rev=1476669&r1=1476668&r2=1476669&view=diff
==============================================================================
--- oodt/trunk/pge/src/test/resources/test-config.vm (original)
+++ oodt/trunk/pge/src/test/resources/test-config.vm Sat Apr 27 20:57:00 2013
@@ -1 +1 @@
-Welcome to $metadata.conference#foreach($name in $metadata.getValues('name'))
$name#end!
\ No newline at end of file
+$env.USER Welcomes to $metadata.conference#foreach($name in
$metadata.getValues('name')) $name#end!
\ No newline at end of file
