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...> - 2010-02-23 23:12:27
|
Update of /cvsroot/webmacro/webmacro/webmacro In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv3610 Modified Files: build.xml Log Message: Run tests too, and use new directory structure Index: build.xml =================================================================== RCS file: /cvsroot/webmacro/webmacro/webmacro/build.xml,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** build.xml 12 Nov 2008 23:24:03 -0000 1.54 --- build.xml 23 Feb 2010 23:12:12 -0000 1.55 *************** *** 43,52 **** </target> ! <property name="version" value="2.1" /> <property name="wm-style" value="classic" /> <!-- can be "minimal" to get webmacro.defaults.minimal into build--> <property name="app.name" value="webmacro" /> <property name="tmpdir" value="tmp" /> <property name="classes" value="classes"/> - <property name="macros" value="macros"/> <property name="dist.binary" value="webmacro-${wm-style}-bin-${version}"/> <!-- The formal value not used for distribution: --- 43,56 ---- </target> ! <property name="version" value="2.2-SNAPSHOT" /> <property name="wm-style" value="classic" /> <!-- can be "minimal" to get webmacro.defaults.minimal into build--> <property name="app.name" value="webmacro" /> <property name="tmpdir" value="tmp" /> + + <property name="sourceDir" value="src/main/java" /> + <property name="macrosDir" value="src/main/resources/macros" /> + <property name="testSourceDir" value="src/test/java" /> + <property name="classes" value="classes"/> <property name="dist.binary" value="webmacro-${wm-style}-bin-${version}"/> <!-- The formal value not used for distribution: *************** *** 62,65 **** --- 66,74 ---- <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*"/> + <path id="class.path"> <fileset dir="lib"> *************** *** 67,75 **** <include name="*.zip" /> </fileset> ! <pathelement location="${classes}" /> ! <pathelement location="${macros}" /> ! <pathelement path="${java.class.path}" /> </path> - <property name="classpath.resolved" refid="class.path"/> <taskdef name="javacc" --- 76,92 ---- <include name="*.zip" /> </fileset> ! <pathelement location="${macrosDir}" /> ! <pathelement path="${java.class.path}"/> ! </path> ! ! <path id="test.class.path"> ! <path refid="class.path"/> ! <pathelement location="${classes}"/> ! <pathelement location="${testSourceDir}"/> ! </path> ! <path id="test.runtime.class.path"> ! <path refid="test.class.path"/> ! <pathelement location="${testClasses}"/> </path> <taskdef name="javacc" *************** *** 93,97 **** ! <target name="clean" depends="test-clean"> <delete dir="${classes}"/> <delete dir="${javadoc}"/> --- 110,114 ---- ! <target name="clean" > <delete dir="${classes}"/> <delete dir="${javadoc}"/> *************** *** 108,116 **** <delete dir="${examples}/WEB-INF/classes" /> <delete dir="${examples}/WEB-INF/lib" /> ! <ant antfile="test/build.xml" target="unit-clean" /> </target> <target name='javacc' depends='prepare' if='javacc.present'> ! <javacc target="src/org/webmacro/parser/WMParser_impl.jj" javacchome="${javacc.home}" /> </target> --- 125,147 ---- <delete dir="${examples}/WEB-INF/classes" /> <delete dir="${examples}/WEB-INF/lib" /> ! ! <delete dir="${testClasses}"/> ! <delete dir="${testReports}"/> ! <delete file='LoadReport.html'/> ! <delete file='controls.html'/> ! <delete file='winFrame.html'/> ! <delete file='windows.html'/> ! <delete file='verisign.html'/> ! <delete file='LoadReportRelease2Features.html'/> ! <delete file='PerformanceReport.html'/> ! <delete file='ecomm.html'/> ! <!-- see WMEvalTest --> ! <delete file='t.tmp'/> ! <delete file='T'/> ! </target> <target name='javacc' depends='prepare' if='javacc.present'> ! <javacc target="${sourceDir}/org/webmacro/parser/WMParser_impl.jj" javacchome="${javacc.home}" /> </target> *************** *** 122,127 **** <filter token="BUILD_DATE" value="${TODAY}" /> <copy todir="${tmpdir}" filtering="true"> ! <fileset dir="src" /> </copy> <javac srcdir="${tmpdir}" fork="yes" --- 153,159 ---- <filter token="BUILD_DATE" value="${TODAY}" /> <copy todir="${tmpdir}" filtering="true"> ! <fileset dir="${sourceDir}" /> </copy> + <echo message="${java.class.path}"/> <javac srcdir="${tmpdir}" fork="yes" *************** *** 139,160 **** </target> - <target name="compile-optional" depends="compile"> - <filter token="VERSION" value="${version}" /> - <filter token="BUILD_DATE" value="${TODAY}" /> - <copy todir="${tmpdir}" filtering="true"> - <fileset dir="src-optional" /> - </copy> - <javac srcdir="${tmpdir}" destdir="${classes}" - debug="on" optimize="off" deprecation="off"> - <classpath refid="class.path" /> - </javac> - </target> <target name="compile-examples" depends="compile"> <filter token="VERSION" value="${version}" /> <filter token="BUILD_DATE" value="${TODAY}" /> <javac srcdir="${examples}" destdir="${examples}/WEB-INF/classes" debug="on" optimize="off" deprecation="off"> ! <classpath refid="class.path" /> </javac> </target> --- 171,182 ---- </target> <target name="compile-examples" depends="compile"> + <echo message="${java.class.path}"/> <filter token="VERSION" value="${version}" /> <filter token="BUILD_DATE" value="${TODAY}" /> <javac srcdir="${examples}" destdir="${examples}/WEB-INF/classes" debug="on" optimize="off" deprecation="off"> ! <classpath refid="test.class.path" /> </javac> </target> *************** *** 162,166 **** <target name="javadoc" depends="prepare"> ! <javadoc sourcepath="src" destdir="${javadoc}" packagenames="org.*" author="true" version="true" breakiterator="true" use="true" > --- 184,188 ---- <target name="javadoc" depends="prepare"> ! <javadoc sourcepath="${sourceDir}" destdir="${javadoc}" packagenames="org.*" author="true" version="true" breakiterator="true" use="true" > *************** *** 172,176 **** <target name="jar" depends="prepare,compile"> <jar jarfile="${jar}" basedir="${classes}"> - <exclude name="org/webmacro/adapter/**" /> <manifest> <attribute name="Main-Class" value="org.webmacro.WM" /> --- 194,197 ---- *************** *** 178,190 **** </manifest> </jar> - <jar jarfile="${adapters-jar}" basedir="${classes}"> - <include name="org/webmacro/adapter/**" /> - <!-- pull in any templates with macros etc --> - <zipfileset dir="src/org/webmacro/adapter" - includes="**/*.wm" prefix="org/webmacro/adapter"/> - <manifest> - <attribute name="Build-Date" value="${TODAY}" /> - </manifest> - </jar> </target> --- 199,202 ---- *************** *** 193,207 **** <mkdir dir='${dist.binary}' /> <copy todir="${dist.binary}" file="${jar}"/> ! <copy todir="${dist.binary}" file="${adapters-jar}"/> ! <copy todir="${dist.binary}" file="lib/concurrent-1.3.4.jar" /> ! <copy todir="${dist.binary}" file="lib/servlet-api-2.3.jar" /> ! <copy todir="${dist.binary}"> ! <fileset dir="distroot" /> ! </copy> - <mkdir dir="${dist.binary}/tutorial" /> - <copy todir="${dist.binary}/tutorial"> - <fileset dir="tutorial"/> - </copy> <mkdir dir="${dist.binary}/api" /> <copy todir="${dist.binary}/api"> --- 205,210 ---- <mkdir dir='${dist.binary}' /> <copy todir="${dist.binary}" file="${jar}"/> ! <copy todir="${dist.binary}" file="lib/servlet-api-2.5.jar" /> <mkdir dir="${dist.binary}/api" /> <copy todir="${dist.binary}/api"> *************** *** 212,219 **** <fileset dir="examples" /> </copy> - <mkdir dir="${dist.binary}/macros" /> - <copy todir="${dist.binary}/macros"> - <fileset dir="${macros}" /> - </copy> <touch file="${dist.binary}/WM-VERSION-${version}"/> </target> --- 215,218 ---- *************** *** 222,237 **** <delete dir='${dist.source}' /> <mkdir dir='${dist.source}' /> - <copy todir="${dist.source}"> - <fileset dir="distroot" /> - </copy> <copy todir="${dist.source}" file="${jar}"/> - <copy todir="${dist.source}" file="lib/concurrent-1.3.4.jar" /> <copy file='WebMacro.defaults.minimal' todir='${dist.source}' /> <copy file='WebMacro.defaults.classic' todir='${dist.source}' /> <copy file='build.xml' todir='${dist.source}' /> ! <mkdir dir="${dist.source}/src" /> ! <copy todir="${dist.source}/src"> ! <fileset dir="src" /> </copy> --- 221,232 ---- <delete dir='${dist.source}' /> <mkdir dir='${dist.source}' /> <copy todir="${dist.source}" file="${jar}"/> <copy file='WebMacro.defaults.minimal' todir='${dist.source}' /> <copy file='WebMacro.defaults.classic' todir='${dist.source}' /> <copy file='build.xml' todir='${dist.source}' /> ! <mkdir dir="${dist.source}/${sourceDir}" /> ! <copy todir="${dist.source}/${sourceDir}"> ! <fileset dir="${sourceDir}" /> </copy> *************** *** 241,252 **** </copy> ! <mkdir dir="${dist.source}/src-optional" /> ! <copy todir="${dist.source}/src-optional"> ! <fileset dir="src-optional" /> ! </copy> ! ! <mkdir dir="${dist.source}/test" /> ! <copy todir="${dist.source}/test"> ! <fileset dir="test" /> </copy> --- 236,242 ---- </copy> ! <mkdir dir="${dist.source}/${testSourceDir}" /> ! <copy todir="${dist.source}/${testSourceDir}"> ! <fileset dir="${testSourceDir}" /> </copy> *************** *** 256,263 **** </copy> - <mkdir dir="${dist.source}/tutorial" /> - <copy todir="${dist.source}/tutorial"> - <fileset dir="tutorial"/> - </copy> <mkdir dir="${dist.source}/examples" /> --- 246,249 ---- *************** *** 266,279 **** </copy> - <mkdir dir="${dist.source}/macros" /> - <copy todir="${dist.source}/macros"> - <fileset dir="${macros}" /> - </copy> - - <mkdir dir="${dist.source}/distroot" /> - <copy todir="${dist.source}/distroot"> - <fileset dir="distroot" /> - </copy> - <touch file="${dist.source}/WM-VERSION-${version}"/> --- 252,255 ---- *************** *** 290,353 **** <target name='release' depends='clean,test,dist-source,zip.and.tar' /> ! <!-- ! <target name="contrib" depends="compile" > ! <ant antfile="contrib/build.xml" target="all" > ! <property name="java.class.path" value="${classpath.resolved}"/> ! </ant> ! </target> ! --> ! ! <target name="test" depends="compile" > ! <ant antfile="test/build.xml" target="all" > ! <property name="java.class.path" value="${classpath.resolved}"/> ! </ant> ! </target> ! ! <target name="test-unit" depends="compile" > ! <ant antfile="test/build.xml" target="unit" > ! <property name="java.class.path" value="${classpath.resolved}"/> ! </ant> ! </target> ! ! <target name="test-validate" depends="compile" > ! <ant antfile="test/build.xml" target="validate" > ! <property name="java.class.path" value="${classpath.resolved}"/> ! </ant> </target> ! <target name="test-templates" depends="compile" > ! <ant antfile="test/build.xml" target="templates" > ! <property name="java.class.path" value="${classpath.resolved}"/> ! </ant> </target> ! <target name="test-synthetic" depends="compile" > ! <ant antfile="test/build.xml" target="synthetic" > ! <property name="java.class.path" value="${classpath.resolved}"/> ! </ant> </target> ! <target name="test-macro" depends="compile" > ! <ant antfile="test/build.xml" target="macros" > ! <property name="java.class.path" value="${classpath.resolved}"/> ! </ant> </target> ! <target name="test-clean" > ! <ant antfile="test/build.xml" target="clean"> ! <property name="java.class.path" value="${classpath.resolved}"/> ! </ant> </target> ! <target name="test-compile" > ! <ant antfile="test/build.xml" target="unit-compile"> ! <property name="java.class.path" value="${classpath.resolved}"/> ! </ant> </target> ! <target name="all" depends="clean,prepare,compile,javadoc,dist-source,dist-binary,test-unit"/> <!-- ! Note: there are two tasks: (1) Parsing a template which checks the grammar syntax (2) Evaluating a template which evaluates a template using a context --- 266,331 ---- <target name='release' depends='clean,test,dist-source,zip.and.tar' /> ! <target name="test-prepare"> ! <mkdir dir="${testClasses}"/> ! <mkdir dir="${testReports}"/> </target> ! <target name="test-compile" depends="test-prepare"> ! <echo message="${java.class.path}"/> ! <property name="myproperty" refid="test.class.path"/> ! <echo message="${myproperty}"/> ! <javac srcdir="${testSourceDir}" destdir="${testClasses}" ! debug="on" optimize="off" deprecation="off"> ! <classpath refid="test.class.path"/> ! </javac> </target> ! <target name="test" depends="test-compile"> ! <property name="myproperty" refid="test.runtime.class.path"/> ! <echo message="${myproperty}"/> ! <junit printsummary="yes" haltonfailure="no"> ! <classpath refid="test.runtime.class.path"/> ! <formatter type="plain"/> ! <batchtest fork="yes" todir="${testReports}"> ! <fileset dir="${testSourceDir}" includes="**/${test}.java"/> ! </batchtest> ! </junit> </target> ! <target name="synthetic" depends="test-compile"> ! <junit printsummary="yes" haltonfailure="no"> ! <classpath refid="test.runtime.class.path"/> ! <formatter type="plain"/> ! <batchtest fork="yes" todir="${testReports}"> ! <fileset dir="${testSourceDir}" includes="**/TestSyntheticTemplate.java"/> ! </batchtest> ! </junit> </target> ! <target name="macros" depends="test-compile"> ! <junit printsummary="yes" haltonfailure="no"> ! <classpath refid="test.runtime.class.path"/> ! <formatter type="plain"/> ! <batchtest fork="yes" todir="${testReports}"> ! <fileset dir="${testSourceDir}" includes="**/TestParseInclude.java"/> ! <fileset dir="${testSourceDir}" includes="**/TestSiteBuilder.java"/> ! </batchtest> ! </junit> </target> ! <target name="test-validate" depends="test-compile"> ! <junit printsummary="yes" haltonfailure="yes"> ! <classpath refid="test.runtime.class.path"/> ! <formatter type="plain"/> ! <batchtest fork="yes" todir="${testReports}"> ! <fileset dir="${testSourceDir}" includes="**/${test}.java"/> ! </batchtest> ! </junit> </target> ! <target name="all" depends="clean,prepare,compile,test,javadoc,dist-source,dist-binary"/> <!-- ! Note: there are two ant tasks in contrib: (1) Parsing a template which checks the grammar syntax (2) Evaluating a template which evaluates a template using a context *************** *** 380,383 **** --- 358,367 ---- </target> --> + <!-- + <taskdef name="junit" + classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask"> + <classpath refid="class.path"/> + </taskdef> + --> </project> |
|
From: Tim P <ti...@us...> - 2010-02-23 23:12:04
|
Update of /cvsroot/webmacro/webmacro/webmacro In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv3576 Removed Files: buildTests.xml Log Message: Moved into build --- buildTests.xml DELETED --- |
|
From: Tim P <ti...@us...> - 2010-02-22 21:05:34
|
Update of /cvsroot/webmacro/webmacro/webmacro/lib In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv13774 Added Files: servlet-api-2.5.jar Removed Files: servlet-api-2.3.jar Log Message: Latest servlet api --- NEW FILE: servlet-api-2.5.jar --- (This appears to be a binary file; contents omitted.) --- servlet-api-2.3.jar DELETED --- |
|
From: Tim P <ti...@us...> - 2010-02-21 13:20:41
|
Update of /cvsroot/webmacro/webmacro/webmacro/src/test/java/org/webmacro/util/test In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv28437/src/test/java/org/webmacro/util/test Modified Files: WMEvalTest.java Log Message: Tests have moved Index: WMEvalTest.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/webmacro/src/test/java/org/webmacro/util/test/WMEvalTest.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** WMEvalTest.java 28 Mar 2008 20:09:48 -0000 1.3 --- WMEvalTest.java 21 Feb 2010 12:41:40 -0000 1.4 *************** *** 28,32 **** // FIXME Hardcoded path to tests ! private static final String PATH_TO_TESTS = "test/unit/"; /** --- 28,32 ---- // FIXME Hardcoded path to tests ! private static final String PATH_TO_TESTS = "src/test/java/"; /** |
|
From: Tim P <ti...@us...> - 2010-02-21 13:12:54
|
Update of /cvsroot/webmacro/webmacro/webmacro In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv26235 Modified Files: pom.xml Log Message: Update dependency versions: remove concurrent Index: pom.xml =================================================================== RCS file: /cvsroot/webmacro/webmacro/webmacro/pom.xml,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** pom.xml 21 Feb 2010 01:49:49 -0000 1.26 --- pom.xml 21 Feb 2010 12:23:16 -0000 1.27 *************** *** 316,319 **** --- 316,325 ---- <dependencies> <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> + <scope>provided</scope> + </dependency> + <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> *************** *** 321,341 **** <scope>compile</scope> </dependency> - <dependency> - <groupId>concurrent</groupId> - <artifactId>concurrent</artifactId> - <version>1.3.4</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.3</version> - <scope>compile</scope> - </dependency> <dependency> <groupId>jakarta-regexp</groupId> <artifactId>jakarta-regexp</artifactId> ! <version>1.6</version> <scope>test</scope> </dependency> --- 327,335 ---- <scope>compile</scope> </dependency> <dependency> <groupId>jakarta-regexp</groupId> <artifactId>jakarta-regexp</artifactId> ! <version>1.4</version> <scope>test</scope> </dependency> *************** *** 343,347 **** <groupId>net.sourceforge.jwebunit</groupId> <artifactId>jwebunit-core</artifactId> ! <version>1.6.1</version> <scope>test</scope> </dependency> --- 337,341 ---- <groupId>net.sourceforge.jwebunit</groupId> <artifactId>jwebunit-core</artifactId> ! <version>2.2</version> <scope>test</scope> </dependency> *************** *** 349,353 **** <groupId>net.sourceforge.jwebunit</groupId> <artifactId>jwebunit-htmlunit-plugin</artifactId> ! <version>1.6.1</version> <scope>test</scope> </dependency> --- 343,347 ---- <groupId>net.sourceforge.jwebunit</groupId> <artifactId>jwebunit-htmlunit-plugin</artifactId> ! <version>2.2</version> <scope>test</scope> </dependency> |
|
From: Tim P <ti...@us...> - 2010-02-21 13:01:46
|
Update of /cvsroot/webmacro/webmacro/webmacro In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv30507 Modified Files: pom.xml Log Message: Move example code into tests, again Index: pom.xml =================================================================== RCS file: /cvsroot/webmacro/webmacro/webmacro/pom.xml,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** pom.xml 21 Feb 2010 12:23:16 -0000 1.27 --- pom.xml 21 Feb 2010 13:01:30 -0000 1.28 *************** *** 232,236 **** </testResources> <plugins> - <!-- <plugin> <groupId>org.codehaus.mojo</groupId> --- 232,235 ---- *************** *** 249,253 **** </executions> </plugin> - --> <plugin> <groupId>org.apache.maven.plugins</groupId> --- 248,251 ---- |
|
From: Tim P <ti...@us...> - 2010-02-21 12:30:48
|
Update of /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/resource In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv26750/src/main/java/org/webmacro/resource Modified Files: ReloadingCacheManager.java Log Message: Tidy Index: ReloadingCacheManager.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/resource/ReloadingCacheManager.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ReloadingCacheManager.java 21 Feb 2010 11:46:51 -0000 1.5 --- ReloadingCacheManager.java 21 Feb 2010 12:26:55 -0000 1.6 *************** *** 2,6 **** import java.lang.ref.SoftReference; - import java.util.Timer; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.Executors; --- 2,5 ---- *************** *** 16,20 **** import org.webmacro.util.SubSettings; - import EDU.oswego.cs.dl.util.concurrent.ClockDaemon; /** --- 15,18 ---- |
|
From: Tim P <ti...@us...> - 2010-02-21 11:47:08
|
Update of /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/resource In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv21512/src/main/java/org/webmacro/resource Modified Files: ReloadingCacheManager.java Log Message: Use ScheduledThreadPool Index: ReloadingCacheManager.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/resource/ReloadingCacheManager.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ReloadingCacheManager.java 21 Feb 2010 01:49:49 -0000 1.4 --- ReloadingCacheManager.java 21 Feb 2010 11:46:51 -0000 1.5 *************** *** 4,8 **** --- 4,11 ---- import java.util.Timer; import java.util.concurrent.ConcurrentHashMap; + import java.util.concurrent.Executors; + import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ThreadFactory; + import java.util.concurrent.TimeUnit; import org.webmacro.Broker; *************** *** 13,16 **** --- 16,21 ---- import org.webmacro.util.SubSettings; + import EDU.oswego.cs.dl.util.concurrent.ClockDaemon; + /** * ReloadingCacheManager -- a cache manager which supports reloading and expiration, backed *************** *** 24,28 **** private final ConcurrentHashMap _cache = new ConcurrentHashMap(); ! private int _cacheDuration; private String _resourceType; private boolean _reloadOnChange = true, _useSoftReferences = true; --- 29,33 ---- private final ConcurrentHashMap _cache = new ConcurrentHashMap(); ! private int _cacheDurationMilliseconds; private String _resourceType; private boolean _reloadOnChange = true, _useSoftReferences = true; *************** *** 30,35 **** private long _checkForReloadDelay; ! // Use ClockDaemon instead of the original TimeLoop -- more efficient priority-queue based implementation ! private Timer _clockDaemon; private Log _log; --- 35,41 ---- private long _checkForReloadDelay; ! // Used ClockDaemon instead of the original TimeLoop -- more efficient priority-queue based implementation ! // Then renamed in move to java.util.concurrent ! private ScheduledExecutorService _clockDaemon; private Log _log; *************** *** 94,99 **** Settings ourSettings, defaultSettings; ! _clockDaemon = new Timer(); ! _clockDaemon.setThreadFactory(new ThreadFactory() { public Thread newThread(Runnable runnable) { _log.info("Creating new ClockDaemon thread"); --- 100,104 ---- Settings ourSettings, defaultSettings; ! _clockDaemon = Executors.newSingleThreadScheduledExecutor(new ThreadFactory() { public Thread newThread(Runnable runnable) { _log.info("Creating new ClockDaemon thread"); *************** *** 110,114 **** defaultSettings = new SubSettings(config, NAME + ".*"); ! _cacheDuration = ourSettings.getIntegerSetting("ExpireTime", defaultSettings.getIntegerSetting("ExpireTime", --- 115,119 ---- defaultSettings = new SubSettings(config, NAME + ".*"); ! _cacheDurationMilliseconds = ourSettings.getIntegerSetting("ExpireTime", defaultSettings.getIntegerSetting("ExpireTime", *************** *** 131,135 **** _log.info(NAME + "." + _resourceType + ": " ! + "; expireTime=" + _cacheDuration + "; reload=" + _reloadOnChange + "; softReference=" + _useSoftReferences --- 136,140 ---- _log.info(NAME + "." + _resourceType + ": " ! + "; expireTime=" + _cacheDurationMilliseconds + "; reload=" + _reloadOnChange + "; softReference=" + _useSoftReferences *************** *** 158,162 **** { _cache.clear(); ! _clockDaemon.shutDown(); } --- 163,167 ---- { _cache.clear(); ! _clockDaemon.shutdown(); } *************** *** 167,171 **** private final void scheduleRemoval(final Object key) { ! _clockDaemon.executeAfterDelay(_cacheDuration, new Runnable() { --- 172,176 ---- private final void scheduleRemoval(final Object key) { ! _clockDaemon.schedule( new Runnable() { *************** *** 176,180 **** _log.debug("cache expired: " + key); } ! }); } --- 181,187 ---- _log.debug("cache expired: " + key); } ! }, ! _cacheDurationMilliseconds, ! TimeUnit.MILLISECONDS); } *************** *** 208,217 **** _cache.put(query, r); if (_log.loggingDebug()) ! _log.debug("cached: " + query + " for " + _cacheDuration); try { // if timeout is < 0, // then don't schedule a removal from cache ! if (_cacheDuration >= 0) scheduleRemoval(query); } --- 215,224 ---- _cache.put(query, r); if (_log.loggingDebug()) ! _log.debug("cached: " + query + " for " + _cacheDurationMilliseconds); try { // if timeout is < 0, // then don't schedule a removal from cache ! if (_cacheDurationMilliseconds >= 0) scheduleRemoval(query); } *************** *** 247,254 **** _cache.put(query, r); ! if (_cacheDuration >= 0) { if (_log.loggingDebug()) ! _log.debug("cached: " + query + " for " + _cacheDuration); scheduleRemoval(query); } --- 254,261 ---- _cache.put(query, r); ! if (_cacheDurationMilliseconds >= 0) { if (_log.loggingDebug()) ! _log.debug("cached: " + query + " for " + _cacheDurationMilliseconds); scheduleRemoval(query); } |
|
From: Tim P <ti...@us...> - 2010-02-21 01:50:01
|
Update of /cvsroot/webmacro/webmacro/webmacro In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv20022 Modified Files: pom.xml Log Message: Use java.util.concurrent Index: pom.xml =================================================================== RCS file: /cvsroot/webmacro/webmacro/webmacro/pom.xml,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** pom.xml 20 Feb 2010 21:59:23 -0000 1.25 --- pom.xml 21 Feb 2010 01:49:49 -0000 1.26 *************** *** 183,188 **** </organization> <build> ! <sourceDirectory>src</sourceDirectory> ! <testSourceDirectory>test/unit</testSourceDirectory> <resources> <resource> --- 183,188 ---- </organization> <build> ! <sourceDirectory>src/main/java</sourceDirectory> ! <testSourceDirectory>src/test/java</testSourceDirectory> <resources> <resource> *************** *** 194,198 **** </resource> <resource> ! <directory>src</directory> <includes> <include>**/*.wm</include> --- 194,198 ---- </resource> <resource> ! <directory>src/main/java</directory> <includes> <include>**/*.wm</include> *************** *** 205,209 **** </resource> <resource> ! <directory>macros</directory> <includes> <include>**/*.wmm</include> --- 205,209 ---- </resource> <resource> ! <directory>src/main/resources/macros</directory> <includes> <include>**/*.wmm</include> *************** *** 213,217 **** <testResources> <testResource> ! <directory>test/unit</directory> <includes> <include>**/*.wm</include> --- 213,217 ---- <testResources> <testResource> ! <directory>src/test/java</directory> <includes> <include>**/*.wm</include> *************** *** 222,225 **** --- 222,226 ---- </includes> </testResource> + <!-- <testResource> <directory>macros</directory> *************** *** 228,233 **** --- 229,236 ---- </includes> </testResource> + --> </testResources> <plugins> + <!-- <plugin> <groupId>org.codehaus.mojo</groupId> *************** *** 246,249 **** --- 249,253 ---- </executions> </plugin> + --> <plugin> <groupId>org.apache.maven.plugins</groupId> *************** *** 270,274 **** <artifactId>maven-javadoc-plugin</artifactId> <configuration> ! <source>1.4</source> <docencoding>UTF-8</docencoding> </configuration> --- 274,278 ---- <artifactId>maven-javadoc-plugin</artifactId> <configuration> ! <source>1.6</source> <docencoding>UTF-8</docencoding> </configuration> *************** *** 280,285 **** <optimize>false</optimize> <showDeprecation>false</showDeprecation> ! <source>1.4</source> ! <target>1.4</target> </configuration> </plugin> --- 284,289 ---- <optimize>false</optimize> <showDeprecation>false</showDeprecation> ! <source>1.6</source> ! <target>1.6</target> </configuration> </plugin> *************** *** 312,321 **** <dependencies> <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant</artifactId> - <version>1.7.0</version> - <scope>compile</scope> - </dependency> - <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> --- 316,319 ---- *************** *** 335,356 **** <scope>compile</scope> </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring</artifactId> - <version>1.2.6</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-mock</artifactId> - <version>1.2.6</version> - <scope>compile</scope> - </dependency> - <dependency> <groupId>jakarta-regexp</groupId> <artifactId>jakarta-regexp</artifactId> ! <version>1.4</version> <scope>test</scope> </dependency> --- 333,341 ---- <scope>compile</scope> </dependency> <dependency> <groupId>jakarta-regexp</groupId> <artifactId>jakarta-regexp</artifactId> ! <version>1.6</version> <scope>test</scope> </dependency> *************** *** 358,362 **** <groupId>net.sourceforge.jwebunit</groupId> <artifactId>jwebunit-core</artifactId> ! <version>1.4.1</version> <scope>test</scope> </dependency> --- 343,347 ---- <groupId>net.sourceforge.jwebunit</groupId> <artifactId>jwebunit-core</artifactId> ! <version>1.6.1</version> <scope>test</scope> </dependency> *************** *** 364,368 **** <groupId>net.sourceforge.jwebunit</groupId> <artifactId>jwebunit-htmlunit-plugin</artifactId> ! <version>1.4.1</version> <scope>test</scope> </dependency> --- 349,353 ---- <groupId>net.sourceforge.jwebunit</groupId> <artifactId>jwebunit-htmlunit-plugin</artifactId> ! <version>1.6.1</version> <scope>test</scope> </dependency> |
|
From: Tim P <ti...@us...> - 2010-02-21 01:50:01
|
Update of /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/resource In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv20022/src/main/java/org/webmacro/resource Modified Files: ReloadingCacheManager.java SimpleCacheManager.java Log Message: Use java.util.concurrent Index: ReloadingCacheManager.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/resource/ReloadingCacheManager.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ReloadingCacheManager.java 25 Mar 2008 23:01:34 -0000 1.3 --- ReloadingCacheManager.java 21 Feb 2010 01:49:49 -0000 1.4 *************** *** 2,9 **** import java.lang.ref.SoftReference; - import EDU.oswego.cs.dl.util.concurrent.ClockDaemon; - import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap; - import EDU.oswego.cs.dl.util.concurrent.ThreadFactory; import org.webmacro.Broker; import org.webmacro.InitException; --- 2,9 ---- import java.lang.ref.SoftReference; + import java.util.Timer; + import java.util.concurrent.ConcurrentHashMap; + import java.util.concurrent.ThreadFactory; import org.webmacro.Broker; import org.webmacro.InitException; *************** *** 31,35 **** // Use ClockDaemon instead of the original TimeLoop -- more efficient priority-queue based implementation ! private ClockDaemon _clockDaemon; private Log _log; --- 31,35 ---- // Use ClockDaemon instead of the original TimeLoop -- more efficient priority-queue based implementation ! private Timer _clockDaemon; private Log _log; *************** *** 94,98 **** Settings ourSettings, defaultSettings; ! _clockDaemon = new ClockDaemon(); _clockDaemon.setThreadFactory(new ThreadFactory() { public Thread newThread(Runnable runnable) { --- 94,98 ---- Settings ourSettings, defaultSettings; ! _clockDaemon = new Timer(); _clockDaemon.setThreadFactory(new ThreadFactory() { public Thread newThread(Runnable runnable) { Index: SimpleCacheManager.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/resource/SimpleCacheManager.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** SimpleCacheManager.java 20 Mar 2008 10:19:51 -0000 1.3 --- SimpleCacheManager.java 21 Feb 2010 01:49:49 -0000 1.4 *************** *** 9,13 **** import org.webmacro.util.Settings; ! import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap; /** --- 9,13 ---- import org.webmacro.util.Settings; ! import java.util.concurrent.ConcurrentHashMap; /** |
|
From: Tim P <ti...@us...> - 2010-02-21 01:49:57
|
Update of /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/broker In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv20022/src/main/java/org/webmacro/broker Modified Files: DefaultContextAutoLoader.java Log Message: Use java.util.concurrent Index: DefaultContextAutoLoader.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/broker/DefaultContextAutoLoader.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DefaultContextAutoLoader.java 18 Mar 2008 20:10:15 -0000 1.2 --- DefaultContextAutoLoader.java 21 Feb 2010 01:49:49 -0000 1.3 *************** *** 3,6 **** --- 3,7 ---- import java.lang.reflect.Constructor; import java.util.Map; + import java.util.concurrent.ConcurrentHashMap; import org.webmacro.Broker; *************** *** 10,14 **** import org.webmacro.util.Settings; - import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap; /** --- 11,14 ---- |
|
From: Tim P <ti...@us...> - 2010-02-21 01:49:57
|
Update of /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv20022/src/main/java/org/webmacro Modified Files: Broker.java Log Message: Use java.util.concurrent Index: Broker.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/webmacro/src/main/java/org/webmacro/Broker.java,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** Broker.java 18 Mar 2008 16:14:56 -0000 1.48 --- Broker.java 21 Feb 2010 01:49:49 -0000 1.49 *************** *** 53,57 **** import org.webmacro.util.SubSettings; ! import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap; /** --- 53,57 ---- import org.webmacro.util.SubSettings; ! import java.util.concurrent.ConcurrentHashMap; /** |
|
From: Tim P <ti...@us...> - 2010-02-20 23:30:16
|
Update of /cvsroot/webmacro/webmacro/distroot In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv6890 Modified Files: readme.html Log Message: Update version Index: readme.html =================================================================== RCS file: /cvsroot/webmacro/webmacro/distroot/readme.html,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** readme.html 1 Nov 2005 04:33:39 -0000 1.20 --- readme.html 20 Feb 2010 23:30:07 -0000 1.21 *************** *** 14,24 **** <body lang="en-US" bgcolor="#ffffff"> ! <p>Thak you for downloading WebMacro. The latest release can always be found ! <a href="http://www.webmacro.org/DownloadWebMacro">on our website</a>. </p> <h3>Manifest</h3> <ul> <li> ! <p>Build Date: 1 - Nov - 2005</p> </li> --- 14,24 ---- <body lang="en-US" bgcolor="#ffffff"> ! <p>Thank you for downloading WebMacro. The latest release can always be found ! <a href="http://sourceforge.net/projects/webmacro/">on our website</a>. </p> <h3>Manifest</h3> <ul> <li> ! <p>Build Date: 20 - Feb - 20010</p> </li> *************** *** 26,30 **** <li> ! <p>Release Number: 2.0</p> </li> --- 26,30 ---- <li> ! <p>Release Number: 2.1</p> </li> *************** *** 45,48 **** --- 45,53 ---- </ul> + <p> + Release 2.1 does not differ substantially from 2.0. + It does however work with current practices: maven, eclipse, hudson. + </p> + <p>WebMacro is a stable product and the ancestor of many templating projects on the net. Release 2.0 is a major milestone. It proves |
|
From: Tim P <ti...@us...> - 2010-02-20 21:59:31
|
Update of /cvsroot/webmacro/webmacro In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv32007 Modified Files: pom.xml Log Message: Remove checkstyle: that will teach you to be backwards compatible Index: pom.xml =================================================================== RCS file: /cvsroot/webmacro/webmacro/pom.xml,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** pom.xml 20 Feb 2010 21:44:14 -0000 1.24 --- pom.xml 20 Feb 2010 21:59:23 -0000 1.25 *************** *** 395,404 **** <plugins> <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - <configuration> - <configLocation>checkstyle.xml</configLocation> - </configuration> - </plugin> - <plugin> <artifactId>maven-site-plugin</artifactId> <configuration> --- 395,398 ---- *************** *** 434,441 **** <plugin> <groupId>org.codehaus.mojo</groupId> - <artifactId>jdepend-maven-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> <artifactId>taglist-maven-plugin</artifactId> <configuration> --- 428,431 ---- |
|
From: Tim P <ti...@us...> - 2010-02-20 21:44:28
|
Update of /cvsroot/webmacro/webmacro In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv30568 Modified Files: pom.xml Log Message: Fix javadoc syle todo tags Index: pom.xml =================================================================== RCS file: /cvsroot/webmacro/webmacro/pom.xml,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** pom.xml 20 Feb 2010 18:43:27 -0000 1.23 --- pom.xml 20 Feb 2010 21:44:14 -0000 1.24 *************** *** 271,281 **** <configuration> <source>1.4</source> - <tags> - <tag> - <head>"To Do:"</head> - <name>todo</name> - <placement>X</placement> - </tag> - </tags> <docencoding>UTF-8</docencoding> </configuration> --- 271,274 ---- *************** *** 448,452 **** <configuration> <tags> ! <tag>@todo</tag> <tag>FIXME</tag> <tag>@deprecated</tag> --- 441,445 ---- <configuration> <tags> ! <tag>TODO</tag> <tag>FIXME</tag> <tag>@deprecated</tag> |
|
From: Tim P <ti...@us...> - 2010-02-20 20:29:44
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/directive In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv23987/src/org/webmacro/directive Modified Files: WhileDirective.java Log Message: Fix javadoc syle todo tags Index: WhileDirective.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/directive/WhileDirective.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** WhileDirective.java 20 Mar 2008 09:42:30 -0000 1.3 --- WhileDirective.java 20 Feb 2010 20:29:34 -0000 1.4 *************** *** 1,9 **** /* ! * Copyright (C) 2005. All Rights Reserved. Redistribution and use in source and binary forms, with or without ! * modification, are permitted under the terms of either of the following Open Source licenses: The GNU General Public ! * License, version 2, or any later version, as published by the Free Software Foundation ! * (http://www.fsf.org/copyleft/gpl.html); This software is provided "as is", with NO WARRANTY, not even the implied ! * warranties of fitness to purpose, or merchantability. You assume all risks and liabilities associated with its use. ! * See www.webmacro.org for more information on the WebMacro project. @author Mike Weerdenburg @author Marcel Huijkman * * --- 1,18 ---- /* ! * Copyright (C) 2005. ! * All Rights Reserved. Redistribution and use in source and binary forms, ! * with or without modification, are permitted under the terms of either of ! * the following Open Source licenses: ! * The GNU General Public License, version 2, or ! * any later version, as published by the Free Software Foundation ! * (http://www.fsf.org/copyleft/gpl.html); ! * ! * This software is provided "as is", with NO WARRANTY, not even the implied ! * warranties of fitness to purpose, or merchantability. You assume all risks ! * and liabilities associated with its use. ! * See www.webmacro.org for more information on the WebMacro project. ! * ! * @author Mike Weerdenburg ! * @author Marcel Huijkman * * *************** *** 32,36 **** * release 2.0 as an experimental directive. * ! * @todo Introduce unit test and mainline or drop the directive. * * @author Mike Weerdenburg --- 41,45 ---- * release 2.0 as an experimental directive. * ! * TODO Introduce unit test and mainline or drop the directive. * * @author Mike Weerdenburg |
|
From: Tim P <ti...@us...> - 2010-02-20 20:29:43
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/adapter/spring In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv23987/src/org/webmacro/adapter/spring Modified Files: WebMacroView.java Log Message: Fix javadoc syle todo tags Index: WebMacroView.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/adapter/spring/WebMacroView.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** WebMacroView.java 5 Nov 2008 00:18:31 -0000 1.6 --- WebMacroView.java 20 Feb 2010 20:29:34 -0000 1.7 *************** *** 67,71 **** Template template = webMacro.getTemplate(getUrl()); ! // @todo Need handling for template encodings here template.write(response.getOutputStream(), context); } --- 67,71 ---- Template template = webMacro.getTemplate(getUrl()); ! // TODO Need handling for template encodings here template.write(response.getOutputStream(), context); } |
|
From: Tim P <ti...@us...> - 2010-02-20 18:43:35
|
Update of /cvsroot/webmacro/webmacro In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv16693 Modified Files: pom.xml Log Message: [maven-release-plugin] prepare for next development iteration Index: pom.xml =================================================================== RCS file: /cvsroot/webmacro/webmacro/pom.xml,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** pom.xml 20 Feb 2010 18:43:12 -0000 1.22 --- pom.xml 20 Feb 2010 18:43:27 -0000 1.23 *************** *** 4,8 **** <artifactId>webmacro</artifactId> <name>WebMacro</name> ! <version>2.1</version> <description> WebMacro is a stable templating engine written in Java. --- 4,8 ---- <artifactId>webmacro</artifactId> <name>WebMacro</name> ! <version>2.2-SNAPSHOT</version> <description> WebMacro is a stable templating engine written in Java. *************** *** 177,181 **** <developerConnection>scm:cvs:ext:ti...@we...:/cvsroot/webmacro:webmacro</developerConnection> <url>http://cvs.sourceforge.net/viewcvs.py/webmacro/</url> - <tag>webmacro-2_1</tag> </scm> <organization> --- 177,180 ---- |
|
From: Tim P <ti...@us...> - 2010-02-20 18:43:20
|
Update of /cvsroot/webmacro/webmacro In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv16659 Modified Files: pom.xml Log Message: [maven-release-plugin] prepare release webmacro-2_1 Index: pom.xml =================================================================== RCS file: /cvsroot/webmacro/webmacro/pom.xml,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** pom.xml 20 Feb 2010 18:38:14 -0000 1.21 --- pom.xml 20 Feb 2010 18:43:12 -0000 1.22 *************** *** 1,8 **** ! <?xml version="1.0" encoding="UTF-8"?><project> <modelVersion>4.0.0</modelVersion> <groupId>org.webmacro</groupId> <artifactId>webmacro</artifactId> <name>WebMacro</name> ! <version>2.1-SNAPSHOT</version> <description> WebMacro is a stable templating engine written in Java. --- 1,8 ---- ! <?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>org.webmacro</groupId> <artifactId>webmacro</artifactId> <name>WebMacro</name> ! <version>2.1</version> <description> WebMacro is a stable templating engine written in Java. *************** *** 48,52 **** <name>Alex Fiennes</name> <email>alexfiennes AT users.sourceforge.net</email> ! <url></url> <organization>WebMacro</organization> <roles> --- 48,52 ---- <name>Alex Fiennes</name> <email>alexfiennes AT users.sourceforge.net</email> ! <url /> <organization>WebMacro</organization> <roles> *************** *** 70,74 **** <name>Christian Aust</name> <email>datenimperator AT users.sourceforge.net</email> ! <url></url> <organization>WebMacro</organization> <roles> --- 70,74 ---- <name>Christian Aust</name> <email>datenimperator AT users.sourceforge.net</email> ! <url /> <organization>WebMacro</organization> <roles> *************** *** 92,96 **** <name>Guy Bolton King</name> <email>guyboltonking AT users.sourceforge.net</email> ! <url></url> <organization>WebMacro</organization> <roles> --- 92,96 ---- <name>Guy Bolton King</name> <email>guyboltonking AT users.sourceforge.net</email> ! <url /> <organization>WebMacro</organization> <roles> *************** *** 125,129 **** <name>Marcel Huijkman</name> <email>mhuijkman AT users.sourceforge.net</email> ! <url></url> <organization>WebMacro</organization> <roles> --- 125,129 ---- <name>Marcel Huijkman</name> <email>mhuijkman AT users.sourceforge.net</email> ! <url /> <organization>WebMacro</organization> <roles> *************** *** 136,140 **** <name>Sebastian Kanthak</name> <email>skanthak AT users.sourceforge.net</email> ! <url></url> <organization>WebMacro</organization> <roles> --- 136,140 ---- <name>Sebastian Kanthak</name> <email>skanthak AT users.sourceforge.net</email> ! <url /> <organization>WebMacro</organization> <roles> *************** *** 177,180 **** --- 177,181 ---- <developerConnection>scm:cvs:ext:ti...@we...:/cvsroot/webmacro:webmacro</developerConnection> <url>http://cvs.sourceforge.net/viewcvs.py/webmacro/</url> + <tag>webmacro-2_1</tag> </scm> <organization> |
|
From: Tim P <ti...@us...> - 2010-02-20 18:38:22
|
Update of /cvsroot/webmacro/webmacro In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv16200 Modified Files: pom.xml Log Message: Hardcode release engineer :( Index: pom.xml =================================================================== RCS file: /cvsroot/webmacro/webmacro/pom.xml,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** pom.xml 20 Feb 2010 18:10:18 -0000 1.20 --- pom.xml 20 Feb 2010 18:38:14 -0000 1.21 *************** *** 175,179 **** <scm> <connection>scm:cvs:pserver:ano...@we...:/cvsroot/webmacro:webmacro</connection> ! <developerConnection>scm:cvs:ext:${user}@webmacro.cvs.sourceforge.net:/cvsroot/webmacro:webmacro</developerConnection> <url>http://cvs.sourceforge.net/viewcvs.py/webmacro/</url> </scm> --- 175,179 ---- <scm> <connection>scm:cvs:pserver:ano...@we...:/cvsroot/webmacro:webmacro</connection> ! <developerConnection>scm:cvs:ext:ti...@we...:/cvsroot/webmacro:webmacro</developerConnection> <url>http://cvs.sourceforge.net/viewcvs.py/webmacro/</url> </scm> |
|
From: Tim P <ti...@us...> - 2010-02-20 18:10:26
|
Update of /cvsroot/webmacro/webmacro In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv13856 Modified Files: pom.xml Log Message: Try to get release plugin configured Index: pom.xml =================================================================== RCS file: /cvsroot/webmacro/webmacro/pom.xml,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** pom.xml 20 Feb 2010 18:01:07 -0000 1.19 --- pom.xml 20 Feb 2010 18:10:18 -0000 1.20 *************** *** 174,179 **** </licenses> <scm> ! <connection>scm:cvs:pserver:ano...@we...:/cvsroot/webmacro</connection> ! <developerConnection>scm:cvs:ext:ti...@we...:/cvsroot/webmacro</developerConnection> <url>http://cvs.sourceforge.net/viewcvs.py/webmacro/</url> </scm> --- 174,179 ---- </licenses> <scm> ! <connection>scm:cvs:pserver:ano...@we...:/cvsroot/webmacro:webmacro</connection> ! <developerConnection>scm:cvs:ext:${user}@webmacro.cvs.sourceforge.net:/cvsroot/webmacro:webmacro</developerConnection> <url>http://cvs.sourceforge.net/viewcvs.py/webmacro/</url> </scm> |
|
From: Tim P <ti...@us...> - 2010-02-20 18:01:16
|
Update of /cvsroot/webmacro/webmacro In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv12999 Modified Files: pom.xml Log Message: Try to get release plugin configured Index: pom.xml =================================================================== RCS file: /cvsroot/webmacro/webmacro/pom.xml,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** pom.xml 20 Feb 2010 17:58:45 -0000 1.18 --- pom.xml 20 Feb 2010 18:01:07 -0000 1.19 *************** *** 175,179 **** <scm> <connection>scm:cvs:pserver:ano...@we...:/cvsroot/webmacro</connection> ! <developerConnection>scm:cvs:ext:US...@we...:/cvsroot/webmacro</developerConnection> <url>http://cvs.sourceforge.net/viewcvs.py/webmacro/</url> </scm> --- 175,179 ---- <scm> <connection>scm:cvs:pserver:ano...@we...:/cvsroot/webmacro</connection> ! <developerConnection>scm:cvs:ext:ti...@we...:/cvsroot/webmacro</developerConnection> <url>http://cvs.sourceforge.net/viewcvs.py/webmacro/</url> </scm> |
|
From: Tim P <ti...@us...> - 2010-02-20 17:58:53
|
Update of /cvsroot/webmacro/webmacro In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv12676 Modified Files: pom.xml Log Message: Revert to SNAPSHOT Index: pom.xml =================================================================== RCS file: /cvsroot/webmacro/webmacro/pom.xml,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** pom.xml 18 Feb 2010 22:12:04 -0000 1.17 --- pom.xml 20 Feb 2010 17:58:45 -0000 1.18 *************** *** 4,8 **** <artifactId>webmacro</artifactId> <name>WebMacro</name> ! <version>2.1</version> <description> WebMacro is a stable templating engine written in Java. --- 4,8 ---- <artifactId>webmacro</artifactId> <name>WebMacro</name> ! <version>2.1-SNAPSHOT</version> <description> WebMacro is a stable templating engine written in Java. |
|
From: Tim P <ti...@us...> - 2010-02-20 17:55:13
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/directive In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv12208/src/org/webmacro/directive Modified Files: SetpropsDirective.java Log Message: Expand error message Index: SetpropsDirective.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/directive/SetpropsDirective.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** SetpropsDirective.java 20 Feb 2010 17:31:57 -0000 1.6 --- SetpropsDirective.java 20 Feb 2010 17:55:05 -0000 1.7 *************** *** 133,137 **** throw e; } catch (Exception e) { ! String errorText = "#setprops: Unable to set " + target; writeWarning(errorText, context, out); } --- 133,137 ---- throw e; } catch (Exception e) { ! String errorText = "#setprops: Unable to set " + target + " as " + e.getMessage(); writeWarning(errorText, context, out); } |
|
From: Tim P <ti...@us...> - 2010-02-20 17:53:59
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/util In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv11669/src/org/webmacro/util Modified Files: Instantiator.java Log Message: Expand exception messages, simplify and javadoc Index: Instantiator.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/util/Instantiator.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Instantiator.java 20 Mar 2008 09:35:59 -0000 1.2 --- Instantiator.java 20 Feb 2010 17:53:50 -0000 1.3 *************** *** 37,40 **** --- 37,42 ---- * Used by BeanDirective and SetpropsDirective. * + * NOTE If AllowedPackages is empty then all packages are allowed. + * * @author Keats Kirsch * @see org.webmacro.directive.BeanDirective *************** *** 124,129 **** { Class c = null; ! ClassNotFoundException except = null; ! if (className.indexOf('.') >= 0) { try --- 126,130 ---- { Class c = null; ! if (className.indexOf('.') >= 0) // it is a fully specified class name { try *************** *** 131,142 **** c = _broker.classForName(className); } ! catch (ClassNotFoundException cnfe) { ! except = cnfe; } } else ! { ! // try with implied packages prepended for (int i = 0; i < _impliedPackages.size(); i++) { --- 132,144 ---- c = _broker.classForName(className); } ! catch (ClassNotFoundException e) { ! throw new WebMacroException("Unable to load class " + className, e); } } else ! { // try with implied packages prepended ! ClassNotFoundException exception = null; ! for (int i = 0; i < _impliedPackages.size(); i++) { *************** *** 147,160 **** break; } ! catch (ClassNotFoundException cnfe2) { ! except = cnfe2; } } ! } ! if (c == null) ! { ! throw new WebMacroException("Unable to load class " + className, ! except); } --- 149,165 ---- break; } ! catch (ClassNotFoundException e) { ! exception = e; } } ! if (c == null) { ! if (exception == null) ! throw new WebMacroException("Unable to load class " + className + ! ", property " + IMPLIED_PACKAGES + " contains " + ! _impliedPackages.size() + " items"); ! else ! throw new WebMacroException("Unable to load class " + className, exception); ! } } *************** *** 170,174 **** + "\" parameter in the WebMacro configuration."); } ! } return c; } --- 175,181 ---- + "\" parameter in the WebMacro configuration."); } ! } ! // else allowed packages not specified so all allowed ! return c; } |
6 messages has been excluded from this view by a project administrator.
