diff --git a/build-appjar.xml b/build-appjar.xml index 9f301ee..a41b658 100644 --- a/build-appjar.xml +++ b/build-appjar.xml @@ -83,7 +83,7 @@ - + @@ -111,7 +111,7 @@ - + diff --git a/log4j.properties b/log4j.properties index 0d928db..4bcea9e 100644 --- a/log4j.properties +++ b/log4j.properties @@ -3,7 +3,7 @@ # priority setting: DEBUG < INFO < WARN < ERROR log4j.rootLogger = DEBUG, console -log4j.logger.org.april.agirstatool = INFO +log4j.logger.fr.devinsy.agirstatool = INFO log4j.logger.fr.devinsy.xidyn = WARN #-- diff --git a/resources/conf/agirstatool-sample.conf b/resources/conf/agirstatool-sample.conf index eedb6bc..cb5563d 100644 --- a/resources/conf/agirstatool-sample.conf +++ b/resources/conf/agirstatool-sample.conf @@ -6,7 +6,7 @@ database.url=jdbc:mysql://localhost/ database.name=agir2020 database.login=admin -database.password=suko7Gun +database.password=xxxxxxx targetDirectory=/home/cpm/Projets/AgirStatool/TestZone/www diff --git a/resources/conf/log4j-default.properties b/resources/conf/log4j-default.properties index e2e4733..84b8bdb 100644 --- a/resources/conf/log4j-default.properties +++ b/resources/conf/log4j-default.properties @@ -3,7 +3,7 @@ # priority setting: DEBUG < INFO < WARN < ERROR log4j.rootLogger = INFO, stdout, LogWriter -log4j.logger.org.april.agirstatool = INFO +log4j.logger.fr.devinsy.agirstatool = INFO log4j.logger.fr.devinsy.xidyn = INFO #-- diff --git a/src/org/april/agirstatool/AgirStatoolLauncher.java b/src/fr/devinsy/agirstatool/AgirStatoolLauncher.java similarity index 95% rename from src/org/april/agirstatool/AgirStatoolLauncher.java rename to src/fr/devinsy/agirstatool/AgirStatoolLauncher.java index fd2e238..0d3fb91 100644 --- a/src/org/april/agirstatool/AgirStatoolLauncher.java +++ b/src/fr/devinsy/agirstatool/AgirStatoolLauncher.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU Affero General Public License * along with AgirStatool. If not, see . */ -package org.april.agirstatool; +package fr.devinsy.agirstatool; import java.io.File; @@ -24,10 +24,11 @@ import org.apache.log4j.BasicConfigurator; import org.apache.log4j.ConsoleAppender; import org.apache.log4j.EnhancedPatternLayout; import org.apache.log4j.PropertyConfigurator; -import org.april.agirstatool.cli.AgirStatoolCLI; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import fr.devinsy.agirstatool.cli.AgirStatoolCLI; + /** * The Class JugaLauncher. */ diff --git a/src/org/april/agirstatool/charts/DateCount.java b/src/fr/devinsy/agirstatool/charts/DateCount.java similarity index 97% rename from src/org/april/agirstatool/charts/DateCount.java rename to src/fr/devinsy/agirstatool/charts/DateCount.java index 429584a..fdac2d6 100644 --- a/src/org/april/agirstatool/charts/DateCount.java +++ b/src/fr/devinsy/agirstatool/charts/DateCount.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU Affero General Public License * along with AgirStatool. If not, see . */ -package org.april.agirstatool.charts; +package fr.devinsy.agirstatool.charts; import org.apache.commons.lang3.StringUtils; diff --git a/src/org/april/agirstatool/charts/DateCountList.java b/src/fr/devinsy/agirstatool/charts/DateCountList.java similarity index 98% rename from src/org/april/agirstatool/charts/DateCountList.java rename to src/fr/devinsy/agirstatool/charts/DateCountList.java index ee52fd5..be255d6 100644 --- a/src/org/april/agirstatool/charts/DateCountList.java +++ b/src/fr/devinsy/agirstatool/charts/DateCountList.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU Affero General Public License * along with AgirStatool. If not, see . */ -package org.april.agirstatool.charts; +package fr.devinsy.agirstatool.charts; import java.util.ArrayList; diff --git a/src/org/april/agirstatool/charts/DateCountMap.java b/src/fr/devinsy/agirstatool/charts/DateCountMap.java similarity index 96% rename from src/org/april/agirstatool/charts/DateCountMap.java rename to src/fr/devinsy/agirstatool/charts/DateCountMap.java index fbae265..21c6ac2 100644 --- a/src/org/april/agirstatool/charts/DateCountMap.java +++ b/src/fr/devinsy/agirstatool/charts/DateCountMap.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU Affero General Public License * along with AgirStatool. If not, see . */ -package org.april.agirstatool.charts; +package fr.devinsy.agirstatool.charts; import java.util.HashMap; diff --git a/src/org/april/agirstatool/cli/AgirStatoolCLI.java b/src/fr/devinsy/agirstatool/cli/AgirStatoolCLI.java similarity index 98% rename from src/org/april/agirstatool/cli/AgirStatoolCLI.java rename to src/fr/devinsy/agirstatool/cli/AgirStatoolCLI.java index 64db60a..9c19ec4 100644 --- a/src/org/april/agirstatool/cli/AgirStatoolCLI.java +++ b/src/fr/devinsy/agirstatool/cli/AgirStatoolCLI.java @@ -16,18 +16,18 @@ * You should have received a copy of the GNU Affero General Public License * along with AgirStatool. If not, see . */ -package org.april.agirstatool.cli; +package fr.devinsy.agirstatool.cli; import java.io.File; import java.sql.Connection; import java.time.LocalDateTime; import org.apache.log4j.PropertyConfigurator; -import org.april.agirstatool.core.AgirStatool; -import org.april.agirstatool.core.AgirStatoolException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import fr.devinsy.agirstatool.core.AgirStatool; +import fr.devinsy.agirstatool.core.AgirStatoolException; import fr.devinsy.strings.StringList; import utils.BuildInformation; diff --git a/src/org/april/agirstatool/cli/AgirStatoolCLIException.java b/src/fr/devinsy/agirstatool/cli/AgirStatoolCLIException.java similarity index 94% rename from src/org/april/agirstatool/cli/AgirStatoolCLIException.java rename to src/fr/devinsy/agirstatool/cli/AgirStatoolCLIException.java index 7be303d..105a6fa 100644 --- a/src/org/april/agirstatool/cli/AgirStatoolCLIException.java +++ b/src/fr/devinsy/agirstatool/cli/AgirStatoolCLIException.java @@ -16,9 +16,9 @@ * You should have received a copy of the GNU Affero General Public License * along with AgirStatool. If not, see . */ -package org.april.agirstatool.cli; +package fr.devinsy.agirstatool.cli; -import org.april.agirstatool.core.AgirStatoolException; +import fr.devinsy.agirstatool.core.AgirStatoolException; /** * The Class JugaCLIException. diff --git a/src/org/april/agirstatool/cli/AgirStatoolConfigFile.java b/src/fr/devinsy/agirstatool/cli/AgirStatoolConfigFile.java similarity index 97% rename from src/org/april/agirstatool/cli/AgirStatoolConfigFile.java rename to src/fr/devinsy/agirstatool/cli/AgirStatoolConfigFile.java index 264447a..87038b8 100644 --- a/src/org/april/agirstatool/cli/AgirStatoolConfigFile.java +++ b/src/fr/devinsy/agirstatool/cli/AgirStatoolConfigFile.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU Affero General Public License * along with AgirStatool. If not, see . */ -package org.april.agirstatool.cli; +package fr.devinsy.agirstatool.cli; import java.io.File; import java.io.FileReader; @@ -25,10 +25,11 @@ import java.util.Properties; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; -import org.april.agirstatool.core.AgirStatoolException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import fr.devinsy.agirstatool.core.AgirStatoolException; + /** * The Class AgirStatoolConfigFile. */ diff --git a/src/org/april/agirstatool/cli/SQLUtils.java b/src/fr/devinsy/agirstatool/cli/SQLUtils.java similarity index 98% rename from src/org/april/agirstatool/cli/SQLUtils.java rename to src/fr/devinsy/agirstatool/cli/SQLUtils.java index b81d411..3355158 100644 --- a/src/org/april/agirstatool/cli/SQLUtils.java +++ b/src/fr/devinsy/agirstatool/cli/SQLUtils.java @@ -17,7 +17,7 @@ * along with AgirStatool. If not, see . */ -package org.april.agirstatool.cli; +package fr.devinsy.agirstatool.cli; import java.sql.Connection; import java.sql.DriverManager; @@ -28,10 +28,11 @@ import java.time.LocalDateTime; import java.time.ZoneOffset; import org.apache.commons.lang3.StringUtils; -import org.april.agirstatool.core.AgirStatoolException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import fr.devinsy.agirstatool.core.AgirStatoolException; + /** * The Class SQLUtils. */ diff --git a/src/org/april/agirstatool/core/AgirStatool.java b/src/fr/devinsy/agirstatool/core/AgirStatool.java similarity index 97% rename from src/org/april/agirstatool/core/AgirStatool.java rename to src/fr/devinsy/agirstatool/core/AgirStatool.java index 5397db0..c8e4073 100644 --- a/src/org/april/agirstatool/core/AgirStatool.java +++ b/src/fr/devinsy/agirstatool/core/AgirStatool.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU Affero General Public License * along with AgirStatool. If not, see . */ -package org.april.agirstatool.core; +package fr.devinsy.agirstatool.core; import java.io.File; import java.io.FileFilter; @@ -31,14 +31,14 @@ import java.time.ZoneOffset; import org.apache.commons.io.FileUtils; import org.apache.commons.io.filefilter.WildcardFileFilter; -import org.april.agirstatool.charts.DateCount; -import org.april.agirstatool.charts.DateCountList; -import org.april.agirstatool.charts.DateCountMap; -import org.april.agirstatool.cli.SQLUtils; -import org.april.agirstatool.core.pages.ProjectPage; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import fr.devinsy.agirstatool.charts.DateCount; +import fr.devinsy.agirstatool.charts.DateCountList; +import fr.devinsy.agirstatool.charts.DateCountMap; +import fr.devinsy.agirstatool.cli.SQLUtils; +import fr.devinsy.agirstatool.core.pages.ProjectPage; import fr.devinsy.strings.StringList; /** @@ -208,10 +208,10 @@ public class AgirStatool // Copy CSS file. if (!new File(this.targetDirectory, "index.html").exists()) { - FileUtils.copyURLToFile(AgirStatool.class.getResource("/org/april/agirstatool/core/pages/index.html"), new File(this.targetDirectory, "index.html")); - FileUtils.copyURLToFile(AgirStatool.class.getResource("/org/april/agirstatool/core/pages/agirstatool.css"), new File(this.targetDirectory, "agirstatool.css")); - FileUtils.copyURLToFile(AgirStatool.class.getResource("/org/april/agirstatool/core/pages/Chart.bundle.min.js"), new File(this.targetDirectory, "Chart.bundle.min.js")); - FileUtils.copyURLToFile(AgirStatool.class.getResource("/org/april/agirstatool/core/pages/about.xhtml"), new File(this.targetDirectory, "about.xhtml")); + FileUtils.copyURLToFile(AgirStatool.class.getResource("/fr/devinsy/agirstatool/core/pages/index.html"), new File(this.targetDirectory, "index.html")); + FileUtils.copyURLToFile(AgirStatool.class.getResource("/fr/devinsy/agirstatool/core/pages/agirstatool.css"), new File(this.targetDirectory, "agirstatool.css")); + FileUtils.copyURLToFile(AgirStatool.class.getResource("/fr/devinsy/agirstatool/core/pages/Chart.bundle.min.js"), new File(this.targetDirectory, "Chart.bundle.min.js")); + FileUtils.copyURLToFile(AgirStatool.class.getResource("/fr/devinsy/agirstatool/core/pages/about.xhtml"), new File(this.targetDirectory, "about.xhtml")); } // diff --git a/src/org/april/agirstatool/core/AgirStatoolException.java b/src/fr/devinsy/agirstatool/core/AgirStatoolException.java similarity index 97% rename from src/org/april/agirstatool/core/AgirStatoolException.java rename to src/fr/devinsy/agirstatool/core/AgirStatoolException.java index 0ae2a68..559cf9c 100644 --- a/src/org/april/agirstatool/core/AgirStatoolException.java +++ b/src/fr/devinsy/agirstatool/core/AgirStatoolException.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU Affero General Public License * along with AgirStatool. If not, see . */ -package org.april.agirstatool.core; +package fr.devinsy.agirstatool.core; /** * The Class JugaException. diff --git a/src/org/april/agirstatool/core/AgirStatoolUtils.java b/src/fr/devinsy/agirstatool/core/AgirStatoolUtils.java similarity index 98% rename from src/org/april/agirstatool/core/AgirStatoolUtils.java rename to src/fr/devinsy/agirstatool/core/AgirStatoolUtils.java index d1294e5..6bf705c 100644 --- a/src/org/april/agirstatool/core/AgirStatoolUtils.java +++ b/src/fr/devinsy/agirstatool/core/AgirStatoolUtils.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU Affero General Public License * along with AgirStatool. If not, see . */ -package org.april.agirstatool.core; +package fr.devinsy.agirstatool.core; import java.time.LocalDate; import java.time.LocalDateTime; @@ -27,12 +27,12 @@ import java.util.Locale; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.math.NumberUtils; -import org.april.agirstatool.charts.DateCount; -import org.april.agirstatool.charts.DateCountList; -import org.april.agirstatool.charts.DateCountMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import fr.devinsy.agirstatool.charts.DateCount; +import fr.devinsy.agirstatool.charts.DateCountList; +import fr.devinsy.agirstatool.charts.DateCountMap; import fr.devinsy.strings.StringList; import fr.devinsy.strings.StringsUtils; diff --git a/src/org/april/agirstatool/core/CompareUtils.java b/src/fr/devinsy/agirstatool/core/CompareUtils.java similarity index 98% rename from src/org/april/agirstatool/core/CompareUtils.java rename to src/fr/devinsy/agirstatool/core/CompareUtils.java index df55daa..db253ac 100644 --- a/src/org/april/agirstatool/core/CompareUtils.java +++ b/src/fr/devinsy/agirstatool/core/CompareUtils.java @@ -1,4 +1,4 @@ -package org.april.agirstatool.core; +package fr.devinsy.agirstatool.core; import java.time.LocalDateTime; diff --git a/src/org/april/agirstatool/core/Issue.java b/src/fr/devinsy/agirstatool/core/Issue.java similarity index 99% rename from src/org/april/agirstatool/core/Issue.java rename to src/fr/devinsy/agirstatool/core/Issue.java index 531385d..316d692 100644 --- a/src/org/april/agirstatool/core/Issue.java +++ b/src/fr/devinsy/agirstatool/core/Issue.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU Affero General Public License * along with AgirStatool. If not, see . */ -package org.april.agirstatool.core; +package fr.devinsy.agirstatool.core; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/src/org/april/agirstatool/core/IssueComparator.java b/src/fr/devinsy/agirstatool/core/IssueComparator.java similarity index 98% rename from src/org/april/agirstatool/core/IssueComparator.java rename to src/fr/devinsy/agirstatool/core/IssueComparator.java index a152991..b3e7d79 100644 --- a/src/org/april/agirstatool/core/IssueComparator.java +++ b/src/fr/devinsy/agirstatool/core/IssueComparator.java @@ -1,4 +1,4 @@ -package org.april.agirstatool.core; +package fr.devinsy.agirstatool.core; import java.time.LocalDateTime; import java.util.Comparator; diff --git a/src/org/april/agirstatool/core/IssueStats.java b/src/fr/devinsy/agirstatool/core/IssueStats.java similarity index 98% rename from src/org/april/agirstatool/core/IssueStats.java rename to src/fr/devinsy/agirstatool/core/IssueStats.java index 69b5435..89e3303 100644 --- a/src/org/april/agirstatool/core/IssueStats.java +++ b/src/fr/devinsy/agirstatool/core/IssueStats.java @@ -16,11 +16,11 @@ * You should have received a copy of the GNU Affero General Public License * along with AgirStatool. If not, see . */ -package org.april.agirstatool.core; +package fr.devinsy.agirstatool.core; import java.time.LocalDateTime; -import org.april.agirstatool.charts.DateCountList; +import fr.devinsy.agirstatool.charts.DateCountList; /** * The Class Projects. diff --git a/src/org/april/agirstatool/core/Issues.java b/src/fr/devinsy/agirstatool/core/Issues.java similarity index 98% rename from src/org/april/agirstatool/core/Issues.java rename to src/fr/devinsy/agirstatool/core/Issues.java index 2646f7e..9b15e10 100644 --- a/src/org/april/agirstatool/core/Issues.java +++ b/src/fr/devinsy/agirstatool/core/Issues.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU Affero General Public License * along with AgirStatool. If not, see . */ -package org.april.agirstatool.core; +package fr.devinsy.agirstatool.core; import java.time.LocalDate; import java.util.ArrayList; diff --git a/src/org/april/agirstatool/core/LongList.java b/src/fr/devinsy/agirstatool/core/LongList.java similarity index 97% rename from src/org/april/agirstatool/core/LongList.java rename to src/fr/devinsy/agirstatool/core/LongList.java index d24e27f..dc10b37 100644 --- a/src/org/april/agirstatool/core/LongList.java +++ b/src/fr/devinsy/agirstatool/core/LongList.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU Affero General Public License * along with AgirStatool. If not, see . */ -package org.april.agirstatool.core; +package fr.devinsy.agirstatool.core; import java.util.ArrayList; import java.util.Collections; diff --git a/src/org/april/agirstatool/core/Project.java b/src/fr/devinsy/agirstatool/core/Project.java similarity index 99% rename from src/org/april/agirstatool/core/Project.java rename to src/fr/devinsy/agirstatool/core/Project.java index 08fb56b..795598a 100644 --- a/src/org/april/agirstatool/core/Project.java +++ b/src/fr/devinsy/agirstatool/core/Project.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU Affero General Public License * along with AgirStatool. If not, see . */ -package org.april.agirstatool.core; +package fr.devinsy.agirstatool.core; import java.time.LocalDateTime; diff --git a/src/org/april/agirstatool/core/ProjectComparator.java b/src/fr/devinsy/agirstatool/core/ProjectComparator.java similarity index 98% rename from src/org/april/agirstatool/core/ProjectComparator.java rename to src/fr/devinsy/agirstatool/core/ProjectComparator.java index 9127d56..ff6ef46 100644 --- a/src/org/april/agirstatool/core/ProjectComparator.java +++ b/src/fr/devinsy/agirstatool/core/ProjectComparator.java @@ -1,4 +1,4 @@ -package org.april.agirstatool.core; +package fr.devinsy.agirstatool.core; import java.util.Comparator; diff --git a/src/org/april/agirstatool/core/Projects.java b/src/fr/devinsy/agirstatool/core/Projects.java similarity index 98% rename from src/org/april/agirstatool/core/Projects.java rename to src/fr/devinsy/agirstatool/core/Projects.java index 5939f36..d2450f0 100644 --- a/src/org/april/agirstatool/core/Projects.java +++ b/src/fr/devinsy/agirstatool/core/Projects.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU Affero General Public License * along with AgirStatool. If not, see . */ -package org.april.agirstatool.core; +package fr.devinsy.agirstatool.core; import java.util.ArrayList; diff --git a/src/org/april/agirstatool/core/Stat.java b/src/fr/devinsy/agirstatool/core/Stat.java similarity index 98% rename from src/org/april/agirstatool/core/Stat.java rename to src/fr/devinsy/agirstatool/core/Stat.java index 79d604a..639c46e 100644 --- a/src/org/april/agirstatool/core/Stat.java +++ b/src/fr/devinsy/agirstatool/core/Stat.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU Affero General Public License * along with AgirStatool. If not, see . */ -package org.april.agirstatool.core; +package fr.devinsy.agirstatool.core; /** * The Class Stat. diff --git a/src/org/april/agirstatool/core/pages/Chart.bundle.min.js b/src/fr/devinsy/agirstatool/core/pages/Chart.bundle.min.js similarity index 100% rename from src/org/april/agirstatool/core/pages/Chart.bundle.min.js rename to src/fr/devinsy/agirstatool/core/pages/Chart.bundle.min.js diff --git a/src/org/april/agirstatool/core/pages/CreatedClosedCountChartView.java b/src/fr/devinsy/agirstatool/core/pages/CreatedClosedCountChartView.java similarity index 92% rename from src/org/april/agirstatool/core/pages/CreatedClosedCountChartView.java rename to src/fr/devinsy/agirstatool/core/pages/CreatedClosedCountChartView.java index 8a0b8dc..35d0a32 100644 --- a/src/org/april/agirstatool/core/pages/CreatedClosedCountChartView.java +++ b/src/fr/devinsy/agirstatool/core/pages/CreatedClosedCountChartView.java @@ -16,20 +16,20 @@ * You should have received a copy of the GNU Affero General Public License * along with AgirStatool. If not, see . */ -package org.april.agirstatool.core.pages; +package fr.devinsy.agirstatool.core.pages; import java.io.IOException; import java.time.LocalDate; import org.apache.commons.codec.digest.DigestUtils; -import org.april.agirstatool.charts.DateCountList; -import org.april.agirstatool.core.AgirStatool; -import org.april.agirstatool.core.AgirStatoolException; -import org.april.agirstatool.core.AgirStatoolUtils; -import org.april.agirstatool.core.Project; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import fr.devinsy.agirstatool.charts.DateCountList; +import fr.devinsy.agirstatool.core.AgirStatool; +import fr.devinsy.agirstatool.core.AgirStatoolException; +import fr.devinsy.agirstatool.core.AgirStatoolUtils; +import fr.devinsy.agirstatool.core.Project; import fr.devinsy.strings.StringList; import fr.devinsy.xidyn.utils.XidynUtils; @@ -63,7 +63,7 @@ public class CreatedClosedCountChartView { if (project.hasIssue()) { - String source = XidynUtils.load(AgirStatool.class.getResource("/org/april/agirstatool/core/pages/createdClosedCountChartView.xhtml")); + String source = XidynUtils.load(AgirStatool.class.getResource("/fr/devinsy/agirstatool/core/pages/createdClosedCountChartView.xhtml")); String code = XidynUtils.extractBodyContent(source); code = code.replaceAll("myChart", "myChart_" + DigestUtils.md5Hex(title + "lineChart")); @@ -115,7 +115,7 @@ public class CreatedClosedCountChartView if (project.hasIssue()) { - String source = XidynUtils.load(AgirStatool.class.getResource("/org/april/agirstatool/core/pages/createdClosedCountChartView.xhtml")); + String source = XidynUtils.load(AgirStatool.class.getResource("/fr/devinsy/agirstatool/core/pages/createdClosedCountChartView.xhtml")); String code = XidynUtils.extractBodyContent(source); code = code.replaceAll("myChart", "myChart_" + DigestUtils.md5Hex(title + "lineBar")); diff --git a/src/org/april/agirstatool/core/pages/CreatedClosedDiffChartView.java b/src/fr/devinsy/agirstatool/core/pages/CreatedClosedDiffChartView.java similarity index 92% rename from src/org/april/agirstatool/core/pages/CreatedClosedDiffChartView.java rename to src/fr/devinsy/agirstatool/core/pages/CreatedClosedDiffChartView.java index 6d44a65..66ffdd1 100644 --- a/src/org/april/agirstatool/core/pages/CreatedClosedDiffChartView.java +++ b/src/fr/devinsy/agirstatool/core/pages/CreatedClosedDiffChartView.java @@ -16,21 +16,21 @@ * You should have received a copy of the GNU Affero General Public License * along with AgirStatool. If not, see . */ -package org.april.agirstatool.core.pages; +package fr.devinsy.agirstatool.core.pages; import java.io.IOException; import java.time.LocalDate; import org.apache.commons.codec.digest.DigestUtils; -import org.april.agirstatool.charts.DateCount; -import org.april.agirstatool.charts.DateCountList; -import org.april.agirstatool.core.AgirStatool; -import org.april.agirstatool.core.AgirStatoolException; -import org.april.agirstatool.core.AgirStatoolUtils; -import org.april.agirstatool.core.Project; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import fr.devinsy.agirstatool.charts.DateCount; +import fr.devinsy.agirstatool.charts.DateCountList; +import fr.devinsy.agirstatool.core.AgirStatool; +import fr.devinsy.agirstatool.core.AgirStatoolException; +import fr.devinsy.agirstatool.core.AgirStatoolUtils; +import fr.devinsy.agirstatool.core.Project; import fr.devinsy.strings.StringList; import fr.devinsy.xidyn.utils.XidynUtils; @@ -64,7 +64,7 @@ public class CreatedClosedDiffChartView { if (project.hasIssue()) { - String source = XidynUtils.load(AgirStatool.class.getResource("/org/april/agirstatool/core/pages/createdClosedDiffChartView.xhtml")); + String source = XidynUtils.load(AgirStatool.class.getResource("/fr/devinsy/agirstatool/core/pages/createdClosedDiffChartView.xhtml")); String code = XidynUtils.extractBodyContent(source); code = code.replaceAll("myChart", "myChart_" + DigestUtils.md5Hex(title + "line2Chart")); diff --git a/src/org/april/agirstatool/core/pages/IssueAgeChartView.java b/src/fr/devinsy/agirstatool/core/pages/IssueAgeChartView.java similarity index 94% rename from src/org/april/agirstatool/core/pages/IssueAgeChartView.java rename to src/fr/devinsy/agirstatool/core/pages/IssueAgeChartView.java index 8304812..f739719 100644 --- a/src/org/april/agirstatool/core/pages/IssueAgeChartView.java +++ b/src/fr/devinsy/agirstatool/core/pages/IssueAgeChartView.java @@ -16,19 +16,19 @@ * You should have received a copy of the GNU Affero General Public License * along with AgirStatool. If not, see . */ -package org.april.agirstatool.core.pages; +package fr.devinsy.agirstatool.core.pages; import java.io.IOException; import java.time.LocalDate; import org.apache.commons.codec.digest.DigestUtils; -import org.april.agirstatool.core.AgirStatool; -import org.april.agirstatool.core.AgirStatoolException; -import org.april.agirstatool.core.AgirStatoolUtils; -import org.april.agirstatool.core.Project; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import fr.devinsy.agirstatool.core.AgirStatool; +import fr.devinsy.agirstatool.core.AgirStatoolException; +import fr.devinsy.agirstatool.core.AgirStatoolUtils; +import fr.devinsy.agirstatool.core.Project; import fr.devinsy.strings.StringList; import fr.devinsy.xidyn.utils.XidynUtils; @@ -62,7 +62,7 @@ public class IssueAgeChartView { if (project.hasIssue()) { - String source = XidynUtils.load(AgirStatool.class.getResource("/org/april/agirstatool/core/pages/issueAgeChartView.xhtml")); + String source = XidynUtils.load(AgirStatool.class.getResource("/fr/devinsy/agirstatool/core/pages/issueAgeChartView.xhtml")); String code = XidynUtils.extractBodyContent(source); code = code.replaceAll("myChart", "myChart_" + DigestUtils.md5Hex(title + "ageStatsChart")); diff --git a/src/org/april/agirstatool/core/pages/IssueStatusChartView.java b/src/fr/devinsy/agirstatool/core/pages/IssueStatusChartView.java similarity index 92% rename from src/org/april/agirstatool/core/pages/IssueStatusChartView.java rename to src/fr/devinsy/agirstatool/core/pages/IssueStatusChartView.java index 9dcc734..b2a7d30 100644 --- a/src/org/april/agirstatool/core/pages/IssueStatusChartView.java +++ b/src/fr/devinsy/agirstatool/core/pages/IssueStatusChartView.java @@ -16,18 +16,18 @@ * You should have received a copy of the GNU Affero General Public License * along with AgirStatool. If not, see . */ -package org.april.agirstatool.core.pages; +package fr.devinsy.agirstatool.core.pages; import java.io.IOException; import org.apache.commons.codec.digest.DigestUtils; -import org.april.agirstatool.core.AgirStatool; -import org.april.agirstatool.core.AgirStatoolException; -import org.april.agirstatool.core.AgirStatoolUtils; -import org.april.agirstatool.core.Project; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import fr.devinsy.agirstatool.core.AgirStatool; +import fr.devinsy.agirstatool.core.AgirStatoolException; +import fr.devinsy.agirstatool.core.AgirStatoolUtils; +import fr.devinsy.agirstatool.core.Project; import fr.devinsy.strings.StringList; import fr.devinsy.xidyn.utils.XidynUtils; @@ -89,7 +89,7 @@ public class IssueStatusChartView try { - String source = XidynUtils.load(AgirStatool.class.getResource("/org/april/agirstatool/core/pages/issueStatusChartView.xhtml")); + String source = XidynUtils.load(AgirStatool.class.getResource("/fr/devinsy/agirstatool/core/pages/issueStatusChartView.xhtml")); String code = XidynUtils.extractBodyContent(source); code = code.replaceAll("myChart", "myChart_" + DigestUtils.md5Hex(title + "chartBar")); diff --git a/src/org/april/agirstatool/core/pages/ProjectPage.java b/src/fr/devinsy/agirstatool/core/pages/ProjectPage.java similarity index 93% rename from src/org/april/agirstatool/core/pages/ProjectPage.java rename to src/fr/devinsy/agirstatool/core/pages/ProjectPage.java index 62772f5..f20d92d 100644 --- a/src/org/april/agirstatool/core/pages/ProjectPage.java +++ b/src/fr/devinsy/agirstatool/core/pages/ProjectPage.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU Affero General Public License * along with AgirStatool. If not, see . */ -package org.april.agirstatool.core.pages; +package fr.devinsy.agirstatool.core.pages; import java.time.LocalDate; import java.time.LocalDateTime; @@ -24,11 +24,11 @@ import java.time.format.DateTimeFormatter; import java.util.Locale; import org.apache.commons.lang3.StringUtils; -import org.april.agirstatool.core.AgirStatoolException; -import org.april.agirstatool.core.Project; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import fr.devinsy.agirstatool.core.AgirStatoolException; +import fr.devinsy.agirstatool.core.Project; import fr.devinsy.xidyn.XidynException; import fr.devinsy.xidyn.data.TagDataManager; import fr.devinsy.xidyn.presenters.PresenterUtils; @@ -66,11 +66,11 @@ public class ProjectPage data.setAttribute("projectName", "href", project.getPath()); if (StringUtils.equals(project.getIdentifier(), "all")) { - data.setAttribute("agirLink", "href", "https://agir.april.org/issues"); + data.setAttribute("agirLink", "href", "https://agir.foo.org/issues"); } else { - data.setAttribute("agirLink", "href", "https://agir.april.org/projects/" + project.getIdentifier() + "/issues"); + data.setAttribute("agirLink", "href", "https://agir.foo.org/projects/" + project.getIdentifier() + "/issues"); } data.setContent("versionsup", BuildInformation.instance().version()); @@ -115,7 +115,7 @@ public class ProjectPage String projectsGroupedView = ProjectsGroupedView.build(project); data.setContent("tableGroupedView", projectsGroupedView); - result = PresenterUtils.dynamize("/org/april/agirstatool/core/pages/project.xhtml", data).toString(); + result = PresenterUtils.dynamize("/fr/devinsy/agirstatool/core/pages/project.xhtml", data).toString(); } catch (XidynException exception) { diff --git a/src/org/april/agirstatool/core/pages/ProjectsGroupedView.java b/src/fr/devinsy/agirstatool/core/pages/ProjectsGroupedView.java similarity index 94% rename from src/org/april/agirstatool/core/pages/ProjectsGroupedView.java rename to src/fr/devinsy/agirstatool/core/pages/ProjectsGroupedView.java index 84b3bd3..8a78329 100644 --- a/src/org/april/agirstatool/core/pages/ProjectsGroupedView.java +++ b/src/fr/devinsy/agirstatool/core/pages/ProjectsGroupedView.java @@ -16,15 +16,15 @@ * You should have received a copy of the GNU Affero General Public License * along with AgirStatool. If not, see . */ -package org.april.agirstatool.core.pages; +package fr.devinsy.agirstatool.core.pages; import org.apache.commons.lang3.StringEscapeUtils; -import org.april.agirstatool.core.AgirStatoolException; -import org.april.agirstatool.core.AgirStatoolUtils; -import org.april.agirstatool.core.Project; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import fr.devinsy.agirstatool.core.AgirStatoolException; +import fr.devinsy.agirstatool.core.AgirStatoolUtils; +import fr.devinsy.agirstatool.core.Project; import fr.devinsy.xidyn.XidynException; import fr.devinsy.xidyn.data.TagDataManager; import fr.devinsy.xidyn.presenters.PresenterUtils; @@ -73,7 +73,7 @@ public class ProjectsGroupedView } } - CharSequence page = PresenterUtils.dynamize("/org/april/agirstatool/core/pages/projectsGroupedView.xhtml", data); + CharSequence page = PresenterUtils.dynamize("/fr/devinsy/agirstatool/core/pages/projectsGroupedView.xhtml", data); result = XidynUtils.extractBodyContent(page); } catch (XidynException exception) diff --git a/src/org/april/agirstatool/core/pages/ProjectsRawView.java b/src/fr/devinsy/agirstatool/core/pages/ProjectsRawView.java similarity index 95% rename from src/org/april/agirstatool/core/pages/ProjectsRawView.java rename to src/fr/devinsy/agirstatool/core/pages/ProjectsRawView.java index 58b20b9..73e2317 100644 --- a/src/org/april/agirstatool/core/pages/ProjectsRawView.java +++ b/src/fr/devinsy/agirstatool/core/pages/ProjectsRawView.java @@ -16,15 +16,15 @@ * You should have received a copy of the GNU Affero General Public License * along with AgirStatool. If not, see . */ -package org.april.agirstatool.core.pages; +package fr.devinsy.agirstatool.core.pages; import org.apache.commons.lang3.StringEscapeUtils; -import org.april.agirstatool.core.AgirStatoolException; -import org.april.agirstatool.core.AgirStatoolUtils; -import org.april.agirstatool.core.Project; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import fr.devinsy.agirstatool.core.AgirStatoolException; +import fr.devinsy.agirstatool.core.AgirStatoolUtils; +import fr.devinsy.agirstatool.core.Project; import fr.devinsy.xidyn.XidynException; import fr.devinsy.xidyn.data.TagDataManager; import fr.devinsy.xidyn.presenters.PresenterUtils; @@ -71,7 +71,7 @@ public class ProjectsRawView } } - CharSequence page = PresenterUtils.dynamize("/org/april/agirstatool/core/pages/projectsRawView.xhtml", data); + CharSequence page = PresenterUtils.dynamize("/fr/devinsy/agirstatool/core/pages/projectsRawView.xhtml", data); result = XidynUtils.extractBodyContent(page); } catch (XidynException exception) diff --git a/src/org/april/agirstatool/core/pages/UnassignedIssueChartView.java b/src/fr/devinsy/agirstatool/core/pages/UnassignedIssueChartView.java similarity index 91% rename from src/org/april/agirstatool/core/pages/UnassignedIssueChartView.java rename to src/fr/devinsy/agirstatool/core/pages/UnassignedIssueChartView.java index 46e088f..56222b8 100644 --- a/src/org/april/agirstatool/core/pages/UnassignedIssueChartView.java +++ b/src/fr/devinsy/agirstatool/core/pages/UnassignedIssueChartView.java @@ -16,19 +16,19 @@ * You should have received a copy of the GNU Affero General Public License * along with AgirStatool. If not, see . */ -package org.april.agirstatool.core.pages; +package fr.devinsy.agirstatool.core.pages; import java.io.IOException; import org.apache.commons.codec.digest.DigestUtils; -import org.april.agirstatool.core.AgirStatool; -import org.april.agirstatool.core.AgirStatoolException; -import org.april.agirstatool.core.AgirStatoolUtils; -import org.april.agirstatool.core.IssueStats; -import org.april.agirstatool.core.Project; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import fr.devinsy.agirstatool.core.AgirStatool; +import fr.devinsy.agirstatool.core.AgirStatoolException; +import fr.devinsy.agirstatool.core.AgirStatoolUtils; +import fr.devinsy.agirstatool.core.IssueStats; +import fr.devinsy.agirstatool.core.Project; import fr.devinsy.strings.StringList; import fr.devinsy.xidyn.utils.XidynUtils; @@ -39,35 +39,6 @@ public class UnassignedIssueChartView { private static Logger logger = LoggerFactory.getLogger(UnassignedIssueChartView.class); - /** - * Builds the grouped. - * - * @param title - * the title - * @param project - * the project - * @return the string - * @throws AgirStatoolException - * the agir statool exception - */ - public static String buildGrouped(final String title, final Project project) throws AgirStatoolException - { - String result; - - StringList labels = new StringList("Started", "Resolved", "Concluded"); - StringList values = new StringList(); - IssueStats stats = project.issueStats(); - values.append(stats.getUnassignedStartedCount()); - values.append(stats.getUnassignedResolvedCount()); - values.append(stats.getUnassignedConcludedCount()); - - String targetTitle = title + " – " + project.getName(); - result = build(targetTitle, targetTitle, labels, values); - - // - return result; - } - /** * Builds the. * @@ -82,7 +53,7 @@ public class UnassignedIssueChartView public static String build(final String title, final Project project) throws AgirStatoolException { String result; - + StringList labels = new StringList("Confirmed", "Ongoing", "Waiting", "Resolved", "Rejected", "Closed"); StringList values = new StringList(); IssueStats stats = project.issueStats(); @@ -92,10 +63,10 @@ public class UnassignedIssueChartView values.append(stats.getUnassignedResolvedCount()); values.append(stats.getUnassignedRejectedCount()); values.append(stats.getUnassignedClosedCount()); - + String targetTitle = title + " – " + project.getName(); result = build(targetTitle, targetTitle, labels, values); - + // return result; } @@ -121,7 +92,7 @@ public class UnassignedIssueChartView try { - String source = XidynUtils.load(AgirStatool.class.getResource("/org/april/agirstatool/core/pages/unassignedIssueChart.xhtml")); + String source = XidynUtils.load(AgirStatool.class.getResource("/fr/devinsy/agirstatool/core/pages/unassignedIssueChart.xhtml")); String code = XidynUtils.extractBodyContent(source); code = code.replaceAll("myChart", "myChart_" + DigestUtils.md5Hex(title + "chartPolar")); @@ -139,4 +110,33 @@ public class UnassignedIssueChartView // return result; } + + /** + * Builds the grouped. + * + * @param title + * the title + * @param project + * the project + * @return the string + * @throws AgirStatoolException + * the agir statool exception + */ + public static String buildGrouped(final String title, final Project project) throws AgirStatoolException + { + String result; + + StringList labels = new StringList("Started", "Resolved", "Concluded"); + StringList values = new StringList(); + IssueStats stats = project.issueStats(); + values.append(stats.getUnassignedStartedCount()); + values.append(stats.getUnassignedResolvedCount()); + values.append(stats.getUnassignedConcludedCount()); + + String targetTitle = title + " – " + project.getName(); + result = build(targetTitle, targetTitle, labels, values); + + // + return result; + } } diff --git a/src/org/april/agirstatool/core/pages/about.xhtml b/src/fr/devinsy/agirstatool/core/pages/about.xhtml similarity index 73% rename from src/org/april/agirstatool/core/pages/about.xhtml rename to src/fr/devinsy/agirstatool/core/pages/about.xhtml index 186a023..3b032d9 100644 --- a/src/org/april/agirstatool/core/pages/about.xhtml +++ b/src/fr/devinsy/agirstatool/core/pages/about.xhtml @@ -4,7 +4,7 @@ Agir Statool - +