Merge branch 'libreplan-1.2' into money-cost-monitoring-system
11
HACKING
|
|
@ -328,6 +328,13 @@ profiles defined in ``pom.xml`` of business and webapp modules).
|
|||
|
||||
This is used to generate upgrade files in releases.
|
||||
|
||||
* *i18n* - Internationalization (default)
|
||||
|
||||
It uses gettext to process language files in order to be used in *LibrePlan*.
|
||||
|
||||
Like for *reports* and *userguide*, it is useful deactivate this profile
|
||||
during development to save compilation time.
|
||||
|
||||
How to use profiles
|
||||
~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
|
|
@ -335,9 +342,9 @@ Profiles active by default are used always if not deactivated. In order to
|
|||
activate or deactivate a profile you should use parameter ``-P`` for Maven
|
||||
command. For example:
|
||||
|
||||
* Deactivate *reports* and *userguide* to save compilation time::
|
||||
* Deactivate *reports*, *userguide* and *i18n* to save compilation time::
|
||||
|
||||
mvn -P-reports,-userguide clean install
|
||||
mvn -P-reports,-userguide,-i18n clean install
|
||||
|
||||
* Use production environment::
|
||||
|
||||
|
|
|
|||
214
NEWS
|
|
@ -1,7 +1,215 @@
|
|||
NEWS
|
||||
====
|
||||
|
||||
Version 1.2.1 (19 Jan 2011)
|
||||
Version 1.2.2 (15 Mar 2012)
|
||||
---------------------------
|
||||
|
||||
Summary
|
||||
~~~~~~~
|
||||
|
||||
Minor release of LibrePlan including all the maintanance work and small
|
||||
enhancements done since 1.2.1.
|
||||
|
||||
The major developments which come with this new version are the next ones:
|
||||
|
||||
* We are going to provide for the first time RPM packages for the main
|
||||
GNU/Linux distributions based on this package format. This has been a
|
||||
contribution of Juan A. Suárez Romero.
|
||||
|
||||
* LibrePlan interface is available in two new languages thanks to our growing
|
||||
translators community:
|
||||
|
||||
* French. Thanks to Stephane Ayache, Guillaume Postaire and
|
||||
Philippe Poumaroux.
|
||||
* Dutch. Thanks to Jeroen Baten.
|
||||
|
||||
* Two new planning features have been added:
|
||||
|
||||
* The Gantt chart has been improved to include a graphic representation of the
|
||||
start date of a project through a dashed black vertical line. This is very
|
||||
useful to have always visible when a project starts.
|
||||
* If there are violated dependencies in the Gantt charts because of the higher
|
||||
precendence of the task constraints, the dependencies are painted in red.
|
||||
|
||||
* Some small user experience enhancements:
|
||||
|
||||
* The project status is displayed in the Gantt chart next to the breadcrumb.
|
||||
* States that represent a closed project (finished, canceled, stored) are
|
||||
represented in the projects planning view (home page of the application)
|
||||
with a grey color. So, from now on the code color is the next one:
|
||||
|
||||
* Light blue. For projects without any allocated task and not closed.
|
||||
* Dark blue. For project with any allocated task and not closed.
|
||||
* Grey. For closed projects.
|
||||
|
||||
* To measure progress is now a bit faster. The focus is automatically set in
|
||||
the textbox of the row just created for the new progress value.
|
||||
|
||||
* LDAP authentication system has been improved:
|
||||
|
||||
* LDAP users cannot change the password in the LibrePlan interface.
|
||||
* Managers cannot manage LDAP user roles if they are being imported from the
|
||||
configured directory.
|
||||
|
||||
Apart from this, the new versions come with fixes of many issues detected by
|
||||
our users and that can be read in the Changes section.
|
||||
|
||||
Notes
|
||||
~~~~~
|
||||
|
||||
If you are upgrading from any 1.1.x version without using the Debian package,
|
||||
you will need to manually execute on your database the SQL sentences from files:
|
||||
``scripts/database/upgrade_1.2.0.sql``, ``scripts/database/upgrade_1.2.1.sql``
|
||||
and ``scripts/database/upgrade_1.2.2.sql``.
|
||||
|
||||
If you are upgrading from 1.2.0 version without using the Debian package,
|
||||
you will need to manually execute on your database the SQL sentences from files:
|
||||
``scripts/database/upgrade_1.2.1.sql`` and
|
||||
``scripts/database/upgrade_1.2.2.sql``.
|
||||
|
||||
If you are upgrading from 1.2.1 version without using the Debian package,
|
||||
you will need to manually execute on your database the SQL sentences from file:
|
||||
``scripts/database/upgrade_1.2.2.sql``.
|
||||
|
||||
Contributors
|
||||
~~~~~~~~~~~~
|
||||
|
||||
Thanks to all the contributors to this new version:
|
||||
|
||||
* Jacobo Aragunde Pérez
|
||||
* Nacho Barrientos
|
||||
* Ignacio Díaz Teijido
|
||||
* Lucía García Fernández
|
||||
* Óscar González Fernández
|
||||
* Manuel Rego Casasnovas
|
||||
* Juan A. Suárez Romero
|
||||
* Lorenzo Tilve Álvaro
|
||||
|
||||
Translators
|
||||
~~~~~~~~~~~
|
||||
|
||||
Thanks to all the translators in this new version:
|
||||
|
||||
* [es] Manuel Rego Casasnovas
|
||||
* [fr] Stephane Ayache, Guillaume Postaire, Philippe Poumaroux
|
||||
* [gl] Manuel Rego Casasnovas
|
||||
* [it] Giuseppe Zizza
|
||||
* [nl] Jeroen Baten
|
||||
* [pt] Joaquim Rocha
|
||||
|
||||
Changes
|
||||
~~~~~~~
|
||||
|
||||
* Update RPM package for LibrePlan 1.2.2
|
||||
* Update Debian package for LibrePlan 1.2.2
|
||||
* Update database scripts for LibrePlan 1.2.2
|
||||
* Remove some unneeded lines in libreplan.spec
|
||||
* www: Add new README files for Fedora and openSUSE in libreplan.org
|
||||
* Rename database scripts to create database and user
|
||||
* Prepare libreplan spec file for the release 1.2.2.
|
||||
* Add LibrePlan RPM spec file
|
||||
* Add instructions to configure LibrePlan in openSUSE
|
||||
* Add instructions to configure LibrePlan in Fedora
|
||||
* Add Tomcat6 configuration file
|
||||
* Add scripts to create database and user libreplan
|
||||
* Add CutyCapt RPM spec file
|
||||
* Updated documentation about the new i18n profile
|
||||
* Wrap gettext plugin inside a new profile i18n to save time while developing
|
||||
* Bug #1362: Specify type of property in Templates.hbm.xml to avoid problems with MySQL
|
||||
* doc: Removed legacy project logos from documentation screenshots
|
||||
* Make bigger the description field in templates edition
|
||||
* Bug #1398: Fix problem with long descriptions in templates
|
||||
* Bug #1397: Revert a previous commit to avoid the problem
|
||||
* Bug #1393: Fix NPE moving milestone
|
||||
* Bug #1394: Fix problem because of deletedWorkReportLinesSet set was not reseted
|
||||
* Change URL to demo in REST services example scripts
|
||||
* Bug #1387: Reset the TaskSource when an OrderGroup changes to scheduling point.
|
||||
* Bug #1390: correct method TaskComponent.setClass to overwrite the classes instead of adding them.
|
||||
* doc: Update AUTHORS file info about new Dutch translator
|
||||
* i18n: Add Dutch language to enum and modify pom.xml to use English userguide
|
||||
* i18n: Add Dutch translation
|
||||
* Bug #1382: Fix the bug in all cases.
|
||||
* Bug #1382: Synchronize deadline dates between the WBS and the Gantt views.
|
||||
* Bug 1383: Fixed corner case of deadline and current day right position
|
||||
* Displayed project start vertical line with independency of project deadline
|
||||
* Added vertical line in scheduling perspective to display project start date
|
||||
* Bug #1344: Fix bug moving the addition of ConstraintViolationListeners to doAfterCompose instead of constructor.
|
||||
* Remove redundant call to scheduling algorithm from TaskPropertiesController.
|
||||
* Some API docs for the entering/reentering part
|
||||
* Remove uneeded parameters to prevent redundant invocations to scheduling algorithm.
|
||||
* Use more accurate name
|
||||
* Bug #1354: Fix bug
|
||||
* i18n: Update Portuguese translation
|
||||
* i18n: Update Italian translation
|
||||
* Update French translation
|
||||
* Bug #1355: transform AS SOON AS POSSIBLE and AS LATE AS POSSIBLE constraints to the correct constraint based on the scheduling mode.
|
||||
* Bug #1355: transform NOT EARLIER THAN and NOT LATER THAN constraints to the correct constraint based on the scheduling mode.
|
||||
* Bug #1380: Don't allow ASAP constraint for tasks in projects where init date is not set.
|
||||
* i18n: Update Spanish and Galician translations
|
||||
* i18n: Update keys.pot files
|
||||
* Bug #1374: Move capacity field to calendar tab in order to be edited together
|
||||
* i18n: Avoid to translate language names and use the original ones
|
||||
* Bug #1355: START IN FIXED DATE constraints don't change to NOT EARLIER THAN after drag & drop.
|
||||
* Bug #1281: Remove unneeded checkVersion when editing progresses
|
||||
* Bug #1375: Added a constraint for 24 hours and 0 minutes
|
||||
* Disables the button save in change password window and remove role and profile button on edit user
|
||||
* Added condition to method isLdapUser to check configuration
|
||||
* Disallow to change roles and profiles in admin panel for LDAP users when roles are imported from LDAP
|
||||
* Disallow managing passwords in admin users panel for LDAP users when LDAP is being used for authentication
|
||||
* Disallow to change passwords to LDAP users
|
||||
* Mark "Group by weeks" by default in MonteCarlo as it returns better results
|
||||
* Bug #1379: Disable "Go" button in MonteCarlo if there is no tasks in a project
|
||||
* Bug #1348: Added effort to predefined calendar exception types
|
||||
* Bug #1282, #1376: Prevent exception when deleting a milestone inside a container.
|
||||
* Correct a typo in an English string.
|
||||
* Bug #1362: Specify type of property in hbm.xml to avoid problems with MySQL
|
||||
* Bug #1343: Only closed projects in company view perspective are displayed in grey
|
||||
* Bug #1343: Made graphically less relevant component showing project state
|
||||
* Bug #1345: Added project state to name string in breadcrumbs line
|
||||
* Bug #1343: Styled in grey all closed/finished/cancelled projects in company view
|
||||
* Bug #1370: Fixed progress bars not being properly placed inside containers
|
||||
* Bug #1373: When creating new projects from template the explicitly filled start date and deadline values are used
|
||||
* Bug #1369: Moved the template combobox over autogenerated code checkbox in new project popup
|
||||
* Bug #1369: Improved behaviour of project creation popup when using templates
|
||||
* Bug #1343: Added method isRoot() to gantt tasks.
|
||||
* doc: Update translators info in documentation
|
||||
* Update AUTHORS file info about translators
|
||||
* i18n: Add French language to enum and modify pom.xml to use English userguide
|
||||
* i18n: Add French translation
|
||||
* Bug #1343: Prevent NullPointerException when creating a new milestone.
|
||||
* Remove redraw listeners for dependencies once these dependencies are removed.
|
||||
* Prevent unnecessary redraws of dependencies when opening a container.
|
||||
* Bug #1363: Remove visibility listeners corresponding to deleted tasks.
|
||||
* Bug #1343: Prevent NullPointerException when showing default filtering dates on company view.
|
||||
* Bug #1368: Allows to create users with null password when LDAP is used.
|
||||
* Removed two warnings in the build process, which can cause problems with newer versions of maven.
|
||||
* Bug #1343: Ensure that getDefaultPredicate is run in a transactional context.
|
||||
* Bug #1343: Mark closed projects with a special class in the gantt.
|
||||
* Bug #1343: Use getRawValue instead of getValue in date constraint checkers.
|
||||
* Bug #1343: Allow showing closed projects in the company view, if they are inside the filter dates.
|
||||
* Bug #1343: Show default filtering dates on company view.
|
||||
* Bug #1343: Rewrite part of the code for company view initialization.
|
||||
* Bug #1353: Create Tabpanels object for load/earned value Tabbox when the screen is loaded, not in the open event.
|
||||
* Bug #1359: Initialize the resources when the page is loaded, independently from the hidden/shown property of the load chart.
|
||||
* Bug #1357: Use end date minus one day as default date for earned value chart.
|
||||
* Bug #1351: Replaced by a label the disabled listbox to display material unit type
|
||||
* Bug #1351: fixed space for elements
|
||||
* Bug #1330: Setted focus on new progress measurement after pressing on *Add measure*
|
||||
* Bug #1357: Check if the date is out of the visualization area, and in that case set a new date before updating the legend.
|
||||
* Bug #1357: Small code rewrite to simplify the fix of the bug
|
||||
* Update TODO file with roadmap to LibrePlan 1.3
|
||||
* Bug #1366: Fix issue subtracting the value when you are removing work report lines
|
||||
* Bug #1360: Refresh work report line from database before subtracting it from order elements
|
||||
* Bug #1364: Milestones are filtered now like any other task
|
||||
* Bug #1362: Fix problem with long descriptions in projects
|
||||
* Bug #1352: Fix issue not saving tasks without order element
|
||||
* Bug #1320: When asking a container for start constraints, return the leftmost of children's start-in-fixed-date constraints.
|
||||
* Revert "[Bug #1273] Reimplement coerceToString as a workaround for the bug in Decimalbox."
|
||||
* Upgrade ZK version to 5.0.10
|
||||
* doc: Update information in UPDATE file
|
||||
|
||||
|
||||
Version 1.2.1 (19 Jan 2012)
|
||||
---------------------------
|
||||
|
||||
Summary
|
||||
|
|
@ -2756,8 +2964,8 @@ Changes
|
|||
* [Bug #] Fix division by zero in Gantt
|
||||
|
||||
|
||||
Version 1.0.5 (8 Apr 2011)
|
||||
--------------------------
|
||||
Version 1.0.5 (08 Apr 2011)
|
||||
---------------------------
|
||||
|
||||
Last bugfixing version of NavalPlan for 1.0.x cycle, like in previous releases
|
||||
it includes all the fixes done in the stable branch since 1.0.4. Among them we
|
||||
|
|
|
|||
110
README.Fedora
Normal file
|
|
@ -0,0 +1,110 @@
|
|||
Configuring LibrePlan in Fedora for first time
|
||||
==============================================
|
||||
|
||||
This section explains how to set up LibrePlan in Fedora after installing the
|
||||
package.
|
||||
|
||||
It assumes that PostgreSQL is already running and configured to use ``md5`` as
|
||||
the authentication method.
|
||||
|
||||
If this is not the case, go to section "Configuring PostgreSQL to use ``md5``
|
||||
authentication method", at the end of this document.
|
||||
|
||||
|
||||
1) Create libreplan database
|
||||
----------------------------
|
||||
|
||||
# psql -h localhost -U postgres < /usr/share/libreplan/pgsql/create_db.sql
|
||||
|
||||
|
||||
2) Create libreplan user
|
||||
------------------------
|
||||
|
||||
# psql -h localhost -U postgres < /usr/share/libreplan/pgsql/create_user_postgresql.sql
|
||||
|
||||
|
||||
3) Install LibrePlan database
|
||||
-----------------------------
|
||||
|
||||
# psql -h localhost -U libreplan -W libreplan < /usr/share/libreplan/pgsql/install.sql
|
||||
|
||||
|
||||
4) Link LibrePlan configuration file in Tomcat6 configuration directory
|
||||
-----------------------------------------------------------------------
|
||||
|
||||
# ln -s /usr/share/libreplan/conf/libreplan.xml /etc/tomcat6/Catalina/localhost/
|
||||
|
||||
|
||||
5) Link Java JDBC driver for PostgreSQL in Tomcat6 libraries directory
|
||||
----------------------------------------------------------------------
|
||||
|
||||
# ln -s /usr/share/java/postgresql-jdbc3.jar /usr/share/tomcat6/lib/
|
||||
|
||||
|
||||
6) Link LibrePlan WAR file in Tomcat6 we applications directory
|
||||
---------------------------------------------------------------
|
||||
|
||||
# ln -s /usr/share/libreplan/webapps/libreplan.war /var/lib/tomcat6/webapps/
|
||||
|
||||
|
||||
7) Restart Tomcat6
|
||||
------------------
|
||||
|
||||
# service tomcat6 restart
|
||||
|
||||
|
||||
LibrePlan should be running at http://localhost:8080/libreplan
|
||||
|
||||
|
||||
|
||||
Upgrading LibrePlan a.b.c to LibrePlan x.y.z
|
||||
============================================
|
||||
|
||||
This section explains how to upgrade LibrePlan from version a.b.c to version x.y.z.
|
||||
|
||||
|
||||
1) Run upgrade scripts
|
||||
----------------------
|
||||
|
||||
# psql -h localhost -U libreplan -W libreplan < /usr/share/libreplan/pgsql/upgrade_x.y.z.sql
|
||||
|
||||
*VERY IMPORTANT*: If there are other versions between a.b.c and x.y.z, we need to execute those scripts in order, so the upgrade is done correctly.
|
||||
|
||||
|
||||
2) Restart Tomcat6
|
||||
------------------
|
||||
|
||||
# service tomcat6 restart
|
||||
|
||||
|
||||
LibrePlan should be running at http://localhost:8080/libreplan
|
||||
|
||||
|
||||
|
||||
Configuring PostgreSQL to use ``md5`` authentication method
|
||||
===========================================================
|
||||
|
||||
We assume that PostgreSQL is using ``md5`` as the authentication method, instead of default ``ident``.
|
||||
|
||||
These are the steps to change it.
|
||||
|
||||
|
||||
1) Add a password to 'postgres' user (for instance, let's use 'postgres' as password')
|
||||
--------------------------------------------------------------------------------------
|
||||
|
||||
# su postgres -c psql
|
||||
|
||||
postgres=# ALTER USER postgres WITH PASSWORD 'postgres';
|
||||
postgres=# \q
|
||||
|
||||
|
||||
2) Edit '/var/lib/pgsql/data/pg_hba.conf' and replace ``ident`` by ``md5``
|
||||
--------------------------------------------------------------------------
|
||||
|
||||
# sed -i "/^host/s/ident/md5/g" /var/lib/pgsql/data/pg_hba.conf
|
||||
|
||||
|
||||
3) Restart PostgreSQL
|
||||
---------------------
|
||||
|
||||
# service postgresql restart
|
||||
116
README.openSUSE
Normal file
|
|
@ -0,0 +1,116 @@
|
|||
Configuring LibrePlan in openSUSE for first time
|
||||
================================================
|
||||
|
||||
This section explains how to set up LibrePlan in openSUSE after installing the
|
||||
package.
|
||||
|
||||
It assumes that PostgreSQL is already running and configured to use ``md5`` as
|
||||
the authentication method.
|
||||
|
||||
If this is not the case, go to section "Configuring PostgreSQL to use ``md5``
|
||||
authentication method", at the end of this document.
|
||||
|
||||
|
||||
1) Create libreplan database
|
||||
----------------------------
|
||||
|
||||
# psql -h localhost -U postgres < /usr/share/libreplan/pgsql/create_db.sql
|
||||
|
||||
|
||||
2) Create libreplan user
|
||||
------------------------
|
||||
|
||||
# psql -h localhost -U postgres < /usr/share/libreplan/pgsql/create_user_postgresql.sql
|
||||
|
||||
|
||||
3) Install LibrePlan database
|
||||
-----------------------------
|
||||
|
||||
# psql -h localhost -U libreplan -W libreplan < /usr/share/libreplan/pgsql/install.sql
|
||||
|
||||
|
||||
4) Link LibrePlan configuration file in Tomcat6 configuration directory
|
||||
-----------------------------------------------------------------------
|
||||
|
||||
# ln -s /usr/share/libreplan/conf/libreplan.xml /etc/tomcat6/Catalina/localhost/
|
||||
|
||||
|
||||
5) Download Java JDBC driver for PostgreSQL
|
||||
-------------------------------------------
|
||||
|
||||
# wget http://jdbc.postgresql.org/download/postgresql-9.0-801.jdbc3.jar -O /usr/share/java/postgresql-jdbc3.jar
|
||||
|
||||
|
||||
6) Link Java JDBC driver for PostgreSQL in Tomcat6 libraries directory
|
||||
----------------------------------------------------------------------
|
||||
|
||||
# ln -s /usr/share/java/postgresql-jdbc3.jar /usr/share/tomcat6/lib/
|
||||
|
||||
|
||||
7) Link LibrePlan WAR file in Tomcat6 we applications directory
|
||||
---------------------------------------------------------------
|
||||
|
||||
# ln -s /usr/share/libreplan/webapps/libreplan.war /usr/share/tomcat6/webapps/
|
||||
|
||||
|
||||
8) Restart Tomcat6
|
||||
------------------
|
||||
|
||||
# service tomcat6 restart
|
||||
|
||||
|
||||
LibrePlan should be running at http://localhost:8080/libreplan
|
||||
|
||||
|
||||
|
||||
Upgrading LibrePlan a.b.c to LibrePlan x.y.z
|
||||
============================================
|
||||
|
||||
This section explains how to upgrade LibrePlan from version a.b.c to version x.y.z.
|
||||
|
||||
|
||||
1) Run upgrade scripts
|
||||
----------------------
|
||||
|
||||
# psql -h localhost -U libreplan -W libreplan < /usr/share/libreplan/pgsql/upgrade_x.y.z.sql
|
||||
|
||||
*VERY IMPORTANT*: If there are other versions between a.b.c and x.y.z, we need to execute those scripts in order, so the upgrade is done correctly.
|
||||
|
||||
|
||||
2) Restart Tomcat6
|
||||
------------------
|
||||
|
||||
# service tomcat6 restart
|
||||
|
||||
|
||||
LibrePlan should be running at http://localhost:8080/libreplan
|
||||
|
||||
|
||||
|
||||
Configuring PostgreSQL to use ``md5`` authentication method
|
||||
===========================================================
|
||||
|
||||
We assume that PostgreSQL is using ``md5`` as the authentication method, instead of default ``ident``.
|
||||
|
||||
These are the steps to change it.
|
||||
|
||||
|
||||
1) Add a password to 'postgres' user (for instance, let's use 'postgres' as password')
|
||||
--------------------------------------------------------------------------------------
|
||||
|
||||
# su postgres -c psql
|
||||
|
||||
postgres=# ALTER USER postgres WITH PASSWORD 'postgres';
|
||||
postgres=# \q
|
||||
|
||||
|
||||
2) Edit '/var/lib/pgsql/data/pg_hba.conf' and replace ``ident`` by ``md5``
|
||||
--------------------------------------------------------------------------
|
||||
|
||||
# sed -i "/^host/s/ident/md5/g" /var/lib/pgsql/data/pg_hba.conf
|
||||
|
||||
|
||||
3) Restart PostgreSQL
|
||||
---------------------
|
||||
|
||||
# service postgresql restart
|
||||
2
VERSION
|
|
@ -1 +1 @@
|
|||
1.2.1
|
||||
1.2.2
|
||||
|
|
|
|||
10
conf/libreplan.xml
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<Context antiJARLocking="true" path="">
|
||||
<Resource name="jdbc/libreplan-ds" auth="Container"
|
||||
type="javax.sql.DataSource"
|
||||
maxActive="100" maxIdle="30" maxWait="10000"
|
||||
username="libreplan" password="libreplan"
|
||||
driverClassName="org.postgresql.Driver"
|
||||
url="jdbc:postgresql://localhost/libreplan" />
|
||||
</Context>
|
||||
56
contrib/cutycapt/cutycapt.spec
Normal file
|
|
@ -0,0 +1,56 @@
|
|||
Name: cutycapt
|
||||
Version: 20110107
|
||||
Release: 2
|
||||
Summary: Captures web pages to files in different formats
|
||||
License: GPLv2+
|
||||
URL: http://cutycapt.sourceforge.net/
|
||||
Source0: http://cutycapt.svn.sourceforge.net/viewvc/cutycapt/CutyCapt.tar.gz
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
||||
|
||||
BuildRequires: qt-devel
|
||||
%if 0%{?suse_version}
|
||||
BuildRequires: libQtWebKit-devel
|
||||
%else
|
||||
%if 0%{?fedora} == 15
|
||||
BuildRequires: qt-webkit-devel
|
||||
%else
|
||||
BuildRequires: qtwebkit-devel
|
||||
%endif
|
||||
%endif
|
||||
BuildRequires: gcc-c++
|
||||
|
||||
%description
|
||||
CutyCapt is a small cross-platform command-line utility to capture
|
||||
WebKit's rendering of a web page into a variety of vector and bitmap
|
||||
formats, including SVG, PDF, PS, PNG, JPEG, TIFF, GIF, and BMP. See
|
||||
IECapt for a similar tool based on Internet Explorer.
|
||||
|
||||
%prep
|
||||
%setup -q -n CutyCapt
|
||||
|
||||
%build
|
||||
%if 0%{?suse_version}
|
||||
qmake
|
||||
%else
|
||||
qmake-qt4
|
||||
%endif
|
||||
make
|
||||
|
||||
%install
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
mkdir -p $RPM_BUILD_ROOT
|
||||
install -m 755 -d $RPM_BUILD_ROOT/usr/bin
|
||||
install -m 755 CutyCapt $RPM_BUILD_ROOT/usr/bin/cutycapt
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%{_bindir}/cutycapt
|
||||
|
||||
|
||||
%changelog
|
||||
* Fri Feb 17 2012 Juan A. Suarez Romero <jasuarez@gladiator> - 20110107-1
|
||||
- Initial build.
|
||||
6
debian/changelog
vendored
|
|
@ -1,3 +1,9 @@
|
|||
libreplan (1.2.2-1) squeeze; urgency=low
|
||||
|
||||
* Released LibrePlan 1.2.2
|
||||
|
||||
-- Manuel Rego Casasnovas <rego@igalia.com> Thu, 15 Mar 2012 10:23:00 +0100
|
||||
|
||||
libreplan (1.2.1-1) squeeze; urgency=low
|
||||
|
||||
* Released LibrePlan 1.2.1
|
||||
|
|
|
|||
1
debian/libreplan.install
vendored
|
|
@ -5,3 +5,4 @@ debian/tmp/usr/share/dbconfig-common/data/libreplan/upgrade/pgsql/1.0.0
|
|||
debian/tmp/usr/share/dbconfig-common/data/libreplan/upgrade/pgsql/1.1.0
|
||||
debian/tmp/usr/share/dbconfig-common/data/libreplan/upgrade/pgsql/1.2.0
|
||||
debian/tmp/usr/share/dbconfig-common/data/libreplan/upgrade/pgsql/1.2.1
|
||||
debian/tmp/usr/share/dbconfig-common/data/libreplan/upgrade/pgsql/1.2.2
|
||||
|
|
|
|||
3
debian/rules
vendored
|
|
@ -87,6 +87,9 @@ install:
|
|||
# Copy SQL upgrade script for version 1.2.1
|
||||
$(call CMD,cp $(CURDIR)/scripts/database/upgrade_1.2.1.sql \
|
||||
$(CURDIR)/debian/tmp/usr/share/dbconfig-common/data/libreplan/upgrade/pgsql/1.2.1)
|
||||
# Copy SQL upgrade script for version 1.2.2
|
||||
$(call CMD,cp $(CURDIR)/scripts/database/upgrade_1.2.2.sql \
|
||||
$(CURDIR)/debian/tmp/usr/share/dbconfig-common/data/libreplan/upgrade/pgsql/1.2.2)
|
||||
# Install Policy file
|
||||
$(call CMD,mkdir -p $(CURDIR)/debian/tmp/etc/tomcat6/policy.d)
|
||||
$(call CMD,cp $(CURDIR)/debian/51libreplan.policy \
|
||||
|
|
|
|||
|
|
@ -137,9 +137,9 @@ Configure project to run
|
|||
* Name: LibrePlan
|
||||
* Base directory: Choose ``libreplan-webapp`` folder in your workspace
|
||||
* Goals: ``jetty:stop jetty:run``
|
||||
* Profiles (optional): ``-userguide,-reports`` (to disable userguide and
|
||||
reports profiles to save compilation time as they are not mandatory to run
|
||||
LibrePlan)
|
||||
* Profiles (optional): ``-userguide,-reports,-i18n`` (to disable userguide,
|
||||
reports and i18n profiles to save compilation time as they are not
|
||||
mandatory to run LibrePlan)
|
||||
* Mark the following checkboxes (recommended):
|
||||
|
||||
* Resolve Workspace artifacts
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ As can be seen in the program's main screen (shot given previously) and the comp
|
|||
.. figure:: images/order_list.png
|
||||
:scale: 50
|
||||
|
||||
Order list
|
||||
Work Breakdown Structure
|
||||
|
||||
|
||||
The view management commented on previously for the company overview is very similar to the management planned for a single project. A project can be accessed in several ways:
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 96 KiB After Width: | Height: | Size: 136 KiB |
|
Before Width: | Height: | Size: 87 KiB After Width: | Height: | Size: 22 KiB |
|
Before Width: | Height: | Size: 74 KiB After Width: | Height: | Size: 13 KiB |
|
Before Width: | Height: | Size: 133 KiB After Width: | Height: | Size: 71 KiB |
|
Before Width: | Height: | Size: 95 KiB After Width: | Height: | Size: 26 KiB |
|
Before Width: | Height: | Size: 76 KiB After Width: | Height: | Size: 13 KiB |
|
Before Width: | Height: | Size: 61 KiB After Width: | Height: | Size: 19 KiB |
|
Before Width: | Height: | Size: 75 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 90 KiB After Width: | Height: | Size: 24 KiB |
|
Before Width: | Height: | Size: 112 KiB After Width: | Height: | Size: 44 KiB |
|
Before Width: | Height: | Size: 130 KiB After Width: | Height: | Size: 33 KiB |
|
Before Width: | Height: | Size: 123 KiB After Width: | Height: | Size: 29 KiB |
|
Before Width: | Height: | Size: 106 KiB After Width: | Height: | Size: 16 KiB |
|
Before Width: | Height: | Size: 135 KiB After Width: | Height: | Size: 31 KiB |
|
Before Width: | Height: | Size: 114 KiB After Width: | Height: | Size: 23 KiB |
|
Before Width: | Height: | Size: 164 KiB After Width: | Height: | Size: 103 KiB |
|
Before Width: | Height: | Size: 149 KiB After Width: | Height: | Size: 81 KiB |
|
Before Width: | Height: | Size: 99 KiB After Width: | Height: | Size: 29 KiB |
|
Before Width: | Height: | Size: 124 KiB After Width: | Height: | Size: 45 KiB |
|
Before Width: | Height: | Size: 129 KiB After Width: | Height: | Size: 82 KiB |
|
Before Width: | Height: | Size: 114 KiB After Width: | Height: | Size: 82 KiB |
|
Before Width: | Height: | Size: 48 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 56 KiB After Width: | Height: | Size: 17 KiB |
|
|
@ -42,7 +42,7 @@ Como se muestra en la anterior la captura de la pantalla principal de la aplicac
|
|||
.. figure:: images/order_list.png
|
||||
:scale: 50
|
||||
|
||||
Listado de pedidos
|
||||
Estructura de Descomposición de Trabajo
|
||||
|
||||
|
||||
La gestión de perspectivas que se comentó para la vista global de empresa es muy similar a la planteada para un solo proyecto. El acceso a un proyecto se puede realizar de varias formas:
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 96 KiB After Width: | Height: | Size: 136 KiB |
|
Before Width: | Height: | Size: 87 KiB After Width: | Height: | Size: 22 KiB |
|
Before Width: | Height: | Size: 74 KiB After Width: | Height: | Size: 13 KiB |
|
Before Width: | Height: | Size: 133 KiB After Width: | Height: | Size: 71 KiB |
|
Before Width: | Height: | Size: 95 KiB After Width: | Height: | Size: 26 KiB |
|
Before Width: | Height: | Size: 76 KiB After Width: | Height: | Size: 13 KiB |
|
Before Width: | Height: | Size: 61 KiB After Width: | Height: | Size: 19 KiB |
|
Before Width: | Height: | Size: 75 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 90 KiB After Width: | Height: | Size: 24 KiB |
|
Before Width: | Height: | Size: 112 KiB After Width: | Height: | Size: 44 KiB |
|
Before Width: | Height: | Size: 130 KiB After Width: | Height: | Size: 33 KiB |
|
Before Width: | Height: | Size: 123 KiB After Width: | Height: | Size: 29 KiB |
|
Before Width: | Height: | Size: 106 KiB After Width: | Height: | Size: 16 KiB |
|
Before Width: | Height: | Size: 135 KiB After Width: | Height: | Size: 31 KiB |
|
Before Width: | Height: | Size: 114 KiB After Width: | Height: | Size: 23 KiB |
|
Before Width: | Height: | Size: 164 KiB After Width: | Height: | Size: 103 KiB |
|
Before Width: | Height: | Size: 149 KiB After Width: | Height: | Size: 81 KiB |
|
Before Width: | Height: | Size: 99 KiB After Width: | Height: | Size: 29 KiB |
|
Before Width: | Height: | Size: 124 KiB After Width: | Height: | Size: 45 KiB |
|
Before Width: | Height: | Size: 129 KiB After Width: | Height: | Size: 82 KiB |
|
Before Width: | Height: | Size: 114 KiB After Width: | Height: | Size: 82 KiB |
|
Before Width: | Height: | Size: 48 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 56 KiB After Width: | Height: | Size: 17 KiB |
|
|
@ -41,7 +41,7 @@ Tal e como se visualiza na anterior captura, a principal pantalla da aplicación
|
|||
.. figure:: images/order_list.png
|
||||
:scale: 50
|
||||
|
||||
Listado de pedidos
|
||||
Estructura de Descomposición de Traballo
|
||||
|
||||
A xestión de perspectivas que se comentou para a vista global de empresa é moi similar á prantexada para un só proxecto. O acceso a un proxecto pódese realizar de varias formas:
|
||||
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 96 KiB After Width: | Height: | Size: 136 KiB |
|
Before Width: | Height: | Size: 87 KiB After Width: | Height: | Size: 22 KiB |
|
Before Width: | Height: | Size: 74 KiB After Width: | Height: | Size: 13 KiB |
|
Before Width: | Height: | Size: 133 KiB After Width: | Height: | Size: 71 KiB |
|
Before Width: | Height: | Size: 95 KiB After Width: | Height: | Size: 26 KiB |
|
Before Width: | Height: | Size: 76 KiB After Width: | Height: | Size: 13 KiB |
|
Before Width: | Height: | Size: 61 KiB After Width: | Height: | Size: 19 KiB |
|
Before Width: | Height: | Size: 75 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 90 KiB After Width: | Height: | Size: 24 KiB |
|
Before Width: | Height: | Size: 112 KiB After Width: | Height: | Size: 44 KiB |
|
Before Width: | Height: | Size: 130 KiB After Width: | Height: | Size: 33 KiB |
|
Before Width: | Height: | Size: 123 KiB After Width: | Height: | Size: 29 KiB |
|
Before Width: | Height: | Size: 106 KiB After Width: | Height: | Size: 16 KiB |
|
Before Width: | Height: | Size: 135 KiB After Width: | Height: | Size: 31 KiB |
|
Before Width: | Height: | Size: 114 KiB After Width: | Height: | Size: 23 KiB |
|
Before Width: | Height: | Size: 164 KiB After Width: | Height: | Size: 103 KiB |
|
Before Width: | Height: | Size: 149 KiB After Width: | Height: | Size: 81 KiB |
|
Before Width: | Height: | Size: 99 KiB After Width: | Height: | Size: 29 KiB |
|
Before Width: | Height: | Size: 124 KiB After Width: | Height: | Size: 45 KiB |
|
Before Width: | Height: | Size: 129 KiB After Width: | Height: | Size: 82 KiB |
|
Before Width: | Height: | Size: 114 KiB After Width: | Height: | Size: 82 KiB |
|
Before Width: | Height: | Size: 48 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 56 KiB After Width: | Height: | Size: 17 KiB |
|
|
@ -6,47 +6,58 @@
|
|||
<parent>
|
||||
<groupId>org.libreplan</groupId>
|
||||
<artifactId>libreplan</artifactId>
|
||||
<version>1.2.1</version>
|
||||
<version>1.2.2</version>
|
||||
</parent>
|
||||
<artifactId>ganttzk</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
<name>LibrePlan ZK Components Module</name>
|
||||
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.xnap.commons</groupId>
|
||||
<artifactId>maven-gettext-plugin</artifactId>
|
||||
<configuration>
|
||||
<targetBundle>app.i18n.Messages</targetBundle>
|
||||
<poDirectory>${project.build.sourceDirectory}/../resources/i18n</poDirectory>
|
||||
<keywords>-k_</keywords>
|
||||
</configuration>
|
||||
<executions>
|
||||
<execution>
|
||||
<phase>compile</phase>
|
||||
<goals>
|
||||
<goal>dist</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-source-plugin</artifactId>
|
||||
<version>2.1.2</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>default</id>
|
||||
<phase>package</phase>
|
||||
<goals>
|
||||
<goal>jar-no-fork</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
<profiles>
|
||||
<profile>
|
||||
<id>i18n</id>
|
||||
<activation>
|
||||
<activeByDefault>true</activeByDefault>
|
||||
</activation>
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.xnap.commons</groupId>
|
||||
<artifactId>maven-gettext-plugin</artifactId>
|
||||
<configuration>
|
||||
<targetBundle>app.i18n.Messages</targetBundle>
|
||||
<poDirectory>${project.build.sourceDirectory}/../resources/i18n</poDirectory>
|
||||
<keywords>-k_</keywords>
|
||||
</configuration>
|
||||
<executions>
|
||||
<execution>
|
||||
<phase>compile</phase>
|
||||
<goals>
|
||||
<goal>dist</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-source-plugin</artifactId>
|
||||
<version>2.1.2</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>default</id>
|
||||
<phase>package</phase>
|
||||
<goals>
|
||||
<goal>jar-no-fork</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
|
||||
</plugin>
|
||||
</plugins>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</profile>
|
||||
</profiles>
|
||||
|
||||
<build>
|
||||
<pluginManagement>
|
||||
<plugins>
|
||||
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>org.libreplan</groupId>
|
||||
<artifactId>libreplan</artifactId>
|
||||
<version>1.2.1</version>
|
||||
<version>1.2.2</version>
|
||||
</parent>
|
||||
<artifactId>libreplan-business</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -85,21 +85,14 @@ public class GenericDAOHibernate<E extends BaseEntity,
|
|||
return entityClass;
|
||||
}
|
||||
|
||||
public void save(E entity) throws ValidationException {
|
||||
save(entity, Mode.AUTOMATIC_FLUSH);
|
||||
}
|
||||
|
||||
/**
|
||||
* It's necessary to save and validate later.
|
||||
*
|
||||
* Validate may retrieve the entity from DB and put it into the Session, which can eventually lead to
|
||||
* a NonUniqueObject exception. Save works here to reattach the object as well as saving.
|
||||
*/
|
||||
public void save(E entity, Mode mode) throws ValidationException {
|
||||
public void save(E entity) throws ValidationException {
|
||||
getSession().saveOrUpdate(entity);
|
||||
if (mode == Mode.FLUSH_BEFORE_VALIDATION) {
|
||||
getSession().flush();
|
||||
}
|
||||
entity.validate();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -42,19 +42,7 @@ public interface IGenericDAO <E, PK extends Serializable>{
|
|||
|
||||
public Class<E> getEntityClass();
|
||||
|
||||
public enum Mode {
|
||||
FLUSH_BEFORE_VALIDATION, AUTOMATIC_FLUSH;
|
||||
}
|
||||
|
||||
/**
|
||||
* It saves with automatic flush
|
||||
*
|
||||
* @see #save(Object, Mode)
|
||||
*/
|
||||
public void save(E entity) throws ValidationException;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* It inserts the object passed as a parameter in the ORM session, planning
|
||||
* it for updating (even though it is not modified before or after the call
|
||||
* to this method) or insertion, depending if it is was detached or
|
||||
|
|
@ -63,15 +51,11 @@ public interface IGenericDAO <E, PK extends Serializable>{
|
|||
* executed (if the entity has version control enabled) with the possible
|
||||
* <code>org.springframework.dao.OptimisticLockingFailureException</code>
|
||||
* being thrown.
|
||||
* </p>
|
||||
* <p>
|
||||
*
|
||||
* </p>
|
||||
*
|
||||
* @throws ValidationException
|
||||
* if the entity has some invalid values
|
||||
*/
|
||||
public void save(E entity, Mode mode) throws ValidationException;
|
||||
public void save(E entity) throws ValidationException;
|
||||
|
||||
/**
|
||||
* Unlike <code>save</code>, it does not execute validations.
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ public abstract class AssignmentFunction extends BaseEntity {
|
|||
FLAT(_("Flat")),
|
||||
MANUAL(_("Manual")),
|
||||
STRETCHES(_("Stretches")),
|
||||
INTERPOLATION(_("Interporlation")),
|
||||
INTERPOLATION(_("Interpolation")),
|
||||
SIGMOID(_("Sigmoid"));
|
||||
|
||||
private String name;
|
||||
|
|
|
|||
|
|
@ -63,6 +63,11 @@
|
|||
<modifyDataType tableName="order_element" columnName="description" newDataType="TEXT" />
|
||||
</changeSet>
|
||||
|
||||
<changeSet id="change-column-description-in-order_element_template-to-text" author="mrego">
|
||||
<comment>Change column description in order_element_template to TEXT</comment>
|
||||
<modifyDataType tableName="order_element_template" columnName="description" newDataType="TEXT" />
|
||||
</changeSet>
|
||||
|
||||
<changeSet id="add-budget-column-to-order_line" author="mrego">
|
||||
<comment>add budget column to order_line</comment>
|
||||
<addColumn tableName="order_line">
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
<version name="version" access="property" type="long" />
|
||||
<component name="infoComponent" class="org.libreplan.business.orders.entities.InfoComponent">
|
||||
<property name="name" access="field" />
|
||||
<property name="description" access="field" />
|
||||
<property name="description" access="field" type="text" />
|
||||
<property name="code" access="field"/>
|
||||
</component>
|
||||
<property name="startAsDaysFromBeginning"
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<parent>
|
||||
<groupId>org.libreplan</groupId>
|
||||
<artifactId>libreplan</artifactId>
|
||||
<version>1.2.1</version>
|
||||
<version>1.2.2</version>
|
||||
</parent>
|
||||
<artifactId>libreplan-webapp</artifactId>
|
||||
<packaging>war</packaging>
|
||||
|
|
@ -162,36 +162,44 @@
|
|||
</plugins>
|
||||
</build>
|
||||
</profile>
|
||||
<profile>
|
||||
<id>i18n</id>
|
||||
<activation>
|
||||
<activeByDefault>true</activeByDefault>
|
||||
</activation>
|
||||
<build>
|
||||
<!--
|
||||
Gettext Commons plugin
|
||||
goals:
|
||||
merge: parses source code and generates keys.pot
|
||||
dist: generates binary Resoruce Bundle (Messages_XX.class)
|
||||
-->
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.xnap.commons</groupId>
|
||||
<artifactId>maven-gettext-plugin</artifactId>
|
||||
<configuration>
|
||||
<targetBundle>i18n.Messages</targetBundle>
|
||||
<poDirectory>${project.build.sourceDirectory}/../resources/i18n</poDirectory>
|
||||
<keywords>-k_</keywords>
|
||||
</configuration>
|
||||
<executions>
|
||||
<execution>
|
||||
<phase>compile</phase>
|
||||
<goals>
|
||||
<goal>dist</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</profile>
|
||||
</profiles>
|
||||
|
||||
<build>
|
||||
<finalName>libreplan-webapp</finalName>
|
||||
|
||||
<!--
|
||||
Gettext Commons plugin
|
||||
goals:
|
||||
merge: parses source code and generates keys.pot
|
||||
dist: generates binary Resoruce Bundle (Messages_XX.class)
|
||||
-->
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.xnap.commons</groupId>
|
||||
<artifactId>maven-gettext-plugin</artifactId>
|
||||
<configuration>
|
||||
<targetBundle>i18n.Messages</targetBundle>
|
||||
<poDirectory>${project.build.sourceDirectory}/../resources/i18n</poDirectory>
|
||||
<keywords>-k_</keywords>
|
||||
</configuration>
|
||||
<executions>
|
||||
<execution>
|
||||
<phase>compile</phase>
|
||||
<goals>
|
||||
<goal>dist</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
<pluginManagement>
|
||||
<plugins>
|
||||
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
|
||||
|
|
|
|||
|
|
@ -35,7 +35,6 @@ import org.libreplan.business.calendars.daos.IBaseCalendarDAO;
|
|||
import org.libreplan.business.calendars.entities.BaseCalendar;
|
||||
import org.libreplan.business.common.daos.IConfigurationDAO;
|
||||
import org.libreplan.business.common.daos.IEntitySequenceDAO;
|
||||
import org.libreplan.business.common.daos.IGenericDAO.Mode;
|
||||
import org.libreplan.business.common.entities.Configuration;
|
||||
import org.libreplan.business.common.entities.EntityNameEnum;
|
||||
import org.libreplan.business.common.entities.EntitySequence;
|
||||
|
|
@ -49,6 +48,7 @@ import org.libreplan.web.common.concurrentdetection.OnConcurrentModification;
|
|||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.beans.factory.config.BeanDefinition;
|
||||
import org.springframework.context.annotation.Scope;
|
||||
import org.springframework.dao.OptimisticLockingFailureException;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
|
|
@ -149,8 +149,13 @@ public class ConfigurationModel implements IConfigurationModel {
|
|||
@Transactional
|
||||
public void confirm() {
|
||||
checkEntitySequences();
|
||||
configurationDAO.save(configuration, Mode.FLUSH_BEFORE_VALIDATION);
|
||||
storeAndRemoveEntitySequences();
|
||||
configurationDAO.save(configuration);
|
||||
try {
|
||||
storeAndRemoveEntitySequences();
|
||||
} catch (IllegalStateException e) {
|
||||
throw new OptimisticLockingFailureException(
|
||||
"concurrency problem in entity sequences");
|
||||
}
|
||||
}
|
||||
|
||||
private void checkEntitySequences() {
|
||||
|
|
|
|||
|
|
@ -99,7 +99,7 @@
|
|||
</row>
|
||||
<row>
|
||||
<label value="${i18n:_('Description')}" />
|
||||
<textbox width="500px"
|
||||
<textbox rows="3" width="600px"
|
||||
value="@{templatesForOrdersController.template.description}" />
|
||||
</row>
|
||||
<row>
|
||||
|
|
|
|||
121
libreplan.spec
Normal file
|
|
@ -0,0 +1,121 @@
|
|||
Name: libreplan
|
||||
Version: 1.2.2
|
||||
Release: 1
|
||||
Summary: Web application for project planning, monitoring and control
|
||||
License: AGPLv3
|
||||
|
||||
Source0: http://downloads.sourceforge.net/project/libreplan/LibrePlan/%{name}_%{version}.tar.gz
|
||||
Source1: http://downloads.sourceforge.net/project/libreplan/LibrePlan/%{name}_%{version}.war
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
BuildArch: noarch
|
||||
|
||||
#BuildRequires: java-1.6.0-openjdk
|
||||
#BuildRequires: maven2
|
||||
#BuildRequires: maven2-common-poms
|
||||
#BuildRequires: python-docutils
|
||||
#BuildRequires: javamail
|
||||
#BuildRequires: javacc
|
||||
#BuildRequires: ant
|
||||
#BuildRequires: jpackage-utils
|
||||
#BuildRequires: postgresql-server
|
||||
|
||||
%if 0%{?fedora}
|
||||
Requires: postgresql-jdbc
|
||||
%endif
|
||||
Requires: java-1.6.0-openjdk
|
||||
Requires: postgresql
|
||||
Requires: postgresql-server
|
||||
Requires: tomcat6
|
||||
Requires: cutycapt
|
||||
%if 0%{?suse_version}
|
||||
Requires: freefont
|
||||
%else
|
||||
Requires: gnu-free-fonts-compat
|
||||
%endif
|
||||
|
||||
%if 0%{?suse_version}
|
||||
%define distro openSUSE
|
||||
%else
|
||||
%define distro Fedora
|
||||
%endif
|
||||
|
||||
%description
|
||||
LibrePlan is a collaborative tool to plan, monitor and control projects and has
|
||||
a rich web interface which provides a desktop alike user experience. All the
|
||||
team members can take part in the planning and this makes possible to have a
|
||||
real-time planning.
|
||||
|
||||
It was designed thinking on a scenario where multiple projects and resources
|
||||
interact to carry out the work inside a company. Besides, it makes possible
|
||||
the communication with other company tools providing a wide set of web
|
||||
services to import and export data.
|
||||
|
||||
See README.%{distro} for more information.
|
||||
|
||||
%prep
|
||||
#export CURDIR=${RPM_BUILD_DIR}/%{name}
|
||||
%setup -q -n %{name}
|
||||
|
||||
%build
|
||||
#export CURDIR=${RPM_BUILD_DIR}/%{name}
|
||||
#mkdir -p ${CURDIR}/debian/maven-repo
|
||||
#mvn2 -e -Pprod,postgresql,-liquibase-update -DdataSource.jndiName=java:comp/env/jdbc/libreplan-ds -Dmaven.test.skip=true -B -s ${CURDIR}/debian/maven-settings.xml install
|
||||
|
||||
%install
|
||||
export CURDIR=${RPM_BUILD_DIR}/%{name}
|
||||
rm -fr ${RPM_BUILD_ROOT}
|
||||
|
||||
# Commands to install arch-dependant stuff
|
||||
mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}/webapps/
|
||||
#cp ${CURDIR}/libreplan-webapp/target/libreplan-webapp.war ${RPM_BUILD_ROOT}%{_datadir}/%{name}/webapps/libreplan.war
|
||||
install -Dm0644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_datadir}/%{name}/webapps/libreplan.war
|
||||
|
||||
# Copy SQL installation files
|
||||
mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}/pgsql/
|
||||
cp ${CURDIR}/scripts/database/create_db.sql ${RPM_BUILD_ROOT}%{_datadir}/%{name}/pgsql/
|
||||
cp ${CURDIR}/scripts/database/create_user_postgresql.sql ${RPM_BUILD_ROOT}%{_datadir}/%{name}/pgsql/
|
||||
cp ${CURDIR}/scripts/database/install.sql ${RPM_BUILD_ROOT}%{_datadir}/%{name}/pgsql/
|
||||
|
||||
# Copy SQL upgrade script for version 1.0.0
|
||||
cp ${CURDIR}/scripts/database/upgrade_1.0.0.sql ${RPM_BUILD_ROOT}%{_datadir}/%{name}/pgsql/
|
||||
|
||||
# Copy SQL upgrade script for version 1.1.0
|
||||
cp ${CURDIR}/scripts/database/upgrade_1.1.0.sql ${RPM_BUILD_ROOT}%{_datadir}/%{name}/pgsql/
|
||||
|
||||
# Copy SQL upgrade script for version 1.2.0
|
||||
cp ${CURDIR}/scripts/database/upgrade_1.2.0.sql ${RPM_BUILD_ROOT}%{_datadir}/%{name}/pgsql/
|
||||
|
||||
# Copy SQL upgrade script for version 1.2.1
|
||||
cp ${CURDIR}/scripts/database/upgrade_1.2.1.sql ${RPM_BUILD_ROOT}%{_datadir}/%{name}/pgsql/
|
||||
|
||||
# Copy SQL upgrade script for version 1.2.2
|
||||
cp ${CURDIR}/scripts/database/upgrade_1.2.2.sql ${RPM_BUILD_ROOT}%{_datadir}/%{name}/pgsql/
|
||||
|
||||
# Install Policy file
|
||||
#mkdir -p ${RPM_BUILD_ROOT}/etc/tomcat6/policy.d
|
||||
#cp ${CURDIR}/debian/51libreplan.policy ${RPM_BUILD_ROOT}/etc/tomcat6/policy.d/
|
||||
|
||||
# Install Tomcat6 configuration file
|
||||
mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}/conf
|
||||
cp ${CURDIR}/conf/libreplan.xml ${RPM_BUILD_ROOT}%{_datadir}/%{name}/conf/
|
||||
|
||||
%clean
|
||||
rm -rf ${RPM_BUILD_ROOT}
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%doc AUTHORS COPYING NEWS README README.%{distro} TODO INSTALL HACKING
|
||||
%dir %{_datadir}/%{name}
|
||||
%dir %{_datadir}/%{name}/webapps
|
||||
%dir %{_datadir}/%{name}/pgsql
|
||||
%dir %{_datadir}/%{name}/conf
|
||||
%{_datadir}/%{name}/webapps/*
|
||||
%{_datadir}/%{name}/pgsql/*
|
||||
%{_datadir}/%{name}/conf/*
|
||||
|
||||
%changelog
|
||||
* Thu Mar 15 2012 Manuel Rego Casasnovas <rego@igalia.com> - 1.2.2-1
|
||||
- Released LibrePlan 1.2.2
|
||||
* Fri Feb 17 2012 Juan A. Suarez Romero <jasuarez@igalia.com> - 1.2.1-1
|
||||
- Released LibrePlan 1.2.1
|
||||
2
pom.xml
|
|
@ -5,7 +5,7 @@
|
|||
<groupId>org.libreplan</groupId>
|
||||
<artifactId>libreplan</artifactId>
|
||||
<packaging>pom</packaging>
|
||||
<version>1.2.1</version>
|
||||
<version>1.2.2</version>
|
||||
<name>LibrePlan</name>
|
||||
|
||||
<!--
|
||||
|
|
|
|||
1
scripts/database/create_db.sql
Normal file
|
|
@ -0,0 +1 @@
|
|||
CREATE DATABASE libreplan;
|
||||
2
scripts/database/create_user_postgresql.sql
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
CREATE USER libreplan WITH PASSWORD 'libreplan';
|
||||
GRANT ALL PRIVILEGES ON DATABASE libreplan TO libreplan;
|
||||
|
|
@ -2197,3 +2197,29 @@ INSERT INTO databasechangelog (AUTHOR, COMMENTS, DATEEXECUTED, DESCRIPTION, EXEC
|
|||
|
||||
-- Release Database Lock
|
||||
-- Release Database Lock
|
||||
|
||||
|
||||
-- *********************************************************************
|
||||
-- Update Database Script - LibrePlan 1.2.2
|
||||
-- *********************************************************************
|
||||
-- Change Log: src/main/resources/db.changelog.xml
|
||||
-- Ran at: 3/15/12 10:18 AM
|
||||
-- Against: libreplan@jdbc:postgresql://localhost/libreplandev
|
||||
-- Liquibase version: 2.0-rc7
|
||||
-- *********************************************************************
|
||||
|
||||
-- Lock Database
|
||||
-- Changeset src/main/resources/db.changelog-1.2.xml::change-column-description-in-order_element-to-text::mrego::(Checksum: 3:f2241d994f460dca4300c84c9e8f76a0)
|
||||
-- Change column description in order_element to TEXT
|
||||
ALTER TABLE order_element ALTER COLUMN description TYPE TEXT;
|
||||
|
||||
INSERT INTO databasechangelog (AUTHOR, COMMENTS, DATEEXECUTED, DESCRIPTION, EXECTYPE, FILENAME, ID, LIQUIBASE, MD5SUM, ORDEREXECUTED) VALUES ('mrego', 'Change column description in order_element to TEXT', NOW(), 'Modify data type', 'EXECUTED', 'src/main/resources/db.changelog-1.2.xml', 'change-column-description-in-order_element-to-text', '2.0-rc7', '3:f2241d994f460dca4300c84c9e8f76a0', 381);
|
||||
|
||||
-- Changeset src/main/resources/db.changelog-1.2.xml::change-column-description-in-order_element_template-to-text::mrego::(Checksum: 3:cb7234813755a9eceb39dc4601011375)
|
||||
-- Change column description in order_element_template to TEXT
|
||||
ALTER TABLE order_element_template ALTER COLUMN description TYPE TEXT;
|
||||
|
||||
INSERT INTO databasechangelog (AUTHOR, COMMENTS, DATEEXECUTED, DESCRIPTION, EXECTYPE, FILENAME, ID, LIQUIBASE, MD5SUM, ORDEREXECUTED) VALUES ('mrego', 'Change column description in order_element_template to TEXT', NOW(), 'Modify data type', 'EXECUTED', 'src/main/resources/db.changelog-1.2.xml', 'change-column-description-in-order_element_template-to-text', '2.0-rc7', '3:cb7234813755a9eceb39dc4601011375', 382);
|
||||
|
||||
-- Release Database Lock
|
||||
-- Release Database Lock
|
||||
|
|
|
|||
24
scripts/database/upgrade_1.2.2.sql
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
-- *********************************************************************
|
||||
-- Update Database Script - LibrePlan 1.2.2
|
||||
-- *********************************************************************
|
||||
-- Change Log: src/main/resources/db.changelog.xml
|
||||
-- Ran at: 3/15/12 10:18 AM
|
||||
-- Against: libreplan@jdbc:postgresql://localhost/libreplandev
|
||||
-- Liquibase version: 2.0-rc7
|
||||
-- *********************************************************************
|
||||
|
||||
-- Lock Database
|
||||
-- Changeset src/main/resources/db.changelog-1.2.xml::change-column-description-in-order_element-to-text::mrego::(Checksum: 3:f2241d994f460dca4300c84c9e8f76a0)
|
||||
-- Change column description in order_element to TEXT
|
||||
ALTER TABLE order_element ALTER COLUMN description TYPE TEXT;
|
||||
|
||||
INSERT INTO databasechangelog (AUTHOR, COMMENTS, DATEEXECUTED, DESCRIPTION, EXECTYPE, FILENAME, ID, LIQUIBASE, MD5SUM, ORDEREXECUTED) VALUES ('mrego', 'Change column description in order_element to TEXT', NOW(), 'Modify data type', 'EXECUTED', 'src/main/resources/db.changelog-1.2.xml', 'change-column-description-in-order_element-to-text', '2.0-rc7', '3:f2241d994f460dca4300c84c9e8f76a0', 381);
|
||||
|
||||
-- Changeset src/main/resources/db.changelog-1.2.xml::change-column-description-in-order_element_template-to-text::mrego::(Checksum: 3:cb7234813755a9eceb39dc4601011375)
|
||||
-- Change column description in order_element_template to TEXT
|
||||
ALTER TABLE order_element_template ALTER COLUMN description TYPE TEXT;
|
||||
|
||||
INSERT INTO databasechangelog (AUTHOR, COMMENTS, DATEEXECUTED, DESCRIPTION, EXECTYPE, FILENAME, ID, LIQUIBASE, MD5SUM, ORDEREXECUTED) VALUES ('mrego', 'Change column description in order_element_template to TEXT', NOW(), 'Modify data type', 'EXECUTED', 'src/main/resources/db.changelog-1.2.xml', 'change-column-description-in-order_element_template-to-text', '2.0-rc7', '3:cb7234813755a9eceb39dc4601011375', 382);
|
||||
|
||||
-- Release Database Lock
|
||||
-- Release Database Lock
|
||||
1
www/README.Fedora
Symbolic link
|
|
@ -0,0 +1 @@
|
|||
../README.Fedora
|
||||