svn commit: r834575 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/validation/JSONValidationInterceptor.java
Author: musachy
Date: Tue Nov 10 18:10:53 2009
New Revision: 834575
URL: http://svn.apache.org/viewvc?rev=834575&view=rev
Log:
remove "model." from the key fields only if they do start with that, and the
action is modeldriven (assuming that because it is model driven the error keys
will start with "model." is not ok)
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/validation/JSONValidationInterceptor.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/validation/JSONValidationInterceptor.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/validation/JSONValidationInterceptor.java?rev=834575&r1=834574&r2=834575&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/validation/JSONValidationInterceptor.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/validation/JSONValidationInterceptor.java
Tue Nov 10 18:10:53 2009
@@ -146,8 +146,9 @@
.entrySet()) {
sb.append("\"");
//if it is model driven, remove "model." see WW-2721
-sb.append(validationAware instanceof ModelDriven ?
fieldError.getKey().substring(6)
-: fieldError.getKey());
+String fieldErrorKey = fieldError.getKey();
+sb.append(((validationAware instanceof ModelDriven) &&
fieldErrorKey.startsWith("model."))? fieldErrorKey.substring(6)
+: fieldErrorKey);
sb.append("\":");
sb.append(buildArray(fieldError.getValue()));
sb.append(",");
[OSS Bamboo] Struts 2 SVN - Main Build (Java 6) build 1009 has FAILED (1 tests failed, no failures were new). Change made by Musachy Barroso
--- STRUTS-MAINJ6-1009 failed. --- Code has been updated by Musachy Barroso. 1/1135 tests failed. http://opensource.bamboo.atlassian.com/browse/STRUTS-MAINJ6-1009/ -- Code Changes -- Musachy Barroso (834575): >remove "model." from the key fields only if they do start with that, and the >action is modeldriven (assuming that because it is model driven the error keys >will start with "model." is not ok) -- Tests -- Failed Tests (1) - EmbeddedJSPResultTest: Key in context (Existing) -- Error Summary -- [INFO] [ERROR] BUILD FAILURE [INFO] [INFO] There are test failures. Please refer to /opt/j2ee/domains/bamboo.atlassian.com/opensource/home/xml-data/build-dir/STRUTS-MAINJ6/plugins/embeddedjsp/target/surefire-reports for the individual test results. [INFO] [INFO] For more information, run Maven with the -e switch -- This message is automatically generated by Atlassian Bamboo
[OSS Bamboo] Struts 2 SVN - Main Build build 1250 has FAILED (1 tests failed, no failures were new). Change made by Musachy Barroso
--- STRUTS-MAIN-1250 failed. --- Code has been updated by Musachy Barroso. 1/1135 tests failed. http://opensource.bamboo.atlassian.com/browse/STRUTS-MAIN-1250/ -- Code Changes -- Musachy Barroso (834575): >remove "model." from the key fields only if they do start with that, and the >action is modeldriven (assuming that because it is model driven the error keys >will start with "model." is not ok) -- Tests -- Failed Tests (1) - EmbeddedJSPResultTest: Key in context (Existing) -- Error Summary -- [INFO] [ERROR] BUILD FAILURE [INFO] [INFO] There are test failures. Please refer to /opt/j2ee/domains/bamboo.atlassian.com/opensource/home/xml-data/build-dir/STRUTS-MAIN/plugins/embeddedjsp/target/surefire-reports for the individual test results. [INFO] [INFO] For more information, run Maven with the -e switch -- This message is automatically generated by Atlassian Bamboo
svn commit: r834584 - in /struts/maven/trunk/struts2-archetype-plugin: pom.xml src/main/resources/archetype-resources/pom.xml src/main/resources/archetype-resources/src/main/resources/struts-plugin.xm
Author: lukaszlenart Date: Tue Nov 10 18:29:48 2009 New Revision: 834584 URL: http://svn.apache.org/viewvc?rev=834584&view=rev Log: Updated archetype to version 2.1.8 of Struts Modified: struts/maven/trunk/struts2-archetype-plugin/pom.xml struts/maven/trunk/struts2-archetype-plugin/src/main/resources/archetype-resources/pom.xml struts/maven/trunk/struts2-archetype-plugin/src/main/resources/archetype-resources/src/main/resources/struts-plugin.xml Modified: struts/maven/trunk/struts2-archetype-plugin/pom.xml URL: http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-plugin/pom.xml?rev=834584&r1=834583&r2=834584&view=diff == --- struts/maven/trunk/struts2-archetype-plugin/pom.xml (original) +++ struts/maven/trunk/struts2-archetype-plugin/pom.xml Tue Nov 10 18:29:48 2009 @@ -9,8 +9,8 @@ 4.0.0 struts2-archetype-plugin - 2.0.12-SNAPSHOT - maven-plugin + 2.1.8 + jar Struts 2 Archetypes - Plugin Modified: struts/maven/trunk/struts2-archetype-plugin/src/main/resources/archetype-resources/pom.xml URL: http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-plugin/src/main/resources/archetype-resources/pom.xml?rev=834584&r1=834583&r2=834584&view=diff == --- struts/maven/trunk/struts2-archetype-plugin/src/main/resources/archetype-resources/pom.xml (original) +++ struts/maven/trunk/struts2-archetype-plugin/src/main/resources/archetype-resources/pom.xml Tue Nov 10 18:29:48 2009 @@ -13,14 +13,16 @@ org.apache.struts struts2-core -2.0.11 +2.1.8 + javax.servlet servlet-api 2.4 provided + junit junit Modified: struts/maven/trunk/struts2-archetype-plugin/src/main/resources/archetype-resources/src/main/resources/struts-plugin.xml URL: http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-plugin/src/main/resources/archetype-resources/src/main/resources/struts-plugin.xml?rev=834584&r1=834583&r2=834584&view=diff == --- struts/maven/trunk/struts2-archetype-plugin/src/main/resources/archetype-resources/src/main/resources/struts-plugin.xml (original) +++ struts/maven/trunk/struts2-archetype-plugin/src/main/resources/archetype-resources/src/main/resources/struts-plugin.xml Tue Nov 10 18:29:48 2009 @@ -1,8 +1,8 @@ http://struts.apache.org/dtds/struts-2.0.dtd";> +"-//Apache Software Foundation//DTD Struts Configuration 2.1//EN" +"http://struts.apache.org/dtds/struts-2.1.7.dtd";>
svn commit: r834598 - in /struts/maven/trunk/struts2-archetype-starter: pom.xml src/main/resources/archetype-resources/pom.xml src/main/resources/archetype-resources/src/main/java/DateConverter.java
Author: lukaszlenart
Date: Tue Nov 10 18:54:46 2009
New Revision: 834598
URL: http://svn.apache.org/viewvc?rev=834598&view=rev
Log:
Updated archetype to version 2.1.8 of Struts
Modified:
struts/maven/trunk/struts2-archetype-starter/pom.xml
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/pom.xml
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/DateConverter.java
Modified: struts/maven/trunk/struts2-archetype-starter/pom.xml
URL:
http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-starter/pom.xml?rev=834598&r1=834597&r2=834598&view=diff
==
--- struts/maven/trunk/struts2-archetype-starter/pom.xml (original)
+++ struts/maven/trunk/struts2-archetype-starter/pom.xml Tue Nov 10 18:54:46
2009
@@ -9,8 +9,8 @@
4.0.0
struts2-archetype-starter
- 2.0.12-SNAPSHOT
- maven-plugin
+ 2.1.8
+ jar
Struts 2 Archetypes - Starter
Modified:
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/pom.xml?rev=834598&r1=834597&r2=834598&view=diff
==
---
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/pom.xml
(original)
+++
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/pom.xml
Tue Nov 10 18:54:46 2009
@@ -9,7 +9,11 @@
Struts 2 Starter
http://www.myComp.com
Struts 2 Starter
-
+
+
+2.1.8
+
+
@@ -23,17 +27,19 @@
org.apache.struts
struts2-core
-2.0.11
+${struts2.version}
+
org.apache.struts
struts2-sitemesh-plugin
-2.0.11
+${struts2.version}
+
org.apache.struts
struts2-spring-plugin
-2.0.11
+${struts2.version}
@@ -43,6 +49,7 @@
2.4
provided
+
javax.servlet
jsp-api
@@ -78,7 +85,7 @@
org.mortbay.jetty
maven-jetty-plugin
- 6.1.5
+ 6.1.21
10
Modified:
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/DateConverter.java
URL:
http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/DateConverter.java?rev=834598&r1=834597&r2=834598&view=diff
==
---
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/DateConverter.java
(original)
+++
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/DateConverter.java
Tue Nov 10 18:54:46 2009
@@ -21,7 +21,7 @@
import java.text.ParseException;
import java.util.Map;
import java.util.Date;
-import com.opensymphony.xwork2.util.TypeConversionException;
+import com.opensymphony.xwork2.conversion.TypeConversionException;
/**
*
svn commit: r834630 - in /struts/struts2/trunk/plugins/embeddedjsp/src: main/java/org/apache/struts2/JSPLoader.java main/java/org/apache/struts2/jasper/runtime/JspFactoryImpl.java test/java/org/apache
Author: musachy
Date: Tue Nov 10 19:50:37 2009
New Revision: 834630
URL: http://svn.apache.org/viewvc?rev=834630&view=rev
Log:
delegate to jasper Jspfactory when the jsp is not getting handled by the
embeddedjsp plugin
Modified:
struts/struts2/trunk/plugins/embeddedjsp/src/main/java/org/apache/struts2/JSPLoader.java
struts/struts2/trunk/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/JspFactoryImpl.java
struts/struts2/trunk/plugins/embeddedjsp/src/test/java/org/apache/struts2/EmbeddedJSPResultTest.java
Modified:
struts/struts2/trunk/plugins/embeddedjsp/src/main/java/org/apache/struts2/JSPLoader.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/embeddedjsp/src/main/java/org/apache/struts2/JSPLoader.java?rev=834630&r1=834629&r2=834630&view=diff
==
---
struts/struts2/trunk/plugins/embeddedjsp/src/main/java/org/apache/struts2/JSPLoader.java
(original)
+++
struts/struts2/trunk/plugins/embeddedjsp/src/main/java/org/apache/struts2/JSPLoader.java
Tue Nov 10 19:50:37 2009
@@ -190,6 +190,13 @@
//jsp api
classPath.add(getJarUrl(JspPage.class));
+try {
+Class annotationsProcessor =
Class.forName("org.apache.AnnotationProcessor");
+classPath.add(getJarUrl(annotationsProcessor));
+} catch (ClassNotFoundException e) {
+//ok ignore
+}
+
//add extra classpath entries (jars where tlds were found will be here)
for (Iterator iterator = extraClassPath.iterator();
iterator.hasNext();) {
String entry = iterator.next();
Modified:
struts/struts2/trunk/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/JspFactoryImpl.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/JspFactoryImpl.java?rev=834630&r1=834629&r2=834630&view=diff
==
---
struts/struts2/trunk/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/JspFactoryImpl.java
(original)
+++
struts/struts2/trunk/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/JspFactoryImpl.java
Tue Nov 10 19:50:37 2009
@@ -50,19 +50,26 @@
private ThreadLocal localPool = new
ThreadLocal();
+public org.apache.jasper.runtime.JspFactoryImpl jasperFactoryImpl = new
org.apache.jasper.runtime.JspFactoryImpl();
+
public PageContext getPageContext(Servlet servlet, ServletRequest request,
ServletResponse response, String errorPageURL, boolean
needsSession,
int bufferSize, boolean autoflush) {
-if( Constants.IS_SECURITY_ENABLED ) {
-PrivilegedGetPageContext dp = new PrivilegedGetPageContext(
-(JspFactoryImpl)this, servlet, request, response,
errorPageURL,
-needsSession, bufferSize, autoflush);
-return (PageContext)AccessController.doPrivileged(dp);
+if (servlet.getClass().getName().startsWith("org.apache.struts2.jsp"))
{
+if( Constants.IS_SECURITY_ENABLED ) {
+PrivilegedGetPageContext dp = new PrivilegedGetPageContext(
+(JspFactoryImpl)this, servlet, request, response,
errorPageURL,
+needsSession, bufferSize, autoflush);
+return (PageContext)AccessController.doPrivileged(dp);
+} else {
+return internalGetPageContext(servlet, request, response,
+errorPageURL, needsSession,
+bufferSize, autoflush);
+}
} else {
-return internalGetPageContext(servlet, request, response,
-errorPageURL, needsSession,
-bufferSize, autoflush);
+//this call is coming from a page is that is getting handled by
jasper, so use the jasper factory instead
+return jasperFactoryImpl.getPageContext(servlet, request,
response, errorPageURL, autoflush, bufferSize, autoflush);
}
}
Modified:
struts/struts2/trunk/plugins/embeddedjsp/src/test/java/org/apache/struts2/EmbeddedJSPResultTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/embeddedjsp/src/test/java/org/apache/struts2/EmbeddedJSPResultTest.java?rev=834630&r1=834629&r2=834630&view=diff
==
---
struts/struts2/trunk/plugins/embeddedjsp/src/test/java/org/apache/struts2/EmbeddedJSPResultTest.java
(original)
+++
struts/struts2/trunk/plugins/embeddedjsp/src/test/java/org/apache/struts2/EmbeddedJSPResultTest.java
Tue Nov 10 19:50:37 2009
@@ -100,13 +100,14 @@
assertEquals("hello", response.getContentAsString());
}
-public void testKeyInContext() throws Exception {
-result.setLocation("org/apache/struts2/sim
[OSS Bamboo] Struts 2 SVN - Main Build build 1251 has FAILED (0 tests failed). Change made by Musachy Barroso
--- STRUTS-MAIN-1251 failed. --- Code has been updated by Musachy Barroso. No failed tests found, a possible compilation error. http://opensource.bamboo.atlassian.com/browse/STRUTS-MAIN-1251/ -- Code Changes -- Musachy Barroso (834630): >delegate to jasper Jspfactory when the jsp is not getting handled by the >embeddedjsp plugin -- Error Summary -- [INFO] [ERROR] BUILD ERROR [INFO] [INFO] Failed to resolve artifact. Missing: -- 1) org.apache.struts:struts2-osgi-admin-bundle:jar:2.2.0-SNAPSHOT Try downloading the file manually from the project website. Then, install it using the command: mvn install:install-file -DgroupId=org.apache.struts -DartifactId=struts2-osgi-admin-bundle -Dversion=2.2.0-SNAPSHOT -Dpackaging=jar -Dfile=/path/to/file Alternatively, if you host your own repository you can deploy the file there: mvn deploy:deploy-file -DgroupId=org.apache.struts -DartifactId=struts2-osgi-admin-bundle -Dversion=2.2.0-SNAPSHOT -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id] Path to dependency: 1) org.apache.struts:struts2-assembly:pom:2.2.0-SNAPSHOT 2) org.apache.struts:struts2-osgi-admin-bundle:jar:2.2.0-SNAPSHOT 2) org.apache.struts:struts2-osgi-demo-bundle:jar:2.2.0-SNAPSHOT Try downloading the file manually from the project website. Then, install it using the command: mvn install:install-file -DgroupId=org.apache.struts -DartifactId=struts2-osgi-demo-bundle -Dversion=2.2.0-SNAPSHOT -Dpackaging=jar -Dfile=/path/to/file Alternatively, if you host your own repository you can deploy the file there: mvn deploy:deploy-file -DgroupId=org.apache.struts -DartifactId=struts2-osgi-demo-bundle -Dversion=2.2.0-SNAPSHOT -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id] Path to dependency: 1) org.apache.struts:struts2-assembly:pom:2.2.0-SNAPSHOT 2) org.apache.struts:struts2-osgi-demo-bundle:jar:2.2.0-SNAPSHOT -- 2 required artifacts are missing. for artifact: org.apache.struts:struts2-assembly:pom:2.2.0-SNAPSHOT from the specified remote repositories: apache.snapshots (http://people.apache.org/repo/m2-snapshot-repository), central (https://m2proxy.atlassian.com/repository/public) [INFO] [INFO] For more information, run Maven with the -e switch -- This message is automatically generated by Atlassian Bamboo
[OSS Bamboo] Struts 2 SVN - Main Build (Java 6) build 1010 has FAILED (0 tests failed). Change made by Musachy Barroso
--- STRUTS-MAINJ6-1010 failed. --- Code has been updated by Musachy Barroso. No failed tests found, a possible compilation error. http://opensource.bamboo.atlassian.com/browse/STRUTS-MAINJ6-1010/ -- Code Changes -- Musachy Barroso (834630): >delegate to jasper Jspfactory when the jsp is not getting handled by the >embeddedjsp plugin -- Error Summary -- [INFO] [ERROR] BUILD ERROR [INFO] [INFO] Failed to resolve artifact. Missing: -- 1) org.apache.struts:struts2-osgi-admin-bundle:jar:2.2.0-SNAPSHOT Try downloading the file manually from the project website. Then, install it using the command: mvn install:install-file -DgroupId=org.apache.struts -DartifactId=struts2-osgi-admin-bundle -Dversion=2.2.0-SNAPSHOT -Dpackaging=jar -Dfile=/path/to/file Alternatively, if you host your own repository you can deploy the file there: mvn deploy:deploy-file -DgroupId=org.apache.struts -DartifactId=struts2-osgi-admin-bundle -Dversion=2.2.0-SNAPSHOT -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id] Path to dependency: 1) org.apache.struts:struts2-assembly:pom:2.2.0-SNAPSHOT 2) org.apache.struts:struts2-osgi-admin-bundle:jar:2.2.0-SNAPSHOT 2) org.apache.struts:struts2-osgi-demo-bundle:jar:2.2.0-SNAPSHOT Try downloading the file manually from the project website. Then, install it using the command: mvn install:install-file -DgroupId=org.apache.struts -DartifactId=struts2-osgi-demo-bundle -Dversion=2.2.0-SNAPSHOT -Dpackaging=jar -Dfile=/path/to/file Alternatively, if you host your own repository you can deploy the file there: mvn deploy:deploy-file -DgroupId=org.apache.struts -DartifactId=struts2-osgi-demo-bundle -Dversion=2.2.0-SNAPSHOT -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id] Path to dependency: 1) org.apache.struts:struts2-assembly:pom:2.2.0-SNAPSHOT 2) org.apache.struts:struts2-osgi-demo-bundle:jar:2.2.0-SNAPSHOT -- 2 required artifacts are missing. for artifact: org.apache.struts:struts2-assembly:pom:2.2.0-SNAPSHOT from the specified remote repositories: apache.snapshots (http://people.apache.org/repo/m2-snapshot-repository), central (https://m2proxy.atlassian.com/repository/public) [INFO] [INFO] For more information, run Maven with the -e switch -- This message is automatically generated by Atlassian Bamboo
svn commit: r834712 [2/2] - in /struts/sandbox/trunk/struts2-uel-plugin: ./ src/main/java/org/apache/struts2/uelplugin/ src/main/java/org/apache/struts2/uelplugin/elresolvers/ src/main/java/org/apache
Modified:
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/TestAction.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/TestAction.java?rev=834712&r1=834711&r2=834712&view=diff
==
---
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/TestAction.java
(original)
+++
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/TestAction.java
Tue Nov 10 23:39:56 2009
@@ -1,3 +1,23 @@
+/*
+ * $Id$
+ *
+ * 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 org.apache.struts2.uelplugin;
import com.opensymphony.xwork2.ActionSupport;
Modified:
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/TestObject.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/TestObject.java?rev=834712&r1=834711&r2=834712&view=diff
==
---
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/TestObject.java
(original)
+++
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/TestObject.java
Tue Nov 10 23:39:56 2009
@@ -1,3 +1,23 @@
+/*
+ * $Id$
+ *
+ * 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 org.apache.struts2.uelplugin;
import java.util.Date;
@@ -25,6 +45,33 @@
private ChildTestAction childTestAction;
private boolean invoked;
+private String privateField = "private";
+protected String protectedField = "protected";
+
+private void setSomePrivateField(String privateField) {
+this.value = privateField;
+}
+
+private String getSomePrivateField() {
+return value;
+}
+
+protected String getSomeProtectedField() {
+return value;
+}
+
+protected void setSomeProtectedField(String protectedField) {
+this.value = protectedField;
+}
+
+public String getPropWithoutSetter() {
+return value;
+}
+
+public void setPropWithoutGetter(String value) {
+this.value = value;
+}
+
public boolean wasInvoked() {
return invoked;
}
Modified:
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/UELMethodInvocationTest.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/UELMethodInvocationTest.java?rev=834712&r1=834711&r2=834712&view=diff
==
---
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/UELMethodInvocationTest.java
(original)
+++
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/UELMethodInvocationTest.java
Tue Nov 10 23:39:56 2009
@@ -1,3 +1,23 @@
+/*
+ * $Id$
+ *
+ * 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
[CONF] Confluence Changes in the last 24 hours
This is a daily summary of all recent changes in Confluence. - Updated Spaces: - Apache ActiveMQ (http://cwiki.apache.org/confluence/display/ACTIVEMQ) Pages - Consumer Priority edited by tmielke (05:05 PM) http://cwiki.apache.org/confluence/display/ACTIVEMQ/Consumer+Priority Apache Aries (http://cwiki.apache.org/confluence/display/ARIES) Pages - November 2009 created by not (08:19 PM) http://cwiki.apache.org/confluence/display/ARIES/November+2009 Apache Cayenne Website (http://cwiki.apache.org/confluence/display/CAYSITE) Pages - Index edited by ari (08:07 AM) http://cwiki.apache.org/confluence/display/CAYSITE/Index Cayenne 3.0 beta 1 released (10 November 2009) edited by ari (06:28 AM) http://cwiki.apache.org/confluence/display/CAYSITE/2009/11/09/Cayenne+3.0+beta+1+released+%2810+November+2009%29 Apache ESME (http://cwiki.apache.org/confluence/display/ESME) Pages - Collaboration with ubimic created by richardhirsch (08:14 PM) http://cwiki.apache.org/confluence/display/ESME/Collaboration+with+ubimic Tests created by richardhirsch (07:50 AM) http://cwiki.apache.org/confluence/display/ESME/Tests Test cases - UI created by richardhirsch (07:57 AM) http://cwiki.apache.org/confluence/display/ESME/Test+cases+-+UI Apache Open Relevance (http://cwiki.apache.org/confluence/display/ORP) Pages - ExistingCollections edited by rcmuir (07:40 AM) http://cwiki.apache.org/confluence/display/ORP/ExistingCollections Apache Qpid (http://cwiki.apache.org/confluence/display/qpid) Pages - Documentation edited by jonathan.ro...@redhat.com (11:01 PM) http://cwiki.apache.org/confluence/display/qpid/Documentation AMQP Brokers edited by jonathan.ro...@redhat.com (10:48 PM) http://cwiki.apache.org/confluence/display/qpid/AMQP+Brokers AMQP Messaging Broker (implemented in C++) edited by jonathan.ro...@redhat.com (10:30 PM) http://cwiki.apache.org/confluence/pages/viewpage.action?pageId=4589156 AMQP Messaging Clients edited by jonathan.ro...@redhat.com (10:12 PM) http://cwiki.apache.org/confluence/display/qpid/AMQP+Messaging+Clients Index edited by jonathan.ro...@redhat.com (08:09 PM) http://cwiki.apache.org/confluence/display/qpid/Index Apache Roller (http://cwiki.apache.org/confluence/display/ROLLER) Comments http://cwiki.apache.org/confluence/display/ROLLER/Developers+Resources (1) Apache Shiro (http://cwiki.apache.org/confluence/display/SHIRO) Pages - Navigation edited by skipshot4 (05:25 AM) http://cwiki.apache.org/confluence/display/SHIRO/Navigation How to Contribute created by skipshot4 (03:10 AM) http://cwiki.apache.org/confluence/display/SHIRO/How+to+Contribute To Do List created by skipshot4 (03:55 AM) http://cwiki.apache.org/confluence/display/SHIRO/To+Do+List Index edited by adc (03:38 AM) http://cwiki.apache.org/confluence/display/SHIRO/Index Apache Sling (http://cwiki.apache.org/confluence/display/SLING) Pages - FAQ edited by hungerburg (12:27 PM) http://cwiki.apache.org/confluence/display/SLING/FAQ Traffic Server (http://cwiki.apache.org/confluence/display/TS) Pages - TrafficServerMeetUp edited by mlibbey (07:53 PM) http://cwiki.apache.org/confluence/display/TS/TrafficServerMeetUp Supported OSes created by bcall (05:22 PM) http://cwiki.apache.org/confluence/display/TS/Supported+OSes Apache Tuscany (http://cwiki.apache.org/confluence/display/TUSCANY) Pages - SDO CTS edited by lrese...@apache.org (09:25 PM) http://cwiki.apache.org/confluence/display/TUSCANY/SDO+CTS SDO Java Subproject Menu edited by lrese...@apache.org (09:23 PM) http://cwiki.apache.org/confluence/display/TUSCANY/SDO+Java+Subproject+Menu Obtaining the SDO 2.1 CTS edited by lrese...@apache.org (09:22 PM) http://cwiki.apache.org/confluence/display/TUSCANY/Obtaining+the+SDO+2.1+CTS Home Subpage edited by ant (09:35 AM) http://cwiki.apache.org/confluence/display/TUSCANY/Home+Subpage SCA Java 2.x Releases edited by ant (08:41 AM) http://cwiki.apache.org/confluence/display/TUSCANY/SCA+Java+2.x+Releases SCA Java 2.x Previous Releases edited by ant (08:40 AM) http://cwiki.apache.org/confluence/display/TUSCANY/SCA+Java+2.x+Previous+Releases SCA Java 2.0-M4 created by ant
