- update to 4.7.0

- allow building on pointyhat, per discussion with portmgr
 - may disable if becomes issue
- install DOCS (optional)
- update LICENSE per vendor to GPLv3
- add MASTER_SITE for specific FreeBSD Maven Repository for offline build mode
 - NOTE: buildlog will note "Downloading" but will fail due to maven building in offline mode

Sponsored by: Experts-Exchange, LLC.
Changes: http://www.jaspersoft.com/whats-new-in-jaspersoft-47

4 files changed, 234 insertions, 160 deletions

diff --git a/databases/jasperserver/Makefile b/databases/jasperserver/Makefile
index c2270dd872d9..2a504e553b1e 100644
--- a/databases/jasperserver/Makefile
+++ b/databases/jasperserver/Makefile
@@ -6,23 +6,22 @@
 #
 
 PORTNAME=	jasperserver
-PORTVERSION=	4.5.0
+PORTVERSION=	4.7.0
 CATEGORIES=	databases print java
-MASTER_SITES=	SF/${PORTNAME}/JasperServer/JasperServer%20${PORTVERSION}/:source1
+MASTER_SITES=	SF/${PORTNAME}/JasperServer/JasperReports%20Server%20${PORTVERSION}/:source1 \
+		SF/bsdsrc/:source2
 DISTFILES=	jasperreports-server-${PORTVERSION}-src.zip:source1 \
-		jasperreports-server-cp-${PORTVERSION}-maven-repository.zip:source1
+		FreeBSD-jasperreports-server-cp-${PORTVERSION}-maven-repository.zip:source2
 EXTRACT_ONLY=	jasperreports-server-${PORTVERSION}-src.zip
 
 MAINTAINER=	jgh@FreeBSD.org
 COMMENT=	Open Source Java Reporting Library
 
-LICENSE=	GPLv2 MIT AL2
+LICENSE=	GPLv3 MIT AL2
 LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	mvn:${PORTSDIR}/devel/maven2
 
-MANUAL_PACKAGE_BUILD=	distfile exceeds pointyhat filesize limit
-
 SRCDIR=		${WRKDIR}/jasperreports-server-${PORTVERSION}-src
 PATCH_WRKSRC=	${SRCDIR}
 WRKSRC=		${SRCDIR}/${PORTNAME}/buildomatic
@@ -30,8 +29,8 @@ WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
 SQLSRC=		${WRKSRC}/install_resources/sql
 JS=		${SRCDIR}/${PORTNAME}
 JSREPO=		${JS}-repo
-JSMAVENARCH=	jasperreports-server-cp-${PORTVERSION}-maven-repository.zip
-JSUPDATE=	4.2.1-4.5.0
+JSMAVENARCH=	FreeBSD-jasperreports-server-cp-${PORTVERSION}-maven-repository.zip
+JSUPDATE=	4.5.0-${PORTVERSION}
 
 NO_WRKSUBDIR=	yes
 USE_JAVA=	yes
@@ -69,6 +68,8 @@ PLIST_SUB=	DATABASE=${DATABASE} \
 		JSUPDATE=${JSUPDATE} \
 		PORTNAME=${PORTNAME}
 
+PORTDOCS=	*
+
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMYSQL}
@@ -161,6 +162,8 @@ post-patch:
 	@${SED} ${REPLACE_LIST_TEMP} ${file} > ${WRKDIR}/`basename ${file}`
 	@${ECHO_MSG} " [ DONE ]"
 .endfor
+	@${REINPLACE_CMD} -e 's|--DROP|-- DROP|' ${SQLSRC}/mysql/quartz.ddl
+
 .if ${PORT_OPTIONS:MXLS}
 	@${ECHO} "Applying alternative patches for Xls."
 	@cd ${PATCH_WRKSRC} && ${PATCH} --quiet < ${FILESDIR}/alt-patch-jasperserver__common__shared-config__applicationContext.xml
@@ -202,9 +205,9 @@ pre-build:
 .endif
 
 do-build:
+# although log will show Downloading, maven is in offline mode and can't download
 	@( cd ${WRKSRC} && ./js-ant clean-config )
 	@( cd ${WRKSRC} && ./js-ant gen-config )
-	@( cd ${WRKSRC} && ./js-ant add-jdbc-driver )
 	@( ${CP} ${WRKDIR}/web.xml ${JS}/jasperserver-war/src/main/webappAdditions/WEB-INF/web.xml )
 	@( cd ${WRKSRC} && ./js-ant build-ce )
 
@@ -238,12 +241,16 @@ do-install:
 #removed shipped driver from vendor
 .if empty(PORT_OPTIONS:MMYSQL)
 	${INSTALL_DATA} ${DISTDIR}/${JDBC} ${APPHOME}/${JDBCLOC}
-	@${RM} ${APPHOME}/${JDBCLOC}/postgresql-9.0-801.jdbc3.jar
+	@${RM} ${APPHOME}/${JDBCLOC}/postgresql-9.0-801.jdbc4.jar
 .else
 	${LN} -s ${JAVAJARDIR}/mysql-connector-java.jar ${APPHOME}/${JDBCLOC}
 .endif
 
-post-install:
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${DOCSDIR}
+	( cd ${SRCDIR}/${PORTNAME}/docs && ${COPYTREE_SHARE} \* ${DOCSDIR} )
+.endif	
+
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/databases/jasperserver/distinfo b/databases/jasperserver/distinfo
index 3148665aea43..f0cebe21a06c 100644
--- a/databases/jasperserver/distinfo
+++ b/databases/jasperserver/distinfo
@@ -1,6 +1,6 @@
-SHA256 (jasperreports-server-4.5.0-src.zip) = f78bc0aa1fde774e45e84db5741b6c97a238aa3196a45f69a50baff4fbf98cdc
-SIZE (jasperreports-server-4.5.0-src.zip) = 441823862
-SHA256 (jasperreports-server-cp-4.5.0-maven-repository.zip) = 436bed1eb040375237342d7e0a5a6f9b8a1d6504f1cacde44ec23d1346de1cda
-SIZE (jasperreports-server-cp-4.5.0-maven-repository.zip) = 274803612
+SHA256 (jasperreports-server-4.7.0-src.zip) = 1aeadd60749fb3d2983366d99907b1fb0154c9c332639985369e224c96301234
+SIZE (jasperreports-server-4.7.0-src.zip) = 307483221
+SHA256 (FreeBSD-jasperreports-server-cp-4.7.0-maven-repository.zip) = c29a3b66b60407330144e8bb14301c3e81c1f82415a46335a49f8ac16207563a
+SIZE (FreeBSD-jasperreports-server-cp-4.7.0-maven-repository.zip) = 206922723
 SHA256 (postgresql-9.0-802.jdbc4.jar) = 3e800c3bd081ed0bbc9dfdd0e862b9f98fe159b3276881d2da3f2c9767f30829
 SIZE (postgresql-9.0-802.jdbc4.jar) = 543423
