[GitHub] struts pull request: WW-4590 - Allow to use multiple names in resu...

[lukaszlenart]

Github user lukaszlenart commented on a diff in the pull request:

https://github.com/apache/struts/pull/75#discussion_r50081302
  
--- Diff: 
core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
 ---
@@ -777,11 +777,21 @@ protected Class verifyResultType(String className, 
Location loc) {
 }
 params.putAll(resultParams);
 
-ResultConfig resultConfig = new 
ResultConfig.Builder(resultName, resultClass)
-.addParams(params)
-.location(DomHelper.getLocationObject(element))
-.build();
-results.put(resultConfig.getName(), resultConfig);
+Set resultNamesSet;
+if (",".equals(resultName.trim())) {
+resultNamesSet = new HashSet<>(1);
+resultNamesSet.add(resultName);
--- End diff --

Why not just do it this way instead of this `if..else`?
`resultNamesSet = TextParseUtil.commaDelimitedStringToSet(resultName);`


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

-
To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org
For additional commands, e-mail: dev-h...@struts.apache.org

[GitHub] struts pull request: New result 'JSONActionRedirectResult' in json...

[asfgit]

Github user asfgit closed the pull request at:

https://github.com/apache/struts/pull/72


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

-
To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org
For additional commands, e-mail: dev-h...@struts.apache.org

[GitHub] struts pull request: New result 'JSONActionRedirectResult' in json...

[lukaszlenart]

Github user lukaszlenart commented on the pull request:

https://github.com/apache/struts/pull/72#issuecomment-172766427
  
A one formal thing: no JIRA ticket :(


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

-
To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org
For additional commands, e-mail: dev-h...@struts.apache.org

[GitHub] struts pull request: New result 'JSONActionRedirectResult' in json...

[lukaszlenart]

Github user lukaszlenart commented on the pull request:

https://github.com/apache/struts/pull/72#issuecomment-172766247
  
Let's get it merged :)


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

-
To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org
For additional commands, e-mail: dev-h...@struts.apache.org

[GitHub] struts pull request: WW-4590 - Allow to use multiple names in resu...

[lukaszlenart]

Github user lukaszlenart commented on a diff in the pull request:

https://github.com/apache/struts/pull/75#discussion_r50080211
  
--- Diff: 
core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
 ---
@@ -777,11 +777,21 @@ protected Class verifyResultType(String className, 
Location loc) {
 }
 params.putAll(resultParams);
 
-ResultConfig resultConfig = new 
ResultConfig.Builder(resultName, resultClass)
-.addParams(params)
-.location(DomHelper.getLocationObject(element))
-.build();
-results.put(resultConfig.getName(), resultConfig);
+Set resultNamesSet;
+if (",".equals(resultName.trim())) {
+resultNamesSet = new HashSet<>(1);
+resultNamesSet.add(resultName);
--- End diff --

`if (",".equals(resultName.trim()))` assumes that the result name contains 
only `,` and then it will produce a set with `,` (value of `resultName`). 
`TextParseUtil.commaDelimitedStringToSet` is in the `else` section so it won't 
be used in this case.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

-
To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org
For additional commands, e-mail: dev-h...@struts.apache.org

[GitHub] struts pull request: WW-4590 - Allow to use multiple names in resu...

[aleksandr-m]

Github user aleksandr-m commented on a diff in the pull request:

https://github.com/apache/struts/pull/75#discussion_r50079358
  
--- Diff: 
core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
 ---
@@ -777,11 +777,21 @@ protected Class verifyResultType(String className, 
Location loc) {
 }
 params.putAll(resultParams);
 
-ResultConfig resultConfig = new 
ResultConfig.Builder(resultName, resultClass)
-.addParams(params)
-.location(DomHelper.getLocationObject(element))
-.build();
-results.put(resultConfig.getName(), resultConfig);
+Set resultNamesSet;
+if (",".equals(resultName.trim())) {
+resultNamesSet = new HashSet<>(1);
+resultNamesSet.add(resultName);
--- End diff --

Currently it is allowed to have a result name as a `,`. And 
`TextParseUtil.commaDelimitedStringToSet` will produce empty set in that case. 
Note that it is trimmed so the result name can be something like 
"   ," also.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

-
To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org
For additional commands, e-mail: dev-h...@struts.apache.org

[GitHub] struts pull request: WW-4590 - Allow to use multiple names in resu...

[lukaszlenart]

Github user lukaszlenart commented on the pull request:

https://github.com/apache/struts/pull/75#issuecomment-172754377
  
Great idea!


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

-
To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org
For additional commands, e-mail: dev-h...@struts.apache.org

[GitHub] struts pull request: WW-4590 - Allow to use multiple names in resu...

[lukaszlenart]

Github user lukaszlenart commented on a diff in the pull request:

https://github.com/apache/struts/pull/75#discussion_r50076520
  
--- Diff: 
core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
 ---
@@ -777,11 +777,21 @@ protected Class verifyResultType(String className, 
Location loc) {
 }
 params.putAll(resultParams);
 
-ResultConfig resultConfig = new 
ResultConfig.Builder(resultName, resultClass)
-.addParams(params)
-.location(DomHelper.getLocationObject(element))
-.build();
-results.put(resultConfig.getName(), resultConfig);
+Set resultNamesSet;
+if (",".equals(resultName.trim())) {
+resultNamesSet = new HashSet<>(1);
+resultNamesSet.add(resultName);
--- End diff --

the final resuly set will contain only `,`?


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

-
To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org
For additional commands, e-mail: dev-h...@struts.apache.org

[GitHub] struts pull request: propose fix for ww-4456

[lukaszlenart]

Github user lukaszlenart commented on the pull request:

https://github.com/apache/struts/pull/74#issuecomment-172753439
  
The simplest approach it to not reverse merge `master` into your PRs till 
they are green.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

-
To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org
For additional commands, e-mail: dev-h...@struts.apache.org

[GitHub] struts pull request: propose fix for ww-4456

[victorsosa]

Github user victorsosa commented on the pull request:

https://github.com/apache/struts/pull/74#issuecomment-172694546
  
Closed; Just got contaminated with other changes


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

-
To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org
For additional commands, e-mail: dev-h...@struts.apache.org

[GitHub] struts pull request: propose fix for ww-4456

[victorsosa]

Github user victorsosa closed the pull request at:

https://github.com/apache/struts/pull/74


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

-
To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org
For additional commands, e-mail: dev-h...@struts.apache.org

Jenkins build is back to normal : Struts-JDK7-pull-request #129

[Apache Jenkins Server]

See 


-
To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org
For additional commands, e-mail: dev-h...@struts.apache.org

Jenkins build is back to normal : Struts-JDK7-pull-request #127

[Apache Jenkins Server]

See 


-
To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org
For additional commands, e-mail: dev-h...@struts.apache.org

Build failed in Jenkins: Struts-JDK7-pull-request #128

[Apache Jenkins Server]

See 

--
GitHub pull request #78 to apache/struts
[EnvInject] - Loading node environment variables.
Building remotely on ubuntu3 (Ubuntu ubuntu legacy-ubuntu) in workspace 

 > git rev-parse --is-inside-work-tree # timeout=10
Fetching changes from the remote Git repository
 > git config remote.origin.url git://github.com/apache/struts.git # timeout=10
Cleaning workspace
 > git rev-parse --verify HEAD # timeout=10
Resetting working tree
 > git reset --hard # timeout=10
 > git clean -fdx # timeout=10
Pruning obsolete local branches
Fetching upstream changes from git://github.com/apache/struts.git
 > git --version # timeout=10
 > git -c core.askpass=true fetch --tags --progress 
 > git://github.com/apache/struts.git +refs/heads/*:refs/remotes/origin/* 
 > --prune
 > git config core.sparsecheckout # timeout=10
 > git checkout -f origin/master # timeout=10
 > git branch -a # timeout=10
 > git rev-parse master^{commit} # timeout=10
 > git rev-parse support-2-3^{commit} # timeout=10
 > git rev-parse remotes/origin/master^{commit} # timeout=10
 > git rev-parse remotes/origin/support-2-3^{commit} # timeout=10
 > git branch -D master # timeout=10
 > git checkout -b master origin/master
  Opening connection
Done: 0
  Counting objects
Done: 29
  Finding sources
Done: 29
  Getting sizes
Done: 22
  Compressing objects
Done: 0
  Writing objects
Done: 29
  remote: Resolving deltas
  remote: Updating references
Merging refs/tags/changes/128
 > git rev-parse refs/tags/changes/128^{commit} # timeout=10
 > git merge 39a334c87a1b4429060eaf0227ba79677931d25f # timeout=10
FATAL: Could not merge AnyObjectId[39a334c87a1b4429060eaf0227ba79677931d25f]
hudson.plugins.git.GitException: Could not merge 
AnyObjectId[39a334c87a1b4429060eaf0227ba79677931d25f]
at 
org.jenkinsci.plugins.gitclient.CliGitAPIImpl$3.execute(CliGitAPIImpl.java:589)
at 
org.jenkinsci.plugins.gitclient.AbstractGitAPIImpl.merge(AbstractGitAPIImpl.java:87)
at 
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.merge(CliGitAPIImpl.java:62)
at sun.reflect.GeneratedMethodAccessor1325.invoke(Unknown Source)
at 
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:606)
at 
hudson.remoting.RemoteInvocationHandler$RPCRequest.perform(RemoteInvocationHandler.java:608)
at 
hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:583)
at 
hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:542)
at hudson.remoting.UserRequest.perform(UserRequest.java:121)
at hudson.remoting.UserRequest.perform(UserRequest.java:49)
at hudson.remoting.Request$2.run(Request.java:326)
at 
hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:68)
at java.util.concurrent.FutureTask.run(FutureTask.java:262)
at 
java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
at 
java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
at java.lang.Thread.run(Thread.java:745)
at ..remote call to ubuntu3(Native Method)
at hudson.remoting.Channel.attachCallSiteStackTrace(Channel.java:1413)
at hudson.remoting.UserResponse.retrieve(UserRequest.java:221)
at hudson.remoting.Channel.call(Channel.java:778)
at 
hudson.remoting.RemoteInvocationHandler.invoke(RemoteInvocationHandler.java:250)
at com.sun.proxy.$Proxy54.merge(Unknown Source)
at 
org.jenkinsci.plugins.gitclient.RemoteGitImpl.merge(RemoteGitImpl.java:438)
at 
com.cloudbees.jenkins.plugins.git.vmerge.BuildChooserImpl.getCandidateRevisions(BuildChooserImpl.java:107)
at hudson.plugins.git.GitSCM.determineRevisionToBuild(GitSCM.java:951)
at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1054)
at hudson.scm.SCM.checkout(SCM.java:484)
at hudson.model.AbstractProject.checkout(AbstractProject.java:1274)
at 
hudson.model.AbstractBuild$AbstractBuildExecution.defaultCheckout(AbstractBuild.java:609)
at jenkins.scm.SCMCheckoutStrategy.checkout(SCMCheckoutStrategy.java:86)
at 
hudson.model.AbstractBuild$AbstractBuildExecution.run(AbstractBuild.java:531)
at hudson.model.Run.execute(Run.java:1738)
at hudson.maven.MavenModuleSetBuild.run(MavenModuleSetBuild.java:531)
at hudson.model.ResourceController.execute(ResourceController.java:98)
at hudson.model.Executor.run(Executor.java:381)
Caused by: hudson.plugins.git.GitException: Command "git merge 
39a334c87a1b4429060eaf0227ba79677931d25f" returned status code 1:
stdout: CONFLICT (modify/delete): 
plugins/tiles3/src/main/java/org/apache/struts2/views/

