Merge ../activemq into remove-sitemesh
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/f74a65f4 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/f74a65f4 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/f74a65f4 Branch: refs/heads/trunk Commit: f74a65f4f5e712051c33ed7b44605dc3cbb93f7f Parents: f222741 127f82a Author: Daniel Kulp <[email protected]> Authored: Mon Feb 3 15:23:54 2014 -0500 Committer: Daniel Kulp <[email protected]> Committed: Mon Feb 3 15:23:54 2014 -0500 ---------------------------------------------------------------------- .../src/main/webapp/WEB-INF/decorators.xml | 31 ---- .../src/main/webapp/WEB-INF/web.xml | 1 - .../src/main/webapp/decorators/main.jsp | 173 ------------------- .../src/main/webapp/decorators/panel.jsp | 32 ---- .../src/main/webapp/decorators/printable.jsp | 32 ---- assembly/pom.xml | 4 - assembly/src/main/descriptors/common-bin.xml | 3 - pom.xml | 6 - 8 files changed, 282 deletions(-) ----------------------------------------------------------------------