diff --git a/databases/jasperserver/files/patch-jasperserver__buildomatic__bin__dev.xml b/databases/jasperserver/files/patch-jasperserver__buildomatic__bin__dev.xml
index bffbea822349..099475156805 100644
--- a/databases/jasperserver/files/patch-jasperserver__buildomatic__bin__dev.xml
+++ b/databases/jasperserver/files/patch-jasperserver__buildomatic__bin__dev.xml
@@ -1,14 +1,15 @@
---- jasperserver/buildomatic/bin/dev.xml.orig	2011-03-14 02:07:47.000000000 -0700
-+++ jasperserver/buildomatic/bin/dev.xml	2011-03-14 02:15:47.000000000 -0700
-@@ -44,6 +44,7 @@
-             <exec executable="${maven}" dir="@{dir}" failonerror="true">
-                 <env key="MAVEN_OPTS" value="-Xms128m -Xmx512m -XX:PermSize=32m -XX:MaxPermSize=128m"/>
-                 <arg value="-s"/>
-+                <arg value="-o"/>
+--- ./jasperserver/buildomatic/bin/dev.xml.orig	2012-08-21 17:14:07.000000000 -0700
++++ ./jasperserver/buildomatic/bin/dev.xml	2012-08-21 17:14:14.000000000 -0700
+@@ -47,7 +47,7 @@
                  <arg value="${currentConf}/maven_settings.xml"/>
                  <!-- <arg value="-e"/> --> <!-- ERROR INFO MODE -->
                  <!-- <arg value="-X"/> --> <!-- DETAILED DEBUG MODE -->
-@@ -111,16 +112,6 @@
+-                <!-- <arg value="-o"/> --> <!-- OFFLINE MODE -->
++                <arg value="-o"/>
+                 <args/>
+             </exec>
+         </sequential>
+@@ -111,15 +111,6 @@
          </sequential>
      </macrodef>
    
@@ -21,19 +22,19 @@
 -            </exec>
 -        </sequential>
 -    </macrodef>
--
-     <macrodef name="run-export-test">
-       <attribute name="edition" />
-       <sequential>
-@@ -161,6 +152,7 @@
+ 
+ 
+     <!-- ======================================================================= -->
+@@ -138,7 +129,7 @@
              <arg value="-Dversion=${maven.jdbc.version}"/>
              <arg value="-Dpackaging=jar"/>
              <arg value="-Dfile=${currentDbDir}/jdbc/${jdbcJar}"/>
-+	    <arg value="-o"/>
-             <!-- <arg value="-o"/> --> <!-- OFFLINE MODE -->
+-            <!-- <arg value="-o"/> --> <!-- OFFLINE MODE -->
++            <arg value="-o"/>
          </runmaven>
      </target>
-@@ -242,102 +234,6 @@
+ 
+@@ -222,101 +213,6 @@
        <echo> </echo>
      </target>
  
@@ -132,25 +133,28 @@
 -        </else>
 -        </if>
 -    </target>
--
+ 
      <target name="build-src-all"
              depends="build-ce, build-pro"
-             description="Builds JasperServer CE/Pro and copies WAR files to install resources">
-@@ -549,7 +445,7 @@
+@@ -324,7 +220,7 @@
      </target>
  
-     <target name="build-all"
--            depends="update-all,build-all-no-svn"
-+            depends="build-all-no-svn"
-             description="update all src, clean build all src, drop-recreate db, build ddl pro, init db pro, run unit test pro">
-     </target>
+     <target name="build-ce"
+-            depends="init-source-paths, set-ce-webapp-name, install-jdbc-dep"
++            depends="init-source-paths, set-ce-webapp-name"
+             description="Builds JasperServer CE and copies WAR to install resources">
  
-@@ -569,7 +465,7 @@
+         <!-- set these values to package avoid runtime error on windows. these two     -->
+@@ -598,12 +494,6 @@
+                          build ddl pro, init js db pro, run integration tests pro, run production data pro">
      </target>
  
-     <target name="update-build-all"
--            depends="update-repo, update-ce, update-pro, build-ce, build-pro"
-+            depends="build-ce, build-pro"
-             description="update and build os and pro"/>
- 
-     <target name="clean-pro-unit-test"
+-    <target name="build-all-svn-update"
+-            depends="update-all,build-src-all,build-init-js-db-pro,run-integration-tests-pro,run-production-data-pro"
+-            description="(do not do svn update), clean build all src, drop-recreate db, 
+-                         build ddl pro, init js db pro, run integration tests pro, run production data pro">
+-    </target>
+-
+     <target name="build-all-deploy"
+             depends="build-all,deploy-webapp-pro"
+             description="call build-all target, deploy webapp pro">
diff --git a/databases/jasperserver/pkg-plist b/databases/jasperserver/pkg-plist
index 609949b64bfb..0383034997a3 100644
--- a/databases/jasperserver/pkg-plist
+++ b/databases/jasperserver/pkg-plist
@@ -2,6 +2,7 @@
 %%APP_VERSION%%/webapps/jasperserver/META-INF/context.xml
 %%APP_VERSION%%/webapps/jasperserver/META-INF/foodmartDS-jdbc.xml
 %%APP_VERSION%%/webapps/jasperserver/META-INF/jasperserverDS-jdbc.xml
