svn commit: r902143 - /websites/production/struts/content/git-for-struts.html
Author: lukaszlenart Date: Tue Mar 18 07:07:28 2014 New Revision: 902143 Log: Updates autogenerated page Modified: websites/production/struts/content/git-for-struts.html Modified: websites/production/struts/content/git-for-struts.html == --- websites/production/struts/content/git-for-struts.html (original) +++ websites/production/struts/content/git-for-struts.html Tue Mar 18 07:07:28 2014 @@ -129,50 +129,44 @@ Please remember that master branch cannot be modified directly from now on! +Non-committers + If you aren't a committer you must use this link below or mirror at GitHub git clone git://git.apache.org/struts.git struts-copy Contributing with GitHub -If you would like to contribute using the GitHub tools you need to know we can only -accept your work if we have your http://www.apache.org/licenses/icla.txt";>ICLA on file. -Please read the document carefully, sign and send it to us. Basically this document -protects you and the end users for legal problems. It allows the Apache Software Foundation -to use your code and distribute it. -You should receive an email a few days after you submitted it and appear in the -http://people.apache.org/committer-index.html";>committer index in the section "unlisted CLAs". +Using GitHub mirror is the simplest way to contribute to Apache Struts if you are not a member +of Struts Committers group. -Once done, you can clone the https://github.com/apache/struts";>Apache Struts mirror on GitHub: -git clone g...@github.com:apache/struts.git struts-mirror.git - -Please create an issue on our https://issues.apache.org/jira/browse/WW";>issue tracker. -You'll receive an issue number which you should use to create a working branch (for example WW-4196). +First you must have an account created at GitHub to be able perform the next step. If you don't, +go ahead and create one just right now! Please remember to setup +https://help.github.com/articles/generating-ssh-keys";>SSH keys and test them! -If you are sending a pull request, please send it to the Apache Struts teams repo and not -the official mirror. We cannot accept and close pull requests there which is the reason -we have an own account. You can find it here: +When ready go to https://github.com/apache/struts";>https://github.com/apache/struts and click Fork button +in top right corner. This will fork Apache Struts repository and will create your private (but public) repository +with the source code. -[https://github.com/apachestruts/struts] +Next step is to clone your repo locally, information how to do this you will find on right sidebar of your repo +under SSH clone URL headline. -Please send the pull request to "trunk". +Now you are ready to work with Apache Struts code base. Perform your changes, commit them and +next push to GitHub! Remember: commit in Git is different than commit in Subversion! -It is of course possible to add us as upstream repo: -git remote add upstream g...@github.com:apachestruts/struts - -Working with remote branches from GitHub +With your changes pushed to GitHub you can prepare a Pull Request (short: PR). Go to Apache Struts +mirror - https://github.com/apache/struts";>https://github.com/apache/struts - then to +https://github.com/apache/struts/pulls";>Pull request and hit +https://github.com/apache/struts/compare/";>New Pull Request button. + +If not already selected, click on compare across forks. Right now you must select from the dropdowns on right +your fork and branch to compare the differences with Apache Struts develop branch. + +Finally hit Create Pull Request button and you are done! + +Unfortunately not yet. We (Apache Struts committers) can use PRs just for review, we cannot accept your work +directly, so you must fill a JIRA ticket and assign a file with patch to it. But that bother about that right now - +go and hack! -You can add a remote branch from GitHub like this: -git remote add opensourceio g...@github.com:opensourceio/struts - -Pull changes with: -git pull opensourceio anotherbranch - -When merge conflicts happen, these can be resolved using: -git mergetool - -After the merge, you need to commit the changes to Apache Git with: -git commit - Further reading
svn commit: r1578771 - in /struts/site/trunk: content/git-for-struts.html source/git-for-struts.md
Author: lukaszlenart Date: Tue Mar 18 07:07:15 2014 New Revision: 1578771 URL: http://svn.apache.org/r1578771 Log: Updates section about contributing via GitHub Modified: struts/site/trunk/content/git-for-struts.html struts/site/trunk/source/git-for-struts.md Modified: struts/site/trunk/content/git-for-struts.html URL: http://svn.apache.org/viewvc/struts/site/trunk/content/git-for-struts.html?rev=1578771&r1=1578770&r2=1578771&view=diff == --- struts/site/trunk/content/git-for-struts.html (original) +++ struts/site/trunk/content/git-for-struts.html Tue Mar 18 07:07:15 2014 @@ -129,50 +129,44 @@ Please remember that master branch cannot be modified directly from now on! +Non-committers + If you aren't a committer you must use this link below or mirror at GitHub git clone git://git.apache.org/struts.git struts-copy Contributing with GitHub -If you would like to contribute using the GitHub tools you need to know we can only -accept your work if we have your http://www.apache.org/licenses/icla.txt";>ICLA on file. -Please read the document carefully, sign and send it to us. Basically this document -protects you and the end users for legal problems. It allows the Apache Software Foundation -to use your code and distribute it. -You should receive an email a few days after you submitted it and appear in the -http://people.apache.org/committer-index.html";>committer index in the section "unlisted CLAs". +Using GitHub mirror is the simplest way to contribute to Apache Struts if you are not a member +of Struts Committers group. -Once done, you can clone the https://github.com/apache/struts";>Apache Struts mirror on GitHub: -git clone g...@github.com:apache/struts.git struts-mirror.git - -Please create an issue on our https://issues.apache.org/jira/browse/WW";>issue tracker. -You'll receive an issue number which you should use to create a working branch (for example WW-4196). +First you must have an account created at GitHub to be able perform the next step. If you don't, +go ahead and create one just right now! Please remember to setup +https://help.github.com/articles/generating-ssh-keys";>SSH keys and test them! -If you are sending a pull request, please send it to the Apache Struts teams repo and not -the official mirror. We cannot accept and close pull requests there which is the reason -we have an own account. You can find it here: +When ready go to https://github.com/apache/struts";>https://github.com/apache/struts and click Fork button +in top right corner. This will fork Apache Struts repository and will create your private (but public) repository +with the source code. -[https://github.com/apachestruts/struts] +Next step is to clone your repo locally, information how to do this you will find on right sidebar of your repo +under SSH clone URL headline. -Please send the pull request to "trunk". +Now you are ready to work with Apache Struts code base. Perform your changes, commit them and +next push to GitHub! Remember: commit in Git is different than commit in Subversion! -It is of course possible to add us as upstream repo: -git remote add upstream g...@github.com:apachestruts/struts - -Working with remote branches from GitHub +With your changes pushed to GitHub you can prepare a Pull Request (short: PR). Go to Apache Struts +mirror - https://github.com/apache/struts";>https://github.com/apache/struts - then to +https://github.com/apache/struts/pulls";>Pull request and hit +https://github.com/apache/struts/compare/";>New Pull Request button. + +If not already selected, click on compare across forks. Right now you must select from the dropdowns on right +your fork and branch to compare the differences with Apache Struts develop branch. + +Finally hit Create Pull Request button and you are done! + +Unfortunately not yet. We (Apache Struts committers) can use PRs just for review, we cannot accept your work +directly, so you must fill a JIRA ticket and assign a file with patch to it. But that bother about that right now - +go and hack! -You can add a remote branch from GitHub like this: -git remote add opensourceio g...@github.com:opensourceio/struts - -Pull changes with: -git pull opensourceio anotherbranch - -When merge conflicts happen, these can be resolved using: -git mergetool - -After the merge, you need to commit the changes to Apache Git with: -git commit - Further reading Modified: struts/site/trunk/source/git-for-struts.md URL: http://svn.apache.org/viewvc/struts/site/trunk/source/git-for-struts.md?rev=1578771&r1=1578770&r2=1578771&view=diff == --- struts/site/trunk/source/git-for-struts.md (original) +++ struts/site/trunk/source/git-for-struts.md Tue Mar 18 07:07:15 2014 @@ -26,56 +26,44 @@ and done! Please remember that `master` branch cannot be modified directly from now on! +##
[2/2] git commit: No JIRA - edit JavaDoc for class to make it clearer how to assign a value to a parameter when that value is a literal string
No JIRA - edit JavaDoc for class to make it clearer how to assign a value to a parameter when that value is a literal string Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/561063a4 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/561063a4 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/561063a4 Branch: refs/heads/develop Commit: 561063a4227dd609ccba83880b2d0c6ec2d1e4aa Parents: cb9f0f5 Author: phillips1021 Authored: Tue Mar 18 09:48:18 2014 -0500 Committer: phillips1021 Committed: Tue Mar 18 09:48:18 2014 -0500 -- .../main/java/org/apache/struts2/components/GenericUIBean.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/561063a4/core/src/main/java/org/apache/struts2/components/GenericUIBean.java -- diff --git a/core/src/main/java/org/apache/struts2/components/GenericUIBean.java b/core/src/main/java/org/apache/struts2/components/GenericUIBean.java index 64dfabe..9521e1f 100644 --- a/core/src/main/java/org/apache/struts2/components/GenericUIBean.java +++ b/core/src/main/java/org/apache/struts2/components/GenericUIBean.java @@ -56,9 +56,8 @@ import com.opensymphony.xwork2.util.ValueStack; * engine will be found based on file extension. * * Remember: the value params will always be resolved against the ValueStack so if you mean to pass a - * string literal to your component, make sure to wrap it in quotes i.e. value="'value1'" otherwise, the the value - * stack will search for an Object on the stack with a method of getValue1(). (now that i've written this, i'm not - * entirely sure this is the case. i should verify this manana) + * string literal to your component, make sure to wrap it in single quotes i.e. value="'value1'" (note the opening "' and closing '" otherwise, the the value + * stack will search for an Object on the stack with a method of getValue1(). * * *
[1/2] git commit: https://issues.apache.org/jira/browse/WW-4299 - do not assign value to id parameter if tryId value is null this prevents overwriting a parameter with a name of id used with the compo
Repository: struts
Updated Branches:
refs/heads/develop 3ceb3b973 -> 561063a42
https://issues.apache.org/jira/browse/WW-4299 - do not assign value to id
parameter if tryId value is null this prevents overwriting a parameter with a
name of id used with the component tag
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/cb9f0f56
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/cb9f0f56
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/cb9f0f56
Branch: refs/heads/develop
Commit: cb9f0f5645d05b2f1c7c66640716acff61c4425f
Parents: 3ceb3b9
Author: phillips1021
Authored: Tue Mar 18 09:46:36 2014 -0500
Committer: phillips1021
Committed: Tue Mar 18 09:46:36 2014 -0500
--
.../src/main/java/org/apache/struts2/components/UIBean.java | 9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/cb9f0f56/core/src/main/java/org/apache/struts2/components/UIBean.java
--
diff --git a/core/src/main/java/org/apache/struts2/components/UIBean.java
b/core/src/main/java/org/apache/struts2/components/UIBean.java
index 9418a6e..51b7e79 100644
--- a/core/src/main/java/org/apache/struts2/components/UIBean.java
+++ b/core/src/main/java/org/apache/struts2/components/UIBean.java
@@ -1024,8 +1024,13 @@ public abstract class UIBean extends Component {
} else {
tryId = generatedId;
}
-addParameter("id", tryId);
-addParameter("escapedId", escape(tryId));
+
+//fix for https://issues.apache.org/jira/browse/WW-4299
+//do not assign value to id if tryId is null
+if (tryId != null) {
+ addParameter("id", tryId);
+ addParameter("escapedId", escape(tryId));
+}
}
/**
