RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #68 from dgray16/master

Browse source 
Update javax.servlet
This commit is contained in:
Jeroen Baten 2016-04-27 13:55:05 +02:00
commit f0cee093ee
5 changed files with 43 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ganttzk/pom.xml
View file

@ -6,7 +6,7 @@
<parent> <parent>
<groupId>org.libreplan</groupId> <groupId>org.libreplan</groupId>
<artifactId>libreplan</artifactId> <artifactId>libreplan</artifactId>
<version>1.4.1</version> <version>1.6.0</version>
</parent> </parent>
<artifactId>ganttzk</artifactId> <artifactId>ganttzk</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
@ -95,6 +95,7 @@
<groupId>org.xnap.commons</groupId> <groupId>org.xnap.commons</groupId>
<artifactId>gettext-commons</artifactId> <artifactId>gettext-commons</artifactId>
</dependency> </dependency>
<!-- Commons Math--> <!-- Commons Math-->
<dependency> <dependency>
<groupId>commons-math</groupId> <groupId>commons-math</groupId>
@ -104,6 +105,7 @@
<groupId>joda-time</groupId> <groupId>joda-time</groupId>
<artifactId>joda-time</artifactId> <artifactId>joda-time</artifactId>
</dependency> </dependency>
<!-- Commons Logging --> <!-- Commons Logging -->
<dependency> <dependency>
<groupId>commons-logging</groupId> <groupId>commons-logging</groupId>
@ -131,16 +133,19 @@
<groupId>org.zkoss.zk</groupId> <groupId>org.zkoss.zk</groupId>
<artifactId>zk</artifactId> <artifactId>zk</artifactId>
</dependency> </dependency>
<!-- JGraphT --> <!-- JGraphT -->
<dependency> <dependency>
<groupId>org.jgrapht</groupId> <groupId>org.jgrapht</groupId>
<artifactId>jgrapht-jdk1.5</artifactId> <artifactId>jgrapht-jdk1.5</artifactId>
</dependency> </dependency>
<!-- Junit --> <!-- Junit -->
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
</dependency> </dependency>
<!-- Easy mock --> <!-- Easy mock -->
<dependency> <dependency>
<groupId>org.easymock</groupId> <groupId>org.easymock</groupId>
@ -162,7 +167,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId> <artifactId>javax.servlet-api</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>

2
libreplan-business/pom.xml
View file

@ -5,7 +5,7 @@
<parent> <parent>
<groupId>org.libreplan</groupId> <groupId>org.libreplan</groupId>
<artifactId>libreplan</artifactId> <artifactId>libreplan</artifactId>
<version>1.4.1</version> <version>1.6.0</version>
</parent> </parent>
<artifactId>libreplan-business</artifactId> <artifactId>libreplan-business</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>

7
libreplan-webapp/pom.xml
View file

@ -1,10 +1,11 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.libreplan</groupId> <groupId>org.libreplan</groupId>
<artifactId>libreplan</artifactId> <artifactId>libreplan</artifactId>
<version>1.4.1</version> <version>1.6.0</version>
</parent> </parent>
<artifactId>libreplan-webapp</artifactId> <artifactId>libreplan-webapp</artifactId>
<packaging>war</packaging> <packaging>war</packaging>
@ -440,7 +441,7 @@
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId> <artifactId>javax.servlet-api</artifactId>
</dependency> </dependency>
<!-- Java mail --> <!-- Java mail -->

43
libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateController.java
View file