[GitHub] struts pull request: update pull

[victorsosa]

Github user victorsosa closed the pull request at:

https://github.com/apache/struts/pull/78


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

-
To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org
For additional commands, e-mail: dev-h...@struts.apache.org

[GitHub] struts pull request: update pull

[victorsosa]

GitHub user victorsosa opened a pull request:

https://github.com/apache/struts/pull/78

update pull



You can merge this pull request into a Git repository by running:

$ git pull https://github.com/victorsosa/struts patch

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/struts/pull/78.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #78


commit 073bb9dd587844c1f44c97ba53b8419c83f2583a
Author: victor sosa 
Date:   2016-01-16T18:45:39Z

Merge pull request #3 from apache/master

update

commit 8f1557a5b13fe9f9b4cbc8961a8bf66b3db89e76
Author: Victor Sosa 
Date:   2016-01-18T15:34:36Z

WW-4412

Context started without being closed

Now the context is closed after been used.

commit a154184b9059e6e81e63af4820c0fefc0374c2bd
Author: Victor Sosa 
Date:   2016-01-18T15:34:36Z

WW-4412

Context started without being closed

Now the context is closed after been used.

commit cd931f8ed8e73a9dd242ec05fe6dfcaf45012273
Author: victor sosa 
Date:   2016-01-18T23:19:45Z