+%%APP_VERSION%%/webapps/jasperserver/META-INF/jboss-deployment-structure.xml
 %%APP_VERSION%%/webapps/jasperserver/META-INF/sugarcrmDS-jdbc.xml
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/actionModel-adhocChart.xml
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/actionModel-adhocCrosstab.xml
@@ -9,11 +10,15 @@
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/actionModel-dashboard.xml
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/actionModel-navigation.xml
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/actionModel-search.xml
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/actionModel-viewReport.xml
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/applicationContext-cascade.xml
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/applicationContext-data-snapshots.xml
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/applicationContext-events-logging.xml
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/applicationContext-hive-datasource.xml
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/applicationContext-logging.xml
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/applicationContext-mongodb-datasource.xml
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/applicationContext-olap-connection.xml
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/applicationContext-remote-services.xml
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/applicationContext-report-scheduling.xml
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/applicationContext-rest-services.xml
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/applicationContext-search.xml
@@ -24,10 +29,12 @@
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/applicationContext-webHelp.xml
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/applicationContext-webapp.xml
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/applicationContext.xml
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/attachments/readme.txt
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/bundles/calendar.properties
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/bundles/calendar_de.properties
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/bundles/calendar_es.properties
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/bundles/calendar_fr.properties
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/bundles/calendar_it.properties
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/bundles/calendar_ja.properties
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/bundles/calendar_zh_CN.properties
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/bundles/ja-pro_messages.properties
@@ -44,34 +51,41 @@
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/bundles/ja_mondrian_messages_it.properties
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/bundles/ja_mondrian_messages_ja.properties
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/bundles/ja_mondrian_messages_zh_CN.properties
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/bundles/jasperreports_messages.properties
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/bundles/jasperreports_messages_ro.properties
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/bundles/jasperserver_config.properties
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/bundles/jasperserver_config_de.properties
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/bundles/jasperserver_config_es.properties
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/bundles/jasperserver_config_fr.properties
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/bundles/jasperserver_config_it.properties
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/bundles/jasperserver_config_ja.properties
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/bundles/jasperserver_config_zh_CN.properties
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/bundles/jasperserver_messages.properties
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/bundles/jasperserver_messages_de.properties
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/bundles/jasperserver_messages_es.properties
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/bundles/jasperserver_messages_fr.properties
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/bundles/jasperserver_messages_it.properties
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/bundles/jasperserver_messages_ja.properties
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/bundles/jasperserver_messages_zh_CN.properties
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/bundles/jpivot_messages.properties
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/bundles/jpivot_messages_de.properties
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/bundles/jpivot_messages_es.properties
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/bundles/jpivot_messages_fr.properties
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/bundles/jpivot_messages_it.properties
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/bundles/jpivot_messages_ja.properties
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/bundles/jpivot_messages_zh_CN.properties
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/bundles/jsexceptions_messages.properties
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/bundles/jsexceptions_messages_de.properties
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/bundles/jsexceptions_messages_es.properties
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/bundles/jsexceptions_messages_fr.properties
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/bundles/jsexceptions_messages_it.properties
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/bundles/jsexceptions_messages_ja.properties
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/bundles/jsexceptions_messages_zh_CN.properties
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/bundles/logger_descriptions.properties
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/bundles/logger_descriptions_de.properties
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/bundles/logger_descriptions_es.properties
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/bundles/logger_descriptions_fr.properties
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/bundles/logger_descriptions_it.properties
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/bundles/logger_descriptions_ja.properties
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/bundles/logger_descriptions_zh_CN.properties
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/bundles/mondrian_exception_messages.properties
@@ -85,18 +99,24 @@
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/bundles/scheduling_ws_de.properties
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/bundles/scheduling_ws_es.properties
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/bundles/scheduling_ws_fr.properties
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/bundles/scheduling_ws_it.properties
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/bundles/scheduling_ws_ja.properties
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/bundles/scheduling_ws_zh_CN.properties
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/bundles/security.properties
-%%APP_VERSION%%/webapps/jasperserver/WEB-INF/classes/ehcache-hibernate.xml
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/bundles/security_de.properties
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/bundles/security_es.properties
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/bundles/security_fr.properties
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/bundles/security_it.properties
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/bundles/security_ja.properties
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/bundles/security_zh.properties
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/classes/ehcache_hibernate.xml
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/classes/esapi/ESAPI.properties
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/classes/esapi/Owasp.CsrfGuard.RequestFilterConfig.properties
-%%APP_VERSION%%/webapps/jasperserver/WEB-INF/classes/esapi/Owasp.CsrfGuard.js
-%%APP_VERSION%%/webapps/jasperserver/WEB-INF/classes/esapi/Owasp.CsrfGuard.properties
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/classes/esapi/security-config.properties
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/classes/esapi/security.properties
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/classes/esapi/validation.properties
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/classes/jasperreports.properties
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/classes/keystore.jks
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/classes/mondrian.properties
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/classes/themes/default.properties
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/datasources.xml
@@ -107,13 +127,18 @@
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/decorators/decoratorMinimalComponents.jsp
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/decorators/decoratorMinimalImports.jsp
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/decorators/decoratorSample.jsp
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/decorators/designerMinimalImports.jsp
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/decorators/emptyDecorator.jsp
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/decorators/main.jsp
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/decorators/metadata.jsp
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/decorators/minimalDecorator.jsp
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/decorators/panel.jsp
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/decorators/printable.jsp
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/ehcache-data-snapshots.xml
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/ehcache.xml
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/ehcache_hibernate.xml
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/esapi/Owasp.CsrfGuard.js
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/esapi/Owasp.CsrfGuard.properties
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/faces-config.xml
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/flows/addDataSourceFlow.xml
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/flows/addFileResourceFlow.xml
@@ -292,6 +317,7 @@
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/jsp/modules/commonJSTLScripts.jsp
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/jsp/modules/defaultPaginatorLinks.jsp
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/jsp/modules/editFolderForm.jsp
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/jsp/modules/encrypt.jsp
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/jsp/modules/exporters/csvExportParams.jsp
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/jsp/modules/exporters/excelExportParams.jsp
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/jsp/modules/exporters/swfExport.jsp
@@ -302,7 +328,9 @@
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/jsp/modules/home.jsp
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/jsp/modules/inputControls/DefaultParametersForm.jsp
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/jsp/modules/inputControls/InputControlLabel.jsp
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/jsp/modules/inputControls/InputControlTemplates.jsp
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/jsp/modules/inputControls/Label.jsp
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/jsp/modules/inputControls/commonInputControlsImports.jsp
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/jsp/modules/listOlapViews.jsp
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/jsp/modules/login/login.jsp
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/jsp/modules/login/loginState.jsp
@@ -371,8 +399,11 @@
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/jsp/modules/search/results.jsp
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/jsp/modules/search/resultsState.jsp
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/jsp/modules/search/searchComponents.jsp
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/jsp/modules/system/404.jsp
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/jsp/modules/system/500.jsp
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/jsp/modules/system/AccessDeniedPage.jsp
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/jsp/modules/system/errorPage.jsp
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/jsp/modules/system/jasperInteractiveErrorPage.jsp
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/jsp/modules/system/systemConfirm.jsp
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/jsp/modules/viewReport/DefaultJasperViewer.jsp
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/jsp/modules/viewReport/DefaultJasperViewerState.jsp
@@ -393,8 +424,10 @@
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/jsp/templates/control_searchLockup.jsp
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/jsp/templates/control_tabSet.jsp
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/jsp/templates/customURL.jsp
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/jsp/templates/dependencies.jsp
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/jsp/templates/detail.jsp
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/jsp/templates/editLabel.jsp
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/jsp/templates/generateResource.jsp
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/jsp/templates/heartbeatOptin.jsp
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/jsp/templates/inputControls.jsp
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/jsp/templates/list.jsp
@@ -425,6 +458,9 @@
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/LICENSE.BSD.yahoo.js.txt
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/LICENSE.CC.fugue.txt
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/LICENSE.CDDI.jaxb.txt
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/LICENSE.CDDI.jersey.txt
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/LICENSE.MIT.jcryption.js.txt
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/LICENSE.MIT.jquery.js.txt
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/LICENSE.MIT.nwmatcher.js.txt
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/LICENSE.MIT.prototype.js.txt
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/LICENSE.MIT.scriptaculous.js.txt
@@ -432,9 +468,11 @@
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/LICENSE.ant.txt
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/LICENSE.antlr.txt
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/LICENSE.apache-2.0.txt
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/LICENSE.asm.txt
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/LICENSE.avalon.txt
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/LICENSE.bouncycastle.txt
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/LICENSE.bsh.txt
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/LICENSE.c3p0.txt
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/LICENSE.cas-client.txt
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/LICENSE.cglib.txt
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/LICENSE.commons.txt
@@ -446,6 +484,7 @@
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/LICENSE.ehcache.txt
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/LICENSE.eigenbase.txt
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/LICENSE.groovy.txt
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/LICENSE.gson.txt
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/LICENSE.hibernate.txt
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/LICENSE.hsqldb.txt
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/LICENSE.jackson.txt
@@ -480,6 +519,7 @@
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/activation-1.1.jar
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/antlr-2.7.6.jar
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/aopalliance-1.0.jar
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/asm-3.1.jar
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/aspectjrt-1.5.4.jar
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/avalon-framework-api-4.3.1.jar
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/avalon-framework-impl-4.3.1.jar
@@ -509,6 +549,7 @@
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/bcprov-jdk14-1.38.jar
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/bcprov-jdk14-138.jar
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/bctsp-jdk14-1.38.jar
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/c3p0-0.9.1.1.jar
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/cas-client-core-3.1.5.jar
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/castor-1.2.jar
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/cglib-nodep-2.2.jar
@@ -525,14 +566,14 @@
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/commons-io-1.1.jar
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/commons-lang-2.4.jar
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/commons-logging-1.0.4.jar
-%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/commons-logging-api-1.1.jar
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/commons-math-1.0.jar
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/commons-net-3.1.jar
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/commons-pool-1.2.jar
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/commons-validator-1.3.1.jar
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/commons-vfs-1.0.jar
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/dom4j-1.6.1.jar
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/dwr-2.0.3.jar
-%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/ehcache-core-1.7.2.jar
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/ehcache-core-2.5.0.jar
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/eigenbase-properties-1.1.0.10924.jar
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/eigenbase-resgen-1.3.0.11873.jar
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/eigenbase-xom-1.3.0.11999.jar
@@ -540,43 +581,46 @@
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/fop-0.95.jar
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/geronimo-stax-api_1.0_spec-1.0.jar
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/groovy-all-1.7.5.jar
-%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/hadoop-core-0.20.2.jar
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/hadoop-core-1.0.1.jar
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/hibernate-core-3.3.2.GA-HHH-2763.jar
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/hibernate-jmx-3.3.2.GA.jar
-%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/hive-common-0.7.0.jar
-%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/hive-exec-0.7.0.jar
-%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/hive-jdbc-0.7.0.jar
-%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/hive-metastore-0.7.0.jar
-%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/hive-service-0.7.0.jar
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/hive-common-0.8.1.jar
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/hive-exec-0.8.1.jar
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/hive-jdbc-0.8.1.jar
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/hive-metastore-0.8.1.jar
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/hive-service-0.8.1.jar
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/httpclient-4.1.1.jar
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/httpcore-4.1.jar
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/httpmime-4.1.1.jar
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/iReport-utils-2.0.1.jar
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/itext-2.1.7.jar
-%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/jackson-core-lgpl-1.7.4.jar
-%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/jackson-mapper-lgpl-1.7.4.jar
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/jackson-core-asl-1.9.4.jar
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/jackson-jaxrs-1.9.2.jar
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/jackson-mapper-asl-1.9.4.jar
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/jackson-xc-1.9.2.jar
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/jai_codec-1.1_mr.jar
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/jai_core-1.1_mr.jar
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/jakarta-regexp-1.4.jar
-%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/jasperreports-4.5.0.2.jar
-%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/jasperreports-chart-themes-4.5.0.jar
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/jasperreports-4.7.0.jar
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/jasperreports-chart-themes-4.7.0.jar
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/jasperreports-fonts-4.5.0.jar
-%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/jasperreports-ofc-4.5.0.jar
-%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/jasperserver-api-common-4.5.0.jar
-%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/jasperserver-api-common-impl-4.5.0.jar
-%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/jasperserver-api-engine-4.5.0.jar
-%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/jasperserver-api-engine-impl-4.5.0.jar
-%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/jasperserver-api-metadata-4.5.0.jar
-%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/jasperserver-api-metadata-impl-4.5.0.jar
-%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/jasperserver-common-ws-4.5.0.jar
-%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/jasperserver-core-util-4.5.0.jar
-%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/jasperserver-export-tool-4.5.0.jar
-%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/jasperserver-remote-services-4.5.0.jar
-%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/jasperserver-repository-hibernate-4.5.0.jar
-%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/jasperserver-rest-server-4.5.0.jar
-%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/jasperserver-search-4.5.0.jar
-%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/jasperserver-war-jar-4.5.0.jar
-%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/jasperserver-ws-server-4.5.0.jar
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/jasperreports-ofc-4.7.0.jar
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/jasperserver-api-common-4.7.0.jar
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/jasperserver-api-common-impl-4.7.0.jar
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/jasperserver-api-engine-4.7.0.jar
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/jasperserver-api-engine-impl-4.7.0.jar
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/jasperserver-api-metadata-4.7.0.jar
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/jasperserver-api-metadata-impl-4.7.0.jar
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/jasperserver-common-ws-4.7.0.jar
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/jasperserver-core-util-4.7.0.jar
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/jasperserver-export-tool-4.7.0.jar
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/jasperserver-jax-rs-rest-4.7.0.jar
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/jasperserver-remote-services-4.7.0.jar
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/jasperserver-repository-hibernate-4.7.0.jar
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/jasperserver-rest-server-4.7.0.jar
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/jasperserver-search-4.7.0.jar
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/jasperserver-war-jar-4.7.0.jar
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/jasperserver-ws-server-4.7.0.jar
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/javacup-0.10k.jar
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/javassist-3.7.ga.jar
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/jaxb-api-2.1.jar
@@ -585,20 +629,29 @@
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/jcommon-1.0.15.jar
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/jdom-1.1.jar
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/jdtcore-3.1.0.jar
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/jersey-core-1.13-b01.jar
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/jersey-json-1.13-b01.jar
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/jersey-server-1.13-b01.jar
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/jersey-servlet-1.13-b01.jar
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/jersey-spring-1.13-b01.jar
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/jettison-1.1.jar
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/jfreechart-1.0.12.jar
-%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/ji-jpivot-4.0.1.jar
-%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/ji-wcf-4.0.1.jar
-%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/js-hive-datasource-0.9.0.jar
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/ji-jpivot-4.0.2.jar
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/ji-wcf-4.0.2.jar
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/js-1.7R1.jar
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/js-hive-datasource-1.0.3.jar
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/js-mongodb-datasource-1.0.0.jar
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/jsf-api-1.1.jar
-%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/json-org-1.0.jar
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/jsr311-api-1.1.jar
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/jstl-1.1.2.jar
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/jta-1.1.jar
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/jxl-2.6.10.jar
-%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/libfb303-0.6.1.jar
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/libfb303-0.7.0.jar
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/log4j-1.2.12.jar
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/mail-1.4.jar
-%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/mondrian-3.2.0-13661-JS-2.jar
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/mondrian-3.2.0-13661-JS-3.jar
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/mondrian.dtd
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/mongo-java-driver-2.7.3.jar
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/ognl-2.7.3.jar
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/olap4j-0.9.7.309-JS-2.jar
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/oro-2.0.8.jar
@@ -606,24 +659,34 @@
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/poi-3.7.jar
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/poi-ooxml-3.7.jar
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/poi-ooxml-schemas-3.7.jar
-%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/quartz-1.5.1-jaspersoft.jar
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/quartz-2.1.2.jar
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/quartz-commonj-2.1.2.jar
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/serializer-2.7.1.jar
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/sitemesh-2.2.1-JasperSoft.jar
-%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/slf4j-api-1.5.8.jar
-%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/slf4j-log4j12-1.5.8.jar
-%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/spring-2.5.6.SEC03.jar
-%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/spring-binding-2.0.7.RELEASE.jar
-%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/spring-context-support-2.5.6.SEC03.jar
-%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/spring-js-2.0.7.RELEASE.jar
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/slf4j-api-1.6.1.jar
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/slf4j-log4j12-1.6.1.jar
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/spring-aop-3.1.0.RELEASE.jar
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/spring-asm-3.1.0.RELEASE.jar
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/spring-beans-3.1.0.RELEASE.jar
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/spring-binding-2.3.0.RELEASE.jar
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/spring-context-3.1.0.RELEASE.jar
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/spring-context-support-3.1.0.RELEASE.jar
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/spring-core-3.1.0.RELEASE.jar
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/spring-expression-3.1.0.RELEASE.jar
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/spring-jdbc-3.1.0.RELEASE.jar
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/spring-js-2.3.0.RELEASE.jar
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/spring-js-resources-2.3.0.RELEASE.jar
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/spring-ldap-core-1.3.0.RELEASE.jar
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/spring-ldap-core-tiger-1.3.0.RELEASE.jar
-%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/spring-orm-2.5.6.SEC03.jar
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/spring-orm-3.1.0.RELEASE.jar
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/spring-security-acl-2.0.7.RELEASE.jar
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/spring-security-cas-client-2.0.7.RELEASE.jar
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/spring-security-core-2.0.7.RELEASE.jar
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/spring-security-taglibs-2.0.7.RELEASE.jar
-%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/spring-web-2.5.6.SEC03.jar
-%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/spring-webflow-2.0.7.RELEASE.jar
-%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/spring-webmvc-2.5.6.SEC03.jar
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/spring-tx-3.1.0.RELEASE.jar
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/spring-web-3.1.0.RELEASE.jar
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/spring-webflow-2.3.0.RELEASE.jar
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/spring-webmvc-3.1.0.RELEASE.jar
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/standard-1.1.2.jar
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/stax-api-1.0.1.jar
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/tiles-api-2.1.4.jar
@@ -633,6 +696,7 @@
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/velocity-1.7.jar
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/wsdl4j-1.5.1.jar
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/xalan-2.7.1.jar
+%%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/xbean-2.2.0.jar
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/xercesImpl-2.7.1.jar
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/xml-apis-1.3.04.jar
 %%APP_VERSION%%/webapps/jasperserver/WEB-INF/lib/xml-apis-ext-1.3.04.jar
