You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2018/11/03 09:47:14 UTC

[struts] branch struts-2-5-x updated (8293add -> 12c3d23)

This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a change to branch struts-2-5-x
in repository https://gitbox.apache.org/repos/asf/struts.git.


    from 8293add  Merge pull request #257 from JCgH4164838Gh792C124B5/localS2_2_5_x_Branch
     add bac0f29  monitor not-monitored loaded files on demand
     add ecb7bee  not miss container provided fileUrl and ...
     new 12c3d23  Merge pull request #260 from yasserzamani/WW-4974

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../xwork2/util/fs/DefaultFileManager.java         | 23 +++++++++--
 .../apache/struts2/util/fs/JBossFileManager.java   |  2 +-
 .../providers/XmlConfigurationProviderTest.java    | 45 +++++++++++++++++++---
 ...k-test-wildcard-1.xml => xwork-test-reload.xml} |  8 ++--
 4 files changed, 64 insertions(+), 14 deletions(-)
 copy core/src/test/resources/com/opensymphony/xwork2/config/providers/{xwork-test-wildcard-1.xml => xwork-test-reload.xml} (84%)


[struts] 01/01: Merge pull request #260 from yasserzamani/WW-4974

Posted by lu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a commit to branch struts-2-5-x
in repository https://gitbox.apache.org/repos/asf/struts.git

commit 12c3d23bdf036b2413fe1d5533af66e3bebb9ce6
Merge: 8293add ecb7bee
Author: Lukasz Lenart <lu...@gmail.com>
AuthorDate: Sat Nov 3 10:47:09 2018 +0100

    Merge pull request #260 from yasserzamani/WW-4974
    
    WW-4974 monitor not-monitored loaded files on demand

 .../xwork2/util/fs/DefaultFileManager.java         | 23 +++++++++--
 .../apache/struts2/util/fs/JBossFileManager.java   |  2 +-
 .../providers/XmlConfigurationProviderTest.java    | 45 +++++++++++++++++++---
 .../xwork2/config/providers/xwork-test-reload.xml  | 31 +++++++++++++++
 4 files changed, 90 insertions(+), 11 deletions(-)