FreeBSD Bugzilla – Attachment 117037 Details for
Bug 159094
[patch][maintainer-update] databases/jasperserver: update to 4.1.0
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
file.diff
file.diff (text/plain), 40.42 KB, created by
Jason Helfman
on 2011-07-21 23:20:07 UTC
(
hide
)
Description:
file.diff
Filename:
MIME Type:
Creator:
Jason Helfman
Created:
2011-07-21 23:20:07 UTC
Size:
40.42 KB
patch
obsolete
>Index: jasperserver/Makefile >=================================================================== >RCS file: /home/jhelfman/ncvs/ports/databases/jasperserver/Makefile,v >retrieving revision 1.5 >diff -u -r1.5 Makefile >--- jasperserver/Makefile 30 Mar 2011 14:29:54 -0000 1.5 >+++ jasperserver/Makefile 21 Jul 2011 19:38:33 -0000 >@@ -6,12 +6,11 @@ > # > > PORTNAME= jasperserver >-PORTVERSION= 4.0.0 >-PORTREVISION= 2 >+PORTVERSION= 4.1.0 > CATEGORIES= databases print java > MASTER_SITES= SF/${PORTNAME}/JasperServer/JasperServer%20${PORTVERSION}/:source1 > DISTFILES= jasperreports-server-cp-${PORTVERSION}-src.zip:source1 \ >- jasperreports-server-cp-${PORTVERSION}-maven-repository.zip:source1 >+ jasperreports-server-${PORTVERSION}-maven-repository.zip:source1 > EXTRACT_ONLY= jasperreports-server-cp-${PORTVERSION}-src.zip > > MAINTAINER= jhelfman@experts-exchange.com >@@ -29,7 +28,7 @@ > SQLSRC= ${WRKSRC}/install_resources/sql > JS= ${SRCDIR}/${PORTNAME} > JSREPO= ${JS}-repo >-JSMAVENARCH= jasperreports-server-cp-${PORTVERSION}-maven-repository.zip >+JSMAVENARCH= jasperreports-server-${PORTVERSION}-maven-repository.zip > > NO_WRKSUBDIR= yes > USE_JAVA= yes >@@ -43,7 +42,8 @@ > OPTIONS= TOMCAT5 "Enable Tomcat 5.x support" on \ > TOMCAT6 "Enable Tomcat 6.x support" off \ > MYSQL "Enable Mysql 5.x support" on \ >- POSTGRESQL "Enable PostgreSQL 8.x support" off >+ POSTGRESQL "Enable PostgreSQL 8.x support" off \ >+ POSTGRESQL9 "Enable PostgreSQL 9.x support" off > > REPLACE_FILES= ${JS}/jasperserver-war/src/main/webappAdditions/WEB-INF/web.xml > REPLACE_LIST_TEMP= ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} >@@ -73,16 +73,24 @@ > .endif > > #use version 84, application is certified against this version >+#use version 90, application is reported to work against this version > .if defined(WITH_POSTGRESQL) >+WANT_PGSQL_VER= 84 >+JDBC= postgresql-8.4-702.jdbc4.jar >+DISTFILES+= postgresql-8.4-702.jdbc4.jar:source2 >+.elif defined(WITH_POSTGRESQL9) >+WANT_PGSQL_VER= 90 >+JDBC= postgresql-9.0-801.jdbc4.jar >+DISTFILES+= postgresql-9.0-801.jdbc4.jar:source2 >+.endif >+ >+.if ( defined(WITH_POSTGRESQL) || (WITH_POSTGRESQL9) ) > USE_PGSQL= yes >-WANT_PGSQL_VER= 84 > MYNAME?= pgsql > MYPASS?= pgsql > DATABASE= postgresql >-JDBC= postgresql-8.4-702.jdbc4.jar > PLIST_SUB+= JDBC=${JDBC} > MASTER_SITES+= http://jdbc.postgresql.org/download/:source2 >-DISTFILES+= postgresql-8.4-702.jdbc4.jar:source2 > .endif > > .if defined(WITH_TOMCAT5) >@@ -108,7 +116,7 @@ > DBHOST?= localhost > > APP_PROPERTIES= ${SRCDIR}/${PORTNAME}/buildomatic/default_master.properties >-MAIL_PROPERTIES=${SRCDIR}/${PORTNAME}/buildomatic/build_conf/default/webapp/WEB-INF/js.quartz.properties >+QTZ_PROPERTIES= ${SRCDIR}/${PORTNAME}/${PORTNAME}-war/target/${PORTNAME}/WEB-INF/js.quartz.properties > > JSPORT?= 8080 > JSEXTRA?= >@@ -127,7 +135,11 @@ > IGNORE= choose at least one application server > .elif ( defined(WITH_MYSQL) && defined(WITH_POSTGRESQL) ) > IGNORE= you can only define one database >-.elif ( !defined(WITH_MYSQL) && !defined(WITH_POSTGRESQL) ) >+.elif ( defined(WITH_MYSQL) && defined(WITH_POSTGRESQL9) ) >+IGNORE= you can only define one database >+.elif ( defined(WITH_POSTGRESQL) && defined(WITH_POSTGRESQL9) ) >+IGNORE= you can only define one database >+.elif ( !defined(WITH_MYSQL) && !defined(WITH_POSTGRESQL) && !defined(WITH_POSTGRESQL9) ) > IGNORE= choose at least one database > .endif > >@@ -185,16 +197,21 @@ > @( ${CP} ${WRKDIR}/web.xml ${JS}/jasperserver-war/src/main/webappAdditions/WEB-INF/web.xml ) > @( cd ${WRKSRC} && ./js-ant build-ce ) > >- @${ECHO} "quartz.delegateClass=org.quartz.impl.jdbcjobstore.StdJDBCDelegate" > ${MAIL_PROPERTIES} >- @${ECHO} "quartz.tablePrefix=QRTZ_" >> ${MAIL_PROPERTIES} >- @${ECHO} "quartz.extraSettings=${JSEXTRA}" >> ${MAIL_PROPERTIES} >- @${ECHO} "report.scheduler.web.deployment.uri=http://localhost:${JSPORT}/${PORTNAME}" >> ${MAIL_PROPERTIES} >- @${ECHO} "report.scheduler.mail.sender.host=${JSMAILHOST}" >> ${MAIL_PROPERTIES} >- @${ECHO} "report.scheduler.mail.sender.username=${JSMAILUSER}" >> ${MAIL_PROPERTIES} >- @${ECHO} "report.scheduler.mail.sender.password=${JSMAILPASS}" >> ${MAIL_PROPERTIES} >- @${ECHO} "report.scheduler.mail.sender.from=${JSMAILFROM}" >> ${MAIL_PROPERTIES} >- @${ECHO} "report.scheduler.mail.sender.protocol=${JSMAILPROTO}" >> ${MAIL_PROPERTIES} >- @${ECHO} "report.scheduler.mail.sender.port=${JSMAILPORT}" >> ${MAIL_PROPERTIES} >+.if !( defined(WITH_POSTGRESQL) || (WITH_POSTGRESQL9) ) >+ @${ECHO} "quartz.delegateClass=org.quartz.impl.jdbcjobstore.StdJDBCDelegate" > ${QTZ_PROPERTIES} >+.else >+ @${ECHO} "quartz.delegateClass=org.quartz.impl.jdbcjobstore.PostgreSQLDelegate" > ${QTZ_PROPERTIES} >+.endif >+ >+ @${ECHO} "quartz.tablePrefix=QRTZ_" >> ${QTZ_PROPERTIES} >+ @${ECHO} "quartz.extraSettings=${JSEXTRA}" >> ${QTZ_PROPERTIES} >+ @${ECHO} "report.scheduler.web.deployment.uri=http://localhost:${JSPORT}/${PORTNAME}" >> ${QTZ_PROPERTIES} >+ @${ECHO} "report.scheduler.mail.sender.host=${JSMAILHOST}" >> ${QTZ_PROPERTIES} >+ @${ECHO} "report.scheduler.mail.sender.username=${JSMAILUSER}" >> ${QTZ_PROPERTIES} >+ @${ECHO} "report.scheduler.mail.sender.password=${JSMAILPASS}" >> ${QTZ_PROPERTIES} >+ @${ECHO} "report.scheduler.mail.sender.from=${JSMAILFROM}" >> ${QTZ_PROPERTIES} >+ @${ECHO} "report.scheduler.mail.sender.protocol=${JSMAILPROTO}" >> ${QTZ_PROPERTIES} >+ @${ECHO} "report.scheduler.mail.sender.port=${JSMAILPORT}" >> ${QTZ_PROPERTIES} > > post-build: > @if [ -L ~/.m2 ]; then ${RM} -f ~/.m2; fi >@@ -204,11 +221,13 @@ > @${INSTALL_DATA} ${FILESDIR}/jasperserverCreateDefaultSecurity-${DATABASE}.sql ${JSHOME} > @( cd ${SQLSRC} && ${INSTALL_DATA} ${DATABASE}/js-create.ddl ${JSHOME} ) > @( cd ${SQLSRC} && ${INSTALL_DATA} ${DATABASE}/quartz.ddl ${JSHOME} ) >- @${INSTALL} -m 440 ${MAIL_PROPERTIES} ${JSHOME}/WEB-INF/ >+ @( cd ${SQLSRC} && ${INSTALL_DATA} ${DATABASE}/upgrade-${DATABASE}-4.0.0-4.1.0-ce.sql ${JSHOME} ) >+ @${INSTALL} -m 440 ${QTZ_PROPERTIES} ${JSHOME}/WEB-INF/ > >-.if ( defined(WITH_TOMCAT6) || defined(WITH_TOMCAT5) && !defined(WITH_MYSQL) ) >+#removed shipped driver from vendor >+.if ( defined(WITH_TOMCAT6) || defined(WITH_TOMCAT5) && !defined(WITH_MYSQL) && defined(WITH_POSTGRESQL) || defined(WITH_POSTGRESQL9) ) > ${INSTALL_DATA} ${DISTDIR}/${JDBC} ${APPHOME}/${JDBCLOC} >- @${RM} ${APPHOME}/${JDBCLOC}/postgresql-8.1-407.jdbc3.jar >+ @${RM} ${APPHOME}/${JDBCLOC}/postgresql-9.0-801.jdbc3.jar > .endif > > post-install: >Index: jasperserver/distinfo >=================================================================== >RCS file: /home/jhelfman/ncvs/ports/databases/jasperserver/distinfo,v >retrieving revision 1.2 >diff -u -r1.2 distinfo >--- jasperserver/distinfo 28 Feb 2011 23:14:44 -0000 1.2 >+++ jasperserver/distinfo 21 Jul 2011 18:54:49 -0000 >@@ -1,6 +1,8 @@ >-SHA256 (jasperreports-server-cp-4.0.0-src.zip) = 2795f952b36af74efe8e90baa0d230bce51344abc706f6225661315b269d6e62 >-SIZE (jasperreports-server-cp-4.0.0-src.zip) = 151337059 >-SHA256 (jasperreports-server-cp-4.0.0-maven-repository.zip) = 535342169a6b53466b387670f6bbe8414ed7b0fa12f9734d6ad369144fca2fc5 >-SIZE (jasperreports-server-cp-4.0.0-maven-repository.zip) = 224104077 >+SHA256 (jasperreports-server-cp-4.1.0-src.zip) = b6d2c460883848ebcedc75d7fef2fa4928fd8ca12187f53523a0affae2bc6d5e >+SIZE (jasperreports-server-cp-4.1.0-src.zip) = 131993640 >+SHA256 (jasperreports-server-4.1.0-maven-repository.zip) = 8229eda108ba773b3d1f0c87ee915ba27468d784863e1ad2ea858b946345a742 >+SIZE (jasperreports-server-4.1.0-maven-repository.zip) = 226631661 >+SHA256 (postgresql-9.0-801.jdbc4.jar) = 269faefab785ba5480b66b67b94a5189209e5cb86fb6def3e0a2155332ed6f3a >+SIZE (postgresql-9.0-801.jdbc4.jar) = 539705 > SHA256 (postgresql-8.4-702.jdbc4.jar) = 614727934086a416eaa23425ac5f57df937a258e6d327e6c23e9ff87b11fa138 > SIZE (postgresql-8.4-702.jdbc4.jar) = 539510 >Index: jasperserver/pkg-install >=================================================================== >RCS file: /home/jhelfman/ncvs/ports/databases/jasperserver/pkg-install,v >retrieving revision 1.1 >diff -u -r1.1 pkg-install >--- jasperserver/pkg-install 28 Feb 2011 23:14:44 -0000 1.1 >+++ jasperserver/pkg-install 21 Jul 2011 22:06:13 -0000 >@@ -8,19 +8,12 @@ > cat << _EOF > ============== W A R N I N G I M P O R T A N T N O T E ================= > >-If UPGRADING from 3.5.0 to 4.0: >-(taken from release notes of 4.0 from vendor) >+If UPGRADING from 4.0.0 to 4.1.0: >+(taken from release notes of 4.1.0 from vendor) > >-If you are upgrading from an older JasperServer version such as 3.5 then you >-must first upgrade to JasperServer 3.7 before upgrading to 4.0. >-Upgrading directly from JasperServer 3.5 to 4.0 is not a "certified" (i.e. fully >-QA tested) procedure. >- >-The steps to carry out this operation are fully documented in the JasperReports >-Server Installation Guide for the 3.7 release. You will need to download the >-JasperServer 3.7 release package to get the relevant files and documentation. >-To download the JasperServer 3.7 WAR file distribution zip package, go to the >-JasperForge.org website and to the JasperServer project. >+To upgrade from 4.0.0 to 4.1.0, refer to the recommended >+procedure described in the Installation Guide Chapter 8 >+"Upgrade from 4.0.0 to 4.1.0" > > WWW: http://jasperforge.org/projects/jasperserver > >Index: jasperserver/pkg-plist >=================================================================== >RCS file: /home/jhelfman/ncvs/ports/databases/jasperserver/pkg-plist,v >retrieving revision 1.2 >diff -u -r1.2 pkg-plist >--- jasperserver/pkg-plist 28 Feb 2011 23:14:44 -0000 1.2 >+++ jasperserver/pkg-plist 21 Jul 2011 18:26:04 -0000 >@@ -5,6 +5,7 @@ > %%APP_VERSION%%/webapps/%%PORTNAME%%/META-INF/sugarcrmDS-jdbc.xml > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/actionModel-adhocChart.xml > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/actionModel-adhocCrosstab.xml >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/actionModel-adhocOlapCrosstab.xml > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/actionModel-adhocTable.xml > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/actionModel-dashboard.xml > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/actionModel-navigation.xml >@@ -24,15 +25,64 @@ > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/applicationContext-webapp.xml > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/applicationContext.xml > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/bundles/calendar.properties >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/bundles/calendar_de.properties >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/bundles/calendar_es.properties >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/bundles/calendar_fr.properties >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/bundles/calendar_ja.properties >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/bundles/calendar_zh_CN.properties > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/bundles/ja-pro_messages.properties >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/bundles/ja-pro_messages_de.properties >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/bundles/ja-pro_messages_es.properties >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/bundles/ja-pro_messages_fr.properties >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/bundles/ja-pro_messages_ja.properties >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/bundles/ja-pro_messages_zh_CN.properties > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/bundles/ja_mondrian_messages.properties >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/bundles/ja_mondrian_messages_de.properties >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/bundles/ja_mondrian_messages_es.properties >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/bundles/ja_mondrian_messages_fr.properties >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/bundles/ja_mondrian_messages_ja.properties >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/bundles/ja_mondrian_messages_zh_CN.properties > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/bundles/jasperserver_config.properties >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/bundles/jasperserver_config_de.properties >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/bundles/jasperserver_config_es.properties >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/bundles/jasperserver_config_fr.properties >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/bundles/jasperserver_config_ja.properties >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/bundles/jasperserver_config_zh_CN.properties > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/bundles/jasperserver_messages.properties >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/bundles/jasperserver_messages_de.properties >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/bundles/jasperserver_messages_es.properties >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/bundles/jasperserver_messages_fr.properties >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/bundles/jasperserver_messages_ja.properties >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/bundles/jasperserver_messages_zh_CN.properties > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/bundles/jpivot_messages.properties >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/bundles/jpivot_messages_de.properties >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/bundles/jpivot_messages_es.properties >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/bundles/jpivot_messages_fr.properties >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/bundles/jpivot_messages_ja.properties >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/bundles/jpivot_messages_zh_CN.properties > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/bundles/jsexceptions_messages.properties >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/bundles/jsexceptions_messages_de.properties >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/bundles/jsexceptions_messages_es.properties >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/bundles/jsexceptions_messages_fr.properties >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/bundles/jsexceptions_messages_ja.properties >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/bundles/jsexceptions_messages_zh_CN.properties > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/bundles/logger_descriptions.properties >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/bundles/logger_descriptions_de.properties >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/bundles/logger_descriptions_es.properties >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/bundles/logger_descriptions_fr.properties >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/bundles/logger_descriptions_ja.properties > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/bundles/mondrian_exception_messages.properties >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/bundles/mondrian_exception_messages_de.properties >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/bundles/mondrian_exception_messages_es.properties >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/bundles/mondrian_exception_messages_fr.properties >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/bundles/mondrian_exception_messages_ja.properties >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/bundles/mondrian_exception_messages_zh_CN.properties > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/bundles/scheduling_ws.properties >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/bundles/scheduling_ws_de.properties >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/bundles/scheduling_ws_es.properties >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/bundles/scheduling_ws_fr.properties >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/bundles/scheduling_ws_ja.properties >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/bundles/scheduling_ws_zh_CN.properties > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/classes/ehcache-hibernate.xml > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/classes/jasperreports.properties > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/classes/mondrian.properties >@@ -165,16 +215,11 @@ > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/js.spring.properties > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/ajax/ajaxerror.jsp > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/ajax/ajaxresponse.jsp >-%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/inputControls/controlNamingAndType.jsp >-%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/inputControls/listOfValues.jsp >-%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/inputControls/queryExtraData.jsp >-%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/inputControls/singleOrMultiValue.jsp >-%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/listOfValues/lovEditForm.jsp >-%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/listOfValues/lovItemsEditForm.jsp > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/CalendarInput.jsp > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/ListReports.jsp > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/about/about.jsp > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/addResource/analysisClientConnection/analysisClientConnectionDataSourceLocate.jsp >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/addResource/analysisClientConnection/analysisClientConnectionDataSourceLocateState.jsp > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/addResource/analysisClientConnection/analysisClientConnectionMondrianLocate.jsp > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/addResource/analysisClientConnection/analysisClientConnectionMondrianLocateState.jsp > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/addResource/analysisClientConnection/analysisClientConnectionXmlLocate.jsp >@@ -243,6 +288,7 @@ > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/home.jsp > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/inputControls/DefaultParametersForm.jsp > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/inputControls/InputControlLabel.jsp >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/inputControls/Label.jsp > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/listOlapViews.jsp > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/login/login.jsp > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/login/loginState.jsp >@@ -295,6 +341,8 @@ > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/sample/flow.jsp > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/sample/lists.jsp > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/sample/menus.jsp >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/sample/mocks/jrTestReport_1.jsp >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/sample/mocks/reportViewer_top.jsp > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/sample/oneColumn.jsp > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/sample/panels.jsp > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/sample/sampleIndex.jsp >@@ -309,42 +357,6 @@ > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/system/AccessDeniedPage.jsp > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/system/errorPage.jsp > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/system/systemConfirm.jsp >-%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/templates/#aboutBox.jsp >-%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/templates/#addFolder.jsp >-%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/templates/#addOrganization.jsp >-%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/templates/#addRole.jsp >-%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/templates/#addUser.jsp >-%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/templates/#calculatedField.jsp >-%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/templates/#customURL.jsp >-%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/templates/#detail.jsp >-%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/templates/#editLabel.jsp >-%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/templates/#heartbeatOptin.jsp >-%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/templates/#inputControls.jsp >-%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/templates/#loading.jsp >-%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/templates/#login.jsp >-%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/templates/#manageDataSource.jsp >-%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/templates/#nothingToDisplay.jsp >-%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/templates/#permissions.jsp >-%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/templates/#propertiesResource.jsp >-%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/templates/#saveAs.jsp >-%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/templates/#saveValues.jsp >-%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/templates/#select.jsp >-%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/templates/#selectFields.jsp >-%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/templates/#selectFile.jsp >-%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/templates/#selectFromRepository.jsp >-%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/templates/#selectPalette.jsp >-%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/templates/#sortDialog.jsp >-%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/templates/#standardConfirm.jsp >-%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/templates/#systemConfirm.jsp >-%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/templates/#uploadTheme.jsp >-%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/templates/container.jsp >-%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/templates/control_groupBox.jsp >-%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/templates/control_searchLockup.jsp >-%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/templates/control_tabSet.jsp >-%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/templates/list.jsp >-%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/templates/menu.jsp >-%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/templates/page.jsp >-%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/templates/utility_cosmetic.jsp > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/viewReport/DefaultJasperViewer.jsp > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/viewReport/DefaultJasperViewerState.jsp > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/viewReport/FusionChartsIEFix.jsp >@@ -352,6 +364,44 @@ > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/viewReport/ViewReportState.jsp > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/viewReport/reportOutput.jsp > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/webHelp/webHelp.jsp >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/templates/aboutBox.jsp >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/templates/addFolder.jsp >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/templates/addOrganization.jsp >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/templates/addRole.jsp >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/templates/addUser.jsp >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/templates/calculatedField.jsp >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/templates/container.jsp >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/templates/control_groupBox.jsp >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/templates/control_searchLockup.jsp >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/templates/control_tabSet.jsp >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/templates/customURL.jsp >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/templates/detail.jsp >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/templates/editLabel.jsp >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/templates/heartbeatOptin.jsp >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/templates/inputControls.jsp >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/templates/list.jsp >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/templates/loading.jsp >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/templates/login.jsp >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/templates/manageDataSource.jsp >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/templates/menu.jsp >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/templates/nothingToDisplay.jsp >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/templates/page.jsp >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/templates/permissions.jsp >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/templates/propertiesResource.jsp >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/templates/saveAs.jsp >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/templates/saveValues.jsp >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/templates/select.jsp >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/templates/selectFields.jsp >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/templates/selectFile.jsp >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/templates/selectFromRepository.jsp >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/templates/selectPalette.jsp >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/templates/sortDialog.jsp >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/templates/standardAlert.jsp >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/templates/standardConfirm.jsp >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/templates/systemConfirm.jsp >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/templates/uploadTheme.jsp >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/templates/userCountExceeded.jsp >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/templates/utility_cosmetic.jsp > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/FoodMart.xml > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/LICENSE.BSD.yahoo.js.txt > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/LICENSE.MIT.nwmatcher.js.txt >@@ -428,7 +478,7 @@ > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/bcprov-jdk14-1.38.jar > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/bcprov-jdk14-138.jar > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/bctsp-jdk14-1.38.jar >-%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/cas-client-core-3.1.3.jar >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/cas-client-core-3.1.5.jar > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/castor-1.2.jar > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/cglib-nodep-2.2.jar > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/commons-beanutils-1.8.0.jar >@@ -463,23 +513,23 @@ > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/jai_codec-1.1_mr.jar > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/jai_core-1.1_mr.jar > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/jakarta-regexp-1.4.jar >-%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/jasperreports-4.0.0.jar >-%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/jasperreports-chart-themes-4.0.0.jar >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/jasperreports-4.0.1.1.jar >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/jasperreports-chart-themes-4.0.1.jar > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/jasperreports-fonts-4.0.0.jar >-%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/jasperreports-ofc-4.0.0.jar >-%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/jasperserver-api-common-4.0.0.jar >-%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/jasperserver-api-common-impl-4.0.0.jar >-%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/jasperserver-api-engine-4.0.0.jar >-%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/jasperserver-api-engine-impl-4.0.0.jar >-%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/jasperserver-api-metadata-4.0.0.jar >-%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/jasperserver-api-metadata-impl-4.0.0.jar >-%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/jasperserver-common-ws-4.0.0.jar >-%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/jasperserver-core-util-4.0.0.jar >-%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/jasperserver-export-tool-4.0.0.jar >-%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/jasperserver-repository-hibernate-4.0.0.jar >-%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/jasperserver-search-4.0.0.jar >-%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/jasperserver-war-jar-4.0.0.jar >-%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/jasperserver-ws-server-4.0.0.jar >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/jasperreports-ofc-4.0.1.jar >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/jasperserver-api-common-4.1.0.jar >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/jasperserver-api-common-impl-4.1.0.jar >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/jasperserver-api-engine-4.1.0.jar >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/jasperserver-api-engine-impl-4.1.0.jar >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/jasperserver-api-metadata-4.1.0.jar >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/jasperserver-api-metadata-impl-4.1.0.jar >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/jasperserver-common-ws-4.1.0.jar >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/jasperserver-core-util-4.1.0.jar >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/jasperserver-export-tool-4.1.0.jar >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/jasperserver-repository-hibernate-4.1.0.jar >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/jasperserver-search-4.1.0.jar >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/jasperserver-war-jar-4.1.0.jar >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/jasperserver-ws-server-4.1.0.jar > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/javacup-0.10k.jar > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/javassist-3.7.ga.jar > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/jaxen-1.1-beta-8.jar >@@ -487,8 +537,8 @@ > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/jdom-1.1.jar > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/jdtcore-3.1.0.jar > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/jfreechart-1.0.12.jar >-%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/ji-jpivot-4.0.0.jar >-%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/ji-wcf-4.0.0.jar >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/ji-jpivot-4.0.1.jar >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/ji-wcf-4.0.1.jar > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/jsf-api-1.1.jar > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/json-org-1.0.jar > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/jstl-1.1.2.jar >@@ -496,11 +546,11 @@ > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/jxl-2.6.10.jar > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/log4j-1.2.12.jar > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/mail-1.4.jar >-%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/mondrian-3.2.0-13661.jar >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/mondrian-3.2.0-13661-JS.jar > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/mondrian.dtd > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/objenesis-1.2.jar > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/ognl-2.7.3.jar >-%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/olap4j-0.9.7.309.jar >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/olap4j-0.9.7.309-JS.jar > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/oro-2.0.8.jar > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/png-encoder-1.5.jar > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/quartz-1.5.1-jaspersoft.jar >@@ -515,9 +565,9 @@ > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/spring-ldap-core-1.3.0.RELEASE.jar > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/spring-ldap-core-tiger-1.3.0.RELEASE.jar > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/spring-orm-2.5.6.SEC02.jar >-%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/spring-security-cas-client-2.0.4.jar >-%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/spring-security-core-2.0.4.jar >-%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/spring-security-taglibs-2.0.4.jar >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/spring-security-cas-client-2.0.6.RELEASE.jar >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/spring-security-core-2.0.6.RELEASE.jar >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/spring-security-taglibs-2.0.6.RELEASE.jar > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/spring-web-2.5.6.SEC02.jar > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/spring-webflow-2.0.7.RELEASE.jar > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/spring-webmvc-2.5.6.SEC02.jar >@@ -534,7 +584,7 @@ > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib/xmlgraphics-commons-1.3.1.jar > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/log4j.properties > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/logs/readme.txt >-%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/mondrian.properties >+%%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/mondrian.connect.string.properties > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/olap-ehcache.xml > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/pdfFontBeans.xml > %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/queries/FoodMart.xml >@@ -908,6 +958,7 @@ > %%APP_VERSION%%/webapps/%%PORTNAME%%/themes/default/images/disclosure_indicators_sprite.png > %%APP_VERSION%%/webapps/%%PORTNAME%%/themes/default/images/first-d.gif > %%APP_VERSION%%/webapps/%%PORTNAME%%/themes/default/images/first.gif >+%%APP_VERSION%%/webapps/%%PORTNAME%%/themes/default/images/floatingMenu_sprite.png > %%APP_VERSION%%/webapps/%%PORTNAME%%/themes/default/images/frame_background_sprite.png > %%APP_VERSION%%/webapps/%%PORTNAME%%/themes/default/images/frame_bkgd_corners.png > %%APP_VERSION%%/webapps/%%PORTNAME%%/themes/default/images/frame_bkgd_edges_rl.png >@@ -980,7 +1031,54 @@ > %%APP_VERSION%%/webapps/%%PORTNAME%%/themes/default/pages.css > %%APP_VERSION%%/webapps/%%PORTNAME%%/themes/default/samples.css > %%APP_VERSION%%/webapps/%%PORTNAME%%/themes/default/theme.css >-%%APP_VERSION%%/webapps/%%PORTNAME%%/themes/default/themeSpecific.css >+%%APP_VERSION%%/webapps/%%PORTNAME%%/themes/hale/buttons.css >+%%APP_VERSION%%/webapps/%%PORTNAME%%/themes/hale/containers.css >+%%APP_VERSION%%/webapps/%%PORTNAME%%/themes/hale/controls.css >+%%APP_VERSION%%/webapps/%%PORTNAME%%/themes/hale/dialogSpecific.css >+%%APP_VERSION%%/webapps/%%PORTNAME%%/themes/hale/images/bullet_arrow.gif >+%%APP_VERSION%%/webapps/%%PORTNAME%%/themes/hale/images/clear.png >+%%APP_VERSION%%/webapps/%%PORTNAME%%/themes/hale/images/controls.png >+%%APP_VERSION%%/webapps/%%PORTNAME%%/themes/hale/images/display.png >+%%APP_VERSION%%/webapps/%%PORTNAME%%/themes/hale/images/export.png >+%%APP_VERSION%%/webapps/%%PORTNAME%%/themes/hale/images/folder.png >+%%APP_VERSION%%/webapps/%%PORTNAME%%/themes/hale/images/folder_open.png >+%%APP_VERSION%%/webapps/%%PORTNAME%%/themes/hale/images/grouper_sprite.png >+%%APP_VERSION%%/webapps/%%PORTNAME%%/themes/hale/images/home_bkgd.png >+%%APP_VERSION%%/webapps/%%PORTNAME%%/themes/hale/images/home_icons_sprite.png >+%%APP_VERSION%%/webapps/%%PORTNAME%%/themes/hale/images/input_bg.gif >+%%APP_VERSION%%/webapps/%%PORTNAME%%/themes/hale/images/js_logo_grays.png >+%%APP_VERSION%%/webapps/%%PORTNAME%%/themes/hale/images/lists_sprite.png >+%%APP_VERSION%%/webapps/%%PORTNAME%%/themes/hale/images/move_down_gray.png >+%%APP_VERSION%%/webapps/%%PORTNAME%%/themes/hale/images/move_far_down_gray.png >+%%APP_VERSION%%/webapps/%%PORTNAME%%/themes/hale/images/move_far_left_gray.png >+%%APP_VERSION%%/webapps/%%PORTNAME%%/themes/hale/images/move_far_right_gray.png >+%%APP_VERSION%%/webapps/%%PORTNAME%%/themes/hale/images/move_far_up_gray.png >+%%APP_VERSION%%/webapps/%%PORTNAME%%/themes/hale/images/move_left_gray.png >+%%APP_VERSION%%/webapps/%%PORTNAME%%/themes/hale/images/move_right_gray.png >+%%APP_VERSION%%/webapps/%%PORTNAME%%/themes/hale/images/move_up_gray.png >+%%APP_VERSION%%/webapps/%%PORTNAME%%/themes/hale/images/mutton.png >+%%APP_VERSION%%/webapps/%%PORTNAME%%/themes/hale/images/navigation_down.png >+%%APP_VERSION%%/webapps/%%PORTNAME%%/themes/hale/images/navigation_down_gray.png >+%%APP_VERSION%%/webapps/%%PORTNAME%%/themes/hale/images/navigation_right_gray.png >+%%APP_VERSION%%/webapps/%%PORTNAME%%/themes/hale/images/options.png >+%%APP_VERSION%%/webapps/%%PORTNAME%%/themes/hale/images/panel_close.png >+%%APP_VERSION%%/webapps/%%PORTNAME%%/themes/hale/images/pivot.png >+%%APP_VERSION%%/webapps/%%PORTNAME%%/themes/hale/images/redo.png >+%%APP_VERSION%%/webapps/%%PORTNAME%%/themes/hale/images/resize_vertical.png >+%%APP_VERSION%%/webapps/%%PORTNAME%%/themes/hale/images/save.png >+%%APP_VERSION%%/webapps/%%PORTNAME%%/themes/hale/images/search.png >+%%APP_VERSION%%/webapps/%%PORTNAME%%/themes/hale/images/search_sprite.png >+%%APP_VERSION%%/webapps/%%PORTNAME%%/themes/hale/images/sort.png >+%%APP_VERSION%%/webapps/%%PORTNAME%%/themes/hale/images/styles.png >+%%APP_VERSION%%/webapps/%%PORTNAME%%/themes/hale/images/tabs_horizontal_sprite.png >+%%APP_VERSION%%/webapps/%%PORTNAME%%/themes/hale/images/undo-all.png >+%%APP_VERSION%%/webapps/%%PORTNAME%%/themes/hale/images/undo.png >+%%APP_VERSION%%/webapps/%%PORTNAME%%/themes/hale/images/wait_animation_large.gif >+%%APP_VERSION%%/webapps/%%PORTNAME%%/themes/hale/lists.css >+%%APP_VERSION%%/webapps/%%PORTNAME%%/themes/hale/pageSpecific.css >+%%APP_VERSION%%/webapps/%%PORTNAME%%/themes/hale/pages.css >+%%APP_VERSION%%/webapps/%%PORTNAME%%/themes/hale/samples.css >+%%APP_VERSION%%/webapps/%%PORTNAME%%/themes/hale/theme.css > %%APP_VERSION%%/webapps/%%PORTNAME%%/themes/pods_summer/images/body_bkgnd.png > %%APP_VERSION%%/webapps/%%PORTNAME%%/themes/pods_summer/images/button_action_jumbo_sprite.png > %%APP_VERSION%%/webapps/%%PORTNAME%%/themes/pods_summer/images/button_action_primary_sprite.png >@@ -1059,6 +1157,7 @@ > %%APP_VERSION%%/webapps/%%PORTNAME%%/wcf/tree/xtree.css > %%APP_VERSION%%/webapps/%%PORTNAME%%/wcf/wcf.css > %%APP_VERSION%%/webapps/%%PORTNAME%%/jasperserverCreateDefaultSecurity-%%DATABASE%%.sql >+%%APP_VERSION%%/webapps/%%PORTNAME%%/upgrade-%%DATABASE%%-4.0.0-4.1.0-ce.sql > %%APP_VERSION%%/%%JDBCLOC%%/%%JDBC%% > @exec if [ -f %D/%%APP_VERSION%%/%%JDBCLOC%%/%%JDBC%% ]; then /bin/chmod a+r %D/%%APP_VERSION%%/%%JDBCLOC%%/%%JDBC%%; else exit 1; fi > @dirrm %%APP_VERSION%%/webapps/%%PORTNAME%%/wcf/tree >@@ -1075,6 +1174,8 @@ > @dirrm %%APP_VERSION%%/webapps/%%PORTNAME%%/wcf > @dirrm %%APP_VERSION%%/webapps/%%PORTNAME%%/themes/pods_summer/images > @dirrm %%APP_VERSION%%/webapps/%%PORTNAME%%/themes/pods_summer >+@dirrm %%APP_VERSION%%/webapps/%%PORTNAME%%/themes/hale/images >+@dirrm %%APP_VERSION%%/webapps/%%PORTNAME%%/themes/hale > @dirrm %%APP_VERSION%%/webapps/%%PORTNAME%%/themes/default/images > @dirrm %%APP_VERSION%%/webapps/%%PORTNAME%%/themes/default > @dirrm %%APP_VERSION%%/webapps/%%PORTNAME%%/themes >@@ -1090,11 +1191,12 @@ > @dirrm %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/queries > @dirrm %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/logs > @dirrm %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/lib >+@dirrm %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/templates > @dirrm %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/webHelp > @dirrm %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/viewReport >-@dirrm %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/templates > @dirrm %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/system > @dirrm %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/search >+@dirrm %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/sample/mocks > @dirrm %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/sample > @dirrm %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/reportUnitFlow > @dirrm %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/reportScheduling >@@ -1125,8 +1227,6 @@ > @dirrm %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/addResource > @dirrm %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules/about > @dirrm %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/modules >-@dirrm %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/listOfValues >-@dirrm %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/inputControls > @dirrm %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp/ajax > @dirrm %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jsp > @dirrm %%APP_VERSION%%/webapps/%%PORTNAME%%/WEB-INF/jpivot/toolbar >Index: jasperserver/files/pkg-message.in >=================================================================== >RCS file: /home/jhelfman/ncvs/ports/databases/jasperserver/files/pkg-message.in,v >retrieving revision 1.2 >diff -u -r1.2 pkg-message.in >--- jasperserver/files/pkg-message.in 28 Feb 2011 23:14:44 -0000 1.2 >+++ jasperserver/files/pkg-message.in 21 Jul 2011 20:21:13 -0000 >@@ -8,6 +8,7 @@ > > - %%JSHOME%%/js-create.ddl > - %%JSHOME%%/quartz.ddl >+- %%JSHOME%%/upgrade-%%DATABASE%%-4.0.0-4.1.0-ce.sql > and > - %%JSHOME%%/jasperserverCreateDefaultSecurity-%%DATABASE%%.sql > >@@ -28,20 +29,12 @@ > > ============== W A R N I N G I M P O R T A N T N O T E ================= > >-If UPGRADING from 3.5.0 to 4.0: >-(taken from release notes of 4.0 from vendor) >- >-If you are upgrading from an older JasperServer version such as 3.5 then you >-must first upgrade to JasperServer 3.7 before upgrading to 4.0. >-Upgrading directly from JasperServer 3.5 to 4.0 is not a "certified" (i.e. fully >-QA tested) procedure. >- >-The steps to carry out this operation are fully documented in the JasperReports >-Server Installation Guide for the 3.7 release. You will need to download the >-JasperServer 3.7 release package to get the relevant files and documentation. >-To download the JasperServer 3.7 WAR file distribution zip package, go to the >-JasperForge.org website and to the JasperServer project. >+If UPGRADING from 4.0.0 to 4.1.0: >+(taken from release notes of 4.1.0 from vendor) > >+To upgrade from 4.0.0 to 4.1.0, refer to the recommended >+procedure described in the Installation Guide Chapter 8 >+"Upgrade from 4.0.0 to 4.1.0" > ============== W A R N I N G I M P O R T A N T N O T E ================= > > WWW: http://jasperforge.org/projects/jasperserver
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 159094
: 117037