@@ -723,7 +787,7 @@
 %%APP_VERSION%%/webapps/jasperserver/j/zoom-out-all-up.png
 %%APP_VERSION%%/webapps/jasperserver/j/zoom_in.cur
 %%APP_VERSION%%/webapps/jasperserver/j/zoom_out.cur
-%%APP_VERSION%%/webapps/jasperserver/jasperreports-flash-4.5.0.swf
+%%APP_VERSION%%/webapps/jasperserver/jasperreports-flash-4.7.0.swf
 %%APP_VERSION%%/webapps/jasperserver/jpivot/navi/cat-available.png
 %%APP_VERSION%%/webapps/jasperserver/jpivot/navi/cat-visible.png
 %%APP_VERSION%%/webapps/jasperserver/jpivot/navi/column.png
@@ -887,14 +951,13 @@
 %%APP_VERSION%%/webapps/jasperserver/scripts/administer.base.js
 %%APP_VERSION%%/webapps/jasperserver/scripts/administer.logging.js
 %%APP_VERSION%%/webapps/jasperserver/scripts/administer.options.js
-%%APP_VERSION%%/webapps/jasperserver/scripts/cal.calendar.js
-%%APP_VERSION%%/webapps/jasperserver/scripts/cal.calendarSetup.js
 %%APP_VERSION%%/webapps/jasperserver/scripts/cascade.cascade.js
 %%APP_VERSION%%/webapps/jasperserver/scripts/components.LinkButton.js
 %%APP_VERSION%%/webapps/jasperserver/scripts/components.ListBox.js
 %%APP_VERSION%%/webapps/jasperserver/scripts/components.about.js
 %%APP_VERSION%%/webapps/jasperserver/scripts/components.checkbox-utils.js
 %%APP_VERSION%%/webapps/jasperserver/scripts/components.customTooltip.js
