svn commit: r523619 - in /struts/struts2/branches/STRUTS_2_0_X/core: pom.xml src/main/java/org/apache/struts2/components/I18n.java src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
Author: rgielen
Date: Thu Mar 29 01:31:43 2007
New Revision: 523619
URL: http://svn.apache.org/viewvc?view=rev&rev=523619
Log:
WW-1856:
Use changed TextProviderFactory (for upcoming XW 2.0.2) to fix issue with
broken i18n tag / missing thread safety for TPF
See also:
http://jira.opensymphony.com/browse/XW-487
http://jira.opensymphony.com/browse/XW-476
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/pom.xml
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/I18n.java
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
Modified: struts/struts2/branches/STRUTS_2_0_X/core/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/pom.xml?view=diff&rev=523619&r1=523618&r2=523619
==
--- struts/struts2/branches/STRUTS_2_0_X/core/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_0_X/core/pom.xml Thu Mar 29 01:31:43 2007
@@ -252,7 +252,7 @@
opensymphony
xwork
-2.0.1
+2.0.2-SNAPSHOT
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/I18n.java
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/I18n.java?view=diff&rev=523619&r1=523618&r2=523619
==
---
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/I18n.java
(original)
+++
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/I18n.java
Thu Mar 29 01:31:43 2007
@@ -20,20 +20,19 @@
*/
package org.apache.struts2.components;
-import java.io.Writer;
-import java.util.Locale;
-import java.util.ResourceBundle;
-
-import org.apache.struts2.views.annotations.StrutsTag;
-import org.apache.struts2.views.annotations.StrutsTagAttribute;
-import org.apache.struts2.StrutsException;
-
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.LocaleProvider;
-import com.opensymphony.xwork2.TextProviderSupport;
import com.opensymphony.xwork2.TextProviderFactory;
import com.opensymphony.xwork2.util.LocalizedTextUtil;
import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.StrutsException;
+import org.apache.struts2.dispatcher.Dispatcher;
+import org.apache.struts2.views.annotations.StrutsTag;
+import org.apache.struts2.views.annotations.StrutsTagAttribute;
+
+import java.io.Writer;
+import java.util.Locale;
+import java.util.ResourceBundle;
/**
*
@@ -103,7 +102,9 @@
if (bundle != null) {
final Locale locale = (Locale)
getStack().getContext().get(ActionContext.LOCALE);
-getStack().push(TextProviderFactory.getInstance(bundle, new
LocaleProvider() {
+TextProviderFactory tpf = new TextProviderFactory();
+Dispatcher.getInstance().getContainer().inject(tpf);
+getStack().push(tpf.createInstance(bundle, new
LocaleProvider() {
public Locale getLocale() {
return locale;
}
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java?view=diff&rev=523619&r1=523618&r2=523619
==
---
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
(original)
+++
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
Thu Mar 29 01:31:43 2007
@@ -401,9 +401,6 @@
ObjectTypeDeterminer objectTypeDeterminer =
container.getInstance(ObjectTypeDeterminer.class);
ObjectTypeDeterminerFactory.setInstance(objectTypeDeterminer);
-TextProvider textProvider = container.getInstance(TextProvider.class);
-TextProviderFactory.setInstance(textProvider);
-
return container;
}
svn commit: r523622 - in /struts/struts2/trunk/core: pom.xml src/main/java/org/apache/struts2/components/I18n.java src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
Author: rgielen
Date: Thu Mar 29 01:34:01 2007
New Revision: 523622
URL: http://svn.apache.org/viewvc?view=rev&rev=523622
Log:
WW-1856:
Use changed TextProviderFactory (for upcoming XW 2.0.2) to fix issue with
broken i18n tag / missing thread safety for TPF
See also:
http://jira.opensymphony.com/browse/XW-487
http://jira.opensymphony.com/browse/XW-476
Modified:
struts/struts2/trunk/core/pom.xml
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/I18n.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
Modified: struts/struts2/trunk/core/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/pom.xml?view=diff&rev=523622&r1=523621&r2=523622
==
--- struts/struts2/trunk/core/pom.xml (original)
+++ struts/struts2/trunk/core/pom.xml Thu Mar 29 01:34:01 2007
@@ -252,7 +252,7 @@
opensymphony
xwork
-2.0.1
+2.0.2-SNAPSHOT
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/I18n.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/I18n.java?view=diff&rev=523622&r1=523621&r2=523622
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/I18n.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/I18n.java
Thu Mar 29 01:34:01 2007
@@ -27,6 +27,7 @@
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
import org.apache.struts2.StrutsException;
+import org.apache.struts2.dispatcher.Dispatcher;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.LocaleProvider;
@@ -102,7 +103,9 @@
if (bundle != null) {
final Locale locale = (Locale)
getStack().getContext().get(ActionContext.LOCALE);
-getStack().push(TextProviderFactory.getInstance(bundle, new
LocaleProvider() {
+TextProviderFactory tpf = new TextProviderFactory();
+Dispatcher.getInstance().getContainer().inject(tpf);
+getStack().push(tpf.createInstance(bundle, new
LocaleProvider() {
public Locale getLocale() {
return locale;
}
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java?view=diff&rev=523622&r1=523621&r2=523622
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
Thu Mar 29 01:34:01 2007
@@ -401,9 +401,6 @@
ObjectTypeDeterminer objectTypeDeterminer =
container.getInstance(ObjectTypeDeterminer.class);
ObjectTypeDeterminerFactory.setInstance(objectTypeDeterminer);
-TextProvider textProvider = container.getInstance(TextProvider.class);
-TextProviderFactory.setInstance(textProvider);
-
return container;
}
svn commit: r523646 - /struts/maven/trunk/struts2-archetype-starter/README.txt
Author: rgielen Date: Thu Mar 29 02:21:28 2007 New Revision: 523646 URL: http://svn.apache.org/viewvc?view=rev&rev=523646 Log: version update Modified: struts/maven/trunk/struts2-archetype-starter/README.txt Modified: struts/maven/trunk/struts2-archetype-starter/README.txt URL: http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-starter/README.txt?view=diff&rev=523646&r1=523645&r2=523646 == --- struts/maven/trunk/struts2-archetype-starter/README.txt (original) +++ struts/maven/trunk/struts2-archetype-starter/README.txt Thu Mar 29 02:21:28 2007 @@ -31,7 +31,7 @@ -DartifactId=myWebApp \ -DarchetypeGroupId=org.apache.struts \ -DarchetypeArtifactId=struts2-archetype-starter \ - -DarchetypeVersion=2.0.2-SNAPSHOT \ + -DarchetypeVersion=2.0.6-SNAPSHOT \ -DremoteRepositories=http://people.apache.org/maven-snapshot-repository
[CONF] Confluence Changes in the last 24 hours
- This is a daily summary of all recent changes in Confluence. - Updated Spaces: - Apache Camel (CAMEL) http://cwiki.apache.org/confluence/display/CAMEL | |-Pages Added or Edited in This Space |-- Type Converter was created by jstrachan (08:30 AM). | http://cwiki.apache.org/confluence/display/CAMEL/Type+Converter Apache CXF 2.0 Documentation (CXF20DOC) http://cwiki.apache.org/confluence/display/CXF20DOC | |-Pages Added or Edited in This Space |-- Service Routing was last edited by jliu (11:06 PM). | http://cwiki.apache.org/confluence/display/CXF20DOC/Service+Routing |-- Maven Integration and Plugin was last edited by dandiep (11:51 AM). | http://cwiki.apache.org/confluence/display/CXF20DOC/Maven+Integration+and+Plugin Apache Directory Server v1.5 (DIRxSRVx11) http://cwiki.apache.org/confluence/display/DIRxSRVx11 | |-Pages Added or Edited in This Space |-- Index was last edited by ck (12:27 PM). | http://cwiki.apache.org/confluence/display/DIRxSRVx11/Index |-- ApacheDS v1.5 Basic User's Guide was created by ck (12:20 PM). | http://cwiki.apache.org/confluence/display/DIRxSRVx11/ApacheDS+v1.5+Basic+User%27s+Guide Apache Geronimo v1.1 (GMOxDOC11) http://cwiki.apache.org/confluence/display/GMOxDOC11 | |-Pages Added or Edited in This Space |-- geronimo-application.xml was last edited by [EMAIL PROTECTED] (03:34 AM). | http://cwiki.apache.org/confluence/display/GMOxDOC11/geronimo-application.xml Apache Struts 2 Documentation (WW) http://cwiki.apache.org/confluence/display/WW | |-Pages Added or Edited in This Space |-- table was last edited by musachy (01:35 PM). | http://cwiki.apache.org/confluence/display/WW/table |-- Struts 2 + Spring 2 + JPA + AJAX was last edited by musachy (01:26 PM). | http://cwiki.apache.org/confluence/pages/viewpage.action?pageId=33168 |-- Writing Interceptors was last edited by musachy (10:02 AM). | http://cwiki.apache.org/confluence/display/WW/Writing+Interceptors |-- Tutorials was last edited by husted (09:44 AM). | http://cwiki.apache.org/confluence/display/WW/Tutorials Apache Wicket Website (WICKETxSITE) http://cwiki.apache.org/confluence/display/WICKETxSITE | |-Pages Added or Edited in This Space |-- Index was last edited by dashorst (01:37 PM). | http://cwiki.apache.org/confluence/display/WICKETxSITE/Index |-- Navigation was last edited by dashorst (01:32 PM). | http://cwiki.apache.org/confluence/display/WICKETxSITE/Navigation |-- Building from SVN was last edited by dashorst (01:26 PM). | http://cwiki.apache.org/confluence/display/WICKETxSITE/Building+from+SVN Apache Directory Server v1.0 (DIRxSRVx10) http://cwiki.apache.org/confluence/display/DIRxSRVx10 | |-Pages Added or Edited in This Space |-- Navigation was last edited by ck (11:35 AM). | http://cwiki.apache.org/confluence/display/DIRxSRVx10/Navigation Apache Tuscany (TUSCANY) http://cwiki.apache.org/confluence/display/TUSCANY | |-Pages Added or Edited in This Space |-- Deployment was last edited by [EMAIL PROTECTED] (03:29 PM). | http://cwiki.apache.org/confluence/display/TUSCANY/Deployment |-- Kernel Modulization Design Discussions was last edited by [EMAIL PROTECTED] (03:25 PM). | http://cwiki.apache.org/confluence/display/TUSCANY/Kernel+Modulization+Design+Discussions |-- Feature areas and what folks are working on was last edited by [EMAIL PROTECTED] (07:31 AM). | http://cwiki.apache.org/confluence/display/TUSCANY/Feature+areas+and+what+folks+are+working+on Apache Wicket (WICKET) http://cwiki.apache.org/confluence/display/WICKET | |-Pages Added or Edited in This Space |-- Migrate-1.3 was last edited by ehillenius (09:40 PM). | http://cwiki.apache.org/confluence/display/WICKET/Migrate-1.3 |-- Wiki move was last edited by gwynevans (10:37 AM). | http://cwiki.apache.org/confluence/display/WICKET/Wiki+move |-- Spring was last edited by [EMAIL PROTECTED] (12:26 AM). | http://cwiki.apache.org/confluence/display/WICKET/Spring Apache Geronimo v1.2 (GMOxDOC12) http://cwiki.apache.org/confluence/display/GMOxDOC12 | |-Pages Added or Edited in This Space |-- DB Pool Testing sample application (1.2 Ok) was last edited by hcunico (06:38 AM). | http://cwiki.apache.org/confluence/display/GMOxDOC12/DB+Pool+Testing+sample+application+%281.2+Ok%29 Felix (FELIX) http://cwiki.apache.org/confluence/display/FELIX | |-Pages Added or Edited in This Space |-- Service Component Runtime Tutorial was last edited by fmeschbe (07:26 AM). | http://cwiki.apache.org/confluence/display/FELIX/Service+Component+Runtime+Tutorial Apache Qpid (qpid) http://cwiki.apache.org/confluence/display/qpid | |-Pages Added or Edited in This Space |-- Cluster Design Note was last edited by aconway (02:08 PM). | http://cwiki.apache.org/confluence/display
