svn commit: r1484384 - in /struts/struts2/trunk: ./ apps/blank/ apps/jboss-blank/ apps/mailreader/ apps/portlet/ apps/rest-showcase/ apps/showcase/ assembly/ bundles/ bundles/admin/ bundles/demo/ core
Author: lukaszlenart
Date: Mon May 20 07:29:24 2013
New Revision: 1484384
URL: http://svn.apache.org/r1484384
Log:
WW-4021 Cleans up poms
Modified:
struts/struts2/trunk/apps/blank/pom.xml
struts/struts2/trunk/apps/jboss-blank/pom.xml
struts/struts2/trunk/apps/mailreader/pom.xml
struts/struts2/trunk/apps/portlet/pom.xml
struts/struts2/trunk/apps/rest-showcase/pom.xml
struts/struts2/trunk/apps/showcase/pom.xml
struts/struts2/trunk/assembly/pom.xml
struts/struts2/trunk/bundles/admin/pom.xml
struts/struts2/trunk/bundles/demo/pom.xml
struts/struts2/trunk/bundles/pom.xml
struts/struts2/trunk/core/pom.xml
struts/struts2/trunk/plugins/cdi/pom.xml
struts/struts2/trunk/plugins/codebehind/pom.xml
struts/struts2/trunk/plugins/config-browser/pom.xml
struts/struts2/trunk/plugins/convention/pom.xml
struts/struts2/trunk/plugins/dojo/pom.xml
struts/struts2/trunk/plugins/dwr/pom.xml
struts/struts2/trunk/plugins/embeddedjsp/pom.xml
struts/struts2/trunk/plugins/gxp/pom.xml
struts/struts2/trunk/plugins/jasperreports/pom.xml
struts/struts2/trunk/plugins/javatemplates/pom.xml
struts/struts2/trunk/plugins/jfreechart/pom.xml
struts/struts2/trunk/plugins/jsf/pom.xml
struts/struts2/trunk/plugins/json/pom.xml
struts/struts2/trunk/plugins/junit/pom.xml
struts/struts2/trunk/plugins/osgi/pom.xml
struts/struts2/trunk/plugins/oval/pom.xml
struts/struts2/trunk/plugins/pell-multipart/pom.xml
struts/struts2/trunk/plugins/plexus/pom.xml
struts/struts2/trunk/plugins/pom.xml
struts/struts2/trunk/plugins/portlet-tiles/pom.xml
struts/struts2/trunk/plugins/portlet/pom.xml
struts/struts2/trunk/plugins/rest/pom.xml
struts/struts2/trunk/plugins/sitegraph/pom.xml
struts/struts2/trunk/plugins/sitemesh/pom.xml
struts/struts2/trunk/plugins/spring/pom.xml
struts/struts2/trunk/plugins/struts1/pom.xml
struts/struts2/trunk/plugins/testng/pom.xml
struts/struts2/trunk/plugins/tiles/pom.xml
struts/struts2/trunk/plugins/tiles3/pom.xml
struts/struts2/trunk/pom.xml
Modified: struts/struts2/trunk/apps/blank/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/blank/pom.xml?rev=1484384&r1=1484383&r2=1484384&view=diff
==
--- struts/struts2/trunk/apps/blank/pom.xml (original)
+++ struts/struts2/trunk/apps/blank/pom.xml Mon May 20 07:29:24 2013
@@ -28,7 +28,7 @@
struts2-apps
2.3.15-SNAPSHOT
-org.apache.struts
+
struts2-blank
war
Blank Webapp
@@ -66,7 +66,6 @@
${project.groupId}
struts2-junit-plugin
-${project.version}
test
Modified: struts/struts2/trunk/apps/jboss-blank/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/jboss-blank/pom.xml?rev=1484384&r1=1484383&r2=1484384&view=diff
==
--- struts/struts2/trunk/apps/jboss-blank/pom.xml (original)
+++ struts/struts2/trunk/apps/jboss-blank/pom.xml Mon May 20 07:29:24 2013
@@ -28,7 +28,7 @@
struts2-apps
2.3.15-SNAPSHOT
-org.apache.struts
+
struts2-jboss-blank
war
JBoss Blank Webapp
@@ -57,7 +57,6 @@
${project.groupId}
struts2-junit-plugin
-${project.version}
test
Modified: struts/struts2/trunk/apps/mailreader/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/pom.xml?rev=1484384&r1=1484383&r2=1484384&view=diff
==
--- struts/struts2/trunk/apps/mailreader/pom.xml (original)
+++ struts/struts2/trunk/apps/mailreader/pom.xml Mon May 20 07:29:24 2013
@@ -28,7 +28,7 @@
struts2-apps
2.3.15-SNAPSHOT
-org.apache.struts
+
struts2-mailreader
war
Mail Reader Webapp
Modified: struts/struts2/trunk/apps/portlet/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/portlet/pom.xml?rev=1484384&r1=1484383&r2=1484384&view=diff
==
--- struts/struts2/trunk/apps/portlet/pom.xml (original)
+++ struts/struts2/trunk/apps/portlet/pom.xml Mon May 20 07:29:24 2013
@@ -28,7 +28,7 @@
struts2-apps
2.3.15-SNAPSHOT
-org.apache.struts
+
struts2-portlet
war
Portlet Webapp
Modified: struts/struts2/trunk/apps/rest-showcase/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/rest-showcase/pom.xml?rev=1484384&r1=1484383&r2=1484384&view=diff
==
--- struts/struts2/trunk/apps/rest-showcase/pom.xml (original)
+++ struts/struts2/trunk/apps/rest-showcase/pom.xml Mon May 20 07:29:24 2013
@@ -29,7 +29,6 @@
2.3.1
svn commit: r1484447 - in /struts/struts2/trunk: assembly/pom.xml pom.xml src/site/xdoc/index.xml.vm xwork-core/pom.xml
Author: lukaszlenart
Date: Mon May 20 12:39:31 2013
New Revision: 1484447
URL: http://svn.apache.org/r1484447
Log:
WW-4070 Removes support for translating project to JDK4
Modified:
struts/struts2/trunk/assembly/pom.xml
struts/struts2/trunk/pom.xml
struts/struts2/trunk/src/site/xdoc/index.xml.vm
struts/struts2/trunk/xwork-core/pom.xml
Modified: struts/struts2/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/pom.xml?rev=1484447&r1=1484446&r2=1484447&view=diff
==
--- struts/struts2/trunk/assembly/pom.xml (original)
+++ struts/struts2/trunk/assembly/pom.xml Mon May 20 12:39:31 2013
@@ -16,185 +16,6 @@
http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/assembly
-
-
-j4
-
-
-
-maven-assembly-plugin
-
-
-make-assembly
-package
-
-attached
-
-
-
-
-
-
src/main/assembly/all.xml
-
src/main/assembly/lib.xml
-
src/main/assembly/lib-jdk14.xml
-
src/main/assembly/apps.xml
-
src/main/assembly/src.xml
-
src/main/assembly/docs.xml
-
-struts-${project.version}
-
target/assembly/out
-target/assembly/work
-
-
-
-
-
-
-
-net.sf.retrotranslator
-retrotranslator-runtime
-1.2.1
-runtime
-
-
-
-backport-util-concurrent
-backport-util-concurrent
-3.0
-runtime
-
-
-
-org.apache.struts.xwork
-xwork-core
-${project.version}
-jar
-jdk14
-runtime
-
-
-
-org.apache.struts
-struts2-core
-${project.version}
-jdk14
-
-
-
-org.apache.struts
-struts2-config-browser-plugin
-${project.version}
-jdk14
-
-
-
-org.apache.struts
-struts2-jasperreports-plugin
-${project.version}
-jdk14
-
-
-
-org.apache.struts
-struts2-jfreechart-plugin
-${project.version}
-jdk14
-
-
-
-org.apache.struts
-struts2-jsf-plugin
-${project.version}
-jdk14
-
-
-
-org.apache.struts
-struts2-pell-multipart-plugin
-${project.version}
-jdk14
-
-
-
-org.apache.struts
-struts2-plexus-plugin
-${project.version}
-jdk14
-
-
-
-org.apache.struts
-struts2-sitegraph-plugin
-${project.version}
-jdk14
-
-
-
-org.apache.struts
-struts2-sitemesh-plugin
-${project.version}
-jdk14
-
-
-
-org.apache.struts
-struts2-struts1-plugin
-${project.version}
-jdk14
-
-
-
-org.apache.struts
-struts2-tiles-plugin
-${project.version}
-jdk14
-
-
-
-org.apache.struts
-struts2-rest-plugin
-${project.version}
-jdk14
-
-
-
-org.apache.struts
-struts2-oval-plugin
-${project.version}
-
svn commit: r1484461 - /struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/RadioHandler.java
Author: lukaszlenart
Date: Mon May 20 12:59:25 2013
New Revision: 1484461
URL: http://svn.apache.org/r1484461
Log:
WW-3676 Uses simple toString() for non-null objects to support other types than
String and Integer
Modified:
struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/RadioHandler.java
Modified:
struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/RadioHandler.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/RadioHandler.java?rev=1484461&r1=1484460&r2=1484461&view=diff
==
---
struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/RadioHandler.java
(original)
+++
struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/RadioHandler.java
Mon May 20 12:59:25 2013
@@ -33,8 +33,8 @@ import java.util.Iterator;
import java.util.Map;
public class RadioHandler extends AbstractTagHandler implements TagGenerator {
-public void generate() throws IOException {
+public void generate() throws IOException {
Map params = context.getParameters();
Object listObj = params.get("list");
@@ -59,19 +59,12 @@ public class RadioHandler extends Abstra
Object itemValue = findValue(listValue != null ? listValue :
"top");
String itemValueStr = StringUtils.defaultString(itemValue ==
null ? null : itemValue.toString());
-//Namevalue needs to cast to a string from object. It's object
because the
-//Property can be defined as String or as Integer
-String itemNameValueStr;
-if (nameValue instanceof java.lang.Integer || nameValue
instanceof java.lang.String)
-itemNameValueStr = nameValue.toString();
-else
-itemNameValueStr = null;
+// nameValue needs to cast to a string from object
+String itemNameValueStr = (nameValue == null ? null :
nameValue.toString());
//Checked value. It's set to true if the nameValue (the value
associated with the name which is typically set in
//the action is equal to the current key value.
-Boolean checked = itemKeyStr != null &&
-itemNameValueStr != null &&
-itemNameValueStr.equals(itemKeyStr);
+Boolean checked = itemKeyStr != null && itemNameValueStr !=
null && itemNameValueStr.equals(itemKeyStr);
//Radio button section
String id = params.get("id") + Integer.toString(cnt++);
@@ -93,11 +86,13 @@ public class RadioHandler extends Abstra
.addIfExists("style", params.get("cssStyle"))
.addIfExists("title", params.get("title"));
super.start("label", a);
-if (StringUtils.isNotEmpty(itemValueStr))
+if (StringUtils.isNotEmpty(itemValueStr)) {
characters(itemValueStr);
+}
super.end("label");
stack.pop();
}
}
}
+
}
[CONF] Confluence Changes in the last 24 hours
This is a daily summary of all recent changes in Confluence. - Updated Spaces: - Apache ActiveMQ CPP (https://cwiki.apache.org/confluence/display/AMQCPP) Pages - CMS API Overview edited by tabish121 (07:56 PM) https://cwiki.apache.org/confluence/display/AMQCPP/CMS+API+Overview Apache Camel (https://cwiki.apache.org/confluence/display/CAMEL) Pages - Camel 2.11.0 Release edited by davsclaus (11:34 PM) https://cwiki.apache.org/confluence/display/CAMEL/Camel+2.11.0+Release Apache Cloudstack (https://cwiki.apache.org/confluence/display/CLOUDSTACK) Pages - Apache CloudStack Weekly News - 20 May 2013 created by jzb (12:44 PM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Apache+CloudStack+Weekly+News+-+20+May+2013 Building DevCloud edited by digitalsanctum (10:48 AM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Building+DevCloud Allow ACL on all level 4 protocols edited by kis...@cloud.com (05:50 AM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Allow+ACL+on+all+level+4+protocols Support ACL deny rules edited by kis...@cloud.com (05:03 AM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Support+ACL+deny+rules OVS Tunnel Manager for CloudStack edited by murali.reddy (02:28 AM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/OVS+Tunnel+Manager+for+CloudStack Apache CXF Documentation (https://cwiki.apache.org/confluence/display/CXF20DOC) Pages - 3.0 Migration Guide edited by dkulp (01:20 PM) https://cwiki.apache.org/confluence/display/CXF20DOC/3.0+Migration+Guide Drill Wiki (https://cwiki.apache.org/confluence/display/DRILL) Pages - Q2 In-Progress Report edited by ellen_friedman (09:57 PM) https://cwiki.apache.org/confluence/display/DRILL/Q2+In-Progress+Report Apache Geronimo Project Management (https://cwiki.apache.org/confluence/display/GMOxPMGT) Pages - Geronimo 3.0.x Release Process edited by xiaming (11:08 PM) https://cwiki.apache.org/confluence/display/GMOxPMGT/Geronimo+3.0.x+Release+Process Apache Hive (https://cwiki.apache.org/confluence/display/Hive) Pages - LanguageManual edited by leftyl (10:30 AM) https://cwiki.apache.org/confluence/display/Hive/LanguageManual LanguageManual Indexing created by leftyl (10:20 AM) https://cwiki.apache.org/confluence/display/Hive/LanguageManual+Indexing Apache ActiveMQ NMS (https://cwiki.apache.org/confluence/display/NMS) Pages - Download edited by tabish121 (05:53 PM) https://cwiki.apache.org/confluence/display/NMS/Download Apache.NMS API v1.6.0 created by tabish121 (05:51 PM) https://cwiki.apache.org/confluence/display/NMS/Apache.NMS+API+v1.6.0 NMS API Downloads edited by tabish121 (05:44 PM) https://cwiki.apache.org/confluence/display/NMS/NMS+API+Downloads OODT (https://cwiki.apache.org/confluence/display/OODT) Pages - Solr File Manager Quick Start Guide edited by lmzxq.tom (08:09 AM) https://cwiki.apache.org/confluence/display/OODT/Solr+File+Manager+Quick+Start+Guide Apache OpenOffice Community (https://cwiki.apache.org/confluence/display/OOOUSERS) Pages - Tips for branch ia2 edited by steve.yin (11:20 PM) https://cwiki.apache.org/confluence/display/OOOUSERS/Tips+for+branch+ia2 Localization Volunteers edited by cleoditra (10:07 PM) https://cwiki.apache.org/confluence/display/OOOUSERS/Localization+Volunteers Directory of Volunteers edited by albinoneto (03:14 PM) https://cwiki.apache.org/confluence/display/OOOUSERS/Directory+of+Volunteers Traffic Server (https://cwiki.apache.org/confluence/display/TS) Pages - Release and Support cycles edited by zwoop (03:20 PM) https://cwiki.apache.org/confluence/display/TS/Release+and+Support+cycles Apache Struts 2 Documentation (https://cwiki.apache.org/confluence/display/WW) Pages - OSGi Plugin edited by lukaszlenart (03:06 PM) https://cwiki.apache.org/confluence/display/WW/OSGi+Plugin Change your notification preferences: https://cwiki.apache.org/confluence/users/viewnotifications.action