+%%APP_VERSION%%/webapps/jasperserver/scripts/components.dependent.dialog.js
 %%APP_VERSION%%/webapps/jasperserver/scripts/components.dialogs.js
 %%APP_VERSION%%/webapps/jasperserver/scripts/components.heartbeat.js
 %%APP_VERSION%%/webapps/jasperserver/scripts/components.loginBox.js
@@ -906,17 +969,29 @@
 %%APP_VERSION%%/webapps/jasperserver/scripts/components.toolbarButtons.js
 %%APP_VERSION%%/webapps/jasperserver/scripts/components.tooltip.js
 %%APP_VERSION%%/webapps/jasperserver/scripts/components.validator.js
+%%APP_VERSION%%/webapps/jasperserver/scripts/components.webHelp.js
 %%APP_VERSION%%/webapps/jasperserver/scripts/controls.base.js
+%%APP_VERSION%%/webapps/jasperserver/scripts/controls.basecontrol.js
+%%APP_VERSION%%/webapps/jasperserver/scripts/controls.components.js
+%%APP_VERSION%%/webapps/jasperserver/scripts/controls.controller.js
+%%APP_VERSION%%/webapps/jasperserver/scripts/controls.core.js
+%%APP_VERSION%%/webapps/jasperserver/scripts/controls.datatransfer.js
+%%APP_VERSION%%/webapps/jasperserver/scripts/controls.logging.js
 %%APP_VERSION%%/webapps/jasperserver/scripts/controls.report.js
+%%APP_VERSION%%/webapps/jasperserver/scripts/controls.viewmodel.js
 %%APP_VERSION%%/webapps/jasperserver/scripts/core.accessibility.js
 %%APP_VERSION%%/webapps/jasperserver/scripts/core.ajax.js
 %%APP_VERSION%%/webapps/jasperserver/scripts/core.edition.js
+%%APP_VERSION%%/webapps/jasperserver/scripts/core.events.bis.js
 %%APP_VERSION%%/webapps/jasperserver/scripts/core.events.js
 %%APP_VERSION%%/webapps/jasperserver/scripts/core.initialize.js
 %%APP_VERSION%%/webapps/jasperserver/scripts/core.key.events.js
 %%APP_VERSION%%/webapps/jasperserver/scripts/core.layout.js
 %%APP_VERSION%%/webapps/jasperserver/scripts/core.touch.events.js
+%%APP_VERSION%%/webapps/jasperserver/scripts/encrypt.js
+%%APP_VERSION%%/webapps/jasperserver/scripts/encryption.utils.js
 %%APP_VERSION%%/webapps/jasperserver/scripts/error.error.js
+%%APP_VERSION%%/webapps/jasperserver/scripts/error.system.js
 %%APP_VERSION%%/webapps/jasperserver/scripts/ext.unittests.yui.console-filters.js
 %%APP_VERSION%%/webapps/jasperserver/scripts/ext.unittests.yui.console.js
 %%APP_VERSION%%/webapps/jasperserver/scripts/ext.unittests.yui.js
@@ -935,10 +1010,28 @@
 %%APP_VERSION%%/webapps/jasperserver/scripts/ext.utils.slider.js
 %%APP_VERSION%%/webapps/jasperserver/scripts/ext.utils.sound.js
 %%APP_VERSION%%/webapps/jasperserver/scripts/ext.utils.touch.controller.js
