[Struts Wiki] Update of "StrutsActionRelease200" by TedHusted
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Struts Wiki" for change notification. The following page has been changed by TedHusted: http://wiki.apache.org/struts/StrutsActionRelease200 The comment on the change is: Link to 2.0.0 JIRA report -- == See Also == + * [http://issues.apache.org/struts/secure/IssueNavigator.jspa?reset=true&mode=hide&sorter/order=DESC&sorter/field=priority&resolution=-1&pid=10030&fixfor=21510 Issue Tracker] * [http://wiki.apache.org/struts/StrutsTi Struts Ti Proposal] * [http://wiki.apache.org/struts/StrutsAction2 Migration Issues] * [http://wiki.apache.org/struts/RoughSpots SAF2 Rough Spots]
svn commit: r413643 - /struts/action2/trunk/apps/showcase/src/main/resources/struts.properties
Author: tmjee Date: Mon Jun 12 05:16:02 2006 New Revision: 413643 URL: http://svn.apache.org/viewvc?rev=413643&view=rev Log: - added an entry for custom freemarker (needed by one of the example in showcase) - added entry to disable browser cache, for easier debugging showcase Modified: struts/action2/trunk/apps/showcase/src/main/resources/struts.properties Modified: struts/action2/trunk/apps/showcase/src/main/resources/struts.properties URL: http://svn.apache.org/viewvc/struts/action2/trunk/apps/showcase/src/main/resources/struts.properties?rev=413643&r1=413642&r2=413643&view=diff == --- struts/action2/trunk/apps/showcase/src/main/resources/struts.properties (original) +++ struts/action2/trunk/apps/showcase/src/main/resources/struts.properties Mon Jun 12 05:16:02 2006 @@ -6,3 +6,7 @@ struts.custom.i18n.resources=globalMessages #struts.action.extension=jspa struts.url.http.port = 8080 +struts.freemarker.manager.classname=customFreemarkerManager + +struts.serve.static=true +struts.serve.static.browserCache=false
svn commit: r413650 - /struts/shale/branches/mvn_reorg/pom.xml
Author: wsmoak Date: Mon Jun 12 06:18:01 2006 New Revision: 413650 URL: http://svn.apache.org/viewvc?rev=413650&view=rev Log: [SHALE-179] Changed the profile activation strategy for building with MyFaces vs. JSF RI. MyFaces is now the default. To build with the RI, use -Djsf=ri on the command line. Suggested By: Roland Asmann Modified: struts/shale/branches/mvn_reorg/pom.xml Modified: struts/shale/branches/mvn_reorg/pom.xml URL: http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/pom.xml?rev=413650&r1=413649&r2=413650&view=diff == --- struts/shale/branches/mvn_reorg/pom.xml (original) +++ struts/shale/branches/mvn_reorg/pom.xml Mon Jun 12 06:18:01 2006 @@ -70,10 +70,8 @@ myfaces -true -maven.shale.jsf.impl -myfaces +!jsf @@ -110,8 +108,8 @@ jsfri -maven.shale.jsf.impl -jsfri +jsf +ri @@ -192,7 +190,7 @@ --> - + org.apache.struts @@ -200,9 +198,9 @@ 1.0.1 - + install - +
[Struts Wiki] Update of "Shale/BuildingWithMaven2" by WendySmoak
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Struts Wiki" for change
notification.
The following page has been changed by WendySmoak:
http://wiki.apache.org/struts/Shale/BuildingWithMaven2
The comment on the change is:
MyFaces is now the default. Use -Djsf=ri to build with the RI.
--
__To build all of shale__ (run from the root of your local Subversion
checkout of shale)
|| Command || Status || Plugin || Artifacts ||
- || $mvn|| failure - you must provide a profile (see mvn -Pjsfri) || || ||
- || $mvn -Pmyfaces || success || || For each project under the root, you'll
see {project}/target/{project}-{ver}.jar, and for each sample app under
shale-apps/, {app}/target/{app}.war ||
+ || $mvn || success (MyFaces) || || For each project under the root, you'll
see {project}/target/{project}-{ver}.jar, and for each sample app under
shale-apps/, {app}/target/{app}.war ||
- || $mvn -Pjsfri || success || || ||
+ || $mvn -Djsf=ri || success (JSF RI) || || ||
- || $mvn -Pmyfaces,designtime || Must have Sun Studio Creator jars installed
in your local maven repository, see designtime/pom.xml for details || || ||
+ || $mvn -Pdesigntime || Must have Sun Studio Creator jars installed in your
local maven repository, see designtime/pom.xml for details || || ||
'''Note:''' The shale-tiger and shale-sql-browser modules will only be built
if you are using Java SE 5 (JDK 1.5). The profile is automatically activated
by the presence of JDK 1.5, there is nothing extra to add to the command line.
@@ -32, +31 @@
__To build the Shale assembly (distribution)__
{{{
- $ mvn site -Pmyfaces
+ $ mvn site
$ cd shale-dist
- $ mvn assembly:assembly -Pmyfaces
+ $ mvn assembly:assembly
}}}
The file(s) will be in target/assembly/out
[Struts Wiki] Update of "StrutsActionRelease200" by TedHusted
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Struts Wiki" for change notification. The following page has been changed by TedHusted: http://wiki.apache.org/struts/StrutsActionRelease200 The comment on the change is: Add JIRA link -- || Initial rename of packages and configuration files || Complete || || Pass Web``Work2 codebase through the Incubator || Complete || - || Update WW2 documentation for SAF2 || Step 3 of 4 || + || [http://issues.apache.org/struts/browse/WW-1340 Update WW2 documentation for SAF2] || Step 3 of 4 || || Condense Showcase and Examples applications into Cookbook || - || || Remove deprecated members (IoC components) || - || || Remove selected legacy API members (e.g. Around``Interceptor, "do" clause) || - ||
[Struts Wiki] Update of "StrutsActionRelease200" by TedHusted
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Struts Wiki" for change notification. The following page has been changed by TedHusted: http://wiki.apache.org/struts/StrutsActionRelease200 The comment on the change is: Add JIRA links -- || Initial rename of packages and configuration files || Complete || || Pass Web``Work2 codebase through the Incubator || Complete || || [http://issues.apache.org/struts/browse/WW-1340 Update WW2 documentation for SAF2] || Step 3 of 4 || - || Condense Showcase and Examples applications into Cookbook || - || - || Remove deprecated members (IoC components) || - || - || Remove selected legacy API members (e.g. Around``Interceptor, "do" clause) || - || - || Update Javadoc to match new package and configuration naming || - || + || [http://issues.apache.org/struts/browse/WW-1341 Utilize Cookbook format for Showcase and add Struts-Examples use cases] || - || + || [http://issues.apache.org/struts/browse/WW-1342 Remove deprecated members (IoC components)] || - || + || [http://issues.apache.org/struts/browse/WW-1343 Deprecate selected legacy API members (e.g. Around``Interceptor, "do" clause)] || - || + || [http://issues.apache.org/struts/browse/WW-1344 Update Javadoc to match new package and configuration naming] || - || || Implement selected new features and SAF1 features (infra) || - || - || Add SAF1 and WW2 Migration Guides || - || - || Develop routine for exporting wiki to HTML/PDF || - || + || [http://issues.apache.org/struts/browse/WW-1345 Add SAF1 and WW2 Migration Guides] || - || + || [http://issues.apache.org/struts/browse/WW-1346 Develop routine for exporting wiki to HTML/PDF] || - || || Second documentation review || - || || Complete standard release plan || - || || - || - ||
[Struts Wiki] Update of "StrutsActionRelease200" by TedHusted
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Struts Wiki" for change notification. The following page has been changed by TedHusted: http://wiki.apache.org/struts/StrutsActionRelease200 The comment on the change is: Catagorize issues -- == New Features Under Consideration == - This initial list of new features is taken from the RoughSpots page. + This initial list of new features is taken from the [http://wiki.apache.org/struts/RoughSpots SAF2 Rough Spots] page. + + Review and Refinement * Separate classes that most applications need to use. Isolate classes that the framework uses internally or that are rarely used by applications. (See Rough Spot #3.) * Distinguish between the published public versus private APIs. (See Rough Spot #4.) + * Utilize properties (methods) instead of protected or public fields (). (See #13.0 + * Review exception handling. Some are still being swallowed rather than rethrown. (See #20.) + + Modifications + + * Simplify Text``Provider. (See #15.) + * Modify `ParametersInterceptor` to sort parameter names by depth (using bucket sort) and then map them in that order (shallowest first). (See #21.) + * Use the strategy pattern to swap in different implementations of interfaces like Validation``Aware. (See Tim, NTH #1.) + + [http://issues.apache.org/struts/browse/WW-1343 Deprecations and Removals] + * Deprecate or remove the Around``Interceptor. (See #7.) - * Utilize properties (methods) instead of protected or public fields (). (See #13.0 - * Simplify Text``Provider. (See #15.) + * Eliminate "do" clause for Action alias lookups. Scan Actions at load time for known aliases, and fail fast. + + OGNL + * On the OGNL value stack, rename #request for request parameters and #requestAttributes for request attributes. (See #17.) - * Eliminate "do" clause for Action alias lookups. Scan Actions at load time for known aliases, and fail fast. - * Review exception handling. Some are still being swallowed rather than rethrown. (See #20.) - * Modify `ParametersInterceptor` to sort parameter names by depth (using bucket sort) and then map them in that order (shallowest first). (See #21.) + * Work with OGNL to add Java 5 support. (See #31.) + * Work with OGNL to make it a clear superset of JSTL. (See Gabe #4.) + + Architecture + + * Address the confusing issue of the validation/workflow lifecycle and different methods. (See Patrick #4.) + + Configuration + * Reduce or eliminate need to use fully-qualified class names, over and over. (See #23.) + * Combine configuration DTDs so that Actions, Messages, and Validators can be defined in a single file. (See Ted, #1.) + * Use values on the stack to override/define configuration options. (See Tim, NTH #3.) - * Work with OGNL to add Java 5 support. (See #31.) - * Address the confusing issue of the validation/workflow lifecycle and different methods. (See Patrick #4.) - * Work with OGNL to make it a clear superset of JSTL. (See Gabe #4.) - * Use the strategy pattern to swap in different implementations of interfaces like Validation``Aware. (See Tim, NTH #1.) - * Extends support on actions in xml (See Tim, NTH #2.) - Other feature suggestions + UI Tags - * Use values on the stack to override/define configuration options. (See Tim, NTH #3.) - * Combine configuration DTDs so that Actions, Messages, and Validators can be defined in a single file. (See Ted, #1.) * Change the default submit method for the form tag from GET to POST (See Ted, #2.) - == SAF1 Features to Implement == + == [http://issues.apache.org/struts/browse/WW-1347 SAF1 Features to Implement] == * Wildcard Action Mappings * DynaForm as Model Object - * Extends for action mappings + * Extends for action mappings (See Tim, NTH #2.) == Outstanding Issue Review ==
[Struts Wiki] Update of "StrutsActionRelease200" by TedHusted
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Struts Wiki" for change notification. The following page has been changed by TedHusted: http://wiki.apache.org/struts/StrutsActionRelease200 The comment on the change is: Catagorize issues -- * Combine configuration DTDs so that Actions, Messages, and Validators can be defined in a single file. (See Ted, #1.) * Use values on the stack to override/define configuration options. (See Tim, NTH #3.) - UI Tags - - * Change the default submit method for the form tag from GET to POST (See Ted, #2.) - == [http://issues.apache.org/struts/browse/WW-1347 SAF1 Features to Implement] == * Wildcard Action Mappings * DynaForm as Model Object * Extends for action mappings (See Tim, NTH #2.) + * Change the default submit method for the form tag from GET to POST (See Ted, #2.) == Outstanding Issue Review ==
[Struts Wiki] Update of "StrutsActionRelease200" by TedHusted
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Struts Wiki" for change notification. The following page has been changed by TedHusted: http://wiki.apache.org/struts/StrutsActionRelease200 The comment on the change is: Catagorize issues -- * Deprecate or remove the Around``Interceptor. (See #7.) * Eliminate "do" clause for Action alias lookups. Scan Actions at load time for known aliases, and fail fast. - OGNL - - * On the OGNL value stack, rename #request for request parameters and #requestAttributes for request attributes. (See #17.) - * Work with OGNL to add Java 5 support. (See #31.) - * Work with OGNL to make it a clear superset of JSTL. (See Gabe #4.) - Architecture * Address the confusing issue of the validation/workflow lifecycle and different methods. (See Patrick #4.) @@ -100, +94 @@ * Combine configuration DTDs so that Actions, Messages, and Validators can be defined in a single file. (See Ted, #1.) * Use values on the stack to override/define configuration options. (See Tim, NTH #3.) + OGNL + + * On the OGNL value stack, rename #request for request parameters and #requestAttributes for request attributes. (See #17.) + * Work with OGNL to add Java 5 support. (See #31.) + * Work with OGNL to make it a clear superset of JSTL. (See Gabe #4.) + + == SAF1 Features to Implement == + - == [http://issues.apache.org/struts/browse/WW-1347 SAF1 Features to Implement] == + [http://issues.apache.org/struts/browse/WW-1347 JIRA issue] * Wildcard Action Mappings * DynaForm as Model Object * Extends for action mappings (See Tim, NTH #2.) * Change the default submit method for the form tag from GET to POST (See Ted, #2.) + + == Outstanding Issue Review ==
[Struts Wiki] Update of "StrutsActionRelease200" by TedHusted
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Struts Wiki" for change notification. The following page has been changed by TedHusted: http://wiki.apache.org/struts/StrutsActionRelease200 The comment on the change is: Catagorize issues -- * Separate classes that most applications need to use. Isolate classes that the framework uses internally or that are rarely used by applications. (See Rough Spot #3.) * Distinguish between the published public versus private APIs. (See Rough Spot #4.) - * Utilize properties (methods) instead of protected or public fields (). (See #13.0 + * Utilize properties (methods) instead of protected or public fields (). (See #13.) * Review exception handling. Some are still being swallowed rather than rethrown. (See #20.) Modifications @@ -105, +105 @@ [http://issues.apache.org/struts/browse/WW-1347 JIRA issue] * Wildcard Action Mappings - * DynaForm as Model Object + * Dyna``Form as Model Object * Extends for action mappings (See Tim, NTH #2.) * Change the default submit method for the form tag from GET to POST (See Ted, #2.)
[Struts Wiki] Update of "StrutsActionRelease200" by TedHusted
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Struts Wiki" for change notification. The following page has been changed by TedHusted: http://wiki.apache.org/struts/StrutsActionRelease200 The comment on the change is: Link JIRA issues -- * Separate classes that most applications need to use. Isolate classes that the framework uses internally or that are rarely used by applications. (See Rough Spot #3.) * Distinguish between the published public versus private APIs. (See Rough Spot #4.) * Utilize properties (methods) instead of protected or public fields (). (See #13.) - * Review exception handling. Some are still being swallowed rather than rethrown. (See #20.) + * Review exception handling. Some are still being swallowed rather than rethrown. (See #20 and [http://issues.apache.org/struts/browse/WW-652 WW-652]) Modifications
[Struts Wiki] Update of "StrutsActionRelease200" by TedHusted
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Struts Wiki" for change notification. The following page has been changed by TedHusted: http://wiki.apache.org/struts/StrutsActionRelease200 The comment on the change is: Link JIRA issues -- OGNL - * On the OGNL value stack, rename #request for request parameters and #requestAttributes for request attributes. (See #17.) + * On the OGNL value stack, rename #request for request parameters and #requestAttributes for request attributes. (See #17 and [http://issues.apache.org/struts/browse/WW-785 WW-785].) * Work with OGNL to add Java 5 support. (See #31.) * Work with OGNL to make it a clear superset of JSTL. (See Gabe #4.)
svn commit: r413781 - /struts/shale/branches/mvn_reorg/shale-dist/src/assemble/dist.xml
Author: craigmcc Date: Mon Jun 12 18:40:30 2006 New Revision: 413781 URL: http://svn.apache.org/viewvc?rev=413781&view=rev Log: Add filesets for the rest of the top-level framework modules (but comment out the one for shale-designtime ... I still need to do cleanup work on that module). Issue -- it copies all the sources, but the only shale-*.jar included is the one for core. Also, add an Apache license at the top of the assembly configuration file. Modified: struts/shale/branches/mvn_reorg/shale-dist/src/assemble/dist.xml Modified: struts/shale/branches/mvn_reorg/shale-dist/src/assemble/dist.xml URL: http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-dist/src/assemble/dist.xml?rev=413781&r1=413780&r2=413781&view=diff == --- struts/shale/branches/mvn_reorg/shale-dist/src/assemble/dist.xml (original) +++ struts/shale/branches/mvn_reorg/shale-dist/src/assemble/dist.xml Mon Jun 12 18:40:30 2006 @@ -1,4 +1,25 @@ + + + dist zip @@ -24,6 +45,14 @@ +../shale-clay +src/shale-clay + +pom.xml +src/ + + + ../shale-core src/shale-core @@ -31,6 +60,56 @@ src/ + + +../shale-remoting +src/shale-remoting + +pom.xml +src/ + + + +../shale-spring +src/shale-spring + +pom.xml +src/ + + + +../shale-test +src/shale-test + +pom.xml +src/ + + + +../shale-tiger +src/shale-tiger + +pom.xml +src/ + + + +../shale-tiles +src/shale-tiles + +pom.xml +src/ + + @@ -38,9 +117,40 @@ docs/ +../shale-clay/target/site +docs/shale-clay + + ../shale-core/target/site docs/shale-core + + +../shale-remoting/target/site +docs/shale-remoting + + +../shale-spring/target/site +docs/shale-spring + + +../shale-test/target/site +docs/shale-test + + +../shale-tiger/target/site +docs/shale-tiger + + +../shale-tiles/target/site +docs/shale-tiles + - \ No newline at end of file + +
svn commit: r413783 - /struts/shale/branches/mvn_reorg/shale-dist/pom.xml
Author: craigmcc
Date: Mon Jun 12 18:46:48 2006
New Revision: 413783
URL: http://svn.apache.org/viewvc?rev=413783&view=rev
Log:
Add the other binary dependencies so the corresponding JARs will get
included in the assembly.
Modified:
struts/shale/branches/mvn_reorg/shale-dist/pom.xml
Modified: struts/shale/branches/mvn_reorg/shale-dist/pom.xml
URL:
http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-dist/pom.xml?rev=413783&r1=413782&r2=413783&view=diff
==
--- struts/shale/branches/mvn_reorg/shale-dist/pom.xml (original)
+++ struts/shale/branches/mvn_reorg/shale-dist/pom.xml Mon Jun 12 18:46:48 2006
@@ -52,7 +52,49 @@
org.apache.struts.shale
+shale-clay
+${version}
+
+
+org.apache.struts.shale
shale-core
+${version}
+
+
+
+org.apache.struts.shale
+shale-remoting
+${version}
+
+
+org.apache.struts.shale
+shale-spring
+${version}
+
+
+org.apache.struts.shale
+shale-spring
+${version}
+
+
+org.apache.struts.shale
+shale-test
+${version}
+
+
+org.apache.struts.shale
+shale-tiger
+${version}
+
+
+org.apache.struts.shale
+shale-tiles
${version}
svn commit: r413788 - in /struts/shale/branches/mvn_reorg/shale-clay/src: main/java/org/apache/shale/clay/component/ main/java/org/apache/shale/clay/component/chain/ main/java/org/apache/shale/clay/co
Author: gvanmatre
Date: Mon Jun 12 19:34:20 2006
New Revision: 413788
URL: http://svn.apache.org/viewvc?rev=413788&view=rev
Log:
Fix for issue SHALE-187
Added:
struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/config/beans/AbstractBean.java
(with props)
struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/config/beans/SymbolBean.java
(with props)
struts/shale/branches/mvn_reorg/shale-clay/src/test/java/org/apache/shale/clay/config/DesigntimeTestCase.java
(with props)
Modified:
struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/component/Clay.java
struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/component/chain/AbstractCommand.java
struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/config/ClayXmlParser.java
struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/config/beans/AttributeBean.java
struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/config/beans/ComponentBean.java
struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/config/beans/ComponentConfigBean.java
struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/Builder.java
struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/ElementBuilder.java
struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/JsfDefaultBuilder.java
struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/taglib/SymbolTag.java
struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/utils/ClayAmalgam.java
struts/shale/branches/mvn_reorg/shale-clay/src/test/java/org/apache/shale/clay/config/SymbolsTestCase.java
Modified:
struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/component/Clay.java
URL:
http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/component/Clay.java?rev=413788&r1=413787&r2=413788&view=diff
==
---
struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/component/Clay.java
(original)
+++
struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/component/Clay.java
Mon Jun 12 19:34:20 2006
@@ -42,6 +42,7 @@
import org.apache.shale.clay.config.beans.ComponentBean;
import org.apache.shale.clay.config.beans.ConfigBean;
import org.apache.shale.clay.config.beans.ConfigBeanFactory;
+import org.apache.shale.clay.config.beans.SymbolBean;
import org.apache.shale.util.Messages;
/**
@@ -211,7 +212,8 @@
*
*/
public String getManagedBeanName() {
-return (String) symbols.get(Globals.MANAGED_BEAN_MNEMONIC);
+SymbolBean symbol = (SymbolBean)
symbols.get(Globals.MANAGED_BEAN_MNEMONIC);
+return ((symbol != null) ? symbol.getValue() : null);
}
/**
@@ -221,7 +223,10 @@
*
*/
public void setManagedBeanName(String mbeanMnemonic) {
-symbols.put(Globals.MANAGED_BEAN_MNEMONIC, mbeanMnemonic);
+SymbolBean symbol = new SymbolBean();
+symbol.setName(Globals.MANAGED_BEAN_MNEMONIC);
+symbol.setValue(mbeanMnemonic);
+symbols.put(symbol.getName(), symbol);
}
/**
Modified:
struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/component/chain/AbstractCommand.java
URL:
http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/component/chain/AbstractCommand.java?rev=413788&r1=413787&r2=413788&view=diff
==
---
struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/component/chain/AbstractCommand.java
(original)
+++
struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/component/chain/AbstractCommand.java
Mon Jun 12 19:34:20 2006
@@ -28,6 +28,7 @@
import org.apache.commons.chain.Context;
import org.apache.commons.chain.config.ConfigParser;
import org.apache.shale.clay.config.Globals;
+import org.apache.shale.clay.config.beans.SymbolBean;
import org.apache.shale.util.Messages;
/**
@@ -102,8 +103,9 @@
int i = buff.indexOf("@");
replace: while (i > -1 && si.hasNext()) {
Map.Entry e = (Map.Entry) si.next();
-String key = (String) e.getKey();
-String value = (String) (e.getValue() == null ? "" : e.getValue());
+SymbolBean symbol = (SymbolBean) e.getValue();
+String key = symbol.getName();
+String value = (symbol.getValue() == null ? "" :
symbol.getValue());
i = (wasReplacementMade ? buff.
svn commit: r413789 - in /struts/shale/trunk/clay-plugin/src: java/org/apache/shale/clay/component/ java/org/apache/shale/clay/component/chain/ java/org/apache/shale/clay/config/ java/org/apache/shale
Author: gvanmatre
Date: Mon Jun 12 19:35:12 2006
New Revision: 413789
URL: http://svn.apache.org/viewvc?rev=413789&view=rev
Log:
Fix for issue SHALE-187
Added:
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/config/beans/AbstractBean.java
(with props)
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/config/beans/SymbolBean.java
(with props)
struts/shale/trunk/clay-plugin/src/test/org/apache/shale/clay/config/DesigntimeTestCase.java
(with props)
Modified:
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/component/Clay.java
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/component/chain/AbstractCommand.java
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/config/ClayXmlParser.java
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/config/beans/AttributeBean.java
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/config/beans/ComponentBean.java
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/config/beans/ComponentConfigBean.java
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/parser/builder/Builder.java
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/parser/builder/ElementBuilder.java
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/parser/builder/JsfDefaultBuilder.java
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/taglib/SymbolTag.java
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/utils/ClayAmalgam.java
struts/shale/trunk/clay-plugin/src/test/org/apache/shale/clay/config/SymbolsTestCase.java
Modified:
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/component/Clay.java
URL:
http://svn.apache.org/viewvc/struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/component/Clay.java?rev=413789&r1=413788&r2=413789&view=diff
==
---
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/component/Clay.java
(original)
+++
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/component/Clay.java
Mon Jun 12 19:35:12 2006
@@ -28,7 +28,6 @@
import javax.faces.component.UINamingContainer;
import javax.faces.context.FacesContext;
import javax.faces.el.MethodBinding;
-import javax.faces.el.ValueBinding;
import org.apache.commons.chain.Catalog;
import org.apache.commons.chain.CatalogFactory;
@@ -43,6 +42,7 @@
import org.apache.shale.clay.config.beans.ComponentBean;
import org.apache.shale.clay.config.beans.ConfigBean;
import org.apache.shale.clay.config.beans.ConfigBeanFactory;
+import org.apache.shale.clay.config.beans.SymbolBean;
import org.apache.shale.util.Messages;
/**
@@ -212,7 +212,8 @@
*
*/
public String getManagedBeanName() {
-return (String) symbols.get(Globals.MANAGED_BEAN_MNEMONIC);
+SymbolBean symbol = (SymbolBean)
symbols.get(Globals.MANAGED_BEAN_MNEMONIC);
+return ((symbol != null) ? symbol.getValue() : null);
}
/**
@@ -222,7 +223,10 @@
*
*/
public void setManagedBeanName(String mbeanMnemonic) {
-symbols.put(Globals.MANAGED_BEAN_MNEMONIC, mbeanMnemonic);
+SymbolBean symbol = new SymbolBean();
+symbol.setName(Globals.MANAGED_BEAN_MNEMONIC);
+symbol.setValue(mbeanMnemonic);
+symbols.put(symbol.getName(), symbol);
}
/**
Modified:
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/component/chain/AbstractCommand.java
URL:
http://svn.apache.org/viewvc/struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/component/chain/AbstractCommand.java?rev=413789&r1=413788&r2=413789&view=diff
==
---
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/component/chain/AbstractCommand.java
(original)
+++
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/component/chain/AbstractCommand.java
Mon Jun 12 19:35:12 2006
@@ -28,6 +28,7 @@
import org.apache.commons.chain.Context;
import org.apache.commons.chain.config.ConfigParser;
import org.apache.shale.clay.config.Globals;
+import org.apache.shale.clay.config.beans.SymbolBean;
import org.apache.shale.util.Messages;
/**
@@ -102,8 +103,9 @@
int i = buff.indexOf("@");
replace: while (i > -1 && si.hasNext()) {
Map.Entry e = (Map.Entry) si.next();
-String key = (String) e.getKey();
-String value = (String) (e.getValue() == null ? "" : e.getValue());
+SymbolBean symbol = (SymbolBean) e.getValue();
+String key = symbol.getName();
+String value = (symbol.getValue() == null ? "" :
symbol.getValue());
i = (wasReplacementMade ? buff.indexOf("@") : i);
if (i == -1)
break replace;
Modified:
struts/shale/trunk/clay-plu