Update JakartaMultiPartRequest.java

Fix conflict

commit f562147d028156f7f51adab247e1b450a20962d8
Author: Victor Sosa 
Date:   2016-01-18T23:14:48Z

Merge branch 'patch' of g...@github.com:victorsosa/struts.git into patch

commit 39a334c87a1b4429060eaf0227ba79677931d25f
Author: Victor Sosa 
Date:   2016-01-18T23:29:28Z

Merge branch 'patch' of g...@github.com:victorsosa/struts.git into patch




---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

-
To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org
For additional commands, e-mail: dev-h...@struts.apache.org

[GitHub] struts pull request: WW-4412 Context started without being closed

[victorsosa]

GitHub user victorsosa opened a pull request:

https://github.com/apache/struts/pull/77

WW-4412  Context started without being closed

Patch   WW-4412

Context started without being closed

Now the context is closed after been used.

You can merge this pull request into a Git repository by running:

$ git pull https://github.com/victorsosa/struts patch

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/struts/pull/77.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #77


commit 073bb9dd587844c1f44c97ba53b8419c83f2583a
Author: victor sosa 
Date:   2016-01-16T18:45:39Z

Merge pull request #3 from apache/master

update

commit 8f1557a5b13fe9f9b4cbc8961a8bf66b3db89e76
Author: Victor Sosa 
Date:   2016-01-18T15:34:36Z