+%%APP_VERSION%%/webapps/jasperserver/scripts/ext.utils.underscore.js
+%%APP_VERSION%%/webapps/jasperserver/scripts/ext.utils.underscore.string.js
 %%APP_VERSION%%/webapps/jasperserver/scripts/ext.utils.unittest.js
+%%APP_VERSION%%/webapps/jasperserver/scripts/jasperreports-reportViewerToolbar.js
 %%APP_VERSION%%/webapps/jasperserver/scripts/jpivot.jaPro.js
-%%APP_VERSION%%/webapps/jasperserver/scripts/jquery/js/jquery-1.4.4.min.js
+%%APP_VERSION%%/webapps/jasperserver/scripts/jquery/js/ext.jquery.jcryption.js
+%%APP_VERSION%%/webapps/jasperserver/scripts/jquery/js/jquery-1.7.1.min.js
 %%APP_VERSION%%/webapps/jasperserver/scripts/jquery/js/jquery-ui-1.8.16.custom.min.js
+%%APP_VERSION%%/webapps/jasperserver/scripts/jquery/js/jquery-ui-1.8.20.custom.min.js
+%%APP_VERSION%%/webapps/jasperserver/scripts/jquery/js/jquery-ui-timepicker-addon.js
+%%APP_VERSION%%/webapps/jasperserver/scripts/jquery/js/jquery.jcryption.js
+%%APP_VERSION%%/webapps/jasperserver/scripts/jquery/js/jquery.jcryption.min.js
+%%APP_VERSION%%/webapps/jasperserver/scripts/jquery/js/jquery.ui.datepicker-de.js
+%%APP_VERSION%%/webapps/jasperserver/scripts/jquery/js/jquery.ui.datepicker-en.js
+%%APP_VERSION%%/webapps/jasperserver/scripts/jquery/js/jquery.ui.datepicker-es.js
+%%APP_VERSION%%/webapps/jasperserver/scripts/jquery/js/jquery.ui.datepicker-fr.js
+%%APP_VERSION%%/webapps/jasperserver/scripts/jquery/js/jquery.ui.datepicker-it.js
+%%APP_VERSION%%/webapps/jasperserver/scripts/jquery/js/jquery.ui.datepicker-ja.js
+%%APP_VERSION%%/webapps/jasperserver/scripts/jquery/js/jquery.ui.datepicker-ro.js
+%%APP_VERSION%%/webapps/jasperserver/scripts/jquery/js/jquery.ui.datepicker-zh-CN.js
+%%APP_VERSION%%/webapps/jasperserver/scripts/jquery/js/jquery.ui.datepicker-zh-TW.js
+%%APP_VERSION%%/webapps/jasperserver/scripts/jquery/js/jquery.urldecoder.js
 %%APP_VERSION%%/webapps/jasperserver/scripts/jquery/theme/images/ui-bg_flat_0_aaaaaa_40x100.png
 %%APP_VERSION%%/webapps/jasperserver/scripts/jquery/theme/images/ui-bg_flat_75_ffffff_40x100.png
 %%APP_VERSION%%/webapps/jasperserver/scripts/jquery/theme/images/ui-bg_glass_55_fbf9ee_1x400.png
@@ -958,12 +1051,31 @@
 %%APP_VERSION%%/webapps/jasperserver/scripts/jquery/theme/jquery.ui.resizable.css
 %%APP_VERSION%%/webapps/jasperserver/scripts/jquery/theme/jquery.ui.selectable.css
 %%APP_VERSION%%/webapps/jasperserver/scripts/jquery/theme/jquery.ui.theme.css
+%%APP_VERSION%%/webapps/jasperserver/scripts/jquery/theme/redmond/images/ui-bg_flat_0_aaaaaa_40x100.png
+%%APP_VERSION%%/webapps/jasperserver/scripts/jquery/theme/redmond/images/ui-bg_flat_55_fbec88_40x100.png
+%%APP_VERSION%%/webapps/jasperserver/scripts/jquery/theme/redmond/images/ui-bg_glass_75_d0e5f5_1x400.png
+%%APP_VERSION%%/webapps/jasperserver/scripts/jquery/theme/redmond/images/ui-bg_glass_85_dfeffc_1x400.png
+%%APP_VERSION%%/webapps/jasperserver/scripts/jquery/theme/redmond/images/ui-bg_glass_95_fef1ec_1x400.png
+%%APP_VERSION%%/webapps/jasperserver/scripts/jquery/theme/redmond/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png
+%%APP_VERSION%%/webapps/jasperserver/scripts/jquery/theme/redmond/images/ui-bg_inset-hard_100_f5f8f9_1x100.png
+%%APP_VERSION%%/webapps/jasperserver/scripts/jquery/theme/redmond/images/ui-bg_inset-hard_100_fcfdfd_1x100.png
+%%APP_VERSION%%/webapps/jasperserver/scripts/jquery/theme/redmond/images/ui-icons_217bc0_256x240.png
+%%APP_VERSION%%/webapps/jasperserver/scripts/jquery/theme/redmond/images/ui-icons_2e83ff_256x240.png
+%%APP_VERSION%%/webapps/jasperserver/scripts/jquery/theme/redmond/images/ui-icons_469bdd_256x240.png
+%%APP_VERSION%%/webapps/jasperserver/scripts/jquery/theme/redmond/images/ui-icons_6da8d5_256x240.png
+%%APP_VERSION%%/webapps/jasperserver/scripts/jquery/theme/redmond/images/ui-icons_cd0a0a_256x240.png
+%%APP_VERSION%%/webapps/jasperserver/scripts/jquery/theme/redmond/images/ui-icons_d8e7f3_256x240.png
+%%APP_VERSION%%/webapps/jasperserver/scripts/jquery/theme/redmond/images/ui-icons_f9bd01_256x240.png
+%%APP_VERSION%%/webapps/jasperserver/scripts/jquery/theme/redmond/jquery-ui-1.8.20.custom.css
+%%APP_VERSION%%/webapps/jasperserver/scripts/jquery/ui/jquery.ui.mouse.touch.js
 %%APP_VERSION%%/webapps/jasperserver/scripts/list.base.js
+%%APP_VERSION%%/webapps/jasperserver/scripts/login.js
 %%APP_VERSION%%/webapps/jasperserver/scripts/messages.messageDetail.js
 %%APP_VERSION%%/webapps/jasperserver/scripts/messages.messageList.js
 %%APP_VERSION%%/webapps/jasperserver/scripts/mng.common.actions.js
 %%APP_VERSION%%/webapps/jasperserver/scripts/mng.common.js
 %%APP_VERSION%%/webapps/jasperserver/scripts/mng.main.js
+%%APP_VERSION%%/webapps/jasperserver/scripts/mustache.js
 %%APP_VERSION%%/webapps/jasperserver/scripts/old.report.view-report.js
 %%APP_VERSION%%/webapps/jasperserver/scripts/org.role.mng.actions.js
 %%APP_VERSION%%/webapps/jasperserver/scripts/org.role.mng.components.js
@@ -1023,94 +1135,41 @@
 %%APP_VERSION%%/webapps/jasperserver/themes/default/forPrint.css
 %%APP_VERSION%%/webapps/jasperserver/themes/default/images/adhoc_datatree_icons_sprite.png
 %%APP_VERSION%%/webapps/jasperserver/themes/default/images/adhoc_toolbar_buttons_sprite.png
