svn commit: r412416 - /struts/action2/trunk/core/src/main/java/org/apache/struts/action2/views/freemarker/FreemarkerManager.java
Author: tmjee
Date: Wed Jun 7 07:58:29 2006
New Revision: 412416
URL: http://svn.apache.org/viewvc?rev=412416&view=rev
Log:
WW-1286
- cannot create FreemarkerManager using Spring
Modified:
struts/action2/trunk/core/src/main/java/org/apache/struts/action2/views/freemarker/FreemarkerManager.java
Modified:
struts/action2/trunk/core/src/main/java/org/apache/struts/action2/views/freemarker/FreemarkerManager.java
URL:
http://svn.apache.org/viewvc/struts/action2/trunk/core/src/main/java/org/apache/struts/action2/views/freemarker/FreemarkerManager.java?rev=412416&r1=412415&r2=412416&view=diff
==
---
struts/action2/trunk/core/src/main/java/org/apache/struts/action2/views/freemarker/FreemarkerManager.java
(original)
+++
struts/action2/trunk/core/src/main/java/org/apache/struts/action2/views/freemarker/FreemarkerManager.java
Wed Jun 7 07:58:29 2006
@@ -96,7 +96,7 @@
try {
log.info("Instantiating Freemarker ConfigManager!, " +
classname);
// singleton instances shouldn't be built accessing request or
session-specific context data
-instance = (FreemarkerManager)
ObjectFactory.getObjectFactory().buildBean(Class.forName(classname), null);
+instance = (FreemarkerManager)
ObjectFactory.getObjectFactory().buildBean(classname, null);
} catch (Exception e) {
log.fatal("Fatal exception occurred while trying to
instantiate a Freemarker ConfigManager instance, " + classname, e);
}
svn commit: r412429 - /struts/action2/trunk/core/src/main/java/org/apache/struts/action2/views/freemarker/FreemarkerManager.java
Author: tmjee
Date: Wed Jun 7 08:32:41 2006
New Revision: 412429
URL: http://svn.apache.org/viewvc?rev=412429&view=rev
Log:
- added javadoc
Modified:
struts/action2/trunk/core/src/main/java/org/apache/struts/action2/views/freemarker/FreemarkerManager.java
Modified:
struts/action2/trunk/core/src/main/java/org/apache/struts/action2/views/freemarker/FreemarkerManager.java
URL:
http://svn.apache.org/viewvc/struts/action2/trunk/core/src/main/java/org/apache/struts/action2/views/freemarker/FreemarkerManager.java?rev=412429&r1=412428&r2=412429&view=diff
==
---
struts/action2/trunk/core/src/main/java/org/apache/struts/action2/views/freemarker/FreemarkerManager.java
(original)
+++
struts/action2/trunk/core/src/main/java/org/apache/struts/action2/views/freemarker/FreemarkerManager.java
Wed Jun 7 08:32:41 2006
@@ -53,7 +53,38 @@
/**
* Static Configuration Manager for the FreemarkerResult's configuration
+ *
+ *
*
+ * Possible extension points are :-
+ *
+ * createConfiguration method
+ * loadSettings method
+ * getTemplateLoader method
+ * populateContext method
+ *
+ *
+ *
+ * createConfiguration method
+ * Create a freemarker Configuration.
+ *
+ *
+ * loadSettings method
+ * Load freemarker settings, default to freemarker.properties (if found in
classpath)
+ *
+ *
+ * getTemplateLoader method
+ * create a freemarker TemplateLoader that loads freemarker template in the
following order :-
+ *
+ * path defined in ServletContext init parameter named 'templatePath' or
'TemplatePath' (must be an absolute path)
+ * webapp classpath
+ * webwork's static folder (under
[WEBWORK_SOURCE]/com/opensymphony/webwork/static/
+ *
+ *
+ *
+ * populateContext method
+ * populate the created model.
+ *
*/
public class FreemarkerManager {
svn commit: r412639 - in /struts/shale/branches/mvn_reorg/shale-apps/shale-blank: pom.xml src/test/java/org/apache/shale/blank/systest/WelcomeTestCase.java
Author: wsmoak
Date: Wed Jun 7 20:18:28 2006
New Revision: 412639
URL: http://svn.apache.org/viewvc?rev=412639&view=rev
Log:
Use the Cargo Java API to start and stop Tomcat for the integration tests.
To run the tests, enable the 'itest' profile with -Pitest on the command line.
Remove the Cargo plugin config, which was conflicting with the config inherited
from the shale-apps parent pom.
Modified:
struts/shale/branches/mvn_reorg/shale-apps/shale-blank/pom.xml
struts/shale/branches/mvn_reorg/shale-apps/shale-blank/src/test/java/org/apache/shale/blank/systest/WelcomeTestCase.java
Modified: struts/shale/branches/mvn_reorg/shale-apps/shale-blank/pom.xml
URL:
http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-apps/shale-blank/pom.xml?rev=412639&r1=412638&r2=412639&view=diff
==
--- struts/shale/branches/mvn_reorg/shale-apps/shale-blank/pom.xml (original)
+++ struts/shale/branches/mvn_reorg/shale-apps/shale-blank/pom.xml Wed Jun 7
20:18:28 2006
@@ -88,6 +88,19 @@
+
+org.codehaus.cargo
+cargo-core-uberjar
+0.8
+test
+
+
+org.codehaus.cargo
+cargo-ant
+0.8
+test
+
+
@@ -109,39 +122,6 @@
-org.codehaus.cargo
-cargo-maven2-plugin
-0.2
-
-
-cargo-start
-pre-integration-test
-
-start
-
-
-false
-
-tomcat5x
-${cargo.tomcat5x.home}
-
${project.build.directory}/tomcat5x.log
-
${project.build.directory}/tomcat5x.out
-
-
-
${project.build.directory}/tomcat5x
-
-
-
-
-cargo-stop
-post-integration-test
-
-stop
-
-
-
-
-
org.apache.maven.plugins
maven-surefire-plugin
@@ -162,6 +142,11 @@
url
http://localhost:8080/shale-blank
+
+
+
+cargo.tomcat5x.home
+
${cargo.tomcat5x.home}
Modified:
struts/shale/branches/mvn_reorg/shale-apps/shale-blank/src/test/java/org/apache/shale/blank/systest/WelcomeTestCase.java
URL:
http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-apps/shale-blank/src/test/java/org/apache/shale/blank/systest/WelcomeTestCase.java?rev=412639&r1=412638&r2=412639&view=diff
==
---
struts/shale/branches/mvn_reorg/shale-apps/shale-blank/src/test/java/org/apache/shale/blank/systest/WelcomeTestCase.java
(original)
+++
struts/shale/branches/mvn_reorg/shale-apps/shale-blank/src/test/java/org/apache/shale/blank/systest/WelcomeTestCase.java
Wed Jun 7 20:18:28 2006
@@ -18,10 +18,21 @@
package org.apache.shale.blank.systest;
+import java.io.File;
import java.util.ResourceBundle;
import junit.framework.Test;
import junit.framework.TestSuite;
import org.apache.shale.test.htmlunit.AbstractHtmlUnitTestCase;
+import org.codehaus.cargo.generic.DefaultContainerFactory;
+import org.codehaus.cargo.generic.deployable.DefaultDeployableFactory;
+import org.codehaus.cargo.generic.configuration.ConfigurationFactory;
+import org.codehaus.cargo.generic.configuration.DefaultConfigurationFactory;
+import org.codehaus.cargo.container.ContainerType;
+import org.codehaus.cargo.container.InstalledLocalContainer;
+import org.codehaus.cargo.container.deployable.DeployableType;
+import org.codehaus.cargo.container.deployable.Deployable;
+import org.codehaus.cargo.container.config
