svn commit: r1505371 - /struts/sandbox/trunk/Struts2HelloWorldPortlet/

2013-07-21 Thread bphillips
Author: bphillips
Date: Sun Jul 21 12:41:01 2013
New Revision: 1505371

URL: http://svn.apache.org/r1505371
Log:
Initial import.

Added:
struts/sandbox/trunk/Struts2HelloWorldPortlet/



svn commit: r1505372 - in /struts/sandbox/trunk/Struts2HelloWorldPortlet: ./ src/ src/main/ src/main/java/ src/main/java/com/ src/main/java/com/struts2/ src/main/java/com/struts2/tutorial/ src/main/ja

2013-07-21 Thread bphillips
Author: bphillips
Date: Sun Jul 21 12:42:35 2013
New Revision: 1505372

URL: http://svn.apache.org/r1505372
Log:
Initial commit of a Struts 2 portlet project - see README.txt for how to build 
and run

Added:
struts/sandbox/trunk/Struts2HelloWorldPortlet/README.txt
struts/sandbox/trunk/Struts2HelloWorldPortlet/pom.xml
struts/sandbox/trunk/Struts2HelloWorldPortlet/src/
struts/sandbox/trunk/Struts2HelloWorldPortlet/src/main/
struts/sandbox/trunk/Struts2HelloWorldPortlet/src/main/java/
struts/sandbox/trunk/Struts2HelloWorldPortlet/src/main/java/com/
struts/sandbox/trunk/Struts2HelloWorldPortlet/src/main/java/com/struts2/

struts/sandbox/trunk/Struts2HelloWorldPortlet/src/main/java/com/struts2/tutorial/

struts/sandbox/trunk/Struts2HelloWorldPortlet/src/main/java/com/struts2/tutorial/action/

struts/sandbox/trunk/Struts2HelloWorldPortlet/src/main/java/com/struts2/tutorial/action/DefaultAction.java

struts/sandbox/trunk/Struts2HelloWorldPortlet/src/main/java/com/struts2/tutorial/action/MessageService.java
struts/sandbox/trunk/Struts2HelloWorldPortlet/src/main/resources/

struts/sandbox/trunk/Struts2HelloWorldPortlet/src/main/resources/applicationContext.xml
struts/sandbox/trunk/Struts2HelloWorldPortlet/src/main/resources/log4j.dtd
struts/sandbox/trunk/Struts2HelloWorldPortlet/src/main/resources/log4j.xml
struts/sandbox/trunk/Struts2HelloWorldPortlet/src/main/resources/struts.xml
struts/sandbox/trunk/Struts2HelloWorldPortlet/src/main/webapp/
struts/sandbox/trunk/Struts2HelloWorldPortlet/src/main/webapp/META-INF/

struts/sandbox/trunk/Struts2HelloWorldPortlet/src/main/webapp/META-INF/MANIFEST.MF
struts/sandbox/trunk/Struts2HelloWorldPortlet/src/main/webapp/WEB-INF/

struts/sandbox/trunk/Struts2HelloWorldPortlet/src/main/webapp/WEB-INF/jetty-pluto-web-default.xml

struts/sandbox/trunk/Struts2HelloWorldPortlet/src/main/webapp/WEB-INF/portlet.xml

struts/sandbox/trunk/Struts2HelloWorldPortlet/src/main/webapp/WEB-INF/web.xml
struts/sandbox/trunk/Struts2HelloWorldPortlet/src/main/webapp/index.html
struts/sandbox/trunk/Struts2HelloWorldPortlet/src/main/webapp/portlet/

struts/sandbox/trunk/Struts2HelloWorldPortlet/src/main/webapp/portlet/hello.jsp

Added: struts/sandbox/trunk/Struts2HelloWorldPortlet/README.txt
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/Struts2HelloWorldPortlet/README.txt?rev=1505372&view=auto
==
--- struts/sandbox/trunk/Struts2HelloWorldPortlet/README.txt (added)
+++ struts/sandbox/trunk/Struts2HelloWorldPortlet/README.txt Sun Jul 21 
12:42:35 2013
@@ -0,0 +1,50 @@
+This is an example of running a Struts 2 portlet using the pluto embedded 
maven plugin with Jetty servlet container.
+
+To run the application use mvn jetty:run
+
+After Jetty starts up go to 
http://localhost:8080/struts2helloworldportlet/pluto/index.jsp
+
+The key parts to get the application to run using the embedded pluto plugin 
are:
+
+1.  include this dependency in your pom.xml
+
+   
+   com.bekk.boss
+   maven-jetty-pluto-embedded
+   1.0.1
+   
+   
+2.  include these plugins in your plugins section in pom.xml
+   (note the value of org.apache.pluto.embedded.portletIds is the portlet id 
value from portlet.xml)
+
+   
+org.apache.pluto
+maven-pluto-plugin
+1.1.3
+
+
+generate-resources
+
+assemble
+
+
+
+
+
+org.mortbay.jetty
+maven-jetty-plugin
+6.1.23
+
+
${project.build.directory}/pluto-resources/web.xml
+
src/main/webapp/WEB-INF/jetty-pluto-web-default.xml
+
+
+org.apache.pluto.embedded.portletIds
+struts2helloworldportlet
+
+
+
+
+
+3.  Include jetty-pluto-web-default.xml in WEB-INF
+