-%%APP_VERSION%%/webapps/jasperserver/themes/default/images/ajax-loader.gif
-%%APP_VERSION%%/webapps/jasperserver/themes/default/images/body_bkgnd.png
-%%APP_VERSION%%/webapps/jasperserver/themes/default/images/button_action_jumbo_primary_sprite.png
-%%APP_VERSION%%/webapps/jasperserver/themes/default/images/button_action_jumbo_sprite.png
+%%APP_VERSION%%/webapps/jasperserver/themes/default/images/banner_bkgd.png
 %%APP_VERSION%%/webapps/jasperserver/themes/default/images/button_action_primary_sprite.png
 %%APP_VERSION%%/webapps/jasperserver/themes/default/images/button_action_sprite.png
 %%APP_VERSION%%/webapps/jasperserver/themes/default/images/button_action_square_icons_sprite.png
 %%APP_VERSION%%/webapps/jasperserver/themes/default/images/button_capsule_sprite.png
 %%APP_VERSION%%/webapps/jasperserver/themes/default/images/button_options_sprite.png
-%%APP_VERSION%%/webapps/jasperserver/themes/default/images/column_bkgd.png
-%%APP_VERSION%%/webapps/jasperserver/themes/default/images/column_bkgd_corners.png
-%%APP_VERSION%%/webapps/jasperserver/themes/default/images/column_bkgd_edges_rl.png
-%%APP_VERSION%%/webapps/jasperserver/themes/default/images/column_bkgd_edges_tb.png
+%%APP_VERSION%%/webapps/jasperserver/themes/default/images/column_header_bkgd.png
 %%APP_VERSION%%/webapps/jasperserver/themes/default/images/cursor_copy.cur
 %%APP_VERSION%%/webapps/jasperserver/themes/default/images/cursor_copy.png
 %%APP_VERSION%%/webapps/jasperserver/themes/default/images/disclosure_indicators_sprite.png
-%%APP_VERSION%%/webapps/jasperserver/themes/default/images/first-d.gif
-%%APP_VERSION%%/webapps/jasperserver/themes/default/images/first.gif
 %%APP_VERSION%%/webapps/jasperserver/themes/default/images/floatingMenu_sprite.png
-%%APP_VERSION%%/webapps/jasperserver/themes/default/images/frame_background_sprite.png
-%%APP_VERSION%%/webapps/jasperserver/themes/default/images/frame_bkgd_corners.png
-%%APP_VERSION%%/webapps/jasperserver/themes/default/images/frame_bkgd_edges_rl.png
-%%APP_VERSION%%/webapps/jasperserver/themes/default/images/frame_bkgd_edges_tb.png
-%%APP_VERSION%%/webapps/jasperserver/themes/default/images/frame_header_sprite.png
-%%APP_VERSION%%/webapps/jasperserver/themes/default/images/gradient_frame.content.png
 %%APP_VERSION%%/webapps/jasperserver/themes/default/images/grid_20x20_bkgd.png
-%%APP_VERSION%%/webapps/jasperserver/themes/default/images/grouper_sprite.png
-%%APP_VERSION%%/webapps/jasperserver/themes/default/images/header_primary_sprite.png
 %%APP_VERSION%%/webapps/jasperserver/themes/default/images/home_bkgd.png
 %%APP_VERSION%%/webapps/jasperserver/themes/default/images/home_icons_sprite.png
+%%APP_VERSION%%/webapps/jasperserver/themes/default/images/inner_pagination_sprite.png
 %%APP_VERSION%%/webapps/jasperserver/themes/default/images/input_bkgd.png
-%%APP_VERSION%%/webapps/jasperserver/themes/default/images/last-d.gif
-%%APP_VERSION%%/webapps/jasperserver/themes/default/images/last.gif
 %%APP_VERSION%%/webapps/jasperserver/themes/default/images/list_node_animation.gif
 %%APP_VERSION%%/webapps/jasperserver/themes/default/images/list_pressed_bkgd.png
 %%APP_VERSION%%/webapps/jasperserver/themes/default/images/lists_sprite.png
 %%APP_VERSION%%/webapps/jasperserver/themes/default/images/loadinfo.gif
 %%APP_VERSION%%/webapps/jasperserver/themes/default/images/login_welcome_bkgd.jpg
-%%APP_VERSION%%/webapps/jasperserver/themes/default/images/login_welcome_bkgd_ipad.jpg
 %%APP_VERSION%%/webapps/jasperserver/themes/default/images/login_welcome_ce_bkgd.jpg
 %%APP_VERSION%%/webapps/jasperserver/themes/default/images/logo.png
-%%APP_VERSION%%/webapps/jasperserver/themes/default/images/logo_small.png
-%%APP_VERSION%%/webapps/jasperserver/themes/default/images/menu_context_bkgd_corners.png
-%%APP_VERSION%%/webapps/jasperserver/themes/default/images/menu_context_bkgd_edges_rl.png
-%%APP_VERSION%%/webapps/jasperserver/themes/default/images/menu_context_bkgd_edges_tb.png
-%%APP_VERSION%%/webapps/jasperserver/themes/default/images/menu_dropDown_bkgd_corners.png
-%%APP_VERSION%%/webapps/jasperserver/themes/default/images/menu_dropDown_bkgd_edges_rl.png
-%%APP_VERSION%%/webapps/jasperserver/themes/default/images/menu_dropDown_bkgd_edges_tb.png
-%%APP_VERSION%%/webapps/jasperserver/themes/default/images/menu_indicators_sprite.png
 %%APP_VERSION%%/webapps/jasperserver/themes/default/images/menu_primaryNav_sprite.png
-%%APP_VERSION%%/webapps/jasperserver/themes/default/images/menu_vertical_bkgd.png
 %%APP_VERSION%%/webapps/jasperserver/themes/default/images/message_icons_sprite.png
