Update of /cvsroot/webmacro/webmacro
In directory usw-pr-cvs1:/tmp/cvs-serv32240
Modified Files:
LICENSE WebMacro.defaults build.xml
Log Message:
1.1b2 updates, additions, documentation
Index: LICENSE
===================================================================
RCS file: /cvsroot/webmacro/webmacro/LICENSE,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** LICENSE 18 Jun 2001 03:44:32 -0000 1.1
--- LICENSE 17 Nov 2002 16:26:21 -0000 1.2
***************
*** 1,4 ****
/*
! * Copyright (C) 1998-2000 Semiotek Inc. All Rights Reserved.
*
* Redistribution and use in source and binary forms, with or without
--- 1,4 ----
/*
! * Copyright (C) 1998-2002 Semiotek Inc. All Rights Reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: WebMacro.defaults
===================================================================
RCS file: /cvsroot/webmacro/webmacro/WebMacro.defaults,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** WebMacro.defaults 22 Oct 2002 15:23:16 -0000 1.32
--- WebMacro.defaults 17 Nov 2002 16:26:21 -0000 1.33
***************
*** 217,220 ****
--- 217,221 ----
# Directives.escape: org.webmacro.directive.EscapeDirective
# Directives.silence: org.webmacro.directive.SilenceDirective
+ Directives.bean: org.webmacro.directive.BeanDirective
***************
*** 242,248 ****
# that are assumed to be templates when
# #include is used without qualifing the
! # file type
! include.TemplateExtensions: .wm, .wmt, .tml
! parse.TemplateExtensions: .wm, .wmt, .tml
--- 243,249 ----
# that are assumed to be templates when
# #include is used without qualifing the
! # file type. By convention wmm is for WM macro library files.
! include.TemplateExtensions: .wm, .wmt, .tml, .wmm
! parse.TemplateExtensions: .wm, .wmt, .tml, .wmm
Index: build.xml
===================================================================
RCS file: /cvsroot/webmacro/webmacro/build.xml,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** build.xml 15 Nov 2002 01:15:22 -0000 1.27
--- build.xml 17 Nov 2002 16:26:21 -0000 1.28
***************
*** 10,13 ****
--- 10,14 ----
<property name="tmpdir" value="tmp" />
<property name="classes" value="classes"/>
+ <property name="macros" value="macros"/>
<property name="dist" value="webmacro-${version}"/>
<property name="javadoc" value="javadoc"/>
***************
*** 26,29 ****
--- 27,31 ----
</fileset>
<pathelement location="${classes}" />
+ <pathelement location="${macros}" />
<pathelement path="${java.class.path}" />
</path>
***************
*** 122,125 ****
--- 124,131 ----
<fileset dir="examples" />
</copy>
+ <mkdir dir="${dist}/macros" />
+ <copy todir="${dist}/macros">
+ <fileset dir="${macros}" />
+ </copy>
<!-- don't put contrib in the distro anymore.
<mkdir dir="${dist}/contrib" />
***************
*** 165,168 ****
--- 171,180 ----
<target name="test-tst" depends="compile" >
<ant antfile="test/build.xml" target="TST" >
+ <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>
|