Added: struts/sandbox/trunk/Struts2HelloWorldPortlet/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/Struts2HelloWorldPortlet/pom.xml?rev=1505372&view=auto
==
--- struts/sandbox/trunk/Struts2HelloWorldPortlet/pom.xml (added)
+++ struts/sandbox/trunk/Struts2HelloWorldPortlet/pom.xml Sun Jul 21 12:42:35 
2013
@@ -0,0 +1,174 @@
+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/maven-v4_0_0.xsd";>
+   4.0.0
+   manning
+   struts2helloworldportlet
+   war

svn commit: r1505390 - /struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/TextProvider.java

2013-07-21 Thread bphillips
Author: bphillips
Date: Sun Jul 21 13:55:36 2013
New Revision: 1505390

URL: http://svn.apache.org/r1505390
Log:
WW-4099 updated JavaDoc for getText methods to clearly state that if there is 
no value found for the provided key then the method should return the provided 
key.

Modified:

struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/TextProvider.java

Modified: 
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/TextProvider.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/TextProvider.java?rev=1505390&r1=1505389&r2=1505390&view=diff
==
--- 
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/TextProvider.java
 (original)
+++ 
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/TextProvider.java
 Sun Jul 21 13:55:36 2013
@@ -24,7 +24,7 @@ import java.util.ResourceBundle;
 /**
  * Provides access to {@link ResourceBundle}s and their underlying text 
messages.
  * Implementing classes can delegate {@link TextProviderSupport}. Messages 
will be
- * searched in multiple resource bundles, startinag with the one associated 
with
+ * searched in multiple resource bundles, starting with the one associated with
  * this particular class (action in most cases), continuing to try the message
  * bundle associated with each superclass as well. It will stop once a bundle 
is
  * found that contains the given text. This gives a cascading style that allow
@@ -39,7 +39,7 @@ import java.util.ResourceBundle;
  * 
  * 
  * 
- * if you want to also use your implemntation for framework's messages define 
another constant (remember to put
+ * if you want to also use your implementation for framework's messages define 
another constant (remember to put
  * into it all framework messages)
  * 
  * 
@@ -61,10 +61,11 @@ public interface TextProvider {
 boolean hasKey(String key);
 
 /**
- * Gets a message based on a message key, or null if no message is found.
+ * Gets a message based on a message key or if no message is found the 
provided key
+ * is returned.
  *
  * @param key the resource bundle key that is to be searched for
- * @return the message as found in the resource bundle, or null if none is 
found.
+ * @return the message as found in the resource bundle, or the provided 
key if none is found.
  */
 String getText(String key);
 
