Author: bdube
Date: Wed Jan 12 06:34:28 2011
New Revision: 1057997
URL: http://svn.apache.org/viewvc?rev=1057997&view=rev
Log:
Fix hard-coded path
Several more also need attention
Thanks: Richard Calmbach, Mathieu Champlon
Issue: FOR-752
Modified:
forrest/trunk/main/java/org/apache/forrest/conf/ForrestConfUtils.java
forrest/trunk/main/java/org/apache/forrest/log/ForrestLogTargetFactory.java
forrest/trunk/site-author/status.xml
Modified: forrest/trunk/main/java/org/apache/forrest/conf/ForrestConfUtils.java
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/java/org/apache/forrest/conf/ForrestConfUtils.java?rev=1057997&r1=1057996&r2=1057997&view=diff
==============================================================================
--- forrest/trunk/main/java/org/apache/forrest/conf/ForrestConfUtils.java
(original)
+++ forrest/trunk/main/java/org/apache/forrest/conf/ForrestConfUtils.java Wed
Jan 12 06:34:28 2011
@@ -89,6 +89,10 @@ public class ForrestConfUtils
return contextHome;
}
+ public static String getProjectWebappHome() {
+ return getSystemProperty("project.webapp");
+ }
+
/**
* For backwards compatibility, alias old skin names to new ones. This must
* be kept in sync with aliasing in forrest.build.xml/init-props
Modified:
forrest/trunk/main/java/org/apache/forrest/log/ForrestLogTargetFactory.java
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/java/org/apache/forrest/log/ForrestLogTargetFactory.java?rev=1057997&r1=1057996&r2=1057997&view=diff
==============================================================================
--- forrest/trunk/main/java/org/apache/forrest/log/ForrestLogTargetFactory.java
(original)
+++ forrest/trunk/main/java/org/apache/forrest/log/ForrestLogTargetFactory.java
Wed Jan 12 06:34:28 2011
@@ -42,7 +42,7 @@ public class ForrestLogTargetFactory
if(!projectHome.startsWith(ForrestConfUtils.defaultHome)){
DefaultContext newContext = new DefaultContext(context);
- newContext.put("context-root",projectHome + "/build/webapp");
+ newContext.put("context-root",
ForrestConfUtils.getProjectWebappHome());
currentContext = newContext;
}
} catch (Exception e) {
Modified: forrest/trunk/site-author/status.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/site-author/status.xml?rev=1057997&r1=1057996&r2=1057997&view=diff
==============================================================================
--- forrest/trunk/site-author/status.xml (original)
+++ forrest/trunk/site-author/status.xml Wed Jan 12 06:34:28 2011
@@ -154,6 +154,11 @@
<link href="site:upgrading_09">upgrading to v0.9</link>
</action>
<!-- 2011-01 -->
+ <action context="code" type="update" dev="BMD" due-to="Richard
Calmbach,Mathieu Champlon" fixes-bug="FOR-752">
+ Fix hard-coded path in ForrestLogTargetFactory and
+ ForrestConfUtils which caused files to be placed in the wrong
+ directory when using ForrestBot.
+ </action>
<action context="code" type="update" dev="DC">
ForrestBar added search options for Gossamer Threads archives and
MarkMail archives.
</action>
