- update jasperserver to version 4.0.0

 - add support for tomcat6 and postgresql 8.4

 - add warning about updating to version 4.0 (incompatible changes)
 - set MANUAL_PACKAGE_BUILDING (~360MB sources)

PR:		ports/154946
Submitted by:	Jason Helfman <jhelfman _at_ experts-exchange.com> (maintainer)

6 files changed, 285 insertions, 5 deletions

diff --git a/databases/jasperserver/files/jasperserverCreateDefaultSecurity-mysql.sql b/databases/jasperserver/files/jasperserverCreateDefaultSecurity-mysql.sql
new file mode 100644
index 000000000000..e0270726a116
--- /dev/null
+++ b/databases/jasperserver/files/jasperserverCreateDefaultSecurity-mysql.sql
@@ -0,0 +1,38 @@
+
+INSERT INTO `JITenant` (`id`, `tenantId`, `parentId`, `tenantName`, `tenantDesc`, `tenantNote`, `tenantUri`, `tenantFolderUri`) 
+VALUES (1,'organizations',NULL,'root','organizations',' ','/','/');
+
+INSERT INTO `JIRole` (`rolename`, `tenantId`,`externallyDefined`) VALUES 
+ ('ROLE_USER',1,0),
+ ('ROLE_ADMINISTRATOR',1,0),
+ ('ROLE_ANONYMOUS',1,0),
+ ('ROLE_PORTLET',1,0);
+
+INSERT INTO `JIUser` (`username`,`tenantId`,`fullname`,`emailAddress`,`password`,`externallyDefined`,`enabled`) VALUES
+('anonymousUser',1,'Anonymous User',NULL,'CF35D2E88192D6EB',0,1);
+ 
+INSERT INTO `JIUserRole` (`userId`,`roleId`)
+select u.id, r.id from JIUser u, JIRole r where u.username = 'anonymousUser' and r.roleName = 'ROLE_ANONYMOUS';
+
+-- add jasperadmin user
+
+INSERT INTO `JIUser` (`username`,`tenantId`,`fullname`,`emailAddress`,`password`,`externallyDefined`,`enabled`) VALUES
+('jasperadmin',1,'Jasper Administrator',NULL,'349AFAADD5C5A2BD477309618DCD58B9',0,1);
+
+INSERT INTO `JIUserRole` (`userId`,`roleId`)
+select u.id, r.id from JIUser u, JIRole r where u.username = 'jasperadmin' and r.roleName = 'ROLE_ADMINISTRATOR';
+
+INSERT INTO JIUserRole (userId,roleId)
+select u.id, r.id from JIUser u, JIRole r where u.username = 'jasperadmin' and r.roleName = 'ROLE_USER';
+
+INSERT INTO `JIResourceFolder` (`id`,`version`,`uri`,`hidden`,`name`,`label`,`description`,`parent_folder`,`creation_date`) VALUES 
+(1,0,'/',0,'/','root','Root of the folder hierarchy',NULL,NOW());
+
+INSERT INTO `JIObjectPermission` (`uri`,`recipientobjectclass`,`permissionMask`,`recipientobjectid`)
+select 'repo:/','com.jaspersoft.jasperserver.api.metadata.user.domain.impl.hibernate.RepoRole', 1, r.id
+from `JIRole` r where rolename = 'ROLE_ADMINISTRATOR';
+
+INSERT INTO `JIObjectPermission` (`uri`,`recipientobjectclass`,`permissionMask`,`recipientobjectid`)
+select 'repo:/','com.jaspersoft.jasperserver.api.metadata.user.domain.impl.hibernate.RepoRole', 2, r.id
+from `JIRole` r where rolename = 'ROLE_USER';
+
diff --git a/databases/jasperserver/files/jasperserverCreateDefaultSecurity-postgresql.sql b/databases/jasperserver/files/jasperserverCreateDefaultSecurity-postgresql.sql
new file mode 100644
index 000000000000..b1088b724418
--- /dev/null
+++ b/databases/jasperserver/files/jasperserverCreateDefaultSecurity-postgresql.sql
@@ -0,0 +1,38 @@
+-- Contributed by Alex Matzinger <amatzinger@experts-exchange.com>
+
+INSERT INTO JITenant (id, tenantId, parentId, tenantName, tenantDesc, tenantNote, tenantUri, tenantFolderUri, tenantAlias) 
+VALUES (1,'organizations',NULL,'root','organizations',' ','/','/',' ');
+
+INSERT INTO JIRole (rolename, tenantId,externallyDefined) VALUES ('ROLE_USER',1,false);
+INSERT INTO JIRole (rolename, tenantId,externallyDefined) VALUES ('ROLE_ADMINISTRATOR',1,false);
+INSERT INTO JIRole (rolename, tenantId,externallyDefined) VALUES ('ROLE_ANONYMOUS',1,false);
+INSERT INTO JIRole (rolename, tenantId,externallyDefined) VALUES ('ROLE_PORTLET',1,false);
+
+INSERT INTO JIUser (username,tenantId,fullname,emailAddress,password,externallyDefined,enabled) VALUES
+('anonymousUser',1,'Anonymous User',NULL,'CF35D2E88192D6EB',false,true);
+ 
+INSERT INTO JIUserRole (userId,roleId)
+select u.id, r.id from JIUser u, JIRole r where u.username = 'anonymousUser' and r.roleName = 'ROLE_ANONYMOUS';
+
+-- add jasperadmin user
+
+INSERT INTO JIUser (username,tenantId,fullname,emailAddress,password,externallyDefined,enabled) VALUES
+('jasperadmin',1,'Jasper Administrator',NULL,'349AFAADD5C5A2BD477309618DCD58B9',false,true);
+
+INSERT INTO JIUserRole (userId,roleId)
+select u.id, r.id from JIUser u, JIRole r where u.username = 'jasperadmin' and r.roleName = 'ROLE_ADMINISTRATOR';
+
+INSERT INTO JIUserRole (userId,roleId)
+select u.id, r.id from JIUser u, JIRole r where u.username = 'jasperadmin' and r.roleName = 'ROLE_USER';
+
+INSERT INTO JIResourceFolder (id,version,uri,hidden,name,label,description,parent_folder,creation_date,update_date) VALUES 
+(1,0,'/',false,'/','root','Root of the folder hierarchy',NULL,NOW(),NOW());
+
+INSERT INTO JIObjectPermission (uri,recipientobjectclass,permissionMask,recipientobjectid)
+select 'repo:/','com.jaspersoft.jasperserver.api.metadata.user.domain.impl.hibernate.RepoRole', 1, r.id
+from JIRole r where rolename = 'ROLE_ADMINISTRATOR';
+
+INSERT INTO JIObjectPermission (uri,recipientobjectclass,permissionMask,recipientobjectid)
+select 'repo:/','com.jaspersoft.jasperserver.api.metadata.user.domain.impl.hibernate.RepoRole', 2, r.id
+from JIRole r where rolename = 'ROLE_USER';
+
diff --git a/databases/jasperserver/files/patch-jasperserver__buildomatic__conf_source__db__mysql__db.template.properties b/databases/jasperserver/files/patch-jasperserver__buildomatic__conf_source__db__mysql__db.template.properties
new file mode 100644
index 000000000000..cdba4d405bb3
--- /dev/null
+++ b/databases/jasperserver/files/patch-jasperserver__buildomatic__conf_source__db__mysql__db.template.properties
@@ -0,0 +1,11 @@
+--- ./jasperserver/buildomatic/conf_source/db/mysql/db.template.properties.orig	2011-02-18 15:03:17.000000000 -0800
++++ ./jasperserver/buildomatic/conf_source/db/mysql/db.template.properties	2011-02-18 15:04:04.000000000 -0800
+@@ -8,7 +8,7 @@
+ 
+ # jdbc url templates...assume same host, port, db type
+ admin.jdbcUrl=jdbc:mysql://${dbHost}:${dbPort}/mysql
+-js.jdbcUrl=jdbc:mysql://${dbHost}:${dbPort}/${js.dbName}?useUnicode=true&amp;characterEncoding=UTF-8&amp;autoReconnect=true&amp;autoReconnectForPools=true
++js.jdbcUrl=jdbc:mysql://${dbHost}:${dbPort}/${js.dbName}?zeroDateTimeBehavior=convertToNull&amp;useUnicode=true&amp;characterEncoding=UTF-8&amp;autoReconnect=true&amp;autoReconnectForPools=true
+ sugarcrm.jdbcUrl=jdbc:mysql://${dbHost}:${dbPort}/${sugarcrm.dbName}?useUnicode=true&amp;characterEncoding=UTF-8&amp;autoReconnect=true&amp;autoReconnectForPools=true
+ foodmart.jdbcUrl=jdbc:mysql://${dbHost}:${dbPort}/${foodmart.dbName}?useUnicode=true&amp;characterEncoding=UTF-8&amp;autoReconnect=true&amp;autoReconnectForPools=true
+ 
diff --git a/databases/jasperserver/files/patch-jasperserver__buildomatic__install_resources__sql__postgresql__js-create.ddl b/databases/jasperserver/files/patch-jasperserver__buildomatic__install_resources__sql__postgresql__js-create.ddl
new file mode 100644
index 000000000000..e6f8a4b2e023
--- /dev/null
+++ b/databases/jasperserver/files/patch-jasperserver__buildomatic__install_resources__sql__postgresql__js-create.ddl
@@ -0,0 +1,118 @@
+--- ./jasperserver/buildomatic/install_resources/sql/postgresql/js-create.ddl.orig	2011-02-21 16:48:37.000000000 -0800
++++ ./jasperserver/buildomatic/install_resources/sql/postgresql/js-create.ddl	2011-02-21 15:45:58.000000000 -0800
+@@ -1,6 +1,6 @@
+ 
+     create table JIAccessEvent (
+-        id int8 not null,
++        id bigserial not null,
+         user_id int8 not null,
+         event_date timestamp not null,
+         resource_id int8 not null,
+@@ -108,7 +108,7 @@
+     );
+ 
+     create table JILogEvent (
+-        id int8 not null,
++        id bigserial not null,
+         occurrence_date timestamp not null,
+         event_type int2 not null,
+         component varchar(100),
+@@ -136,7 +136,7 @@
+     );
+ 
+     create table JIObjectPermission (
+-        id int8 not null,
++        id bigserial not null,
+         uri varchar(250) not null,
+         recipientobjectclass varchar(250),
+         recipientobjectid int8,
+@@ -158,7 +158,7 @@
+     );
+ 
+     create table JIProfileAttribute (
+-        id int8 not null,
++        id bigserial not null,
+         attrName varchar(255) not null,
+         attrValue varchar(255) not null,
+         principalobjectclass varchar(255) not null,
+@@ -175,7 +175,7 @@
+     );
+ 
+     create table JIReportJob (
+-        id int8 not null,
++        id bigserial not null,
+         version int4 not null,
+         owner int8 not null,
+         label varchar(100) not null,
+@@ -190,7 +190,7 @@
+     );
+ 
+     create table JIReportJobCalendarTrigger (
+-        id int8 not null,
++        id bigserial not null,
+         minutes varchar(200) not null,
+         hours varchar(80) not null,
+         days_type int2 not null,
+@@ -201,7 +201,7 @@
+     );
+ 
+     create table JIReportJobMail (
+-        id int8 not null,
++        id bigserial not null,
+         version int4 not null,
+         subject varchar(100) not null,
+         message varchar(2000),
+@@ -232,7 +232,7 @@
+     );
+ 
+     create table JIReportJobRepoDest (
+-        id int8 not null,
++        id bigserial not null,
+         version int4 not null,
+         folder_uri varchar(250) not null,
+         sequential_filenames bool not null,
+@@ -251,7 +251,7 @@
+     );
+ 
+     create table JIReportJobTrigger (
+-        id int8 not null,
++        id bigserial not null,
+         version int4 not null,
+         timezone varchar(40),
+         start_type int2 not null,
+@@ -287,7 +287,7 @@
+     );
+ 
+     create table JIRepositoryCache (
+-        id int8 not null,
++        id bigserial not null,
+         uri varchar(250) not null,
+         cache_name varchar(20) not null,
+         data bytea,
+@@ -299,7 +299,7 @@
+     );
+ 
+     create table JIResource (
+-        id int8 not null,
++        id bigserial not null,
+         version int4 not null,
+         name varchar(100) not null,
+         parent_folder int8 not null,
+@@ -328,7 +328,7 @@
+     );
+ 
+     create table JIRole (
+-        id int8 not null,
++        id bigserial not null,
+         rolename varchar(100) not null,
+         tenantId int8 not null,
+         externallyDefined bool,
+@@ -352,7 +352,7 @@
+     );
+ 
+     create table JIUser (
+-        id int8 not null,
++        id bigserial not null,
+         username varchar(100) not null,
+         tenantId int8 not null,
+         fullname varchar(100) not null,
diff --git a/databases/jasperserver/files/patch-jasperserver__common__shared-config__applicationContext-themes.xml b/databases/jasperserver/files/patch-jasperserver__common__shared-config__applicationContext-themes.xml
new file mode 100644
index 000000000000..6d27fc48912e
--- /dev/null
+++ b/databases/jasperserver/files/patch-jasperserver__common__shared-config__applicationContext-themes.xml
@@ -0,0 +1,51 @@
+--- ./jasperserver/common/shared-config/applicationContext-themes.xml.orig	2011-02-18 14:52:56.000000000 -0800
++++ ./jasperserver/common/shared-config/applicationContext-themes.xml	2011-02-18 14:53:53.000000000 -0800
+@@ -14,7 +14,6 @@
+ 	     	
+ 	 -->
+ 
+-<!--
+     <bean id="themeResolver" class="org.springframework.web.servlet.theme.FixedThemeResolver">
+         <property name="defaultThemeName" value="default"/>
+     </bean>
+@@ -22,27 +21,32 @@
+     <bean id="themeSource" class="org.springframework.ui.context.support.ResourceBundleThemeSource">
+         <property name="basenamePrefix" value="themes."/>
+     </bean>
+--->
+ 
+ 	<!-- To run the themes from the repository, uncomment the three beans below and comment out the two beans above -->
+ 	
++<!--
+     <bean id="themeResolver" class="com.jaspersoft.jasperserver.war.themes.JSThemeResolver">
+         <property name="defaultThemeName">
+             <util:property-path path="configurationBean.themeDefaultName"/>
+         </property>
+         <property name="delegate" ref="jsThemeResolver"/>
+     </bean>
++-->
+ 
++<!--
+     <bean id="jsThemeResolver" class="com.jaspersoft.jasperserver.war.themes.MTThemeResolver">
+         <property name="defaultThemeName">
+             <util:property-path path="configurationBean.themeDefaultName"/>
+         </property>
+         <property name="tenantService" ref="${bean.hibernateTenantService}" />
+     </bean>
++-->
+ 
++<!--
+     <bean id="themeSource" class="com.jaspersoft.jasperserver.war.themes.RepositoryFolderThemeSourceImpl">
+         <property name="themeCache" ref="themeCache"/>
+     </bean>
++-->
+ 
+     <bean id="themeCache" class="com.jaspersoft.jasperserver.war.themes.ThemeCache">
+         <property name="repositoryService" ref="unsecureRepositoryService"/>
+@@ -84,4 +88,4 @@
+         <property name="themeSource" ref="themeSource" />
+     </bean>
+ 
+-</beans>       
+\ No newline at end of file
++</beans>       
diff --git a/databases/jasperserver/files/pkg-message.in b/databases/jasperserver/files/pkg-message.in
index 9da03cdeb49b..c99c25eb5536 100644
--- a/databases/jasperserver/files/pkg-message.in
+++ b/databases/jasperserver/files/pkg-message.in
@@ -1,17 +1,20 @@
+==============================================================================
 
-To use this software package, you need to properly configure and enable an application and
-database server. These components need to be enabled, respectively, in /etc/rc.conf.
+To use this software package, you need to properly configure and enable an
+application and database server. These components need to be enabled,
+respectively, in /etc/rc.conf.
 
 The %%DATABASE%% schema and default security credentials have been copied to:
 
-%%JSHOME%%/jasperserverCreate-%%DATABASE%%.ddl
+- %%JSHOME%%/js-create.ddl
+- %%JSHOME%%/quartz.ddl 
 and 
-%%JSHOME%%/jasperserverCreateDefaultSecurity-%%DATABASE%%.sql 
+- %%JSHOME%%/jasperserverCreateDefaultSecurity-%%DATABASE%%.sql 
 
 Take necessary precautions before loading this sql into the %%PORTNAME%% database.
 
 To create the %%PORTNAME%% database, you may choose to run the following target against
-%%PORTSDIR%%/databases/%%PORTNAME%%-%%PORTVERSION%%-src/%%PORTNAME%%/buildomatic/js-ant
+%%SRCDIR%%/%%PORTNAME%%/buildomatic/js-ant
 
 ./js-ant create-js-db (Creates the %%PORTNAME%% database)
 
@@ -20,4 +23,25 @@ If the %%PORTNAME%% database already exists, you may need to first drop the data
 
 Alternatively, you may choose to use the following method to create a suitable database:
  (mysql) mysql> create database jasperserver character set utf8;
+ (postgresql) create database jasperserver;
 
+
+==============  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.
+
+==============  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