Commit Graph

2403 Commits

Author SHA1 Message Date
Musachy Barroso 60fdb065c5 WW-3217 Bring JSON plugin into trunk
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@802878 13f79535-47bb-0310-9956-ffa450edef68
2009-08-10 18:19:48 +00:00
Musachy Barroso 2f7177ce8f Add a class loader interface (bundle based) to the ServletContext so it cann be used by other plugins to lookup resources
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@802870 13f79535-47bb-0310-9956-ffa450edef68
2009-08-10 17:40:46 +00:00
Musachy Barroso 7e0ad932de fix log message
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@802862 13f79535-47bb-0310-9956-ffa450edef68
2009-08-10 17:00:49 +00:00
Musachy Barroso d89c7186a1 minor formatting thingy
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@802133 13f79535-47bb-0310-9956-ffa450edef68
2009-08-07 18:24:45 +00:00
Musachy Barroso a5d0e408c6 organize imports
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@802129 13f79535-47bb-0310-9956-ffa450edef68
2009-08-07 18:14:48 +00:00
Musachy Barroso 81fee36664 remove commented code
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@802126 13f79535-47bb-0310-9956-ffa450edef68
2009-08-07 18:11:39 +00:00
Musachy Barroso 976863cfb7 git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@802124 13f79535-47bb-0310-9956-ffa450edef68 2009-08-07 18:11:11 +00:00
Musachy Barroso 51a68818dc WW-3208 Spring Plugin using commons.lang.StringUtils instead of shaded class in xwork library
thanks to  Tom Terrace for the patch

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@799123 13f79535-47bb-0310-9956-ffa450edef68
2009-07-29 23:27:25 +00:00
Lukasz Lenart c1c5c44897 Keep in sync source and dependency for Xwork - upgraded to version 2.1.5-SNAPSHOT
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@798999 13f79535-47bb-0310-9956-ffa450edef68
2009-07-29 18:17:14 +00:00
Wesley Wannemacher 9159be55cd adding ignores for target dir and IDE artifacts
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@798892 13f79535-47bb-0310-9956-ffa450edef68
2009-07-29 13:24:43 +00:00
Musachy Barroso 4593090a00 WW-3196 Add post init hook, and change fields visibility to protected
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@798341 13f79535-47bb-0310-9956-ffa450edef68
2009-07-28 00:12:12 +00:00
Musachy Barroso a6f1e0d755 fix build
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@796774 13f79535-47bb-0310-9956-ffa450edef68
2009-07-22 15:48:06 +00:00
Musachy Barroso 17ea15b208 XW-710 update to OGNL 2.7.3
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@796082 13f79535-47bb-0310-9956-ffa450edef68
2009-07-21 00:05:16 +00:00
Musachy Barroso b92fae8200 WW-3198 Upgrade to FreeMarker 2.3.15
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@795455 13f79535-47bb-0310-9956-ffa450edef68
2009-07-19 00:42:10 +00:00
Musachy Barroso fe7a12574b fix bug that added all the watched dirs as stores to the reloading classloader
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@794418 13f79535-47bb-0310-9956-ffa450edef68
2009-07-15 21:07:45 +00:00
Musachy Barroso 0fd40525cd Make the class reloading implementation work with convention. (use the reloading class loader when an instance is requested using the class name)
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@794116 13f79535-47bb-0310-9956-ffa450edef68
2009-07-14 23:44:43 +00:00
Musachy Barroso 4eb9f31c67 init reloading class loader before calling setApplication
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@794105 13f79535-47bb-0310-9956-ffa450edef68
2009-07-14 22:45:13 +00:00
Musachy Barroso 125522566e add some logging to class reloading
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@794094 13f79535-47bb-0310-9956-ffa450edef68
2009-07-14 22:24:56 +00:00
Musachy Barroso 49e5110dd4 define constants as empty as a workaround to the IoC container limitation ("required" is ignored in @Inject in constructor params)
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@793692 13f79535-47bb-0310-9956-ffa450edef68
2009-07-13 20:08:21 +00:00
Musachy Barroso 577840562a fix broken build
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@793636 13f79535-47bb-0310-9956-ffa450edef68
2009-07-13 17:35:54 +00:00
Musachy Barroso 6539d0dd80 add a constant to limit the classes that can be loaded by the reloading class loader, support relative paths
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@793626 13f79535-47bb-0310-9956-ffa450edef68
2009-07-13 16:58:08 +00:00
Musachy Barroso b2cf05e87a WW-3183 Add class reloading to the Spring plugin
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@793388 13f79535-47bb-0310-9956-ffa450edef68
2009-07-12 18:17:55 +00:00
Musachy Barroso 3959fe30f4 move ReloadingClassLoader impl to XWork
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@793257 13f79535-47bb-0310-9956-ffa450edef68
2009-07-12 01:47:44 +00:00
Musachy Barroso 22949c709d Fix NPE from class loader and add a JarResourceStore
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@793255 13f79535-47bb-0310-9956-ffa450edef68
2009-07-12 01:36:27 +00:00
Musachy Barroso 5448b55542 fix typo
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@791919 13f79535-47bb-0310-9956-ffa450edef68
2009-07-07 17:47:34 +00:00
Wesley Wannemacher 350acd8bc9 WW-3128, screwed up originally, forgot to svn add this file after applying the patch
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@791565 13f79535-47bb-0310-9956-ffa450edef68
2009-07-06 19:01:15 +00:00
Musachy Barroso 813ea065ad fix typo
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@789467 13f79535-47bb-0310-9956-ffa450edef68
2009-06-29 22:11:12 +00:00
Musachy Barroso ccbc28feee bump xwork version
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@789434 13f79535-47bb-0310-9956-ffa450edef68
2009-06-29 20:17:20 +00:00
Musachy Barroso a94d6c0dca WW-3172 Add a flag to disable OGNL cache, which can cause memory leaks
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@789432 13f79535-47bb-0310-9956-ffa450edef68
2009-06-29 20:15:24 +00:00
Nils-Helge Garli eca561c674 WW-3164
Need to inject ActionMapper in PortletUrlRenderer to avoid NPE when passing through to ServletUrlRenderer.

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@788633 13f79535-47bb-0310-9956-ffa450edef68
2009-06-26 08:43:42 +00:00
Wesley Wannemacher eae2fc668a putting wget mirror back in place now that release has been tagged, this way we can still generate nightlies through CI
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@786912 13f79535-47bb-0310-9956-ffa450edef68
2009-06-20 22:00:23 +00:00
Wesley Wannemacher 3e33a7b70c [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@786191 13f79535-47bb-0310-9956-ffa450edef68
2009-06-18 18:09:00 +00:00
Wesley Wannemacher 87321e8d2b [maven-release-plugin] prepare release STRUTS_2_1_7
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@786189 13f79535-47bb-0310-9956-ffa450edef68
2009-06-18 18:07:01 +00:00
Wesley Wannemacher 08d9774e7b WW-3100, still trying to get manual build process working for release
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@786184 13f79535-47bb-0310-9956-ffa450edef68
2009-06-18 17:53:41 +00:00
Wesley Wannemacher 66b2b0f145 WW-3100, still trying to get manual build process working for release
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@786182 13f79535-47bb-0310-9956-ffa450edef68
2009-06-18 17:51:24 +00:00
Wesley Wannemacher 5d3bbc29c1 WW-3100, pointing docs to local directory so that I can use a cwiki export
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@786088 13f79535-47bb-0310-9956-ffa450edef68
2009-06-18 14:39:12 +00:00
Wesley Wannemacher 3dbd0294e8 WW-3163, fixing NPE, but throwing StrutsException instead, not a great fix, but when I get a chance to work closer with JBoss, I will come back to this
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@786061 13f79535-47bb-0310-9956-ffa450edef68
2009-06-18 13:35:03 +00:00
Wesley Wannemacher d8e5ea68d9 WW-3162, properly supporting inheritance for ParentPackage annotation
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@786050 13f79535-47bb-0310-9956-ffa450edef68
2009-06-18 13:21:57 +00:00
Wesley Wannemacher 4e8bd6f09b Fixed comment, removed unused import WW-3100
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@783012 13f79535-47bb-0310-9956-ffa450edef68
2009-06-09 14:15:54 +00:00
Wesley Wannemacher a319344a9a Updating core to support pluggable upload capabilities WW-3100
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@783008 13f79535-47bb-0310-9956-ffa450edef68
2009-06-09 14:12:23 +00:00
Musachy Barroso 55fdb0e0f3 rname file(agrrr)
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@781887 13f79535-47bb-0310-9956-ffa450edef68
2009-06-05 02:06:13 +00:00
Musachy Barroso 7953458fc0 rname file(did my cat walk on the keyboard?)
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@781886 13f79535-47bb-0310-9956-ffa450edef68
2009-06-05 02:05:35 +00:00
Wesley Wannemacher 1b19830293 More NPE possible in TokenSessionStoreInterceptor, updated unit tests again WW-3150
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@781838 13f79535-47bb-0310-9956-ffa450edef68
2009-06-04 19:38:07 +00:00
Wesley Wannemacher ee1b9aac9b making unit test match environment that caused NPE in WW-3150
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@781805 13f79535-47bb-0310-9956-ffa450edef68
2009-06-04 17:33:00 +00:00
Wesley Wannemacher bc6d4bb804 Fixing NPE in token processing WW-3150, thanks James Peltzer
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@781798 13f79535-47bb-0310-9956-ffa450edef68
2009-06-04 17:08:35 +00:00
Wesley Wannemacher 6deb1d5ea8 Giving myself some room to inherit, enhance and conquer WW-3100
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@781501 13f79535-47bb-0310-9956-ffa450edef68
2009-06-03 18:34:05 +00:00
Musachy Barroso db349486d7 change some javadocs and method visibility
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@781447 13f79535-47bb-0310-9956-ffa450edef68
2009-06-03 15:59:27 +00:00
Wesley Wannemacher 47fa0c6635 trying to make bamboo happy
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@781096 13f79535-47bb-0310-9956-ffa450edef68
2009-06-02 17:47:00 +00:00
Wesley Wannemacher 6862e2a5c5 WW-3107, fixing NPE, good catch Andrey Vasenin
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@781086 13f79535-47bb-0310-9956-ffa450edef68
2009-06-02 17:26:17 +00:00
Wesley Wannemacher 4f91ad5ecb WW-3143 lowering log level for file upload messages
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@781032 13f79535-47bb-0310-9956-ffa450edef68
2009-06-02 13:50:54 +00:00