@ -82,8 +82,7 @@ public class TemplateController extends GenericForwardComposer {
return scenarioManager.getCurrent(); return scenarioManager.getCurrent();
} }
public void changeScenario() throws SuspendNotAllowedException, public void changeScenario() throws SuspendNotAllowedException, InterruptedException {
InterruptedException {
window.doModal(); window.doModal();
} }
@ -91,6 +90,7 @@ public class TemplateController extends GenericForwardComposer {
if ( templateModel == null ) { if ( templateModel == null ) {
return Collections.emptyList(); return Collections.emptyList();
} }
return templateModel.getScenarios(); return templateModel.getScenarios();
} }
@ -98,17 +98,15 @@ public class TemplateController extends GenericForwardComposer {
if ( templateModel == null || templateModel.getCompanyLogoURL() == null ) { if ( templateModel == null || templateModel.getCompanyLogoURL() == null ) {
return ""; return "";
} }
return templateModel.getCompanyLogoURL().trim(); return templateModel.getCompanyLogoURL().trim();
} }
public void accept() { public void accept() {
BandboxSearch scenarioBandboxSearch = (BandboxSearch) window BandboxSearch scenarioBandboxSearch = (BandboxSearch) window.getFellow("scenarioBandboxSearch");
.getFellow("scenarioBandboxSearch"); Scenario scenario = (Scenario) scenarioBandboxSearch.getSelectedElement();
Scenario scenario = (Scenario) scenarioBandboxSearch
.getSelectedElement();
templateModel.setScenario(SecurityUtils.getSessionUserLoginName(), templateModel.setScenario(SecurityUtils.getSessionUserLoginName(), scenario, new IOnFinished() {
scenario, new IOnFinished() {
@Override @Override
public void onWithoutErrorFinish() { public void onWithoutErrorFinish() {
window.setVisible(false); window.setVisible(false);
@ -117,11 +115,8 @@ public class TemplateController extends GenericForwardComposer {
@Override @Override
public void errorHappened(Exception exceptionHappened) { public void errorHappened(Exception exceptionHappened) {
LOG.error("error doing reassignation", LOG.error("error doing reassignation", exceptionHappened);
exceptionHappened); windowMessages.showMessage(Level.ERROR, _("error doing reassignment: {0}", exceptionHappened));
windowMessages.showMessage(Level.ERROR, _(
"error doing reassignment: {0}",
exceptionHappened));
} }
}); });
} }
@ -166,10 +161,8 @@ public class TemplateController extends GenericForwardComposer {
return notChangedPasswordWarningDisplayPropertyFor(PredefinedUsers.REPORTS); return notChangedPasswordWarningDisplayPropertyFor(PredefinedUsers.REPORTS);
} }
private String notChangedPasswordWarningDisplayPropertyFor( private String notChangedPasswordWarningDisplayPropertyFor(PredefinedUsers mandatoryUser) {
PredefinedUsers mandatoryUser) { return asDisplayProperty(templateModel.hasChangedDefaultPassword(mandatoryUser));
return asDisplayProperty(templateModel
.hasChangedDefaultPassword(mandatoryUser));
} }
@ -178,8 +171,7 @@ public class TemplateController extends GenericForwardComposer {
} }
public String getDefaultPasswdVisible() { public String getDefaultPasswdVisible() {
return asDisplayProperty(!templateModel return asDisplayProperty(!templateModel.adminPasswordChangedAndSomeOtherNotChanged());
.adminPasswordChangedAndSomeOtherNotChanged());
} }
public String getIdAdminUser() { public String getIdAdminUser() {
@ -195,8 +187,7 @@ public class TemplateController extends GenericForwardComposer {
} }
public String getIdWssubcontractingUser() { public String getIdWssubcontractingUser() {
return templateModel.getIdUser(PredefinedUsers.WSSUBCONTRACTING return templateModel.getIdUser(PredefinedUsers.WSSUBCONTRACTING.getLoginName());
.getLoginName());
} }
public String getIdManagerUser() { public String getIdManagerUser() {
@ -208,8 +199,7 @@ public class TemplateController extends GenericForwardComposer {
} }
public String getIdOutsourcingUser() { public String getIdOutsourcingUser() {
return templateModel return templateModel.getIdUser(PredefinedUsers.OUTSOURCING.getLoginName());
.getIdUser(PredefinedUsers.OUTSOURCING.getLoginName());
} }
public String getIdReportsUser() { public String getIdReportsUser() {
@ -222,6 +212,7 @@ public class TemplateController extends GenericForwardComposer {
public boolean isNewVersionAvailable() { public boolean isNewVersionAvailable() {
if ( templateModel.isCheckNewVersionEnabled() ) { if ( templateModel.isCheckNewVersionEnabled() ) {
if ( VersionInformation.isNewVersionAvailable() ){ if ( VersionInformation.isNewVersionAvailable() ){
lastVersionNumber = VersionInformation.getLastVersion(); lastVersionNumber = VersionInformation.getLastVersion();
return true; return true;
@ -233,10 +224,8 @@ public class TemplateController extends GenericForwardComposer {
public String getUsername() { public String getUsername() {
CustomUser user = SecurityUtils.getLoggedUser(); CustomUser user = SecurityUtils.getLoggedUser();
if (user == null) {
return ""; return (user == null) ? "" : user.getUsername();
}
return user.getUsername();
} }
public String getVersionMessage(){ public String getVersionMessage(){

6
pom.xml
View file

@ -5,7 +5,7 @@
<groupId>org.libreplan</groupId> <groupId>org.libreplan</groupId>
<artifactId>libreplan</artifactId> <artifactId>libreplan</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>1.4.1</version> <version>1.6.0</version>
<name>LibrePlan</name> <name>LibrePlan</name>
<!-- <!--
@ -504,8 +504,8 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId> <artifactId>javax.servlet-api</artifactId>
<version>2.5</version> <version>3.1.0</version>
<type>jar</type> <type>jar</type>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>