WW-4412

Context started without being closed

Now the context is closed after been used.

commit a154184b9059e6e81e63af4820c0fefc0374c2bd
Author: Victor Sosa 
Date:   2016-01-18T15:34:36Z

WW-4412

Context started without being closed

Now the context is closed after been used.

commit cd931f8ed8e73a9dd242ec05fe6dfcaf45012273
Author: victor sosa 
Date:   2016-01-18T23:19:45Z

Update JakartaMultiPartRequest.java

Fix conflict

commit f562147d028156f7f51adab247e1b450a20962d8
Author: Victor Sosa 
Date:   2016-01-18T23:14:48Z

Merge branch 'patch' of g...@github.com:victorsosa/struts.git into patch

commit 39a334c87a1b4429060eaf0227ba79677931d25f
Author: Victor Sosa 
Date:   2016-01-18T23:29:28Z

Merge branch 'patch' of g...@github.com:victorsosa/struts.git into patch




---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

-
To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org
For additional commands, e-mail: dev-h...@struts.apache.org

Build failed in Jenkins: Struts-JDK7-pull-request #126

[Apache Jenkins Server]

See 

--
GitHub pull request #77 to apache/struts
[EnvInject] - Loading node environment variables.
Building remotely on ubuntu3 (Ubuntu ubuntu legacy-ubuntu) in workspace 

 > git rev-parse --is-inside-work-tree # timeout=10
Fetching changes from the remote Git repository
 > git config remote.origin.url git://github.com/apache/struts.git # timeout=10
Cleaning workspace
 > git rev-parse --verify HEAD # timeout=10
Resetting working tree
 > git reset --hard # timeout=10
 > git clean -fdx # timeout=10
Pruning obsolete local branches
Fetching upstream changes from git://github.com/apache/struts.git
 > git --version # timeout=10
 > git -c core.askpass=true fetch --tags --progress 
 > git://github.com/apache/struts.git +refs/heads/*:refs/remotes/origin/* 
 > --prune
 > git config core.sparsecheckout # timeout=10
 > git checkout -f origin/master # timeout=10
 > git branch -a # timeout=10
 > git rev-parse master^{commit} # timeout=10
 > git rev-parse support-2-3^{commit} # timeout=10
 > git rev-parse remotes/origin/master^{commit} # timeout=10
 > git rev-parse remotes/origin/support-2-3^{commit} # timeout=10
 > git branch -D master # timeout=10
 > git checkout -b master origin/master
  Opening connection
Done: 0
  Counting objects
Done: 29
  Finding sources
Done: 29
  Getting sizes
Done: 22
  Compressing objects
Done: 0
  Writing objects
Done: 29
  remote: Resolving deltas
  remote: Updating references
Merging refs/tags/changes/126
 > git rev-parse refs/tags/changes/126^{commit} # timeout=10
 > git merge 39a334c87a1b4429060eaf0227ba79677931d25f # timeout=10
FATAL: Could not merge AnyObjectId[39a334c87a1b4429060eaf0227ba79677931d25f]
hudson.plugins.git.GitException: Could not merge 
AnyObjectId[39a334c87a1b4429060eaf0227ba79677931d25f]
at 
org.jenkinsci.plugins.gitclient.CliGitAPIImpl$3.execute(CliGitAPIImpl.java:589)
at 
org.jenkinsci.plugins.gitclient.AbstractGitAPIImpl.merge(AbstractGitAPIImpl.java:87)
at 
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.merge(CliGitAPIImpl.java:62)
at sun.reflect.GeneratedMethodAccessor1325.invoke(Unknown Source)
at 
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:606)
at 
hudson.remoting.RemoteInvocationHandler$RPCRequest.perform(RemoteInvocationHandler.java:608)
at 
hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:583)
at 
hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:542)
at hudson.remoting.UserRequest.perform(UserRequest.java:121)
at hudson.remoting.UserRequest.perform(UserRequest.java:49)
at hudson.remoting.Request$2.run(Request.java:326)
at 
hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:68)
at java.util.concurrent.FutureTask.run(FutureTask.java:262)
at 
java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
at 
java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
at java.lang.Thread.run(Thread.java:745)
at ..remote call to ubuntu3(Native Method)
at hudson.remoting.Channel.attachCallSiteStackTrace(Channel.java:1413)
at hudson.remoting.UserResponse.retrieve(UserRequest.java:221)
at hudson.remoting.Channel.call(Channel.java:778)
at 
hudson.remoting.RemoteInvocationHandler.invoke(RemoteInvocationHandler.java:250)
at com.sun.proxy.$Proxy54.merge(Unknown Source)
at 
org.jenkinsci.plugins.gitclient.RemoteGitImpl.merge(RemoteGitImpl.java:438)
at 
com.cloudbees.jenkins.plugins.git.vmerge.BuildChooserImpl.getCandidateRevisions(BuildChooserImpl.java:107)
at hudson.plugins.git.GitSCM.determineRevisionToBuild(GitSCM.java:951)
at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1054)
at hudson.scm.SCM.checkout(SCM.java:484)
at hudson.model.AbstractProject.checkout(AbstractProject.java:1274)
at 
hudson.model.AbstractBuild$AbstractBuildExecution.defaultCheckout(AbstractBuild.java:609)
at jenkins.scm.SCMCheckoutStrategy.checkout(SCMCheckoutStrategy.java:86)
at 
hudson.model.AbstractBuild$AbstractBuildExecution.run(AbstractBuild.java:531)
at hudson.model.Run.execute(Run.java:1738)
at hudson.maven.MavenModuleSetBuild.run(MavenModuleSetBuild.java:531)
at hudson.model.ResourceController.execute(ResourceController.java:98)
at hudson.model.Executor.run(Executor.java:381)
Caused by: hudson.plugins.git.GitException: Command "git merge 
39a334c87a1b4429060eaf0227ba79677931d25f" returned status code 1:
stdout: CONFLICT (modify/delete): 
plugins/tiles3/src/main/java/org/apache/struts2/views/

