This is an automated email from the ASF dual-hosted git repository.
yasserzamani pushed a change to branch struts-2-5-x
in repository https://gitbox.apache.org/repos/asf/struts.git.
from 4504e61 Merge pull request #425 from apache/WW-5077-dmi-aware
new c7149ab Initial attempt to fix OSGi Plugin issues discovered during
examination of WW-5075. - Indication is that the OSGi Plugin has been failing
since Struts 2.3.4. - Applied fix to ResourceFinder to restore 2.3.x logic that
was broken in 2.5.x. - Implemented changes to restore OSGi Plugin
functionality for 2.5.x. - Applied changes to the OSGi Admin Bundle to function
under 2.5.x. - Updated the OSGi Admin Bundle JS libraries and related CSS to
newer versions. - Added new un [...]
new d61be3e Updated with suggested changes from review. -
BundlePackageLoader changes suggested by L. Lenart. - FelixOsgiHost changes to
better handle Felix bundle cache location processing (Windows and Linux). -
FelixOsgIHost test modified to not fail if felix-cache directory cannot be
created (warn only) to avoid failing the whole build.
new bcfb769 Merge pull request #427 from
JCgH4164838Gh792C124B5/WW-5075_S2_5_OSGiPluginUpdate
The 5472 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:
.../struts2/osgi/admin/actions/BundlesAction.java | 31 +-
.../struts2/osgi/admin/actions/ShellAction.java | 72 +-
.../admin/src/main/resources/JQUERY-LICENSE.txt | 26 +-
bundles/admin/src/main/resources/NOTICE.txt | 5 +-
.../admin/src/main/resources/osgi/admin/shell.ftl | 6 +-
.../src/main/resources/osgi/admin/viewBundle.ftl | 9 +-
.../src/main/resources/osgi/admin/viewBundles.ftl | 12 +-
.../css/redmond/jquery-ui-1.12.1.redmond.css | 1311 ++++++++++++++++++++
.../static/css/redmond/jquery-ui-1.7.1.custom.css | 404 ------
.../main/resources/static/js/jquery-1.12.4.min.js | 5 +
.../main/resources/static/js/jquery-1.3.2.min.js | 19 -
.../resources/static/js/jquery-ui-1.12.1.min.js | 13 +
.../static/js/jquery-ui-1.7.1.custom.min.js | 20 -
bundles/admin/src/main/resources/struts.xml | 11 +-
.../xwork2/util/finder/ResourceFinder.java | 49 +-
plugins/osgi/pom.xml | 23 +
.../struts2/osgi/BundleClassLoaderInterface.java | 9 +-
.../struts2/osgi/BundleFreemarkerManager.java | 14 +-
.../apache/struts2/osgi/BundlePackageLoader.java | 90 +-
.../apache/struts2/osgi/DefaultBundleAccessor.java | 50 +-
.../struts2/osgi/DelegatingObjectFactory.java | 60 +-
.../struts2/osgi/OsgiConfigurationProvider.java | 90 +-
.../java/org/apache/struts2/osgi/OsgiUtil.java | 89 +-
.../org/apache/struts2/osgi/PackageLoader.java | 34 +
.../struts2/osgi/SpringOsgiObjectFactory.java | 28 +-
.../apache/struts2/osgi/StrutsOsgiListener.java | 28 +-
.../org/apache/struts2/osgi/host/BaseOsgiHost.java | 259 +++-
.../apache/struts2/osgi/host/FelixOsgiHost.java | 475 ++++++-
.../struts2/osgi/host/GlassfishOSGiHost.java | 26 +-
.../struts2/osgi/interceptor/OsgiInterceptor.java | 20 +-
.../loaders/StaticContentBundleResourceLoader.java | 1 +
.../osgi/loaders/VelocityBundleResourceLoader.java | 1 +
.../osgi/src/main/resources/struts-osgi.properties | 2 +-
plugins/osgi/src/main/resources/struts-plugin.xml | 4 +-
.../java/org/apache/struts2/osgi/OsgiUtilTest.java | 158 +++
.../struts2/osgi/host/FelixOsgiHostTest.java | 168 ++-
.../struts2/osgi/interceptor/SomeAction.java | 1 +
plugins/osgi/src/test/resources/default.properties | 787 ++++++++++++
.../resources/struts-osgi.properties | 52 +-
pom.xml | 7 +
40 files changed, 3852 insertions(+), 617 deletions(-)
create mode 100644
bundles/admin/src/main/resources/static/css/redmond/jquery-ui-1.12.1.redmond.css
delete mode 100644
bundles/admin/src/main/resources/static/css/redmond/jquery-ui-1.7.1.custom.css
create mode 100644
bundles/admin/src/main/resources/static/js/jquery-1.12.4.min.js
delete mode 100644
bundles/admin/src/main/resources/static/js/jquery-1.3.2.min.js
create mode 100644
bundles/admin/src/main/resources/static/js/jquery-ui-1.12.1.min.js
delete mode 100644
bundles/admin/src/main/resources/static/js/jquery-ui-1.7.1.custom.min.js
create mode 100644
plugins/osgi/src/test/java/org/apache/struts2/osgi/OsgiUtilTest.java
create mode 100644 plugins/osgi/src/test/resources/default.properties
copy plugins/osgi/src/{main => test}/resources/struts-osgi.properties (88%)
