Menu
▾
▴
webmacro-cvs — receive cvs commit messages
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(11) |
Nov
(97) |
Dec
(35) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(12) |
Feb
(55) |
Mar
(21) |
Apr
(3) |
May
(7) |
Jun
(25) |
Jul
(108) |
Aug
(23) |
Sep
|
Oct
|
Nov
|
Dec
(4) |
| 2006 |
Jan
|
Feb
|
Mar
(6) |
Apr
(3) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2008 |
Jan
(13) |
Feb
|
Mar
(257) |
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(38) |
Dec
|
| 2009 |
Jan
|
Feb
(1) |
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2010 |
Jan
|
Feb
(63) |
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
(1) |
| 2011 |
Jan
|
Feb
(1) |
Mar
|
Apr
(1) |
May
(1) |
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Tim P <ti...@us...> - 2011-05-16 15:20:40
|
Update of /cvsroot/webmacro/webmacro/webmacro
In directory vz-cvs-4.sog:/tmp/cvs-serv8016
Modified Files:
pom.xml
Log Message:
Using Jenkins now
Index: pom.xml
===================================================================
RCS file: /cvsroot/webmacro/webmacro/webmacro/pom.xml,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** pom.xml 25 Feb 2010 01:49:08 -0000 1.30
--- pom.xml 16 May 2011 15:20:38 -0000 1.31
***************
*** 14,19 ****
<inceptionYear>1999</inceptionYear>
<ciManagement>
! <system>Hudson</system>
! <url>http://hudson.paneris.net/</url>
</ciManagement>
<mailingLists>
--- 14,19 ----
<inceptionYear>1999</inceptionYear>
<ciManagement>
! <system>Jenkins</system>
! <url>http://jenkins.paneris.net/</url>
</ciManagement>
<mailingLists>
|
|
From: L. <ar...@gg...> - 2011-04-18 03:49:58
|
We offer Photo to Painting services. Our portrait painters will create a 100% Handmade work of art as a perfect gift for your loved ones. Ordering Process: Step 1 - You send us the photo that you want to turn into a painting. Step 2 - We get back to you with sizes and prices. Step 3 - You choose size. Step 4 - We send you an invoice by email. Step 5 - You complete the payment (PayPal, bank transfer are accepted) Step 6 - We start painting your photo and will complete it within 17 days. Step 7 - We deliver the painted portrait to the address you have provided. Step 8 - If you do not receive the painting you purchased, you can report a transaction problem on paypal.com within 45 days of the payment. It is risk free placing an order with us. If there is a picture you would like painted, please send it to us by email, we will get back to you with sizes and prices. We will never pass your email address, your personal information or your photo on to anyone else. If you have any doubts, just let me know. 1. Prices in Euros People Oil Portraits Size (inches)Size (cm)1 figure2 figures3 figures4 figures5 figures6 figures7 figures 12"x16"30x40€€98€121----- 16"x20"40x50€125€152€179---- 20"x24"50x60€152€179€206€224€242-- 24"x36"60x90€197€233€269€296€323€350€377 30"x40"75x100€242€278€314€350€386€422€458 36"x48"90x120€278€323€368€413€458€503€548 48"x72"120x180€404€467€530€593€638€683€728 Pets/Animal Oil Portraits Landscape/House Oil Portraits Size (inches)Size (cm)1 figure2 figures 12"x16"30x40€67€80 16"x20"40x50€89€98 20"x24"50x60€98€116 24"x36"60x90€134€152 30"x40"75x100€170€197 36"x48"90x120€206€242 48"x72"120x180€242€269 Size (inches)Size (cm)1 figure 12"x16"30x40€62 16"x20"40x50€80 20"x24"50x60€89 24"x36"60x90€120 30"x40"75x100€150 36"x48"90x120€188 48"x72"120x180€233 2. Prices in US dollars People Oil Portraits Size (inches)Size (cm)1 figure2 figures3 figures4 figures5 figures6 figures7 figures 12"x16"30x40$125$152----- 16"x20"40x50$161$197$224---- 20"x24"50x60$197$233$269$296$323-- 24"x36"60x90$251$305$359$413$458$503$548 30"x40"75x100$305$359$413$458$503$548$593 36"x48"90x120$350$404$449$503$548$602$656 48"x72"120x180$503$593$683$773$827$881$935 Pets/Animal Oil Portraits Landscape/House Oil Portraits Size (inches)Size (cm)1 figure2 figures 12"x16"30x40$107$134 16"x20"40x50$125$152 20"x24"50x60$161$188 24"x36"60x90$206$242 30"x40"75x100$260$305 36"x48"90x120$296$350 48"x72"120x180$395$449 Size (inches)Size (cm)1 figure 12"x16"30x40$107 16"x20"40x50$134 20"x24"50x60$161 24"x36"60x90$206 30"x40"75x100$260 36"x48"90x120$296 48"x72"120x180$395 3. Prices in UK pounds People Oil Portraits Size (inches)Size (cm)1 figure2 figures3 figures4 figures5 figures6 figures7 figures 12"x16"30x40£74£93----- 16"x20"40x50£97£121£145---- 20"x24"50x60£112£135£168£201£224-- 24"x36"60x90£149£180£224£269£298£343£374 30"x40"75x100£187£234£280£336£374£430£467 36"x48"90x120£224£280£336£404£449£516£560 48"x72"120x180£298£374£449£538£598£688£747 Pets/Animal Oil Portraits Landscape/House Oil Portraits Size (inches)Size (cm)1 figure2 figures 12"x16"30x40£62£77 16"x20"40x50£81£100 20"x24"50x60£93£117 24"x36"60x90£124£155 30"x40"75x100£155£194 36"x48"90x120£186£233 48"x72"120x180£249£311 Size (inches)Size (cm)1 figure 12"x16"30x40£55 16"x20"40x50£72 20"x24"50x60£83 24"x36"60x90£111 30"x40"75x100£139 36"x48"90x120£167 48"x72"120x180£224 4. Prices in Australian dollars People Oil Portraits Size (inches)Size (cm)1 figure2 figures3 figures4 figures5 figures6 figures7 figures 12"x16"30x40$154$193----- 16"x20"40x50$201$252$302---- 20"x24"50x60$232$290$348$418$464-- 24"x36"60x90$309$387$464$557$619$711$774 30"x40"75x100$387$484$580$696$774$890$967 36"x48"90x120$464$580$696$836$928$1068$1161 48"x72"120x180$619$774$928$1114$1238$1423$1548 Pets/Animal Oil Portraits Landscape/House Oil Portraits Size (inches)Size (cm)1 figure2 figures 12"x16"30x40$128$161 16"x20"40x50$167$209 20"x24"50x60$193$241 24"x36"60x90$257$322 30"x40"75x100$322$402 36"x48"90x120$386$483 48"x72"120x180$514$644 Size (inches)Size (cm)1 figure 12"x16"30x40$116 16"x20"40x50$150 20"x24"50x60$173 24"x36"60x90$231 30"x40"75x100$289 36"x48"90x120$347 48"x72"120x180$463 5. Prices in Canadian dollars People Oil Portraits Size (inches)Size (cm)1 figure2 figures3 figures4 figures5 figures6 figures7 figures 12"x16"30x40$125$152----- 16"x20"40x50$161$197$224---- 20"x24"50x60$197$233$269$296$323-- 24"x36"60x90$251$305$359$413$458$503$549 30"x40"75x100$305$359$413$458$503$548$593 36"x48"90x120$350$404$449$503$548$602$656 48"x72"120x180$503$593$683$773$827$881$935 Pets/Animal Oil Portraits Landscape/House Oil Portraits Size (inches)Size (cm)1 figure2 figures 12"x16"30x40$107$134 16"x20"40x50$125$152 20"x24"50x60$161$188 24"x36"60x90$206$242 30"x40"75x100$260$305 36"x48"90x120$296$350 48"x72"120x180$395$449 Size (inches)Size (cm)1 figure 12"x16"30x40$107 16"x20"40x50$134 20"x24"50x60$161 24"x36"60x90$206 30"x40"75x100$260 36"x48"90x120$296 48"x72"120x180$395 |
|
From: Paintings on C. <oil...@zz...> - 2010-09-15 19:26:48
|
We can turn any photograph and digital image into a handmade oil painting. If you are interested then please email us the image you would like painted and receive an exact quote. |
|
From: Tim P <ti...@us...> - 2010-02-25 23:47:24
|
Update of /cvsroot/webmacro/webmacro/webmacro/src/test/java/org/webmacro/util/test In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv7929/src/test/java/org/webmacro/util/test Removed Files: Base64Test.java Log Message: Not used in WebMacro or Melati, and with known bug --- Base64Test.java DELETED --- |
|
From: Tim P <ti...@us...> - 2010-02-25 23:47:24
|
Update of /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/util In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv7929/src/main/java/org/webmacro/util Removed Files: Base64.java Log Message: Not used in WebMacro or Melati, and with known bug --- Base64.java DELETED --- |
|
From: Tim P <ti...@us...> - 2010-02-25 23:47:00
|
Update of /cvsroot/webmacro/webmacro/webmacro In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv7690 Modified Files: .classpath Log Message: Regenerated Index: .classpath =================================================================== RCS file: /cvsroot/webmacro/webmacro/webmacro/.classpath,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** .classpath 25 Feb 2010 01:49:55 -0000 1.1 --- .classpath 25 Feb 2010 23:46:52 -0000 1.2 *************** *** 1,73 **** - <?xml version="1.0" encoding="UTF-8"?> <classpath> ! <classpathentry kind="src" output="target/test-classes" path="src/test/java"/> ! <classpathentry kind="src" path="src/main/java"/> ! <classpathentry excluding="**/*.java" including="NOTICE.txt" kind="src" path=""/> ! <classpathentry excluding="**/*.java" including="**/*.wmm" kind="src" path="src/main/resources/macros"/> ! <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar" sourcepath="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5-sources.jar"/> ! <classpathentry kind="var" path="M2_REPO/ant/ant/1.6.5/ant-1.6.5.jar" sourcepath="M2_REPO/ant/ant/1.6.5/ant-1.6.5-sources.jar"/> ! <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.3/commons-codec-1.3.jar" sourcepath="M2_REPO/commons-codec/commons-codec/1.3/commons-codec-1.3-sources.jar"> ! <attributes> ! <attribute name="javadoc_location" value="jar:file:/home/timp/.m2/repository/commons-codec/commons-codec/1.3/commons-codec-1.3-javadoc.jar!/"/> ! </attributes> ! </classpathentry> ! <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar" sourcepath="M2_REPO/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1-sources.jar"> ! <attributes> ! <attribute name="javadoc_location" value="jar:file:/home/timp/.m2/repository/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1-javadoc.jar!/"/> ! </attributes> ! </classpathentry> ! <classpathentry kind="var" path="M2_REPO/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar"/> ! <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.4/commons-io-1.4.jar" sourcepath="M2_REPO/commons-io/commons-io/1.4/commons-io-1.4-sources.jar"> ! <attributes> ! <attribute name="javadoc_location" value="jar:file:/home/timp/.m2/repository/commons-io/commons-io/1.4/commons-io-1.4-javadoc.jar!/"/> ! </attributes> ! </classpathentry> ! <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.4/commons-lang-2.4.jar" sourcepath="M2_REPO/commons-lang/commons-lang/2.4/commons-lang-2.4-sources.jar"> ! <attributes> ! <attribute name="javadoc_location" value="jar:file:/home/timp/.m2/repository/commons-lang/commons-lang/2.4/commons-lang-2.4-javadoc.jar!/"/> ! </attributes> ! </classpathentry> ! <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-sources.jar"> ! <attributes> ! <attribute name="javadoc_location" value="jar:file:/home/timp/.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-javadoc.jar!/"/> ! </attributes> ! </classpathentry> ! <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.1.1/core-3.1.1.jar"/> ! <classpathentry kind="var" path="M2_REPO/net/sourceforge/cssparser/cssparser/0.9.5/cssparser-0.9.5.jar" sourcepath="M2_REPO/net/sourceforge/cssparser/cssparser/0.9.5/cssparser-0.9.5-sources.jar"/> ! <classpathentry kind="var" path="M2_REPO/net/sourceforge/htmlunit/htmlunit/2.5/htmlunit-2.5.jar" sourcepath="M2_REPO/net/sourceforge/htmlunit/htmlunit/2.5/htmlunit-2.5-sources.jar"/> ! <classpathentry kind="var" path="M2_REPO/net/sourceforge/htmlunit/htmlunit-core-js/2.5/htmlunit-core-js-2.5.jar" sourcepath="M2_REPO/net/sourceforge/htmlunit/htmlunit-core-js/2.5/htmlunit-core-js-2.5-sources.jar"/> ! <classpathentry kind="var" path="M2_REPO/jakarta-regexp/jakarta-regexp/1.4/jakarta-regexp-1.4.jar"/> ! <classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/jetty/6.1.5/jetty-6.1.5.jar" sourcepath="M2_REPO/org/mortbay/jetty/jetty/6.1.5/jetty-6.1.5-sources.jar"/> ! <classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/jetty-util/6.1.5/jetty-util-6.1.5.jar" sourcepath="M2_REPO/org/mortbay/jetty/jetty-util/6.1.5/jetty-util-6.1.5-sources.jar"/> ! <classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/jsp-2.1/6.1.5/jsp-2.1-6.1.5.jar" sourcepath="M2_REPO/org/mortbay/jetty/jsp-2.1/6.1.5/jsp-2.1-6.1.5-sources.jar"/> ! <classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/jsp-api-2.1/6.1.5/jsp-api-2.1-6.1.5.jar" sourcepath="M2_REPO/org/mortbay/jetty/jsp-api-2.1/6.1.5/jsp-api-2.1-6.1.5-sources.jar"/> ! <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/> ! <classpathentry kind="var" path="M2_REPO/net/sourceforge/jwebunit/jwebunit-core/2.2/jwebunit-core-2.2.jar" sourcepath="M2_REPO/net/sourceforge/jwebunit/jwebunit-core/2.2/jwebunit-core-2.2-sources.jar"> ! <attributes> ! <attribute name="javadoc_location" value="jar:file:/home/timp/.m2/repository/net/sourceforge/jwebunit/jwebunit-core/2.2/jwebunit-core-2.2-javadoc.jar!/"/> ! </attributes> ! </classpathentry> ! <classpathentry kind="var" path="M2_REPO/net/sourceforge/jwebunit/jwebunit-htmlunit-plugin/2.2/jwebunit-htmlunit-plugin-2.2.jar" sourcepath="M2_REPO/net/sourceforge/jwebunit/jwebunit-htmlunit-plugin/2.2/jwebunit-htmlunit-plugin-2.2-sources.jar"> ! <attributes> ! <attribute name="javadoc_location" value="jar:file:/home/timp/.m2/repository/net/sourceforge/jwebunit/jwebunit-htmlunit-plugin/2.2/jwebunit-htmlunit-plugin-2.2-javadoc.jar!/"/> ! </attributes> ! </classpathentry> ! <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar" sourcepath="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13-sources.jar"/> ! <classpathentry kind="var" path="M2_REPO/mockobjects/mockobjects-core/0.09/mockobjects-core-0.09.jar" sourcepath="M2_REPO/mockobjects/mockobjects-core/0.09/mockobjects-core-0.09-sources.jar"/> ! <classpathentry kind="var" path="M2_REPO/net/sourceforge/nekohtml/nekohtml/1.9.12/nekohtml-1.9.12.jar" sourcepath="M2_REPO/net/sourceforge/nekohtml/nekohtml/1.9.12/nekohtml-1.9.12-sources.jar"> ! <attributes> ! <attribute name="javadoc_location" value="jar:file:/home/timp/.m2/repository/net/sourceforge/nekohtml/nekohtml/1.9.12/nekohtml-1.9.12-javadoc.jar!/"/> ! </attributes> ! </classpathentry> ! <classpathentry kind="var" path="M2_REPO/regexp/regexp/1.3/regexp-1.3.jar" sourcepath="M2_REPO/regexp/regexp/1.3/regexp-1.3-sources.jar"/> ! <classpathentry kind="var" path="M2_REPO/org/w3c/css/sac/1.3/sac-1.3.jar" sourcepath="M2_REPO/org/w3c/css/sac/1.3/sac-1.3-sources.jar"/> ! <classpathentry kind="var" path="M2_REPO/xalan/serializer/2.7.1/serializer-2.7.1.jar"/> ! <classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/servlet-api-2.5/6.1.5/servlet-api-2.5-6.1.5.jar" sourcepath="M2_REPO/org/mortbay/jetty/servlet-api-2.5/6.1.5/servlet-api-2.5-6.1.5-sources.jar"/> ! <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.5.8/slf4j-api-1.5.8.jar" sourcepath="M2_REPO/org/slf4j/slf4j-api/1.5.8/slf4j-api-1.5.8-sources.jar"/> ! <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.5.0/slf4j-log4j12-1.5.0.jar" sourcepath="M2_REPO/org/slf4j/slf4j-log4j12/1.5.0/slf4j-log4j12-1.5.0-sources.jar"/> ! <classpathentry kind="var" path="M2_REPO/xalan/xalan/2.7.1/xalan-2.7.1.jar" sourcepath="M2_REPO/xalan/xalan/2.7.1/xalan-2.7.1-sources.jar"/> ! <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.8.1/xercesImpl-2.8.1.jar" sourcepath="M2_REPO/xerces/xercesImpl/2.8.1/xercesImpl-2.8.1-sources.jar"/> ! <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.jar" sourcepath="M2_REPO/xml-apis/xml-apis/1.3.04/xml-apis-1.3.04-sources.jar"/> ! <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> ! <classpathentry kind="output" path="target/classes"/> ! </classpath> --- 1,72 ---- <classpath> ! <classpathentry kind="src" path="src/test/java" output="target/test-classes"/> ! <classpathentry kind="src" path="src/main/java"/> ! <classpathentry kind="src" path="." including="NOTICE.txt" excluding="**/*.java"/> ! <classpathentry kind="src" path="src/main/resources/macros" including="**/*.wmm" excluding="**/*.java"/> ! <classpathentry kind="output" path="target/classes"/> ! <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar" sourcepath="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5-sources.jar"/> ! <classpathentry kind="var" path="M2_REPO/ant/ant/1.6.5/ant-1.6.5.jar" sourcepath="M2_REPO/ant/ant/1.6.5/ant-1.6.5-sources.jar"/> ! <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.3/commons-codec-1.3.jar" sourcepath="M2_REPO/commons-codec/commons-codec/1.3/commons-codec-1.3-sources.jar"> ! <attributes> ! <attribute value="jar:file:/home/timp/.m2/repository/commons-codec/commons-codec/1.3/commons-codec-1.3-javadoc.jar!/" name="javadoc_location"/> ! </attributes> ! </classpathentry> ! <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar" sourcepath="M2_REPO/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1-sources.jar"> ! <attributes> ! <attribute value="jar:file:/home/timp/.m2/repository/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1-javadoc.jar!/" name="javadoc_location"/> ! </attributes> ! </classpathentry> ! <classpathentry kind="var" path="M2_REPO/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar"/> ! <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.4/commons-io-1.4.jar" sourcepath="M2_REPO/commons-io/commons-io/1.4/commons-io-1.4-sources.jar"> ! <attributes> ! <attribute value="jar:file:/home/timp/.m2/repository/commons-io/commons-io/1.4/commons-io-1.4-javadoc.jar!/" name="javadoc_location"/> ! </attributes> ! </classpathentry> ! <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.4/commons-lang-2.4.jar" sourcepath="M2_REPO/commons-lang/commons-lang/2.4/commons-lang-2.4-sources.jar"> ! <attributes> ! <attribute value="jar:file:/home/timp/.m2/repository/commons-lang/commons-lang/2.4/commons-lang-2.4-javadoc.jar!/" name="javadoc_location"/> ! </attributes> ! </classpathentry> ! <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-sources.jar"> ! <attributes> ! <attribute value="jar:file:/home/timp/.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-javadoc.jar!/" name="javadoc_location"/> ! </attributes> ! </classpathentry> ! <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.1.1/core-3.1.1.jar"/> ! <classpathentry kind="var" path="M2_REPO/net/sourceforge/cssparser/cssparser/0.9.5/cssparser-0.9.5.jar" sourcepath="M2_REPO/net/sourceforge/cssparser/cssparser/0.9.5/cssparser-0.9.5-sources.jar"/> ! <classpathentry kind="var" path="M2_REPO/net/sourceforge/htmlunit/htmlunit/2.5/htmlunit-2.5.jar" sourcepath="M2_REPO/net/sourceforge/htmlunit/htmlunit/2.5/htmlunit-2.5-sources.jar"/> ! <classpathentry kind="var" path="M2_REPO/net/sourceforge/htmlunit/htmlunit-core-js/2.5/htmlunit-core-js-2.5.jar" sourcepath="M2_REPO/net/sourceforge/htmlunit/htmlunit-core-js/2.5/htmlunit-core-js-2.5-sources.jar"/> ! <classpathentry kind="var" path="M2_REPO/jakarta-regexp/jakarta-regexp/1.4/jakarta-regexp-1.4.jar"/> ! <classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/jetty/6.1.5/jetty-6.1.5.jar" sourcepath="M2_REPO/org/mortbay/jetty/jetty/6.1.5/jetty-6.1.5-sources.jar"/> ! <classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/jetty-util/6.1.5/jetty-util-6.1.5.jar" sourcepath="M2_REPO/org/mortbay/jetty/jetty-util/6.1.5/jetty-util-6.1.5-sources.jar"/> ! <classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/jsp-2.1/6.1.5/jsp-2.1-6.1.5.jar" sourcepath="M2_REPO/org/mortbay/jetty/jsp-2.1/6.1.5/jsp-2.1-6.1.5-sources.jar"/> ! <classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/jsp-api-2.1/6.1.5/jsp-api-2.1-6.1.5.jar" sourcepath="M2_REPO/org/mortbay/jetty/jsp-api-2.1/6.1.5/jsp-api-2.1-6.1.5-sources.jar"/> ! <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/> ! <classpathentry kind="var" path="M2_REPO/net/sourceforge/jwebunit/jwebunit-core/2.2/jwebunit-core-2.2.jar" sourcepath="M2_REPO/net/sourceforge/jwebunit/jwebunit-core/2.2/jwebunit-core-2.2-sources.jar"> ! <attributes> ! <attribute value="jar:file:/home/timp/.m2/repository/net/sourceforge/jwebunit/jwebunit-core/2.2/jwebunit-core-2.2-javadoc.jar!/" name="javadoc_location"/> ! </attributes> ! </classpathentry> ! <classpathentry kind="var" path="M2_REPO/net/sourceforge/jwebunit/jwebunit-htmlunit-plugin/2.2/jwebunit-htmlunit-plugin-2.2.jar" sourcepath="M2_REPO/net/sourceforge/jwebunit/jwebunit-htmlunit-plugin/2.2/jwebunit-htmlunit-plugin-2.2-sources.jar"> ! <attributes> ! <attribute value="jar:file:/home/timp/.m2/repository/net/sourceforge/jwebunit/jwebunit-htmlunit-plugin/2.2/jwebunit-htmlunit-plugin-2.2-javadoc.jar!/" name="javadoc_location"/> ! </attributes> ! </classpathentry> ! <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/> ! <classpathentry kind="var" path="M2_REPO/mockobjects/mockobjects-core/0.09/mockobjects-core-0.09.jar" sourcepath="M2_REPO/mockobjects/mockobjects-core/0.09/mockobjects-core-0.09-sources.jar"/> ! <classpathentry kind="var" path="M2_REPO/net/sourceforge/nekohtml/nekohtml/1.9.12/nekohtml-1.9.12.jar" sourcepath="M2_REPO/net/sourceforge/nekohtml/nekohtml/1.9.12/nekohtml-1.9.12-sources.jar"> ! <attributes> ! <attribute value="jar:file:/home/timp/.m2/repository/net/sourceforge/nekohtml/nekohtml/1.9.12/nekohtml-1.9.12-javadoc.jar!/" name="javadoc_location"/> ! </attributes> ! </classpathentry> ! <classpathentry kind="var" path="M2_REPO/regexp/regexp/1.3/regexp-1.3.jar" sourcepath="M2_REPO/regexp/regexp/1.3/regexp-1.3-sources.jar"/> ! <classpathentry kind="var" path="M2_REPO/org/w3c/css/sac/1.3/sac-1.3.jar" sourcepath="M2_REPO/org/w3c/css/sac/1.3/sac-1.3-sources.jar"/> ! <classpathentry kind="var" path="M2_REPO/xalan/serializer/2.7.1/serializer-2.7.1.jar"/> ! <classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/servlet-api-2.5/6.1.5/servlet-api-2.5-6.1.5.jar" sourcepath="M2_REPO/org/mortbay/jetty/servlet-api-2.5/6.1.5/servlet-api-2.5-6.1.5-sources.jar"/> ! <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.5.8/slf4j-api-1.5.8.jar" sourcepath="M2_REPO/org/slf4j/slf4j-api/1.5.8/slf4j-api-1.5.8-sources.jar"/> ! <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.5.8/slf4j-log4j12-1.5.8.jar" sourcepath="M2_REPO/org/slf4j/slf4j-log4j12/1.5.8/slf4j-log4j12-1.5.8-sources.jar"/> ! <classpathentry kind="var" path="M2_REPO/xalan/xalan/2.7.1/xalan-2.7.1.jar" sourcepath="M2_REPO/xalan/xalan/2.7.1/xalan-2.7.1-sources.jar"/> ! <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.8.1/xercesImpl-2.8.1.jar" sourcepath="M2_REPO/xerces/xercesImpl/2.8.1/xercesImpl-2.8.1-sources.jar"/> ! <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.jar" sourcepath="M2_REPO/xml-apis/xml-apis/1.3.04/xml-apis-1.3.04-sources.jar"/> ! <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> ! </classpath> \ No newline at end of file |
|
From: Tim P <ti...@us...> - 2010-02-25 23:38:33
|
Update of /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/directive In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv3732/src/main/java/org/webmacro/directive Modified Files: AlternateDirective.java Log Message: Eclipse warnings Index: AlternateDirective.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/directive/AlternateDirective.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** AlternateDirective.java 19 Mar 2008 16:06:20 -0000 1.14 --- AlternateDirective.java 25 Feb 2010 23:38:24 -0000 1.15 *************** *** 160,170 **** class IteratorAlternator extends Alternator { ! private Iterator itr; ! private List list; private int index = -1; ! public IteratorAlternator(Iterator itr) { this.itr = itr; ! this.list = new ArrayList(); } public Object evaluate(Context context) --- 160,170 ---- class IteratorAlternator extends Alternator { ! private Iterator<Object> itr; ! private List<Object> list; private int index = -1; ! public IteratorAlternator(Iterator<Object> itr) { this.itr = itr; ! this.list = new ArrayList<Object>(); } public Object evaluate(Context context) |
|
From: Tim P <ti...@us...> - 2010-02-25 23:03:49
|
Update of /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/resource In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv30164/src/main/java/org/webmacro/resource Modified Files: AbstractTemplateLoader.java Log Message: Unused import Index: AbstractTemplateLoader.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/resource/AbstractTemplateLoader.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** AbstractTemplateLoader.java 24 Feb 2010 21:02:17 -0000 1.5 --- AbstractTemplateLoader.java 25 Feb 2010 23:03:38 -0000 1.6 *************** *** 27,31 **** import org.webmacro.InitException; import org.webmacro.util.Settings; - import org.webmacro.util.WMEval; /** --- 27,30 ---- |
|
From: Tim P <ti...@us...> - 2010-02-25 01:50:03
|
Update of /cvsroot/webmacro/webmacro/webmacro In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv16813 Added Files: .classpath .project Log Message: Maven generated Eclipse project files --- NEW FILE: .project --- <projectDescription> <name>webmacro</name> <comment>WebMacro is a stable templating engine written in Java.</comment> <projects/> <buildSpec> <buildCommand> <name>org.eclipse.jdt.core.javabuilder</name> </buildCommand> <buildCommand> <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name> <arguments> <dictionary> <key>LaunchConfigHandle</key> <value><project>/.externalToolBuilders/Maven_Ant_Builder.launch</value> </dictionary> </arguments> </buildCommand> </buildSpec> <natures> <nature>org.eclipse.jdt.core.javanature</nature> </natures> </projectDescription> --- NEW FILE: .classpath --- <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" output="target/test-classes" path="src/test/java"/> <classpathentry kind="src" path="src/main/java"/> <classpathentry excluding="**/*.java" including="NOTICE.txt" kind="src" path=""/> <classpathentry excluding="**/*.java" including="**/*.wmm" kind="src" path="src/main/resources/macros"/> <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar" sourcepath="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5-sources.jar"/> <classpathentry kind="var" path="M2_REPO/ant/ant/1.6.5/ant-1.6.5.jar" sourcepath="M2_REPO/ant/ant/1.6.5/ant-1.6.5-sources.jar"/> <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.3/commons-codec-1.3.jar" sourcepath="M2_REPO/commons-codec/commons-codec/1.3/commons-codec-1.3-sources.jar"> <attributes> <attribute name="javadoc_location" value="jar:file:/home/timp/.m2/repository/commons-codec/commons-codec/1.3/commons-codec-1.3-javadoc.jar!/"/> </attributes> </classpathentry> <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar" sourcepath="M2_REPO/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1-sources.jar"> <attributes> <attribute name="javadoc_location" value="jar:file:/home/timp/.m2/repository/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1-javadoc.jar!/"/> </attributes> </classpathentry> <classpathentry kind="var" path="M2_REPO/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar"/> <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.4/commons-io-1.4.jar" sourcepath="M2_REPO/commons-io/commons-io/1.4/commons-io-1.4-sources.jar"> <attributes> <attribute name="javadoc_location" value="jar:file:/home/timp/.m2/repository/commons-io/commons-io/1.4/commons-io-1.4-javadoc.jar!/"/> </attributes> </classpathentry> <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.4/commons-lang-2.4.jar" sourcepath="M2_REPO/commons-lang/commons-lang/2.4/commons-lang-2.4-sources.jar"> <attributes> <attribute name="javadoc_location" value="jar:file:/home/timp/.m2/repository/commons-lang/commons-lang/2.4/commons-lang-2.4-javadoc.jar!/"/> </attributes> </classpathentry> <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-sources.jar"> <attributes> <attribute name="javadoc_location" value="jar:file:/home/timp/.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-javadoc.jar!/"/> </attributes> </classpathentry> <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.1.1/core-3.1.1.jar"/> <classpathentry kind="var" path="M2_REPO/net/sourceforge/cssparser/cssparser/0.9.5/cssparser-0.9.5.jar" sourcepath="M2_REPO/net/sourceforge/cssparser/cssparser/0.9.5/cssparser-0.9.5-sources.jar"/> <classpathentry kind="var" path="M2_REPO/net/sourceforge/htmlunit/htmlunit/2.5/htmlunit-2.5.jar" sourcepath="M2_REPO/net/sourceforge/htmlunit/htmlunit/2.5/htmlunit-2.5-sources.jar"/> <classpathentry kind="var" path="M2_REPO/net/sourceforge/htmlunit/htmlunit-core-js/2.5/htmlunit-core-js-2.5.jar" sourcepath="M2_REPO/net/sourceforge/htmlunit/htmlunit-core-js/2.5/htmlunit-core-js-2.5-sources.jar"/> <classpathentry kind="var" path="M2_REPO/jakarta-regexp/jakarta-regexp/1.4/jakarta-regexp-1.4.jar"/> <classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/jetty/6.1.5/jetty-6.1.5.jar" sourcepath="M2_REPO/org/mortbay/jetty/jetty/6.1.5/jetty-6.1.5-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/jetty-util/6.1.5/jetty-util-6.1.5.jar" sourcepath="M2_REPO/org/mortbay/jetty/jetty-util/6.1.5/jetty-util-6.1.5-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/jsp-2.1/6.1.5/jsp-2.1-6.1.5.jar" sourcepath="M2_REPO/org/mortbay/jetty/jsp-2.1/6.1.5/jsp-2.1-6.1.5-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/jsp-api-2.1/6.1.5/jsp-api-2.1-6.1.5.jar" sourcepath="M2_REPO/org/mortbay/jetty/jsp-api-2.1/6.1.5/jsp-api-2.1-6.1.5-sources.jar"/> <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/net/sourceforge/jwebunit/jwebunit-core/2.2/jwebunit-core-2.2.jar" sourcepath="M2_REPO/net/sourceforge/jwebunit/jwebunit-core/2.2/jwebunit-core-2.2-sources.jar"> <attributes> <attribute name="javadoc_location" value="jar:file:/home/timp/.m2/repository/net/sourceforge/jwebunit/jwebunit-core/2.2/jwebunit-core-2.2-javadoc.jar!/"/> </attributes> </classpathentry> <classpathentry kind="var" path="M2_REPO/net/sourceforge/jwebunit/jwebunit-htmlunit-plugin/2.2/jwebunit-htmlunit-plugin-2.2.jar" sourcepath="M2_REPO/net/sourceforge/jwebunit/jwebunit-htmlunit-plugin/2.2/jwebunit-htmlunit-plugin-2.2-sources.jar"> <attributes> <attribute name="javadoc_location" value="jar:file:/home/timp/.m2/repository/net/sourceforge/jwebunit/jwebunit-htmlunit-plugin/2.2/jwebunit-htmlunit-plugin-2.2-javadoc.jar!/"/> </attributes> </classpathentry> <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar" sourcepath="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13-sources.jar"/> <classpathentry kind="var" path="M2_REPO/mockobjects/mockobjects-core/0.09/mockobjects-core-0.09.jar" sourcepath="M2_REPO/mockobjects/mockobjects-core/0.09/mockobjects-core-0.09-sources.jar"/> <classpathentry kind="var" path="M2_REPO/net/sourceforge/nekohtml/nekohtml/1.9.12/nekohtml-1.9.12.jar" sourcepath="M2_REPO/net/sourceforge/nekohtml/nekohtml/1.9.12/nekohtml-1.9.12-sources.jar"> <attributes> <attribute name="javadoc_location" value="jar:file:/home/timp/.m2/repository/net/sourceforge/nekohtml/nekohtml/1.9.12/nekohtml-1.9.12-javadoc.jar!/"/> </attributes> </classpathentry> <classpathentry kind="var" path="M2_REPO/regexp/regexp/1.3/regexp-1.3.jar" sourcepath="M2_REPO/regexp/regexp/1.3/regexp-1.3-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/w3c/css/sac/1.3/sac-1.3.jar" sourcepath="M2_REPO/org/w3c/css/sac/1.3/sac-1.3-sources.jar"/> <classpathentry kind="var" path="M2_REPO/xalan/serializer/2.7.1/serializer-2.7.1.jar"/> <classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/servlet-api-2.5/6.1.5/servlet-api-2.5-6.1.5.jar" sourcepath="M2_REPO/org/mortbay/jetty/servlet-api-2.5/6.1.5/servlet-api-2.5-6.1.5-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.5.8/slf4j-api-1.5.8.jar" sourcepath="M2_REPO/org/slf4j/slf4j-api/1.5.8/slf4j-api-1.5.8-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.5.0/slf4j-log4j12-1.5.0.jar" sourcepath="M2_REPO/org/slf4j/slf4j-log4j12/1.5.0/slf4j-log4j12-1.5.0-sources.jar"/> <classpathentry kind="var" path="M2_REPO/xalan/xalan/2.7.1/xalan-2.7.1.jar" sourcepath="M2_REPO/xalan/xalan/2.7.1/xalan-2.7.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.8.1/xercesImpl-2.8.1.jar" sourcepath="M2_REPO/xerces/xercesImpl/2.8.1/xercesImpl-2.8.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.jar" sourcepath="M2_REPO/xml-apis/xml-apis/1.3.04/xml-apis-1.3.04-sources.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="output" path="target/classes"/> </classpath> |
|
From: Tim P <ti...@us...> - 2010-02-25 01:49:17
|
Update of /cvsroot/webmacro/webmacro/webmacro In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv16638 Modified Files: pom.xml Log Message: Get deployment to SF working without needing to create a shell Index: pom.xml =================================================================== RCS file: /cvsroot/webmacro/webmacro/webmacro/pom.xml,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** pom.xml 24 Feb 2010 21:02:00 -0000 1.29 --- pom.xml 25 Feb 2010 01:49:08 -0000 1.30 *************** *** 222,233 **** </includes> </testResource> - <!-- - <testResource> - <directory>macros</directory> - <includes> - <include>**/*.wmm</include> - </includes> - </testResource> - --> </testResources> <plugins> --- 222,225 ---- *************** *** 313,322 **** </build> <dependencies> ! <dependency> ! <groupId>javax.servlet</groupId> ! <artifactId>servlet-api</artifactId> ! <version>2.5</version> ! <scope>provided</scope> ! </dependency> <dependency> <groupId>org.slf4j</groupId> --- 305,309 ---- </build> <dependencies> ! <!-- ONE compile-time dependency !!! --> <dependency> <groupId>org.slf4j</groupId> *************** *** 325,342 **** <scope>compile</scope> </dependency> <dependency> ! <groupId>org.slf4j</groupId> ! <artifactId>slf4j-simple</artifactId> ! <version>1.5.8</version> ! <scope>test</scope> </dependency> ! <!-- <dependency> ! <groupId>commons-logging</groupId> ! <artifactId>commons-logging</artifactId> ! <version>1.1</version> <scope>test</scope> </dependency> - --> <dependency> <groupId>jakarta-regexp</groupId> --- 312,332 ---- <scope>compile</scope> </dependency> + + <dependency> ! <groupId>javax.servlet</groupId> ! <artifactId>servlet-api</artifactId> ! <version>2.5</version> ! <scope>provided</scope> </dependency> ! ! ! <dependency> ! <groupId>org.slf4j</groupId> ! <artifactId>slf4j-log4j12</artifactId> ! <version>1.5.8</version> <scope>test</scope> </dependency> <dependency> <groupId>jakarta-regexp</groupId> *************** *** 431,444 **** </plugins> </reporting> <distributionManagement> <repository> ! <id>default</id> ! <name>Default Repository</name> ! <url>scp://shell.sourceforge.net/home/groups/w/we/webmacro/htdocs/maven2/</url> </repository> <site> ! <id>default</id> ! <name>Default Site</name> ! <url>scp://shell.sourceforge.net/home/groups/w/we/webmacro/htdocs/</url> </site> </distributionManagement> --- 421,461 ---- </plugins> </reporting> + <repositories> + <repository> + <id>sf</id> + <name>SourceForge</name> + <url>http://webmacro.sourceforge.net/maven2/</url> + </repository> + </repositories> + <!-- + Note that you need to have created a shell to get scp to work with shell.sourceforge.net + I could not get scp to work with web.sourceforge.net + + --> + + <!-- + ssh -t timp,web...@sh... create + --> <distributionManagement> + <downloadUrl>http://webmacro.sourceforge.net/maven2/</downloadUrl> <repository> ! <id>sf</id> ! <name>SourceForge</name> ! <!-- ! <url>scp://timp,web...@sh...:/home/groups/w/we/webmacro/htdocs/maven2/</url> ! --> ! <url>sftp://timp,web...@we...:/home/groups/w/we/webmacro/htdocs/maven2</url> ! </repository> ! <!-- Need a separate release thingy to deploy to frs ! <repository> ! <id>sf</id> ! <name>SourceForge</name> ! <url>sftp://timp,web...@we...:/home/frs/project/w/we/webmacro/releases</url> </repository> + --> <site> ! <id>sf</id> ! <name>SourceForge</name> ! <url>sftp://timp,web...@we...:/home/groups/w/we/webmacro/htdocs/</url> </site> </distributionManagement> |
|
From: Tim P <ti...@us...> - 2010-02-24 21:02:58
|
Update of /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/util In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv30233/src/main/java/org/webmacro/util Modified Files: Encoder.java Instantiator.java WMEval.java Removed Files: AbstractLogFile.java CommonsLoggingTarget.java LogFile.java LogSource.java LogSystem.java LogTarget.java LogTargetFactory.java Log Message: Remove logging --- LogSource.java DELETED --- --- LogSystem.java DELETED --- --- LogTargetFactory.java DELETED --- Index: Instantiator.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/util/Instantiator.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Instantiator.java 20 Feb 2010 17:53:50 -0000 1.3 --- Instantiator.java 24 Feb 2010 21:02:20 -0000 1.4 *************** *** 26,29 **** --- 26,32 ---- import java.util.Collections; import java.util.List; + + import org.slf4j.Logger; + import org.slf4j.LoggerFactory; import org.webmacro.Broker; import org.webmacro.WebMacroException; *************** *** 45,48 **** --- 48,52 ---- final public class Instantiator { + static Logger _log = LoggerFactory.getLogger(Instantiator.class); private static final String IMPLIED_PACKAGES = "ImpliedPackages"; *************** *** 71,75 **** if (s != null) { ! b.getLog("engine").warning( "The configuration parameter \"" + DEPRECATED_IMPLIED_PACKAGES --- 75,79 ---- if (s != null) { ! _log.warn( "The configuration parameter \"" + DEPRECATED_IMPLIED_PACKAGES *************** *** 95,99 **** if (s != null) { ! b.getLog("engine").warning( "The configuration parameter \"" + DEPRECATED_ALLOWED_PACKAGES --- 99,103 ---- if (s != null) { ! _log.warn( "The configuration parameter \"" + DEPRECATED_ALLOWED_PACKAGES --- LogTarget.java DELETED --- --- CommonsLoggingTarget.java DELETED --- --- AbstractLogFile.java DELETED --- Index: Encoder.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/util/Encoder.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Encoder.java 18 Mar 2008 11:07:56 -0000 1.7 --- Encoder.java 24 Feb 2010 21:02:20 -0000 1.8 *************** *** 23,29 **** package org.webmacro.util; import org.webmacro.Broker; import org.webmacro.InitException; - import org.webmacro.Log; import org.webmacro.ResourceException; import org.webmacro.resource.CacheElement; --- 23,30 ---- package org.webmacro.util; + import org.slf4j.Logger; + import org.slf4j.LoggerFactory; import org.webmacro.Broker; import org.webmacro.InitException; import org.webmacro.ResourceException; import org.webmacro.resource.CacheElement; *************** *** 59,63 **** private String _encoding; private CacheManager _cache; ! private Log _log; /** --- 60,64 ---- private String _encoding; private CacheManager _cache; ! static Logger _log = LoggerFactory.getLogger(Encoder.class); /** *************** *** 101,105 **** { String cacheManager; - _log = b.getLog("resource", "Object loading and caching"); cacheManager = b.getSetting("Encoder." + _encoding + ".CacheManager"); --- 102,105 ---- *************** *** 121,125 **** catch (Exception e) { ! _log.warning("Unable to load cache manager " + cacheManager + " for encoding type " + _encoding + ", using TrivialCacheManager. Reason:\n" + e); --- 121,125 ---- catch (Exception e) { ! _log.warn("Unable to load cache manager " + cacheManager + " for encoding type " + _encoding + ", using TrivialCacheManager. Reason:\n" + e); Index: WMEval.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/util/WMEval.java,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** WMEval.java 28 Mar 2008 20:12:18 -0000 1.29 --- WMEval.java 24 Feb 2010 21:02:20 -0000 1.30 *************** *** 32,37 **** import javax.servlet.http.HttpServletResponse; import org.webmacro.Context; - import org.webmacro.Log; import org.webmacro.Template; import org.webmacro.WM; --- 32,39 ---- import javax.servlet.http.HttpServletResponse; + import org.slf4j.Logger; + import org.slf4j.LoggerFactory; + import org.webmacro.Context; import org.webmacro.Template; import org.webmacro.WM; *************** *** 39,42 **** --- 41,46 ---- import org.webmacro.WebMacro; import org.webmacro.engine.StreamTemplate; + import org.webmacro.resource.AbstractTemplateLoader; + import org.webmacro.servlet.WMServlet; import org.webmacro.servlet.WebContext; *************** *** 73,77 **** private WebMacro wm; ! private Log log; private Template currentTemplate; --- 77,81 ---- private WebMacro wm; ! static Logger _log = LoggerFactory.getLogger(WMEval.class); private Template currentTemplate; *************** *** 135,139 **** private void init() { context = wm.getContext(); - log = wm.getBroker().getBrokerLog(); } /** --- 139,142 ---- *************** *** 148,154 **** * Return the log associated with this instance of WMEval. */ ! public Log getLog () { ! return this.log; } --- 151,157 ---- * Return the log associated with this instance of WMEval. */ ! public Logger getLog () { ! return _log; } *************** *** 184,188 **** public void error (String msg, Exception e) { ! wm.getLog("ERROR").error(msg, e); } --- 187,191 ---- public void error (String msg, Exception e) { ! _log.error(msg, e); } --- LogFile.java DELETED --- |
|
From: Tim P <ti...@us...> - 2010-02-24 21:02:58
|
Update of /cvsroot/webmacro/webmacro/webmacro/src/test/java/org/webmacro In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv30233/src/test/java/org/webmacro Modified Files: TestBroker.java Log Message: Remove logging Index: TestBroker.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/webmacro/src/test/java/org/webmacro/TestBroker.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** TestBroker.java 12 Jun 2003 00:47:49 -0000 1.4 --- TestBroker.java 24 Feb 2010 21:02:20 -0000 1.5 *************** *** 1,4 **** --- 1,6 ---- package org.webmacro; + import org.slf4j.Logger; + import junit.framework.TestCase; import org.webmacro.util.Settings; *************** *** 59,72 **** - public void testGetLog () throws Exception - { - Log l = _broker.getLog("template"); - assertTrue(l != null); - - l = _broker.getLog("NewLog"); - assertTrue(l != null); - } - - public void testGetResource () throws Exception { --- 61,64 ---- |
|
From: Tim P <ti...@us...> - 2010-02-24 21:02:57
|
Update of /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/servlet In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv30233/src/main/java/org/webmacro/servlet Modified Files: Servlet20Broker.java Servlet22Broker.java ServletBroker.java TemplateServlet.java VariableTool.java WMServlet.java WebContext.java Removed Files: ServletLog.java Log Message: Remove logging Index: WebContext.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/servlet/WebContext.java,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** WebContext.java 16 Jul 2003 06:45:00 -0000 1.24 --- WebContext.java 24 Feb 2010 21:02:19 -0000 1.25 *************** *** 29,35 **** package org.webmacro.servlet; import org.webmacro.Broker; import org.webmacro.Context; ! import org.webmacro.Log; import org.webmacro.util.Bag; --- 29,38 ---- package org.webmacro.servlet; + import org.slf4j.Logger; + import org.slf4j.LoggerFactory; + import org.webmacro.Broker; import org.webmacro.Context; ! import org.webmacro.engine.Block; import org.webmacro.util.Bag; *************** *** 63,69 **** /** ! * Log configuration errors, context errors, etc. */ ! private final Log _log; /** --- 66,72 ---- /** ! * Logger configuration errors, context errors, etc. */ ! static Logger _log = LoggerFactory.getLogger(WebContext.class); /** *************** *** 88,92 **** _request = req; _response = resp; - _log = broker.getLog("WebContext"); } --- 91,94 ---- --- ServletLog.java DELETED --- Index: WMServlet.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/servlet/WMServlet.java,v retrieving revision 1.68 retrieving revision 1.69 diff -C2 -d -r1.68 -r1.69 *** WMServlet.java 18 Feb 2010 17:08:23 -0000 1.68 --- WMServlet.java 24 Feb 2010 21:02:19 -0000 1.69 *************** *** 37,45 **** import javax.servlet.http.HttpServletResponse; import org.webmacro.Broker; import org.webmacro.Context; import org.webmacro.FastWriter; import org.webmacro.InitException; - import org.webmacro.Log; import org.webmacro.NotFoundException; import org.webmacro.PropertyException; --- 37,47 ---- import javax.servlet.http.HttpServletResponse; + import org.slf4j.Logger; + import org.slf4j.LoggerFactory; + import org.webmacro.Broker; import org.webmacro.Context; import org.webmacro.FastWriter; import org.webmacro.InitException; import org.webmacro.NotFoundException; import org.webmacro.PropertyException; *************** *** 49,53 **** import org.webmacro.WMConstants; import org.webmacro.WebMacro; - import org.webmacro.util.LogSystem; /** --- 51,54 ---- *************** *** 69,72 **** --- 70,74 ---- private static final long serialVersionUID = -4903102471116106113L; + static Logger _log = LoggerFactory.getLogger(WMServlet.class); private WebMacro _wm = null; *************** *** 92,100 **** /** - * Log object used to write out messages. - */ - protected Log _log; - - /** * Null means all OK. */ --- 94,97 ---- *************** *** 144,157 **** + "*** and that all values were set correctly.\n\n" + e.getMessage(); ! Log sysLog = LogSystem.getSystemLog("servlet"); ! sysLog.error(_problem, e); return; } } - _log = _broker.getLog("servlet", "WMServlet lifecycle information"); try { ! if (_log.loggingDebug()) { java.net.URL url = getBroker().getResource(Broker.WEBMACRO_PROPERTIES); --- 141,152 ---- + "*** and that all values were set correctly.\n\n" + e.getMessage(); ! _log.error(_problem, e); return; } } try { ! if (_log.isDebugEnabled()) { java.net.URL url = getBroker().getResource(Broker.WEBMACRO_PROPERTIES); *************** *** 171,175 **** _log.error(_problem, e); } ! _log.notice("started: " + this); _started = true; --- 166,170 ---- _log.error(_problem, e); } ! _log.info("started: " + this); _started = true; *************** *** 189,193 **** stop(); _wm.destroy(); ! _log.notice("stopped: " + this); _wm = null; _started = false; --- 184,188 ---- stop(); _wm.destroy(); ! _log.info("stopped: " + this); _wm = null; _started = false; *************** *** 358,383 **** /** - * Get a Log object which can be used to write to the log file. - * Messages to the logfile will be associated with the supplied - * type. The type name should be short as it may be printed on - * every log line. The description is a longer explanation of - * the type of messages you intend to write to this Log. - */ - public Log getLog (String type, String description) - { - return _broker.getLog(type, description); - } - - /** - * Get a Log object which can be used to write to the log file. - * Messages to the logfile will be associated with the supplied - * type. The type will be used as the description. - */ - public Log getLog (String type) - { - return _broker.getLog(type, type); - } - - /** * Retrieve a template from the "template" provider. Equivalent to * getBroker().get(TemplateProvider.TYPE,key) --- 353,356 ---- *************** *** 524,529 **** Locale locale = (Locale) tmpl.getParam( WMConstants.TEMPLATE_LOCALE); ! if (_log.loggingDebug()) ! _log.debug("TemplateLocale=" + locale); if (locale != null) { --- 497,501 ---- Locale locale = (Locale) tmpl.getParam( WMConstants.TEMPLATE_LOCALE); ! _log.debug("TemplateLocale=" + locale); if (locale != null) { *************** *** 538,543 **** } ! if (_log.loggingDebug()) ! _log.debug("Using output encoding " + encoding); // get the bytes before calling getOutputStream --- 510,514 ---- } ! _log.debug("Using output encoding " + encoding); // get the bytes before calling getOutputStream *************** *** 740,750 **** {Locale.class}); m.invoke(resp, (Object[])new Locale[]{locale}); ! if (_log.loggingDebug()) ! _log.debug("Successfully set locale to " + locale); } catch (Exception e) { ! if (_log.loggingDebug()) ! _log.debug("Error set locale to " + locale + ": " + e.getClass()); } } --- 711,719 ---- {Locale.class}); m.invoke(resp, (Object[])new Locale[]{locale}); ! _log.debug("Successfully set locale to " + locale); } catch (Exception e) { ! _log.debug("Error set locale to " + locale + ": " + e.getClass()); } } Index: Servlet22Broker.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/servlet/Servlet22Broker.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** Servlet22Broker.java 20 Mar 2008 10:26:44 -0000 1.16 --- Servlet22Broker.java 24 Feb 2010 21:02:19 -0000 1.17 *************** *** 24,31 **** package org.webmacro.servlet; import org.webmacro.Broker; import org.webmacro.InitException; - import org.webmacro.Log; - import org.webmacro.util.LogSystem; import javax.servlet.Servlet; --- 24,32 ---- package org.webmacro.servlet; + import org.slf4j.Logger; + import org.slf4j.LoggerFactory; + import org.webmacro.Broker; import org.webmacro.InitException; import javax.servlet.Servlet; *************** *** 52,55 **** --- 53,57 ---- { + static Logger _log = LoggerFactory.getLogger(Servlet22Broker.class); protected final ClassLoader _servletClassLoader; protected String _templatePrefix; *************** *** 85,91 **** propertySource += ", (System Properties)"; loadSystemSettings(); - initLog(_config); ! _log.notice("Loaded settings from " + propertySource); init(); } --- 87,92 ---- propertySource += ", (System Properties)"; loadSystemSettings(); ! _log.info("Loaded settings from " + propertySource); init(); } *************** *** 186,190 **** } else ! b.getLog("broker").notice( (fromServlet ? "Servlet " : "ServletContext ") + servletOrContextName --- 187,191 ---- } else ! _log.info( (fromServlet ? "Servlet " : "ServletContext ") + servletOrContextName *************** *** 194,199 **** catch (InitException e) { ! Log log = LogSystem.getSystemLog("wm"); ! log.error("Failed to initialized WebMacro from "+ (fromServlet ? "Servlet " : "ServletContext ") + servletOrContextName); --- 195,199 ---- catch (InitException e) { ! _log.error("Failed to initialized WebMacro from "+ (fromServlet ? "Servlet " : "ServletContext ") + servletOrContextName); *************** *** 243,247 **** catch (MalformedURLException e) { ! _log.warning("MalformedURLException caught in " + "ServletBroker.getResource for " + name); return null; --- 243,247 ---- catch (MalformedURLException e) { ! _log.warn("MalformedURLException caught in " + "ServletBroker.getResource for " + name); return null; Index: ServletBroker.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/servlet/ServletBroker.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** ServletBroker.java 27 Mar 2008 09:45:13 -0000 1.14 --- ServletBroker.java 24 Feb 2010 21:02:19 -0000 1.15 *************** *** 32,38 **** package org.webmacro.servlet; import org.webmacro.Broker; import org.webmacro.InitException; - import org.webmacro.util.Settings; import javax.servlet.Servlet; --- 32,39 ---- package org.webmacro.servlet; + import org.slf4j.Logger; + import org.slf4j.LoggerFactory; import org.webmacro.Broker; import org.webmacro.InitException; import javax.servlet.Servlet; *************** *** 54,57 **** --- 55,60 ---- protected ServletContext _servletContext; + protected Logger _log = LoggerFactory.getLogger(ServletBroker.class); + /** *************** *** 69,93 **** } - public void initLog (Settings config) - { - String logFile = config.getSetting("LogFile"); - if ((logFile == null || logFile.equals("")) - && _config.getBooleanSetting("LogUsingServletLog")) - addLogTarget(); - else - initLog(); - } - - private void addLogTarget () - { - synchronized (servletContextsWithLogTargets) - { - if (!servletContextsWithLogTargets.containsKey(_servletContext)) - { - _ls.addTarget(new ServletLog(_servletContext, _config)); - servletContextsWithLogTargets.put(_servletContext, Boolean.TRUE); - } - } - } public static Broker getBroker (Servlet s, Properties additionalProperties) --- 72,75 ---- Index: VariableTool.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/servlet/VariableTool.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** VariableTool.java 30 Jul 2003 04:51:17 -0000 1.12 --- VariableTool.java 24 Feb 2010 21:02:19 -0000 1.13 *************** *** 23,26 **** --- 23,28 ---- package org.webmacro.servlet; + import org.slf4j.Logger; + import org.slf4j.LoggerFactory; import org.webmacro.Context; import org.webmacro.ContextTool; *************** *** 38,41 **** --- 40,44 ---- { + static Logger _log = LoggerFactory.getLogger(VariableTool.class); Context context; *************** *** 92,103 **** catch (ClassNotFoundException cnfe) { ! context.getBroker().getLog("VariableTool") ! .error("VariableTool could not locate the class: /" + className + "/"); } catch (Exception e) { ! context.getBroker().getLog("VariableTool") ! .error("An unexpected exception occured", e); } return false; --- 95,104 ---- catch (ClassNotFoundException cnfe) { ! _log.error("VariableTool could not locate the class: /" + className + "/"); } catch (Exception e) { ! _log.error("An unexpected exception occured", e); } return false; Index: TemplateServlet.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/servlet/TemplateServlet.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** TemplateServlet.java 19 Mar 2008 12:40:55 -0000 1.11 --- TemplateServlet.java 24 Feb 2010 21:02:19 -0000 1.12 *************** *** 27,32 **** import javax.servlet.http.HttpServletResponse; import org.webmacro.Context; - import org.webmacro.Log; import org.webmacro.util.Settings; import org.webmacro.util.WMEval; --- 27,33 ---- import javax.servlet.http.HttpServletResponse; + import org.slf4j.Logger; + import org.webmacro.Context; import org.webmacro.util.Settings; import org.webmacro.util.WMEval; *************** *** 112,116 **** private ServletRouter servletRouter; ! protected Log log; --- 113,117 ---- private ServletRouter servletRouter; ! protected Logger log; Index: Servlet20Broker.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/servlet/Servlet20Broker.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Servlet20Broker.java 20 Mar 2008 12:52:38 -0000 1.9 --- Servlet20Broker.java 24 Feb 2010 21:02:18 -0000 1.10 *************** *** 23,30 **** package org.webmacro.servlet; import org.webmacro.Broker; import org.webmacro.InitException; - import org.webmacro.Log; - import org.webmacro.util.LogSystem; import javax.servlet.Servlet; --- 23,31 ---- package org.webmacro.servlet; + import org.slf4j.Logger; + import org.slf4j.LoggerFactory; + import org.webmacro.Broker; import org.webmacro.InitException; import javax.servlet.Servlet; *************** *** 52,55 **** --- 53,58 ---- { + static Logger _log = LoggerFactory.getLogger(Servlet20Broker.class); + protected ClassLoader _servletClassLoader; *************** *** 71,77 **** propertySource += ", (System Properties)"; loadSystemSettings(); - initLog(_config); ! _log.notice("Loaded settings from " + propertySource); init(); } --- 74,79 ---- propertySource += ", (System Properties)"; loadSystemSettings(); ! _log.info("Loaded settings from " + propertySource); init(); } *************** *** 141,145 **** } else ! b.getLog("broker").notice( (fromServlet ? "Servlet " : "ServletContext ") + servletOrContextName --- 143,147 ---- } else ! _log.info( (fromServlet ? "Servlet " : "ServletContext ") + servletOrContextName *************** *** 149,154 **** catch (InitException e) { ! Log log = LogSystem.getSystemLog("wm"); ! log.error("Failed to initialized WebMacro from "+ (fromServlet ? "Servlet " : "ServletContext ") + servletOrContextName); --- 151,155 ---- catch (InitException e) { ! _log.error("Failed to initialized WebMacro from "+ (fromServlet ? "Servlet " : "ServletContext ") + servletOrContextName); |
Update of /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/resource In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv30233/src/main/java/org/webmacro/resource Modified Files: AbstractTemplateLoader.java BrokerTemplateLoader.java BrokerTemplateProvider.java BrokerTemplateProviderHelper.java CachingProvider.java ClassPathTemplateLoader.java DelegatingTemplateProvider.java FileTemplateLoader.java ReloadDelayDecorator.java ReloadingCacheManager.java ServletContextTemplateLoader.java SimpleCacheManager.java TemplatePathTemplateLoader.java TemplateProvider.java URLTemplate.java URLTemplateProvider.java Log Message: Remove logging Index: URLTemplateProvider.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/resource/URLTemplateProvider.java,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** URLTemplateProvider.java 25 Mar 2008 22:54:09 -0000 1.21 --- URLTemplateProvider.java 24 Feb 2010 21:02:18 -0000 1.22 *************** *** 31,37 **** import java.util.StringTokenizer; import org.webmacro.Broker; import org.webmacro.InitException; - import org.webmacro.Log; import org.webmacro.NotFoundException; import org.webmacro.ResourceException; --- 31,39 ---- import java.util.StringTokenizer; + import org.slf4j.Logger; + import org.slf4j.LoggerFactory; + import org.webmacro.Broker; import org.webmacro.InitException; import org.webmacro.NotFoundException; import org.webmacro.ResourceException; *************** *** 97,100 **** --- 99,103 ---- final public class URLTemplateProvider extends CachingProvider { + static Logger _log = LoggerFactory.getLogger(URLTemplateProvider.class); /** CVS Revision tag. */ *************** *** 164,173 **** /** - * Where we write our log messages - */ - - private Log _log; - - /** * Supports the "template" type. This is a straight replacement for the * default TemplateProvider --- 167,170 ---- *************** *** 194,198 **** super.init(b, config); _broker = b; - _log = b.getLog("resource", "general object loading"); try --- 191,194 ---- Index: URLTemplate.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/resource/URLTemplate.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** URLTemplate.java 20 Mar 2008 12:30:09 -0000 1.12 --- URLTemplate.java 24 Feb 2010 21:02:17 -0000 1.13 *************** *** 34,37 **** --- 34,40 ---- import java.util.Properties; + import org.slf4j.Logger; + import org.slf4j.LoggerFactory; + import org.webmacro.Broker; import org.webmacro.TemplateException; *************** *** 48,51 **** --- 51,56 ---- { + static Logger _log = LoggerFactory.getLogger(URLTemplate.class); + /** CVS revision */ public static final String RCS = "@(#) $Id$"; Index: ReloadingCacheManager.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/resource/ReloadingCacheManager.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ReloadingCacheManager.java 21 Feb 2010 12:26:55 -0000 1.6 --- ReloadingCacheManager.java 24 Feb 2010 21:02:17 -0000 1.7 *************** *** 8,14 **** import java.util.concurrent.TimeUnit; import org.webmacro.Broker; import org.webmacro.InitException; - import org.webmacro.Log; import org.webmacro.ResourceException; import org.webmacro.util.Settings; --- 8,16 ---- import java.util.concurrent.TimeUnit; + import org.slf4j.Logger; + import org.slf4j.LoggerFactory; + import org.webmacro.Broker; import org.webmacro.InitException; import org.webmacro.ResourceException; import org.webmacro.util.Settings; *************** *** 24,27 **** --- 26,31 ---- public class ReloadingCacheManager implements CacheManager { + static Logger _log = LoggerFactory.getLogger(ReloadDelayDecorator.class); + private static final String NAME = "ReloadingCacheManager"; *************** *** 37,41 **** private ScheduledExecutorService _clockDaemon; - private Log _log; private abstract class MyCacheElement extends CacheElement implements Cloneable --- 41,44 ---- *************** *** 107,111 **** }); - _log = b.getLog("resource", "Object loading and caching"); _resourceType = resourceType; --- 110,113 ---- *************** *** 176,181 **** { _cache.remove(key); ! if (_log.loggingDebug()) ! _log.debug("cache expired: " + key); } }, --- 178,182 ---- { _cache.remove(key); ! _log.debug("cache expired: " + key); } }, *************** *** 212,217 **** r.setObject(o); _cache.put(query, r); ! if (_log.loggingDebug()) ! _log.debug("cached: " + query + " for " + _cacheDurationMilliseconds); try { --- 213,217 ---- r.setObject(o); _cache.put(query, r); ! _log.debug("cached: " + query + " for " + _cacheDurationMilliseconds); try { *************** *** 254,259 **** if (_cacheDurationMilliseconds >= 0) { ! if (_log.loggingDebug()) ! _log.debug("cached: " + query + " for " + _cacheDurationMilliseconds); scheduleRemoval(query); } --- 254,258 ---- if (_cacheDurationMilliseconds >= 0) { ! _log.debug("cached: " + query + " for " + _cacheDurationMilliseconds); scheduleRemoval(query); } Index: BrokerTemplateProvider.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/resource/BrokerTemplateProvider.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** BrokerTemplateProvider.java 20 Mar 2008 11:42:51 -0000 1.7 --- BrokerTemplateProvider.java 24 Feb 2010 21:02:17 -0000 1.8 *************** *** 23,29 **** package org.webmacro.resource; import org.webmacro.Broker; import org.webmacro.InitException; - import org.webmacro.Log; import org.webmacro.ResourceException; import org.webmacro.util.Settings; --- 23,30 ---- package org.webmacro.resource; + import org.slf4j.Logger; + import org.slf4j.LoggerFactory; import org.webmacro.Broker; import org.webmacro.InitException; import org.webmacro.ResourceException; import org.webmacro.util.Settings; *************** *** 43,47 **** private BrokerTemplateProviderHelper _helper; ! private Log _log; public void init (Broker b, Settings config) throws InitException --- 44,48 ---- private BrokerTemplateProviderHelper _helper; ! static Logger _log = LoggerFactory.getLogger(BrokerTemplateProvider.class); public void init (Broker b, Settings config) throws InitException *************** *** 51,55 **** _helper.init(b, config); _helper.setReload(_cacheSupportsReload); - _log = b.getLog("resource", "Object loading and caching"); } --- 52,55 ---- *************** *** 62,67 **** throws ResourceException { ! if (_log.loggingInfo()) ! _log.info("Loading template: " + name); return _helper.load(name, ce); } --- 62,66 ---- throws ResourceException { ! _log.info("Loading template: " + name); return _helper.load(name, ce); } Index: TemplateProvider.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/resource/TemplateProvider.java,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** TemplateProvider.java 20 Mar 2008 12:48:20 -0000 1.30 --- TemplateProvider.java 24 Feb 2010 21:02:17 -0000 1.31 *************** *** 27,33 **** import java.util.StringTokenizer; import org.webmacro.Broker; import org.webmacro.InitException; - import org.webmacro.Log; import org.webmacro.NotFoundException; import org.webmacro.ResourceException; --- 27,35 ---- import java.util.StringTokenizer; + import org.slf4j.Logger; + import org.slf4j.LoggerFactory; + import org.webmacro.Broker; import org.webmacro.InitException; import org.webmacro.NotFoundException; import org.webmacro.ResourceException; *************** *** 43,47 **** * relative to the TemplatePath specified in the configuration. * <p> ! * Ordinarily you would not accses this class directly, but * instead you would call the Broker and it would look up and * use the TemplateProvider for you. --- 45,49 ---- * relative to the TemplatePath specified in the configuration. * <p> ! * Ordinarily you would not access this class directly, but * instead you would call the Broker and it would look up and * use the TemplateProvider for you. *************** *** 52,55 **** --- 54,58 ---- { + static Logger _log = LoggerFactory.getLogger(TemplateProvider.class); // INITIALIZATION *************** *** 58,62 **** private Broker _broker = null; private String _templatePath; - private Log _log; private BrokerTemplateProviderHelper _btpHelper; --- 61,64 ---- *************** *** 111,115 **** super.init(b, config); _broker = b; - _log = b.getLog("resource", "Object loading and caching"); try --- 113,116 ---- *************** *** 158,163 **** Object ret = null; ! if (_log.loggingInfo()) ! _log.info("Loading template: " + name); File tFile = findFileTemplate(name); --- 159,163 ---- Object ret = null; ! _log.info("Loading template: " + name); File tFile = findFileTemplate(name); *************** *** 179,183 **** catch (NullPointerException npe) { ! _log.warning("TemplateProvider: Template not found: " + name, npe); throw new ResourceException("Error fetching template " + name, npe); --- 179,183 ---- catch (NullPointerException npe) { ! _log.warn("TemplateProvider: Template not found: " + name, npe); throw new ResourceException("Error fetching template " + name, npe); *************** *** 186,190 **** { // Parse error ! _log.warning("TemplateProvider: Error occured while parsing " + name, e); throw new InvalidResourceException("Error parsing template " --- 186,190 ---- { // Parse error ! _log.warn("TemplateProvider: Error occured while parsing " + name, e); throw new InvalidResourceException("Error parsing template " *************** *** 193,197 **** catch (Exception e) { ! _log.warning("TemplateProvider: Error occured while fetching " + name, e); throw new ResourceException("Error fetching template " + name, e); --- 193,197 ---- catch (Exception e) { ! _log.warn("TemplateProvider: Error occured while fetching " + name, e); throw new ResourceException("Error fetching template " + name, e); *************** *** 224,229 **** if (_templateDirectory != null) { ! if (_log.loggingDebug()) ! _log.debug("Looking for template in TemplatePath: " + fileName); for (int i = 0; i < _templateDirectory.length; i++) { --- 224,228 ---- if (_templateDirectory != null) { ! _log.debug("Looking for template in TemplatePath: " + fileName); for (int i = 0; i < _templateDirectory.length; i++) { *************** *** 232,237 **** if (tFile.canRead()) { ! if (_log.loggingDebug()) ! _log.debug("TemplateProvider: Found " + fileName + " in " + dir); return tFile; } --- 231,235 ---- if (tFile.canRead()) { ! _log.debug("TemplateProvider: Found " + fileName + " in " + dir); return tFile; } Index: AbstractTemplateLoader.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/resource/AbstractTemplateLoader.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** AbstractTemplateLoader.java 12 Jun 2003 00:47:47 -0000 1.4 --- AbstractTemplateLoader.java 24 Feb 2010 21:02:17 -0000 1.5 *************** *** 22,29 **** package org.webmacro.resource; import org.webmacro.Broker; import org.webmacro.InitException; - import org.webmacro.Log; import org.webmacro.util.Settings; /** --- 22,31 ---- package org.webmacro.resource; + import org.slf4j.Logger; + import org.slf4j.LoggerFactory; import org.webmacro.Broker; import org.webmacro.InitException; import org.webmacro.util.Settings; + import org.webmacro.util.WMEval; /** *************** *** 39,44 **** protected Broker broker; ! /** Log to use */ ! protected Log log; /** Helper class for loading templates from files or URLs */ --- 41,46 ---- protected Broker broker; ! /** Logger to use */ ! static Logger _log = LoggerFactory.getLogger(AbstractTemplateLoader.class); /** Helper class for loading templates from files or URLs */ *************** *** 53,57 **** { this.broker = b; - log = b.getLog("resource", "Loading templates"); helper = new TemplateLoaderHelper(); helper.init(b, config); --- 55,58 ---- Index: CachingProvider.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/resource/CachingProvider.java,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** CachingProvider.java 19 Mar 2008 17:25:18 -0000 1.20 --- CachingProvider.java 24 Feb 2010 21:02:17 -0000 1.21 *************** *** 24,30 **** package org.webmacro.resource; import org.webmacro.Broker; import org.webmacro.InitException; - import org.webmacro.Log; import org.webmacro.Provider; import org.webmacro.ResourceException; --- 24,31 ---- package org.webmacro.resource; + import org.slf4j.Logger; + import org.slf4j.LoggerFactory; import org.webmacro.Broker; import org.webmacro.InitException; import org.webmacro.Provider; import org.webmacro.ResourceException; *************** *** 44,49 **** { private CacheManager _cache; - private Log _log; protected boolean _cacheSupportsReload; --- 45,51 ---- { + static Logger _log = LoggerFactory.getLogger(CachingProvider.class); + private CacheManager _cache; protected boolean _cacheSupportsReload; *************** *** 59,64 **** String cacheManager; - _log = b.getLog("resource", "Object loading and caching"); - cacheManager = b.getSetting("CachingProvider." + getType() + ".CacheManager"); --- 61,64 ---- *************** *** 79,83 **** catch (Exception e) { ! _log.warning("Unable to load cache manager " + cacheManager + " for resource type " + getType() + ", using TrivialCacheManager. Reason:\n" + e); --- 79,83 ---- catch (Exception e) { ! _log.warn("Unable to load cache manager " + cacheManager + " for resource type " + getType() + ", using TrivialCacheManager. Reason:\n" + e); Index: FileTemplateLoader.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/resource/FileTemplateLoader.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** FileTemplateLoader.java 12 Jun 2003 00:47:47 -0000 1.6 --- FileTemplateLoader.java 24 Feb 2010 21:02:17 -0000 1.7 *************** *** 23,26 **** --- 23,28 ---- package org.webmacro.resource; + import org.slf4j.Logger; + import org.slf4j.LoggerFactory; import org.webmacro.ResourceException; import org.webmacro.Template; *************** *** 38,41 **** --- 40,45 ---- { + static Logger _log = LoggerFactory.getLogger(FileTemplateLoader.class); + private String path; *************** *** 50,58 **** if (!f.exists()) { ! log.warning("FileTemplateLoader: " + f.getAbsolutePath() + " does not exist."); } else if (!f.isDirectory()) { ! log.warning("FileTemplateLoader: " + f.getAbsolutePath() + " is not a directory."); } } --- 54,62 ---- if (!f.exists()) { ! _log.warn("FileTemplateLoader: " + f.getAbsolutePath() + " does not exist."); } else if (!f.isDirectory()) { ! _log.warn("FileTemplateLoader: " + f.getAbsolutePath() + " is not a directory."); } } *************** *** 67,72 **** if (tFile.isFile() && tFile.canRead()) { ! if (log.loggingDebug()) ! log.debug("FileTemplateProvider: Found template " + tFile.getAbsolutePath()); return helper.load(tFile, ce); } --- 71,75 ---- if (tFile.isFile() && tFile.canRead()) { ! _log.debug("FileTemplateProvider: Found template " + tFile.getAbsolutePath()); return helper.load(tFile, ce); } Index: BrokerTemplateLoader.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/resource/BrokerTemplateLoader.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** BrokerTemplateLoader.java 18 Mar 2008 20:08:58 -0000 1.5 --- BrokerTemplateLoader.java 24 Feb 2010 21:02:17 -0000 1.6 *************** *** 22,25 **** --- 22,27 ---- package org.webmacro.resource; + import org.slf4j.Logger; + import org.slf4j.LoggerFactory; import org.webmacro.ResourceException; import org.webmacro.Template; *************** *** 34,37 **** --- 36,40 ---- { + static Logger _log = LoggerFactory.getLogger(BrokerTemplateLoader.class); public void setConfig (String config) { *************** *** 39,46 **** if (config != null && config.length() > 0) { ! if (log.loggingWarning()) ! { ! log.warning("BrokerTemplateProvider: Ignoring configuration options " + config); ! } } } --- 42,46 ---- if (config != null && config.length() > 0) { ! _log.warn("BrokerTemplateProvider: Ignoring configuration options " + config); } } *************** *** 49,55 **** { URL url = broker.getTemplate(query); ! if (url != null && log.loggingDebug()) { ! log.debug("BrokerTemplateLoader: Found Template " + url.toString()); } return (url != null) ? helper.load(url, ce) : null; --- 49,55 ---- { URL url = broker.getTemplate(query); ! if (url != null && _log.isDebugEnabled()) { ! _log.debug("BrokerTemplateLoader: Found Template " + url.toString()); } return (url != null) ? helper.load(url, ce) : null; Index: ClassPathTemplateLoader.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/resource/ClassPathTemplateLoader.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** ClassPathTemplateLoader.java 12 Jun 2003 00:47:47 -0000 1.7 --- ClassPathTemplateLoader.java 24 Feb 2010 21:02:17 -0000 1.8 *************** *** 22,25 **** --- 22,27 ---- package org.webmacro.resource; + import org.slf4j.Logger; + import org.slf4j.LoggerFactory; import org.webmacro.Broker; import org.webmacro.InitException; *************** *** 43,46 **** --- 45,49 ---- { + static Logger _log = LoggerFactory.getLogger(ClassPathTemplateLoader.class); private ClassLoader loader; private String path; *************** *** 57,62 **** if (config.length() > 0 && !config.endsWith("/")) { ! if (log.loggingInfo()) ! log.info("ClassPathTemplateLoader: appending \"/\" to path " + config); config = config.concat("/"); } --- 60,64 ---- if (config.length() > 0 && !config.endsWith("/")) { ! _log.info("ClassPathTemplateLoader: appending \"/\" to path " + config); config = config.concat("/"); } *************** *** 80,86 **** } URL url = loader.getResource(path.concat(query)); ! if (url != null && log.loggingDebug()) { ! log.debug("ClassPathTemplateProvider: Found Template " + url.toString()); } return (url != null) ? helper.load(url, ce) : null; --- 82,88 ---- } URL url = loader.getResource(path.concat(query)); ! if (url != null && _log.isDebugEnabled()) { ! _log.debug("ClassPathTemplateProvider: Found Template " + url.toString()); } return (url != null) ? helper.load(url, ce) : null; Index: ReloadDelayDecorator.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/resource/ReloadDelayDecorator.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ReloadDelayDecorator.java 18 Mar 2008 09:33:38 -0000 1.6 --- ReloadDelayDecorator.java 24 Feb 2010 21:02:17 -0000 1.7 *************** *** 22,28 **** package org.webmacro.resource; import org.webmacro.Broker; import org.webmacro.InitException; - import org.webmacro.Log; import org.webmacro.util.Settings; --- 22,29 ---- package org.webmacro.resource; + import org.slf4j.Logger; + import org.slf4j.LoggerFactory; import org.webmacro.Broker; import org.webmacro.InitException; import org.webmacro.util.Settings; *************** *** 45,52 **** { ! /** maps protocol types to Long objects */ private Map reloadDelays; private long defaultDelay; - private Log log; public ReloadDelayDecorator () --- 46,54 ---- { ! static Logger _log = LoggerFactory.getLogger(ReloadDelayDecorator.class); ! ! /** maps protocol types to Long objects */ private Map reloadDelays; private long defaultDelay; public ReloadDelayDecorator () *************** *** 81,85 **** }); } - log = b.getLog("resource", "ReloadDelayDecorator"); } --- 83,86 ---- *************** *** 104,119 **** if (delay > 0) { ! if (log.loggingDebug()) ! { ! log.debug("Returning timed reload context with delay " + delay); ! } return new TimedReloadContext(reloadContext, delay); } else { ! if (log.loggingDebug()) ! { ! log.debug("Returning unmodified reload context"); ! } return reloadContext; } --- 105,114 ---- if (delay > 0) { ! _log.debug("Returning timed reload context with delay " + delay); return new TimedReloadContext(reloadContext, delay); } else { ! _log.debug("Returning unmodified reload context"); return reloadContext; } Index: TemplatePathTemplateLoader.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/resource/TemplatePathTemplateLoader.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TemplatePathTemplateLoader.java 12 Jun 2003 00:47:47 -0000 1.3 --- TemplatePathTemplateLoader.java 24 Feb 2010 21:02:17 -0000 1.4 *************** *** 23,26 **** --- 23,28 ---- package org.webmacro.resource; + import org.slf4j.Logger; + import org.slf4j.LoggerFactory; import org.webmacro.InitException; import org.webmacro.ResourceException; *************** *** 41,44 **** --- 43,48 ---- { + static Logger _log = LoggerFactory.getLogger(TemplatePathTemplateLoader.class); + private TemplateLoader[] loaders; *************** *** 48,52 **** Settings settings = broker.getSettings(); String templatePath = settings.getSetting("TemplatePath", ""); ! log.info("Using legacy template path " + templatePath); if (templatePath.length() != 0) { --- 52,56 ---- Settings settings = broker.getSettings(); String templatePath = settings.getSetting("TemplatePath", ""); ! _log.info("Using legacy template path " + templatePath); if (templatePath.length() != 0) { Index: SimpleCacheManager.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/resource/SimpleCacheManager.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** SimpleCacheManager.java 21 Feb 2010 01:49:49 -0000 1.4 --- SimpleCacheManager.java 24 Feb 2010 21:02:17 -0000 1.5 *************** *** 3,9 **** import java.util.Map; import org.webmacro.Broker; import org.webmacro.InitException; - import org.webmacro.Log; import org.webmacro.ResourceException; import org.webmacro.util.Settings; --- 3,11 ---- import java.util.Map; + import org.slf4j.Logger; + import org.slf4j.LoggerFactory; + import org.webmacro.Broker; import org.webmacro.InitException; import org.webmacro.ResourceException; import org.webmacro.util.Settings; *************** *** 19,27 **** public class SimpleCacheManager implements CacheManager { private static final String NAME = "SimpleCacheManager"; private final Map _cache = new ConcurrentHashMap(); private String _resourceType; - private Log _log; public SimpleCacheManager() { --- 21,30 ---- public class SimpleCacheManager implements CacheManager { + static Logger _log = LoggerFactory.getLogger(SimpleCacheManager.class); + private static final String NAME = "SimpleCacheManager"; private final Map _cache = new ConcurrentHashMap(); private String _resourceType; public SimpleCacheManager() { *************** *** 31,35 **** throws InitException { - _log = b.getLog("resource", "Object loading and caching"); _resourceType = resourceType; --- 34,37 ---- Index: ServletContextTemplateLoader.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/resource/ServletContextTemplateLoader.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ServletContextTemplateLoader.java 12 Jun 2003 00:47:47 -0000 1.6 --- ServletContextTemplateLoader.java 24 Feb 2010 21:02:17 -0000 1.7 *************** *** 22,25 **** --- 22,27 ---- package org.webmacro.resource; + import org.slf4j.Logger; + import org.slf4j.LoggerFactory; import org.webmacro.Broker; import org.webmacro.InitException; *************** *** 53,56 **** --- 55,60 ---- { + static Logger _log = LoggerFactory.getLogger(ServletContextTemplateLoader.class); + private ServletContext loader; private String path; *************** *** 75,80 **** if (config.length() > 0 && !config.endsWith("/")) { ! if (log.loggingInfo()) ! log.info("ServletContextTemplateLoader: appending \"/\" to path " + config); config = config.concat("/"); } --- 79,83 ---- if (config.length() > 0 && !config.endsWith("/")) { ! _log.info("ServletContextTemplateLoader: appending \"/\" to path " + config); config = config.concat("/"); } *************** *** 83,88 **** if (!config.startsWith("/")) { ! if (log.loggingInfo()) ! log.info("ServletContextTemplateLoader: adding \"/\" at the beginning of path " + config); config = "/".concat(config); } --- 86,90 ---- if (!config.startsWith("/")) { ! _log.info("ServletContextTemplateLoader: adding \"/\" at the beginning of path " + config); config = "/".concat(config); } *************** *** 95,101 **** { URL url = loader.getResource(path.concat(query)); ! if (url != null && log.loggingDebug()) { ! log.debug("ServletContextTemplateProvider: Found Template " + url.toString()); } return (url != null) ? helper.load(url, ce) : null; --- 97,103 ---- { URL url = loader.getResource(path.concat(query)); ! if (url != null && _log.isDebugEnabled()) { ! _log.debug("ServletContextTemplateProvider: Found Template " + url.toString()); } return (url != null) ? helper.load(url, ce) : null; Index: DelegatingTemplateProvider.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/resource/DelegatingTemplateProvider.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** DelegatingTemplateProvider.java 18 Mar 2008 09:29:05 -0000 1.9 --- DelegatingTemplateProvider.java 24 Feb 2010 21:02:17 -0000 1.10 *************** *** 29,35 **** import java.util.List; import org.webmacro.Broker; import org.webmacro.InitException; - import org.webmacro.Log; import org.webmacro.NotFoundException; import org.webmacro.ResourceException; --- 29,37 ---- import java.util.List; + import org.slf4j.Logger; + import org.slf4j.LoggerFactory; import org.webmacro.Broker; + import org.webmacro.Context; import org.webmacro.InitException; import org.webmacro.NotFoundException; import org.webmacro.ResourceException; *************** *** 73,77 **** { ! private Log log; private TemplateLoaderFactory factory; private TemplateLoader[] templateLoaders; --- 75,80 ---- { ! static Logger _log = LoggerFactory.getLogger(DelegatingTemplateProvider.class); ! private TemplateLoaderFactory factory; private TemplateLoader[] templateLoaders; *************** *** 80,87 **** { super.init(broker, config); - log = broker.getLog("resource", "DelegatingTemplateProvider"); String factoryClass = config.getSetting("TemplateLoaderFactory", ""); ! log.info("DelegatingTemplateProvider: Using TemplateLoaderFactory " + factoryClass); factory = createFactory(factoryClass); --- 83,89 ---- { super.init(broker, config); String factoryClass = config.getSetting("TemplateLoaderFactory", ""); ! _log.info("DelegatingTemplateProvider: Using TemplateLoaderFactory " + factoryClass); factory = createFactory(factoryClass); Index: BrokerTemplateProviderHelper.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/resource/BrokerTemplateProviderHelper.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** BrokerTemplateProviderHelper.java 20 Mar 2008 14:12:58 -0000 1.15 --- BrokerTemplateProviderHelper.java 24 Feb 2010 21:02:17 -0000 1.16 *************** *** 28,34 **** import java.net.URL; import org.webmacro.Broker; import org.webmacro.InitException; - import org.webmacro.Log; import org.webmacro.NotFoundException; import org.webmacro.ResourceException; --- 28,35 ---- import java.net.URL; + import org.slf4j.Logger; + import org.slf4j.LoggerFactory; import org.webmacro.Broker; import org.webmacro.InitException; import org.webmacro.NotFoundException; import org.webmacro.ResourceException; *************** *** 53,61 **** { // INITIALIZATION private Broker _broker; //private int _cacheDuration; ! private Log _log; private boolean _cacheSupportsReload = true; private ReloadDelayDecorator reloadDelay; --- 54,65 ---- { + static Logger _log = LoggerFactory.getLogger(BrokerTemplateProviderHelper.class); + // INITIALIZATION private Broker _broker; //private int _cacheDuration; ! ! private boolean _cacheSupportsReload = true; private ReloadDelayDecorator reloadDelay; *************** *** 88,92 **** { _broker = b; - _log = b.getLog("resource", "Object loading and caching"); //_cacheDuration = config.getIntegerSetting("TemplateExpireTime", 0); reloadDelay = new ReloadDelayDecorator(); --- 92,95 ---- *************** *** 145,153 **** catch (NullPointerException npe) { ! _log.warning("BrokerTemplateProvider: Template not found: " + name); } catch (ParseException e) { ! _log.warning("BrokerTemplateProvider: Error occured while parsing " + name, e); throw new InvalidResourceException("Error parsing template " + name, --- 148,156 ---- catch (NullPointerException npe) { ! _log.warn("BrokerTemplateProvider: Template not found: " + name); } catch (ParseException e) { ! _log.warn("BrokerTemplateProvider: Error occured while parsing " + name, e); throw new InvalidResourceException("Error parsing template " + name, *************** *** 156,160 **** catch (IOException e) { ! _log.warning("BrokerTemplateProvider: IOException while parsing " + name, e); throw new InvalidResourceException("Error parsing template " + name, --- 159,163 ---- catch (IOException e) { ! _log.warn("BrokerTemplateProvider: IOException while parsing " + name, e); throw new InvalidResourceException("Error parsing template " + name, *************** *** 163,167 **** catch (Exception e) { ! _log.warning("BrokerTemplateProvider: Error occured while fetching " + name, e); throw new ResourceException("Error parsing template " + name, e); --- 166,170 ---- catch (Exception e) { ! _log.warn("BrokerTemplateProvider: Error occured while fetching " + name, e); throw new ResourceException("Error parsing template " + name, e); *************** *** 195,204 **** final private URL findTemplate (String fileName) { ! if (_log.loggingDebug()) ! _log.debug("Looking for template in class path: " + fileName); URL u = _broker.getTemplate(fileName); if (u != null) ! if (_log.loggingDebug()) ! _log.debug("BrokerTemplateProvider: Found " + fileName + " at " + u.toString()); return u; --- 198,205 ---- final private URL findTemplate (String fileName) { ! _log.debug("Looking for template in class path: " + fileName); URL u = _broker.getTemplate(fileName); if (u != null) ! _log.debug("BrokerTemplateProvider: Found " + fileName + " at " + u.toString()); return u; |
|
From: Tim P <ti...@us...> - 2010-02-24 21:02:54
|
Update of /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/parser In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv30233/src/main/java/org/webmacro/parser Modified Files: WMParser.java WMParser_impl.java Log Message: Remove logging Index: WMParser_impl.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/parser/WMParser_impl.java,v retrieving revision 1.60 retrieving revision 1.61 diff -C2 -d -r1.60 -r1.61 *** WMParser_impl.java 18 Feb 2010 21:16:54 -0000 1.60 --- WMParser_impl.java 24 Feb 2010 21:02:09 -0000 1.61 *************** *** 7,10 **** --- 7,12 ---- import java.util.Stack; + import org.slf4j.Logger; + import org.slf4j.LoggerFactory; import org.webmacro.Broker; import org.webmacro.Context; *************** *** 31,34 **** --- 33,37 ---- import org.webmacro.engine.QuotedStringBuilder; import org.webmacro.engine.VariableBuilder; + import org.webmacro.resource.DelegatingTemplateProvider; /** *************** *** 44,47 **** --- 47,51 ---- public class WMParser_impl implements WMParser_implConstants { + static Logger _log = LoggerFactory.getLogger(WMParser_impl.class); private Broker broker; private BackupCharStream stream; *************** *** 174,178 **** // Warning routines private void warnDeprecated(String feature, int line, int col) { ! broker.getLog("parser").warning("Deprecated feature: " + feature + " at " + templateName + ":" + line + "." + col); } --- 178,182 ---- // Warning routines private void warnDeprecated(String feature, int line, int col) { ! _log.warn("Deprecated feature: " + feature + " at " + templateName + ":" + line + "." + col); } Index: WMParser.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/parser/WMParser.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** WMParser.java 20 Mar 2008 12:22:52 -0000 1.11 --- WMParser.java 24 Feb 2010 21:02:09 -0000 1.12 *************** *** 26,29 **** --- 26,31 ---- import java.io.Reader; + import org.slf4j.Logger; + import org.slf4j.LoggerFactory; import org.webmacro.Broker; import org.webmacro.engine.BlockBuilder; *************** *** 36,39 **** --- 38,42 ---- { + static Logger _log = LoggerFactory.getLogger(WMParser.class); private final Broker _broker; *************** *** 41,45 **** { _broker = b; ! _broker.getLog("parser").info("parser created"); } --- 44,48 ---- { _broker = b; ! _log.info("parser created"); } |
|
From: Tim P <ti...@us...> - 2010-02-24 21:02:47
|
Update of /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/engine In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv30233/src/main/java/org/webmacro/engine Modified Files: Block.java CrankyEvaluationExceptionHandler.java DebugEvaluationExceptionHandler.java DefaultEvaluationExceptionHandler.java ParserProvider.java PropertyOperatorCache.java WMTemplate.java Log Message: Remove logging Index: WMTemplate.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/engine/WMTemplate.java,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** WMTemplate.java 20 Feb 2009 13:37:55 -0000 1.54 --- WMTemplate.java 24 Feb 2010 21:02:09 -0000 1.55 *************** *** 30,37 **** import java.util.Map; import org.webmacro.Broker; import org.webmacro.Context; import org.webmacro.FastWriter; - import org.webmacro.Log; import org.webmacro.PropertyException; import org.webmacro.Template; --- 30,39 ---- import java.util.Map; + import org.slf4j.Logger; + import org.slf4j.LoggerFactory; + import org.webmacro.Broker; import org.webmacro.Context; import org.webmacro.FastWriter; import org.webmacro.PropertyException; import org.webmacro.Template; *************** *** 63,66 **** --- 65,69 ---- { + static Logger _log = LoggerFactory.getLogger(WMTemplate.class); /** * The resource broker used to resolve things in this template. *************** *** 69,77 **** /** - * Where we log our errors. - */ - final protected Log _log; - - /** * Whether template has already been parsed. */ --- 72,75 ---- *************** *** 116,120 **** _broker = broker; _parserName = parserName; - _log = broker.getLog("template", "template lifecycle"); } --- 114,117 ---- *************** *** 346,350 **** String warning = "Template: Exception evaluating template " + this; ! _log.warning(warning, e); out.write(context.getEvaluationExceptionHandler() --- 343,347 ---- String warning = "Template: Exception evaluating template " + this; ! _log.warn(warning, e); out.write(context.getEvaluationExceptionHandler() Index: Block.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/engine/Block.java,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** Block.java 20 Mar 2008 22:45:29 -0000 1.28 --- Block.java 24 Feb 2010 21:02:07 -0000 1.29 *************** *** 27,30 **** --- 27,32 ---- import java.util.List; + import org.slf4j.Logger; + import org.slf4j.LoggerFactory; import org.webmacro.Context; import org.webmacro.FastWriter; *************** *** 43,46 **** --- 45,50 ---- { + static Logger _log = LoggerFactory.getLogger(Block.class); + private final String[] _strings; private final Macro[] _macros; *************** *** 344,350 **** catch (IOException e) { ! context.getBroker().getLog("engine", ! "parsing and template execution") ! .error("StringWriter threw an IOException!", e); return null; } --- 348,352 ---- catch (IOException e) { ! _log.error("StringWriter threw an IOException!", e); return null; } Index: DebugEvaluationExceptionHandler.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/engine/DebugEvaluationExceptionHandler.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** DebugEvaluationExceptionHandler.java 20 Mar 2008 11:16:07 -0000 1.9 --- DebugEvaluationExceptionHandler.java 24 Feb 2010 21:02:07 -0000 1.10 *************** *** 24,30 **** package org.webmacro.engine; import org.webmacro.Broker; import org.webmacro.Context; - import org.webmacro.Log; import org.webmacro.PropertyException; import org.webmacro.util.Settings; --- 24,31 ---- package org.webmacro.engine; + import org.slf4j.Logger; + import org.slf4j.LoggerFactory; import org.webmacro.Broker; import org.webmacro.Context; import org.webmacro.PropertyException; import org.webmacro.util.Settings; *************** *** 63,67 **** { ! private Log _log; public DebugEvaluationExceptionHandler () --- 64,68 ---- { ! static Logger _log = LoggerFactory.getLogger(DebugEvaluationExceptionHandler.class); public DebugEvaluationExceptionHandler () *************** *** 76,80 **** public void init (Broker b, Settings config) { - _log = b.getLog("engine"); } --- 77,80 ---- *************** *** 130,134 **** if (_log != null) { ! _log.warning(strError, propEx); } // and rethrow it --- 130,134 ---- if (_log != null) { ! _log.warn(strError, propEx); } // and rethrow it Index: PropertyOperatorCache.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/engine/PropertyOperatorCache.java,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** PropertyOperatorCache.java 20 Mar 2008 21:01:48 -0000 1.24 --- PropertyOperatorCache.java 24 Feb 2010 21:02:08 -0000 1.25 *************** *** 36,43 **** import java.util.Vector; import org.webmacro.Broker; import org.webmacro.Context; import org.webmacro.InitException; - import org.webmacro.Log; import org.webmacro.PropertyException; import org.webmacro.resource.CacheManager; --- 36,44 ---- import java.util.Vector; + import org.slf4j.Logger; + import org.slf4j.LoggerFactory; import org.webmacro.Broker; import org.webmacro.Context; import org.webmacro.InitException; import org.webmacro.PropertyException; import org.webmacro.resource.CacheManager; *************** *** 58,62 **** private CacheManager _cache; ! private Log _log; private HashMap _restrictedClasses; --- 59,63 ---- private CacheManager _cache; ! static Logger _log = LoggerFactory.getLogger(PropertyOperatorCache.class); private HashMap _restrictedClasses; *************** *** 69,73 **** String cacheManager; - _log = b.getLog("resource", "Object loading and caching"); cacheManager = b.getSetting("PropertyOperator.CacheManager"); --- 70,73 ---- *************** *** 87,91 **** catch (Exception e) { ! _log.warning("Unable to load cache manager " + cacheManager + " for PropertyOperator, using SimpleCacheManager. Reason:\n" + e); _cache = new SimpleCacheManager(); --- 87,91 ---- catch (Exception e) { ! _log.warn("Unable to load cache manager " + cacheManager + " for PropertyOperator, using SimpleCacheManager. Reason:\n" + e); _cache = new SimpleCacheManager(); Index: CrankyEvaluationExceptionHandler.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/engine/CrankyEvaluationExceptionHandler.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** CrankyEvaluationExceptionHandler.java 12 Jun 2003 00:47:45 -0000 1.8 --- CrankyEvaluationExceptionHandler.java 24 Feb 2010 21:02:07 -0000 1.9 *************** *** 24,30 **** package org.webmacro.engine; import org.webmacro.Broker; import org.webmacro.Context; - import org.webmacro.Log; import org.webmacro.PropertyException; import org.webmacro.util.Settings; --- 24,31 ---- package org.webmacro.engine; + import org.slf4j.Logger; + import org.slf4j.LoggerFactory; import org.webmacro.Broker; import org.webmacro.Context; import org.webmacro.PropertyException; import org.webmacro.util.Settings; *************** *** 44,50 **** { ! private Log _log; ! public CrankyEvaluationExceptionHandler () { } --- 45,51 ---- { ! static Logger _log = LoggerFactory.getLogger(CrankyEvaluationExceptionHandler.class); ! public CrankyEvaluationExceptionHandler () { } *************** *** 57,61 **** public void init (Broker b, Settings config) { - _log = b.getLog("engine"); } --- 58,61 ---- *************** *** 82,86 **** // log it if (_log != null) ! _log.warning("Error evaluating $" + variable.getVariableName(), problem); --- 82,86 ---- // log it if (_log != null) ! _log.warn("Error evaluating $" + variable.getVariableName(), problem); *************** *** 111,115 **** // log it if (_log != null) ! _log.warning("Error expanding $" + variable.getVariableName(), problem); --- 111,115 ---- // log it if (_log != null) ! _log.warn("Error expanding $" + variable.getVariableName(), problem); Index: ParserProvider.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/engine/ParserProvider.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** ParserProvider.java 19 Mar 2008 09:43:27 -0000 1.12 --- ParserProvider.java 24 Feb 2010 21:02:07 -0000 1.13 *************** *** 28,36 **** import java.util.Hashtable; import org.webmacro.Broker; import org.webmacro.InitException; - import org.webmacro.Log; import org.webmacro.NotFoundException; import org.webmacro.Provider; import org.webmacro.util.Settings; --- 28,39 ---- import java.util.Hashtable; + import org.slf4j.Logger; + import org.slf4j.LoggerFactory; + import org.webmacro.Broker; import org.webmacro.InitException; import org.webmacro.NotFoundException; import org.webmacro.Provider; + import org.webmacro.util.Instantiator; import org.webmacro.util.Settings; *************** *** 40,43 **** --- 43,47 ---- public final class ParserProvider implements Provider { + static Logger _log = LoggerFactory.getLogger(Instantiator.class); // BULDER CLASS MANAGEMENT *************** *** 46,50 **** private Broker _broker = null; - private Log _log; private final Class[] _brokerParam = {Broker.class}; private final Object[] _brokerArg = new Object[1]; --- 50,53 ---- *************** *** 164,168 **** _brokerArg[0] = broker; _broker = broker; - _log = broker.getLog("engine"); try --- 167,170 ---- Index: DefaultEvaluationExceptionHandler.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/engine/DefaultEvaluationExceptionHandler.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** DefaultEvaluationExceptionHandler.java 19 Mar 2008 17:09:28 -0000 1.13 --- DefaultEvaluationExceptionHandler.java 24 Feb 2010 21:02:07 -0000 1.14 *************** *** 24,30 **** package org.webmacro.engine; import org.webmacro.Broker; import org.webmacro.Context; - import org.webmacro.Log; import org.webmacro.PropertyException; import org.webmacro.util.Settings; --- 24,31 ---- package org.webmacro.engine; + import org.slf4j.Logger; + import org.slf4j.LoggerFactory; import org.webmacro.Broker; import org.webmacro.Context; import org.webmacro.PropertyException; import org.webmacro.util.Settings; *************** *** 46,50 **** { ! private Log _log; public DefaultEvaluationExceptionHandler () --- 47,51 ---- { ! static Logger _log = LoggerFactory.getLogger(DefaultEvaluationExceptionHandler.class); public DefaultEvaluationExceptionHandler () *************** *** 59,63 **** public void init (Broker b, Settings config) { - _log = b.getLog("engine"); } --- 60,63 ---- |
Update of /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/directive In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv30233/src/main/java/org/webmacro/directive Modified Files: BeanDirective.java Directive.java DirectiveProvider.java IncludeDirective.java Log Message: Remove logging Index: IncludeDirective.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/directive/IncludeDirective.java,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** IncludeDirective.java 18 Feb 2010 22:50:12 -0000 1.27 --- IncludeDirective.java 24 Feb 2010 21:02:07 -0000 1.28 *************** *** 29,36 **** import java.util.StringTokenizer; import org.webmacro.Broker; import org.webmacro.Context; import org.webmacro.FastWriter; - import org.webmacro.Log; import org.webmacro.Macro; import org.webmacro.NotFoundException; --- 29,37 ---- import java.util.StringTokenizer; + import org.slf4j.Logger; + import org.webmacro.Broker; import org.webmacro.Context; import org.webmacro.FastWriter; import org.webmacro.Macro; import org.webmacro.NotFoundException; *************** *** 220,224 **** /** Logging can be good */ ! protected Log _log; /** The included file type. * One of TYPE_TEMPLATE, TYPE_STATIC, TYPE_MACRO, or TYPE_DYNAMIC. */ --- 221,225 ---- /** Logging can be good */ ! protected Logger _log; /** The included file type. * One of TYPE_TEMPLATE, TYPE_STATIC, TYPE_MACRO, or TYPE_DYNAMIC. */ *************** *** 288,292 **** if (_type == TYPE_TEXT || _type == TYPE_MACRO) { ! _log.warning("Included a 'static' file type using a dynamic filename. " + "File will be included, but any included #macro's will not at " + bc.getCurrentLocation()); } --- 289,293 ---- if (_type == TYPE_TEXT || _type == TYPE_MACRO) { ! _log.warn("Included a 'static' file type using a dynamic filename. " + "File will be included, but any included #macro's will not at " + bc.getCurrentLocation()); } *************** *** 372,381 **** } ! if (_log.loggingDebug() && context.getCurrentLocation().indexOf(_strFilename) > -1) { // when in debug mode, output a warning if a template tries to include itself ! // there are situtations where this is desired, but it's good to make // the user aware of what they're doing ! _log.warning(context.getCurrentLocation() + " includes itself."); } --- 373,382 ---- } ! if (_log.isDebugEnabled() && context.getCurrentLocation().indexOf(_strFilename) > -1) { // when in debug mode, output a warning if a template tries to include itself ! // there are situations where this is desired, but it's good to make // the user aware of what they're doing ! _log.warn(context.getCurrentLocation() + " includes itself."); } *************** *** 385,396 **** _type = guessType(broker, _strFilename); ! if (_log.loggingDebug()) ! { ! _log.debug("Including '" + _strFilename + "' as " + ((_type == TYPE_MACRO) ? "MACRO" : (_type == TYPE_TEMPLATE) ? "TEMPLATE" : (_type == TYPE_TEXT) ? "TEXT" : "UNKNOWN. Throwing exception")); - } Object toInclude = getThingToInclude(broker, _type, _strFilename); --- 386,394 ---- _type = guessType(broker, _strFilename); ! _log.debug("Including '" + _strFilename + "' as " + ((_type == TYPE_MACRO) ? "MACRO" : (_type == TYPE_TEMPLATE) ? "TEMPLATE" : (_type == TYPE_TEXT) ? "TEXT" : "UNKNOWN. Throwing exception")); Object toInclude = getThingToInclude(broker, _type, _strFilename); Index: BeanDirective.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/directive/BeanDirective.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** BeanDirective.java 18 Mar 2008 20:03:13 -0000 1.16 --- BeanDirective.java 24 Feb 2010 21:02:05 -0000 1.17 *************** *** 31,38 **** import java.util.Map; import org.webmacro.Broker; import org.webmacro.Context; import org.webmacro.FastWriter; - import org.webmacro.Log; import org.webmacro.Macro; import org.webmacro.PropertyException; --- 31,39 ---- import java.util.Map; + import org.slf4j.Logger; + import org.slf4j.LoggerFactory; import org.webmacro.Broker; import org.webmacro.Context; import org.webmacro.FastWriter; import org.webmacro.Macro; import org.webmacro.PropertyException; *************** *** 57,60 **** --- 58,63 ---- { + static Logger _log = LoggerFactory.getLogger(BeanDirective.class); + private static final String APP_BEANS_KEY = "org.webmacro.directive.BeanDirective.appBeans"; *************** *** 107,112 **** private Block onNewBlock; - private Log _log; - private Broker _broker; --- 110,113 ---- *************** *** 143,147 **** { _broker = bc.getBroker(); - _log = _broker.getLog("directive"); // appBeans map is created by the init method when this directive // is registered by the DirectiveProvider --- 144,147 ---- Index: DirectiveProvider.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/directive/DirectiveProvider.java,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** DirectiveProvider.java 27 May 2005 19:44:58 -0000 1.19 --- DirectiveProvider.java 24 Feb 2010 21:02:07 -0000 1.20 *************** *** 23,29 **** package org.webmacro.directive; import org.webmacro.Broker; import org.webmacro.InitException; - import org.webmacro.Log; import org.webmacro.Provider; import org.webmacro.engine.IntrospectionException; --- 23,30 ---- package org.webmacro.directive; + import org.slf4j.Logger; + import org.slf4j.LoggerFactory; import org.webmacro.Broker; import org.webmacro.InitException; import org.webmacro.Provider; import org.webmacro.engine.IntrospectionException; *************** *** 38,41 **** --- 39,44 ---- { + static Logger _log = LoggerFactory.getLogger(DirectiveProvider.class); + public static final String DIRECTIVE_KEY = "directive"; *************** *** 43,47 **** private final Hashtable _descriptors = new Hashtable(); - private Log _log; private Broker _broker; --- 46,49 ---- *************** *** 62,66 **** catch (Exception ce) { ! _log.warning("Exception loading directive " + settingValue, ce); } } --- 64,68 ---- catch (Exception ce) { ! _log.warn("Exception loading directive " + settingValue, ce); } } *************** *** 143,147 **** catch (Exception e) { ! _log.warning("Unable to invoke the init method for the directive " + directive.getName(), e); } --- 145,149 ---- catch (Exception e) { ! _log.warn("Unable to invoke the init method for the directive " + directive.getName(), e); } *************** *** 188,192 **** { _broker = broker; - _log = broker.getLog("directive"); try { --- 190,193 ---- *************** *** 195,199 **** catch (Exception e) { ! _log.warning("Error initializing DirectiveProvider", e); throw new InitException("Could not initialize DirectiveProvider", e); } --- 196,200 ---- catch (Exception e) { ! _log.warn("Error initializing DirectiveProvider", e); throw new InitException("Could not initialize DirectiveProvider", e); } Index: Directive.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/directive/Directive.java,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** Directive.java 19 Mar 2008 09:38:05 -0000 1.24 --- Directive.java 24 Feb 2010 21:02:07 -0000 1.25 *************** *** 25,28 **** --- 25,30 ---- import java.io.IOException; + import org.slf4j.Logger; + import org.slf4j.LoggerFactory; import org.webmacro.Context; import org.webmacro.FastWriter; *************** *** 56,59 **** --- 58,62 ---- { + static Logger _log = LoggerFactory.getLogger(Directive.class); public static final int ArgType_CONDITION = 1; public static final int ArgType_LVALUE = 2; *************** *** 100,104 **** catch (IOException e) { ! context.getBroker().getLog("engine").error( "Directive.evaluate: IO exception on write to StringWriter", e); return ""; --- 103,107 ---- catch (IOException e) { ! _log.error( "Directive.evaluate: IO exception on write to StringWriter", e); return ""; *************** *** 130,134 **** FastWriter writer) throws IOException, PropertyException { ! context.getLog("directive").warning(warning + " at " + context.getCurrentLocation()); writer.write(getWarningText(warning, context)); --- 133,137 ---- FastWriter writer) throws IOException, PropertyException { ! context.getLog("directive").warn(warning + " at " + context.getCurrentLocation()); writer.write(getWarningText(warning, context)); |
Update of /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv30233/src/main/java/org/webmacro Modified Files: Broker.java Context.java URLTemplateLoader.java WM.java WebMacro.java Removed Files: Log.java Log Message: Remove logging Index: URLTemplateLoader.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/URLTemplateLoader.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** URLTemplateLoader.java 18 Mar 2008 20:48:17 -0000 1.3 --- URLTemplateLoader.java 24 Feb 2010 21:02:04 -0000 1.4 *************** *** 26,29 **** --- 26,31 ---- import java.net.URL; + import org.slf4j.Logger; + import org.slf4j.LoggerFactory; import org.webmacro.resource.AbstractTemplateLoader; import org.webmacro.resource.CacheElement; *************** *** 39,42 **** --- 41,45 ---- { + static Logger _log = LoggerFactory.getLogger(URLTemplateLoader.class); private URL baseURI; *************** *** 49,53 **** catch (MalformedURLException e) { ! log.error("Cannot init url template loader, bad URL", e); } } --- 52,56 ---- catch (MalformedURLException e) { ! _log.error("Cannot init url template loader, bad URL", e); } } *************** *** 62,69 **** { URL url = new URL(baseURI, query); ! if (log.loggingDebug()) ! { ! log.debug("FileTemplateProvider: Found template " + url); ! } return helper.load(url, ce); } --- 65,69 ---- { URL url = new URL(baseURI, query); ! _log.debug("FileTemplateProvider: Found template " + url); return helper.load(url, ce); } Index: Context.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/Context.java,v retrieving revision 1.66 retrieving revision 1.67 diff -C2 -d -r1.66 -r1.67 *** Context.java 20 Mar 2008 12:44:27 -0000 1.66 --- Context.java 24 Feb 2010 21:02:03 -0000 1.67 *************** *** 29,32 **** --- 29,34 ---- import java.util.Set; + import org.slf4j.Logger; + import org.slf4j.LoggerFactory; import org.webmacro.engine.EvaluationExceptionHandler; import org.webmacro.engine.FunctionCall; *************** *** 38,42 **** * via the Template.write() or Template.evaluate() methods. Actually * you can render any Macro object by passing a Context to its ! * write() or evaluat() method, not just templates. * <p> * A Context is a per-thread data structure. It should not be shared --- 40,44 ---- * via the Template.write() or Template.evaluate() methods. Actually * you can render any Macro object by passing a Context to its ! * write() or evaluate() method, not just templates. * <p> * A Context is a per-thread data structure. It should not be shared *************** *** 44,49 **** * of the state for a single request into the context and then execute * it, with each request having its own separate context. In this ! * thread-per-request worldview there is no reason to synchronize ! * the Context objects as they are not shared bewteen threads. * <p> * Ordinarily you acquire a Context object from the WebMacro --- 46,51 ---- * of the state for a single request into the context and then execute * it, with each request having its own separate context. In this ! * thread-per-request world view there is no reason to synchronize ! * the Context objects as they are not shared between threads. * <p> * Ordinarily you acquire a Context object from the WebMacro *************** *** 58,63 **** public class Context implements Map, Cloneable { private final Broker _broker; - private final Log _log; private HashMap _funcs = null; // lazy initialization --- 60,66 ---- public class Context implements Map, Cloneable { + static Logger _log = LoggerFactory.getLogger(Context.class); + private final Broker _broker; private HashMap _funcs = null; // lazy initialization *************** *** 85,89 **** { _broker = broker; - _log = broker.getLog("context", "property and evaluation errors"); } --- 88,91 ---- *************** *** 173,179 **** * into the log under the supplied log type. */ ! public final Log getLog (String type, String description) { ! return _broker.getLog(type, description); } --- 175,181 ---- * into the log under the supplied log type. */ ! public final Logger getLog (String type, String description) { ! return _log; } *************** *** 183,189 **** * be used as the description. */ ! public final Log getLog (String type) { ! return _broker.getLog(type, type); } --- 185,191 ---- * be used as the description. */ ! public final Logger getLog (String type) { ! return _log; } Index: WebMacro.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/WebMacro.java,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** WebMacro.java 12 Nov 2008 20:55:47 -0000 1.19 --- WebMacro.java 24 Feb 2010 21:02:05 -0000 1.20 *************** *** 24,27 **** --- 24,29 ---- package org.webmacro; + import org.slf4j.Logger; + import java.io.OutputStream; import java.io.UnsupportedEncodingException; *************** *** 30,34 **** * WebMacro Manager Interface * ! * This interface provies root access into the WebMacro system. Use it to * obtain references to other WebMacro objects which you might need. * <p> --- 32,36 ---- * WebMacro Manager Interface * ! * This interface provides root access into the WebMacro system. Use it to * obtain references to other WebMacro objects which you might need. * <p> *************** *** 46,51 **** * No longer using ant filtering. */ ! public static final String VERSION = "2.1"; ! public static final String BUILD_DATE = "2008-11-13"; /** --- 48,53 ---- * No longer using ant filtering. */ ! public static final String VERSION = "2.2"; ! public static final String BUILD_DATE = "2010-02-22"; /** *************** *** 116,125 **** * control logging. */ ! public Log getLog (String type, String description); /** * Get a log using the type as the description */ ! public Log getLog (String type); /** --- 118,127 ---- * control logging. */ ! //public Logger getLog (String type, String description); /** * Get a log using the type as the description */ ! //public Logger getLog (String type); /** Index: WM.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/WM.java,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** WM.java 19 Mar 2008 00:20:29 -0000 1.48 --- WM.java 24 Feb 2010 21:02:04 -0000 1.49 *************** *** 33,36 **** --- 33,39 ---- import javax.servlet.http.HttpServletResponse; + import org.slf4j.Logger; + import org.slf4j.LoggerFactory; + import org.webmacro.servlet.ServletBroker; import org.webmacro.servlet.WebContext; *************** *** 48,51 **** --- 51,55 ---- public class WM implements WebMacro { + static Logger _log = LoggerFactory.getLogger(WM.class); // INIT METHODS--MANAGE ACCESS TO THE BROKER *************** *** 55,59 **** final private Provider _tmplProvider; final private Provider _urlProvider; - final private Log _log; --- 59,62 ---- *************** *** 135,140 **** _broker = broker; ! _log = _broker.getLog("wm", "WebMacro instance lifecycle"); ! _log.notice("new " + this + " v" + WebMacro.VERSION); try --- 138,142 ---- _broker = broker; ! _log.info("new " + this + " v" + WebMacro.VERSION); try *************** *** 260,271 **** /** ! * Get a log to write information to. Log type names should be lower * case and short. They may be printed on every line of the log * file. The description is a longer explanation of the type of ! * log messages you intend to produce with this Log object. */ ! final public Log getLog (String type, String description) { ! return _broker.getLog(type, description); } --- 262,273 ---- /** ! * Get a log to write information to. Logger type names should be lower * case and short. They may be printed on every line of the log * file. The description is a longer explanation of the type of ! * log messages you intend to produce with this Logger object. */ ! final public Logger getLog (String type, String description) { ! return _log; } *************** *** 273,279 **** * Get a log using the type as the description */ ! final public Log getLog (String type) { ! return _broker.getLog(type, type); } --- 275,281 ---- * Get a log using the type as the description */ ! final public Logger getLog (String type) { ! return _log; } Index: Broker.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/Broker.java,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** Broker.java 21 Feb 2010 01:49:49 -0000 1.49 --- Broker.java 24 Feb 2010 21:02:02 -0000 1.50 *************** *** 40,43 **** --- 40,46 ---- import java.util.WeakHashMap; + import org.slf4j.Logger; + import org.slf4j.LoggerFactory; + import org.webmacro.broker.ContextAutoLoader; import org.webmacro.engine.DefaultEvaluationExceptionHandler; *************** *** 46,53 **** import org.webmacro.engine.MethodWrapper; import org.webmacro.engine.PropertyOperatorCache; - import org.webmacro.util.LogFile; - import org.webmacro.util.LogSystem; - import org.webmacro.util.LogTarget; - import org.webmacro.util.LogTargetFactory; import org.webmacro.util.Settings; import org.webmacro.util.SubSettings; --- 49,52 ---- *************** *** 91,99 **** final protected Settings _config = new Settings(); final protected String _name; - final protected LogSystem _ls; final public PropertyOperatorCache _propertyOperators = new PropertyOperatorCache(); ! protected Log _log; private EvaluationExceptionHandler _eeHandler; --- 90,98 ---- final protected Settings _config = new Settings(); final protected String _name; final public PropertyOperatorCache _propertyOperators = new PropertyOperatorCache(); ! protected Logger _log = LoggerFactory.getLogger(Broker.class); ! private EvaluationExceptionHandler _eeHandler; *************** *** 138,143 **** loadSettings(WEBMACRO_PROPERTIES, true); loadSystemSettings(); ! initLog(); ! _log.notice("Loaded settings from " + propertySource); init(); } --- 137,141 ---- loadSettings(WEBMACRO_PROPERTIES, true); loadSystemSettings(); ! _log.info("Loaded settings from " + propertySource); init(); } *************** *** 157,162 **** loadSettings(props); loadSystemSettings(); ! initLog(); ! _log.notice("Loaded settings from " + propertySource); init(); } --- 155,159 ---- loadSettings(props); loadSystemSettings(); ! _log.info("Loaded settings from " + propertySource); init(); } *************** *** 179,184 **** loadSystemSettings(); propertySource += ", " + "(System Properties)"; ! initLog(); ! _log.notice("Loaded settings from " + propertySource); init(); } --- 176,180 ---- loadSystemSettings(); propertySource += ", " + "(System Properties)"; ! _log.info("Loaded settings from " + propertySource); init(); } *************** *** 196,259 **** { _name = name; - _ls = new LogSystem(_name); - _log = _ls.getLog("broker", "general object loader and configuration"); } - /** - * Constructors should call this after they've set up the properties - * to set up the log target. If subclasses are going to set up logging - * themselves, then they don't have to call it. - */ - protected void initLog () - { - final LogTargetFactory ltf = LogTargetFactory.getInstance(); - final Broker broker = this; - - if (!_config.containsKey("LogTargets")) - { - // no log targets defined so just start with the - // standard LogFile - try - { - _ls.addTarget(new LogFile(_config)); - } - catch (IOException e) - { - _log.error("Failed to open logfile", e); - } - } - else - { - // use whatever was defined in the configuration for this broker - _config.processListSetting("LogTargets", - new Settings.ListSettingHandler() - { - public void processSetting (String settingKey, - String settingValue) - { - try - { - LogTarget lt = ltf.createLogTarget(broker, - settingValue, - _config); - _ls.addTarget(lt); - } - catch (LogTargetFactory.LogCreationException e) - { - _log.error("Broker unable to init log " - + settingValue, e); - } - } - } - ); - } - - _log.notice("starting " + this.getClass().getName() + ": " + _name); - } /** * Provide access to the broker's log. */ ! public Log getBrokerLog() { return _log; --- 192,202 ---- { _name = name; } /** * Provide access to the broker's log. */ ! public Logger getBrokerLog() { return _log; *************** *** 307,311 **** // Write out our properties as debug records ! if (_log.loggingDebug()) { String[] properties = _config.getKeys(); --- 250,254 ---- // Write out our properties as debug records ! if (_log.isDebugEnabled()) { String[] properties = _config.getKeys(); *************** *** 339,343 **** catch (Exception e) { ! _log.warning("Unable to instantiate exception handler of class " + eehClass + "; " + e); } --- 282,286 ---- catch (Exception e) { ! _log.warn("Unable to instantiate exception handler of class " + eehClass + "; " + e); } *************** *** 482,488 **** catch (InitException e) { ! Log log = LogSystem.getSystemLog("wm"); ! log.error("Failed to initialize WebMacro with default config"); ! throw e; } } --- 425,429 ---- catch (InitException e) { ! throw new InitException("Failed to initialize WebMacro with default config",e); } } *************** *** 490,530 **** public static Broker getBroker (Properties p) throws InitException { ! try ! { ! Broker b = findBroker(p); ! if (b == null) ! { ! b = new Broker(p); ! register(p, b); ! } ! return b; ! } ! catch (InitException e) { ! Log log = LogSystem.getSystemLog("wm"); ! log.error("Failed to initialize WebMacro with default config"); ! throw e; } } public static Broker getBroker (String settingsFile) throws InitException { ! try ! { ! Broker b = findBroker(settingsFile); ! if (b == null) ! { ! b = new Broker(settingsFile); ! register(settingsFile, b); ! } ! ! return b; ! } ! catch (InitException e) { ! Log log = LogSystem.getSystemLog("wm"); ! log.error("Failed to initialize WebMacro from " + settingsFile); ! throw e; } } --- 431,453 ---- public static Broker getBroker (Properties p) throws InitException { ! Broker b = findBroker(p); ! if (b == null) { ! b = new Broker(p); ! register(p, b); } + return b; } public static Broker getBroker (String settingsFile) throws InitException { ! Broker b = findBroker(settingsFile); ! if (b == null) { ! b = new Broker(settingsFile); ! register(settingsFile, b); } + + return b; } *************** *** 546,550 **** } } ! // _log.notice("Loading properties file " + WEBMACRO_DEFAULTS); _config.load(_defaultSettings); } --- 469,473 ---- } } ! // _log.info("Loading properties file " + WEBMACRO_DEFAULTS); _config.load(_defaultSettings); } *************** *** 565,569 **** if (optional) { ! _log.notice("Cannot find properties file " + name + ", continuing"); } e.printStackTrace(); --- 488,492 ---- if (optional) { ! _log.info("Cannot find properties file " + name + ", continuing"); } e.printStackTrace(); *************** *** 591,595 **** protected void loadSystemSettings () { ! // _log.notice("Loading properties from system properties"); _config.load(System.getProperties(), SETTINGS_PREFIX); } --- 514,518 ---- protected void loadSystemSettings () { ! // _log.info("Loading properties from system properties"); _config.load(System.getProperties(), SETTINGS_PREFIX); } *************** *** 725,754 **** /** - * Get a log: the behavior of this log depends on the configuration - * of the broker. If your system loads from a WebMacro.properties - * file then look in there for details about setting up and - * controlling the Log. - * <p> - * You should try and hang on to the Log you get back from this - * method since creating new Log objects can be expensive. You - * also likely pay for IO when you use a log object. - * <p> - * The type you supply will be associated with your log messages - * in the log file. - */ - public Log getLog (String type, String description) - { - return _ls.getLog(type, description); - } - - /** - * Shortcut: create a new log using the type as the description - */ - public Log getLog (String type) - { - return _ls.getLog(type, type); - } - - /** * Get a new FastWriter * A FastWriter is used when writing templates to an output stream --- 648,651 ---- --- Log.java DELETED --- |
|
From: Tim P <ti...@us...> - 2010-02-24 21:02:43
|
Update of /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/broker In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv30233/src/main/java/org/webmacro/broker Modified Files: DefaultContextAutoLoader.java Log Message: Remove logging Index: DefaultContextAutoLoader.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/broker/DefaultContextAutoLoader.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** DefaultContextAutoLoader.java 21 Feb 2010 01:49:49 -0000 1.3 --- DefaultContextAutoLoader.java 24 Feb 2010 21:02:05 -0000 1.4 *************** *** 5,11 **** import java.util.concurrent.ConcurrentHashMap; import org.webmacro.Broker; import org.webmacro.Context; - import org.webmacro.Log; import org.webmacro.PropertyException; import org.webmacro.util.Settings; --- 5,12 ---- import java.util.concurrent.ConcurrentHashMap; + import org.slf4j.Logger; + import org.slf4j.LoggerFactory; import org.webmacro.Broker; import org.webmacro.Context; import org.webmacro.PropertyException; import org.webmacro.util.Settings; *************** *** 19,23 **** public class DefaultContextAutoLoader implements ContextAutoLoader { ! private Log _log; private Broker _broker; private Map _factories = new ConcurrentHashMap(); --- 20,24 ---- public class DefaultContextAutoLoader implements ContextAutoLoader { ! static Logger _log = LoggerFactory.getLogger(DefaultContextAutoLoader.class); private Broker _broker; private Map _factories = new ConcurrentHashMap(); *************** *** 25,29 **** public void init(Broker b, String name) { _broker = b; - _log = b.getLog("broker"); loadFactories(name); } --- 26,29 ---- *************** *** 86,90 **** catch (ClassNotFoundException e) { ! _log.warning("Context: Could not locate class for context tool " + className); return; } --- 86,90 ---- catch (ClassNotFoundException e) { ! _log.warn("Context: Could not locate class for context tool " + className); return; } *************** *** 144,148 **** } else { ! _log.warning("Context object " + toolName + " is not of type ContextObjectFactory"); } } --- 144,148 ---- } else { ! _log.warn("Context object " + toolName + " is not of type ContextObjectFactory"); } } |
|
From: Tim P <ti...@us...> - 2010-02-24 21:02:41
|
Update of /cvsroot/webmacro/webmacro/webmacro/src/main/java In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv30233/src/main/java Modified Files: WebMacro.defaults Log Message: Remove logging Index: WebMacro.defaults =================================================================== RCS file: /cvsroot/webmacro/webmacro/webmacro/src/main/java/WebMacro.defaults,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** WebMacro.defaults 4 Nov 2008 23:07:17 -0000 1.1 --- WebMacro.defaults 24 Feb 2010 21:02:02 -0000 1.2 *************** *** 36,40 **** # A whitespace separated list of org.webmacro.util.LogTarget ! # implementations that should should receive your log output. # # WebMacro comes with a default target, LogFile, which logs --- 36,40 ---- # A whitespace separated list of org.webmacro.util.LogTarget ! # implementations that should receive your log output. # # WebMacro comes with a default target, LogFile, which logs *************** *** 43,47 **** # custom logging system or to Log4J or whatever. ! LogTargets: org.webmacro.util.LogFile --- 43,47 ---- # custom logging system or to Log4J or whatever. ! #LogTargets: org.webmacro.util.LogFile |
|
From: Tim P <ti...@us...> - 2010-02-24 21:02:41
|
Update of /cvsroot/webmacro/webmacro/webmacro In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv30233 Modified Files: pom.xml Log Message: Remove logging Index: pom.xml =================================================================== RCS file: /cvsroot/webmacro/webmacro/webmacro/pom.xml,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** pom.xml 21 Feb 2010 13:01:30 -0000 1.28 --- pom.xml 24 Feb 2010 21:02:00 -0000 1.29 *************** *** 320,329 **** </dependency> <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> <version>1.1</version> ! <scope>compile</scope> </dependency> ! <dependency> <groupId>jakarta-regexp</groupId> --- 320,342 ---- </dependency> <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.5.8</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <version>1.5.8</version> + <scope>test</scope> + </dependency> + <!-- + <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> <version>1.1</version> ! <scope>test</scope> </dependency> ! --> <dependency> <groupId>jakarta-regexp</groupId> |
|
From: Tim P <ti...@us...> - 2010-02-24 21:02:40
|
Update of /cvsroot/webmacro/webmacro/webmacro/examples In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv30233/examples Modified Files: CheckConfig.java Log Message: Remove logging Index: CheckConfig.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/webmacro/examples/CheckConfig.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** CheckConfig.java 13 Nov 2008 00:06:34 -0000 1.5 --- CheckConfig.java 24 Feb 2010 21:02:02 -0000 1.6 *************** *** 8,13 **** import javax.servlet.http.HttpServletRequest; import org.webmacro.Broker; - import org.webmacro.Log; import org.webmacro.Template; import org.webmacro.servlet.HandlerException; --- 8,15 ---- import javax.servlet.http.HttpServletRequest; + import org.slf4j.Logger; + import org.slf4j.LoggerFactory; + import org.webmacro.Broker; import org.webmacro.Template; import org.webmacro.servlet.HandlerException; *************** *** 23,30 **** public class CheckConfig extends WMServlet { private static final long serialVersionUID = -1844295645621234018L; final static public boolean DEBUG = true; final static public String DEFAULT_TEMPLATE = "default.wm"; - private Log _log = null; public Template handle(WebContext context) throws HandlerException { --- 25,33 ---- public class CheckConfig extends WMServlet { private static final long serialVersionUID = -1844295645621234018L; + + static Logger _log = LoggerFactory.getLogger(CheckConfig.class); final static public boolean DEBUG = true; final static public String DEFAULT_TEMPLATE = "default.wm"; public Template handle(WebContext context) throws HandlerException { *************** *** 110,114 **** // get the log //_log = org.webmacro.util.LogSystem.getInstance().getLog("WMTest", "WMTest log"); - _log = org.webmacro.util.LogSystem.getInstance().getLog(null); _log.info(this.getClass().getName() + ".start() invoked."); } // start() --- 113,116 ---- |
|
From: Tim P <ti...@us...> - 2010-02-24 21:02:30
|
Update of /cvsroot/webmacro/webmacro/webmacro/src/test/java/org/webmacro/template In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv30233/src/test/java/org/webmacro/template Modified Files: TemplateTestCase.java Log Message: Remove logging Index: TemplateTestCase.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/webmacro/src/test/java/org/webmacro/template/TemplateTestCase.java,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** TemplateTestCase.java 20 Feb 2010 11:07:11 -0000 1.26 --- TemplateTestCase.java 24 Feb 2010 21:02:20 -0000 1.27 *************** *** 1,11 **** package org.webmacro.template; import junit.framework.TestCase; import org.apache.regexp.RE; ! import org.webmacro.*; import org.webmacro.engine.StringTemplate; - import java.io.*; - public abstract class TemplateTestCase extends TestCase --- 1,20 ---- package org.webmacro.template; + import java.io.FileInputStream; + import java.io.FileNotFoundException; + import java.io.FileWriter; + import java.io.InputStream; + import java.io.Writer; + import junit.framework.TestCase; + import org.apache.regexp.RE; ! import org.webmacro.Context; ! import org.webmacro.PropertyException; ! import org.webmacro.Template; ! import org.webmacro.WM; ! import org.webmacro.WebMacro; import org.webmacro.engine.StringTemplate; public abstract class TemplateTestCase extends TestCase |
|
From: Tim P <ti...@us...> - 2010-02-24 21:02:10
|
Update of /cvsroot/webmacro/webmacro/webmacro/lib In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv30233/lib Added Files: log4j-1.2.9.jar slf4j-api-1.5.5.jar slf4j-log4j12-1.5.5.jar Log Message: Remove logging --- NEW FILE: log4j-1.2.9.jar --- (This appears to be a binary file; contents omitted.) --- NEW FILE: slf4j-api-1.5.5.jar --- (This appears to be a binary file; contents omitted.) --- NEW FILE: slf4j-log4j12-1.5.5.jar --- (This appears to be a binary file; contents omitted.) |
|
From: Tim P <ti...@us...> - 2010-02-23 23:24:09
|
Update of /cvsroot/webmacro/webmacro/webmacro In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv5107 Modified Files: build.xml Log Message: Use testOutput directory for test output Index: build.xml =================================================================== RCS file: /cvsroot/webmacro/webmacro/webmacro/build.xml,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** build.xml 23 Feb 2010 23:12:12 -0000 1.55 --- build.xml 23 Feb 2010 23:24:00 -0000 1.56 *************** *** 61,72 **** <property name="examples" value="examples"/> <property name="jar" value="${app.name}.jar"/> - <property name="adapters-jar" value="${app.name}-adapters.jar"/> <property name="src.jar" value="${app.name}-src.jar"/> <property environment="ENV" /> <property name="javacc.home" value="${ENV.JAVACC_HOME}" /> ! <property name="testTarget" value="test/target"/> ! <property name="testClasses" value="${testTarget}/test-classes"/> ! <property name="testReports" value="${testTarget}/test-reports"/> <property name="test" value="Test*"/> --- 61,71 ---- <property name="examples" value="examples"/> <property name="jar" value="${app.name}.jar"/> <property name="src.jar" value="${app.name}-src.jar"/> <property environment="ENV" /> <property name="javacc.home" value="${ENV.JAVACC_HOME}" /> ! <property name="testOutput" value="testOutput"/> ! <property name="testClasses" value="${testOutput}/test-classes"/> ! <property name="testReports" value="${testOutput}/test-reports"/> <property name="test" value="Test*"/> *************** *** 95,113 **** </taskdef> - <target name="prepare"> - <tstamp /> - <mkdir dir="${classes}"/> - <mkdir dir="${javadoc}"/> - <mkdir dir="${dist.binary}"/> - <mkdir dir="${examples}/WEB-INF/classes"/> - <mkdir dir="${examples}/WEB-INF/lib"/> - <mkdir dir="${dist.binary}"/> - <mkdir dir="${dist.source}"/> - <available property="javacc.present" classname="org.javacc.parser.Main" - classpath="${javacc.home}/javacc.jar" /> - <!-- <available property="javacc.present" classname="COM.sun.labs.javacc.Main" classpath="${javacc.home}/JavaCC.zip" /> --> - </target> - - <target name="clean" > <delete dir="${classes}"/> --- 94,97 ---- *************** *** 121,129 **** <delete file="${jar}"/> <delete file="${src.jar}"/> - <delete file="${adapters-jar}"/> <delete dir="${tmpdir}"/> <delete dir="${examples}/WEB-INF/classes" /> <delete dir="${examples}/WEB-INF/lib" /> <delete dir="${testClasses}"/> <delete dir="${testReports}"/> --- 105,113 ---- <delete file="${jar}"/> <delete file="${src.jar}"/> <delete dir="${tmpdir}"/> <delete dir="${examples}/WEB-INF/classes" /> <delete dir="${examples}/WEB-INF/lib" /> + <delete dir="${testOutput}"/> <delete dir="${testClasses}"/> <delete dir="${testReports}"/> *************** *** 142,145 **** --- 126,144 ---- </target> + <target name="prepare"> + <tstamp /> + <mkdir dir="${classes}"/> + <mkdir dir="${javadoc}"/> + <mkdir dir="${dist.binary}"/> + <mkdir dir="${examples}/WEB-INF/classes"/> + <mkdir dir="${examples}/WEB-INF/lib"/> + <mkdir dir="${dist.binary}"/> + <mkdir dir="${dist.source}"/> + <available property="javacc.present" classname="org.javacc.parser.Main" + classpath="${javacc.home}/javacc.jar" /> + <!-- <available property="javacc.present" classname="COM.sun.labs.javacc.Main" classpath="${javacc.home}/JavaCC.zip" /> --> + </target> + + <target name='javacc' depends='prepare' if='javacc.present'> <javacc target="${sourceDir}/org/webmacro/parser/WMParser_impl.jj" javacchome="${javacc.home}" /> |
6 messages has been excluded from this view by a project administrator.