[GitHub] struts pull request: WW-4412 Context started without being closed

[victorsosa]

Github user victorsosa closed the pull request at:

https://github.com/apache/struts/pull/77


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

-
To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org
For additional commands, e-mail: dev-h...@struts.apache.org

[GitHub] struts pull request: WW-4412 Context started without being closed

[victorsosa]

Github user victorsosa closed the pull request at:

https://github.com/apache/struts/pull/76


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

-
To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org
For additional commands, e-mail: dev-h...@struts.apache.org

[GitHub] struts pull request: WW-4412 Context started without being closed

[victorsosa]

Github user victorsosa commented on the pull request:

https://github.com/apache/struts/pull/76#issuecomment-172679977
  
Closed this pull request is right; I will send another one


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

-
To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org
For additional commands, e-mail: dev-h...@struts.apache.org

[GitHub] struts pull request: WW-4412 Context started without being closed

[victorsosa]

GitHub user victorsosa opened a pull request:

https://github.com/apache/struts/pull/76

WW-4412  Context started without being closed

WW-4412

Context started without being closed

You can merge this pull request into a Git repository by running:

$ git pull https://github.com/victorsosa/struts patch

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/struts/pull/76.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #76


commit 073bb9dd587844c1f44c97ba53b8419c83f2583a
Author: victor sosa 
Date:   2016-01-16T18:45:39Z

Merge pull request #3 from apache/master

update

commit 8f1557a5b13fe9f9b4cbc8961a8bf66b3db89e76
Author: Victor Sosa 
Date:   2016-01-18T15:34:36Z

WW-4412

Context started without being closed

Now the context is closed after been used.

commit cd931f8ed8e73a9dd242ec05fe6dfcaf45012273
Author: victor sosa 
Date:   2016-01-18T23:19:45Z

Update JakartaMultiPartRequest.java

Fix conflict




---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

-
To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org
For additional commands, e-mail: dev-h...@struts.apache.org

Build failed in Jenkins: Struts-JDK7-pull-request #125

[Apache Jenkins Server]

See 

--
GitHub pull request #76 to apache/struts
[EnvInject] - Loading node environment variables.
Building remotely on ubuntu3 (Ubuntu ubuntu legacy-ubuntu) in workspace 

 > git rev-parse --is-inside-work-tree # timeout=10
Fetching changes from the remote Git repository
 > git config remote.origin.url git://github.com/apache/struts.git # timeout=10
Cleaning workspace
 > git rev-parse --verify HEAD # timeout=10
Resetting working tree
 > git reset --hard # timeout=10
 > git clean -fdx # timeout=10
Pruning obsolete local branches
Fetching upstream changes from git://github.com/apache/struts.git
 > git --version # timeout=10
 > git -c core.askpass=true fetch --tags --progress 
 > git://github.com/apache/struts.git +refs/heads/*:refs/remotes/origin/* 
 > --prune
 > git config core.sparsecheckout # timeout=10
 > git checkout -f origin/master # timeout=10
 > git branch -a # timeout=10
 > git rev-parse master^{commit} # timeout=10
 > git rev-parse support-2-3^{commit} # timeout=10
 > git rev-parse remotes/origin/master^{commit} # timeout=10
 > git rev-parse remotes/origin/support-2-3^{commit} # timeout=10
 > git branch -D master # timeout=10
 > git checkout -b master origin/master
  Opening connection
Done: 0
  Counting objects
Done: 26
  Finding sources
Done: 26
  Getting sizes
Done: 22
  Compressing objects
Done: 0
  Writing objects
Done: 26
  remote: Resolving deltas
  remote: Updating references
