From 808abc64a0833f7ec491a95a090d5ec91ebce672 Mon Sep 17 00:00:00 2001 From: "Donald J. Brown" Date: Thu, 13 Jul 2006 23:52:21 +0000 Subject: [PATCH] Fixing last references of xwork.xml that I could find WW-1344 git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@421745 13f79535-47bb-0310-9956-ffa450edef68 --- apps/shopping-cart/src/main/resources/struts.properties | 2 +- core/src/main/resources/org/apache/struts2/default.properties | 2 +- .../resources/org/apache/struts2/sitegraph/sitegraph-usage.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/shopping-cart/src/main/resources/struts.properties b/apps/shopping-cart/src/main/resources/struts.properties index c5f712daf..aa081ab68 100644 --- a/apps/shopping-cart/src/main/resources/struts.properties +++ b/apps/shopping-cart/src/main/resources/struts.properties @@ -6,7 +6,7 @@ struts.objectFactory=spring struts.objectFactory.spring.autoWire=type ### Configuration reloading -# This will cause the configuration to reload xwork.xml when it is changed +# This will cause the configuration to reload struts.xml when it is changed struts.configuration.xml.reload=true ### Load custom default resource bundles diff --git a/core/src/main/resources/org/apache/struts2/default.properties b/core/src/main/resources/org/apache/struts2/default.properties index aac3b6b09..2b2465328 100644 --- a/core/src/main/resources/org/apache/struts2/default.properties +++ b/core/src/main/resources/org/apache/struts2/default.properties @@ -99,7 +99,7 @@ struts.ui.templateDir=template struts.ui.templateSuffix=ftl ### Configuration reloading -### This will cause the configuration to reload xwork.xml when it is changed +### This will cause the configuration to reload struts.xml when it is changed struts.configuration.xml.reload=false ### Location of velocity.properties file. defaults to velocity.properties diff --git a/core/src/main/resources/org/apache/struts2/sitegraph/sitegraph-usage.txt b/core/src/main/resources/org/apache/struts2/sitegraph/sitegraph-usage.txt index c1dced13a..258d01972 100644 --- a/core/src/main/resources/org/apache/struts2/sitegraph/sitegraph-usage.txt +++ b/core/src/main/resources/org/apache/struts2/sitegraph/sitegraph-usage.txt @@ -1,6 +1,6 @@ // START SNIPPET: sitegraph-usage Usage: -config CONFIG_DIR -views VIEWS_DIRS -output OUTPUT [-ns NAMESPACE] - CONFIG_DIR => a directory containing xwork.xml + CONFIG_DIR => a directory containing struts.xml VIEWS_DIRS => comma seperated list of dirs containing JSPs, VMs, etc OUPUT => the directory where the output should go NAMESPACE => the namespace path restriction (/, /foo, etc)