You can subscribe to this list here.
2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(4) |
Nov
(39) |
Dec
(10) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2007 |
Jan
(19) |
Feb
(150) |
Mar
(10) |
Apr
|
May
(8) |
Jun
(11) |
Jul
(27) |
Aug
(52) |
Sep
(35) |
Oct
(30) |
Nov
(18) |
Dec
(4) |
2008 |
Jan
(76) |
Feb
(121) |
Mar
(39) |
Apr
(55) |
May
(18) |
Jun
(49) |
Jul
(32) |
Aug
(4) |
Sep
(10) |
Oct
|
Nov
(3) |
Dec
(33) |
2009 |
Jan
(19) |
Feb
(87) |
Mar
(69) |
Apr
(38) |
May
(47) |
Jun
(20) |
Jul
(5) |
Aug
(76) |
Sep
(145) |
Oct
(34) |
Nov
(8) |
Dec
(68) |
2010 |
Jan
(150) |
Feb
(379) |
Mar
(191) |
Apr
(100) |
May
(525) |
Jun
(269) |
Jul
(127) |
Aug
(190) |
Sep
(190) |
Oct
(29) |
Nov
(147) |
Dec
(83) |
2011 |
Jan
(188) |
Feb
(81) |
Mar
(43) |
Apr
(97) |
May
(63) |
Jun
(129) |
Jul
(17) |
Aug
(124) |
Sep
(6) |
Oct
(20) |
Nov
(67) |
Dec
(23) |
2012 |
Jan
(6) |
Feb
(14) |
Mar
(181) |
Apr
(64) |
May
(102) |
Jun
(47) |
Jul
(26) |
Aug
(3) |
Sep
(1) |
Oct
(14) |
Nov
(13) |
Dec
(23) |
2013 |
Jan
(4) |
Feb
(14) |
Mar
(18) |
Apr
(14) |
May
(27) |
Jun
(27) |
Jul
(5) |
Aug
(2) |
Sep
(74) |
Oct
(79) |
Nov
(21) |
Dec
(97) |
2014 |
Jan
(6) |
Feb
(3) |
Mar
(8) |
Apr
|
May
(5) |
Jun
|
Jul
(9) |
Aug
(6) |
Sep
(3) |
Oct
(10) |
Nov
(6) |
Dec
|
2015 |
Jan
|
Feb
|
Mar
(1) |
Apr
(25) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2016 |
Jan
|
Feb
|
Mar
|
Apr
(5) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: <fg...@us...> - 2007-02-11 09:39:56
|
Revision: 239 http://svn.sourceforge.net/openutils/?rev=239&view=rev Author: fgiust Date: 2007-02-11 01:39:48 -0800 (Sun, 11 Feb 2007) Log Message: ----------- cleanup of the input tag Modified Paths: -------------- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/input.tag trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/txtinput.tag Modified: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/input.tag =================================================================== --- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/input.tag 2007-02-06 14:34:07 UTC (rev 238) +++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/input.tag 2007-02-11 09:39:48 UTC (rev 239) @@ -1,148 +1,129 @@ -<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" - xmlns:spring="http://www.springframework.org/tags" xmlns:c="http://java.sun.com/jsp/jstl/core" - xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:su="http://openutils.sourceforge.net/openutils-tags-commonslang" xmlns:ou="http://openutils.sourceforge.net/openutils-tags-spring"> - - <jsp:directive.attribute name="path" required="true" /> - <jsp:directive.attribute name="name" required="false" /> - <jsp:directive.attribute name="maxlength" required="false" type="java.lang.Integer" /> - <jsp:directive.attribute name="readonly" required="false" type="java.lang.Boolean" /> - <jsp:directive.attribute name="disabled" required="false" type="java.lang.Boolean" /> - <jsp:directive.attribute name="bare" required="false" type="java.lang.Boolean" /> - <jsp:directive.attribute name="type" required="false" /> - <jsp:directive.attribute name="nobind" required="false" type="java.lang.Boolean" /> - <jsp:directive.attribute name="style" required="false" /> - <jsp:directive.attribute name="onkeypress" required="false" /> - <jsp:directive.attribute name="onkeydown" required="false" /> - <jsp:directive.attribute name="onkeyup" required="false" /> - <jsp:directive.attribute name="onchange" required="false" /> - <jsp:directive.attribute name="cssclass" required="false" /> - <jsp:directive.attribute name="key" required="false" /> - <jsp:directive.attribute name="onblur" required="false" /> - <jsp:directive.attribute name="label" required="false" type="java.lang.String" /> - - - <c:if test="${empty(key)}"> - <c:set var="key">${path}</c:set> - </c:if> - <c:if test="${empty(name)}"> - <c:set var="name">${su:substringAfter(path, ".")}</c:set> - </c:if> - <c:if test="${empty(maxlength)}"> - <c:set var="maxlength">30</c:set> - </c:if> - <c:if test="${type == 'key' and !empty(status.value)}"> - <c:set var="type">hidden</c:set> - </c:if> - <c:if test="${type == 'keyshow' and !empty(status.value)}"> - <c:set var="readonly" value="${true}" /> - </c:if> - <c:if test="${type == 'date'}"> - <c:set var="type">text</c:set> - <c:set var="datepicker" value="${true}" /> - </c:if> - <c:set var="divclass">formelement</c:set> - - - <c:choose> - <c:when test="${empty(label)}"> - <c:set var="labelmsg"><fmt:message key="${key}" /></c:set> - </c:when> - <c:otherwise> - <c:set var="labelmsg">${label}</c:set> - </c:otherwise> - </c:choose> - +<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" + xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" + xmlns:su="http://openutils.sourceforge.net/openutils-tags-commonslang" + xmlns:ou="http://openutils.sourceforge.net/openutils-tags-spring" + xmlns:elx="http://openutils.sourceforge.net/openutils-tags-elx"> + <jsp:directive.attribute name="path" required="true" /> + <jsp:directive.attribute name="name" required="false" /> + <jsp:directive.attribute name="maxlength" required="false" type="java.lang.Integer" /> + <jsp:directive.attribute name="readonly" required="false" type="java.lang.Boolean" /> + <jsp:directive.attribute name="disabled" required="false" type="java.lang.Boolean" /> + <jsp:directive.attribute name="bare" required="false" type="java.lang.Boolean" /> + <jsp:directive.attribute name="type" required="false" /> + <jsp:directive.attribute name="nobind" required="false" type="java.lang.Boolean" /> + <jsp:directive.attribute name="style" required="false" /> + <jsp:directive.attribute name="onkeypress" required="false" /> + <jsp:directive.attribute name="onkeydown" required="false" /> + <jsp:directive.attribute name="onkeyup" required="false" /> + <jsp:directive.attribute name="onchange" required="false" /> + <jsp:directive.attribute name="cssclass" required="false" /> + <jsp:directive.attribute name="key" required="false" /> + <jsp:directive.attribute name="onblur" required="false" /> + <jsp:directive.attribute name="label" required="false" type="java.lang.String" /> + <c:if test="${empty(key)}"> + <c:set var="key">${path}</c:set> + </c:if> + <c:if test="${empty(name)}"> + <c:set var="name">${su:substringAfter(path, ".")}</c:set> + </c:if> + <c:if test="${empty(maxlength)}"> + <c:set var="maxlength">30</c:set> + </c:if> + <c:if test="${type == 'key' || type == 'keyshow'}"> <c:choose> - <c:when test="${!nobind}"> - <spring:bind path="${path}"> - <c:set var="divclass">formelement <c:if test="${!empty(status.errorMessage)}"> formelementerror</c:if></c:set> - - <c:choose> - <c:when test="${type == 'hidden'}"> - <input type="hidden" name="${name}" id="${name}" value="${status.value}" /> - </c:when> - <c:when test="${bare}"> - - <c:choose> - <c:when test="${maxlength le 256}"> - <ou:txtinput type="text" name="${name}" value="${status.value}" cssclass="text ${cssclass}" maxlength="${maxlength}" style="${style}" readonly="${readonly}" disabled="${disabled}" onkeypress="${onkeypress}" onkeydown="${onkeydown}" onkeyup="${onkeyup}" onchange="${onchange}" onblur="${onblur}"/> - </c:when> - <c:otherwise> - <ou:txttextarea name="${name}" value="${status.value}" style="${style}" cssclass="inputtextarea ${cssclass}" /> - </c:otherwise> - </c:choose> - </c:when> - <c:when test="${type == 'password'}"> - <div class="${divclass}"> - <label for="${name}">${labelmsg}:</label> - - - <ou:txtinput type="password" name="${name}" value="${status.value}" cssclass="text ${cssclass}" maxlength="${maxlength}" style="${style}" readonly="${readonly}" disabled="${disabled}" onkeypress="${onkeypress}" onkeydown="${onkeydown}" onkeyup="${onkeyup}" onchange="${onchange}" onblur="${onblur}"/> - - - - - <div class="clear"><!-- --></div> - </div> - </c:when> - <c:otherwise> - <div class="${divclass}"> - <label for="${name}">${labelmsg}:</label> - - <c:choose> - <c:when test="${maxlength le 256}"> - <ou:txtinput type="text" name="${name}" value="${status.value}" cssclass="text ${cssclass}" maxlength="${maxlength}" style="${style}" readonly="${readonly}" disabled="${disabled}" onkeypress="${onkeypress}" onkeydown="${onkeydown}" onkeyup="${onkeyup}" onchange="${onchange}" onblur="${onblur}"/> - </c:when> - <c:otherwise> - <ou:txttextarea name="${name}" value="${status.value}" style="${style}" cssclass="inputtextarea ${cssclass}" /> - </c:otherwise> - </c:choose> - - <c:if test="${datepicker}"> - <a href="javascript:showCal('divdata${name}','${name}')" title="seleziona" class="calbtn"> - <span>C</span> - </a> - <div class="calendar" id="divdata${name}" style="display:none"><!-- --></div> - <!--[if gte IE 5.5]> - <iframe id='divdata${name}iframe' class='calendarIframe' src='javascript:false;' frameBorder='0' scrolling='no' - style="display:none;filter:progid:DXImageTransform.Microsoft.Alpha(style=0,opacity=0)"><!-- x --></iframe> - <![endif]--> - <script type="text/javascript">createCalendar('${status.value}', 'divdata${name}', '${name}')</script> - </c:if> - - <div class="clear"><!-- --></div> - </div> - </c:otherwise> - </c:choose> - </spring:bind> + <c:when test="${type == 'key' and !empty(status.value)}"> + <c:set var="type" value="hidden" /> </c:when> + <c:when test="${type == 'keyshow' and !empty(status.value)}"> + <c:set var="type" value="text" /> + <c:set var="readonly" value="${true}" /> + </c:when> <c:otherwise> - - <c:choose> - <c:when test="${type == 'hidden'}"> - <input type="hidden" name="${name}" id="${name}" value="${status.value}" /> - </c:when> - <c:when test="${bare}"> - <ou:txtinput type="text" name="${name}" value="${status.value}" cssclass="text" maxlength="${maxlength}" style="${style}" readonly="${readonly}" disabled="${disabled}" onkeypress="${onkeypress}" onkeydown="${onkeydown}" onkeyup="${onkeyup}" onchange="${onchange}" onblur="${onblur}"/> - </c:when> - <c:otherwise> - <div class="${divclass}"> - <label for="${name}">${labelmsg}:</label> - - <c:choose> - <c:when test="${maxlength le 256}"> - <ou:txtinput type="text" name="${name}" value="${status.value}" cssclass="text" maxlength="${maxlength}" style="${style}" readonly="${readonly}" disabled="${disabled}" onkeypress="${onkeypress}" onkeydown="${onkeydown}" onkeyup="${onkeyup}" onchange="${onchange}" onblur="${onblur}"/> - </c:when> - <c:otherwise> - <ou:txttextarea name="${name}" value="${status.value}" style="${style}" cssclass="inputtextarea" /> - </c:otherwise> - </c:choose> - - - <div class="clear"><!-- --></div> - </div> - </c:otherwise> - </c:choose> + <c:set var="type" value="text" /> </c:otherwise> - </c:choose> + </c:choose> + </c:if> + <c:if test="${type == 'date'}"> + <c:set var="type" value="text" /> + <c:set var="datepicker" value="${true}" /> + </c:if> + <c:if test="${maxlength ge 256}"> + <c:set var="type" value="textarea" /> + </c:if> + <c:set var="divclass">formelement</c:set> + <c:set var="cssclass"> + <jsp:text>${type} ${cssclass}</jsp:text> + <c:if test="${readonly}">${elx:space()}readonly</c:if> + </c:set> + <c:choose> + <c:when test="${empty(label)}"> + <c:set var="labelmsg"> + <fmt:message key="${key}" /> + </c:set> + </c:when> + <c:otherwise> + <c:set var="labelmsg">${label}</c:set> + </c:otherwise> + </c:choose> + <!-- stampa campi --> + <c:choose> + <c:when test="${!nobind}"> + <spring:bind path="${path}"> + <c:set var="divclass"> + <jsp:text>formelement</jsp:text> + <c:if test="${!empty(status.errorMessage)}">${elx:space()}formelementerror</c:if> + </c:set> + <c:choose> + <c:when test="${bare}"> + <ou:txtinput type="${type}" name="${name}" value="${status.value}" cssclass="${cssclass}" + maxlength="${maxlength}" style="${style}" readonly="${readonly}" disabled="${disabled}" + onkeypress="${onkeypress}" onkeydown="${onkeydown}" onkeyup="${onkeyup}" onchange="${onchange}" + onblur="${onblur}" checked="${status.value}" /> + </c:when> + <c:otherwise> + <div class="${divclass}"> + <label for="${name}">${labelmsg}:</label> + <ou:txtinput type="${type}" name="${name}" value="${status.value}" cssclass="${cssclass}" + maxlength="${maxlength}" style="${style}" readonly="${readonly}" disabled="${disabled}" + onkeypress="${onkeypress}" onkeydown="${onkeydown}" onkeyup="${onkeyup}" onchange="${onchange}" + onblur="${onblur}" /> + <c:if test="${datepicker}"> + <a href="javascript:showCal('divdata${name}','${name}')" title="seleziona" class="calbtn"> + <span>C</span> + </a> + <div class="calendar" id="divdata${name}" style="display:none"><!-- --></div> + <!--[if gte IE 5.5]> + <iframe id='divdata${name}iframe' class='calendarIframe' src='javascript:false;' frameBorder='0' + scrolling='no' + style="display:none;filter:progid:DXImageTransform.Microsoft.Alpha(style=0,opacity=0)"><!-- x --></iframe> + <![endif]--> + <script type="text/javascript">createCalendar('${status.value}', 'divdata${name}', '${name}')</script> + </c:if> + <div class="clear"><!-- --></div> + </div> + </c:otherwise> + </c:choose> + </spring:bind> + </c:when> + <c:otherwise><!-- no spring binding --> + <c:choose> + <c:when test="${bare}"> + <ou:txtinput type="${type}" name="${name}" value="${status.value}" cssclass="${cssclass}" + maxlength="${maxlength}" style="${style}" readonly="${readonly}" disabled="${disabled}" + onkeypress="${onkeypress}" onkeydown="${onkeydown}" onkeyup="${onkeyup}" onchange="${onchange}" + onblur="${onblur}" /> + </c:when> + <c:otherwise> + <div class="${divclass}"> + <label for="${name}">${labelmsg}:</label> + <ou:txtinput type="${type}" name="${name}" value="${status.value}" cssclass="${cssclass}" + maxlength="${maxlength}" style="${style}" readonly="${readonly}" disabled="${disabled}" + onkeypress="${onkeypress}" onkeydown="${onkeydown}" onkeyup="${onkeyup}" onchange="${onchange}" + onblur="${onblur}" /> + <div class="clear"><!-- --></div> + </div> + </c:otherwise> + </c:choose> + </c:otherwise> + </c:choose> </jsp:root> Modified: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/txtinput.tag =================================================================== --- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/txtinput.tag 2007-02-06 14:34:07 UTC (rev 238) +++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/txtinput.tag 2007-02-11 09:39:48 UTC (rev 239) @@ -11,19 +11,30 @@ <jsp:directive.attribute name="maxlength" required="false" /> <jsp:directive.attribute name="readonly" required="false" type="java.lang.Boolean"/> <jsp:directive.attribute name="disabled" required="false" type="java.lang.Boolean"/> + <jsp:directive.attribute name="checked" required="false" type="java.lang.Boolean"/> <jsp:directive.attribute name="onkeypress" required="false" /> <jsp:directive.attribute name="onkeydown" required="false" /> <jsp:directive.attribute name="onkeyup" required="false" /> <jsp:directive.attribute name="onchange" required="false" /> <jsp:directive.attribute name="onblur" required="false" /> - <c:if test="${empty(type)}"> <c:set var="type" value="text" /> </c:if> + + <c:choose> + <c:when test="${type == 'textarea'}"><![CDATA[<textarea name="]]>${name}<![CDATA[" id="]]>${name}<![CDATA[" ]]></c:when> + <c:otherwise><![CDATA[<input name="]]>${name}<![CDATA[" id="]]>${name}<![CDATA[" type="]]>${type}<![CDATA["]]></c:otherwise> + </c:choose> - <![CDATA[<input name="]]>${name}<![CDATA[" id="]]>${name}<![CDATA[" value="]]>${value}<![CDATA[" type="]]>${type}<![CDATA["]]> + <c:choose> + <c:when test="${type == 'checkbox'}"><![CDATA[ value="]]>true<![CDATA[" ]]></c:when> + <c:when test="${type == 'textarea'}"></c:when> + <c:otherwise><![CDATA[ value="]]>${value}<![CDATA[" ]]></c:otherwise> + </c:choose> + + + <c:if test="${!empty(cssclass)}"><![CDATA[ class="]]>${cssclass}<![CDATA[" ]]></c:if> - <c:if test="${!empty(maxlength)}"><![CDATA[ maxlength="]]>${maxlength}<![CDATA[" ]]></c:if> <c:if test="${!empty(onkeypress)}"><![CDATA[ onkeypress="]]>${onkeypress}<![CDATA[" ]]></c:if> <c:if test="${!empty(onkeydown)}"><![CDATA[ onkeydown="]]>${onkeydown}<![CDATA[" ]]></c:if> <c:if test="${!empty(onkeyup)}"><![CDATA[ onkeydown="]]>${onkeyup}<![CDATA[" ]]></c:if> @@ -33,7 +44,23 @@ <c:if test="${readonly}"><![CDATA[ readonly="readonly" ]]></c:if> <c:if test="${disabled}"><![CDATA[ disabled="disabled" ]]></c:if> <c:if test="${!empty(onkeypress) || !empty(onkeydown) || !empty(onkeyup) || !empty(onchange) || !empty(onblur)}"><![CDATA[ autocomplete="off" ]]></c:if> - <![CDATA[ />]]> + + <c:choose> + <c:when test="${type == 'text'}"> + <c:if test="${!empty(maxlength)}"><![CDATA[ maxlength="]]>${maxlength}<![CDATA[" ]]></c:if> + </c:when> + <c:when test="${type == 'checkbox'}"> + <c:if test="${checked}"><![CDATA[ checked="checked" ]]></c:if> + </c:when> + </c:choose> + <c:choose> + <c:when test="${type == 'textarea'}"><![CDATA[ >]]>${value}<![CDATA[</textarea>]]></c:when> + <c:otherwise><![CDATA[ />]]></c:otherwise> + </c:choose> + <c:if test="${type == checkbox}"> + <input type="hidden" name="_${name}" value="${value}"/> + </c:if> + </jsp:root> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2007-02-06 14:34:09
|
Revision: 238 http://svn.sourceforge.net/openutils/?rev=238&view=rev Author: fgiust Date: 2007-02-06 06:34:07 -0800 (Tue, 06 Feb 2007) Log Message: ----------- [maven-release-plugin] prepare for next development iteration Modified Paths: -------------- trunk/openutils-deployment/pom.xml Modified: trunk/openutils-deployment/pom.xml =================================================================== --- trunk/openutils-deployment/pom.xml 2007-02-06 14:33:59 UTC (rev 237) +++ trunk/openutils-deployment/pom.xml 2007-02-06 14:34:07 UTC (rev 238) @@ -8,7 +8,7 @@ </parent> <artifactId>openutils-deployment</artifactId> <name>openutils deployment tools</name> - <version>1.0.6</version> + <version>1.0.7-SNAPSHOT</version> <description /> <dependencies> <dependency> @@ -51,10 +51,4 @@ <scope>test</scope> </dependency> </dependencies> - - <scm> - <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-deployment-1.0.6</connection> - <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-deployment-1.0.6</developerConnection> - <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-deployment-1.0.6</url> - </scm> </project> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2007-02-06 14:34:02
|
Revision: 237 http://svn.sourceforge.net/openutils/?rev=237&view=rev Author: fgiust Date: 2007-02-06 06:33:59 -0800 (Tue, 06 Feb 2007) Log Message: ----------- [maven-scm] copy for tag openutils-deployment-1.0.6 Added Paths: ----------- tags/openutils-deployment-1.0.6/ tags/openutils-deployment-1.0.6/pom.xml tags/openutils-deployment-1.0.6/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java Removed Paths: ------------- tags/openutils-deployment-1.0.6/pom.xml tags/openutils-deployment-1.0.6/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java Copied: tags/openutils-deployment-1.0.6 (from rev 208, trunk/openutils-deployment) Deleted: tags/openutils-deployment-1.0.6/pom.xml =================================================================== --- trunk/openutils-deployment/pom.xml 2007-02-05 21:37:30 UTC (rev 208) +++ tags/openutils-deployment-1.0.6/pom.xml 2007-02-06 14:33:59 UTC (rev 237) @@ -1,60 +0,0 @@ -<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> - <parent> - <groupId>net.sourceforge.openutils</groupId> - <artifactId>openutils</artifactId> - <version>3</version> - <relativePath>..</relativePath> - </parent> - <artifactId>openutils-deployment</artifactId> - <name>openutils deployment tools</name> - <version>1.0.5-SNAPSHOT</version> - <description /> - <dependencies> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.2</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-web</artifactId> - <version>2.0.1</version> - <optional>true</optional> - <exclusions> - <!-- - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - --> - <exclusion> - <groupId>logkit</groupId> - <artifactId>logkit</artifactId> - </exclusion> - <exclusion> - <groupId>avalon-framework</groupId> - <artifactId>avalon-framework</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>1.2</version> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.4</version> - <scope>provided</scope> - <optional>true</optional> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.0</version> - <scope>test</scope> - </dependency> - </dependencies> -</project> \ No newline at end of file Copied: tags/openutils-deployment-1.0.6/pom.xml (from rev 236, trunk/openutils-deployment/pom.xml) =================================================================== --- tags/openutils-deployment-1.0.6/pom.xml (rev 0) +++ tags/openutils-deployment-1.0.6/pom.xml 2007-02-06 14:33:59 UTC (rev 237) @@ -0,0 +1,60 @@ +<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> + <parent> + <groupId>net.sourceforge.openutils</groupId> + <artifactId>openutils</artifactId> + <version>3</version> + <relativePath>..</relativePath> + </parent> + <artifactId>openutils-deployment</artifactId> + <name>openutils deployment tools</name> + <version>1.0.6</version> + <description /> + <dependencies> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.2</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-web</artifactId> + <version>2.0.1</version> + <optional>true</optional> + <exclusions> + <exclusion> + <groupId>logkit</groupId> + <artifactId>logkit</artifactId> + </exclusion> + <exclusion> + <groupId>avalon-framework</groupId> + <artifactId>avalon-framework</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>1.2</version> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.4</version> + <scope>provided</scope> + <optional>true</optional> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.0</version> + <scope>test</scope> + </dependency> + </dependencies> + + <scm> + <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-deployment-1.0.6</connection> + <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-deployment-1.0.6</developerConnection> + <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-deployment-1.0.6</url> + </scm> +</project> \ No newline at end of file Deleted: tags/openutils-deployment-1.0.6/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java =================================================================== --- trunk/openutils-deployment/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java 2007-02-05 21:37:30 UTC (rev 208) +++ tags/openutils-deployment-1.0.6/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java 2007-02-06 14:33:59 UTC (rev 237) @@ -1,214 +0,0 @@ -package it.openutils.deployment.spring; - -import java.io.FileNotFoundException; -import java.io.IOException; -import java.net.InetAddress; -import java.net.MalformedURLException; -import java.net.URL; -import java.net.UnknownHostException; - -import javax.servlet.ServletContext; - -import org.apache.commons.lang.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.BeansException; -import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; -import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer; -import org.springframework.core.io.Resource; -import org.springframework.core.io.UrlResource; -import org.springframework.util.ResourceUtils; -import org.springframework.web.context.ServletContextAware; - - -/** - * @author fgiust - * @version $Id: $ - */ -public class EnvironmentPropertyConfigurer extends PropertyPlaceholderConfigurer implements ServletContextAware -{ - - /** - * Application name (webapp name) variable. - */ - private static final String PROPERTY_APPL = "${appl}"; - - /** - * Environment (server name) variable. - */ - private static final String PROPERTY_ENV = "${env}"; - - /** - * Logger. - */ - private static Logger log = LoggerFactory.getLogger(EnvironmentPropertyConfigurer.class); - - /** - * @deprecated use defaultLocation - */ - @Deprecated - private String defaultEnvironment; - - private ServletContext servletContext; - - private String fileLocation; - - /** - * {@inheritDoc} - */ - public void setServletContext(ServletContext servletContext) - { - this.servletContext = servletContext; - } - - /** - * Setter for <code>fileLocation</code>. - * @param fileLocation The fileLocation to set. - */ - public void setFileLocation(String fileLocation) - { - this.fileLocation = fileLocation; - } - - /** - * Setter for <code>defaultEnvironment</code>. - * @param defaultEnvironment The defaultEnvironment to set. - * @deprecated use defaultLocation - */ - @Deprecated - public void setDefaultEnvironment(String defaultEnvironment) - { - this.defaultEnvironment = defaultEnvironment; - } - - /** - * {@inheritDoc} - */ - @Override - public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException - { - if (fileLocation != null) - { - - String hostname = null; - try - { - hostname = StringUtils.substringBefore( - StringUtils.lowerCase(InetAddress.getLocalHost().getHostName()), - "."); - } - catch (UnknownHostException e) - { - log.error(e.getMessage()); // should not happen - } - - if (hostname != null) - { - System.setProperty("env", hostname); - } - - String applName = getApplicationName(); - if (applName != null) - { - System.setProperty("appl", applName); - } - - URL propertyUrl = null; - - String replacedLocations = StringUtils.replace(fileLocation, PROPERTY_ENV, hostname); - replacedLocations = StringUtils.replace(replacedLocations, PROPERTY_APPL, applName); - - String[] locations = StringUtils.split(replacedLocations, ","); - - for (String loc : locations) - { - propertyUrl = getResource(StringUtils.strip(loc)); - if (propertyUrl != null) - { - break; - } - log.debug("Property file not found at {}", loc); - } - - if (propertyUrl == null && defaultEnvironment != null) - { - log.warn("Usage of \"defaultEnvironment\" is deprecated, please specify the fallback location " - + "as the last comma separated value in \"fileLocation\""); - propertyUrl = getResource(StringUtils.replace(fileLocation, PROPERTY_ENV, this.defaultEnvironment)); - - } - - if (propertyUrl == null) - { - log.error("No properties found at {}", replacedLocations); - } - else - { - Resource resource = new UrlResource(propertyUrl); - super.setLocation(resource); - } - } - - super.postProcessBeanFactory(beanFactory); - } - - private URL getResource(String resource) - { - URL url = null; - - if (servletContext != null) - { - try - { - url = servletContext.getResource(resource); - - if (url != null) - { - // check needed for servletUnit - // we need to check for a connection because getResource always returns a URL, also if the resource - // doesn't exists - url.openConnection().connect(); - } - - } - catch (MalformedURLException e) - { - log.error(e.getMessage(), e); - } - catch (IOException e) - { - // ignore, URL is not a valid resource - url = null; - } - } - else - { - try - { - url = ResourceUtils.getURL(resource); - } - catch (FileNotFoundException e) - { - // ignore, can be normal - } - } - return url; - } - - private String getApplicationName() - { - if (servletContext != null) - { - String url = servletContext.getRealPath("/"); - url = StringUtils.replace(url, "\\", "/"); - if (url.endsWith("/")) - { - url = StringUtils.substringBeforeLast(url, "/"); - } - - return StringUtils.substringAfterLast(url, "/"); - } - return null; - } - -} Copied: tags/openutils-deployment-1.0.6/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java (from rev 235, trunk/openutils-deployment/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java) =================================================================== --- tags/openutils-deployment-1.0.6/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java (rev 0) +++ tags/openutils-deployment-1.0.6/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java 2007-02-06 14:33:59 UTC (rev 237) @@ -0,0 +1,223 @@ +package it.openutils.deployment.spring; + +import java.io.FileNotFoundException; +import java.io.IOException; +import java.net.InetAddress; +import java.net.MalformedURLException; +import java.net.URL; +import java.net.UnknownHostException; + +import javax.servlet.ServletContext; + +import org.apache.commons.lang.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.BeansException; +import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; +import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer; +import org.springframework.core.io.Resource; +import org.springframework.core.io.UrlResource; +import org.springframework.util.ResourceUtils; +import org.springframework.web.context.ServletContextAware; + + +/** + * @author fgiust + * @version $Id: $ + */ +public class EnvironmentPropertyConfigurer extends PropertyPlaceholderConfigurer implements ServletContextAware +{ + + /** + * Application name (webapp name) variable. + */ + private static final String PROPERTY_APPL = "${appl}"; + + /** + * Environment (server name) variable. + */ + private static final String PROPERTY_ENV = "${env}"; + + /** + * Logger. + */ + private static Logger log = LoggerFactory.getLogger(EnvironmentPropertyConfigurer.class); + + /** + * @deprecated use defaultLocation + */ + @Deprecated + private String defaultEnvironment; + + private ServletContext servletContext; + + private String fileLocation; + + /** + * {@inheritDoc} + */ + public void setServletContext(ServletContext servletContext) + { + this.servletContext = servletContext; + } + + /** + * Setter for <code>fileLocation</code>. + * @param fileLocation The fileLocation to set. + */ + public void setFileLocation(String fileLocation) + { + this.fileLocation = fileLocation; + } + + /** + * Setter for <code>defaultEnvironment</code>. + * @param defaultEnvironment The defaultEnvironment to set. + * @deprecated use defaultLocation + */ + @Deprecated + public void setDefaultEnvironment(String defaultEnvironment) + { + this.defaultEnvironment = defaultEnvironment; + } + + /** + * {@inheritDoc} + */ + @Override + public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException + { + if (fileLocation != null) + { + + String hostname = null; + try + { + hostname = StringUtils.substringBefore( + StringUtils.lowerCase(InetAddress.getLocalHost().getHostName()), + "."); + } + catch (UnknownHostException e) + { + log.error(e.getMessage()); // should not happen + } + + if (hostname != null) + { + System.setProperty("env", hostname); + } + + String applName = getApplicationName(); + if (applName != null) + { + System.setProperty("appl", applName); + } + + URL propertyUrl = null; + + String replacedLocations = StringUtils.replace(fileLocation, PROPERTY_ENV, hostname); + replacedLocations = StringUtils.replace(replacedLocations, PROPERTY_APPL, applName); + + String[] locations = StringUtils.split(replacedLocations, ","); + + for (String loc : locations) + { + propertyUrl = getResource(StringUtils.strip(loc)); + if (propertyUrl != null) + { + break; + } + log.debug("Property file not found at {}", loc); + } + + if (propertyUrl == null && defaultEnvironment != null) + { + log.warn("Usage of \"defaultEnvironment\" is deprecated, please specify the fallback location " + + "as the last comma separated value in \"fileLocation\""); + propertyUrl = getResource(StringUtils.replace(fileLocation, PROPERTY_ENV, this.defaultEnvironment)); + + } + + if (propertyUrl == null) + { + log.error("No properties found at {}", replacedLocations); + } + else + { + Resource resource = new UrlResource(propertyUrl); + super.setLocation(resource); + } + } + + super.postProcessBeanFactory(beanFactory); + } + + private URL getResource(String resource) + { + URL url = null; + + if (servletContext != null) + { + try + { + if (resource != null && !resource.startsWith("/")) + { + url = servletContext.getResource("/" + resource); + } + else + { + url = servletContext.getResource(resource); + } + + if (url != null) + { + // check needed for servletUnit + // we need to check for a connection because getResource always returns a URL, also if the resource + // doesn't exists + url.openConnection().connect(); + } + + } + catch (MalformedURLException e) + { + log.error(e.getMessage(), e); + } + catch (IOException e) + { + // ignore, URL is not a valid resource + url = null; + } + } + else + { + try + { + url = ResourceUtils.getURL(resource); + url.openStream().close(); // test if the resource actually exists + } + catch (IOException e) + { + // ignore, can be normal + url = null; + } + } + return url; + } + + private String getApplicationName() + { + if (servletContext != null) + { + String url = servletContext.getRealPath("/"); + url = StringUtils.replace(url, "\\", "/"); + if (url.endsWith("/")) + { + url = StringUtils.substringBeforeLast(url, "/"); + } + + return StringUtils.substringAfterLast(url, "/"); + } + return StringUtils.EMPTY; + } + +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2007-02-06 14:33:45
|
Revision: 236 http://svn.sourceforge.net/openutils/?rev=236&view=rev Author: fgiust Date: 2007-02-06 06:33:44 -0800 (Tue, 06 Feb 2007) Log Message: ----------- [maven-release-plugin] prepare release openutils-deployment-1.0.6 Modified Paths: -------------- trunk/openutils-deployment/pom.xml Modified: trunk/openutils-deployment/pom.xml =================================================================== --- trunk/openutils-deployment/pom.xml 2007-02-06 14:32:57 UTC (rev 235) +++ trunk/openutils-deployment/pom.xml 2007-02-06 14:33:44 UTC (rev 236) @@ -8,7 +8,7 @@ </parent> <artifactId>openutils-deployment</artifactId> <name>openutils deployment tools</name> - <version>1.0.6-SNAPSHOT</version> + <version>1.0.6</version> <description /> <dependencies> <dependency> @@ -51,4 +51,10 @@ <scope>test</scope> </dependency> </dependencies> + + <scm> + <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-deployment-1.0.6</connection> + <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-deployment-1.0.6</developerConnection> + <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-deployment-1.0.6</url> + </scm> </project> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2007-02-06 14:33:02
|
Revision: 235 http://svn.sourceforge.net/openutils/?rev=235&view=rev Author: fgiust Date: 2007-02-06 06:32:57 -0800 (Tue, 06 Feb 2007) Log Message: ----------- handle missing file resources (check didn't work properly for non-classpath resources) Modified Paths: -------------- trunk/openutils-deployment/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java Modified: trunk/openutils-deployment/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java =================================================================== --- trunk/openutils-deployment/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java 2007-02-06 13:50:58 UTC (rev 234) +++ trunk/openutils-deployment/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java 2007-02-06 14:32:57 UTC (rev 235) @@ -193,10 +193,12 @@ try { url = ResourceUtils.getURL(resource); + url.openStream().close(); // test if the resource actually exists } - catch (FileNotFoundException e) + catch (IOException e) { // ignore, can be normal + url = null; } } return url; @@ -215,7 +217,7 @@ return StringUtils.substringAfterLast(url, "/"); } - return null; + return StringUtils.EMPTY; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2007-02-06 13:50:57
|
Revision: 234 http://svn.sourceforge.net/openutils/?rev=234&view=rev Author: fgiust Date: 2007-02-06 05:50:58 -0800 (Tue, 06 Feb 2007) Log Message: ----------- [maven-release-plugin] prepare for next development iteration Modified Paths: -------------- trunk/openutils-deployment/pom.xml Modified: trunk/openutils-deployment/pom.xml =================================================================== --- trunk/openutils-deployment/pom.xml 2007-02-06 13:50:51 UTC (rev 233) +++ trunk/openutils-deployment/pom.xml 2007-02-06 13:50:58 UTC (rev 234) @@ -8,7 +8,7 @@ </parent> <artifactId>openutils-deployment</artifactId> <name>openutils deployment tools</name> - <version>1.0.5</version> + <version>1.0.6-SNAPSHOT</version> <description /> <dependencies> <dependency> @@ -51,10 +51,4 @@ <scope>test</scope> </dependency> </dependencies> - - <scm> - <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-deployment-1.0.5</connection> - <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-deployment-1.0.5</developerConnection> - <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-deployment-1.0.5</url> - </scm> </project> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2007-02-06 13:50:54
|
Revision: 233 http://svn.sourceforge.net/openutils/?rev=233&view=rev Author: fgiust Date: 2007-02-06 05:50:51 -0800 (Tue, 06 Feb 2007) Log Message: ----------- [maven-scm] copy for tag openutils-deployment-1.0.5 Added Paths: ----------- tags/openutils-deployment-1.0.5/ tags/openutils-deployment-1.0.5/pom.xml tags/openutils-deployment-1.0.5/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java Removed Paths: ------------- tags/openutils-deployment-1.0.5/pom.xml tags/openutils-deployment-1.0.5/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java Copied: tags/openutils-deployment-1.0.5 (from rev 208, trunk/openutils-deployment) Deleted: tags/openutils-deployment-1.0.5/pom.xml =================================================================== --- trunk/openutils-deployment/pom.xml 2007-02-05 21:37:30 UTC (rev 208) +++ tags/openutils-deployment-1.0.5/pom.xml 2007-02-06 13:50:51 UTC (rev 233) @@ -1,60 +0,0 @@ -<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> - <parent> - <groupId>net.sourceforge.openutils</groupId> - <artifactId>openutils</artifactId> - <version>3</version> - <relativePath>..</relativePath> - </parent> - <artifactId>openutils-deployment</artifactId> - <name>openutils deployment tools</name> - <version>1.0.5-SNAPSHOT</version> - <description /> - <dependencies> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.2</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-web</artifactId> - <version>2.0.1</version> - <optional>true</optional> - <exclusions> - <!-- - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - --> - <exclusion> - <groupId>logkit</groupId> - <artifactId>logkit</artifactId> - </exclusion> - <exclusion> - <groupId>avalon-framework</groupId> - <artifactId>avalon-framework</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>1.2</version> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.4</version> - <scope>provided</scope> - <optional>true</optional> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.0</version> - <scope>test</scope> - </dependency> - </dependencies> -</project> \ No newline at end of file Copied: tags/openutils-deployment-1.0.5/pom.xml (from rev 232, trunk/openutils-deployment/pom.xml) =================================================================== --- tags/openutils-deployment-1.0.5/pom.xml (rev 0) +++ tags/openutils-deployment-1.0.5/pom.xml 2007-02-06 13:50:51 UTC (rev 233) @@ -0,0 +1,60 @@ +<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> + <parent> + <groupId>net.sourceforge.openutils</groupId> + <artifactId>openutils</artifactId> + <version>3</version> + <relativePath>..</relativePath> + </parent> + <artifactId>openutils-deployment</artifactId> + <name>openutils deployment tools</name> + <version>1.0.5</version> + <description /> + <dependencies> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.2</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-web</artifactId> + <version>2.0.1</version> + <optional>true</optional> + <exclusions> + <exclusion> + <groupId>logkit</groupId> + <artifactId>logkit</artifactId> + </exclusion> + <exclusion> + <groupId>avalon-framework</groupId> + <artifactId>avalon-framework</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>1.2</version> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.4</version> + <scope>provided</scope> + <optional>true</optional> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.0</version> + <scope>test</scope> + </dependency> + </dependencies> + + <scm> + <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-deployment-1.0.5</connection> + <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-deployment-1.0.5</developerConnection> + <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-deployment-1.0.5</url> + </scm> +</project> \ No newline at end of file Deleted: tags/openutils-deployment-1.0.5/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java =================================================================== --- trunk/openutils-deployment/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java 2007-02-05 21:37:30 UTC (rev 208) +++ tags/openutils-deployment-1.0.5/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java 2007-02-06 13:50:51 UTC (rev 233) @@ -1,214 +0,0 @@ -package it.openutils.deployment.spring; - -import java.io.FileNotFoundException; -import java.io.IOException; -import java.net.InetAddress; -import java.net.MalformedURLException; -import java.net.URL; -import java.net.UnknownHostException; - -import javax.servlet.ServletContext; - -import org.apache.commons.lang.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.BeansException; -import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; -import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer; -import org.springframework.core.io.Resource; -import org.springframework.core.io.UrlResource; -import org.springframework.util.ResourceUtils; -import org.springframework.web.context.ServletContextAware; - - -/** - * @author fgiust - * @version $Id: $ - */ -public class EnvironmentPropertyConfigurer extends PropertyPlaceholderConfigurer implements ServletContextAware -{ - - /** - * Application name (webapp name) variable. - */ - private static final String PROPERTY_APPL = "${appl}"; - - /** - * Environment (server name) variable. - */ - private static final String PROPERTY_ENV = "${env}"; - - /** - * Logger. - */ - private static Logger log = LoggerFactory.getLogger(EnvironmentPropertyConfigurer.class); - - /** - * @deprecated use defaultLocation - */ - @Deprecated - private String defaultEnvironment; - - private ServletContext servletContext; - - private String fileLocation; - - /** - * {@inheritDoc} - */ - public void setServletContext(ServletContext servletContext) - { - this.servletContext = servletContext; - } - - /** - * Setter for <code>fileLocation</code>. - * @param fileLocation The fileLocation to set. - */ - public void setFileLocation(String fileLocation) - { - this.fileLocation = fileLocation; - } - - /** - * Setter for <code>defaultEnvironment</code>. - * @param defaultEnvironment The defaultEnvironment to set. - * @deprecated use defaultLocation - */ - @Deprecated - public void setDefaultEnvironment(String defaultEnvironment) - { - this.defaultEnvironment = defaultEnvironment; - } - - /** - * {@inheritDoc} - */ - @Override - public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException - { - if (fileLocation != null) - { - - String hostname = null; - try - { - hostname = StringUtils.substringBefore( - StringUtils.lowerCase(InetAddress.getLocalHost().getHostName()), - "."); - } - catch (UnknownHostException e) - { - log.error(e.getMessage()); // should not happen - } - - if (hostname != null) - { - System.setProperty("env", hostname); - } - - String applName = getApplicationName(); - if (applName != null) - { - System.setProperty("appl", applName); - } - - URL propertyUrl = null; - - String replacedLocations = StringUtils.replace(fileLocation, PROPERTY_ENV, hostname); - replacedLocations = StringUtils.replace(replacedLocations, PROPERTY_APPL, applName); - - String[] locations = StringUtils.split(replacedLocations, ","); - - for (String loc : locations) - { - propertyUrl = getResource(StringUtils.strip(loc)); - if (propertyUrl != null) - { - break; - } - log.debug("Property file not found at {}", loc); - } - - if (propertyUrl == null && defaultEnvironment != null) - { - log.warn("Usage of \"defaultEnvironment\" is deprecated, please specify the fallback location " - + "as the last comma separated value in \"fileLocation\""); - propertyUrl = getResource(StringUtils.replace(fileLocation, PROPERTY_ENV, this.defaultEnvironment)); - - } - - if (propertyUrl == null) - { - log.error("No properties found at {}", replacedLocations); - } - else - { - Resource resource = new UrlResource(propertyUrl); - super.setLocation(resource); - } - } - - super.postProcessBeanFactory(beanFactory); - } - - private URL getResource(String resource) - { - URL url = null; - - if (servletContext != null) - { - try - { - url = servletContext.getResource(resource); - - if (url != null) - { - // check needed for servletUnit - // we need to check for a connection because getResource always returns a URL, also if the resource - // doesn't exists - url.openConnection().connect(); - } - - } - catch (MalformedURLException e) - { - log.error(e.getMessage(), e); - } - catch (IOException e) - { - // ignore, URL is not a valid resource - url = null; - } - } - else - { - try - { - url = ResourceUtils.getURL(resource); - } - catch (FileNotFoundException e) - { - // ignore, can be normal - } - } - return url; - } - - private String getApplicationName() - { - if (servletContext != null) - { - String url = servletContext.getRealPath("/"); - url = StringUtils.replace(url, "\\", "/"); - if (url.endsWith("/")) - { - url = StringUtils.substringBeforeLast(url, "/"); - } - - return StringUtils.substringAfterLast(url, "/"); - } - return null; - } - -} Copied: tags/openutils-deployment-1.0.5/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java (from rev 230, trunk/openutils-deployment/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java) =================================================================== --- tags/openutils-deployment-1.0.5/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java (rev 0) +++ tags/openutils-deployment-1.0.5/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java 2007-02-06 13:50:51 UTC (rev 233) @@ -0,0 +1,221 @@ +package it.openutils.deployment.spring; + +import java.io.FileNotFoundException; +import java.io.IOException; +import java.net.InetAddress; +import java.net.MalformedURLException; +import java.net.URL; +import java.net.UnknownHostException; + +import javax.servlet.ServletContext; + +import org.apache.commons.lang.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.BeansException; +import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; +import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer; +import org.springframework.core.io.Resource; +import org.springframework.core.io.UrlResource; +import org.springframework.util.ResourceUtils; +import org.springframework.web.context.ServletContextAware; + + +/** + * @author fgiust + * @version $Id: $ + */ +public class EnvironmentPropertyConfigurer extends PropertyPlaceholderConfigurer implements ServletContextAware +{ + + /** + * Application name (webapp name) variable. + */ + private static final String PROPERTY_APPL = "${appl}"; + + /** + * Environment (server name) variable. + */ + private static final String PROPERTY_ENV = "${env}"; + + /** + * Logger. + */ + private static Logger log = LoggerFactory.getLogger(EnvironmentPropertyConfigurer.class); + + /** + * @deprecated use defaultLocation + */ + @Deprecated + private String defaultEnvironment; + + private ServletContext servletContext; + + private String fileLocation; + + /** + * {@inheritDoc} + */ + public void setServletContext(ServletContext servletContext) + { + this.servletContext = servletContext; + } + + /** + * Setter for <code>fileLocation</code>. + * @param fileLocation The fileLocation to set. + */ + public void setFileLocation(String fileLocation) + { + this.fileLocation = fileLocation; + } + + /** + * Setter for <code>defaultEnvironment</code>. + * @param defaultEnvironment The defaultEnvironment to set. + * @deprecated use defaultLocation + */ + @Deprecated + public void setDefaultEnvironment(String defaultEnvironment) + { + this.defaultEnvironment = defaultEnvironment; + } + + /** + * {@inheritDoc} + */ + @Override + public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException + { + if (fileLocation != null) + { + + String hostname = null; + try + { + hostname = StringUtils.substringBefore( + StringUtils.lowerCase(InetAddress.getLocalHost().getHostName()), + "."); + } + catch (UnknownHostException e) + { + log.error(e.getMessage()); // should not happen + } + + if (hostname != null) + { + System.setProperty("env", hostname); + } + + String applName = getApplicationName(); + if (applName != null) + { + System.setProperty("appl", applName); + } + + URL propertyUrl = null; + + String replacedLocations = StringUtils.replace(fileLocation, PROPERTY_ENV, hostname); + replacedLocations = StringUtils.replace(replacedLocations, PROPERTY_APPL, applName); + + String[] locations = StringUtils.split(replacedLocations, ","); + + for (String loc : locations) + { + propertyUrl = getResource(StringUtils.strip(loc)); + if (propertyUrl != null) + { + break; + } + log.debug("Property file not found at {}", loc); + } + + if (propertyUrl == null && defaultEnvironment != null) + { + log.warn("Usage of \"defaultEnvironment\" is deprecated, please specify the fallback location " + + "as the last comma separated value in \"fileLocation\""); + propertyUrl = getResource(StringUtils.replace(fileLocation, PROPERTY_ENV, this.defaultEnvironment)); + + } + + if (propertyUrl == null) + { + log.error("No properties found at {}", replacedLocations); + } + else + { + Resource resource = new UrlResource(propertyUrl); + super.setLocation(resource); + } + } + + super.postProcessBeanFactory(beanFactory); + } + + private URL getResource(String resource) + { + URL url = null; + + if (servletContext != null) + { + try + { + if (resource != null && !resource.startsWith("/")) + { + url = servletContext.getResource("/" + resource); + } + else + { + url = servletContext.getResource(resource); + } + + if (url != null) + { + // check needed for servletUnit + // we need to check for a connection because getResource always returns a URL, also if the resource + // doesn't exists + url.openConnection().connect(); + } + + } + catch (MalformedURLException e) + { + log.error(e.getMessage(), e); + } + catch (IOException e) + { + // ignore, URL is not a valid resource + url = null; + } + } + else + { + try + { + url = ResourceUtils.getURL(resource); + } + catch (FileNotFoundException e) + { + // ignore, can be normal + } + } + return url; + } + + private String getApplicationName() + { + if (servletContext != null) + { + String url = servletContext.getRealPath("/"); + url = StringUtils.replace(url, "\\", "/"); + if (url.endsWith("/")) + { + url = StringUtils.substringBeforeLast(url, "/"); + } + + return StringUtils.substringAfterLast(url, "/"); + } + return null; + } + +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2007-02-06 13:50:54
|
Revision: 232 http://svn.sourceforge.net/openutils/?rev=232&view=rev Author: fgiust Date: 2007-02-06 05:50:42 -0800 (Tue, 06 Feb 2007) Log Message: ----------- [maven-release-plugin] prepare release openutils-deployment-1.0.5 Modified Paths: -------------- trunk/openutils-deployment/pom.xml Modified: trunk/openutils-deployment/pom.xml =================================================================== --- trunk/openutils-deployment/pom.xml 2007-02-06 13:49:53 UTC (rev 231) +++ trunk/openutils-deployment/pom.xml 2007-02-06 13:50:42 UTC (rev 232) @@ -1,5 +1,4 @@ -<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> <parent> <groupId>net.sourceforge.openutils</groupId> @@ -9,7 +8,7 @@ </parent> <artifactId>openutils-deployment</artifactId> <name>openutils deployment tools</name> - <version>1.0.5-SNAPSHOT</version> + <version>1.0.5</version> <description /> <dependencies> <dependency> @@ -52,4 +51,10 @@ <scope>test</scope> </dependency> </dependencies> + + <scm> + <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-deployment-1.0.5</connection> + <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-deployment-1.0.5</developerConnection> + <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-deployment-1.0.5</url> + </scm> </project> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2007-02-06 13:49:59
|
Revision: 231 http://svn.sourceforge.net/openutils/?rev=231&view=rev Author: fgiust Date: 2007-02-06 05:49:53 -0800 (Tue, 06 Feb 2007) Log Message: ----------- remove comment Modified Paths: -------------- trunk/openutils-deployment/pom.xml Modified: trunk/openutils-deployment/pom.xml =================================================================== --- trunk/openutils-deployment/pom.xml 2007-02-06 13:47:56 UTC (rev 230) +++ trunk/openutils-deployment/pom.xml 2007-02-06 13:49:53 UTC (rev 231) @@ -1,4 +1,5 @@ -<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> <parent> <groupId>net.sourceforge.openutils</groupId> @@ -22,13 +23,7 @@ <version>2.0.1</version> <optional>true</optional> <exclusions> - <!-- <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - --> - <exclusion> <groupId>logkit</groupId> <artifactId>logkit</artifactId> </exclusion> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2007-02-06 13:48:10
|
Revision: 230 http://svn.sourceforge.net/openutils/?rev=230&view=rev Author: fgiust Date: 2007-02-06 05:47:56 -0800 (Tue, 06 Feb 2007) Log Message: ----------- gracefully handle missing "/" in webapp resources Modified Paths: -------------- trunk/openutils-deployment/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java Modified: trunk/openutils-deployment/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java =================================================================== --- trunk/openutils-deployment/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java 2007-02-05 23:08:14 UTC (rev 229) +++ trunk/openutils-deployment/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java 2007-02-06 13:47:56 UTC (rev 230) @@ -160,7 +160,14 @@ { try { - url = servletContext.getResource(resource); + if (resource != null && !resource.startsWith("/")) + { + url = servletContext.getResource("/" + resource); + } + else + { + url = servletContext.getResource(resource); + } if (url != null) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2007-02-05 23:08:13
|
Revision: 229 http://svn.sourceforge.net/openutils/?rev=229&view=rev Author: fgiust Date: 2007-02-05 15:08:14 -0800 (Mon, 05 Feb 2007) Log Message: ----------- [maven-release-plugin] prepare for next development iteration Modified Paths: -------------- trunk/openutils-tags-spring/pom.xml Modified: trunk/openutils-tags-spring/pom.xml =================================================================== --- trunk/openutils-tags-spring/pom.xml 2007-02-05 23:08:07 UTC (rev 228) +++ trunk/openutils-tags-spring/pom.xml 2007-02-05 23:08:14 UTC (rev 229) @@ -8,7 +8,7 @@ </parent> <artifactId>openutils-tags-spring</artifactId> <name>openutils tags for spring MVC</name> - <version>0.2</version> + <version>1.0-SNAPSHOT</version> <description /> <dependencies> <dependency> @@ -76,10 +76,4 @@ <scope>test</scope> </dependency> </dependencies> - - <scm> - <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-tags-spring-0.2</connection> - <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-tags-spring-0.2</developerConnection> - <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-tags-spring-0.2</url> - </scm> </project> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2007-02-05 23:08:09
|
Revision: 228 http://svn.sourceforge.net/openutils/?rev=228&view=rev Author: fgiust Date: 2007-02-05 15:08:07 -0800 (Mon, 05 Feb 2007) Log Message: ----------- [maven-scm] copy for tag openutils-tags-spring-0.2 Added Paths: ----------- tags/openutils-tags-spring-0.2/ tags/openutils-tags-spring-0.2/pom.xml tags/openutils-tags-spring-0.2/src/main/resources/META-INF/tags/ou/input.tag Removed Paths: ------------- tags/openutils-tags-spring-0.2/pom.xml tags/openutils-tags-spring-0.2/src/main/resources/META-INF/tags/ou/input.tag Copied: tags/openutils-tags-spring-0.2 (from rev 208, trunk/openutils-tags-spring) Deleted: tags/openutils-tags-spring-0.2/pom.xml =================================================================== --- trunk/openutils-tags-spring/pom.xml 2007-02-05 21:37:30 UTC (rev 208) +++ tags/openutils-tags-spring-0.2/pom.xml 2007-02-05 23:08:07 UTC (rev 228) @@ -1,80 +0,0 @@ -<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> - <parent> - <groupId>net.sourceforge.openutils</groupId> - <artifactId>openutils</artifactId> - <version>3</version> - <relativePath>..</relativePath> - </parent> - <artifactId>openutils-tags-spring</artifactId> - <name>openutils tags for spring MVC</name> - <version>1.0-SNAPSHOT</version> - <description /> - <dependencies> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.4</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>jstl</groupId> - <artifactId>jstl</artifactId> - <version>1.1.2</version> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jsp-api</artifactId> - <version>2.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.2</version> - </dependency> - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - <version>1.7.0</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>1.0.1</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-web</artifactId> - <version>2.0.1</version> - <optional>true</optional> - <exclusions> - <exclusion> - <groupId>taglibs</groupId> - <artifactId>standard</artifactId> - </exclusion> - <exclusion> - <groupId>logkit</groupId> - <artifactId>logkit</artifactId> - </exclusion> - <exclusion> - <groupId>avalon-framework</groupId> - <artifactId>avalon-framework</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.13</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.0</version> - <scope>test</scope> - </dependency> - </dependencies> -</project> \ No newline at end of file Copied: tags/openutils-tags-spring-0.2/pom.xml (from rev 227, trunk/openutils-tags-spring/pom.xml) =================================================================== --- tags/openutils-tags-spring-0.2/pom.xml (rev 0) +++ tags/openutils-tags-spring-0.2/pom.xml 2007-02-05 23:08:07 UTC (rev 228) @@ -0,0 +1,85 @@ +<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> + <parent> + <groupId>net.sourceforge.openutils</groupId> + <artifactId>openutils</artifactId> + <version>3</version> + <relativePath>..</relativePath> + </parent> + <artifactId>openutils-tags-spring</artifactId> + <name>openutils tags for spring MVC</name> + <version>0.2</version> + <description /> + <dependencies> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.4</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>jstl</groupId> + <artifactId>jstl</artifactId> + <version>1.1.2</version> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jsp-api</artifactId> + <version>2.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.2</version> + </dependency> + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <version>1.7.0</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>1.2</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-web</artifactId> + <version>2.0.1</version> + <optional>true</optional> + <exclusions> + <exclusion> + <groupId>taglibs</groupId> + <artifactId>standard</artifactId> + </exclusion> + <exclusion> + <groupId>logkit</groupId> + <artifactId>logkit</artifactId> + </exclusion> + <exclusion> + <groupId>avalon-framework</groupId> + <artifactId>avalon-framework</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.13</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.0</version> + <scope>test</scope> + </dependency> + </dependencies> + + <scm> + <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-tags-spring-0.2</connection> + <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-tags-spring-0.2</developerConnection> + <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-tags-spring-0.2</url> + </scm> +</project> \ No newline at end of file Deleted: tags/openutils-tags-spring-0.2/src/main/resources/META-INF/tags/ou/input.tag =================================================================== --- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/input.tag 2007-02-05 21:37:30 UTC (rev 208) +++ tags/openutils-tags-spring-0.2/src/main/resources/META-INF/tags/ou/input.tag 2007-02-05 23:08:07 UTC (rev 228) @@ -1,136 +0,0 @@ -<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" - xmlns:spring="http://www.springframework.org/tags" xmlns:c="http://java.sun.com/jsp/jstl/core" - xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:su="http://openutils.sourceforge.net/openutils-tags-commonslang" xmlns:ou="http://openutils.sourceforge.net/openutils-tags-spring"> - - <jsp:directive.attribute name="path" required="true" /> - <jsp:directive.attribute name="name" required="false" /> - <jsp:directive.attribute name="maxlength" required="false" type="java.lang.Integer" /> - <jsp:directive.attribute name="readonly" required="false" type="java.lang.Boolean" /> - <jsp:directive.attribute name="disabled" required="false" type="java.lang.Boolean" /> - <jsp:directive.attribute name="bare" required="false" type="java.lang.Boolean" /> - <jsp:directive.attribute name="type" required="false" /> - <jsp:directive.attribute name="nobind" required="false" type="java.lang.Boolean" /> - <jsp:directive.attribute name="style" required="false" /> - <jsp:directive.attribute name="onkeypress" required="false" /> - <jsp:directive.attribute name="onkeydown" required="false" /> - <jsp:directive.attribute name="onkeyup" required="false" /> - <jsp:directive.attribute name="onchange" required="false" /> - <jsp:directive.attribute name="cssclass" required="false" /> - <jsp:directive.attribute name="key" required="false" /> - <jsp:directive.attribute name="onblur" required="false" /> - <jsp:directive.attribute name="label" required="false" type="java.lang.String" /> - - - <c:if test="${empty(key)}"> - <c:set var="key">${path}</c:set> - </c:if> - <c:if test="${empty(name)}"> - <c:set var="name">${su:substringAfter(path, ".")}</c:set> - </c:if> - <c:if test="${empty(maxlength)}"> - <c:set var="maxlength">30</c:set> - </c:if> - <c:if test="${type == 'key' and !empty(status.value)}"> - <c:set var="type">hidden</c:set> - </c:if> - <c:if test="${type == 'keyshow' and !empty(status.value)}"> - <c:set var="readonly" value="${true}" /> - </c:if> - <c:set var="divclass">formelement</c:set> - - - <c:choose> - <c:when test="${empty(label)}"> - <c:set var="labelmsg"><fmt:message key="${key}" /></c:set> - </c:when> - <c:otherwise> - <c:set var="labelmsg">${label}</c:set> - </c:otherwise> - </c:choose> - - <c:choose> - <c:when test="${!nobind}"> - <spring:bind path="${path}"> - <c:set var="divclass">formelement <c:if test="${!empty(status.errorMessage)}"> formelementerror</c:if></c:set> - - <c:choose> - <c:when test="${type == 'hidden'}"> - <input type="hidden" name="${name}" id="${name}" value="${status.value}" /> - </c:when> - <c:when test="${bare}"> - - <c:choose> - <c:when test="${maxlength le 256}"> - <ou:txtinput type="text" name="${name}" value="${status.value}" cssclass="text ${cssclass}" maxlength="${maxlength}" style="${style}" readonly="${readonly}" disabled="${disabled}" onkeypress="${onkeypress}" onkeydown="${onkeydown}" onkeyup="${onkeyup}" onchange="${onchange}" onblur="${onblur}"/> - </c:when> - <c:otherwise> - <ou:txttextarea name="${name}" value="${status.value}" style="${style}" cssclass="inputtextarea ${cssclass}" /> - </c:otherwise> - </c:choose> - </c:when> - <c:when test="${type == 'password'}"> - <div class="${divclass}"> - <label for="${name}">${labelmsg}:</label> - - - <ou:txtinput type="password" name="${name}" value="${status.value}" cssclass="text ${cssclass}" maxlength="${maxlength}" style="${style}" readonly="${readonly}" disabled="${disabled}" onkeypress="${onkeypress}" onkeydown="${onkeydown}" onkeyup="${onkeyup}" onchange="${onchange}" onblur="${onblur}"/> - - - - - <div class="clear"><!-- --></div> - </div> - </c:when> - <c:otherwise> - <div class="${divclass}"> - <label for="${name}">${labelmsg}:</label> - - <c:choose> - <c:when test="${maxlength le 256}"> - <ou:txtinput type="text" name="${name}" value="${status.value}" cssclass="text ${cssclass}" maxlength="${maxlength}" style="${style}" readonly="${readonly}" disabled="${disabled}" onkeypress="${onkeypress}" onkeydown="${onkeydown}" onkeyup="${onkeyup}" onchange="${onchange}" onblur="${onblur}"/> - </c:when> - <c:otherwise> - <ou:txttextarea name="${name}" value="${status.value}" style="${style}" cssclass="inputtextarea ${cssclass}" /> - </c:otherwise> - </c:choose> - - - <div class="clear"><!-- --></div> - </div> - </c:otherwise> - </c:choose> - </spring:bind> - </c:when> - <c:otherwise> - - <c:choose> - <c:when test="${type == 'hidden'}"> - <input type="hidden" name="${name}" id="${name}" value="${status.value}" /> - </c:when> - <c:when test="${bare}"> - <ou:txtinput type="text" name="${name}" value="${status.value}" cssclass="text" maxlength="${maxlength}" style="${style}" readonly="${readonly}" disabled="${disabled}" onkeypress="${onkeypress}" onkeydown="${onkeydown}" onkeyup="${onkeyup}" onchange="${onchange}" onblur="${onblur}"/> - </c:when> - <c:otherwise> - <div class="${divclass}"> - <label for="${name}">${labelmsg}:</label> - - <c:choose> - <c:when test="${maxlength le 256}"> - <ou:txtinput type="text" name="${name}" value="${status.value}" cssclass="text" maxlength="${maxlength}" style="${style}" readonly="${readonly}" disabled="${disabled}" onkeypress="${onkeypress}" onkeydown="${onkeydown}" onkeyup="${onkeyup}" onchange="${onchange}" onblur="${onblur}"/> - </c:when> - <c:otherwise> - <ou:txttextarea name="${name}" value="${status.value}" style="${style}" cssclass="inputtextarea" /> - </c:otherwise> - </c:choose> - - - <div class="clear"><!-- --></div> - </div> - </c:otherwise> - </c:choose> - </c:otherwise> - </c:choose> - - - -</jsp:root> Copied: tags/openutils-tags-spring-0.2/src/main/resources/META-INF/tags/ou/input.tag (from rev 226, trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/input.tag) =================================================================== --- tags/openutils-tags-spring-0.2/src/main/resources/META-INF/tags/ou/input.tag (rev 0) +++ tags/openutils-tags-spring-0.2/src/main/resources/META-INF/tags/ou/input.tag 2007-02-05 23:08:07 UTC (rev 228) @@ -0,0 +1,148 @@ +<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" + xmlns:spring="http://www.springframework.org/tags" xmlns:c="http://java.sun.com/jsp/jstl/core" + xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:su="http://openutils.sourceforge.net/openutils-tags-commonslang" xmlns:ou="http://openutils.sourceforge.net/openutils-tags-spring"> + + <jsp:directive.attribute name="path" required="true" /> + <jsp:directive.attribute name="name" required="false" /> + <jsp:directive.attribute name="maxlength" required="false" type="java.lang.Integer" /> + <jsp:directive.attribute name="readonly" required="false" type="java.lang.Boolean" /> + <jsp:directive.attribute name="disabled" required="false" type="java.lang.Boolean" /> + <jsp:directive.attribute name="bare" required="false" type="java.lang.Boolean" /> + <jsp:directive.attribute name="type" required="false" /> + <jsp:directive.attribute name="nobind" required="false" type="java.lang.Boolean" /> + <jsp:directive.attribute name="style" required="false" /> + <jsp:directive.attribute name="onkeypress" required="false" /> + <jsp:directive.attribute name="onkeydown" required="false" /> + <jsp:directive.attribute name="onkeyup" required="false" /> + <jsp:directive.attribute name="onchange" required="false" /> + <jsp:directive.attribute name="cssclass" required="false" /> + <jsp:directive.attribute name="key" required="false" /> + <jsp:directive.attribute name="onblur" required="false" /> + <jsp:directive.attribute name="label" required="false" type="java.lang.String" /> + + + <c:if test="${empty(key)}"> + <c:set var="key">${path}</c:set> + </c:if> + <c:if test="${empty(name)}"> + <c:set var="name">${su:substringAfter(path, ".")}</c:set> + </c:if> + <c:if test="${empty(maxlength)}"> + <c:set var="maxlength">30</c:set> + </c:if> + <c:if test="${type == 'key' and !empty(status.value)}"> + <c:set var="type">hidden</c:set> + </c:if> + <c:if test="${type == 'keyshow' and !empty(status.value)}"> + <c:set var="readonly" value="${true}" /> + </c:if> + <c:if test="${type == 'date'}"> + <c:set var="type">text</c:set> + <c:set var="datepicker" value="${true}" /> + </c:if> + <c:set var="divclass">formelement</c:set> + + + <c:choose> + <c:when test="${empty(label)}"> + <c:set var="labelmsg"><fmt:message key="${key}" /></c:set> + </c:when> + <c:otherwise> + <c:set var="labelmsg">${label}</c:set> + </c:otherwise> + </c:choose> + + <c:choose> + <c:when test="${!nobind}"> + <spring:bind path="${path}"> + <c:set var="divclass">formelement <c:if test="${!empty(status.errorMessage)}"> formelementerror</c:if></c:set> + + <c:choose> + <c:when test="${type == 'hidden'}"> + <input type="hidden" name="${name}" id="${name}" value="${status.value}" /> + </c:when> + <c:when test="${bare}"> + + <c:choose> + <c:when test="${maxlength le 256}"> + <ou:txtinput type="text" name="${name}" value="${status.value}" cssclass="text ${cssclass}" maxlength="${maxlength}" style="${style}" readonly="${readonly}" disabled="${disabled}" onkeypress="${onkeypress}" onkeydown="${onkeydown}" onkeyup="${onkeyup}" onchange="${onchange}" onblur="${onblur}"/> + </c:when> + <c:otherwise> + <ou:txttextarea name="${name}" value="${status.value}" style="${style}" cssclass="inputtextarea ${cssclass}" /> + </c:otherwise> + </c:choose> + </c:when> + <c:when test="${type == 'password'}"> + <div class="${divclass}"> + <label for="${name}">${labelmsg}:</label> + + + <ou:txtinput type="password" name="${name}" value="${status.value}" cssclass="text ${cssclass}" maxlength="${maxlength}" style="${style}" readonly="${readonly}" disabled="${disabled}" onkeypress="${onkeypress}" onkeydown="${onkeydown}" onkeyup="${onkeyup}" onchange="${onchange}" onblur="${onblur}"/> + + + + + <div class="clear"><!-- --></div> + </div> + </c:when> + <c:otherwise> + <div class="${divclass}"> + <label for="${name}">${labelmsg}:</label> + + <c:choose> + <c:when test="${maxlength le 256}"> + <ou:txtinput type="text" name="${name}" value="${status.value}" cssclass="text ${cssclass}" maxlength="${maxlength}" style="${style}" readonly="${readonly}" disabled="${disabled}" onkeypress="${onkeypress}" onkeydown="${onkeydown}" onkeyup="${onkeyup}" onchange="${onchange}" onblur="${onblur}"/> + </c:when> + <c:otherwise> + <ou:txttextarea name="${name}" value="${status.value}" style="${style}" cssclass="inputtextarea ${cssclass}" /> + </c:otherwise> + </c:choose> + + <c:if test="${datepicker}"> + <a href="javascript:showCal('divdata${name}','${name}')" title="seleziona" class="calbtn"> + <span>C</span> + </a> + <div class="calendar" id="divdata${name}" style="display:none"><!-- --></div> + <!--[if gte IE 5.5]> + <iframe id='divdata${name}iframe' class='calendarIframe' src='javascript:false;' frameBorder='0' scrolling='no' + style="display:none;filter:progid:DXImageTransform.Microsoft.Alpha(style=0,opacity=0)"><!-- x --></iframe> + <![endif]--> + <script type="text/javascript">createCalendar('${status.value}', 'divdata${name}', '${name}')</script> + </c:if> + + <div class="clear"><!-- --></div> + </div> + </c:otherwise> + </c:choose> + </spring:bind> + </c:when> + <c:otherwise> + + <c:choose> + <c:when test="${type == 'hidden'}"> + <input type="hidden" name="${name}" id="${name}" value="${status.value}" /> + </c:when> + <c:when test="${bare}"> + <ou:txtinput type="text" name="${name}" value="${status.value}" cssclass="text" maxlength="${maxlength}" style="${style}" readonly="${readonly}" disabled="${disabled}" onkeypress="${onkeypress}" onkeydown="${onkeydown}" onkeyup="${onkeyup}" onchange="${onchange}" onblur="${onblur}"/> + </c:when> + <c:otherwise> + <div class="${divclass}"> + <label for="${name}">${labelmsg}:</label> + + <c:choose> + <c:when test="${maxlength le 256}"> + <ou:txtinput type="text" name="${name}" value="${status.value}" cssclass="text" maxlength="${maxlength}" style="${style}" readonly="${readonly}" disabled="${disabled}" onkeypress="${onkeypress}" onkeydown="${onkeydown}" onkeyup="${onkeyup}" onchange="${onchange}" onblur="${onblur}"/> + </c:when> + <c:otherwise> + <ou:txttextarea name="${name}" value="${status.value}" style="${style}" cssclass="inputtextarea" /> + </c:otherwise> + </c:choose> + + + <div class="clear"><!-- --></div> + </div> + </c:otherwise> + </c:choose> + </c:otherwise> + </c:choose> +</jsp:root> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2007-02-05 23:07:56
|
Revision: 227 http://svn.sourceforge.net/openutils/?rev=227&view=rev Author: fgiust Date: 2007-02-05 15:07:57 -0800 (Mon, 05 Feb 2007) Log Message: ----------- [maven-release-plugin] prepare release openutils-tags-spring-0.2 Modified Paths: -------------- trunk/openutils-tags-spring/pom.xml Modified: trunk/openutils-tags-spring/pom.xml =================================================================== --- trunk/openutils-tags-spring/pom.xml 2007-02-05 23:07:03 UTC (rev 226) +++ trunk/openutils-tags-spring/pom.xml 2007-02-05 23:07:57 UTC (rev 227) @@ -8,7 +8,7 @@ </parent> <artifactId>openutils-tags-spring</artifactId> <name>openutils tags for spring MVC</name> - <version>1.0-SNAPSHOT</version> + <version>0.2</version> <description /> <dependencies> <dependency> @@ -76,4 +76,10 @@ <scope>test</scope> </dependency> </dependencies> + + <scm> + <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-tags-spring-0.2</connection> + <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-tags-spring-0.2</developerConnection> + <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-tags-spring-0.2</url> + </scm> </project> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2007-02-05 23:07:03
|
Revision: 226 http://svn.sourceforge.net/openutils/?rev=226&view=rev Author: fgiust Date: 2007-02-05 15:07:03 -0800 (Mon, 05 Feb 2007) Log Message: ----------- handle date fields Modified Paths: -------------- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/input.tag Modified: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/input.tag =================================================================== --- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/input.tag 2007-02-05 21:54:13 UTC (rev 225) +++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/input.tag 2007-02-05 23:07:03 UTC (rev 226) @@ -17,7 +17,7 @@ <jsp:directive.attribute name="onchange" required="false" /> <jsp:directive.attribute name="cssclass" required="false" /> <jsp:directive.attribute name="key" required="false" /> - <jsp:directive.attribute name="onblur" required="false" /> + <jsp:directive.attribute name="onblur" required="false" /> <jsp:directive.attribute name="label" required="false" type="java.lang.String" /> @@ -36,101 +36,113 @@ <c:if test="${type == 'keyshow' and !empty(status.value)}"> <c:set var="readonly" value="${true}" /> </c:if> + <c:if test="${type == 'date'}"> + <c:set var="type">text</c:set> + <c:set var="datepicker" value="${true}" /> + </c:if> <c:set var="divclass">formelement</c:set> - <c:choose> - <c:when test="${empty(label)}"> - <c:set var="labelmsg"><fmt:message key="${key}" /></c:set> - </c:when> - <c:otherwise> - <c:set var="labelmsg">${label}</c:set> - </c:otherwise> - </c:choose> + <c:choose> + <c:when test="${empty(label)}"> + <c:set var="labelmsg"><fmt:message key="${key}" /></c:set> + </c:when> + <c:otherwise> + <c:set var="labelmsg">${label}</c:set> + </c:otherwise> + </c:choose> <c:choose> <c:when test="${!nobind}"> <spring:bind path="${path}"> - <c:set var="divclass">formelement <c:if test="${!empty(status.errorMessage)}"> formelementerror</c:if></c:set> + <c:set var="divclass">formelement <c:if test="${!empty(status.errorMessage)}"> formelementerror</c:if></c:set> - <c:choose> - <c:when test="${type == 'hidden'}"> - <input type="hidden" name="${name}" id="${name}" value="${status.value}" /> - </c:when> - <c:when test="${bare}"> + <c:choose> + <c:when test="${type == 'hidden'}"> + <input type="hidden" name="${name}" id="${name}" value="${status.value}" /> + </c:when> + <c:when test="${bare}"> - <c:choose> - <c:when test="${maxlength le 256}"> - <ou:txtinput type="text" name="${name}" value="${status.value}" cssclass="text ${cssclass}" maxlength="${maxlength}" style="${style}" readonly="${readonly}" disabled="${disabled}" onkeypress="${onkeypress}" onkeydown="${onkeydown}" onkeyup="${onkeyup}" onchange="${onchange}" onblur="${onblur}"/> - </c:when> - <c:otherwise> - <ou:txttextarea name="${name}" value="${status.value}" style="${style}" cssclass="inputtextarea ${cssclass}" /> - </c:otherwise> - </c:choose> - </c:when> - <c:when test="${type == 'password'}"> - <div class="${divclass}"> - <label for="${name}">${labelmsg}:</label> + <c:choose> + <c:when test="${maxlength le 256}"> + <ou:txtinput type="text" name="${name}" value="${status.value}" cssclass="text ${cssclass}" maxlength="${maxlength}" style="${style}" readonly="${readonly}" disabled="${disabled}" onkeypress="${onkeypress}" onkeydown="${onkeydown}" onkeyup="${onkeyup}" onchange="${onchange}" onblur="${onblur}"/> + </c:when> + <c:otherwise> + <ou:txttextarea name="${name}" value="${status.value}" style="${style}" cssclass="inputtextarea ${cssclass}" /> + </c:otherwise> + </c:choose> + </c:when> + <c:when test="${type == 'password'}"> + <div class="${divclass}"> + <label for="${name}">${labelmsg}:</label> - <ou:txtinput type="password" name="${name}" value="${status.value}" cssclass="text ${cssclass}" maxlength="${maxlength}" style="${style}" readonly="${readonly}" disabled="${disabled}" onkeypress="${onkeypress}" onkeydown="${onkeydown}" onkeyup="${onkeyup}" onchange="${onchange}" onblur="${onblur}"/> + <ou:txtinput type="password" name="${name}" value="${status.value}" cssclass="text ${cssclass}" maxlength="${maxlength}" style="${style}" readonly="${readonly}" disabled="${disabled}" onkeypress="${onkeypress}" onkeydown="${onkeydown}" onkeyup="${onkeyup}" onchange="${onchange}" onblur="${onblur}"/> - <div class="clear"><!-- --></div> - </div> - </c:when> - <c:otherwise> - <div class="${divclass}"> - <label for="${name}">${labelmsg}:</label> + <div class="clear"><!-- --></div> + </div> + </c:when> + <c:otherwise> + <div class="${divclass}"> + <label for="${name}">${labelmsg}:</label> <c:choose> - <c:when test="${maxlength le 256}"> - <ou:txtinput type="text" name="${name}" value="${status.value}" cssclass="text ${cssclass}" maxlength="${maxlength}" style="${style}" readonly="${readonly}" disabled="${disabled}" onkeypress="${onkeypress}" onkeydown="${onkeydown}" onkeyup="${onkeyup}" onchange="${onchange}" onblur="${onblur}"/> - </c:when> - <c:otherwise> - <ou:txttextarea name="${name}" value="${status.value}" style="${style}" cssclass="inputtextarea ${cssclass}" /> - </c:otherwise> - </c:choose> + <c:when test="${maxlength le 256}"> + <ou:txtinput type="text" name="${name}" value="${status.value}" cssclass="text ${cssclass}" maxlength="${maxlength}" style="${style}" readonly="${readonly}" disabled="${disabled}" onkeypress="${onkeypress}" onkeydown="${onkeydown}" onkeyup="${onkeyup}" onchange="${onchange}" onblur="${onblur}"/> + </c:when> + <c:otherwise> + <ou:txttextarea name="${name}" value="${status.value}" style="${style}" cssclass="inputtextarea ${cssclass}" /> + </c:otherwise> + </c:choose> + <c:if test="${datepicker}"> + <a href="javascript:showCal('divdata${name}','${name}')" title="seleziona" class="calbtn"> + <span>C</span> + </a> + <div class="calendar" id="divdata${name}" style="display:none"><!-- --></div> + <!--[if gte IE 5.5]> + <iframe id='divdata${name}iframe' class='calendarIframe' src='javascript:false;' frameBorder='0' scrolling='no' + style="display:none;filter:progid:DXImageTransform.Microsoft.Alpha(style=0,opacity=0)"><!-- x --></iframe> + <![endif]--> + <script type="text/javascript">createCalendar('${status.value}', 'divdata${name}', '${name}')</script> + </c:if> - <div class="clear"><!-- --></div> - </div> - </c:otherwise> - </c:choose> + <div class="clear"><!-- --></div> + </div> + </c:otherwise> + </c:choose> </spring:bind> </c:when> <c:otherwise> - <c:choose> - <c:when test="${type == 'hidden'}"> - <input type="hidden" name="${name}" id="${name}" value="${status.value}" /> - </c:when> - <c:when test="${bare}"> - <ou:txtinput type="text" name="${name}" value="${status.value}" cssclass="text" maxlength="${maxlength}" style="${style}" readonly="${readonly}" disabled="${disabled}" onkeypress="${onkeypress}" onkeydown="${onkeydown}" onkeyup="${onkeyup}" onchange="${onchange}" onblur="${onblur}"/> - </c:when> - <c:otherwise> - <div class="${divclass}"> - <label for="${name}">${labelmsg}:</label> + <c:choose> + <c:when test="${type == 'hidden'}"> + <input type="hidden" name="${name}" id="${name}" value="${status.value}" /> + </c:when> + <c:when test="${bare}"> + <ou:txtinput type="text" name="${name}" value="${status.value}" cssclass="text" maxlength="${maxlength}" style="${style}" readonly="${readonly}" disabled="${disabled}" onkeypress="${onkeypress}" onkeydown="${onkeydown}" onkeyup="${onkeyup}" onchange="${onchange}" onblur="${onblur}"/> + </c:when> + <c:otherwise> + <div class="${divclass}"> + <label for="${name}">${labelmsg}:</label> <c:choose> - <c:when test="${maxlength le 256}"> - <ou:txtinput type="text" name="${name}" value="${status.value}" cssclass="text" maxlength="${maxlength}" style="${style}" readonly="${readonly}" disabled="${disabled}" onkeypress="${onkeypress}" onkeydown="${onkeydown}" onkeyup="${onkeyup}" onchange="${onchange}" onblur="${onblur}"/> - </c:when> - <c:otherwise> - <ou:txttextarea name="${name}" value="${status.value}" style="${style}" cssclass="inputtextarea" /> - </c:otherwise> - </c:choose> + <c:when test="${maxlength le 256}"> + <ou:txtinput type="text" name="${name}" value="${status.value}" cssclass="text" maxlength="${maxlength}" style="${style}" readonly="${readonly}" disabled="${disabled}" onkeypress="${onkeypress}" onkeydown="${onkeydown}" onkeyup="${onkeyup}" onchange="${onchange}" onblur="${onblur}"/> + </c:when> + <c:otherwise> + <ou:txttextarea name="${name}" value="${status.value}" style="${style}" cssclass="inputtextarea" /> + </c:otherwise> + </c:choose> - <div class="clear"><!-- --></div> - </div> - </c:otherwise> - </c:choose> + <div class="clear"><!-- --></div> + </div> + </c:otherwise> + </c:choose> </c:otherwise> </c:choose> - - - </jsp:root> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2007-02-05 21:54:13
|
Revision: 225 http://svn.sourceforge.net/openutils/?rev=225&view=rev Author: fgiust Date: 2007-02-05 13:54:13 -0800 (Mon, 05 Feb 2007) Log Message: ----------- [maven-release-plugin] prepare for next development iteration Modified Paths: -------------- trunk/openutils-web/pom.xml Modified: trunk/openutils-web/pom.xml =================================================================== --- trunk/openutils-web/pom.xml 2007-02-05 21:53:59 UTC (rev 224) +++ trunk/openutils-web/pom.xml 2007-02-05 21:54:13 UTC (rev 225) @@ -8,7 +8,7 @@ </parent> <artifactId>openutils-web</artifactId> <name>openutils generic web utilities</name> - <version>0.1</version> + <version>1.0-SNAPSHOT</version> <description /> <dependencies> <dependency> @@ -40,10 +40,4 @@ <scope>test</scope> </dependency> </dependencies> - - <scm> - <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-web-0.1</connection> - <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-web-0.1</developerConnection> - <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-web-0.1</url> - </scm> </project> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2007-02-05 21:54:05
|
Revision: 224 http://svn.sourceforge.net/openutils/?rev=224&view=rev Author: fgiust Date: 2007-02-05 13:53:59 -0800 (Mon, 05 Feb 2007) Log Message: ----------- [maven-scm] copy for tag openutils-web-0.1 Added Paths: ----------- tags/openutils-web-0.1/ tags/openutils-web-0.1/pom.xml Removed Paths: ------------- tags/openutils-web-0.1/pom.xml Copied: tags/openutils-web-0.1 (from rev 208, trunk/openutils-web) Deleted: tags/openutils-web-0.1/pom.xml =================================================================== --- trunk/openutils-web/pom.xml 2007-02-05 21:37:30 UTC (rev 208) +++ tags/openutils-web-0.1/pom.xml 2007-02-05 21:53:59 UTC (rev 224) @@ -1,43 +0,0 @@ -<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> - <parent> - <groupId>net.sourceforge.openutils</groupId> - <artifactId>openutils</artifactId> - <version>3</version> - <relativePath>..</relativePath> - </parent> - <artifactId>openutils-web</artifactId> - <name>openutils generic web utilities</name> - <version>1.0-SNAPSHOT</version> - <description /> - <dependencies> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.2</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>1.0.1</version> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.4</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.13</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.0</version> - <scope>test</scope> - </dependency> - </dependencies> -</project> \ No newline at end of file Copied: tags/openutils-web-0.1/pom.xml (from rev 223, trunk/openutils-web/pom.xml) =================================================================== --- tags/openutils-web-0.1/pom.xml (rev 0) +++ tags/openutils-web-0.1/pom.xml 2007-02-05 21:53:59 UTC (rev 224) @@ -0,0 +1,49 @@ +<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> + <parent> + <groupId>net.sourceforge.openutils</groupId> + <artifactId>openutils</artifactId> + <version>3</version> + <relativePath>..</relativePath> + </parent> + <artifactId>openutils-web</artifactId> + <name>openutils generic web utilities</name> + <version>0.1</version> + <description /> + <dependencies> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.2</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>1.2</version> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.4</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.13</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.0</version> + <scope>test</scope> + </dependency> + </dependencies> + + <scm> + <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-web-0.1</connection> + <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-web-0.1</developerConnection> + <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-web-0.1</url> + </scm> +</project> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2007-02-05 21:53:49
|
Revision: 223 http://svn.sourceforge.net/openutils/?rev=223&view=rev Author: fgiust Date: 2007-02-05 13:53:49 -0800 (Mon, 05 Feb 2007) Log Message: ----------- [maven-release-plugin] prepare release openutils-web-0.1 Modified Paths: -------------- trunk/openutils-web/pom.xml Modified: trunk/openutils-web/pom.xml =================================================================== --- trunk/openutils-web/pom.xml 2007-02-05 21:53:22 UTC (rev 222) +++ trunk/openutils-web/pom.xml 2007-02-05 21:53:49 UTC (rev 223) @@ -8,7 +8,7 @@ </parent> <artifactId>openutils-web</artifactId> <name>openutils generic web utilities</name> - <version>1.0-SNAPSHOT</version> + <version>0.1</version> <description /> <dependencies> <dependency> @@ -40,4 +40,10 @@ <scope>test</scope> </dependency> </dependencies> + + <scm> + <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-web-0.1</connection> + <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-web-0.1</developerConnection> + <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-web-0.1</url> + </scm> </project> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2007-02-05 21:53:22
|
Revision: 222 http://svn.sourceforge.net/openutils/?rev=222&view=rev Author: fgiust Date: 2007-02-05 13:53:22 -0800 (Mon, 05 Feb 2007) Log Message: ----------- update slf4j Modified Paths: -------------- trunk/openutils-web/pom.xml Modified: trunk/openutils-web/pom.xml =================================================================== --- trunk/openutils-web/pom.xml 2007-02-05 21:50:28 UTC (rev 221) +++ trunk/openutils-web/pom.xml 2007-02-05 21:53:22 UTC (rev 222) @@ -19,7 +19,7 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> - <version>1.0.1</version> + <version>1.2</version> </dependency> <dependency> <groupId>javax.servlet</groupId> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2007-02-05 21:50:30
|
Revision: 221 http://svn.sourceforge.net/openutils/?rev=221&view=rev Author: fgiust Date: 2007-02-05 13:50:28 -0800 (Mon, 05 Feb 2007) Log Message: ----------- [maven-release-plugin] prepare for next development iteration Modified Paths: -------------- trunk/openutils-tags-spring/pom.xml Modified: trunk/openutils-tags-spring/pom.xml =================================================================== --- trunk/openutils-tags-spring/pom.xml 2007-02-05 21:50:17 UTC (rev 220) +++ trunk/openutils-tags-spring/pom.xml 2007-02-05 21:50:28 UTC (rev 221) @@ -8,7 +8,7 @@ </parent> <artifactId>openutils-tags-spring</artifactId> <name>openutils tags for spring MVC</name> - <version>0.1</version> + <version>1.0-SNAPSHOT</version> <description /> <dependencies> <dependency> @@ -76,10 +76,4 @@ <scope>test</scope> </dependency> </dependencies> - - <scm> - <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-tags-spring-0.1</connection> - <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-tags-spring-0.1</developerConnection> - <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-tags-spring-0.1</url> - </scm> </project> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2007-02-05 21:50:27
|
Revision: 220 http://svn.sourceforge.net/openutils/?rev=220&view=rev Author: fgiust Date: 2007-02-05 13:50:17 -0800 (Mon, 05 Feb 2007) Log Message: ----------- [maven-scm] copy for tag openutils-tags-spring-0.1 Added Paths: ----------- tags/openutils-tags-spring-0.1/ tags/openutils-tags-spring-0.1/pom.xml Removed Paths: ------------- tags/openutils-tags-spring-0.1/pom.xml Copied: tags/openutils-tags-spring-0.1 (from rev 208, trunk/openutils-tags-spring) Deleted: tags/openutils-tags-spring-0.1/pom.xml =================================================================== --- trunk/openutils-tags-spring/pom.xml 2007-02-05 21:37:30 UTC (rev 208) +++ tags/openutils-tags-spring-0.1/pom.xml 2007-02-05 21:50:17 UTC (rev 220) @@ -1,80 +0,0 @@ -<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> - <parent> - <groupId>net.sourceforge.openutils</groupId> - <artifactId>openutils</artifactId> - <version>3</version> - <relativePath>..</relativePath> - </parent> - <artifactId>openutils-tags-spring</artifactId> - <name>openutils tags for spring MVC</name> - <version>1.0-SNAPSHOT</version> - <description /> - <dependencies> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.4</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>jstl</groupId> - <artifactId>jstl</artifactId> - <version>1.1.2</version> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jsp-api</artifactId> - <version>2.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.2</version> - </dependency> - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - <version>1.7.0</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>1.0.1</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-web</artifactId> - <version>2.0.1</version> - <optional>true</optional> - <exclusions> - <exclusion> - <groupId>taglibs</groupId> - <artifactId>standard</artifactId> - </exclusion> - <exclusion> - <groupId>logkit</groupId> - <artifactId>logkit</artifactId> - </exclusion> - <exclusion> - <groupId>avalon-framework</groupId> - <artifactId>avalon-framework</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.13</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.0</version> - <scope>test</scope> - </dependency> - </dependencies> -</project> \ No newline at end of file Copied: tags/openutils-tags-spring-0.1/pom.xml (from rev 219, trunk/openutils-tags-spring/pom.xml) =================================================================== --- tags/openutils-tags-spring-0.1/pom.xml (rev 0) +++ tags/openutils-tags-spring-0.1/pom.xml 2007-02-05 21:50:17 UTC (rev 220) @@ -0,0 +1,85 @@ +<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> + <parent> + <groupId>net.sourceforge.openutils</groupId> + <artifactId>openutils</artifactId> + <version>3</version> + <relativePath>..</relativePath> + </parent> + <artifactId>openutils-tags-spring</artifactId> + <name>openutils tags for spring MVC</name> + <version>0.1</version> + <description /> + <dependencies> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.4</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>jstl</groupId> + <artifactId>jstl</artifactId> + <version>1.1.2</version> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jsp-api</artifactId> + <version>2.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.2</version> + </dependency> + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <version>1.7.0</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>1.2</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-web</artifactId> + <version>2.0.1</version> + <optional>true</optional> + <exclusions> + <exclusion> + <groupId>taglibs</groupId> + <artifactId>standard</artifactId> + </exclusion> + <exclusion> + <groupId>logkit</groupId> + <artifactId>logkit</artifactId> + </exclusion> + <exclusion> + <groupId>avalon-framework</groupId> + <artifactId>avalon-framework</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.13</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.0</version> + <scope>test</scope> + </dependency> + </dependencies> + + <scm> + <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-tags-spring-0.1</connection> + <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-tags-spring-0.1</developerConnection> + <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-tags-spring-0.1</url> + </scm> +</project> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2007-02-05 21:50:11
|
Revision: 219 http://svn.sourceforge.net/openutils/?rev=219&view=rev Author: fgiust Date: 2007-02-05 13:50:07 -0800 (Mon, 05 Feb 2007) Log Message: ----------- [maven-release-plugin] prepare release openutils-tags-spring-0.1 Modified Paths: -------------- trunk/openutils-tags-spring/pom.xml Modified: trunk/openutils-tags-spring/pom.xml =================================================================== --- trunk/openutils-tags-spring/pom.xml 2007-02-05 21:49:02 UTC (rev 218) +++ trunk/openutils-tags-spring/pom.xml 2007-02-05 21:50:07 UTC (rev 219) @@ -1,5 +1,4 @@ -<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> <parent> <groupId>net.sourceforge.openutils</groupId> @@ -9,7 +8,7 @@ </parent> <artifactId>openutils-tags-spring</artifactId> <name>openutils tags for spring MVC</name> - <version>1.0-SNAPSHOT</version> + <version>0.1</version> <description /> <dependencies> <dependency> @@ -77,4 +76,10 @@ <scope>test</scope> </dependency> </dependencies> + + <scm> + <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-tags-spring-0.1</connection> + <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-tags-spring-0.1</developerConnection> + <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-tags-spring-0.1</url> + </scm> </project> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2007-02-05 21:49:07
|
Revision: 218 http://svn.sourceforge.net/openutils/?rev=218&view=rev Author: fgiust Date: 2007-02-05 13:49:02 -0800 (Mon, 05 Feb 2007) Log Message: ----------- update slf4j Modified Paths: -------------- trunk/openutils-tags-spring/pom.xml Modified: trunk/openutils-tags-spring/pom.xml =================================================================== --- trunk/openutils-tags-spring/pom.xml 2007-02-05 21:48:05 UTC (rev 217) +++ trunk/openutils-tags-spring/pom.xml 2007-02-05 21:49:02 UTC (rev 218) @@ -42,7 +42,7 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> - <version>1.0.1</version> + <version>1.2</version> </dependency> <dependency> <groupId>org.springframework</groupId> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2007-02-05 21:48:12
|
Revision: 217 http://svn.sourceforge.net/openutils/?rev=217&view=rev Author: fgiust Date: 2007-02-05 13:48:05 -0800 (Mon, 05 Feb 2007) Log Message: ----------- [maven-release-plugin] prepare for next development iteration Modified Paths: -------------- trunk/openutils-spring/pom.xml Modified: trunk/openutils-spring/pom.xml =================================================================== --- trunk/openutils-spring/pom.xml 2007-02-05 21:47:59 UTC (rev 216) +++ trunk/openutils-spring/pom.xml 2007-02-05 21:48:05 UTC (rev 217) @@ -8,7 +8,7 @@ </parent> <artifactId>openutils-spring</artifactId> <name>openutils spring tools</name> - <version>1.0.1</version> + <version>1.0.2-SNAPSHOT</version> <description /> <dependencies> <dependency> @@ -83,10 +83,4 @@ <scope>test</scope> </dependency> </dependencies> - - <scm> - <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-spring-1.0.1</connection> - <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-spring-1.0.1</developerConnection> - <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-spring-1.0.1</url> - </scm> </project> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2007-02-05 21:48:04
|
Revision: 216 http://svn.sourceforge.net/openutils/?rev=216&view=rev Author: fgiust Date: 2007-02-05 13:47:59 -0800 (Mon, 05 Feb 2007) Log Message: ----------- [maven-scm] copy for tag openutils-spring-1.0.1 Added Paths: ----------- tags/openutils-spring-1.0.1/ tags/openutils-spring-1.0.1/pom.xml tags/openutils-spring-1.0.1/src/main/java/it/openutils/web/spring/BaseFormController.java Removed Paths: ------------- tags/openutils-spring-1.0.1/pom.xml tags/openutils-spring-1.0.1/src/main/java/it/openutils/web/spring/BaseFormController.java Copied: tags/openutils-spring-1.0.1 (from rev 208, trunk/openutils-spring) Deleted: tags/openutils-spring-1.0.1/pom.xml =================================================================== --- trunk/openutils-spring/pom.xml 2007-02-05 21:37:30 UTC (rev 208) +++ tags/openutils-spring-1.0.1/pom.xml 2007-02-05 21:47:59 UTC (rev 216) @@ -1,87 +0,0 @@ -<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> - <parent> - <groupId>net.sourceforge.openutils</groupId> - <artifactId>openutils</artifactId> - <version>3</version> - <relativePath>..</relativePath> - </parent> - <artifactId>openutils-spring</artifactId> - <name>openutils spring tools</name> - <version>1.1-SNAPSHOT</version> - <description /> - <dependencies> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-webmvc</artifactId> - <version>2.0.1</version> - <optional>true</optional> - <exclusions> - <exclusion> - <groupId>javax.servlet</groupId> - <artifactId>jstl:jar</artifactId> - </exclusion> - <exclusion> - <groupId>taglibs</groupId> - <artifactId>standard</artifactId> - </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>logkit</groupId> - <artifactId>logkit</artifactId> - </exclusion> - <exclusion> - <groupId>avalon-framework</groupId> - <artifactId>avalon-framework</artifactId> - </exclusion> - <exclusion> - <groupId>struts</groupId> - <artifactId>struts</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.2</version> - </dependency> - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - <version>1.7.0</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>1.0.1</version> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-annotations</artifactId> - <version>3.2.1.ga</version> - <optional>true</optional> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.4</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.13</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> - </dependency> - </dependencies> -</project> \ No newline at end of file Copied: tags/openutils-spring-1.0.1/pom.xml (from rev 215, trunk/openutils-spring/pom.xml) =================================================================== --- tags/openutils-spring-1.0.1/pom.xml (rev 0) +++ tags/openutils-spring-1.0.1/pom.xml 2007-02-05 21:47:59 UTC (rev 216) @@ -0,0 +1,92 @@ +<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> + <parent> + <groupId>net.sourceforge.openutils</groupId> + <artifactId>openutils</artifactId> + <version>3</version> + <relativePath>..</relativePath> + </parent> + <artifactId>openutils-spring</artifactId> + <name>openutils spring tools</name> + <version>1.0.1</version> + <description /> + <dependencies> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-webmvc</artifactId> + <version>2.0.1</version> + <optional>true</optional> + <exclusions> + <exclusion> + <groupId>javax.servlet</groupId> + <artifactId>jstl:jar</artifactId> + </exclusion> + <exclusion> + <groupId>taglibs</groupId> + <artifactId>standard</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + <exclusion> + <groupId>logkit</groupId> + <artifactId>logkit</artifactId> + </exclusion> + <exclusion> + <groupId>avalon-framework</groupId> + <artifactId>avalon-framework</artifactId> + </exclusion> + <exclusion> + <groupId>struts</groupId> + <artifactId>struts</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.2</version> + </dependency> + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <version>1.7.0</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>1.2</version> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-annotations</artifactId> + <version>3.2.1.ga</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.4</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.13</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + </dependencies> + + <scm> + <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-spring-1.0.1</connection> + <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-spring-1.0.1</developerConnection> + <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-spring-1.0.1</url> + </scm> +</project> \ No newline at end of file Deleted: tags/openutils-spring-1.0.1/src/main/java/it/openutils/web/spring/BaseFormController.java =================================================================== --- trunk/openutils-spring/src/main/java/it/openutils/web/spring/BaseFormController.java 2007-02-05 21:37:30 UTC (rev 208) +++ tags/openutils-spring-1.0.1/src/main/java/it/openutils/web/spring/BaseFormController.java 2007-02-05 21:47:59 UTC (rev 216) @@ -1,118 +0,0 @@ -package it.openutils.web.spring; - -import it.openutils.web.util.MessageUtils; - -import java.text.SimpleDateFormat; -import java.util.Date; - -import javax.servlet.http.HttpServletRequest; - -import org.apache.commons.lang.ClassUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.springframework.beans.propertyeditors.CustomDateEditor; -import org.springframework.beans.propertyeditors.CustomNumberEditor; -import org.springframework.beans.propertyeditors.StringTrimmerEditor; -import org.springframework.web.bind.ServletRequestDataBinder; -import org.springframework.web.servlet.mvc.SimpleFormController; - - -/** - * @author fgiust - * @version $Revision$ ($Author$) - */ -public class BaseFormController extends SimpleFormController -{ - - /** - * Logger. - */ - protected Log log = LogFactory.getLog(getClass()); - - /** - * {@inheritDoc} - */ - @Override - protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) - { - // convert java.util.Date - SimpleDateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy"); - dateFormat.setLenient(false); - binder.registerCustomEditor(Date.class, null, new CustomDateEditor(dateFormat, true)); - - // convert Integers and Longs - binder.registerCustomEditor(Long.class, null, new CustomNumberEditor(Long.class, true)); - binder.registerCustomEditor(Double.class, null, new EasyDoubleCustomEditor(Double.class, true)); - binder.registerCustomEditor(Integer.class, null, new CustomNumberEditor(Integer.class, true)); - binder.registerCustomEditor(Short.class, null, new CustomNumberEditor(Short.class, true)); - - // trim empty strings - binder.registerCustomEditor(String.class, new StringTrimmerEditor(true)); - - } - - // /** - // * Convenience method for getting a i18n key's value. Calling getMessageSourceAccessor() is used because the - // * RequestContext variable is not set in unit tests b/c there's no DispatchServlet Request. - // * @param msgKey - // * @return String - // */ - // public String getText(String msgKey) - // { - // String currentLocale = ThreadLocaleHolder.getLocale(); - // if (currentLocale != null) - // { - // return getMessageSourceAccessor().getMessage(msgKey, new Locale(currentLocale)); - // } - // - // return getMessageSourceAccessor().getMessage(msgKey); - // } - - /** - * Convenient method for getting a i18n key's value with a single string argument. - * @param msgKey - * @param arg - * @return String - */ - public String getText(String msgKey, Object arg) - { - return getText(msgKey, new Object[]{arg}); - } - - // /** - // * Convenience method for getting a i18n key's value with arguments. - // * @param msgKey - // * @param args - // * @return String - // */ - // public String getText(String msgKey, Object[] args) - // { - // String currentLocale = ThreadLocaleHolder.getLocale(); - // if (currentLocale != null) - // { - // return getMessageSourceAccessor().getMessage(msgKey, args, new Locale(currentLocale)); - // } - // - // return getMessageSourceAccessor().getMessage(msgKey, args); - // } - - public void saveMessage(HttpServletRequest request, String message) - { - MessageUtils.saveMessage(request, message); - } - - public void saveError(HttpServletRequest request, String message) - { - MessageUtils.saveError(request, message); - } - - /** - * {@inheritDoc} - */ - @Override - public String toString() - { - return ClassUtils.getShortClassName(getClass()); - } - -} \ No newline at end of file Copied: tags/openutils-spring-1.0.1/src/main/java/it/openutils/web/spring/BaseFormController.java (from rev 214, trunk/openutils-spring/src/main/java/it/openutils/web/spring/BaseFormController.java) =================================================================== --- tags/openutils-spring-1.0.1/src/main/java/it/openutils/web/spring/BaseFormController.java (rev 0) +++ tags/openutils-spring-1.0.1/src/main/java/it/openutils/web/spring/BaseFormController.java 2007-02-05 21:47:59 UTC (rev 216) @@ -0,0 +1,84 @@ +package it.openutils.web.spring; + +import it.openutils.web.util.MessageUtils; + +import java.text.SimpleDateFormat; +import java.util.Date; + +import javax.servlet.http.HttpServletRequest; + +import org.apache.commons.lang.ClassUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.springframework.beans.propertyeditors.CustomDateEditor; +import org.springframework.beans.propertyeditors.CustomNumberEditor; +import org.springframework.beans.propertyeditors.StringTrimmerEditor; +import org.springframework.web.bind.ServletRequestDataBinder; +import org.springframework.web.servlet.mvc.SimpleFormController; + + +/** + * @author fgiust + * @version $Revision$ ($Author$) + */ +public class BaseFormController extends SimpleFormController +{ + + /** + * Logger. + */ + protected Log log = LogFactory.getLog(getClass()); + + /** + * {@inheritDoc} + */ + @Override + protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) + { + // convert java.util.Date + SimpleDateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy"); + dateFormat.setLenient(false); + binder.registerCustomEditor(Date.class, null, new CustomDateEditor(dateFormat, true, 10)); + + // convert Integers and Longs + binder.registerCustomEditor(Long.class, null, new CustomNumberEditor(Long.class, true)); + binder.registerCustomEditor(Double.class, null, new EasyDoubleCustomEditor(Double.class, true)); + binder.registerCustomEditor(Integer.class, null, new CustomNumberEditor(Integer.class, true)); + binder.registerCustomEditor(Short.class, null, new CustomNumberEditor(Short.class, true)); + + // trim empty strings + binder.registerCustomEditor(String.class, new StringTrimmerEditor(true)); + + } + + /** + * Convenient method for getting a i18n key's value with a single string argument. + * @param msgKey + * @param arg + * @return String + */ + public String getText(String msgKey, Object arg) + { + return getText(msgKey, new Object[]{arg }); + } + + public void saveMessage(HttpServletRequest request, String message) + { + MessageUtils.saveMessage(request, message); + } + + public void saveError(HttpServletRequest request, String message) + { + MessageUtils.saveError(request, message); + } + + /** + * {@inheritDoc} + */ + @Override + public String toString() + { + return ClassUtils.getShortClassName(getClass()); + } + +} \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2007-02-05 21:47:51
|
Revision: 215 http://svn.sourceforge.net/openutils/?rev=215&view=rev Author: fgiust Date: 2007-02-05 13:47:49 -0800 (Mon, 05 Feb 2007) Log Message: ----------- [maven-release-plugin] prepare release openutils-spring-1.0.1 Modified Paths: -------------- trunk/openutils-spring/pom.xml Modified: trunk/openutils-spring/pom.xml =================================================================== --- trunk/openutils-spring/pom.xml 2007-02-05 21:47:01 UTC (rev 214) +++ trunk/openutils-spring/pom.xml 2007-02-05 21:47:49 UTC (rev 215) @@ -1,5 +1,4 @@ -<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> <parent> <groupId>net.sourceforge.openutils</groupId> @@ -9,7 +8,7 @@ </parent> <artifactId>openutils-spring</artifactId> <name>openutils spring tools</name> - <version>1.1-SNAPSHOT</version> + <version>1.0.1</version> <description /> <dependencies> <dependency> @@ -84,4 +83,10 @@ <scope>test</scope> </dependency> </dependencies> + + <scm> + <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-spring-1.0.1</connection> + <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-spring-1.0.1</developerConnection> + <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-spring-1.0.1</url> + </scm> </project> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |