#set($object = $webwork.bean("com.foo.ClassName"))
@@ -75,10 +75,10 @@ provides a way to uses the <ww:text name="title.edit" /> tag fro
$action.getText('title.edit')
would perform the same thing.see
UI tags#WW/UI+Tags for more information about webworks tags. Many provide equivalent velocity examples. Usage with other tags could be infered based on examples given.
-
-
-
-
+
+
+
+
diff --git a/docs/docs.pdf b/docs/docs.pdf
index 924b59a29..4bb5eee7a 100644
Binary files a/docs/docs.pdf and b/docs/docs.pdf differ
diff --git a/docs/wikidocs/Create a webapp project structure for your web application.html b/docs/wikidocs/Create a webapp project structure for your web application.html
index f33903e92..fa1fa5ade 100644
--- a/docs/wikidocs/Create a webapp project structure for your web application.html
+++ b/docs/wikidocs/Create a webapp project structure for your web application.html
@@ -48,7 +48,7 @@ BUILD SUCCESSFUL
ww-sample/
src/
java/
- com/opensymphony/webwork/example/HomeAction.java -- A simple action example implementation
+ org/apache/struts/action2/example/HomeAction.java -- A simple action example implementation
webapp/
index.jsp -- redirects to home.action
WEB-INF/
diff --git a/docs/wikidocs/Style Guide.html b/docs/wikidocs/Style Guide.html
index e6bac24d4..8b4b6188a 100644
--- a/docs/wikidocs/Style Guide.html
+++ b/docs/wikidocs/Style Guide.html
@@ -29,7 +29,7 @@
or
-
{snippet:id=sitegraph-usage|lang=none|url=webwork/src/java/com/opensymphony/webwork/sitegraph/sitegraph-usage.txt}
+
{snippet:id=sitegraph-usage|lang=none|url=webwork/src/java/org/apache/struts/action2/sitegraph/sitegraph-usage.txt}
or
diff --git a/docs/wikidocs/Tiles Use_attachments/war-expanded.zip b/docs/wikidocs/Tiles Use_attachments/war-expanded.zip
index aacf13f84..070df6a80 100644
Binary files a/docs/wikidocs/Tiles Use_attachments/war-expanded.zip and b/docs/wikidocs/Tiles Use_attachments/war-expanded.zip differ
diff --git a/docs/wikidocs/WebWork.html b/docs/wikidocs/WebWork.html
index 3037b3295..ee9d18267 100644
--- a/docs/wikidocs/WebWork.html
+++ b/docs/wikidocs/WebWork.html
@@ -31,7 +31,7 @@
Getting Started
- - Downloads (continous builds, previous versions)
+ - Downloads (continous builds, previous versions)
- Installation
- Requirements (dependencies, appservers)
- Quickstart
diff --git a/osbuild.xml b/osbuild.xml
index bbd92c2fc..4773ec60c 100644
--- a/osbuild.xml
+++ b/osbuild.xml
@@ -44,7 +44,7 @@
-
+
diff --git a/src/java/org/apache/struts/action2/components/DefaultRichtexteditorConnector.java b/src/java/org/apache/struts/action2/components/DefaultRichtexteditorConnector.java
index ff0af09ae..0a5700fd2 100644
--- a/src/java/org/apache/struts/action2/components/DefaultRichtexteditorConnector.java
+++ b/src/java/org/apache/struts/action2/components/DefaultRichtexteditorConnector.java
@@ -34,7 +34,7 @@ public class DefaultRichtexteditorConnector extends AbstractRichtexteditorConnec
private static final long serialVersionUID = -3792445192115623052L;
- protected String _actualServerPath = "/com/opensymphony/webwork/static/richtexteditor/data/";
+ protected String _actualServerPath = "/org/apache/struts/action2/static/richtexteditor/data/";
public String getActualServerPath() { return _actualServerPath; }
diff --git a/src/java/org/apache/struts/action2/config/DefaultConfiguration.java b/src/java/org/apache/struts/action2/config/DefaultConfiguration.java
index d641066f7..6aaef4dec 100644
--- a/src/java/org/apache/struts/action2/config/DefaultConfiguration.java
+++ b/src/java/org/apache/struts/action2/config/DefaultConfiguration.java
@@ -45,9 +45,9 @@ public class DefaultConfiguration extends Configuration {
}
try {
- list.add(new PropertiesConfiguration("com/opensymphony/webwork/default"));
+ list.add(new PropertiesConfiguration("org/apache/struts/action2/default"));
} catch (Exception e) {
- log.error("Could not find com/opensymphony/webwork/default.properties", e);
+ log.error("Could not find org/apache/struts/action2/default.properties", e);
}
Configuration[] configList = new Configuration[list.size()];
@@ -75,7 +75,7 @@ public class DefaultConfiguration extends Configuration {
// Add addtional list of i18n global resource bundles
try {
- LocalizedTextUtil.addDefaultResourceBundle("com/opensymphony/webwork/webwork-messages");
+ LocalizedTextUtil.addDefaultResourceBundle("org/apache/struts/action2/webwork-messages");
StringTokenizer bundleFiles = new StringTokenizer((String) config.getImpl(WebWorkConstants.WEBWORK_CUSTOM_I18N_RESOURCES), ", ");
while (bundleFiles.hasMoreTokens()) {
diff --git a/src/java/org/apache/struts/action2/interceptor/ExecuteAndWaitInterceptor.java b/src/java/org/apache/struts/action2/interceptor/ExecuteAndWaitInterceptor.java
index 7b96ff8fb..6de6b9448 100644
--- a/src/java/org/apache/struts/action2/interceptor/ExecuteAndWaitInterceptor.java
+++ b/src/java/org/apache/struts/action2/interceptor/ExecuteAndWaitInterceptor.java
@@ -189,7 +189,7 @@ public class ExecuteAndWaitInterceptor implements Interceptor {
"'! This requires FreeMarker support and won't work if you don't have it installed");
// no wait result? hmm -- let's try to do dynamically put it in for you!
ResultConfig rc = new ResultConfig(WAIT, "org.apache.struts.action2.views.freemarker.FreemarkerResult",
- Collections.singletonMap("location", "com/opensymphony/webwork/interceptor/wait.ftl"));
+ Collections.singletonMap("location", "org/apache/struts/action2/interceptor/wait.ftl"));
results.put(WAIT, rc);
}
diff --git a/src/java/org/apache/struts/action2/portlet/dispatcher/Jsr168Dispatcher.java b/src/java/org/apache/struts/action2/portlet/dispatcher/Jsr168Dispatcher.java
index 7f1048b49..a0f05624e 100644
--- a/src/java/org/apache/struts/action2/portlet/dispatcher/Jsr168Dispatcher.java
+++ b/src/java/org/apache/struts/action2/portlet/dispatcher/Jsr168Dispatcher.java
@@ -183,7 +183,7 @@ public class Jsr168Dispatcher extends GenericPortlet implements WebWorkStatics,
portletNamespace = "";
}
LocalizedTextUtil
- .addDefaultResourceBundle("com/opensymphony/webwork/webwork-messages");
+ .addDefaultResourceBundle("org/apache/struts/action2/webwork-messages");
//check for configuration reloading
if ("true".equalsIgnoreCase(Configuration
diff --git a/src/test/org/apache/struts/action2/config/ConfigurationTest.java b/src/test/org/apache/struts/action2/config/ConfigurationTest.java
index cefa391c0..96f2ad092 100644
--- a/src/test/org/apache/struts/action2/config/ConfigurationTest.java
+++ b/src/test/org/apache/struts/action2/config/ConfigurationTest.java
@@ -23,7 +23,7 @@ public class ConfigurationTest extends WebWorkTestCase {
assertEquals("12345", Configuration.getString(WebWorkConstants.WEBWORK_MULTIPART_MAXSIZE));
assertEquals("\temp", Configuration.getString(WebWorkConstants.WEBWORK_MULTIPART_SAVEDIR));
- assertEquals("test,com/opensymphony/webwork/othertest", Configuration.getString( WebWorkConstants.WEBWORK_CUSTOM_PROPERTIES));
+ assertEquals("test,org/apache/struts/action2/othertest", Configuration.getString( WebWorkConstants.WEBWORK_CUSTOM_PROPERTIES));
assertEquals("testvalue", Configuration.getString("testkey"));
assertEquals("othertestvalue", Configuration.getString("othertestkey"));
@@ -44,7 +44,7 @@ public class ConfigurationTest extends WebWorkTestCase {
Locale.setDefault(Locale.US); // force to US locale as we also have _de and _da properties
LocalizedTextUtil.clearDefaultResourceBundles();
- LocalizedTextUtil.addDefaultResourceBundle("com/opensymphony/webwork/webwork-messages");
+ LocalizedTextUtil.addDefaultResourceBundle("org/apache/struts/action2/webwork-messages");
assertEquals("The form has already been processed or no token was supplied, please try again.", LocalizedTextUtil.findDefaultText("webwork.messages.invalid.token", Locale.getDefault()));
Configuration.reset();
diff --git a/src/test/org/apache/struts/action2/dispatcher/PlainTextResultTest.java b/src/test/org/apache/struts/action2/dispatcher/PlainTextResultTest.java
index bb3092751..0c67bdac2 100644
--- a/src/test/org/apache/struts/action2/dispatcher/PlainTextResultTest.java
+++ b/src/test/org/apache/struts/action2/dispatcher/PlainTextResultTest.java
@@ -44,7 +44,7 @@ public class PlainTextResultTest extends TestCase {
response.setExpectedHeader("Content-Disposition", "inline");
InputStream jspResourceInputStream =
ClassLoaderUtil.getResourceAsStream(
- "com/opensymphony/webwork/dispatcher/someJspFile.jsp",
+ "org/apache/struts/action2/dispatcher/someJspFile.jsp",
PlainTextResultTest.class);
@@ -54,7 +54,7 @@ public class PlainTextResultTest extends TestCase {
String r = AbstractUITagTest.normalize(stringWriter.getBuffer().toString(), true);
String e = AbstractUITagTest.normalize(
- readAsString("com/opensymphony/webwork/dispatcher/someJspFile.jsp"), true);
+ readAsString("org/apache/struts/action2/dispatcher/someJspFile.jsp"), true);
assertEquals(r, e);
}
finally {
@@ -71,7 +71,7 @@ public class PlainTextResultTest extends TestCase {
response.setExpectedHeader("Content-Disposition", "inline");
InputStream jspResourceInputStream =
ClassLoaderUtil.getResourceAsStream(
- "com/opensymphony/webwork/dispatcher/someJspFile.jsp",
+ "org/apache/struts/action2/dispatcher/someJspFile.jsp",
PlainTextResultTest.class);
@@ -81,7 +81,7 @@ public class PlainTextResultTest extends TestCase {
String r = AbstractUITagTest.normalize(stringWriter.getBuffer().toString(), true);
String e = AbstractUITagTest.normalize(
- readAsString("com/opensymphony/webwork/dispatcher/someJspFile.jsp"), true);
+ readAsString("org/apache/struts/action2/dispatcher/someJspFile.jsp"), true);
assertEquals(r, e);
}
finally {
diff --git a/src/test/org/apache/struts/action2/dispatcher/ServletDispatcherTest.java b/src/test/org/apache/struts/action2/dispatcher/ServletDispatcherTest.java
index 8cdfe7250..e8c2b2b5b 100644
--- a/src/test/org/apache/struts/action2/dispatcher/ServletDispatcherTest.java
+++ b/src/test/org/apache/struts/action2/dispatcher/ServletDispatcherTest.java
@@ -17,7 +17,7 @@ import java.util.Map;
*/
public class ServletDispatcherTest extends AbstractServletDispatcherTestCase {
public String getConfigFilename() {
- return "com/opensymphony/webwork/dispatcher/ServletDispatcherTest-xwork.xml";
+ return "org/apache/struts/action2/dispatcher/ServletDispatcherTest-xwork.xml";
}
public ServletDispatcher getServletDispatcher() {
diff --git a/src/test/org/apache/struts/action2/sitegraph/SiteGraphTest.java b/src/test/org/apache/struts/action2/sitegraph/SiteGraphTest.java
index e41b20213..89ed11b13 100644
--- a/src/test/org/apache/struts/action2/sitegraph/SiteGraphTest.java
+++ b/src/test/org/apache/struts/action2/sitegraph/SiteGraphTest.java
@@ -13,13 +13,13 @@ import java.io.StringWriter;
*/
public class SiteGraphTest extends WebWorkTestCase {
public void testWebFlow() {
- String dir = "src/test/com/opensymphony/webwork/sitegraph";
+ String dir = "src/test/org/apache/struts/action2/sitegraph";
SiteGraph siteGraph = new SiteGraph(dir, dir, dir, "");
StringWriter writer = new StringWriter();
siteGraph.setWriter(writer);
siteGraph.prepare();
- String out = "src/test/com/opensymphony/webwork/sitegraph/out.txt";
+ String out = "src/test/org/apache/struts/action2/sitegraph/out.txt";
assertEquals(FileUtils.readFile(new File(out)), writer.toString());
}
}
diff --git a/src/test/org/apache/struts/action2/spring/WebWorkSpringObjectFactoryTest.java b/src/test/org/apache/struts/action2/spring/WebWorkSpringObjectFactoryTest.java
index dd4ed0a4e..ef91e7e24 100644
--- a/src/test/org/apache/struts/action2/spring/WebWorkSpringObjectFactoryTest.java
+++ b/src/test/org/apache/struts/action2/spring/WebWorkSpringObjectFactoryTest.java
@@ -42,7 +42,7 @@ public class WebWorkSpringObjectFactoryTest extends TestCase {
ServletContext msc = (ServletContext) new MockServletContext();
msc.setAttribute(WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE, ac);
ac.setServletContext(msc);
- ac.setConfigLocations(new String[] {"/com/opensymphony/webwork/spring/WebWorkSpringObjectFactoryTest-applicationContext.xml"});
+ ac.setConfigLocations(new String[] {"/org/apache/struts/action2/spring/WebWorkSpringObjectFactoryTest-applicationContext.xml"});
ac.refresh();
fac.init(msc);
diff --git a/src/test/webwork.properties b/src/test/webwork.properties
index d30f2bb48..99b9323ad 100644
--- a/src/test/webwork.properties
+++ b/src/test/webwork.properties
@@ -4,7 +4,7 @@ webwork.multipart.saveDir=\temp
webwork.multipart.maxSize=12345
### Load custom property files (does not override webwork.properties!)
-webwork.custom.properties=test,com/opensymphony/webwork/othertest
+webwork.custom.properties=test,org/apache/struts/action2/othertest
# added the MockTag to the path of Tags that the TagDirective will search through
webwork.velocity.tag.path = org.apache.struts.action2.views.velocity.ui, org.displaytag.tags