Merging refs/tags/changes/125
 > git rev-parse refs/tags/changes/125^{commit} # timeout=10
 > git merge cd931f8ed8e73a9dd242ec05fe6dfcaf45012273 # timeout=10
FATAL: Could not merge AnyObjectId[cd931f8ed8e73a9dd242ec05fe6dfcaf45012273]
hudson.plugins.git.GitException: Could not merge 
AnyObjectId[cd931f8ed8e73a9dd242ec05fe6dfcaf45012273]
at 
org.jenkinsci.plugins.gitclient.CliGitAPIImpl$3.execute(CliGitAPIImpl.java:589)
at 
org.jenkinsci.plugins.gitclient.AbstractGitAPIImpl.merge(AbstractGitAPIImpl.java:87)
at 
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.merge(CliGitAPIImpl.java:62)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at 
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
at 
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:606)
at 
hudson.remoting.RemoteInvocationHandler$RPCRequest.perform(RemoteInvocationHandler.java:608)
at 
hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:583)
at 
hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:542)
at hudson.remoting.UserRequest.perform(UserRequest.java:121)
at hudson.remoting.UserRequest.perform(UserRequest.java:49)
at hudson.remoting.Request$2.run(Request.java:326)
at 
hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:68)
at java.util.concurrent.FutureTask.run(FutureTask.java:262)
at 
java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
at 
java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
at java.lang.Thread.run(Thread.java:745)
at ..remote call to ubuntu3(Native Method)
at hudson.remoting.Channel.attachCallSiteStackTrace(Channel.java:1413)
at hudson.remoting.UserResponse.retrieve(UserRequest.java:221)
at hudson.remoting.Channel.call(Channel.java:778)
at 
hudson.remoting.RemoteInvocationHandler.invoke(RemoteInvocationHandler.java:250)
at com.sun.proxy.$Proxy54.merge(Unknown Source)
at 
org.jenkinsci.plugins.gitclient.RemoteGitImpl.merge(RemoteGitImpl.java:438)
at 
com.cloudbees.jenkins.plugins.git.vmerge.BuildChooserImpl.getCandidateRevisions(BuildChooserImpl.java:107)
at hudson.plugins.git.GitSCM.determineRevisionToBuild(GitSCM.java:951)
at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1054)
at hudson.scm.SCM.checkout(SCM.java:484)
at hudson.model.AbstractProject.checkout(AbstractProject.java:1274)
at 
hudson.model.AbstractBuild$AbstractBuildExecution.defaultCheckout(AbstractBuild.java:609)
at jenkins.scm.SCMCheckoutStrategy.checkout(SCMCheckoutStrategy.java:86)
at 
hudson.model.AbstractBuild$AbstractBuildExecution.run(AbstractBuild.java:531)
at hudson.model.Run.execute(Run.java:1738)
at hudson.maven.MavenModuleSetBuild.run(MavenModuleSetBuild.java:531)
at hudson.model.ResourceController.execute(ResourceController.java:98)
at hudson.model.Executor.run(Executor.java:381)
Caused by: hudson.plugins.git.GitException: Command "git merge 
cd931f8ed8e73a9dd242ec05fe6dfcaf45012273" returned status code 1:
st

[GitHub] struts pull request: WW-4590 - Allow to use multiple names in resu...

[aleksandr-m]

GitHub user aleksandr-m opened a pull request:

https://github.com/apache/struts/pull/75

WW-4590 - Allow to use multiple names in result

Allow to use multiple values in `result` tag `name` attribute and in 
`Result` annotation `name`.

So this typical configuration:

```

success.jsp
input-form.jsp
input-form.jsp

```

Can be shorten to that:

```

success.jsp
input-form.jsp

```

And this annotations:

```
@Action(results = {
@Result(name="error", location="input-form.jsp"),
@Result(name="input", location="input-form.jsp"),
@Result(name="success", location="success.jsp")
})
```

To that:

```
@Action(results = {
@Result(name="error, input", location="input-form.jsp"),
@Result(name="success", location="success.jsp")
})
```

You can merge this pull request into a Git repository by running:

$ git pull https://github.com/aleksandr-m/struts 
feature/multiple_result_names

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/struts/pull/75.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #75


commit 087cf610abcd262980a41c30a2f9360aa3f416e1
Author: Aleksandr Mashchenko 
Date:   2016-01-18T19:23:46Z

WW-4590 - Allow to use multiple names in result




---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

-
To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org
For additional commands, e-mail: dev-h...@struts.apache.org

[GitHub] struts pull request: propose fix for ww-4456

[victorsosa]

GitHub user victorsosa opened a pull request:

https://github.com/apache/struts/pull/74

propose fix for ww-4456

HI Lukasz,

This is a proposal to fix WW-4456 - Got NPE when File Upload Limitation 
exceeds in portal env.