-%%APP_VERSION%%/webapps/jasperserver/themes/default/images/next-d.gif
-%%APP_VERSION%%/webapps/jasperserver/themes/default/images/next.gif
-%%APP_VERSION%%/webapps/jasperserver/themes/default/images/panel_bkgd_corners.png
-%%APP_VERSION%%/webapps/jasperserver/themes/default/images/panel_bkgd_edges_rl.png
-%%APP_VERSION%%/webapps/jasperserver/themes/default/images/panel_bkgd_edges_tb.png
-%%APP_VERSION%%/webapps/jasperserver/themes/default/images/panel_confirm_bkgd.png
-%%APP_VERSION%%/webapps/jasperserver/themes/default/images/panel_dialog_header_sprite.png
-%%APP_VERSION%%/webapps/jasperserver/themes/default/images/panel_info_bkgd_corners.png
-%%APP_VERSION%%/webapps/jasperserver/themes/default/images/panel_info_bkgd_edges_rl.png
-%%APP_VERSION%%/webapps/jasperserver/themes/default/images/panel_info_bkgd_edges_tb.png
-%%APP_VERSION%%/webapps/jasperserver/themes/default/images/panel_info_system_bkgd_corners.png
-%%APP_VERSION%%/webapps/jasperserver/themes/default/images/panel_info_system_bkgd_edges_rl.png
-%%APP_VERSION%%/webapps/jasperserver/themes/default/images/panel_info_system_bkgd_edges_tb.png
-%%APP_VERSION%%/webapps/jasperserver/themes/default/images/panel_info_tooltip_bkgd_corners.png
-%%APP_VERSION%%/webapps/jasperserver/themes/default/images/panel_info_tooltip_bkgd_edges_rl.png
-%%APP_VERSION%%/webapps/jasperserver/themes/default/images/panel_info_tooltip_bkgd_edges_tb.png
-%%APP_VERSION%%/webapps/jasperserver/themes/default/images/panel_inlay_bkgd.png
-%%APP_VERSION%%/webapps/jasperserver/themes/default/images/panel_inlay_bkgd_corners.png
-%%APP_VERSION%%/webapps/jasperserver/themes/default/images/panel_inlay_bkgd_edges_rl.png
-%%APP_VERSION%%/webapps/jasperserver/themes/default/images/panel_inlay_bkgd_edges_tb.png
-%%APP_VERSION%%/webapps/jasperserver/themes/default/images/panel_inlay_gradient_left.png
-%%APP_VERSION%%/webapps/jasperserver/themes/default/images/panel_inlay_gradient_right.png
-%%APP_VERSION%%/webapps/jasperserver/themes/default/images/panel_inset_bkgd_corners.png
-%%APP_VERSION%%/webapps/jasperserver/themes/default/images/panel_inset_bkgd_edges_rl.png
-%%APP_VERSION%%/webapps/jasperserver/themes/default/images/panel_inset_bkgd_edges_tb.png
 %%APP_VERSION%%/webapps/jasperserver/themes/default/images/panel_inset_inset_bkgd.png
 %%APP_VERSION%%/webapps/jasperserver/themes/default/images/panel_sizer_sprite.png
-%%APP_VERSION%%/webapps/jasperserver/themes/default/images/panel_widget_header_sprite.png
-%%APP_VERSION%%/webapps/jasperserver/themes/default/images/prev-d.gif
-%%APP_VERSION%%/webapps/jasperserver/themes/default/images/prev.gif
+%%APP_VERSION%%/webapps/jasperserver/themes/default/images/report_load_animation.gif
 %%APP_VERSION%%/webapps/jasperserver/themes/default/images/search_sprite.png
 %%APP_VERSION%%/webapps/jasperserver/themes/default/images/sort_indicators_sprite.png
+%%APP_VERSION%%/webapps/jasperserver/themes/default/images/spacer.gif
 %%APP_VERSION%%/webapps/jasperserver/themes/default/images/tabs_horizontal_buttons_bkgd.png
 %%APP_VERSION%%/webapps/jasperserver/themes/default/images/tabs_horizontal_sprite.png
 %%APP_VERSION%%/webapps/jasperserver/themes/default/images/tabs_vertical_sprite.png
-%%APP_VERSION%%/webapps/jasperserver/themes/default/images/toolbar_bkgd.png
+%%APP_VERSION%%/webapps/jasperserver/themes/default/images/viewer_toolbar_buttons_sprite.png
 %%APP_VERSION%%/webapps/jasperserver/themes/default/images/wait_animation_large.gif
 %%APP_VERSION%%/webapps/jasperserver/themes/default/lists.css
 %%APP_VERSION%%/webapps/jasperserver/themes/default/overrides_custom.css
@@ -1121,15 +1180,14 @@
 %%APP_VERSION%%/webapps/jasperserver/themes/default/pages.css
 %%APP_VERSION%%/webapps/jasperserver/themes/default/samples.css
 %%APP_VERSION%%/webapps/jasperserver/themes/default/theme.css
+%%APP_VERSION%%/webapps/jasperserver/themes/pods_summer/images/banner_bkgd.png
 %%APP_VERSION%%/webapps/jasperserver/themes/pods_summer/images/body_bkgnd.png
-%%APP_VERSION%%/webapps/jasperserver/themes/pods_summer/images/button_action_jumbo_sprite.png
 %%APP_VERSION%%/webapps/jasperserver/themes/pods_summer/images/button_action_primary_sprite.png
 %%APP_VERSION%%/webapps/jasperserver/themes/pods_summer/images/button_capsule_sprite.png
 %%APP_VERSION%%/webapps/jasperserver/themes/pods_summer/images/disclosure_indicators_sprite.png
-%%APP_VERSION%%/webapps/jasperserver/themes/pods_summer/images/frame_header_sprite.png
+%%APP_VERSION%%/webapps/jasperserver/themes/pods_summer/images/footer_bkgd.png
 %%APP_VERSION%%/webapps/jasperserver/themes/pods_summer/images/logo.png
 %%APP_VERSION%%/webapps/jasperserver/themes/pods_summer/images/menu_primaryNav_sprite.png
-%%APP_VERSION%%/webapps/jasperserver/themes/pods_summer/images/search_sprite.png
 %%APP_VERSION%%/webapps/jasperserver/themes/pods_summer/images/tabs_horizontal_sprite.png
 %%APP_VERSION%%/webapps/jasperserver/themes/pods_summer/images/tabs_vertical_sprite.png
 %%APP_VERSION%%/webapps/jasperserver/themes/pods_summer/overrides_custom.css
@@ -1219,6 +1277,9 @@
 @dirrm %%APP_VERSION%%/webapps/jasperserver/themes/default/images
 @dirrm %%APP_VERSION%%/webapps/jasperserver/themes/default
 @dirrm %%APP_VERSION%%/webapps/jasperserver/themes
+@dirrm %%APP_VERSION%%/webapps/jasperserver/scripts/jquery/ui
+@dirrm %%APP_VERSION%%/webapps/jasperserver/scripts/jquery/theme/redmond/images
+@dirrm %%APP_VERSION%%/webapps/jasperserver/scripts/jquery/theme/redmond
 @dirrm %%APP_VERSION%%/webapps/jasperserver/scripts/jquery/theme/images
 @dirrm %%APP_VERSION%%/webapps/jasperserver/scripts/jquery/theme
 @dirrm %%APP_VERSION%%/webapps/jasperserver/scripts/jquery/js
@@ -1282,11 +1343,13 @@
 @dirrm %%APP_VERSION%%/webapps/jasperserver/WEB-INF/jpivot
 @dirrm %%APP_VERSION%%/webapps/jasperserver/WEB-INF/internal
 @dirrm %%APP_VERSION%%/webapps/jasperserver/WEB-INF/flows
+@dirrm %%APP_VERSION%%/webapps/jasperserver/WEB-INF/esapi
 @dirrm %%APP_VERSION%%/webapps/jasperserver/WEB-INF/decorators
 @dirrm %%APP_VERSION%%/webapps/jasperserver/WEB-INF/classes/themes
 @dirrm %%APP_VERSION%%/webapps/jasperserver/WEB-INF/classes/esapi
 @dirrm %%APP_VERSION%%/webapps/jasperserver/WEB-INF/classes
 @dirrm %%APP_VERSION%%/webapps/jasperserver/WEB-INF/bundles
+@dirrm %%APP_VERSION%%/webapps/jasperserver/WEB-INF/attachments
 @dirrm %%APP_VERSION%%/webapps/jasperserver/WEB-INF
 @dirrm %%APP_VERSION%%/webapps/jasperserver/META-INF
 @dirrm %%APP_VERSION%%/webapps/jasperserver