You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by mr...@apache.org on 2007/09/03 08:56:01 UTC
svn commit: r572239 [1/3] - in
/struts/sandbox/trunk/struts2-webwork2-plugin: ./ src/ src/main/
src/main/java/ src/main/java/com/ src/main/java/com/opensymphony/
src/main/java/com/opensymphony/webwork/
src/main/java/com/opensymphony/webwork/dispatcher/...
Author: mrdon
Date: Sun Sep 2 23:55:57 2007
New Revision: 572239
URL: http://svn.apache.org/viewvc?rev=572239&view=rev
Log:
Initial import
Added:
struts/sandbox/trunk/struts2-webwork2-plugin/
struts/sandbox/trunk/struts2-webwork2-plugin/LICENSE.txt
struts/sandbox/trunk/struts2-webwork2-plugin/NOTICE.txt
struts/sandbox/trunk/struts2-webwork2-plugin/pom.xml
struts/sandbox/trunk/struts2-webwork2-plugin/src/
struts/sandbox/trunk/struts2-webwork2-plugin/src/main/
struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/
struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/
struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/
struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/webwork/
struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/webwork/dispatcher/
struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/webwork/dispatcher/FilterDispatcher.java
struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/xwork/
struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/xwork/Action.java
struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/xwork/ActionContext.java
struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/xwork/ActionSupport.java
struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/xwork/LocaleProvider.java
struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/xwork/ModelDriven.java
struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/xwork/Preparable.java
struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/xwork/TextProvider.java
struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/xwork/Validateable.java
struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/xwork/ValidationAware.java
struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/xwork/ValidationAwareSupport.java
struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/xwork/interceptor/
struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/xwork/interceptor/NoParameters.java
struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/xwork/interceptor/ParameterNameAware.java
struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/org/
struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/org/apache/
struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/org/apache/struts2/
struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/org/apache/struts2/webwork2/
struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/org/apache/struts2/webwork2/WebWorkConfigurationProvider.java
struts/sandbox/trunk/struts2-webwork2-plugin/src/main/resources/
struts/sandbox/trunk/struts2-webwork2-plugin/src/main/resources/META-INF/
struts/sandbox/trunk/struts2-webwork2-plugin/src/main/resources/META-INF/webwork.tld
struts/sandbox/trunk/struts2-webwork2-plugin/src/main/resources/struts-plugin.xml
struts/sandbox/trunk/struts2-webwork2-plugin/src/main/resources/webwork-default.xml
Added: struts/sandbox/trunk/struts2-webwork2-plugin/LICENSE.txt
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-webwork2-plugin/LICENSE.txt?rev=572239&view=auto
==============================================================================
--- struts/sandbox/trunk/struts2-webwork2-plugin/LICENSE.txt (added)
+++ struts/sandbox/trunk/struts2-webwork2-plugin/LICENSE.txt Sun Sep 2 23:55:57 2007
@@ -0,0 +1,174 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
Added: struts/sandbox/trunk/struts2-webwork2-plugin/NOTICE.txt
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-webwork2-plugin/NOTICE.txt?rev=572239&view=auto
==============================================================================
--- struts/sandbox/trunk/struts2-webwork2-plugin/NOTICE.txt (added)
+++ struts/sandbox/trunk/struts2-webwork2-plugin/NOTICE.txt Sun Sep 2 23:55:57 2007
@@ -0,0 +1,6 @@
+Apache Struts
+
+Copyright 2006 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/
Added: struts/sandbox/trunk/struts2-webwork2-plugin/pom.xml
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-webwork2-plugin/pom.xml?rev=572239&view=auto
==============================================================================
--- struts/sandbox/trunk/struts2-webwork2-plugin/pom.xml (added)
+++ struts/sandbox/trunk/struts2-webwork2-plugin/pom.xml Sun Sep 2 23:55:57 2007
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-webwork2-plugin</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Struts 2 Plugin</name>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-core</artifactId>
+ <version>2.0.9</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-spring-plugin</artifactId>
+ <version>2.0.9</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <defaultGoal>install</defaultGoal>
+ </build>
+
+</project>
Added: struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/webwork/dispatcher/FilterDispatcher.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/webwork/dispatcher/FilterDispatcher.java?rev=572239&view=auto
==============================================================================
--- struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/webwork/dispatcher/FilterDispatcher.java (added)
+++ struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/webwork/dispatcher/FilterDispatcher.java Sun Sep 2 23:55:57 2007
@@ -0,0 +1,83 @@
+/*
+ * $Id: StrutsModels.java 549177 2007-06-20 18:17:22Z musachy $
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package com.opensymphony.webwork.dispatcher;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.Properties;
+
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+
+import com.opensymphony.xwork2.config.ConfigurationException;
+
+public class FilterDispatcher extends org.apache.struts2.dispatcher.FilterDispatcher {
+
+ @Override
+ public void init(FilterConfig config) throws ServletException {
+ super.init(new FilterConfigWrapper(config));
+ }
+
+ class FilterConfigWrapper implements FilterConfig {
+
+ FilterConfig cfg;
+ Map<String,String> extraProps = new HashMap<String,String>();
+
+ public FilterConfigWrapper(FilterConfig cfg) {
+ this.cfg = cfg;
+ extraProps.put("config", "struts-default.xml,struts-plugin.xml,struts.xml,xwork.xml");
+ extraProps.put("configProviders", "org.apache.struts2.webwork2.WebWorkConfigurationProvider");
+ }
+
+ public String getFilterName() {
+ return cfg.getFilterName();
+ }
+
+ public String getInitParameter(String name) {
+ if (extraProps.containsKey(name)) {
+ return extraProps.get(name);
+ } else {
+ return cfg.getInitParameter(name);
+ }
+ }
+
+ public Enumeration getInitParameterNames() {
+ Set list = new HashSet();
+ for (Enumeration e = cfg.getInitParameterNames(); e.hasMoreElements(); ) {
+ list.add(e.nextElement());
+ }
+ list.addAll(extraProps.keySet());
+ return Collections.enumeration(list);
+ }
+
+ public ServletContext getServletContext() {
+ return cfg.getServletContext();
+ }
+ }
+}
Added: struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/xwork/Action.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/xwork/Action.java?rev=572239&view=auto
==============================================================================
--- struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/xwork/Action.java (added)
+++ struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/xwork/Action.java Sun Sep 2 23:55:57 2007
@@ -0,0 +1,24 @@
+/*
+ * $Id: StrutsModels.java 549177 2007-06-20 18:17:22Z musachy $
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package com.opensymphony.xwork;
+
+public interface Action extends com.opensymphony.xwork2.Action {
+}
Added: struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/xwork/ActionContext.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/xwork/ActionContext.java?rev=572239&view=auto
==============================================================================
--- struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/xwork/ActionContext.java (added)
+++ struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/xwork/ActionContext.java Sun Sep 2 23:55:57 2007
@@ -0,0 +1,48 @@
+/*
+ * $Id: StrutsModels.java 549177 2007-06-20 18:17:22Z musachy $
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package com.opensymphony.xwork;
+
+import java.util.Map;
+
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.ValueStackFactory;
+
+
+public class ActionContext extends com.opensymphony.xwork2.ActionContext {
+
+ private com.opensymphony.xwork2.ActionContext realContext;
+
+
+ public ActionContext(com.opensymphony.xwork2.ActionContext ctx) {
+ super(ctx.getContextMap());
+ this.realContext = ctx;
+ }
+
+ /**
+ * Returns the ActionContext specific to the current thread.
+ *
+ * @return the ActionContext for the current thread, is never <tt>null</tt>.
+ */
+ public static ActionContext getContext() {
+ return new ActionContext(com.opensymphony.xwork2.ActionContext.getContext());
+ }
+
+}
Added: struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/xwork/ActionSupport.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/xwork/ActionSupport.java?rev=572239&view=auto
==============================================================================
--- struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/xwork/ActionSupport.java (added)
+++ struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/xwork/ActionSupport.java Sun Sep 2 23:55:57 2007
@@ -0,0 +1,25 @@
+/*
+ * $Id: StrutsModels.java 549177 2007-06-20 18:17:22Z musachy $
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package com.opensymphony.xwork;
+
+public class ActionSupport extends com.opensymphony.xwork2.ActionSupport {
+
+}
Added: struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/xwork/LocaleProvider.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/xwork/LocaleProvider.java?rev=572239&view=auto
==============================================================================
--- struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/xwork/LocaleProvider.java (added)
+++ struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/xwork/LocaleProvider.java Sun Sep 2 23:55:57 2007
@@ -0,0 +1,25 @@
+/*
+ * $Id: StrutsModels.java 549177 2007-06-20 18:17:22Z musachy $
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package com.opensymphony.xwork;
+
+public interface LocaleProvider extends com.opensymphony.xwork2.LocaleProvider {
+
+}
Added: struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/xwork/ModelDriven.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/xwork/ModelDriven.java?rev=572239&view=auto
==============================================================================
--- struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/xwork/ModelDriven.java (added)
+++ struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/xwork/ModelDriven.java Sun Sep 2 23:55:57 2007
@@ -0,0 +1,25 @@
+/*
+ * $Id: StrutsModels.java 549177 2007-06-20 18:17:22Z musachy $
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package com.opensymphony.xwork;
+
+public interface ModelDriven extends com.opensymphony.xwork2.ModelDriven {
+
+}
Added: struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/xwork/Preparable.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/xwork/Preparable.java?rev=572239&view=auto
==============================================================================
--- struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/xwork/Preparable.java (added)
+++ struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/xwork/Preparable.java Sun Sep 2 23:55:57 2007
@@ -0,0 +1,25 @@
+/*
+ * $Id: StrutsModels.java 549177 2007-06-20 18:17:22Z musachy $
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package com.opensymphony.xwork;
+
+public interface Preparable extends com.opensymphony.xwork2.Preparable {
+
+}
Added: struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/xwork/TextProvider.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/xwork/TextProvider.java?rev=572239&view=auto
==============================================================================
--- struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/xwork/TextProvider.java (added)
+++ struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/xwork/TextProvider.java Sun Sep 2 23:55:57 2007
@@ -0,0 +1,25 @@
+/*
+ * $Id: StrutsModels.java 549177 2007-06-20 18:17:22Z musachy $
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package com.opensymphony.xwork;
+
+public interface TextProvider extends com.opensymphony.xwork2.TextProvider {
+
+}
Added: struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/xwork/Validateable.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/xwork/Validateable.java?rev=572239&view=auto
==============================================================================
--- struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/xwork/Validateable.java (added)
+++ struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/xwork/Validateable.java Sun Sep 2 23:55:57 2007
@@ -0,0 +1,25 @@
+/*
+ * $Id: StrutsModels.java 549177 2007-06-20 18:17:22Z musachy $
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package com.opensymphony.xwork;
+
+public interface Validateable extends com.opensymphony.xwork2.Validateable {
+
+}
Added: struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/xwork/ValidationAware.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/xwork/ValidationAware.java?rev=572239&view=auto
==============================================================================
--- struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/xwork/ValidationAware.java (added)
+++ struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/xwork/ValidationAware.java Sun Sep 2 23:55:57 2007
@@ -0,0 +1,25 @@
+/*
+ * $Id: StrutsModels.java 549177 2007-06-20 18:17:22Z musachy $
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package com.opensymphony.xwork;
+
+public interface ValidationAware extends com.opensymphony.xwork2.ValidationAware {
+
+}
Added: struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/xwork/ValidationAwareSupport.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/xwork/ValidationAwareSupport.java?rev=572239&view=auto
==============================================================================
--- struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/xwork/ValidationAwareSupport.java (added)
+++ struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/xwork/ValidationAwareSupport.java Sun Sep 2 23:55:57 2007
@@ -0,0 +1,26 @@
+/*
+ * $Id: StrutsModels.java 549177 2007-06-20 18:17:22Z musachy $
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package com.opensymphony.xwork;
+
+public class ValidationAwareSupport extends
+ com.opensymphony.xwork2.ValidationAwareSupport {
+
+}
Added: struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/xwork/interceptor/NoParameters.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/xwork/interceptor/NoParameters.java?rev=572239&view=auto
==============================================================================
--- struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/xwork/interceptor/NoParameters.java (added)
+++ struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/xwork/interceptor/NoParameters.java Sun Sep 2 23:55:57 2007
@@ -0,0 +1,25 @@
+/*
+ * $Id: StrutsModels.java 549177 2007-06-20 18:17:22Z musachy $
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package com.opensymphony.xwork.interceptor;
+
+public interface NoParameters extends com.opensymphony.xwork2.interceptor.NoParameters {
+
+}
Added: struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/xwork/interceptor/ParameterNameAware.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/xwork/interceptor/ParameterNameAware.java?rev=572239&view=auto
==============================================================================
--- struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/xwork/interceptor/ParameterNameAware.java (added)
+++ struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/xwork/interceptor/ParameterNameAware.java Sun Sep 2 23:55:57 2007
@@ -0,0 +1,25 @@
+/*
+ * $Id: StrutsModels.java 549177 2007-06-20 18:17:22Z musachy $
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package com.opensymphony.xwork.interceptor;
+
+public interface ParameterNameAware extends com.opensymphony.xwork2.interceptor.ParameterNameAware {
+
+}
Added: struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/org/apache/struts2/webwork2/WebWorkConfigurationProvider.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/org/apache/struts2/webwork2/WebWorkConfigurationProvider.java?rev=572239&view=auto
==============================================================================
--- struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/org/apache/struts2/webwork2/WebWorkConfigurationProvider.java (added)
+++ struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/org/apache/struts2/webwork2/WebWorkConfigurationProvider.java Sun Sep 2 23:55:57 2007
@@ -0,0 +1,66 @@
+package org.apache.struts2.webwork2;
+
+import java.io.IOException;
+import java.net.URL;
+
+import com.opensymphony.xwork2.config.Configuration;
+import com.opensymphony.xwork2.config.ConfigurationException;
+import com.opensymphony.xwork2.config.ConfigurationProvider;
+import com.opensymphony.xwork2.inject.ContainerBuilder;
+import com.opensymphony.xwork2.util.ClassLoaderUtil;
+import com.opensymphony.xwork2.util.location.LocatableProperties;
+/*
+ * $Id: StrutsModels.java 549177 2007-06-20 18:17:22Z musachy $
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import com.opensymphony.xwork2.util.location.LocationImpl;
+
+public class WebWorkConfigurationProvider implements ConfigurationProvider {
+
+ public void destroy() {
+ }
+
+ public void init(Configuration configuration) throws ConfigurationException {
+ }
+
+ public void loadPackages() throws ConfigurationException {
+ }
+
+ public boolean needsReload() {
+ return false;
+ }
+
+ public void register(ContainerBuilder builder, LocatableProperties props)
+ throws ConfigurationException {
+ URL url = ClassLoaderUtil.getResource("webwork.properties", WebWorkConfigurationProvider.class);
+ LocatableProperties locProps = new LocatableProperties(new LocationImpl("webwork.properties", url.toString()));
+ try {
+ locProps.load(url.openStream());
+ } catch (IOException e) {
+ throw new ConfigurationException("Unable to load webwork.properties");
+ }
+ for (Object key : locProps.keySet()) {
+ props.setProperty(
+ key.toString().replaceFirst("webwork\\.", "struts."),
+ locProps.getProperty(key.toString()),
+ locProps.getPropertyLocation(key.toString()));
+ }
+ }
+
+}