We should catch in any case a FileUploadException, then try to cast down if 
we want any info about the exception. Valid subtype of FileUploadException:
InvalidContentTypeException
IOFileUploadException
SizeLimitExceededException
FileSizeLimitExceededException

I couldn't get the complete test on a running test env, because I had 
issues getting the logging to work.

But it seems to works.



You can merge this pull request into a Git repository by running:

$ git pull https://github.com/victorsosa/struts master

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/struts/pull/74.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #74


commit 073bb9dd587844c1f44c97ba53b8419c83f2583a
Author: victor sosa 
Date:   2016-01-16T18:45:39Z

Merge pull request #3 from apache/master

update

commit 81675825723a0f4e7d4d185cd234cb2b900c2577
Author: Victor Sosa 
Date:   2016-01-18T15:34:36Z

propose fix for WW-4456

Got NPE when File Upload Limitation exceeds in portal env.




---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

-
To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org
For additional commands, e-mail: dev-h...@struts.apache.org

Build failed in Jenkins: Struts-JDK8-master #77

[Apache Jenkins Server]

See 

Changes:

[Lukasz Lenart] Adds required dependencies

[Lukasz Lenart] Re-implements tiles integration based on new API

[Lukasz Lenart] Drops unused classes

[Lukasz Lenart] Replaces call to deprecated api

[Lukasz Lenart] Updates Portal Tiles integration

[Lukasz Lenart] Adds missing header with license

[Lukasz Lenart] Registers Tiles model

[Lukasz Lenart] Fixes dependency clash

[Lukasz Lenart] Drops Tiles 3 plugin

[Lukasz Lenart] Removes module

[Lukasz Lenart] Ports solution from 2.3.x branch

[Lukasz Lenart] Upgrade Tiles dependencies

[Lukasz Lenart] Ports solution to resolve problem with EL functions

[Lukasz Lenart] Adds missing Tiles API dependency

[Lukasz Lenart] Adjusts code to Tiles 3

[Lukasz Lenart] Uses new way to access TileContainer

[Lukasz Lenart] Migrates tiles-portlet to the same version

[Lukasz Lenart] Renames class to match pattern used in Tiles

[Lukasz Lenart] Adds missing dependencies to tiles-request

[Lukasz Lenart] Defines helper method to fetch ActionContext from request

[Lukasz Lenart] Overrides method to use defined base instead of fetching it 
again

[Lukasz Lenart] Extends logging

[Lukasz Lenart] Simplifies logic to fetch HttpServletRequest

[Lukasz Lenart] Uses existing constants instead of literals

[Lukasz Lenart] Extracts constants representing expression languages

[Lukasz Lenart] Adds support to use Struts' Locale

[Lukasz Lenart] Adds support for I18N

[Lukasz Lenart] Simplifies logging

--
[...truncated 90685 lines...]
[INFO] >>> maven-source-plugin:2.3:jar (attach-source) @ struts2-dwr-plugin >>>
[WARNING] Failed to getClass for org.apache.maven.plugin.source.SourceJarMojo
[INFO] 
[INFO] <<< maven-source-plugin:2.3:jar (attach-source) @ struts2-dwr-plugin <<<
[INFO] 
[INFO] --- maven-source-plugin:2.3:jar (attach-source) @ struts2-dwr-plugin ---
[INFO] Building jar: 

[INFO] 
[INFO] --- maven-site-plugin:3.4:attach-descriptor (attach-descriptor) @ 
struts2-dwr-plugin ---
[INFO] 
[INFO] --- maven-install-plugin:2.5.2:install (default-install) @ 
struts2-dwr-plugin ---
[INFO] Installing 

 to 
/home/jenkins/jenkins-slave/maven-repositories/0/org/apache/struts/struts2-dwr-plugin/2.5-SNAPSHOT/struts2-dwr-plugin-2.5-SNAPSHOT.jar
[INFO] Installing 
 to 
/home/jenkins/jenkins-slave/maven-repositories/0/org/apache/struts/struts2-dwr-plugin/2.5-SNAPSHOT/struts2-dwr-plugin-2.5-SNAPSHOT.pom
[INFO] Installing 

 to 
/home/jenkins/jenkins-slave/maven-repositories/0/org/apache/struts/struts2-dwr-plugin/2.5-SNAPSHOT/struts2-dwr-plugin-2.5-SNAPSHOT-sources.jar
[INFO] Installing 

 to 
/home/jenkins/jenkins-slave/maven-repositories/0/org/apache/struts/struts2-dwr-plugin/2.5-SNAPSHOT/struts2-dwr-plugin-2.5-SNAPSHOT-javadoc.jar
[INFO] 
[INFO] --- maven-deploy-plugin:2.8.2:deploy (default-deploy) @ 
struts2-dwr-plugin ---
[INFO] Downloading: 
https://repository.apache.org/content/repositories/snapshots/org/apache/struts/struts2-dwr-plugin/2.5-SNAPSHOT/maven-metadata.xml
[INFO] Downloaded: 
https://repository.apache.org/content/repositories/snapshots/org/apache/struts/struts2-dwr-plugin/2.5-SNAPSHOT/maven-metadata.xml
 (2 KB at 9.8 KB/sec)
