Author: mrdon
Date: Thu Mar 23 21:50:22 2006
New Revision: 388388
URL: http://svn.apache.org/viewcvs?rev=388388&view=rev
Log:
Changing the code paths
Modified:
incubator/webwork2/build.xml
incubator/webwork2/docs/chinese/wikidocs/Resources Available to Velocity
Views.html
incubator/webwork2/docs/docs.pdf
incubator/webwork2/docs/wikidocs/Create a webapp project structure for your
web application.html
incubator/webwork2/docs/wikidocs/Style Guide.html
incubator/webwork2/docs/wikidocs/Tiles Use_attachments/war-expanded.zip
incubator/webwork2/docs/wikidocs/WebWork.html
incubator/webwork2/osbuild.xml
incubator/webwork2/src/java/org/apache/struts/action2/components/DefaultRichtexteditorConnector.java
incubator/webwork2/src/java/org/apache/struts/action2/config/DefaultConfiguration.java
incubator/webwork2/src/java/org/apache/struts/action2/interceptor/ExecuteAndWaitInterceptor.java
incubator/webwork2/src/java/org/apache/struts/action2/portlet/dispatcher/Jsr168Dispatcher.java
incubator/webwork2/src/test/org/apache/struts/action2/config/ConfigurationTest.java
incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/PlainTextResultTest.java
incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/ServletDispatcherTest.java
incubator/webwork2/src/test/org/apache/struts/action2/sitegraph/SiteGraphTest.java
incubator/webwork2/src/test/org/apache/struts/action2/spring/WebWorkSpringObjectFactoryTest.java
incubator/webwork2/src/test/webwork.properties
Modified: incubator/webwork2/build.xml
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/build.xml?rev=388388&r1=388387&r2=388388&view=diff
==============================================================================
--- incubator/webwork2/build.xml (original)
+++ incubator/webwork2/build.xml Thu Mar 23 21:50:22 2006
@@ -105,8 +105,8 @@
mergedir="src/etc"
-->
<fileset dir="${src.java}">
- <include name="com/opensymphony/webwork/views/**/*.java"/>
- <include name="com/opensymphony/webwork/components/**/*.java"/>
+ <include name="org/apache/struts/action2/views/**/*.java"/>
+ <include
name="org/apache/struts/action2/components/**/*.java"/>
</fileset>
<configParam name="Jspversion" value="1.2"/>
<configParam name="Taglibversion" value="${version}"/>
@@ -129,8 +129,8 @@
force="true"
>
<fileset dir="${src.java}">
- <include name="com/opensymphony/webwork/views/**/*.java"/>
- <include name="com/opensymphony/webwork/components/**/*.java"/>
+ <include name="org/apache/struts/action2/views/**/*.java"/>
+ <include
name="org/apache/struts/action2/components/**/*.java"/>
</fileset>
<xmlTemplate templateFile="${src.xdt}/tagdoc.xdt"
destinationfile="{0}.html"/>
</xdoclet>
@@ -140,8 +140,8 @@
force="true"
>
<fileset dir="${src.java}">
- <include name="com/opensymphony/webwork/views/**/*.java"/>
- <include name="com/opensymphony/webwork/components/**/*.java"/>
+ <include name="org/apache/struts/action2/views/**/*.java"/>
+ <include
name="org/apache/struts/action2/components/**/*.java"/>
</fileset>
<configParam name="Taglibversion" value="${version}"/>
<template templateFile="${src.xdt}/tagdoc-toc.xdt"
destinationfile="index.html"/>
@@ -182,7 +182,7 @@
</jar>
<jar jarfile="${build}/${name}-nostatic-${version}.jar">
<fileset dir="${build.java}">
- <exclude name="com/opensymphony/webwork/static/**/*" />
+ <exclude name="org/apache/struts/action2/static/**/*" />
</fileset>
<manifest>
<attribute name="Main-Class"
value="org.apache.struts.action2.Main"/>
@@ -191,7 +191,7 @@
</manifest>
</jar>
<zip destfile="${build}/${name}-static-${version}.zip">
- <zipfileset dir="${build.java}/com/opensymphony/webwork/static"
prefix="webwork" />
+ <zipfileset dir="${build.java}/org/apache/struts/action2/static"
prefix="webwork" />
</zip>
</target>
Modified: incubator/webwork2/docs/chinese/wikidocs/Resources Available to
Velocity Views.html
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/docs/chinese/wikidocs/Resources%20Available%20to%20Velocity%20Views.html?rev=388388&r1=388387&r2=388388&view=diff
==============================================================================
--- incubator/webwork2/docs/chinese/wikidocs/Resources Available to Velocity
Views.html (original)
+++ incubator/webwork2/docs/chinese/wikidocs/Resources Available to Velocity
Views.html Thu Mar 23 21:50:22 2006
@@ -36,7 +36,7 @@
<div class="code"><div class="codeContent">
<pre><span class="java-keyword">public</span> class
ProcessEditTableRowAction <span class="java-keyword">extends</span>
ActionSupport { <span
class="java-keyword">private</span> <span
class="java-object">String</span> fooString;</pre>
</div></div></p>And you have a getter method for that string (in that same
ActionClass):<br/>
-
+
<div class="code"><div class="codeContent">
<pre><span class="java-keyword">public</span> <span
class="java-object">String</span> getFooString() { <span
class="java-keyword">return</span> fooString; }</pre>
</div></div><p class="paragraph">Then in your Velocity template you can
retrieve the value of that String by simply refering to:
@@ -50,16 +50,16 @@
<b class="strong">$stack</b><br/>
The OGNL value stack. (<a
href="http://www.opensymphony.com/xwork/api/com/opensymphony/xwork/util/OgnlValueStack.html";
title="Visit page outside Confluence">API Docs</a>)</p><em
class="emphasis">TODO:</em> Talk about what's actually <b
class="strong">on</b> the stack. Doesn't do a whole lot of good to know
it's there without knowing what's on it.<p class="paragraph"><br
clear="all" />
<b class="strong">$ognl</b><br/>
-A reference to an OGNL tool. (<a
href="http://www.opensymphony.com/webwork/api/com/opensymphony/webwork/views/jsp/ui/OgnlTool.html";
title="Visit page outside Confluence">API Docs</a>)<br/>
+A reference to an OGNL tool. (<a
href="http://www.opensymphony.com/webwork/api/org/apache/struts/action2/views/jsp/ui/OgnlTool.html";
title="Visit page outside Confluence">API Docs</a>)<br/>
(<a href="http://wiki.opensymphony.com/display/XW/Ognl"; title="Visit page
outside Confluence">See OGNL Basics</a>)</p>At the time of this writing, there
are no docs for that object, so if you really want to know how it works, be a
<a href="http://en.wikipedia.org/wiki/Jedi"; title="Visit page outside
Confluence">Jedi</a> and "use the source". (The CVS repository is
browsable here: <a
href="https://webwork.dev.java.net/source/browse/webwork/src/java"; title="Visit
page outside
Confluence">https://webwork.dev.java.net/source/browse/webwork/src/java</a>)<p
class="paragraph"><br clear="all" />
<em class="emphasis">Tip:</em><br/>
Jason/Patrick note that one nifty thing you can do with this tool is to call
static class methods. That's rather handy since Velocity doesn't
offer access to class variables or methods, but only to instantiate objects
that have been placed in the Velocity Context. So you can't normally do
things like Math.random().</p>To call a class method, from within Velocity
template, using the OGNL tool, you do this:<br/>
-
+
<div class="code"><div class="codeContent">
<pre>$ognl.findValue(<span
class="java-quote">"@com.acme.FooClass@FOO"</span>)</pre>
</div></div><p class="paragraph"><em class="emphasis">TODO:</em> the original
email detailing the above example used $value to refer to the OGNL tool, not
$ognl. But the source indicates it's "$ognl" that's shared
with the context. Which is right?</p><br clear="all" />
<b class="strong">$webwork</b><br/>
-A reference to the VelocityWebWorkUtil class. (<a
href="http://www.opensymphony.com/webwork/api/com/opensymphony/webwork/util/WebWorkUtil.html";
title="Visit page outside Confluence">API Docs</a>)<p class="paragraph">At the
time of this writing, the API docs for this object are effectively blank, so if
you really want to know how it works, be a <a
href="http://en.wikipedia.org/wiki/Jedi"; title="Visit page outside
Confluence">Jedi</a> and "use the source". (The CVS repository is
browsable here: <a
href="https://webwork.dev.java.net/source/browse/webwork/src/java"; title="Visit
page outside
Confluence">https://webwork.dev.java.net/source/browse/webwork/src/java</a>)</p><br
clear="all" />
+A reference to the VelocityWebWorkUtil class. (<a
href="http://www.opensymphony.com/webwork/api/org/apache/struts/action2/util/WebWorkUtil.html";
title="Visit page outside Confluence">API Docs</a>)<p class="paragraph">At the
time of this writing, the API docs for this object are effectively blank, so if
you really want to know how it works, be a <a
href="http://en.wikipedia.org/wiki/Jedi"; title="Visit page outside
Confluence">Jedi</a> and "use the source". (The CVS repository is
browsable here: <a
href="https://webwork.dev.java.net/source/browse/webwork/src/java"; title="Visit
page outside
Confluence">https://webwork.dev.java.net/source/browse/webwork/src/java</a>)</p><br
clear="all" />
<em class="emphasis">Tip:</em><br/>
Mathew notes that the VelocityWebWorkUtil class can instantiate other objects
for you. This, too, is very handy since Velocity is normally constrained to
only the objects that have been explicitely shared with it's context (and
not something you have control over when using Velocity templates kicked off by
WebWork).<p class="paragraph">To instantiate an object from a Velocity page
(that's been kicked off by WebWork, of course) do this:</p><div
class="code"><div class="codeContent">
<pre>#set($object = $webwork.bean(<span
class="java-quote">"com.foo.ClassName"</span>))</pre>
@@ -75,10 +75,10 @@
<div class="code"><div class="codeContent">
<pre>$action.getText('title.edit')</pre>
</div></div> would perform the same thing.</p>see <a href="UI
tags.html#UITags-WW%2FUI%2BTags" title="WW/UI+Tags on UI Tags">UI
tags#WW/UI+Tags</a> for more information about webworks tags. Many provide
equivalent velocity examples. Usage with other tags could be infered based on
examples given. <br/>
-
-
-
-
+
+
+
+
Modified: incubator/webwork2/docs/docs.pdf
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/docs/docs.pdf?rev=388388&r1=388387&r2=388388&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/webwork2/docs/wikidocs/Create a webapp project structure
for your web application.html
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/docs/wikidocs/Create%20a%20webapp%20project%20structure%20for%20your%20web%20application.html?rev=388388&r1=388387&r2=388388&view=diff
==============================================================================
--- incubator/webwork2/docs/wikidocs/Create a webapp project structure for your
web application.html (original)
+++ incubator/webwork2/docs/wikidocs/Create a webapp project structure for your
web application.html Thu Mar 23 21:50:22 2006
@@ -48,7 +48,7 @@
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/
Modified: incubator/webwork2/docs/wikidocs/Style Guide.html
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/docs/wikidocs/Style%20Guide.html?rev=388388&r1=388387&r2=388388&view=diff
==============================================================================
--- incubator/webwork2/docs/wikidocs/Style Guide.html (original)
+++ incubator/webwork2/docs/wikidocs/Style Guide.html Thu Mar 23 21:50:22 2006
@@ -29,7 +29,7 @@
<p>or</p>
-<p>{snippet:id=sitegraph-usage|lang=none|url=webwork/src/java/com/opensymphony/webwork/sitegraph/sitegraph-usage.txt}</p>
+<p>{snippet:id=sitegraph-usage|lang=none|url=webwork/src/java/org/apache/struts/action2/sitegraph/sitegraph-usage.txt}</p>
<p>or</p>
Modified: incubator/webwork2/docs/wikidocs/Tiles
Use_attachments/war-expanded.zip
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/docs/wikidocs/Tiles%20Use_attachments/war-expanded.zip?rev=388388&r1=388387&r2=388388&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/webwork2/docs/wikidocs/WebWork.html
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/docs/wikidocs/WebWork.html?rev=388388&r1=388387&r2=388388&view=diff
==============================================================================
--- incubator/webwork2/docs/wikidocs/WebWork.html (original)
+++ incubator/webwork2/docs/wikidocs/WebWork.html Thu Mar 23 21:50:22 2006
@@ -31,7 +31,7 @@
<h3><a name="WebWork-GettingStarted"></a>Getting Started</h3>
<ul class="alternate" type="square">
- <li><a href="http://www.opensymphony.com/webwork/download.action";
title="Visit page outside Confluence">Downloads</a> (<a
href="http://ivyrep.opensymphony.com/opensymphony/webwork/"; title="Visit page
outside Confluence">continous builds</a>, <a href="Previous Releases.html"
title="Previous releases">previous versions</a>)</li>
+ <li><a href="http://www.opensymphony.com/webwork/download.action";
title="Visit page outside Confluence">Downloads</a> (<a
href="http://ivyrep.opensymphony.org/apache/struts/action2/"; title="Visit page
outside Confluence">continous builds</a>, <a href="Previous Releases.html"
title="Previous releases">previous versions</a>)</li>
<li>Installation</li>
<li>Requirements (<a href="dependencies.html"
title="Dependencies">dependencies</a>, <a href="App Servers.html" title="App
Servers">appservers</a>)</li>
<li><a href="Quickstart.html" title="QuickStart">Quickstart</a></li>
Modified: incubator/webwork2/osbuild.xml
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/osbuild.xml?rev=388388&r1=388387&r2=388388&view=diff
==============================================================================
--- incubator/webwork2/osbuild.xml (original)
+++ incubator/webwork2/osbuild.xml Thu Mar 23 21:50:22 2006
@@ -44,7 +44,7 @@
<property name="dist" location="dist"/>
<property name="docs" location="docs"/>
- <property name="docs.packages" value="com.opensymphony.*"/>
+ <property name="docs.packages" value="org.apache.struts.action2.*"/>
<property name="jar.manifest" value="${common.dir}/EMPTY.MF"/>
<property name="jar.excludes" value=""/>
Modified:
incubator/webwork2/src/java/org/apache/struts/action2/components/DefaultRichtexteditorConnector.java
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/components/DefaultRichtexteditorConnector.java?rev=388388&r1=388387&r2=388388&view=diff
==============================================================================
---
incubator/webwork2/src/java/org/apache/struts/action2/components/DefaultRichtexteditorConnector.java
(original)
+++
incubator/webwork2/src/java/org/apache/struts/action2/components/DefaultRichtexteditorConnector.java
Thu Mar 23 21:50:22 2006
@@ -34,7 +34,7 @@
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; }
Modified:
incubator/webwork2/src/java/org/apache/struts/action2/config/DefaultConfiguration.java
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/config/DefaultConfiguration.java?rev=388388&r1=388387&r2=388388&view=diff
==============================================================================
---
incubator/webwork2/src/java/org/apache/struts/action2/config/DefaultConfiguration.java
(original)
+++
incubator/webwork2/src/java/org/apache/struts/action2/config/DefaultConfiguration.java
Thu Mar 23 21:50:22 2006
@@ -45,9 +45,9 @@
}
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 @@
// 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()) {
Modified:
incubator/webwork2/src/java/org/apache/struts/action2/interceptor/ExecuteAndWaitInterceptor.java
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/interceptor/ExecuteAndWaitInterceptor.java?rev=388388&r1=388387&r2=388388&view=diff
==============================================================================
---
incubator/webwork2/src/java/org/apache/struts/action2/interceptor/ExecuteAndWaitInterceptor.java
(original)
+++
incubator/webwork2/src/java/org/apache/struts/action2/interceptor/ExecuteAndWaitInterceptor.java
Thu Mar 23 21:50:22 2006
@@ -189,7 +189,7 @@
"'! 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);
}
Modified:
incubator/webwork2/src/java/org/apache/struts/action2/portlet/dispatcher/Jsr168Dispatcher.java
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/portlet/dispatcher/Jsr168Dispatcher.java?rev=388388&r1=388387&r2=388388&view=diff
==============================================================================
---
incubator/webwork2/src/java/org/apache/struts/action2/portlet/dispatcher/Jsr168Dispatcher.java
(original)
+++
incubator/webwork2/src/java/org/apache/struts/action2/portlet/dispatcher/Jsr168Dispatcher.java
Thu Mar 23 21:50:22 2006
@@ -183,7 +183,7 @@
portletNamespace = "";
}
LocalizedTextUtil
-
.addDefaultResourceBundle("com/opensymphony/webwork/webwork-messages");
+
.addDefaultResourceBundle("org/apache/struts/action2/webwork-messages");
//check for configuration reloading
if ("true".equalsIgnoreCase(Configuration
Modified:
incubator/webwork2/src/test/org/apache/struts/action2/config/ConfigurationTest.java
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/config/ConfigurationTest.java?rev=388388&r1=388387&r2=388388&view=diff
==============================================================================
---
incubator/webwork2/src/test/org/apache/struts/action2/config/ConfigurationTest.java
(original)
+++
incubator/webwork2/src/test/org/apache/struts/action2/config/ConfigurationTest.java
Thu Mar 23 21:50:22 2006
@@ -23,7 +23,7 @@
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 @@
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();
Modified:
incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/PlainTextResultTest.java
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/PlainTextResultTest.java?rev=388388&r1=388387&r2=388388&view=diff
==============================================================================
---
incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/PlainTextResultTest.java
(original)
+++
incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/PlainTextResultTest.java
Thu Mar 23 21:50:22 2006
@@ -44,7 +44,7 @@
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 @@
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 @@
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 @@
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 {
Modified:
incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/ServletDispatcherTest.java
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/ServletDispatcherTest.java?rev=388388&r1=388387&r2=388388&view=diff
==============================================================================
---
incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/ServletDispatcherTest.java
(original)
+++
incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/ServletDispatcherTest.java
Thu Mar 23 21:50:22 2006
@@ -17,7 +17,7 @@
*/
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() {
Modified:
incubator/webwork2/src/test/org/apache/struts/action2/sitegraph/SiteGraphTest.java
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/sitegraph/SiteGraphTest.java?rev=388388&r1=388387&r2=388388&view=diff
==============================================================================
---
incubator/webwork2/src/test/org/apache/struts/action2/sitegraph/SiteGraphTest.java
(original)
+++
incubator/webwork2/src/test/org/apache/struts/action2/sitegraph/SiteGraphTest.java
Thu Mar 23 21:50:22 2006
@@ -13,13 +13,13 @@
*/
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());
}
}
Modified:
incubator/webwork2/src/test/org/apache/struts/action2/spring/WebWorkSpringObjectFactoryTest.java
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/spring/WebWorkSpringObjectFactoryTest.java?rev=388388&r1=388387&r2=388388&view=diff
==============================================================================
---
incubator/webwork2/src/test/org/apache/struts/action2/spring/WebWorkSpringObjectFactoryTest.java
(original)
+++
incubator/webwork2/src/test/org/apache/struts/action2/spring/WebWorkSpringObjectFactoryTest.java
Thu Mar 23 21:50:22 2006
@@ -42,7 +42,7 @@
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);
Modified: incubator/webwork2/src/test/webwork.properties
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/src/test/webwork.properties?rev=388388&r1=388387&r2=388388&view=diff
==============================================================================
--- incubator/webwork2/src/test/webwork.properties (original)
+++ incubator/webwork2/src/test/webwork.properties Thu Mar 23 21:50:22 2006
@@ -4,7 +4,7 @@
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
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