@@ -92,21 +93,21 @@ public interface TextProvider {
 
 /**
  * Gets a message based on a key using the supplied args, as defined in
- * {@link java.text.MessageFormat}, or null if no message is found.
+ * {@link java.text.MessageFormat} or the provided key if no message is 
found.
  *
  * @param key  the resource bundle key that is to be searched for
  * @param args a list args to be used in a {@link java.text.MessageFormat} 
message
- * @return the message as found in the resource bundle, or null if none is 
found.
+ * @return the message as found in the resource bundle, or the provided 
key if none is found.
  */
 String getText(String key, List args);
 
 /**
  * Gets a message based on a key using the supplied args, as defined in
- * {@link java.text.MessageFormat}, or null if no message is found.
+ * {@link java.text.MessageFormat}, or the provided key if no message is 
found.
  *
  * @param key  the resource bundle key that is to be searched for
  * @param args an array args to be used in a {@link 
java.text.MessageFormat} message
- * @return the message as found in the resource bundle, or null if none is 
found.
+ * @return the message as found in the resource bundle, or the provided 
key if none is found.
  */
 String getText(String key, String[] args);
 




svn commit: r1505391 - /struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/TextProviderSupport.java

2013-07-21 Thread bphillips
Author: bphillips
Date: Sun Jul 21 13:56:57 2013
New Revision: 1505391

URL: http://svn.apache.org/r1505391
Log:
updated JavaDoc for the getText methods to clearly statue that if no value is 
found for the provided key then the key is returned

Modified:

struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/TextProviderSupport.java

Modified: 
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/TextProviderSupport.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/TextProviderSupport.java?rev=1505391&r1=1505390&r2=1505391&view=diff
==
--- 
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/TextProviderSupport.java
 (original)
+++ 
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/TextProviderSupport.java
 Sun Jul 21 13:56:57 2013
@@ -117,7 +117,7 @@ public class TextProviderSupport impleme
  * class.
  *
  * @param key name of text to be found
- * @return value of named text
+ * @return value of named text or the provided key if no value is found
  */
 public String getText(String key) {
 return getText(key, key, Collections.emptyList());
@@ -133,7 +133,7 @@ public class TextProviderSupport impleme
  *
  * @param keyname of text to be found
  * @param defaultValue the default value which will be returned if no text 
is found
- * @return value of named text
+ * @return value of named text or the provided defaultValue if no value is 
found
  */
 public String getText(String key, String defaultValue) {
 return getText(key, defaultValue, Collections.emptyList());
@@ -149,7 +149,7 @@ public class TextProviderSupport impleme
  *
  * @param keyname of text to be found
  * @param defaultValue the default value which will be returned if no text 
is found
- * @return value of named text
+ * @return value of named text or the provided defaultValue if no value is 
found
  */
 public String getText(String key, String defaultValue, String arg) {
 List args = new ArrayList();
@@ -167,7 +167,7 @@ public class TextProviderSupport impleme
  *
  * @param key name of text to be found
  * @param args  a List of args to be used in a MessageFormat message
- * @return value of named text
+ * @return value of named text or the provided key if no value is found
  */
 public String getText(String key, List args) {
 return getText(key, key, args);
@@ -183,7 +183,7 @@ public class TextProviderSupport impleme
  *
  * @param key name of text to be found
  * @param args  an array of args to be used in a MessageFormat message
- * @return value of named text
+ * @return value of named text or the provided key if no value is found
  */
 public String getText(String key, String[] args) {
 return getText(key, key, args);
@@ -200,7 +200,7 @@ public class TextProviderSupport impleme
  * @param keyname of text to be found
  * @param defaultValue the default value which will be returned if no text 
is found
  * @param args a List of args to be used in a MessageFormat message
- * @return value of named text
+ * @return value of named text or the provided defaultValue if no value is 
found
  */
 public String getText(String key, String defaultValue, List args) {
 Object[] argsArray = ((args != null && 
!args.equals(Collections.emptyList())) ? args.toArray() : null);
@@ -222,7 +222,7 @@ public class TextProviderSupport impleme
  * @param key  name of text to be found
  * @param defaultValue the default value which will be returned if no text 
is found
  * @param args an array of args to be used in a MessageFormat 
message
- * @return value of named text
+ * @return value of named text or the provided defaultValue if no value is 
found
  */
 public String getText(String key, String defaultValue, String[] args) {
 if (clazz != null) {




[CONF] Confluence Changes in the last 24 hours

2013-07-21 Thread Anonymous (Confluence)







   Apache Airavata


Pages

 Page:
 AMQP Transport
edited by Danushka Menikkumbura[09:24 AM]
(view changes)



   Apache Camel


Pages

 Page:
 Stream caching
edited by Claus Ibsen[08:51 PM]
(view changes)

 Page:
 Articles
edited by Claus Ibsen[06:46 PM]
(view changes)




Comments

 Page:
 Articles
has 2 new comments
[ Senthil V S]


   Apache Cloudstack


Pages

 Page:
 VM Snapshot Second Cycle Execution Results
created by Chandan Purushothama[03:14 AM]

 Page:
 Isolation based on Security Groups in Advance zone execution
edited by angie shen[12:48 AM]
(view changes)



   Apache Kafka


Pages

 Page:
 FAQ
edited by Jun Rao[05:45 PM]
(view changes)



   Apache Mahout


Pages

 Page:
 Mahout on Elastic MapReduce
edited by jielunyixia[02:52 PM]
(view changes)




Comments

 Page:
 Mahout on Elastic MapReduce
has a new comment
[ jielunyixia]


   Apache Maven


Pages

 Page:
 Compatibility with Maven 2.x
created by Jason van Zyl[06:02 PM]



   Apache OpenOffice Community


Pages

 Page:
 Notes de la versión AOO 4.0 (Asturianu)
created by Xuacu Saturio[11:58 PM]

 Page:
 Notas de la versión
edited by Ricardo Berlasso[12:54 PM]
(view changes)

 Page:
 AOO 4.0 Release Notes
edited by Andrea Pescetti[11:26 AM]
(view changes)

 Page:
 Informazioni su OpenOffice 4.0 (italiano)
created by Andrea Pescetti[08:38 AM]



   Apache Openmeetings


Pages

 Page:
 List of Missing Features OpenMeetings 3.x
edited by SebastianWagner[06:10 AM]
(view changes)



   Apache Shiro


Pages

 Page:
 Events
edited by Glen Mazza[07:28 PM]
(view changes)



   Apache Sqoop


Pages