[INFO] Uploading: 
https://repository.apache.org/content/repositories/snapshots/org/apache/struts/struts2-dwr-plugin/2.5-SNAPSHOT/struts2-dwr-plugin-2.5-20160118.161037-129.jar
[INFO] Uploaded: 
https://repository.apache.org/content/repositories/snapshots/org/apache/struts/struts2-dwr-plugin/2.5-SNAPSHOT/struts2-dwr-plugin-2.5-20160118.161037-129.jar
 (11 KB at 72.3 KB/sec)
[INFO] Uploading: 
https://repository.apache.org/content/repositories/snapshots/org/apache/struts/struts2-dwr-plugin/2.5-SNAPSHOT/struts2-dwr-plugin-2.5-20160118.161037-129.pom
[INFO] Uploaded: 
https://repository.apache.org/content/repositories/snapshots/org/apache/struts/struts2-dwr-plugin/2.5-SNAPSHOT/struts2-dwr-plugin-2.5-20160118.161037-129.pom
 (2 KB at 11.3 KB/sec)
[INFO] Downloading: 
https://repository.apache.org/content/repositories/snapshots/org/apache/struts/struts2-dwr-plugin/maven-metadata.xml
[INFO] Downloaded: 
https://repository.apache.org/content/repositories/snapshots/org/apache/struts/struts2-dwr-plugin/maven-metadata.xml
 (2 KB at 8.4 KB/sec)
[INFO] Uploading: 
https://repository.apache.org/content/repositories/snapshots/org/apache/struts/struts2-dwr-plugin/2.5-SNAPSHOT/maven-metadata.xml
[INFO] Uploaded: 
https://repository.ap

Re: From Confluence to Markdown

[Lukasz Lenart]

2016-01-14 16:31 GMT+01:00 Rene Gielen :
> I've made some progress on this as time permits, but still a lot to be
> done. I'm convinced that moving to MarkDown / AsciiDoctor would be a
> HUGE improvement both for our docs in general as well as our publishing
> workflows. Nevertheless, exporting the existing docs is still cumbersome
> so far ...

I thought about forking SiteExporter and use it to migrate out
Confluence pages to Markdown/AsciiDoc - I think it will be the
simplest solution.


Regards
-- 
Łukasz
+ 48 606 323 122 http://www.lenart.org.pl/

-
To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org
For additional commands, e-mail: dev-h...@struts.apache.org

Re: Struts 2.5 BETA3

[Lukasz Lenart]

If no objections I am going prepare BETA3 release

2016-01-11 14:53 GMT+01:00 Christoph Nenning :
>> @Christoph I was able to resolve the issue with that warning about
>> Custom EL ... also fixed the problem with loading ftl layouts - you
>> must define a proper templateType ->
>> https://github.com/lukaszlenart/struts2-tiles-demo/commit/
>> dc52bc82895dc664ff0db0bb8ca330a13e48c169
>> - I will add this to docs and I can port this example to be part of
>> the struts-examples
>>
>
>
> Ahh, now I see it ;)
>
>
>
> This Email was scanned by Sophos Anti

-
To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org
For additional commands, e-mail: dev-h...@struts.apache.org

[GitHub] struts pull request: WW-4584: Upgrade tiles plugin

[asfgit]

Github user asfgit closed the pull request at:

https://github.com/apache/struts/pull/73


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

-
To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org
For additional commands, e-mail: dev-h...@struts.apache.org

[GitHub] struts-site pull request: Fixing broken link to Java EE tutorial.

[asfgit]

Github user asfgit closed the pull request at:

https://github.com/apache/struts-site/pull/3


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

-
To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org
For additional commands, e-mail: dev-h...@struts.apache.org

[GitHub] struts pull request: WW-4584: Upgrade tiles plugin

[lukaszlenart]

Github user lukaszlenart commented on the pull request:

https://github.com/apache/struts/pull/73#issuecomment-172462730
  
I have got some comments on my questions sent to Tiles Users mailing list 
and the current implementation isn't optimal ;-) But I have no better idea so 
let's merge it :D


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

-
To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org
For additional commands, e-mail: dev-h...@struts.apache.org

[GitHub] struts pull request: WW-4584: Upgrade tiles plugin

[cnenning]

Github user cnenning commented on the pull request:

https://github.com/apache/struts/pull/73#issuecomment-172460318
  
> Simplifies logging

Still not final :wink: ?

Let's merge it!



---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

-
To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org
For additional commands, e-mail: dev-h...@struts.apache.org