- Nuiton-utils-commits - mailman.cloud.codelutin.com

r1735 - trunk/src/main/java/org/nuiton/util
by echatellier＠users.nuiton.org 12 Jan '10

12 Jan '10

Author: echatellier Date: 2010-01-12 16:42:11 +0100 (Tue, 12 Jan 2010) New Revision: 1735 Modified: trunk/src/main/java/org/nuiton/util/ApplicationConfig.java Log: Remove bad import. Modified: trunk/src/main/java/org/nuiton/util/ApplicationConfig.java =================================================================== --- trunk/src/main/java/org/nuiton/util/ApplicationConfig.java 2010-01-12 15:41:48 UTC (rev 1734) +++ trunk/src/main/java/org/nuiton/util/ApplicationConfig.java 2010-01-12 15:42:11 UTC (rev 1735) @@ -20,7 +20,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import sun.misc.IOUtils; import static org.nuiton.i18n.I18n._; import java.io.File;

1 0

r1734 - trunk/src/main/java/org/nuiton/util
by echatellier＠users.nuiton.org 12 Jan '10

12 Jan '10

Author: echatellier Date: 2010-01-12 16:41:48 +0100 (Tue, 12 Jan 2010) New Revision: 1734 Modified: trunk/src/main/java/org/nuiton/util/ApplicationConfig.java Log: Make sure that writer is closed after file saving. Modified: trunk/src/main/java/org/nuiton/util/ApplicationConfig.java =================================================================== --- trunk/src/main/java/org/nuiton/util/ApplicationConfig.java 2010-01-11 15:13:29 UTC (rev 1733) +++ trunk/src/main/java/org/nuiton/util/ApplicationConfig.java 2010-01-12 15:41:48 UTC (rev 1734) @@ -19,6 +19,8 @@ import org.apache.commons.beanutils.ConstructorUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; + +import sun.misc.IOUtils; import static org.nuiton.i18n.I18n._; import java.io.File; @@ -440,8 +442,17 @@ for (String excludeKey : excludeKeys) { prop.remove(excludeKey); } - Writer writer = new FileWriter(file); - prop.store(writer, "Last saved " + new java.util.Date()); + + Writer writer = null; + try { + writer = new FileWriter(file); + prop.store(writer, "Last saved " + new java.util.Date()); + } + finally { + if (writer != null) { + writer.close(); + } + } } /**

1 0

r1733 - trunk/src/main/java/org/nuiton/util
by fdesbois＠users.nuiton.org 11 Jan '10

11 Jan '10

Author: fdesbois Date: 2010-01-11 16:13:29 +0100 (Mon, 11 Jan 2010) New Revision: 1733 Modified: trunk/src/main/java/org/nuiton/util/PeriodDates.java Log: Add constraint on period creation (throw IllegalArgumentException if dateEnd < dateBegin) Modified: trunk/src/main/java/org/nuiton/util/PeriodDates.java =================================================================== --- trunk/src/main/java/org/nuiton/util/PeriodDates.java 2010-01-10 23:34:03 UTC (rev 1732) +++ trunk/src/main/java/org/nuiton/util/PeriodDates.java 2010-01-11 15:13:29 UTC (rev 1733) @@ -57,21 +57,22 @@ public PeriodDates() { } - public PeriodDates(Date fromDate, Date thruDate) { -// this.fromCalendar = new GregorianCalendar(); + public PeriodDates(Date fromDate, Date thruDate) throws IllegalArgumentException { + if (thruDate != null && fromDate != null && fromDate.after(thruDate)) { + throw new IllegalArgumentException("The fromDate can't be after the thruDate !"); + } + setFromDate(fromDate); - -// this.thruCalendar = new GregorianCalendar(); setThruDate(thruDate); this.pattern = DateUtils.DEFAULT_PATTERN; } - public PeriodDates(Calendar fromCalendar, Calendar thruCalendar) { -// this.fromDate = fromCalendar.getTime(); + public PeriodDates(Calendar fromCalendar, Calendar thruCalendar) throws IllegalArgumentException { + if (thruCalendar != null && fromCalendar != null && fromCalendar.after(thruCalendar)) { + throw new IllegalArgumentException("The fromDate can't be after the thruDate !"); + } this.fromCalendar = fromCalendar; - -// this.thruDate = thruCalendar.getTime(); this.thruCalendar = thruCalendar; this.pattern = DateUtils.DEFAULT_PATTERN; @@ -109,7 +110,7 @@ /** * Set first day of month for dateFrom and last day of month for dateThru */ - public void setDayOfMonthExtremities() { + public void initDayOfMonthExtremities() { if (fromCalendar == null || thruCalendar == null) { throw new NullPointerException("fromDate or thruDate can't be null to" + " change dayOfMonth extremities");

1 0

r1732 - trunk
by tchemit＠users.nuiton.org 10 Jan '10

10 Jan '10

Author: tchemit Date: 2010-01-11 00:34:03 +0100 (Mon, 11 Jan 2010) New Revision: 1732 Modified: trunk/pom.xml Log: use mavenpom4redmine Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-07 15:36:51 UTC (rev 1731) +++ trunk/pom.xml 2010-01-10 23:34:03 UTC (rev 1732) @@ -9,8 +9,8 @@ <parent> <groupId>org.nuiton</groupId> - <artifactId>mavenpom</artifactId> - <version>1.1.4</version> + <artifactId>mavenpom4redmine</artifactId> + <version>2.0-SNAPSHOT</version> </parent> <artifactId>nuiton-utils</artifactId>

1 0

r1731 - trunk/src/main/java/org/nuiton/util
by fdesbois＠users.nuiton.org 07 Jan '10

07 Jan '10

Author: fdesbois Date: 2010-01-07 16:36:51 +0100 (Thu, 07 Jan 2010) New Revision: 1731 Modified: trunk/src/main/java/org/nuiton/util/PeriodDates.java Log: Add method to set period extremities. Suppress internal Date attributes to use only Calendar attributes. Modified: trunk/src/main/java/org/nuiton/util/PeriodDates.java =================================================================== --- trunk/src/main/java/org/nuiton/util/PeriodDates.java 2010-01-07 03:31:13 UTC (rev 1730) +++ trunk/src/main/java/org/nuiton/util/PeriodDates.java 2010-01-07 15:36:51 UTC (rev 1731) @@ -46,11 +46,11 @@ private String pattern; - private Date fromDate; +// private Date fromDate; private Calendar fromCalendar; - private Date thruDate; +// private Date thruDate; private Calendar thruCalendar; @@ -58,20 +58,20 @@ } public PeriodDates(Date fromDate, Date thruDate) { - this.fromCalendar = new GregorianCalendar(); +// this.fromCalendar = new GregorianCalendar(); setFromDate(fromDate); - this.thruCalendar = new GregorianCalendar(); +// this.thruCalendar = new GregorianCalendar(); setThruDate(thruDate); this.pattern = DateUtils.DEFAULT_PATTERN; } public PeriodDates(Calendar fromCalendar, Calendar thruCalendar) { - this.fromDate = fromCalendar.getTime(); +// this.fromDate = fromCalendar.getTime(); this.fromCalendar = fromCalendar; - this.thruDate = thruCalendar.getTime(); +// this.thruDate = thruCalendar.getTime(); this.thruCalendar = thruCalendar; this.pattern = DateUtils.DEFAULT_PATTERN; @@ -106,8 +106,21 @@ this.pattern = pattern; } + /** + * Set first day of month for dateFrom and last day of month for dateThru + */ + public void setDayOfMonthExtremities() { + if (fromCalendar == null || thruCalendar == null) { + throw new NullPointerException("fromDate or thruDate can't be null to" + + " change dayOfMonth extremities"); + } + fromCalendar.set(Calendar.DAY_OF_MONTH, 1); + int maximum = thruCalendar.getActualMaximum(Calendar.DAY_OF_MONTH); + thruCalendar.set(Calendar.DAY_OF_MONTH, maximum); + } + public void setFromDate(Date fromDate) { - this.fromDate = fromDate; + //this.fromDate = fromDate; if (fromDate != null) { if (fromCalendar == null) { fromCalendar = new GregorianCalendar(); @@ -119,7 +132,7 @@ } public Date getFromDate() { - return this.fromDate; + return this.fromCalendar.getTime(); } public int getFromMonth() { @@ -127,7 +140,7 @@ } public void setThruDate(Date thruDate) { - this.thruDate = thruDate; + //this.thruDate = thruDate; if (thruDate != null) { if (thruCalendar == null) { thruCalendar = new GregorianCalendar(); @@ -139,7 +152,7 @@ } public Date getThruDate() { - return this.thruDate; + return this.thruCalendar.getTime(); } public List<Date> getMonths() { @@ -148,23 +161,6 @@ return months; } - /*int mFrom = fromCalendar.get(Calendar.MONTH); - int mThru = thruCalendar.get(Calendar.MONTH); - int yFrom = fromCalendar.get(Calendar.YEAR); - int yThru = thruCalendar.get(Calendar.YEAR); - - int nbYears = yThru - yFrom; - int monthRatio = nbYears * 12; - - int y = yFrom; - for(int i = mFrom; i <= mThru + monthRatio; i++) { - Calendar result = new GregorianCalendar(y, i%12, 1); - months.add(result.getTime()); - if (i != 0 && i%11 == 0) { - y++; - } - }*/ - Calendar current = (Calendar) fromCalendar.clone(); current.set(Calendar.DAY_OF_MONTH, 1); Calendar end = (Calendar) thruCalendar.clone(); @@ -206,9 +202,9 @@ @Override public String toString() { - String fromStr = DateUtils.formatDate(fromDate, pattern); - String thruStr = DateUtils.formatDate(thruDate, pattern); - return "[ " + fromDate + " (pattern: " + fromStr + ") -> " + thruDate + " (pattern: " + thruStr + ") ]"; + String fromStr = DateUtils.formatDate(getFromDate(), pattern); + String thruStr = DateUtils.formatDate(getThruDate(), pattern); + return "[ " + getFromDate() + " (pattern: " + fromStr + ") -> " + getThruDate() + " (pattern: " + thruStr + ") ]"; } }

1 0

r1730 - trunk
by tchemit＠users.nuiton.org 07 Jan '10

07 Jan '10

Author: tchemit Date: 2010-01-07 04:31:13 +0100 (Thu, 07 Jan 2010) New Revision: 1730 Modified: trunk/pom.xml Log: use mavenpom 1.1.4 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-05 17:17:30 UTC (rev 1729) +++ trunk/pom.xml 2010-01-07 03:31:13 UTC (rev 1730) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.1.3</version> + <version>1.1.4</version> </parent> <artifactId>nuiton-utils</artifactId>

1 0

r1729 - trunk/src/site/apt
by echatellier＠users.nuiton.org 05 Jan '10

05 Jan '10

Author: echatellier Date: 2010-01-05 18:17:30 +0100 (Tue, 05 Jan 2010) New Revision: 1729 Modified: trunk/src/site/apt/Warlauncher.apt Log: Add doc about display-name content. Modified: trunk/src/site/apt/Warlauncher.apt =================================================================== --- trunk/src/site/apt/Warlauncher.apt 2010-01-05 17:07:54 UTC (rev 1728) +++ trunk/src/site/apt/Warlauncher.apt 2010-01-05 17:17:30 UTC (rev 1729) @@ -19,6 +19,9 @@ won't work. In maven, by default, this file must be put in <<<src/main/webapp>>> directory. + + If <<<display-name>>> content can be read into <<<WEB-INF/web.xml>>> file, + it's used as server name (currently in systray tooltip). * Use Winstone war launcher

1 0

r1728 - in trunk: . src/main/java/org/nuiton/util/war
by echatellier＠users.nuiton.org 05 Jan '10

05 Jan '10

Author: echatellier Date: 2010-01-05 18:07:54 +0100 (Tue, 05 Jan 2010) New Revision: 1728 Modified: trunk/changelog.txt trunk/src/main/java/org/nuiton/util/war/JettyLauncher.java trunk/src/main/java/org/nuiton/util/war/WinstoneLauncher.java Log: Use display-name from web.xml file as server name Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2010-01-04 08:24:40 UTC (rev 1727) +++ trunk/changelog.txt 2010-01-05 17:07:54 UTC (rev 1728) @@ -1,12 +1,12 @@ -1.1.2 xxx 200912xx +1.1.3 xxx 201001xx + * Use display-name from web.xml file as server name - * Add generic war launcher (winstone based) +1.1.2 desbois 20091223 + * Add generic war launcher (winstone & jetty based) * Add new uncompress method with exclusion filters * [FEATURE] Force application configuration properties to be written sorted * [FEATURE] Add sed and grep method on FileUtil --- - 1.1.1 chemit 20090903 * [FEATURE] #39 add a filterVersions method in VersionUtil Modified: trunk/src/main/java/org/nuiton/util/war/JettyLauncher.java =================================================================== --- trunk/src/main/java/org/nuiton/util/war/JettyLauncher.java 2010-01-04 08:24:40 UTC (rev 1727) +++ trunk/src/main/java/org/nuiton/util/war/JettyLauncher.java 2010-01-05 17:07:54 UTC (rev 1728) @@ -31,6 +31,9 @@ import java.awt.event.MouseListener; import java.io.File; import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.StringWriter; import java.net.JarURLConnection; import java.net.URI; import java.net.URISyntaxException; @@ -45,6 +48,9 @@ import org.eclipse.jetty.server.handler.HandlerCollection; import org.eclipse.jetty.server.nio.SelectChannelConnector; import org.eclipse.jetty.webapp.WebAppContext; +import org.xml.sax.ContentHandler; +import org.xml.sax.XMLReader; +import org.xml.sax.helpers.XMLReaderFactory; /** * War main class launcher (jetty based). @@ -70,6 +76,9 @@ /** Default port. */ protected int port = 8888; + /** Server name. */ + protected String serverName; + /** * Main method (used by war in manifest). * @@ -78,12 +87,62 @@ */ public static void main(String[] args) throws Exception { JettyLauncher launcher = new JettyLauncher(); + launcher.readInformation(); launcher.startServer(args); launcher.installSystemTray(); launcher.openBrowser(); } /** + * Parse WEB-INF/web.xml file and get server display name. + * + * @since 1.1.3 + */ + protected void readInformation() { + InputStream stream = JettyLauncher.class.getResourceAsStream("/WEB-INF/web.xml"); + + if (stream != null) { + String content = readAsString(stream); + if (content != null) { + int first = content.indexOf("<display-name>"); + if (first >= 0) { + serverName = content.substring(first + 14, content.indexOf("</display-name>")); + System.out.println("Using server name : " + serverName); + } + } + } + + // if none read, set default + if (serverName == null || serverName.isEmpty()) { + serverName = "Server"; + } + } + + /** + * Read input stream as string. + * + * Code from commons io. + * + * @param stream stream to read + * @return content as string + * @since 1.1.3 + */ + protected String readAsString(InputStream stream) { + InputStreamReader reader = new InputStreamReader(stream); + StringWriter sw = new StringWriter(); + char[] buffer = new char[4096]; + int n = 0; + try { + while (-1 != (n = reader.read(buffer))) { + sw.write(buffer, 0, n); + } + } catch (IOException e) { + e.printStackTrace(); + } + return sw.toString(); + } + + /** * Launch servlet container. * * @param args args @@ -98,7 +157,7 @@ URL classFile = JettyLauncher.class.getClassLoader().getResource(fqnLauncherFile); System.out.println(" - using classFile : " + classFile); - // strange following line seams also work for jpnl launch + // strange following line seams also work for jnlp launch File me = new File(((JarURLConnection) classFile.openConnection()).getJarFile().getName()); System.out.println(" - using warfile file : " + me); @@ -166,7 +225,7 @@ System.out.println("No favicon.{png|jpg} found, skip systray installation"); } else { Image image = new ImageIcon(imageURL).getImage(); - TrayIcon icon = new TrayIcon(image, "Server", menu); + TrayIcon icon = new TrayIcon(image, serverName, menu); icon.setImageAutoSize(true); icon.addMouseListener(this); Modified: trunk/src/main/java/org/nuiton/util/war/WinstoneLauncher.java =================================================================== --- trunk/src/main/java/org/nuiton/util/war/WinstoneLauncher.java 2010-01-04 08:24:40 UTC (rev 1727) +++ trunk/src/main/java/org/nuiton/util/war/WinstoneLauncher.java 2010-01-05 17:07:54 UTC (rev 1728) @@ -31,6 +31,9 @@ import java.awt.event.MouseListener; import java.io.File; import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.StringWriter; import java.net.JarURLConnection; import java.net.URI; import java.net.URISyntaxException; @@ -64,6 +67,9 @@ /** Server URI. */ protected URI serverUri; + /** Server name. */ + protected String serverName; + /** * Main method (used by war in manifest). * @@ -72,12 +78,62 @@ */ public static void main(String[] args) throws IOException { WinstoneLauncher launcher = new WinstoneLauncher(); + launcher.readInformation(); launcher.startServer(args); launcher.installSystemTray(); launcher.openBrowser(); } /** + * Parse WEB-INF/web.xml file and get server display name. + * + * @since 1.1.3 + */ + protected void readInformation() { + InputStream stream = WinstoneLauncher.class.getResourceAsStream("/WEB-INF/web.xml"); + + if (stream != null) { + String content = readAsString(stream); + if (content != null) { + int first = content.indexOf("<display-name>"); + if (first >= 0) { + serverName = content.substring(first + 14, content.indexOf("</display-name>")); + System.out.println("Using server name : " + serverName); + } + } + } + + // if none read, set default + if (serverName == null || serverName.isEmpty()) { + serverName = "Server"; + } + } + + /** + * Read input stream as string. + * + * Code from commons io. + * + * @param stream stream to read + * @return content as string + * @since 1.1.3 + */ + protected String readAsString(InputStream stream) { + InputStreamReader reader = new InputStreamReader(stream); + StringWriter sw = new StringWriter(); + char[] buffer = new char[4096]; + int n = 0; + try { + while (-1 != (n = reader.read(buffer))) { + sw.write(buffer, 0, n); + } + } catch (IOException e) { + e.printStackTrace(); + } + return sw.toString(); + } + + /** * Launch servlet container. * * @param args args @@ -92,7 +148,7 @@ URL classFile = WinstoneLauncher.class.getClassLoader().getResource(fqnLauncherFile); System.out.println(" - using classFile : " + classFile); - // strange following line seams also work for jpnl launch + // strange following line seams also work for jnlp launch File me = new File(((JarURLConnection) classFile.openConnection()).getJarFile().getName()); System.out.println(" - using warfile file : " + me); @@ -161,7 +217,7 @@ System.out.println("No favicon.{png|jpg} found, skip systray installation"); } else { Image image = new ImageIcon(imageURL).getImage(); - TrayIcon icon = new TrayIcon(image, "Server", menu); + TrayIcon icon = new TrayIcon(image, serverName, menu); icon.setImageAutoSize(true); icon.addMouseListener(this);

1 0

r1727 - trunk/src/site/apt
by echatellier＠users.nuiton.org 04 Jan '10

04 Jan '10

Author: echatellier Date: 2010-01-04 09:24:40 +0100 (Mon, 04 Jan 2010) New Revision: 1727 Modified: trunk/src/site/apt/Warlauncher.apt Log: Update doc about favicon.png source file location. Modified: trunk/src/site/apt/Warlauncher.apt =================================================================== --- trunk/src/site/apt/Warlauncher.apt 2009-12-23 13:20:39 UTC (rev 1726) +++ trunk/src/site/apt/Warlauncher.apt 2010-01-04 08:24:40 UTC (rev 1727) @@ -15,7 +15,10 @@ * Prerequisites By default, both jetty and winstone look for an icon named <<favicon.png>> or - <<favicon.jpg>>. If none of this icons is found, system tray won't work. + <<favicon.jpg>> at webapp base. If none of this icons is found, system tray + won't work. + + In maven, by default, this file must be put in <<<src/main/webapp>>> directory. * Use Winstone war launcher

1 0

r1726 - trunk
by fdesbois＠users.nuiton.org 23 Dec '09

23 Dec '09

Author: fdesbois Date: 2009-12-23 14:20:39 +0100 (Wed, 23 Dec 2009) New Revision: 1726 Modified: trunk/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-12-23 13:20:35 UTC (rev 1725) +++ trunk/pom.xml 2009-12-23 13:20:39 UTC (rev 1726) @@ -14,7 +14,7 @@ </parent> <artifactId>nuiton-utils</artifactId> - <version>1.1.2</version> + <version>1.1.3-SNAPSHOT</version> <dependencies> @@ -154,9 +154,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-1.1.2</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-1.1.2</developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-utils/tags/nuiton-utils-1.…</url> + <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk</developerConnection> + <url>http://www.nuiton.org/repositories/browse/nuiton-utils/trunk</url> </scm> <profiles>

1 0