aceunit-commit Mailing List for AceUnit (Page 2)
Status: Beta
Brought to you by:
christianhujer
Menu
▾
▴
aceunit-commit — svn commit digest list (high traffic)
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(139) |
Nov
(77) |
Dec
(32) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(55) |
Feb
(11) |
Mar
(3) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(9) |
Oct
(75) |
Nov
(57) |
Dec
(21) |
| 2009 |
Jan
(14) |
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
(24) |
Sep
(11) |
Oct
(1) |
Nov
|
Dec
|
| 2011 |
Jan
|
Feb
(21) |
Mar
(10) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(3) |
|
From: <chr...@us...> - 2011-02-14 01:17:25
|
Revision: 558
http://aceunit.svn.sourceforge.net/aceunit/?rev=558&view=rev
Author: christianhujer
Date: 2011-02-14 01:17:19 +0000 (Mon, 14 Feb 2011)
Log Message:
-----------
Simplify Makefile of sort example.
Modified Paths:
--------------
trunk/src/doc/examples/sort/Makefile
Property Changed:
----------------
trunk/src/doc/examples/sort/
Property changes on: trunk/src/doc/examples/sort
___________________________________________________________________
Deleted: svn:ignore
- AceUnit.jar
FullPlainLogger.c
AceUnit.c
sortTest.h
AceUnit.h
runTests
AceUnitAnnotations.h
AceUnitData.c
Modified: trunk/src/doc/examples/sort/Makefile
===================================================================
--- trunk/src/doc/examples/sort/Makefile 2011-02-14 01:10:57 UTC (rev 557)
+++ trunk/src/doc/examples/sort/Makefile 2011-02-14 01:17:19 UTC (rev 558)
@@ -1,44 +1,28 @@
-ACE_UNIT_FILES=AceUnit.c AceUnit.h AceUnitData.c AceUnitAnnotations.h AceUnitLogging.h FullPlainLogger.c AceUnit.jar
+ACE_UNIT_PATH=../../..
-ACE_UNIT_PATH=../../../
+ACE_UNIT_FILES=AceUnit.c AceUnitData.c FullPlainLogger.c $(ACE_UNIT_PATH)/java/AceUnit.jar
FIXTURE_NAME=sortTest
+vpath %.c . $(ACE_UNIT_PATH)/native $(ACE_UNIT_PATH)/native/loggers
+
all: prepare compile
clean:
- rm -f $(ACE_UNIT_FILES) $(FIXTURE_NAME).h runTests
+ rm -f $(FIXTURE_NAME).h runTests
+test: all
+ ./runTests
+
prepare: $(ACE_UNIT_FILES)
-AceUnit.c: $(ACE_UNIT_PATH)/native/AceUnit.c
- cp $< $@
-
-AceUnit.h: $(ACE_UNIT_PATH)/native/AceUnit.h
- cp $< $@
-
-AceUnitData.c: $(ACE_UNIT_PATH)/native/AceUnitData.c
- cp $< $@
-
-AceUnitAnnotations.h: $(ACE_UNIT_PATH)/native/AceUnitAnnotations.h
- cp $< $@
-
-AceUnitLogging.h: $(ACE_UNIT_PATH)/native/AceUnitLogging.h
- cp $< $@
-
-FullPlainLogger.c: $(ACE_UNIT_PATH)/native/FullPlainLogger.c
- cp $< $@
-
-AceUnit.jar: $(ACE_UNIT_PATH)/java/AceUnit.jar
- cp $< $@
-
$(ACE_UNIT_PATH)/java/AceUnit.jar:
(cd $(ACE_UNIT_PATH)/java ; ant)
compile: runTests
-$(FIXTURE_NAME).h: AceUnit.jar $(FIXTURE_NAME).c
- java -jar AceUnit.jar $(FIXTURE_NAME)
+$(FIXTURE_NAME).h: $(ACE_UNIT_PATH)/java/AceUnit.jar $(FIXTURE_NAME).c
+ java -jar $(ACE_UNIT_PATH)/java/AceUnit.jar $(FIXTURE_NAME)
-runTests: $(FIXTURE_NAME).c $(FIXTURE_NAME).h $(ACE_UNIT_FILES)
- $(CC) -Wall -g -o runTests *.c
+runTests: $(wildcard *.c) $(patsubst %.c,%.h,$(wildcard *.c)) $(ACE_UNIT_FILES)
+ $(CC) -Wall -g -I $(ACE_UNIT_PATH)/native -o $@ $(filter %.c, $^)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2011-02-14 01:11:04
|
Revision: 557
http://aceunit.svn.sourceforge.net/aceunit/?rev=557&view=rev
Author: christianhujer
Date: 2011-02-14 01:10:57 +0000 (Mon, 14 Feb 2011)
Log Message:
-----------
Fix bug (typo).
Modified Paths:
--------------
trunk/src/native/AceUnitLoggerStub.c
Modified: trunk/src/native/AceUnitLoggerStub.c
===================================================================
--- trunk/src/native/AceUnitLoggerStub.c 2011-02-13 10:23:13 UTC (rev 556)
+++ trunk/src/native/AceUnitLoggerStub.c 2011-02-14 01:10:57 UTC (rev 557)
@@ -62,7 +62,7 @@
#endif
/** @see TestLogger_t.testCaseCailed */
-void logTestCaseFailed(const AssertoinError_t *error)
+void logTestCaseFailed(const AssertionError_t *error)
{
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2011-02-13 10:23:19
|
Revision: 556
http://aceunit.svn.sourceforge.net/aceunit/?rev=556&view=rev
Author: christianhujer
Date: 2011-02-13 10:23:13 +0000 (Sun, 13 Feb 2011)
Log Message:
-----------
Allow more flexibility when setting the locale for file sorting.
Modified Paths:
--------------
trunk/src/java/src/prj/net/sf/aceunit/GenTest.java
trunk/src/java/src/prj/net/sf/aceunit/GenTest.properties
Modified: trunk/src/java/src/prj/net/sf/aceunit/GenTest.java
===================================================================
--- trunk/src/java/src/prj/net/sf/aceunit/GenTest.java 2011-02-13 10:16:17 UTC (rev 555)
+++ trunk/src/java/src/prj/net/sf/aceunit/GenTest.java 2011-02-13 10:23:13 UTC (rev 556)
@@ -141,7 +141,13 @@
// Optimization Idea:
// Allow specifying static fields from java.util.Locale.
// Allow specifying countries and variants.
- fileComparator = new FileComparator(new Locale(fileSortingLocale));
+ if ("".equals(fileSortingLocale)) {
+ fileComparator = new FileComparator();
+ } else if (".".equals(fileSortingLocale)) {
+ fileComparator = new FileComparator(Locale.getDefault());
+ } else {
+ fileComparator = new FileComparator(new Locale(fileSortingLocale));
+ }
}
/**
Modified: trunk/src/java/src/prj/net/sf/aceunit/GenTest.properties
===================================================================
--- trunk/src/java/src/prj/net/sf/aceunit/GenTest.properties 2011-02-13 10:16:17 UTC (rev 555)
+++ trunk/src/java/src/prj/net/sf/aceunit/GenTest.properties 2011-02-13 10:23:13 UTC (rev 556)
@@ -30,4 +30,4 @@
setPrint=Specifies what to print. Comma separated enum set.\n suites: Print suite file names.\n fixtures: Print fixture file names.\n generated: Generated file names.\n headers: Header file names.\n sources: Source file names.
setAllTestsFilename=Write a table of all tests and their ids to the specified file.
disableGenSuites=Disables the generation of Suite*.c files.\n If Suite*.c files are not generated, ACEUNIT_SUITES cannot be used.\n The default is that Suite*.c files are generated.
-setFileSortingLocale=Specifies the locale to use for file sorting. This enables a reproducible order of tests in environments with exotic file ordering (i.e. ClearCase dynamic views) or mixed locale.
+setFileSortingLocale=Specifies the locale to use for file sorting. This enables a reproducible order of tests in environments with exotic file ordering (i.e. ClearCase dynamic views) or mixed locale.\n Use the empty String ("") to use no locale (default).\n Use a dot (".") to use the user's locale.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2011-02-13 10:16:24
|
Revision: 555
http://aceunit.svn.sourceforge.net/aceunit/?rev=555&view=rev
Author: christianhujer
Date: 2011-02-13 10:16:17 +0000 (Sun, 13 Feb 2011)
Log Message:
-----------
Improve ExceptionHandling.
Modified Paths:
--------------
trunk/src/doc/history.xhtml
Modified: trunk/src/doc/history.xhtml
===================================================================
--- trunk/src/doc/history.xhtml 2011-02-13 10:15:56 UTC (rev 554)
+++ trunk/src/doc/history.xhtml 2011-02-13 10:16:17 UTC (rev 555)
@@ -16,7 +16,10 @@
<dt>AceUnit 0.13 (not yet released)</dt>
<dd>
Fix for [ 3046264 ] Generate TestID independant from underlying file system
+ <br />
Fix for [ 3134402 ] Java Generator shoud sort files
+ <br />
+ Improved exception handling code (which can be used independently from AceUnit).
</dd>
<dt>AceUnit 0.6.1</dt>
<dd>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2011-02-13 10:16:02
|
Revision: 554
http://aceunit.svn.sourceforge.net/aceunit/?rev=554&view=rev
Author: christianhujer
Date: 2011-02-13 10:15:56 +0000 (Sun, 13 Feb 2011)
Log Message:
-----------
Improve ExceptionHandling.
Modified Paths:
--------------
trunk/src/native/ExceptionHandling.h
Modified: trunk/src/native/ExceptionHandling.h
===================================================================
--- trunk/src/native/ExceptionHandling.h 2011-02-13 10:15:46 UTC (rev 553)
+++ trunk/src/native/ExceptionHandling.h 2011-02-13 10:15:56 UTC (rev 554)
@@ -42,16 +42,13 @@
* someMethod();
* } catch (SomeException) {
* // handle this exception
- * } finally {
* } endtry;
* }
* </pre>
*
* Differences to Java
* - Exceptions are only int values.
- * - finally MUST not be omitted.
* - endtry MUST not be omitted.
- * - returning from a function will NOT execute outer finally blocks.
* - Omitting the {} block at try or catch will eventually not be detected by the compiler but lead to extremely strange behaviour.
* - throw has a slightly different syntax.
* - throws has a slightly different syntax and currently no effect.
@@ -80,33 +77,39 @@
extern jmp_buf *currentExceptionBuffer;
/** Start execution of code which might throw an exception that might be caught by the exception handlers that follow this try.
- * @warning Never omit #finally
+ * From #catch / #catchAll to #endtry, a local variable named <var>exception</var> will exist and contain the exception information (that is, #setjmp() return value).
+ * @warning Never omit #endtry
*/
#define try \
do { \
- int jmpret; \
+ int exception; \
jmp_buf lbuf; \
jmp_buf *prev = currentExceptionBuffer; \
currentExceptionBuffer = &lbuf; \
- if (!(jmpret = setjmp(lbuf))) { \
- do
+ switch (exception = setjmp(lbuf)) { \
+ case 0: do \
/** Define an exception handler.
* @param X exception to catch, MUST be of type int.
*/
#define catch(X) \
while (false); \
- } else if ((X) == jmpret) { \
- jmpret = 0; \
- do
+ break; \
+ case (X): exception = 0; do \
+/** Define a default exception handler. */
+#define catchAll() \
+ while (false); \
+ break; \
+ default: exception = 0; do \
+
/** End exception handling. */
#define endtry \
while (false); \
} \
currentExceptionBuffer = prev; \
- if (jmpret) { \
- longjmp(*currentExceptionBuffer, jmpret); \
+ if (exception) { \
+ longjmp(*currentExceptionBuffer, exception); \
} \
} while(0)
@@ -114,8 +117,16 @@
* @param X Exception to throw, MUST be of type int.
*/
#define throw(X) \
- longjmp(*currentExceptionBuffer, (X));
+ do { \
+ longjmp(*currentExceptionBuffer, (X)); \
+ } while (false)
+/** Rethrows the current exception.
+ * This is a shorthand for #throw(exception).
+ */
+#define rethrow() \
+ throw(exception)
+
/** Declare that a function throws an exception of this type.
* This is currently unused but might be used in future by additional tools that could look for uncaught exceptions.
* @param X Exception type to declare, MUST be of type int.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2011-02-13 10:15:53
|
Revision: 553
http://aceunit.svn.sourceforge.net/aceunit/?rev=553&view=rev
Author: christianhujer
Date: 2011-02-13 10:15:46 +0000 (Sun, 13 Feb 2011)
Log Message:
-----------
Add some traceability to ExceptionHandling test.
Modified Paths:
--------------
trunk/src/native/test/exhand/TryExceptionHandling.c
Modified: trunk/src/native/test/exhand/TryExceptionHandling.c
===================================================================
--- trunk/src/native/test/exhand/TryExceptionHandling.c 2011-02-12 20:31:20 UTC (rev 552)
+++ trunk/src/native/test/exhand/TryExceptionHandling.c 2011-02-13 10:15:46 UTC (rev 553)
@@ -4,25 +4,33 @@
#include <stdio.h>
#include <stdbool.h>
+/*define VERBOSE_ASSERT*/
+
+#ifdef VERBOSE_ASSERT
+#define ASSERT(X) printf( #X "\n" ), assert(X)
+#else
+#define ASSERT(X) assert(X)
+#endif
+
int main(void) {
int count = 0;
- assert(++count == 1); /* should be reached. */
+ ASSERT(++count == 1); /* should be reached. */
try {
- assert(++count == 2); /* should be reached. */
+ ASSERT(++count == 2); /* should be reached. */
try {
- assert(++count == 3); /* should be reached. */
+ ASSERT(++count == 3); /* should be reached. */
try {
- assert(++count == 4); /* should be reached. */
+ ASSERT(++count == 4); /* should be reached. */
throw(1);
- assert(false); /* should NOT be reached. */
+ ASSERT(false); /* should NOT be reached. */
} catch (2) {
- assert(false); /* should NOT be reached. */
+ ASSERT(false); /* should NOT be reached. */
} endtry;
} catch (1) {
- assert(++count == 5); /* should be reached. */
+ ASSERT(++count == 5); /* should be reached. */
} endtry;
- assert(++count == 6); /* should be reached. */
+ ASSERT(++count == 6); /* should be reached. */
} endtry;
- assert(++count == 7); /* should be reached. */
+ ASSERT(++count == 7); /* should be reached. */
return 0;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2011-02-12 20:31:26
|
Revision: 552
http://aceunit.svn.sourceforge.net/aceunit/?rev=552&view=rev
Author: christianhujer
Date: 2011-02-12 20:31:20 +0000 (Sat, 12 Feb 2011)
Log Message:
-----------
Update website copyright information.
Modified Paths:
--------------
trunk/src/doc/transform.xslt
Modified: trunk/src/doc/transform.xslt
===================================================================
--- trunk/src/doc/transform.xslt 2011-02-12 20:26:52 UTC (rev 551)
+++ trunk/src/doc/transform.xslt 2011-02-12 20:31:20 UTC (rev 552)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (c) 2007, Christian Hujer
+ ~ Copyright (c) 2007 - 2011, Christian Hujer
~ All rights reserved.
~
~ Redistribution and use in source and binary forms, with or without
@@ -79,7 +79,7 @@
<xsl:value-of select="/html:html/html:head/html:meta[name='Copyright']/@content" />
</xsl:when>
<xsl:otherwise>
- <xsl:text>Copyright © 2007 - 2008 The AceUnit Developers. All Rights Reserved.</xsl:text>
+ <xsl:text>Copyright © 2007 - 2011 The AceUnit Developers. All Rights Reserved.</xsl:text>
</xsl:otherwise>
</xsl:choose>
</address>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2011-02-12 20:26:58
|
Revision: 551
http://aceunit.svn.sourceforge.net/aceunit/?rev=551&view=rev
Author: christianhujer
Date: 2011-02-12 20:26:52 +0000 (Sat, 12 Feb 2011)
Log Message:
-----------
Update website information.
Modified Paths:
--------------
trunk/src/doc/future.xhtml
trunk/src/doc/history.xhtml
trunk/src/doc/start.xhtml
Modified: trunk/src/doc/future.xhtml
===================================================================
--- trunk/src/doc/future.xhtml 2011-02-10 23:36:04 UTC (rev 550)
+++ trunk/src/doc/future.xhtml 2011-02-12 20:26:52 UTC (rev 551)
@@ -17,7 +17,7 @@
<li>Optional feature: Create / finnish implementation of JUnit compatible loggers</li>
<li>Optional feature: Randomization of test order</li>
<li>Optional feature: Automatic generation of main() function</li>
- <li>Optional feature: Off-Target Runner which runs the unit tests on-target by controlling a simulator or debug interface</li>
+ <li>Optional feature: Off-Target Runner which runs the unit tests on-target by controlling a simulator, debug or other user-definable interface</li>
<li>Better logging of information, e.g. expected and actual values</li>
<li>Alternative test runner with more information, e.g. timing values</li>
<li>
Modified: trunk/src/doc/history.xhtml
===================================================================
--- trunk/src/doc/history.xhtml 2011-02-10 23:36:04 UTC (rev 550)
+++ trunk/src/doc/history.xhtml 2011-02-12 20:26:52 UTC (rev 551)
@@ -13,6 +13,11 @@
This is a documentation of the past releases and their changes.
</p>
<dl>
+ <dt>AceUnit 0.13 (not yet released)</dt>
+ <dd>
+ Fix for [ 3046264 ] Generate TestID independant from underlying file system
+ Fix for [ 3134402 ] Java Generator shoud sort files
+ </dd>
<dt>AceUnit 0.6.1</dt>
<dd>
Fix for [ 1879533 ] missing EOL at EOF makes Generator run out of heap space
Modified: trunk/src/doc/start.xhtml
===================================================================
--- trunk/src/doc/start.xhtml 2011-02-10 23:36:04 UTC (rev 550)
+++ trunk/src/doc/start.xhtml 2011-02-12 20:26:52 UTC (rev 551)
@@ -20,7 +20,7 @@
</div>
-->
<p>
- Latest release version: <strong>aceunit-0.10.0</strong>
+ Latest release version: <strong>aceunit-0.12.0</strong>
</p>
<h2>What is AceUnit?</h2>
<!-- The description must match the project description at http://sourceforge.net/projects/aceunit/ -->
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2011-02-10 23:36:11
|
Revision: 550
http://aceunit.svn.sourceforge.net/aceunit/?rev=550&view=rev
Author: christianhujer
Date: 2011-02-10 23:36:04 +0000 (Thu, 10 Feb 2011)
Log Message:
-----------
Fix for #3134402 Java Generator shoud sort files.
Modified Paths:
--------------
trunk/src/java/src/prj/net/sf/aceunit/GenTest.java
trunk/src/java/src/prj/net/sf/aceunit/GenTest.properties
Added Paths:
-----------
trunk/src/java/src/prj/net/sf/aceunit/FileComparator.java
Added: trunk/src/java/src/prj/net/sf/aceunit/FileComparator.java
===================================================================
--- trunk/src/java/src/prj/net/sf/aceunit/FileComparator.java (rev 0)
+++ trunk/src/java/src/prj/net/sf/aceunit/FileComparator.java 2011-02-10 23:36:04 UTC (rev 550)
@@ -0,0 +1,80 @@
+/* Copyright (c) 2007 - 2011, Christian Hujer
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the AceUnit developers nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package net.sf.aceunit;
+
+import java.io.File;
+import java.text.Collator;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.Locale;
+
+/** Comparator for Files.
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
+ */
+public class FileComparator implements Comparator<File> {
+
+ // Optimization Idea:
+ // For multiple or large sort operations, many comparisons are done.
+ // Thus many conversions from File to String would happen.
+ // A WeakHashMap<File, String> could cache the File.toString() results.
+ // If performance is an issue, this also could be a WeakHashMap<File, CollationKey>.
+
+ /** The Collator of this FileComparator. */
+ private final Collator collator;
+
+ /** Creates a FileComparator w/o locale.
+ * The natural ordering of files is used.
+ */
+ public FileComparator() {
+ this((Collator) null);
+ }
+
+ /** Creates a FileComparator.
+ * @param locale Locale for comparing file(name)s.
+ */
+ public FileComparator(final Locale locale) {
+ this(Collator.getInstance(locale));
+ }
+
+ /** Creates a FileComparator.
+ * @param collator Collator for comparing file(name)s.
+ */
+ public FileComparator(final Collator collator) {
+ this.collator = collator;
+ }
+
+ /** {@inheritDoc} */
+ public int compare(final File o1, final File o2) {
+ if (collator == null) {
+ return o1.compareTo(o2);
+ } else {
+ return collator.compare(o1.toString(), o2.toString());
+ }
+ }
+
+}
Property changes on: trunk/src/java/src/prj/net/sf/aceunit/FileComparator.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ LF
Modified: trunk/src/java/src/prj/net/sf/aceunit/GenTest.java
===================================================================
--- trunk/src/java/src/prj/net/sf/aceunit/GenTest.java 2009-10-05 00:03:34 UTC (rev 549)
+++ trunk/src/java/src/prj/net/sf/aceunit/GenTest.java 2011-02-10 23:36:04 UTC (rev 550)
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007 - 2009, Christian Hujer
+/* Copyright (c) 2007 - 2011, Christian Hujer
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -81,6 +81,9 @@
/** The root packages which were found so far. */
private final List<Pckg> roots = new ArrayList<Pckg>();
+ /** The FileComparator for sorting. */
+ private FileComparator fileComparator = new FileComparator();
+
/**
* Creates a GenTest instance.
*
@@ -130,6 +133,18 @@
}
/**
+ * Sets the locale for sorting files.
+ * @param locale Locale for sorting files.
+ */
+ @Option({"locale"})
+ public void setFileSortingLocale(@NotNull final String fileSortingLocale) {
+ // Optimization Idea:
+ // Allow specifying static fields from java.util.Locale.
+ // Allow specifying countries and variants.
+ fileComparator = new FileComparator(new Locale(fileSortingLocale));
+ }
+
+ /**
* Performs the generation of tests.
*
* @param basename Base name to generate tests for.
@@ -174,6 +189,17 @@
return baseFound || testsFound;
}
+ /** Returns a sorted array of files from the given directory which match the given filter.
+ * @param dir Directory of which to list files.
+ * @param fileFilter Filter for the files.
+ * @return sorted array of files.
+ */
+ public File[] listSortedFiles(final File dir, final FileFilter fileFilter) {
+ final File[] contents = dir.listFiles(fileFilter);
+ Arrays.sort(contents, fileComparator);
+ return contents;
+ }
+
/**
* Performs the generation of tests for a package.
*
@@ -195,13 +221,13 @@
pckg.setId(idGenerator);
roots.add(pckg);
}
- for (final File dir : pckgDir.listFiles(SourceFiles.DIR_FILTER)) {
+ for (final File dir : listSortedFiles(pckgDir, SourceFiles.DIR_FILTER)) {
containedFixture |= performPckg(base, pckg, dir);
}
- for (final File fixtureFile : pckgDir.listFiles(SourceFiles.C_SOURCE_FILTER)) {
+ for (final File fixtureFile : listSortedFiles(pckgDir, SourceFiles.C_SOURCE_FILTER)) {
containedFixture |= performFixture(base, pckg, fixtureFile);
}
- for (final File fixtureFile : pckgDir.listFiles(SourceFiles.CPP_SOURCE_FILTER)) {
+ for (final File fixtureFile : listSortedFiles(pckgDir, SourceFiles.CPP_SOURCE_FILTER)) {
containedFixture |= performFixture(base, pckg, fixtureFile);
}
if (containedFixture) {
Modified: trunk/src/java/src/prj/net/sf/aceunit/GenTest.properties
===================================================================
--- trunk/src/java/src/prj/net/sf/aceunit/GenTest.properties 2009-10-05 00:03:34 UTC (rev 549)
+++ trunk/src/java/src/prj/net/sf/aceunit/GenTest.properties 2011-02-10 23:36:04 UTC (rev 550)
@@ -1,4 +1,4 @@
-# Copyright (c) 2007, Christian Hujer
+# Copyright (c) 2007 - 2011, Christian Hujer
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -30,3 +30,4 @@
setPrint=Specifies what to print. Comma separated enum set.\n suites: Print suite file names.\n fixtures: Print fixture file names.\n generated: Generated file names.\n headers: Header file names.\n sources: Source file names.
setAllTestsFilename=Write a table of all tests and their ids to the specified file.
disableGenSuites=Disables the generation of Suite*.c files.\n If Suite*.c files are not generated, ACEUNIT_SUITES cannot be used.\n The default is that Suite*.c files are generated.
+setFileSortingLocale=Specifies the locale to use for file sorting. This enables a reproducible order of tests in environments with exotic file ordering (i.e. ClearCase dynamic views) or mixed locale.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2009-10-05 01:22:34
|
Revision: 549
http://aceunit.svn.sourceforge.net/aceunit/?rev=549&view=rev
Author: christianhujer
Date: 2009-10-05 00:03:34 +0000 (Mon, 05 Oct 2009)
Log Message:
-----------
Fix for #2871367 AceUnit.h runnerData dependency
Modified Paths:
--------------
trunk/src/native/AceUnit.h
Modified: trunk/src/native/AceUnit.h
===================================================================
--- trunk/src/native/AceUnit.h 2009-09-30 19:35:21 UTC (rev 548)
+++ trunk/src/native/AceUnit.h 2009-10-05 00:03:34 UTC (rev 549)
@@ -624,4 +624,8 @@
extern void runSuite(const TestSuite_t *const suite);
#endif
+#if ACEUNIT_ASSERTION_STYLE == ACEUNIT_ASSERTION_STYLE_LONGJMP
+#include "AceUnitData.h"
+#endif
+
#endif /* ACEUNIT_H */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2009-09-30 19:35:30
|
Revision: 548
http://aceunit.svn.sourceforge.net/aceunit/?rev=548&view=rev
Author: christianhujer
Date: 2009-09-30 19:35:21 +0000 (Wed, 30 Sep 2009)
Log Message:
-----------
Fix bug in new frs control.
Modified Paths:
--------------
release.sh
Modified: release.sh
===================================================================
--- release.sh 2009-09-30 19:29:54 UTC (rev 547)
+++ release.sh 2009-09-30 19:35:21 UTC (rev 548)
@@ -65,7 +65,7 @@
tar czvf uploads/$basename-src.tar.gz $basename
zip -r uploads/$basename-src.zip $basename
(cd $basename/src/java ; ant) ; mv $basename/src/java/AceUnit.jar uploads/AceUnit-$releasename.jar
-rsync -avPe ssh uploads/ $sfusername,ac...@fr...:/home/frs/projects/a/ac/aceunit/aceunit-$releasename/
+rsync -avPe ssh uploads/ $sfusername,ac...@fr...:/home/frs/project/a/ac/aceunit/aceunit/aceunit-$releasename/
echo
echo "Upload done. Now create a new release at sourceforge and freshmeat, the mailing list and the forum."
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2009-09-30 19:30:04
|
Revision: 547
http://aceunit.svn.sourceforge.net/aceunit/?rev=547&view=rev
Author: christianhujer
Date: 2009-09-30 19:29:54 +0000 (Wed, 30 Sep 2009)
Log Message:
-----------
Creating release tag 0.12.0 for branch 0.12.
Added Paths:
-----------
tags/0.12.0/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2009-09-30 19:29:23
|
Revision: 546
http://aceunit.svn.sourceforge.net/aceunit/?rev=546&view=rev
Author: christianhujer
Date: 2009-09-30 19:29:12 +0000 (Wed, 30 Sep 2009)
Log Message:
-----------
Creating branch for 0.12.
Added Paths:
-----------
branches/0.12/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2009-09-30 19:19:28
|
Revision: 545
http://aceunit.svn.sourceforge.net/aceunit/?rev=545&view=rev
Author: christianhujer
Date: 2009-09-30 19:19:22 +0000 (Wed, 30 Sep 2009)
Log Message:
-----------
Update release.sh for the new frs of sourceforge.
Modified Paths:
--------------
release.sh
Modified: release.sh
===================================================================
--- release.sh 2009-09-30 19:07:11 UTC (rev 544)
+++ release.sh 2009-09-30 19:19:22 UTC (rev 545)
@@ -65,7 +65,7 @@
tar czvf uploads/$basename-src.tar.gz $basename
zip -r uploads/$basename-src.zip $basename
(cd $basename/src/java ; ant) ; mv $basename/src/java/AceUnit.jar uploads/AceUnit-$releasename.jar
-rsync -avPe ssh uploads/ $sfu...@fr...:uploads/
+rsync -avPe ssh uploads/ $sfusername,ac...@fr...:/home/frs/projects/a/ac/aceunit/aceunit-$releasename/
echo
echo "Upload done. Now create a new release at sourceforge and freshmeat, the mailing list and the forum."
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2009-09-30 19:07:23
|
Revision: 544
http://aceunit.svn.sourceforge.net/aceunit/?rev=544&view=rev
Author: christianhujer
Date: 2009-09-30 19:07:11 +0000 (Wed, 30 Sep 2009)
Log Message:
-----------
Fix for #2870682 Help text format is strange
Modified Paths:
--------------
trunk/src/java/src/prj/net/sf/aceunit/GenTest.properties
Modified: trunk/src/java/src/prj/net/sf/aceunit/GenTest.properties
===================================================================
--- trunk/src/java/src/prj/net/sf/aceunit/GenTest.properties 2009-09-30 19:00:23 UTC (rev 543)
+++ trunk/src/java/src/prj/net/sf/aceunit/GenTest.properties 2009-09-30 19:07:11 UTC (rev 544)
@@ -27,6 +27,6 @@
helpHeader=Usage: java -jar AceUnit.jar [OPTION]... [BASENAME]...\nCreate AceUnit unit test headers for one or more suites with the specified BASENAME(s) (omit .c suffix for fixtures).\n
helpFooter=Examples:\n java -jar AceUnit.jar sortTest\n java -jar AceUnit.jar --print=generated -o alltests.txt src/test/\n
setForce=Overwrite write-protected files.
-setPrint=Specifies what to print. Comma separated enum set.\n suites: Print suite file names.
+setPrint=Specifies what to print. Comma separated enum set.\n suites: Print suite file names.\n fixtures: Print fixture file names.\n generated: Generated file names.\n headers: Header file names.\n sources: Source file names.
setAllTestsFilename=Write a table of all tests and their ids to the specified file.
-disableGenSuites=Disables the generation of Suite*.c files.\nIf Suite*.c files are not generated, ACEUNIT_SUITES cannot be used.\nThe default is that Suite*.c files are generated.
+disableGenSuites=Disables the generation of Suite*.c files.\n If Suite*.c files are not generated, ACEUNIT_SUITES cannot be used.\n The default is that Suite*.c files are generated.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2009-09-30 19:00:31
|
Revision: 543
http://aceunit.svn.sourceforge.net/aceunit/?rev=543&view=rev
Author: christianhujer
Date: 2009-09-30 19:00:23 +0000 (Wed, 30 Sep 2009)
Log Message:
-----------
Fix for #2870684 Typo on help text for --print
Modified Paths:
--------------
trunk/src/java/src/prj/net/sf/aceunit/GenTest.properties
Modified: trunk/src/java/src/prj/net/sf/aceunit/GenTest.properties
===================================================================
--- trunk/src/java/src/prj/net/sf/aceunit/GenTest.properties 2009-09-30 18:55:52 UTC (rev 542)
+++ trunk/src/java/src/prj/net/sf/aceunit/GenTest.properties 2009-09-30 19:00:23 UTC (rev 543)
@@ -27,6 +27,6 @@
helpHeader=Usage: java -jar AceUnit.jar [OPTION]... [BASENAME]...\nCreate AceUnit unit test headers for one or more suites with the specified BASENAME(s) (omit .c suffix for fixtures).\n
helpFooter=Examples:\n java -jar AceUnit.jar sortTest\n java -jar AceUnit.jar --print=generated -o alltests.txt src/test/\n
setForce=Overwrite write-protected files.
-setPrint=Specifies what to print. Comman separated enum set.\n suites: Print suite file names.
+setPrint=Specifies what to print. Comma separated enum set.\n suites: Print suite file names.
setAllTestsFilename=Write a table of all tests and their ids to the specified file.
disableGenSuites=Disables the generation of Suite*.c files.\nIf Suite*.c files are not generated, ACEUNIT_SUITES cannot be used.\nThe default is that Suite*.c files are generated.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2009-09-30 18:56:00
|
Revision: 542
http://aceunit.svn.sourceforge.net/aceunit/?rev=542&view=rev
Author: christianhujer
Date: 2009-09-30 18:55:52 +0000 (Wed, 30 Sep 2009)
Log Message:
-----------
Implementation of #2870681 Add option for omission of suite files
Modified Paths:
--------------
trunk/src/java/AceUnit.iml
trunk/src/java/AceUnit.ipr
trunk/src/java/src/prj/net/sf/aceunit/GenTest.java
trunk/src/java/src/prj/net/sf/aceunit/GenTest.properties
trunk/src/native/test/basic/Makefile
trunk/src/native/test/common.mak
Modified: trunk/src/java/AceUnit.iml
===================================================================
--- trunk/src/java/AceUnit.iml 2009-09-29 20:11:12 UTC (rev 541)
+++ trunk/src/java/AceUnit.iml 2009-09-30 18:55:52 UTC (rev 542)
@@ -40,153 +40,6 @@
<Base>
<setting name="state" value="2" />
</Base>
- <LanguageOptions name="HTML">
- <option name="templateOptions">
- <value>
- <option name="block" value="true" />
- <option name="separateBefore" value="false" />
- <option name="separateAfter" value="false" />
- <option name="prefixLines" value="true" />
- <option name="lenBefore" value="80" />
- <option name="lenAfter" value="80" />
- <option name="box" value="false" />
- <option name="filler" value="$TEMPLATE$" />
- </value>
- </option>
- <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
- <option name="keyword" value="Copyright" />
- <option name="fileTypeOverride" value="2" />
- <option name="relativeBefore" value="true" />
- <option name="addBlankAfter" value="true" />
- <option name="fileLocation" value="1" />
- <option name="useAlternate" value="false" />
- </LanguageOptions>
- <LanguageOptions name="JAVA">
- <option name="templateOptions">
- <value>
- <option name="block" value="true" />
- <option name="separateBefore" value="false" />
- <option name="separateAfter" value="false" />
- <option name="prefixLines" value="true" />
- <option name="lenBefore" value="80" />
- <option name="lenAfter" value="80" />
- <option name="box" value="false" />
- <option name="filler" value="$TEMPLATE$" />
- </value>
- </option>
- <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
- <option name="keyword" value="Copyright" />
- <option name="fileTypeOverride" value="2" />
- <option name="relativeBefore" value="true" />
- <option name="addBlankAfter" value="true" />
- <option name="fileLocation" value="1" />
- <option name="useAlternate" value="false" />
- </LanguageOptions>
- <LanguageOptions name="JSP">
- <option name="templateOptions">
- <value>
- <option name="block" value="true" />
- <option name="separateBefore" value="false" />
- <option name="separateAfter" value="false" />
- <option name="prefixLines" value="true" />
- <option name="lenBefore" value="80" />
- <option name="lenAfter" value="80" />
- <option name="box" value="false" />
- <option name="filler" value="$TEMPLATE$" />
- </value>
- </option>
- <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
- <option name="keyword" value="Copyright" />
- <option name="fileTypeOverride" value="2" />
- <option name="relativeBefore" value="true" />
- <option name="addBlankAfter" value="true" />
- <option name="fileLocation" value="1" />
- <option name="useAlternate" value="false" />
- </LanguageOptions>
- <LanguageOptions name="JavaScript">
- <option name="templateOptions">
- <value>
- <option name="block" value="true" />
- <option name="separateBefore" value="false" />
- <option name="separateAfter" value="false" />
- <option name="prefixLines" value="true" />
- <option name="lenBefore" value="80" />
- <option name="lenAfter" value="80" />
- <option name="box" value="false" />
- <option name="filler" value="$TEMPLATE$" />
- </value>
- </option>
- <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
- <option name="keyword" value="Copyright" />
- <option name="fileTypeOverride" value="2" />
- <option name="relativeBefore" value="true" />
- <option name="addBlankAfter" value="true" />
- <option name="fileLocation" value="1" />
- <option name="useAlternate" value="false" />
- </LanguageOptions>
- <LanguageOptions name="Properties">
- <option name="templateOptions">
- <value>
- <option name="block" value="true" />
- <option name="separateBefore" value="false" />
- <option name="separateAfter" value="false" />
- <option name="prefixLines" value="true" />
- <option name="lenBefore" value="80" />
- <option name="lenAfter" value="80" />
- <option name="box" value="false" />
- <option name="filler" value="$TEMPLATE$" />
- </value>
- </option>
- <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
- <option name="keyword" value="Copyright" />
- <option name="fileTypeOverride" value="2" />
- <option name="relativeBefore" value="true" />
- <option name="addBlankAfter" value="true" />
- <option name="fileLocation" value="1" />
- <option name="useAlternate" value="false" />
- </LanguageOptions>
- <LanguageOptions name="XML">
- <option name="templateOptions">
- <value>
- <option name="block" value="true" />
- <option name="separateBefore" value="false" />
- <option name="separateAfter" value="false" />
- <option name="prefixLines" value="true" />
- <option name="lenBefore" value="80" />
- <option name="lenAfter" value="80" />
- <option name="box" value="false" />
- <option name="filler" value="$TEMPLATE$" />
- </value>
- </option>
- <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
- <option name="keyword" value="Copyright" />
- <option name="fileTypeOverride" value="2" />
- <option name="relativeBefore" value="true" />
- <option name="addBlankAfter" value="true" />
- <option name="fileLocation" value="1" />
- <option name="useAlternate" value="false" />
- </LanguageOptions>
- <LanguageOptions name="__TEMPLATE__">
- <option name="templateOptions">
- <value>
- <option name="block" value="true" />
- <option name="separateBefore" value="false" />
- <option name="separateAfter" value="false" />
- <option name="prefixLines" value="true" />
- <option name="lenBefore" value="80" />
- <option name="lenAfter" value="80" />
- <option name="box" value="false" />
- <option name="filler" value="$TEMPLATE$" />
- </value>
- </option>
- <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
- <option name="keyword" value="Copyright" />
- <option name="fileTypeOverride" value="4" />
- <option name="relativeBefore" value="true" />
- <option name="addBlankAfter" value="true" />
- <option name="fileLocation" value="1" />
- <option name="useAlternate" value="false" />
- </LanguageOptions>
</component>
</module>
Modified: trunk/src/java/AceUnit.ipr
===================================================================
--- trunk/src/java/AceUnit.ipr 2009-09-29 20:11:12 UTC (rev 541)
+++ trunk/src/java/AceUnit.ipr 2009-09-30 18:55:52 UTC (rev 542)
@@ -316,8 +316,5 @@
<setting name="state" value="2" />
</Base>
</component>
- <UsedPathMacros>
- <macro name="TEMPLATE" description="" />
- </UsedPathMacros>
</project>
Modified: trunk/src/java/src/prj/net/sf/aceunit/GenTest.java
===================================================================
--- trunk/src/java/src/prj/net/sf/aceunit/GenTest.java 2009-09-29 20:11:12 UTC (rev 541)
+++ trunk/src/java/src/prj/net/sf/aceunit/GenTest.java 2009-09-30 18:55:52 UTC (rev 542)
@@ -59,6 +59,9 @@
/** Whether to overwrite write-protected files. */
private boolean force;
+ /** Whether or not to generate suites. */
+ private boolean genSuites = true;
+
/** What to print. */
private final EnumSet<Print> printSet = EnumSet.noneOf(Print.class);
@@ -109,6 +112,15 @@
}
/**
+ * Disables suite generation.
+ * If suite generation is turned of, the feature ACEUNIT_SUITES cannot be used.
+ */
+ @Option({"disableGenSuites"})
+ public void disableGenSuites() {
+ this.genSuites = false;
+ }
+
+ /**
* Sets the filename of the file to which a table of all tests is written.
* @param allTestsFilename Filename of the file to which a table of all tests shall be written.
*/
@@ -202,7 +214,9 @@
System.out.println(cFile);
}
final String hSource = pckg.getCode("foo");
- SourceFiles.writeIfChanged(cFile, hSource, force);
+ if (genSuites) {
+ SourceFiles.writeIfChanged(cFile, hSource, force);
+ }
allTests.add(pckgDir.toString().replaceAll("^\\./", "").replaceAll("[\\/]", "."));
}
if (containedFixture && parent != null) {
Modified: trunk/src/java/src/prj/net/sf/aceunit/GenTest.properties
===================================================================
--- trunk/src/java/src/prj/net/sf/aceunit/GenTest.properties 2009-09-29 20:11:12 UTC (rev 541)
+++ trunk/src/java/src/prj/net/sf/aceunit/GenTest.properties 2009-09-30 18:55:52 UTC (rev 542)
@@ -29,3 +29,4 @@
setForce=Overwrite write-protected files.
setPrint=Specifies what to print. Comman separated enum set.\n suites: Print suite file names.
setAllTestsFilename=Write a table of all tests and their ids to the specified file.
+disableGenSuites=Disables the generation of Suite*.c files.\nIf Suite*.c files are not generated, ACEUNIT_SUITES cannot be used.\nThe default is that Suite*.c files are generated.
Modified: trunk/src/native/test/basic/Makefile
===================================================================
--- trunk/src/native/test/basic/Makefile 2009-09-29 20:11:12 UTC (rev 541)
+++ trunk/src/native/test/basic/Makefile 2009-09-30 18:55:52 UTC (rev 542)
@@ -1 +1,2 @@
+ACEUNIT_OPTS=--disableGenSuites
include ../common.mak
Modified: trunk/src/native/test/common.mak
===================================================================
--- trunk/src/native/test/common.mak 2009-09-29 20:11:12 UTC (rev 541)
+++ trunk/src/native/test/common.mak 2009-09-30 18:55:52 UTC (rev 542)
@@ -9,7 +9,7 @@
VPATH=$(ACEUNIT_NATIVE_PATH)
-GENERATED:=$(shell java -ea -jar $(ACEUNIT_JAVA_PATH)/AceUnit.jar --exit true --print=generated -o alltests.txt .)
+GENERATED:=$(shell java -ea -jar $(ACEUNIT_JAVA_PATH)/AceUnit.jar --exit true --print=generated $(ACEUNIT_OPTS) -o alltests.txt .)
SUITES:=$(filter *.c,$(GENERATED))
CSOURCES:=$(sort $(shell find . -name "*.c")) $(SUITES)
CXXSOURCES:=$(sort $(shell find . -name "*.cpp"))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2009-09-29 20:11:27
|
Revision: 541
http://aceunit.svn.sourceforge.net/aceunit/?rev=541&view=rev
Author: christianhujer
Date: 2009-09-29 20:11:12 +0000 (Tue, 29 Sep 2009)
Log Message:
-----------
Creating release tag 0.11.0 for branch 0.11.
Added Paths:
-----------
tags/0.11.0/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2009-09-29 20:10:18
|
Revision: 540
http://aceunit.svn.sourceforge.net/aceunit/?rev=540&view=rev
Author: christianhujer
Date: 2009-09-29 20:10:05 +0000 (Tue, 29 Sep 2009)
Log Message:
-----------
Creating branch for 0.11.
Added Paths:
-----------
branches/0.11/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2009-09-29 20:05:33
|
Revision: 539
http://aceunit.svn.sourceforge.net/aceunit/?rev=539&view=rev
Author: christianhujer
Date: 2009-09-29 20:05:12 +0000 (Tue, 29 Sep 2009)
Log Message:
-----------
Fix #2869584 The global jmpbuf should be a pointer
Modified Paths:
--------------
trunk/src/native/AceUnit.c
trunk/src/native/AceUnit.h
trunk/src/native/AceUnitData.h
Modified: trunk/src/native/AceUnit.c
===================================================================
--- trunk/src/native/AceUnit.c 2009-09-24 22:02:01 UTC (rev 538)
+++ trunk/src/native/AceUnit.c 2009-09-29 20:05:12 UTC (rev 539)
@@ -35,10 +35,6 @@
#include "AceUnitLogging.h"
#include "AceUnitData.h"
-#if ACEUNIT_ASSERTION_STYLE == ACEUNIT_ASSERTION_STYLE_LONGJMP
-#include <setjmp.h>
-#endif
-
#ifdef ACEUNIT_CODE_INCLUDE
#include ACEUNIT_CODE_INCLUDE
#endif
@@ -79,10 +75,6 @@
/** The Logger. */
extern TestLogger_t *globalLogger;
-#if ACEUNIT_ASSERTION_STYLE == ACEUNIT_ASSERTION_STYLE_LONGJMP
-jmp_buf aceunitJmpBuf;
-#endif
-
/* Define the PRE/POST macros as empty macros in case they are undefined to make further source code more readable. */
#ifndef ACEUNIT_PRE_BEFORECLASS
#define ACEUNIT_PRE_BEFORECLASS
@@ -184,7 +176,7 @@
runnerData->recentError = NULL;
ACEUNIT_PRE_TEST
#if ACEUNIT_ASSERTION_STYLE == ACEUNIT_ASSERTION_STYLE_LONGJMP
- if (0 == setjmp(aceunitJmpBuf)) {
+ if (0 == setjmp(runnerData->jmpBuf)) {
#endif
#ifdef ACEUNIT_LOOP
for (currentLoop = 0; (currentLoop < *loopMax) && (NULL == runnerData->recentError); currentLoop++) {
@@ -312,7 +304,7 @@
runnerData->recentError = NULL;
ACEUNIT_PRE_TEST
#if ACEUNIT_ASSERTION_STYLE == ACEUNIT_ASSERTION_STYLE_LONGJMP
- if (0 == setjmp(aceunitJmpBuf)) {
+ if (0 == setjmp(runnerData->jmpBuf)) {
#endif
#ifdef ACEUNIT_LOOP
for (currentLoop = 0; (currentLoop < *loopMax) && (NULL == runnerData->recentError); currentLoop++) {
Modified: trunk/src/native/AceUnit.h
===================================================================
--- trunk/src/native/AceUnit.h 2009-09-24 22:02:01 UTC (rev 538)
+++ trunk/src/native/AceUnit.h 2009-09-29 20:05:12 UTC (rev 539)
@@ -391,8 +391,6 @@
#else
#include <setjmp.h>
#endif
- /** Jump Buffer for AceUnit to abort a test case and jump back to the runner. */
- extern jmp_buf aceunitJmpBuf;
#elif ACEUNIT_ASSERTION_STYLE == ACEUNIT_ASSERTION_STYLE_CUSTOM
/* nothing special */
#else
@@ -407,7 +405,7 @@
#elif ACEUNIT_ASSERTION_STYLE == ACEUNIT_ASSERTION_STYLE_ABORT
#define ACEUNIT_ABORT abort()
#elif ACEUNIT_ASSERTION_STYLE == ACEUNIT_ASSERTION_STYLE_LONGJMP
- #define ACEUNIT_ABORT longjmp(aceunitJmpBuf, 1)
+ #define ACEUNIT_ABORT longjmp(runnerData->jmpBuf, 1)
#elif ACEUNIT_ASSERTION_STYLE == ACEUNIT_ASSERTION_STYLE_CUSTOM
#define ACEUNIT_ABORT ACEUNIT_CUSTOM_ASSERT
#else
Modified: trunk/src/native/AceUnitData.h
===================================================================
--- trunk/src/native/AceUnitData.h 2009-09-24 22:02:01 UTC (rev 538)
+++ trunk/src/native/AceUnitData.h 2009-09-29 20:05:12 UTC (rev 539)
@@ -61,6 +61,11 @@
/** The number of test cases that failed. */
uint16_t testCaseFailureCount;
+#if ACEUNIT_ASSERTION_STYLE == ACEUNIT_ASSERTION_STYLE_LONGJMP
+ /** Jump Buffer for AceUnit to abort a test case and jump back to the runner. */
+ jmp_buf jmpBuf;
+#endif
+
#ifdef ACEUNIT_EXPLICIT_MESSAGES
/** The temporary buffer for message formatting. */
#ifdef ACEUNIT_EXPLICIT_MESSAGES_INLINE_BUFFER
@@ -69,7 +74,6 @@
char *explicitMsgBuf;
#endif
#endif
-
#ifdef ACEUNIT_RUNNERDATA_EXTENSION
/* Extension hook to add your own fields to AceUnitRunnerData_t. */
ACEUNIT_RUNNERDATA_EXTENSION
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2009-09-24 22:02:11
|
Revision: 538
http://aceunit.svn.sourceforge.net/aceunit/?rev=538&view=rev
Author: christianhujer
Date: 2009-09-24 22:02:01 +0000 (Thu, 24 Sep 2009)
Log Message:
-----------
Improve format of exception handling macros.
Remove finally macro as it can never reliably work (think about return or exceptions thrown in catch clauses).
Place the jump buffer for setjmp / longjmp on the stack instead on the heap.
Modified Paths:
--------------
trunk/src/native/ExceptionHandling.c
trunk/src/native/ExceptionHandling.h
trunk/src/native/test/exhand/TryExceptionHandling.c
Modified: trunk/src/native/ExceptionHandling.c
===================================================================
--- trunk/src/native/ExceptionHandling.c 2009-08-24 21:45:40 UTC (rev 537)
+++ trunk/src/native/ExceptionHandling.c 2009-09-24 22:02:01 UTC (rev 538)
@@ -33,16 +33,11 @@
#include "ExceptionHandling.h"
-/** The global exception buffer for single-threaded programs. */
-static jmp_buf exceptionBuffer;
-
/** The exception buffer of the current thread.
- * If you work in a multi-threaded environment, make sure the scheduler allocates a jmp_buf for each thread and initializes currentExceptionBuffer for that thread with each conext switch.
+ * If you work in a multi-threaded environment, make sure the scheduler schedules this variable, too.
* If you don't, your system will get very upset about interrupted exceptions.
*
- * Make sure that the scheduler starts each thread with an initialized jmp_buf (invoke setjmp() once!), otherwise your system will get very upset about uncaught exceptions.
- *
- * If you work in a single-threaded environment, still make sure that setjmp() is invoked at least once, otherwise your system will get very upset
- * about uncaught exceptions.
+ * You may want your system or scheduler to start each thread with an initialized jmp_buf (invoke setjmp() once!).
+ * This allows your scheduler to handle uncaught exceptions.
*/
-jmp_buf *currentExceptionBuffer = &exceptionBuffer; /*lint !e545 The & is required on platforms where jmp_buf is not an array.*/
+jmp_buf *currentExceptionBuffer = NULL; /*lint !e545 The & is required on platforms where jmp_buf is not an array.*/
Modified: trunk/src/native/ExceptionHandling.h
===================================================================
--- trunk/src/native/ExceptionHandling.h 2009-08-24 21:45:40 UTC (rev 537)
+++ trunk/src/native/ExceptionHandling.h 2009-09-24 22:02:01 UTC (rev 538)
@@ -82,23 +82,39 @@
/** Start execution of code which might throw an exception that might be caught by the exception handlers that follow this try.
* @warning Never omit #finally
*/
-#define try do { int jmpret; { jmp_buf lbuf; memcpy(&lbuf, currentExceptionBuffer, sizeof(jmp_buf)); if (!(jmpret = setjmp(*currentExceptionBuffer)))
+#define try \
+ do { \
+ int jmpret; \
+ jmp_buf lbuf; \
+ jmp_buf *prev = currentExceptionBuffer; \
+ currentExceptionBuffer = &lbuf; \
+ if (!(jmpret = setjmp(lbuf))) { \
+ do
/** Define an exception handler.
* @param X exception to catch, MUST be of type int.
*/
-#define catch(X) else if ((X) == jmpret && !(jmpret = 0))
+#define catch(X) \
+ while (false); \
+ } else if ((X) == jmpret) { \
+ jmpret = 0; \
+ do
-/** Always execute this code. */
-#define finally memcpy(currentExceptionBuffer, &lbuf, sizeof(jmp_buf)); }
-
/** End exception handling. */
-#define endtry if (jmpret) { longjmp(*currentExceptionBuffer, jmpret); } } while(0)
+#define endtry \
+ while (false); \
+ } \
+ currentExceptionBuffer = prev; \
+ if (jmpret) { \
+ longjmp(*currentExceptionBuffer, jmpret); \
+ } \
+ } while(0)
/** Throw an exception.
* @param X Exception to throw, MUST be of type int.
*/
-#define throw(X) longjmp(*currentExceptionBuffer, (X));
+#define throw(X) \
+ longjmp(*currentExceptionBuffer, (X));
/** Declare that a function throws an exception of this type.
* This is currently unused but might be used in future by additional tools that could look for uncaught exceptions.
Modified: trunk/src/native/test/exhand/TryExceptionHandling.c
===================================================================
--- trunk/src/native/test/exhand/TryExceptionHandling.c 2009-08-24 21:45:40 UTC (rev 537)
+++ trunk/src/native/test/exhand/TryExceptionHandling.c 2009-09-24 22:02:01 UTC (rev 538)
@@ -17,18 +17,12 @@
assert(false); /* should NOT be reached. */
} catch (2) {
assert(false); /* should NOT be reached. */
- } finally {
- assert(++count == 5); /* should be reached. */
} endtry;
} catch (1) {
- assert(++count == 6); /* should be reached. */
- } finally {
- assert(++count == 7); /* should be reached. */
+ assert(++count == 5); /* should be reached. */
} endtry;
- assert(++count == 8); /* should be reached. */
- } finally {
- assert(++count == 9); /* should be reached. */
+ assert(++count == 6); /* should be reached. */
} endtry;
- assert(++count == 10); /* should be reached. */
+ assert(++count == 7); /* should be reached. */
return 0;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2009-08-24 22:54:47
|
Revision: 537
http://aceunit.svn.sourceforge.net/aceunit/?rev=537&view=rev
Author: christianhujer
Date: 2009-08-24 21:45:40 +0000 (Mon, 24 Aug 2009)
Log Message:
-----------
Improve error messages in case no test cases were found.
Modified Paths:
--------------
trunk/src/java/src/prj/net/sf/aceunit/GenTest.java
Modified: trunk/src/java/src/prj/net/sf/aceunit/GenTest.java
===================================================================
--- trunk/src/java/src/prj/net/sf/aceunit/GenTest.java 2009-08-21 19:58:17 UTC (rev 536)
+++ trunk/src/java/src/prj/net/sf/aceunit/GenTest.java 2009-08-24 21:45:40 UTC (rev 537)
@@ -157,7 +157,7 @@
System.err.println("AceUnit: no input files");
}
if (!testsFound) {
- System.err.println("AceUnit: no test cases");
+ System.err.println("AceUnit: no test cases in " + basename);
}
return baseFound || testsFound;
}
@@ -298,6 +298,9 @@
okay &= perform(basename);
}
writeAllTests();
+ if (!okay) {
+ System.err.println("AceUnit: warning: No test cases found.");
+ }
return okay ? 0 : 1;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2009-08-21 19:58:28
|
Revision: 536
http://aceunit.svn.sourceforge.net/aceunit/?rev=536&view=rev
Author: christianhujer
Date: 2009-08-21 19:58:17 +0000 (Fri, 21 Aug 2009)
Log Message:
-----------
Add XHTML dtds.
Added Paths:
-----------
trunk/src/doc/dtd/
trunk/src/doc/dtd/catalogForAnt.xml
trunk/src/doc/dtd/xhtml-applet-1.mod
trunk/src/doc/dtd/xhtml-arch-1.mod
trunk/src/doc/dtd/xhtml-attribs-1.mod
trunk/src/doc/dtd/xhtml-base-1.mod
trunk/src/doc/dtd/xhtml-basic-form-1.mod
trunk/src/doc/dtd/xhtml-basic-table-1.mod
trunk/src/doc/dtd/xhtml-bdo-1.mod
trunk/src/doc/dtd/xhtml-blkphras-1.mod
trunk/src/doc/dtd/xhtml-blkpres-1.mod
trunk/src/doc/dtd/xhtml-blkstruct-1.mod
trunk/src/doc/dtd/xhtml-charent-1.mod
trunk/src/doc/dtd/xhtml-csismap-1.mod
trunk/src/doc/dtd/xhtml-datatypes-1.mod
trunk/src/doc/dtd/xhtml-edit-1.mod
trunk/src/doc/dtd/xhtml-events-1.mod
trunk/src/doc/dtd/xhtml-form-1.mod
trunk/src/doc/dtd/xhtml-frames-1.mod
trunk/src/doc/dtd/xhtml-framework-1.mod
trunk/src/doc/dtd/xhtml-hypertext-1.mod
trunk/src/doc/dtd/xhtml-iframe-1.mod
trunk/src/doc/dtd/xhtml-image-1.mod
trunk/src/doc/dtd/xhtml-inlphras-1.mod
trunk/src/doc/dtd/xhtml-inlpres-1.mod
trunk/src/doc/dtd/xhtml-inlstruct-1.mod
trunk/src/doc/dtd/xhtml-inlstyle-1.mod
trunk/src/doc/dtd/xhtml-lat1.ent
trunk/src/doc/dtd/xhtml-legacy-1.mod
trunk/src/doc/dtd/xhtml-link-1.mod
trunk/src/doc/dtd/xhtml-list-1.mod
trunk/src/doc/dtd/xhtml-meta-1.mod
trunk/src/doc/dtd/xhtml-nameident-1.mod
trunk/src/doc/dtd/xhtml-notations-1.mod
trunk/src/doc/dtd/xhtml-object-1.mod
trunk/src/doc/dtd/xhtml-param-1.mod
trunk/src/doc/dtd/xhtml-pres-1.mod
trunk/src/doc/dtd/xhtml-qname-1.mod
trunk/src/doc/dtd/xhtml-ruby-1.mod
trunk/src/doc/dtd/xhtml-script-1.mod
trunk/src/doc/dtd/xhtml-special.ent
trunk/src/doc/dtd/xhtml-ssismap-1.mod
trunk/src/doc/dtd/xhtml-struct-1.mod
trunk/src/doc/dtd/xhtml-style-1.mod
trunk/src/doc/dtd/xhtml-symbol.ent
trunk/src/doc/dtd/xhtml-table-1.mod
trunk/src/doc/dtd/xhtml-target-1.mod
trunk/src/doc/dtd/xhtml-text-1.mod
trunk/src/doc/dtd/xhtml-xinclude10-1.mod
trunk/src/doc/dtd/xhtml11-flat.dtd
trunk/src/doc/dtd/xhtml11-model-1.mod
trunk/src/doc/dtd/xhtml11.dtd
trunk/src/doc/dtd/xhtml11_xinclude10-model-1.mod
trunk/src/doc/dtd/xhtml11_xinclude10.dtd
Added: trunk/src/doc/dtd/catalogForAnt.xml
===================================================================
--- trunk/src/doc/dtd/catalogForAnt.xml (rev 0)
+++ trunk/src/doc/dtd/catalogForAnt.xml 2009-08-21 19:58:17 UTC (rev 536)
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xmlcatalog id="commonDTDs">
+ <entity publicid="-//JAPI//DTD XHTML 1.1 + XInclude 1.0//EN" location="src/xslt/dtd/xhtml11_xinclude10.dtd" />
+ <entity publicid="-//JAPI//ENTITIES XHTML 1.1 + XInclude 1.0 Document Model 1.0//EN" location="src/xslt/dtd/xhtml11_xinclude10-model-1.mod" />
+ <entity publicid="-//JAPI//ELEMENTS XHTML XInclude 1.0//EN" location="src/xslt/dtd/xhtml-xinclude10-1.mod" />
+ <entity publicid="-//W3C//DTD XHTML 1.1//EN" location="src/xslt/dtd/xhtml11.dtd" />
+ <entity publicid="-//W3C//ELEMENTS XHTML Base Architecture 1.0//EN" location="src/xslt/dtd/xhtml-arch-1.mod" />
+ <entity publicid="-//W3C//ELEMENTS XHTML Base Element 1.0//EN" location="src/xslt/dtd/xhtml-base-1.mod" />
+ <entity publicid="-//W3C//ELEMENTS XHTML Basic Forms 1.0//EN" location="src/xslt/dtd/xhtml-basic-form-1.mod" />
+ <entity publicid="-//W3C//ELEMENTS XHTML Basic Tables 1.0//EN" location="src/xslt/dtd/xhtml-basic-table-1.mod" />
+ <entity publicid="-//W3C//ELEMENTS XHTML BDO Element 1.0//EN" location="src/xslt/dtd/xhtml-bdo-1.mod" />
+ <entity publicid="-//W3C//ELEMENTS XHTML BIDI Override Element 1.0//EN" location="src/xslt/dtd/xhtml-bdo-1.mod" />
+ <entity publicid="-//W3C//ELEMENTS XHTML Block Phrasal 1.0//EN" location="src/xslt/dtd/xhtml-blkphras-1.mod" />
+ <entity publicid="-//W3C//ELEMENTS XHTML Block Presentation 1.0//EN" location="src/xslt/dtd/xhtml-blkpres-1.mod" />
+ <entity publicid="-//W3C//ELEMENTS XHTML Block Structural 1.0//EN" location="src/xslt/dtd/xhtml-blkstruct-1.mod" />
+ <entity publicid="-//W3C//ELEMENTS XHTML Client-side Image Maps 1.0//EN" location="src/xslt/dtd/xhtml-csismap-1.mod" />
+ <entity publicid="-//W3C//ELEMENTS XHTML Document Structure 1.0//EN" location="src/xslt/dtd/xhtml-struct-1.mod" />
+ <entity publicid="-//W3C//ELEMENTS XHTML Editing Elements 1.0//EN" location="src/xslt/dtd/xhtml-edit-1.mod" />
+ <entity publicid="-//W3C//ELEMENTS XHTML Editing Markup 1.0//EN" location="src/xslt/dtd/xhtml-edit-1.mod" />
+ <entity publicid="-//W3C//ELEMENTS XHTML Embedded Object 1.0//EN" location="src/xslt/dtd/xhtml-object-1.mod" />
+ <entity publicid="-//W3C//ELEMENTS XHTML Forms 1.0//EN" location="src/xslt/dtd/xhtml-form-1.mod" />
+ <entity publicid="-//W3C//ELEMENTS XHTML Frames 1.0//EN" location="src/xslt/dtd/xhtml-frames-1.mod" />
+ <entity publicid="-//W3C//ELEMENTS XHTML Hypertext 1.0//EN" location="src/xslt/dtd/xhtml-hypertext-1.mod" />
+ <entity publicid="-//W3C//ELEMENTS XHTML Images 1.0//EN" location="src/xslt/dtd/xhtml-image-1.mod" />
+ <entity publicid="-//W3C//ELEMENTS XHTML Inline Frame Element 1.0//EN" location="src/xslt/dtd/xhtml-iframe-1.mod" />
+ <entity publicid="-//W3C//ELEMENTS XHTML Inline Phrasal 1.0//EN" location="src/xslt/dtd/xhtml-inlphras-1.mod" />
+ <entity publicid="-//W3C//ELEMENTS XHTML Inline Presentation 1.0//EN" location="src/xslt/dtd/xhtml-inlpres-1.mod" />
+ <entity publicid="-//W3C//ELEMENTS XHTML Inline Structural 1.0//EN" location="src/xslt/dtd/xhtml-inlstruct-1.mod" />
+ <entity publicid="-//W3C//ELEMENTS XHTML Inline Style 1.0//EN" location="src/xslt/dtd/xhtml-inlstyle-1.mod" />
+ <entity publicid="-//W3C//ELEMENTS XHTML Java Applets 1.0//EN" location="src/xslt/dtd/xhtml-applet-1.mod" />
+ <entity publicid="-//W3C//ELEMENTS XHTML Legacy Markup 1.0//EN" location="src/xslt/dtd/xhtml-legacy-1.mod" />
+ <entity publicid="-//W3C//ELEMENTS XHTML Link Element 1.0//EN" location="src/xslt/dtd/xhtml-link-1.mod" />
+ <entity publicid="-//W3C//ELEMENTS XHTML Lists 1.0//EN" location="src/xslt/dtd/xhtml-list-1.mod" />
+ <entity publicid="-//W3C//ELEMENTS XHTML Metainformation 1.0//EN" location="src/xslt/dtd/xhtml-meta-1.mod" />
+ <entity publicid="-//W3C//ELEMENTS XHTML Name Identifier 1.0//EN" location="src/xslt/dtd/xhtml-nameident-1.mod" />
+ <entity publicid="-//W3C//ELEMENTS XHTML Param Element 1.0//EN" location="src/xslt/dtd/xhtml-param-1.mod" />
+ <entity publicid="-//W3C//ELEMENTS XHTML Presentation 1.0//EN" location="src/xslt/dtd/xhtml-pres-1.mod" />
+ <entity publicid="-//W3C//ELEMENTS XHTML Ruby 1.0//EN" location="src/xslt/dtd/xhtml-ruby-1.mod"/>
+ <entity publicid="-//W3C//ELEMENTS XHTML Scripting 1.0//EN" location="src/xslt/dtd/xhtml-script-1.mod" />
+ <entity publicid="-//W3C//ELEMENTS XHTML Server-side Image Maps 1.0//EN" location="src/xslt/dtd/xhtml-ssismap-1.mod" />
+ <entity publicid="-//W3C//ELEMENTS XHTML Style Sheets 1.0//EN" location="src/xslt/dtd/xhtml-style-1.mod" />
+ <entity publicid="-//W3C//ELEMENTS XHTML Tables 1.0//EN" location="src/xslt/dtd/xhtml-table-1.mod" />
+ <entity publicid="-//W3C//ELEMENTS XHTML Target 1.0//EN" location="src/xslt/dtd/xhtml-target-1.mod" />
+ <entity publicid="-//W3C//ELEMENTS XHTML Text 1.0//EN" location="src/xslt/dtd/xhtml-text-1.mod" />
+ <entity publicid="-//W3C//ENTITIES Latin 1 for XHTML//EN" location="src/xslt/dtd/xhtml-lat1.ent" />
+ <entity publicid="-//W3C//ENTITIES Special for XHTML//EN" location="src/xslt/dtd/xhtml-special.ent" />
+ <entity publicid="-//W3C//ENTITIES Symbols for XHTML//EN" location="src/xslt/dtd/xhtml-symbol.ent" />
+ <entity publicid="-//W3C//ENTITIES XHTML 1.1 Document Model 1.0//EN" location="src/xslt/dtd/xhtml11-model-1.mod" />
+ <entity publicid="-//W3C//ENTITIES XHTML 1.1 Modular Framework 1.0//EN" location="src/xslt/dtd/template.dtd" />
+ <entity publicid="-//W3C//ENTITIES XHTML Character Entities 1.0//EN" location="src/xslt/dtd/xhtml-charent-1.mod" />
+ <entity publicid="-//W3C//ENTITIES XHTML Common Attributes 1.0//EN" location="src/xslt/dtd/xhtml-attribs-1.mod" />
+ <entity publicid="-//W3C//ENTITIES XHTML Datatypes 1.0//EN" location="src/xslt/dtd/xhtml-datatypes-1.mod" />
+ <entity publicid="-//W3C//ENTITIES XHTML Inline Style 1.0//EN" location="src/xslt/dtd/xhtml-inlstyle-1.mod" />
+ <entity publicid="-//W3C//ENTITIES XHTML Intrinsic Events 1.0//EN" location="src/xslt/dtd/xhtml-events-1.mod" />
+ <entity publicid="-//W3C//ENTITIES XHTML Modular Framework 1.0//EN" location="src/xslt/dtd/xhtml-framework-1.mod" />
+ <entity publicid="-//W3C//ENTITIES XHTML Qualified Names 1.0//EN" location="src/xslt/dtd/xhtml-qname-1.mod" />
+ <entity publicid="-//W3C//NOTATIONS XHTML Notations 1.0//EN" location="src/xslt/dtd/xhtml-notations-1.mod" />
+</xmlcatalog>
Property changes on: trunk/src/doc/dtd/catalogForAnt.xml
___________________________________________________________________
Added: svn:mime-type
+ text/dtd
Added: svn:eol-style
+ LF
Added: trunk/src/doc/dtd/xhtml-applet-1.mod
===================================================================
--- trunk/src/doc/dtd/xhtml-applet-1.mod (rev 0)
+++ trunk/src/doc/dtd/xhtml-applet-1.mod 2009-08-21 19:58:17 UTC (rev 536)
@@ -0,0 +1,57 @@
+<!-- ...................................................................... -->
+<!-- XHTML Java Applet Module ............................................ -->
+<!-- file: xhtml-applet-1.mod
+
+ This is XHTML, a reformulation of HTML as a modular XML application.
+ Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+ Revision: $Id: xhtml-applet-1.mod,v 3.1 2000/11/15 22:02:08 altheim Exp $ SMI
+
+ This DTD module is identified by the PUBLIC and SYSTEM identifiers:
+
+ PUBLIC "-//W3C//ELEMENTS XHTML Java Applets 1.0//EN"
+ SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-applet-1.mod"
+
+ Revisions:
+ (none)
+ ....................................................................... -->
+
+<!-- Java Applets
+
+ applet
+
+ This module declares the applet element type and its attributes,
+ used to provide support for Java applets. The 'alt' attribute
+ is now required (as it is on images). One of either code or
+ object attributes must be present. In the document, place param
+ elements before other content within the <applet> element.
+
+ Note that use of this module requires instantiation of the
+ Param Element Module.
+-->
+
+<!-- applet: Java Applet ............................... -->
+
+<!ENTITY % applet.element "INCLUDE" >
+<![%applet.element;[
+<!ENTITY % applet.content
+ "( %param.qname; | %Flow.mix; | #PCDATA )*"
+>
+<!ENTITY % applet.qname "applet" >
+<!ELEMENT %applet.qname; %applet.content; >
+<!-- end of applet.element -->]]>
+
+<!ENTITY % applet.attlist "INCLUDE" >
+<![%applet.attlist;[
+<!ATTLIST %applet.qname;
+ %Core.attrib;
+ alt %Text.datatype; #REQUIRED
+ archive CDATA #IMPLIED
+ code CDATA #IMPLIED
+ codebase %URI.datatype; #IMPLIED
+ object CDATA #IMPLIED
+ width %Length.datatype; #REQUIRED
+ height %Length.datatype; #REQUIRED
+>
+<!-- end of applet.attlist -->]]>
+
+<!-- end of xhtml-applet-1.mod -->
Property changes on: trunk/src/doc/dtd/xhtml-applet-1.mod
___________________________________________________________________
Added: svn:mime-type
+ text/dtd
Added: svn:eol-style
+ LF
Added: trunk/src/doc/dtd/xhtml-arch-1.mod
===================================================================
--- trunk/src/doc/dtd/xhtml-arch-1.mod (rev 0)
+++ trunk/src/doc/dtd/xhtml-arch-1.mod 2009-08-21 19:58:17 UTC (rev 536)
@@ -0,0 +1,51 @@
+<!-- ...................................................................... -->
+<!-- XHTML Base Architecture Module ...................................... -->
+<!-- file: xhtml-arch-1.mod
+
+ This is XHTML, a reformulation of HTML as a modular XML application.
+ Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+ Revision: $Id: xhtml-arch-1.mod,v 3.0 2000/10/22 17:13:38 altheim Exp $ SMI
+
+ This DTD module is identified by the PUBLIC and SYSTEM identifiers:
+
+ PUBLIC "-//W3C//ELEMENTS XHTML Base Architecture 1.0//EN"
+ SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-arch-1.mod"
+
+ Revisions:
+ (none)
+ ....................................................................... -->
+
+<!-- This optional module includes declarations that enable XHTML to be used
+ as a base architecture according to the 'Architectural Forms Definition
+ Requirements' (Annex A.3, ISO/IEC 10744, 2nd edition). For more information
+ on use of architectural forms, see the HyTime web site at:
+
+ http://www.hytime.org/
+-->
+
+<?IS10744 ArcBase xhtml ?>
+
+<!NOTATION xhtml PUBLIC "-//W3C//NOTATION AFDR ARCBASE XHTML 1.1//EN" >
+
+<!-- Entity declaration for associated Architectural DTD
+-->
+<!ENTITY xhtml-arch.dtd
+ PUBLIC "-//W3C//DTD XHTML Architecture 1.1//EN"
+ "xhtml11-arch.dtd" >
+
+<?IS10744:arch xhtml
+ public-id = "-//W3C//NOTATION AFDR ARCBASE XHTML 1.1//EN"
+ dtd-public-id = "-//W3C//DTD XHTML 1.1//EN"
+ dtd-system-id = "xhtml11.dtd"
+ doc-elem-form = "html"
+ form-att = "html"
+ renamer-att = "htnames"
+ suppressor-att = "htsupp"
+ data-ignore-att = "htign"
+ auto = "ArcAuto"
+ options = "HtModReq HtModOpt"
+ HtModReq = "Framework Text Hypertext Lists Structure"
+ HtModOpt = "Standard"
+?>
+
+<!-- end of xhtml-arch-1.mod -->
Property changes on: trunk/src/doc/dtd/xhtml-arch-1.mod
___________________________________________________________________
Added: svn:mime-type
+ text/dtd
Added: svn:eol-style
+ LF
Added: trunk/src/doc/dtd/xhtml-attribs-1.mod
===================================================================
--- trunk/src/doc/dtd/xhtml-attribs-1.mod (rev 0)
+++ trunk/src/doc/dtd/xhtml-attribs-1.mod 2009-08-21 19:58:17 UTC (rev 536)
@@ -0,0 +1,78 @@
+<!-- ...................................................................... -->
+<!-- XHTML Common Attributes Module ...................................... -->
+<!-- file: xhtml-attribs-1.mod
+
+ This is XHTML, a reformulation of HTML as a modular XML application.
+ Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+ Revision: $Id: xhtml-attribs-1.mod,v 3.0 2000/10/22 17:13:38 altheim Exp $ SMI
+
+ This DTD module is identified by the PUBLIC and SYSTEM identifiers:
+
+ PUBLIC "-//W3C//ENTITIES XHTML Common Attributes 1.0//EN"
+ SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-attribs-1.mod"
+
+ Revisions:
+ (none)
+ ....................................................................... -->
+
+<!-- Common Attributes
+
+ This module declares many of the common attributes for the XHTML DTD.
+ %NS.decl.attrib; is declared in the XHTML Qname module.
+-->
+
+<!ENTITY % id.attrib
+ "id ID #IMPLIED"
+>
+
+<!ENTITY % class.attrib
+ "class NMTOKENS #IMPLIED"
+>
+
+<!ENTITY % title.attrib
+ "title %Text.datatype; #IMPLIED"
+>
+
+<!ENTITY % Core.extra.attrib "" >
+
+<!ENTITY % Core.attrib
+ "%XHTML.xmlns.attrib;
+ %id.attrib;
+ %class.attrib;
+ %title.attrib;
+ %Core.extra.attrib;"
+>
+
+<!ENTITY % lang.attrib
+ "xml:lang %LanguageCode.datatype; #IMPLIED"
+>
+
+<![%XHTML.bidi;[
+<!ENTITY % dir.attrib
+ "dir ( ltr | rtl ) #IMPLIED"
+>
+
+<!ENTITY % I18n.attrib
+ "%dir.attrib;
+ %lang.attrib;"
+>
+
+]]>
+<!ENTITY % I18n.attrib
+ "%lang.attrib;"
+>
+
+<!ENTITY % Common.extra.attrib "" >
+
+<!-- intrinsic event attributes declared previously
+-->
+<!ENTITY % Events.attrib "" >
+
+<!ENTITY % Common.attrib
+ "%Core.attrib;
+ %I18n.attrib;
+ %Events.attrib;
+ %Common.extra.attrib;"
+>
+
+<!-- end of xhtml-attribs-1.mod -->
Property changes on: trunk/src/doc/dtd/xhtml-attribs-1.mod
___________________________________________________________________
Added: svn:mime-type
+ text/dtd
Added: svn:eol-style
+ LF
Added: trunk/src/doc/dtd/xhtml-base-1.mod
===================================================================
--- trunk/src/doc/dtd/xhtml-base-1.mod (rev 0)
+++ trunk/src/doc/dtd/xhtml-base-1.mod 2009-08-21 19:58:17 UTC (rev 536)
@@ -0,0 +1,53 @@
+<!-- ...................................................................... -->
+<!-- XHTML Base Element Module ........................................... -->
+<!-- file: xhtml-base-1.mod
+
+ This is XHTML, a reformulation of HTML as a modular XML application.
+ Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+ Revision: $Id: xhtml-base-1.mod,v 3.0 2000/10/22 17:13:38 altheim Exp $ SMI
+
+ This DTD module is identified by the PUBLIC and SYSTEM identifiers:
+
+ PUBLIC "-//W3C//ELEMENTS XHTML Base Element 1.0//EN"
+ SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-base-1.mod"
+
+ Revisions:
+ (none)
+ ....................................................................... -->
+
+<!-- Base element
+
+ base
+
+ This module declares the base element type and its attributes,
+ used to define a base URI against which relative URIs in the
+ document will be resolved.
+
+ Note that this module also redeclares the content model for
+ the head element to include the base element.
+-->
+
+<!-- base: Document Base URI ........................... -->
+
+<!ENTITY % base.element "INCLUDE" >
+<![%base.element;[
+<!ENTITY % base.content "EMPTY" >
+<!ENTITY % base.qname "base" >
+<!ELEMENT %base.qname; %base.content; >
+<!-- end of base.element -->]]>
+
+<!ENTITY % base.attlist "INCLUDE" >
+<![%base.attlist;[
+<!ATTLIST %base.qname;
+ %XHTML.xmlns.attrib;
+ href %URI.datatype; #REQUIRED
+>
+<!-- end of base.attlist -->]]>
+
+<!ENTITY % head.content
+ "( %HeadOpts.mix;,
+ ( ( %title.qname;, %HeadOpts.mix;, ( %base.qname;, %HeadOpts.mix; )? )
+ | ( %base.qname;, %HeadOpts.mix;, ( %title.qname;, %HeadOpts.mix; ))))"
+>
+
+<!-- end of xhtml-base-1.mod -->
Property changes on: trunk/src/doc/dtd/xhtml-base-1.mod
___________________________________________________________________
Added: svn:mime-type
+ text/dtd
Added: svn:eol-style
+ LF
Added: trunk/src/doc/dtd/xhtml-basic-form-1.mod
===================================================================
--- trunk/src/doc/dtd/xhtml-basic-form-1.mod (rev 0)
+++ trunk/src/doc/dtd/xhtml-basic-form-1.mod 2009-08-21 19:58:17 UTC (rev 536)
@@ -0,0 +1,185 @@
+<!-- ...................................................................... -->
+<!-- XHTML Simplified Forms Module ....................................... -->
+<!-- file: xhtml-basic-form-1.mod
+
+ This is XHTML Basic, a proper subset of XHTML.
+ Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+ Revision: $Id: xhtml-basic-form-1.mod,v 3.0 2000/10/22 17:13:38 altheim Exp $ SMI
+
+ This DTD module is identified by the PUBLIC and SYSTEM identifiers:
+
+ PUBLIC "-//W3C//ELEMENTS XHTML Basic Forms 1.0//EN"
+ SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-basic-form-1.mod"
+
+ Revisions:
+ (none)
+ ....................................................................... -->
+
+<!-- Basic Forms
+
+ This forms module is based on the HTML 3.2 forms model, with
+ the WAI-requested addition of the label element. While this
+ module essentially mimics the content model and attributes of
+ HTML 3.2 forms, the element types declared herein also include
+ all HTML 4 common attributes.
+
+ form, label, input, select, option, textarea
+-->
+
+<!-- declare qualified element type names:
+-->
+<!ENTITY % form.qname "form" >
+<!ENTITY % label.qname "label" >
+<!ENTITY % input.qname "input" >
+<!ENTITY % select.qname "select" >
+<!ENTITY % option.qname "option" >
+<!ENTITY % textarea.qname "textarea" >
+
+<!-- %BlkNoForm.mix; includes all non-form block elements,
+ plus %Misc.class;
+-->
+<!ENTITY % BlkNoForm.mix
+ "%Heading.class;
+ | %List.class;
+ | %BlkStruct.class;
+ %BlkPhras.class;
+ %BlkPres.class;
+ | %table.qname;
+ %Block.extra;
+ %Misc.class;"
+>
+
+<!-- form: Form Element ................................ -->
+
+<!ENTITY % form.element "INCLUDE" >
+<![%form.element;[
+<!ENTITY % form.content
+ "( %BlkNoForm.mix; )+"
+>
+<!ELEMENT %form.qname; %form.content; >
+<!-- end of form.element -->]]>
+
+<!ENTITY % form.attlist "INCLUDE" >
+<![%form.attlist;[
+<!ATTLIST %form.qname;
+ %Common.attrib;
+ action %URI.datatype; #REQUIRED
+ method ( get | post ) 'get'
+ enctype %ContentType.datatype; 'application/x-www-form-urlencoded'
+>
+<!-- end of form.attlist -->]]>
+
+<!-- label: Form Field Label Text ...................... -->
+
+<!ENTITY % label.element "INCLUDE" >
+<![%label.element;[
+<!-- Each label must not contain more than ONE field
+-->
+<!ENTITY % label.content
+ "( #PCDATA
+ | %input.qname; | %select.qname; | %textarea.qname;
+ | %InlStruct.class;
+ %InlPhras.class;
+ %I18n.class;
+ %InlPres.class;
+ %InlSpecial.class;
+ %Misc.class; )*"
+>
+<!ELEMENT %label.qname; %label.content; >
+<!-- end of label.element -->]]>
+
+<!ENTITY % label.attlist "INCLUDE" >
+<![%label.attlist;[
+<!ATTLIST %label.qname;
+ %Common.attrib;
+ for IDREF #IMPLIED
+ accesskey %Character.datatype; #IMPLIED
+>
+<!-- end of label.attlist -->]]>
+
+<!-- input: Form Control ............................... -->
+
+<!ENTITY % input.element "INCLUDE" >
+<![%input.element;[
+<!ENTITY % input.content "EMPTY" >
+<!ELEMENT %input.qname; %input.content; >
+<!-- end of input.element -->]]>
+
+<!-- Basic Forms removes 'image' and 'file' input types.
+-->
+<!ENTITY % input.attlist "INCLUDE" >
+<![%input.attlist;[
+<!ENTITY % InputType.class
+ "( text | password | checkbox | radio
+ | submit | reset | hidden )"
+>
+<!-- attribute name required for all but submit & reset
+-->
+<!ATTLIST %input.qname;
+ %Common.attrib;
+ type %InputType.class; 'text'
+ name CDATA #IMPLIED
+ value CDATA #IMPLIED
+ checked ( checked ) #IMPLIED
+ size CDATA #IMPLIED
+ maxlength %Number.datatype; #IMPLIED
+ src %URI.datatype; #IMPLIED
+ accesskey %Character.datatype; #IMPLIED
+>
+<!-- end of input.attlist -->]]>
+
+<!-- select: Option Selector ........................... -->
+
+<!ENTITY % select.element "INCLUDE" >
+<![%select.element;[
+<!ENTITY % select.content "( %option.qname; )+" >
+<!ELEMENT %select.qname; %select.content; >
+<!-- end of select.element -->]]>
+
+<!ENTITY % select.attlist "INCLUDE" >
+<![%select.attlist;[
+<!ATTLIST %select.qname;
+ %Common.attrib;
+ name CDATA #IMPLIED
+ size %Number.datatype; #IMPLIED
+ multiple ( multiple ) #IMPLIED
+>
+<!-- end of select.attlist -->]]>
+
+<!-- option: Selectable Choice ......................... -->
+
+<!ENTITY % option.element "INCLUDE" >
+<![%option.element;[
+<!ENTITY % option.content "( #PCDATA )" >
+<!ELEMENT %option.qname; %option.content; >
+<!-- end of option.element -->]]>
+
+<!ENTITY % option.attlist "INCLUDE" >
+<![%option.attlist;[
+<!ATTLIST %option.qname;
+ %Common.attrib;
+ selected ( selected ) #IMPLIED
+ value CDATA #IMPLIED
+>
+<!-- end of option.attlist -->]]>
+
+<!-- textarea: Multi-Line Text Field ................... -->
+
+<!ENTITY % textarea.element "INCLUDE" >
+<![%textarea.element;[
+<!ENTITY % textarea.content "( #PCDATA )" >
+<!ELEMENT %textarea.qname; %textarea.content; >
+<!-- end of textarea.element -->]]>
+
+<!ENTITY % textarea.attlist "INCLUDE" >
+<![%textarea.attlist;[
+<!ATTLIST %textarea.qname;
+ %Common.attrib;
+ name CDATA #IMPLIED
+ rows %Number.datatype; #REQUIRED
+ cols %Number.datatype; #REQUIRED
+ accesskey %Character.datatype; #IMPLIED
+>
+<!-- end of textarea.attlist -->]]>
+
+<!-- end of xhtml-basic-form-1.mod -->
Property changes on: trunk/src/doc/dtd/xhtml-basic-form-1.mod
___________________________________________________________________
Added: svn:mime-type
+ text/dtd
Added: svn:eol-style
+ LF
Added: trunk/src/doc/dtd/xhtml-basic-table-1.mod
===================================================================
--- trunk/src/doc/dtd/xhtml-basic-table-1.mod (rev 0)
+++ trunk/src/doc/dtd/xhtml-basic-table-1.mod 2009-08-21 19:58:17 UTC (rev 536)
@@ -0,0 +1,166 @@
+<!-- ....................................................................... -->
+<!-- XHTML Basic Table Module ............................................. -->
+<!-- file: xhtml-basic-table-1.mod
+
+ This is XHTML Basic, a proper subset of XHTML.
+ Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+ Revision: $Id: xhtml-basic-table-1.mod,v 3.0 2000/10/22 17:13:38 altheim Exp $ SMI
+
+ This DTD module is identified by the PUBLIC and SYSTEM identifiers:
+
+ PUBLIC "-//W3C//ELEMENTS XHTML Basic Tables 1.0//EN"
+ SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-basic-table-1.mod"
+
+ Revisions:
+ (none)
+ ....................................................................... -->
+
+<!-- Basic Tables
+
+ table, caption, tr, th, td
+
+ This table module declares elements and attributes defining
+ a table model based fundamentally on features found in the
+ widely-deployed HTML 3.2 table model. While this module
+ mimics the content model and table attributes of HTML 3.2
+ tables, the element types declared herein also includes all
+ HTML 4 common and most of the HTML 4 table attributes.
+-->
+
+<!-- declare qualified element type names:
+-->
+<!ENTITY % table.qname "table" >
+<!ENTITY % caption.qname "caption" >
+<!ENTITY % tr.qname "tr" >
+<!ENTITY % th.qname "th" >
+<!ENTITY % td.qname "td" >
+
+<!-- horizontal alignment attributes for cell contents
+-->
+<!ENTITY % CellHAlign.attrib
+ "align ( left
+ | center
+ | right ) #IMPLIED"
+>
+
+<!-- vertical alignment attributes for cell contents
+-->
+<!ENTITY % CellVAlign.attrib
+ "valign ( top
+ | middle
+ | bottom ) #IMPLIED"
+>
+
+<!-- scope is simpler than axes attribute for common tables
+-->
+<!ENTITY % scope.attrib
+ "scope ( row | col ) #IMPLIED"
+>
+
+<!-- table: Table Element .............................. -->
+
+<!ENTITY % table.element "INCLUDE" >
+<![%table.element;[
+<!ENTITY % table.content
+ "( %caption.qname;?, %tr.qname;+ )"
+>
+<!ELEMENT %table.qname; %table.content; >
+<!-- end of table.element -->]]>
+
+<!ENTITY % table.attlist "INCLUDE" >
+<![%table.attlist;[
+<!ATTLIST %table.qname;
+ %Common.attrib;
+ summary %Text.datatype; #IMPLIED
+>
+<!-- end of table.attlist -->]]>
+
+<!-- caption: Table Caption ............................ -->
+
+<!ENTITY % caption.element "INCLUDE" >
+<![%caption.element;[
+<!ENTITY % caption.content
+ "( #PCDATA | %Inline.mix; )*"
+>
+<!ELEMENT %caption.qname; %caption.content; >
+<!-- end of caption.element -->]]>
+
+<!ENTITY % caption.attlist "INCLUDE" >
+<![%caption.attlist;[
+<!ATTLIST %caption.qname;
+ %Common.attrib;
+>
+<!-- end of caption.attlist -->]]>
+
+<!-- tr: Table Row ..................................... -->
+
+<!ENTITY % tr.element "INCLUDE" >
+<![%tr.element;[
+<!ENTITY % tr.content "( %th.qname; | %td.qname; )+" >
+<!ELEMENT %tr.qname; %tr.content; >
+<!-- end of tr.element -->]]>
+
+<!ENTITY % tr.attlist "INCLUDE" >
+<![%tr.attlist;[
+<!ATTLIST %tr.qname;
+ %Common.attrib;
+ %CellHAlign.attrib;
+ %CellVAlign.attrib;
+>
+<!-- end of tr.attlist -->]]>
+
+<!-- th: Table Header Cell ............................. -->
+
+<!-- th is for header cells, td for data,
+ but for cells acting as both use td
+-->
+
+<!ENTITY % th.element "INCLUDE" >
+<![%th.element;[
+<!ENTITY % th.content
+ "( #PCDATA | %FlowNoTable.mix; )*"
+>
+<!ELEMENT %th.qname; %th.content; >
+<!-- end of th.element -->]]>
+
+<!ENTITY % th.attlist "INCLUDE" >
+<![%th.attlist;[
+<!ATTLIST %th.qname;
+ %Common.attrib;
+ abbr %Text.datatype; #IMPLIED
+ axis CDATA #IMPLIED
+ headers IDREFS #IMPLIED
+ %scope.attrib;
+ rowspan %Number.datatype; '1'
+ colspan %Number.datatype; '1'
+ %CellHAlign.attrib;
+ %CellVAlign.attrib;
+>
+<!-- end of th.attlist -->]]>
+
+<!-- td: Table Data Cell ............................... -->
+
+<!ENTITY % td.element "INCLUDE" >
+<![%td.element;[
+<!ENTITY % td.content
+ "( #PCDATA | %FlowNoTable.mix; )*"
+>
+<!ELEMENT %td.qname; %td.content; >
+<!-- end of td.element -->]]>
+
+<!ENTITY % td.attlist "INCLUDE" >
+<![%td.attlist;[
+<!ATTLIST %td.qname;
+ %Common.attrib;
+ abbr %Text.datatype; #IMPLIED
+ axis CDATA #IMPLIED
+ headers IDREFS #IMPLIED
+ %scope.attrib;
+ rowspan %Number.datatype; '1'
+ colspan %Number.datatype; '1'
+ %CellHAlign.attrib;
+ %CellVAlign.attrib;
+>
+<!-- end of td.attlist -->]]>
+
+<!-- end of xhtml-basic-table-1.mod -->
Property changes on: trunk/src/doc/dtd/xhtml-basic-table-1.mod
___________________________________________________________________
Added: svn:mime-type
+ text/dtd
Added: svn:eol-style
+ LF
Added: trunk/src/doc/dtd/xhtml-bdo-1.mod
===================================================================
--- trunk/src/doc/dtd/xhtml-bdo-1.mod (rev 0)
+++ trunk/src/doc/dtd/xhtml-bdo-1.mod 2009-08-21 19:58:17 UTC (rev 536)
@@ -0,0 +1,47 @@
+<!-- ...................................................................... -->
+<!-- XHTML BDO Element Module ............................................. -->
+<!-- file: xhtml-bdo-1.mod
+
+ This is XHTML, a reformulation of HTML as a modular XML application.
+ Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+ Revision: $Id: xhtml-bdo-1.mod,v 3.0 2000/10/22 17:13:38 altheim Exp $ SMI
+
+ This DTD module is identified by the PUBLIC and SYSTEM identifiers:
+
+ PUBLIC "-//W3C//ELEMENTS XHTML BDO Element 1.0//EN"
+ SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-bdo-1.mod"
+
+ Revisions:
+ (none)
+ ....................................................................... -->
+
+<!-- Bidirectional Override (bdo) Element
+
+ This modules declares the element 'bdo', used to override the
+ Unicode bidirectional algorithm for selected fragments of text.
+
+ DEPENDENCIES:
+ Relies on the conditional section keyword %XHTML.bidi; declared
+ as "INCLUDE". Bidirectional text support includes both the bdo
+ element and the 'dir' attribute.
+-->
+
+<!ENTITY % bdo.element "INCLUDE" >
+<![%bdo.element;[
+<!ENTITY % bdo.content
+ "( #PCDATA | %Inline.mix; )*"
+>
+<!ENTITY % bdo.qname "bdo" >
+<!ELEMENT %bdo.qname; %bdo.content; >
+<!-- end of bdo.element -->]]>
+
+<!ENTITY % bdo.attlist "INCLUDE" >
+<![%bdo.attlist;[
+<!ATTLIST %bdo.qname;
+ %Core.attrib;
+ xml:lang %LanguageCode.datatype; #IMPLIED
+ dir ( ltr | rtl ) #REQUIRED
+>
+]]>
+
+<!-- end of xhtml-bdo-1.mod -->
Property changes on: trunk/src/doc/dtd/xhtml-bdo-1.mod
___________________________________________________________________
Added: svn:mime-type
+ text/dtd
Added: svn:eol-style
+ LF
Added: trunk/src/doc/dtd/xhtml-blkphras-1.mod
===================================================================
--- trunk/src/doc/dtd/xhtml-blkphras-1.mod (rev 0)
+++ trunk/src/doc/dtd/xhtml-blkphras-1.mod 2009-08-21 19:58:17 UTC (rev 536)
@@ -0,0 +1,164 @@
+<!-- ...................................................................... -->
+<!-- XHTML Block Phrasal Module .......................................... -->
+<!-- file: xhtml-blkphras-1.mod
+
+ This is XHTML, a reformulation of HTML as a modular XML application.
+ Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+ Revision: $Id: xhtml-blkphras-1.mod,v 3.0 2000/10/22 17:13:38 altheim Exp $ SMI
+
+ This DTD module is identified by the PUBLIC and SYSTEM identifiers:
+
+ PUBLIC "-//W3C//ELEMENTS XHTML Block Phrasal 1.0//EN"
+ SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-blkphras-1.mod"
+
+ Revisions:
+ (none)
+ ....................................................................... -->
+
+<!-- Block Phrasal
+
+ address, blockquote, pre, h1, h2, h3, h4, h5, h6
+
+ This module declares the elements and their attributes used to
+ support block-level phrasal markup.
+-->
+
+<!ENTITY % address.element "INCLUDE" >
+<![%address.element;[
+<!ENTITY % address.content
+ "( #PCDATA | %Inline.mix; )*" >
+<!ENTITY % address.qname "address" >
+<!ELEMENT %address.qname; %address.content; >
+<!-- end of address.element -->]]>
+
+<!ENTITY % address.attlist "INCLUDE" >
+<![%address.attlist;[
+<!ATTLIST %address.qname;
+ %Common.attrib;
+>
+<!-- end of address.attlist -->]]>
+
+<!ENTITY % blockquote.element "INCLUDE" >
+<![%blockquote.element;[
+<!ENTITY % blockquote.content
+ "( %Block.mix; )+"
+>
+<!ENTITY % blockquote.qname "blockquote" >
+<!ELEMENT %blockquote.qname; %blockquote.content; >
+<!-- end of blockquote.element -->]]>
+
+<!ENTITY % blockquote.attlist "INCLUDE" >
+<![%blockquote.attlist;[
+<!ATTLIST %blockquote.qname;
+ %Common.attrib;
+ cite %URI.datatype; #IMPLIED
+>
+<!-- end of blockquote.attlist -->]]>
+
+<!ENTITY % pre.element "INCLUDE" >
+<![%pre.element;[
+<!ENTITY % pre.content
+ "( #PCDATA
+ | %InlStruct.class;
+ %InlPhras.class;
+ | %tt.qname; | %i.qname; | %b.qname;
+ %I18n.class;
+ %Anchor.class;
+ | %script.qname; | %map.qname;
+ %Inline.extra; )*"
+>
+<!ENTITY % pre.qname "pre" >
+<!ELEMENT %pre.qname; %pre.content; >
+<!-- end of pre.element -->]]>
+
+<!ENTITY % pre.attlist "INCLUDE" >
+<![%pre.attlist;[
+<!ATTLIST %pre.qname;
+ %Common.attrib;
+ xml:space ( preserve ) #FIXED 'preserve'
+>
+<!-- end of pre.attlist -->]]>
+
+<!-- ................... Heading Elements ................... -->
+
+<!ENTITY % Heading.content "( #PCDATA | %Inline.mix; )*" >
+
+<!ENTITY % h1.element "INCLUDE" >
+<![%h1.element;[
+<!ENTITY % h1.qname "h1" >
+<!ELEMENT %h1.qname; %Heading.content; >
+<!-- end of h1.element -->]]>
+
+<!ENTITY % h1.attlist "INCLUDE" >
+<![%h1.attlist;[
+<!ATTLIST %h1.qname;
+ %Common.attrib;
+>
+<!-- end of h1.attlist -->]]>
+
+<!ENTITY % h2.element "INCLUDE" >
+<![%h2.element;[
+<!ENTITY % h2.qname "h2" >
+<!ELEMENT %h2.qname; %Heading.content; >
+<!-- end of h2.element -->]]>
+
+<!ENTITY % h2.attlist "INCLUDE" >
+<![%h2.attlist;[
+<!ATTLIST %h2.qname;
+ %Common.attrib;
+>
+<!-- end of h2.attlist -->]]>
+
+<!ENTITY % h3.element "INCLUDE" >
+<![%h3.element;[
+<!ENTITY % h3.qname "h3" >
+<!ELEMENT %h3.qname; %Heading.content; >
+<!-- end of h3.element -->]]>
+
+<!ENTITY % h3.attlist "INCLUDE" >
+<![%h3.attlist;[
+<!ATTLIST %h3.qname;
+ %Common.attrib;
+>
+<!-- end of h3.attlist -->]]>
+
+<!ENTITY % h4.element "INCLUDE" >
+<![%h4.element;[
+<!ENTITY % h4.qname "h4" >
+<!ELEMENT %h4.qname; %Heading.content; >
+<!-- end of h4.element -->]]>
+
+<!ENTITY % h4.attlist "INCLUDE" >
+<![%h4.attlist;[
+<!ATTLIST %h4.qname;
+ %Common.attrib;
+>
+<!-- end of h4.attlist -->]]>
+
+<!ENTITY % h5.element "INCLUDE" >
+<![%h5.element;[
+<!ENTITY % h5.qname "h5" >
+<!ELEMENT %h5.qname; %Heading.content; >
+<!-- end of h5.element -->]]>
+
+<!ENTITY % h5.attlist "INCLUDE" >
+<![%h5.attlist;[
+<!ATTLIST %h5.qname;
+ %Common.attrib;
+>
+<!-- end of h5.attlist -->]]>
+
+<!ENTITY % h6.element "INCLUDE" >
+<![%h6.element;[
+<!ENTITY % h6.qname "h6" >
+<!ELEMENT %h6.qname; %Heading.content; >
+<!-- end of h6.element -->]]>
+
+<!ENTITY % h6.attlist "INCLUDE" >
+<![%h6.attlist;[
+<!ATTLIST %h6.qname;
+ %Common.attrib;
+>
+<!-- end of h6.attlist -->]]>
+
+<!-- end of xhtml-blkphras-1.mod -->
Property changes on: trunk/src/doc/dtd/xhtml-blkphras-1.mod
___________________________________________________________________
Added: svn:mime-type
+ text/dtd
Added: svn:eol-style
+ LF
Added: trunk/src/doc/dtd/xhtml-blkpres-1.mod
===================================================================
--- trunk/src/doc/dtd/xhtml-blkpres-1.mod (rev 0)
+++ trunk/src/doc/dtd/xhtml-blkpres-1.mod 2009-08-21 19:58:17 UTC (rev 536)
@@ -0,0 +1,40 @@
+<!-- ...................................................................... -->
+<!-- XHTML Block Presentation Module ..................................... -->
+<!-- file: xhtml-blkpres-1.mod
+
+ This is XHTML, a reformulation of HTML as a modular XML application.
+ Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+ Revision: $Id: xhtml-blkpres-1.mod,v 3.0 2000/10/22 17:13:38 altheim Exp $ SMI
+
+ This DTD module is identified by the PUBLIC and SYSTEM identifiers:
+
+ PUBLIC "-//W3C//ELEMENTS XHTML Block Presentation 1.0//EN"
+ SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-blkpres-1.mod"
+
+ Revisions:
+ (none)
+ ....................................................................... -->
+
+<!-- Block Presentational Elements
+
+ hr
+
+ This module declares the elements and their attributes used to
+ support block-level presentational markup.
+-->
+
+<!ENTITY % hr.element "INCLUDE" >
+<![%hr.element;[
+<!ENTITY % hr.content "EMPTY" >
+<!ENTITY % hr.qname "hr" >
+<!ELEMENT %hr.qname; %hr.content; >
+<!-- end of hr.element -->]]>
+
+<!ENTITY % hr.attlist "INCLUDE" >
+<![%hr.attlist;[
+<!ATTLIST %hr.qname;
+ %Common.attrib;
+>
+<!-- end of hr.attlist -->]]>
+
+<!-- end of xhtml-blkpres-1.mod -->
Property changes on: trunk/src/doc/dtd/xhtml-blkpres-1.mod
___________________________________________________________________
Added: svn:mime-type
+ text/dtd
Added: svn:eol-style
+ LF
Added: trunk/src/doc/dtd/xhtml-blkstruct-1.mod
===================================================================
--- trunk/src/doc/dtd/xhtml-blkstruct-1.mod (rev 0)
+++ trunk/src/doc/dtd/xhtml-blkstruct-1.mod 2009-08-21 19:58:17 UTC (rev 536)
@@ -0,0 +1,57 @@
+<!-- ...................................................................... -->
+<!-- XHTML Block Structural Module ....................................... -->
+<!-- file: xhtml-blkstruct-1.mod
+
+ This is XHTML, a reformulation of HTML as a modular XML application.
+ Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+ Revision: $Id: xhtml-blkstruct-1.mod,v 3.1 2000/11/15 22:02:08 altheim Exp $ SMI
+
+ This DTD module is identified by the PUBLIC and SYSTEM identifiers:
+
+ PUBLIC "-//W3C//ELEMENTS XHTML Block Structural 1.0//EN"
+ SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-blkstruct-1.mod"
+
+ Revisions:
+ (none)
+ ....................................................................... -->
+
+<!-- Block Structural
+
+ div, p
+
+ This module declares the elements and their attributes used to
+ support block-level structural markup.
+-->
+
+<!ENTITY % div.element "INCLUDE" >
+<![%div.element;[
+<!ENTITY % div.content
+ "( #PCDATA | %Flow.mix; )*"
+>
+<!ENTITY % div.qname "div" >
+<!ELEMENT %div.qname; %div.content; >
+<!-- end of div.element -->]]>
+
+<!ENTITY % div.attlist "INCLUDE" >
+<![%div.attlist;[
+<!ATTLIST %div.qname;
+ %Common.attrib;
+>
+<!-- end of div.attlist -->]]>
+
+<!ENTITY % p.element "INCLUDE" >
+<![%p.element;[
+<!ENTITY % p.content
+ "( #PCDATA | %Inline.mix; )*" >
+<!ENTITY % p.qname "p" >
+<!ELEMENT %p.qname; %p.content; >
+<!-- end of p.element -->]]>
+
+<!ENTITY % p.attlist "INCLUDE" >
+<![%p.attlist;[
+<!ATTLIST %p.qname;
+ %Common.attrib;
+>
+<!-- end of p.attlist -->]]>
+
+<!-- end of xhtml-blkstruct-1.mod -->
Property changes on: trunk/src/doc/dtd/xhtml-blkstruct-1.mod
___________________________________________________________________
Added: svn:mime-type
+ text/dtd
Added: svn:eol-style
+ LF
Added: trunk/src/doc/dtd/xhtml-charent-1.mod
===================================================================
--- trunk/src/doc/dtd/xhtml-charent-1.mod (rev 0)
+++ trunk/src/doc/dtd/xhtml-charent-1.mod 2009-08-21 19:58:17 UTC (rev 536)
@@ -0,0 +1,38 @@
+<!-- ...................................................................... -->
+<!-- XHTML Character Entities Module ......................................... -->
+<!-- file: xhtml-charent-1.mod
+
+ This is XHTML, a reformulation of HTML as a modular XML application.
+ Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+ Revision: $Id: xhtml-charent-1.mod,v 3.0 2000/10/22 17:13:38 altheim Exp $ SMI
+
+ This DTD module is identified by the PUBLIC and SYSTEM identifiers:
+
+ PUBLIC "-//W3C//ENTITIES XHTML Character Entities 1.0//EN"
+ SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-charent-1.mod"
+
+ Revisions:
+ (none)
+ ....................................................................... -->
+
+<!-- Character Entities for XHTML
+
+ This module declares the set of character entities for XHTML,
+ including the Latin 1, Symbol and Special character collections.
+-->
+
+<!ENTITY % xhtml-lat1
+ PUBLIC "-//W3C//ENTITIES Latin 1 for XHTML//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml-lat1.ent" >
+<!ENTITY % xhtml-symbol
+ PUBLIC "-//W3C//ENTITIES Symbols for XHTML//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml-symbol.ent" >
+<!ENTITY % xhtml-special
+ PUBLIC "-//W3C//ENTITIES Special for XHTML//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml-special.ent" >
+
+%xhtml-lat1;
+%xhtml-symbol;
+%xhtml-special;
+
+<!-- end of xhtml-charent-1.mod -->
Property changes on: trunk/src/doc/dtd/xhtml-charent-1.mod
___________________________________________________________________
Added: svn:mime-type
+ text/dtd
Added: svn:eol-style
+ LF
Added: trunk/src/doc/dtd/xhtml-csismap-1.mod
===================================================================
--- trunk/src/doc/dtd/xhtml-csismap-1.mod (rev 0)
+++ trunk/src/doc/dtd/xhtml-csismap-1.mod 2009-08-21 19:58:17 UTC (rev 536)
@@ -0,0 +1,114 @@
+<!-- ...................................................................... -->
+<!-- XHTML Client-side Image Map Module .................................. -->
+<!-- file: xhtml-csismap-1.mod
+
+ This is XHTML, a reformulation of HTML as a modular XML application.
+ Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+ Revision: $Id: xhtml-csismap-1.mod,v 3.0 2000/10/22 17:13:38 altheim Exp $ SMI
+
+ This DTD module is identified by the PUBLIC and SYSTEM identifiers:
+
+ PUBLIC "-//W3C//ELEMENTS XHTML Client-side Image Maps 1.0//EN"
+ SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-csismap-1.mod"
+
+ Revisions:
+ (none)
+ ....................................................................... -->
+
+<!-- Client-side Image Maps
+
+ area, map
+
+ This module declares elements and attributes to support client-side
+ image maps. This requires that the Image Module (or a module
+ declaring the img element type) be included in the DTD.
+
+ These can be placed in the same document or grouped in a
+ separate document, although the latter isn't widely supported
+-->
+
+<!ENTITY % area.element "INCLUDE" >
+<![%area.element;[
+<!ENTITY % area.content "EMPTY" >
+<!ENTITY % area.qname "area" >
+<!ELEMENT %area.qname; %area.content; >
+<!-- end of area.element -->]]>
+
+<!ENTITY % Shape.datatype "( rect | circle | poly | default )">
+<!ENTITY % Coords.datatype "CDATA" >
+
+<!ENTITY % area.attlist "INCLUDE" >
+<![%area.attlist;[
+<!ATTLIST %area.qname;
+ %Common.attrib;
+ href %URI.datatype; #IMPLIED
+ shape %Shape.datatype; 'rect'
+ coords %Coords.datatype; #IMPLIED
+ nohref ( nohref ) #IMPLIED
+ alt %Text.datatype; #REQUIRED
+ tabindex %Number.datatype; #IMPLIED
+ accesskey %Character.datatype; #IMPLIED
+>
+<!-- end of area.attlist -->]]>
+
+<!-- modify anchor attribute definition list
+ to allow for client-side image maps
+-->
+<!ATTLIST %a.qname;
+ shape %Shape.datatype; 'rect'
+ coords %Coords.datatype; #IMPLIED
+>
+
+<!-- modify img attribute definition list
+ to allow for client-side image maps
+-->
+<!ATTLIST %img.qname;
+ usemap IDREF #IMPLIED
+>
+
+<!-- modify form input attribute definition list
+ to allow for client-side image maps
+-->
+<!ATTLIST %input.qname;
+ usemap IDREF #IMPLIED
+>
+
+<!-- modify object attribute definition list
+ to allow for client-side image maps
+-->
+<!ATTLIST %object.qname;
+ usemap IDREF #IMPLIED
+>
+
+<!-- 'usemap' points to the 'id' attribute of a <map> element,
+ which must be in the same document; support for external
+ document maps was not widely supported in HTML and is
+ eliminated in XHTML.
+
+ It is considered an error for the element pointed to by
+ a usemap IDREF to occur in anything but a <map> element.
+-->
+
+<!ENTITY % map.element "INCLUDE" >
+<![%map.element;[
+<!ENTITY % map.content
+ "(( %Block.mix; ) | %area.qname; )+"
+>
+<!ENTITY % map.qname "map" >
+<!ELEMENT %map.qname; %map.content; >
+<!-- end of map.element -->]]>
+
+<!ENTITY % map.attlist "INCLUDE" >
+<![%map.attlist;[
+<!ATTLIST %map.qname;
+ %XHTML.xmlns.attrib;
+ id ID #REQUIRED
+ %class.attrib;
+ %title.attrib;
+ %Core.extra.attrib;
+ %I18n.attrib;
+ %Events.attrib;
+>
+<!-- end of map.attlist -->]]>
+
+<!-- end of xhtml-csismap-1.mod -->
Property changes on: trunk/src/doc/dtd/xhtml-csismap-1.mod
___________________________________________________________________
Added: svn:mime-type
+ text/dtd
Added: svn:eol-style
+ LF
Added: trunk/src/doc/dtd/xhtml-datatypes-1.mod
===================================================================
--- trunk/src/doc/dtd/xhtml-datatypes-1.mod (rev 0)
+++ trunk/src/doc/dtd/xhtml-datatypes-1.mod 2009-08-21 19:58:17 UTC (rev 536)
@@ -0,0 +1,82 @@
+<!-- ...................................................................... -->
+<!-- XHTML Datatypes Module .............................................. -->
+<!-- file: xhtml-datatypes-1.mod
+
+ This is XHTML, a reformulation of HTML as a modular XML application.
+ Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+ Revision: $Id: xhtml-datatypes-1.mod,v 3.0 2000/10/22 17:13:38 altheim Exp $ SMI
+
+ This DTD module is identified by the PUBLIC and SYSTEM identifiers:
+
+ PUBLIC "-//W3C//ENTITIES XHTML Datatypes 1.0//EN"
+ SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-datatypes-1.mod"
+
+ Revisions:
+ (none)
+ ....................................................................... -->
+
+<!-- Datatypes
+
+ defines containers for the following datatypes, many of
+ these imported from other specifications and standards.
+-->
+
+<!-- Length defined for cellpadding/cellspacing -->
+
+<!-- nn for pixels or nn% for percentage length -->
+<!ENTITY % Length.datatype "CDATA" >
+
+<!-- space-separated list of link types -->
+<!ENTITY % LinkTypes.datatype "NMTOKENS" >
+
+<!-- single or comma-separated list of media descriptors -->
+<!ENTITY % MediaDesc.datatype "CDATA" >
+
+<!-- pixel, percentage, or relative -->
+<!ENTITY % MultiLength.datatype "CDATA" >
+
+<!-- one or more digits (NUMBER) -->
+<!ENTITY % Number.datatype "CDATA" >
+
+<!-- integer representing length in pixels -->
+<!ENTITY % Pixels.datatype "CDATA" >
+
+<!-- script expression -->
+<!ENTITY % Script.datatype "CDATA" >
+
+<!-- textual content -->
+<!ENTITY % Text.datatype "CDATA" >
+
+<!-- Imported Datatypes ................................ -->
+
+<!-- a single character from [ISO10646] -->
+<!ENTITY % Character.datatype "CDATA" >
+
+<!-- a character encoding, as per [RFC2045] -->
+<!ENTITY % Charset.datatype "CDATA" >
+
+<!-- a space separated list of character encodings, as per [RFC2045] -->
+<!ENTITY % Charsets.datatype "CDATA" >
+
+<!-- media type, as per [RFC2045] -->
+<!ENTITY % ContentType.datatype "CDATA" >
+
+<!-- comma-separated list of media types, as per [RFC2045] -->
+<!ENTITY % ContentTypes.datatype "CDATA" >
+
+<!-- date and time information. ISO date format -->
+<!ENTITY % Datetime.datatype "CDATA" >
+
+<!-- formal public identifier, as per [ISO8879] -->
+<!ENTITY % FPI.datatype "CDATA" >
+
+<!-- a language code, as per [RFC1766] -->
+<!ENTITY % LanguageCode.datatype "NMTOKEN" >
+
+<!-- a Uniform Resource Identifier, see [URI] -->
+<!ENTITY % URI.datatype "CDATA" >
+
+<!-- a space-separated list of Uniform Resource Identifiers, see [URI] -->
+<!ENTITY % URIs.datatype "CDATA" >
+
+<!-- end of xhtml-datatypes-1.mod -->
Property changes on: trunk/src/doc/dtd/xhtml-datatypes-1.mod
___________________________________________________________________
Added: svn:mime-type
+ text/dtd
Added: svn:eol-style
+ LF
Added: trunk/src/doc/dtd/xhtml-edit-1.mod
===================================================================
--- trunk/src/doc/dtd/xhtml-edit-1.mod (rev 0)
+++ trunk/src/doc/dtd/xhtml-edit-1.mod 2009-08-21 19:58:17 UTC (rev 536)
@@ -0,0 +1,66 @@
+<!-- ...................................................................... -->
+<!-- XHTML Editing Elements Module ....................................... -->
+<!-- file: xhtml-edit-1.mod
+
+ This is XHTML, a reformulation of HTML as a modular XML application.
+ Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+ Revision: $Id: xhtml-edit-1.mod,v 3.0 2000/10/22 17:13:38 altheim Exp $ SMI
+
+ This DTD module is identified by the PUBLIC and SYSTEM identifiers:
+
+ PUBLIC "-//W3C//ELEMENTS XHTML Editing Markup 1.0//EN"
+ SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-edit-1.mod"
+
+ Revisions:
+ (none)
+ ....................................................................... -->
+
+<!-- Editing Elements
+
+ ins, del
+
+ This module declares element types and attributes used to indicate
+ inserted and deleted content while editing a document.
+-->
+
+<!-- ins: Inserted Text ............................... -->
+
+<!ENTITY % ins.element "INCLUDE" >
+<![%ins.element;[
+<!ENTITY % ins.content
+ "( #PCDATA | %Flow.mix; )*"
+>
+<!ENTITY % ins.qname "ins" >
+<!ELEMENT %ins.qname; %ins.content; >
+<!-- end of ins.element -->]]>
+
+<!ENTITY % ins.attlist "INCLUDE" >
+<![%ins.attlist;[
+<!ATTLIST %ins.qname;
+ %Common.attrib;
+ cite %URI.datatype; #IMPLIED
+ datetime %Datetime.datatype; #IMPLIED
+>
+<!-- end of ins.attlist -->]]>
+
+<!-- del: Deleted Text ................................ -->
+
+<!ENTITY % del.element "INCLUDE" >
+<![%del.element;[
+<!ENTITY % del.content
+ "( #PCDATA | %Flow.mix; )*"
+>
+<!ENTITY % del.qname "del" >
+<!ELEMENT %del.qname; %del.content; >
+<!-- end of del.element -->]]>
+
+<!ENTITY % del.attlist "INCLUDE" >
+<![%del.attlist;[
+<!ATTLIST %del.qname;
+ %Common.attrib;
+ cite %URI.datatype; #IMPLIED
+ datetime %Datetime.datatype; #IMPLIED
+>
+<!-- end of del.attlist -->]]>
+
+<!-- end of xhtml-edit-1.mod -->
Property changes on: trunk/src/doc/dtd/xhtml-edit-1.mod
___________________________________________________________________
Added: svn:mime-type
+ text/dtd
Added: svn:eol-style
+ LF
Added: trunk/src/doc/dtd/xhtml-events-1.mod
===================================================================
--- trunk/src/doc/dtd/xhtml-events-1.mod (rev 0)
+++ trunk/src/doc/dtd/xhtml-events-1.mod 2009-08-21 19:58:17 UTC (rev 536)
@@ -0,0 +1,120 @@
+<!-- ...................................................................... -->
+<!-- XHTML Intrinsic Events Module ....................................... -->
+<!-- file: xhtml-events-1.mod
+
+ This is XHTML, a reformulation of HTML as a modular XML application.
+ Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+ Revision: $Id: xhtml-events-1.mod,v 3.0 2000/10/22 17:13:38 altheim Exp $ SMI
+
+ This DTD module is identified by the PUBLIC and SYSTEM identifiers:
+
+ PUBLIC "-//W3C//ENTITIES XHTML Intrinsic Events 1.0//EN"
+ SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-events-1.mod"
+
+ Revisions:
+ (none)
+ ....................................................................... -->
+
+<!-- Intrinsic Event Attributes
+
+ These are the event attributes defined in HTML 4.0,
+ Section 18.2.3 "Intrinsic Events". This module must be
+ instantiated prior to the Attributes Module but after
+ the Datatype Module in the Modular Framework module.
+
+ "Note: Authors of HTML documents are advised that changes
+ are likely to occur in the realm of intrinsic events
+ (e.g., how scripts are bound to events). Research in
+ this realm is carried on by members of the W3C Document
+ Object Model Working Group (see the W3C Web site at
+ http://www.w3.org/ for more information)."
+-->
+<!-- NOTE: Because the ATTLIST declarations in this module occur
+ before their respective ELEMENT declarations in other
+ modules, there may be a dependency on this module that
+ should be considered if any of the parameter entities used
+ for element type names (eg., %foo.qname;) are redeclared.
+-->
+
+<!ENTITY % Events.attrib
+ "onclick %Script.datatype; #IMPLIED
+ ondblclick %Script.datatype; #IMPLIED
+ onmousedown %Script.datatype; #IMPLIED
+ onmouseup %Script.datatype; #IMPLIED
+ onmouseover %Script.datatype; #IMPLIED
+ onmousemove %Script.datatype; #IMPLIED
+ onmouseout %Script.datatype; #IMPLIED
+ onkeypress %Script.datatype; #IMPLIED
+ onkeydown %Script.datatype; #IMPLIED
+ onkeyup %Script.datatype; #IMPLIED"
+>
+
+<!-- additional attributes on anchor element
+-->
+<!ATTLIST %a.qname;
+ onfocus %Script.datatype; #IMPLIED
+ onblur %Script.datatype; #IMPLIED
+>
+
+<!-- additional attributes on form element
+-->
+<!ATTLIST %form.qname;
+ onsubmit %Script.datatype; #IMPLIED
+ onreset %Script.datatype; #IMPLIED
+>
+
+<!-- additional attributes on label element
+-->
+<!ATTLIST %label.qname;
+ onfocus %Script.datatype; #IMPLIED
+ onblur %Script.datatype; #IMPLIED
+>
+
+<!-- additional attributes on input element
+-->
+<!ATTLIST %input.qname;
+ onfocus %Script.datatype; #IMPLIED
+ onblur %Script.datatype; #IMPLIED
+ onselect %Script.datatype; #IMPLIED
+ onchange %Script.datatype; #IMPLIED
+>
+
+<!-- additional attributes on select element
+-->
+<!ATTLIST %select.qname;
+ onfocus %Script.datatype; #IMPLIED
+ onblur %Script.datatype; #IMPLIED
+ onchange %Script.datatype; #IMPLIED
+>
+
+<!-- additional attributes on textarea element
+-->
+<!ATTLIST %textarea.qname;
+ onfocus %Script.datatype; #IMPLIED
+ onblur %Script.datatype; #IMPLIED
+ onselect %Script.datatype; #IMPLIED
+ onchange %Script.datatype; #IMPLIED
+>
+
+<!-- additional attributes on button element
+-->
+<!ATTLIST %button.qname;
+ onfocus %Script.datatype; #IMPLIED
+ onblur %Script.datatype; #IMPLIED
+>
+
+<!-- additional attributes on body element
+-->
+<!ATTLIST %body.qname;
+ onload %Script.datatype; #IMPLIED
+ onunload %Script.datatype; #IMPLIED
+>
+
+<!-- additional attributes on area element
+-->
+<!ATTLIST %area.qname;
+ onfocus %Script.datatype; #IMPLIED
+ onblur %Script.datatype; #IMPLIED
+>
+
+<!-- end of xhtml-events-1.mod -->
Property changes on: trunk/src/doc/dtd/xhtml-events-1.mod
___________________________________________________________________
Added: svn:mime-type
+ text/dtd
Added: svn:eol-style
+ LF
Added: trunk/src/doc/dtd/xhtml-form-1.mod
===================================================================
--- trunk/src/doc/dtd/xhtml-form-1.mod (rev 0)
+++ trunk/src/doc/dtd/xhtml-form-1.mod 2009-08-21 19:58:17 UTC (rev 536)
@@ -0,0 +1,291 @@
+<!-- ...................................................................... -->
+<!-- XHTML Forms Module .................................................. -->
+<!-- file: xhtml-form-1.mod
+
+ This is XHTML, a reformulation of HTML as a modular XML application.
+ Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+ Revision: $Id: xhtml-form-1.mod,v 3.0 2000/10/22 17:13:38 altheim Exp $ SMI
+
+ This DTD module is identified by the PUBLIC and SYSTEM identifiers:
+
+ PUBLIC "-//W3C//ELEMENTS XHTML Forms 1.0//EN"
+ SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-form-1.mod"
+
+ Revisions:
+ (none)
+ ....................................................................... -->
+
+<!-- Forms
+
+ form, label, input, select, optgroup, option,
+ textarea, fieldset, legend, button
+
+ This module declares markup to provide support for online
+ form...
[truncated message content] |
|
From: <chr...@us...> - 2009-08-21 19:54:25
|
Revision: 535
http://aceunit.svn.sourceforge.net/aceunit/?rev=535&view=rev
Author: christianhujer
Date: 2009-08-21 19:54:15 +0000 (Fri, 21 Aug 2009)
Log Message:
-----------
Change dtd path.
Modified Paths:
--------------
trunk/src/doc/catalogForAnt.xml
Modified: trunk/src/doc/catalogForAnt.xml
===================================================================
--- trunk/src/doc/catalogForAnt.xml 2009-08-21 19:53:47 UTC (rev 534)
+++ trunk/src/doc/catalogForAnt.xml 2009-08-21 19:54:15 UTC (rev 535)
@@ -27,56 +27,56 @@
~ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-->
<xmlcatalog id="commonDTDs">
- <entity publicid="-//W3C//DTD XHTML 1.1//EN" location="src/doc/dtd/xhtml11.dtd" />
- <entity publicid="-//W3C//ELEMENTS XHTML Base Architecture 1.0//EN" location="src/doc/dtd/xhtml-arch-1.mod" />
- <entity publicid="-//W3C//ELEMENTS XHTML Base Element 1.0//EN" location="src/doc/dtd/xhtml-base-1.mod" />
- <entity publicid="-//W3C//ELEMENTS XHTML Basic Forms 1.0//EN" location="src/doc/dtd/xhtml-basic-form-1.mod" />
- <entity publicid="-//W3C//ELEMENTS XHTML Basic Tables 1.0//EN" location="src/doc/dtd/xhtml-basic-table-1.mod" />
- <entity publicid="-//W3C//ELEMENTS XHTML BDO Element 1.0//EN" location="src/doc/dtd/xhtml-bdo-1.mod" />
- <entity publicid="-//W3C//ELEMENTS XHTML BIDI Override Element 1.0//EN" location="src/doc/dtd/xhtml-bdo-1.mod" />
- <entity publicid="-//W3C//ELEMENTS XHTML Block Phrasal 1.0//EN" location="src/doc/dtd/xhtml-blkphras-1.mod" />
- <entity publicid="-//W3C//ELEMENTS XHTML Block Presentation 1.0//EN" location="src/doc/dtd/xhtml-blkpres-1.mod" />
- <entity publicid="-//W3C//ELEMENTS XHTML Block Structural 1.0//EN" location="src/doc/dtd/xhtml-blkstruct-1.mod" />
- <entity publicid="-//W3C//ELEMENTS XHTML Client-side Image Maps 1.0//EN" location="src/doc/dtd/xhtml-csismap-1.mod" />
- <entity publicid="-//W3C//ELEMENTS XHTML Document Structure 1.0//EN" location="src/doc/dtd/xhtml-struct-1.mod" />
- <entity publicid="-//W3C//ELEMENTS XHTML Editing Elements 1.0//EN" location="src/doc/dtd/xhtml-edit-1.mod" />
- <entity publicid="-//W3C//ELEMENTS XHTML Editing Markup 1.0//EN" location="src/doc/dtd/xhtml-edit-1.mod" />
- <entity publicid="-//W3C//ELEMENTS XHTML Embedded Object 1.0//EN" location="src/doc/dtd/xhtml-object-1.mod" />
- <entity publicid="-//W3C//ELEMENTS XHTML Forms 1.0//EN" location="src/doc/dtd/xhtml-form-1.mod" />
- <entity publicid="-//W3C//ELEMENTS XHTML Frames 1.0//EN" location="src/doc/dtd/xhtml-frames-1.mod" />
- <entity publicid="-//W3C//ELEMENTS XHTML Hypertext 1.0//EN" location="src/doc/dtd/xhtml-hypertext-1.mod" />
- <entity publicid="-//W3C//ELEMENTS XHTML Images 1.0//EN" location="src/doc/dtd/xhtml-image-1.mod" />
- <entity publicid="-//W3C//ELEMENTS XHTML Inline Frame Element 1.0//EN" location="src/doc/dtd/xhtml-iframe-1.mod" />
- <entity publicid="-//W3C//ELEMENTS XHTML Inline Phrasal 1.0//EN" location="src/doc/dtd/xhtml-inlphras-1.mod" />
- <entity publicid="-//W3C//ELEMENTS XHTML Inline Presentation 1.0//EN" location="src/doc/dtd/xhtml-inlpres-1.mod" />
- <entity publicid="-//W3C//ELEMENTS XHTML Inline Structural 1.0//EN" location="src/doc/dtd/xhtml-inlstruct-1.mod" />
- <entity publicid="-//W3C//ELEMENTS XHTML Inline Style 1.0//EN" location="src/doc/dtd/xhtml-inlstyle-1.mod" />
- <entity publicid="-//W3C//ELEMENTS XHTML Java Applets 1.0//EN" location="src/doc/dtd/xhtml-applet-1.mod" />
- <entity publicid="-//W3C//ELEMENTS XHTML Legacy Markup 1.0//EN" location="src/doc/dtd/xhtml-legacy-1.mod" />
- <entity publicid="-//W3C//ELEMENTS XHTML Link Element 1.0//EN" location="src/doc/dtd/xhtml-link-1.mod" />
- <entity publicid="-//W3C//ELEMENTS XHTML Lists 1.0//EN" location="src/doc/dtd/xhtml-list-1.mod" />
- <entity publicid="-//W3C//ELEMENTS XHTML Metainformation 1.0//EN" location="src/doc/dtd/xhtml-meta-1.mod" />
- <entity publicid="-//W3C//ELEMENTS XHTML Name Identifier 1.0//EN" location="src/doc/dtd/xhtml-nameident-1.mod" />
- <entity publicid="-//W3C//ELEMENTS XHTML Param Element 1.0//EN" location="src/doc/dtd/xhtml-param-1.mod" />
- <entity publicid="-//W3C//ELEMENTS XHTML Presentation 1.0//EN" location="src/doc/dtd/xhtml-pres-1.mod" />
- <entity publicid="-//W3C//ELEMENTS XHTML Ruby 1.0//EN" location="src/doc/dtd/xhtml-ruby-1.mod"/>
- <entity publicid="-//W3C//ELEMENTS XHTML Scripting 1.0//EN" location="src/doc/dtd/xhtml-script-1.mod" />
- <entity publicid="-//W3C//ELEMENTS XHTML Server-side Image Maps 1.0//EN" location="src/doc/dtd/xhtml-ssismap-1.mod" />
- <entity publicid="-//W3C//ELEMENTS XHTML Style Sheets 1.0//EN" location="src/doc/dtd/xhtml-style-1.mod" />
- <entity publicid="-//W3C//ELEMENTS XHTML Tables 1.0//EN" location="src/doc/dtd/xhtml-table-1.mod" />
- <entity publicid="-//W3C//ELEMENTS XHTML Target 1.0//EN" location="src/doc/dtd/xhtml-target-1.mod" />
- <entity publicid="-//W3C//ELEMENTS XHTML Text 1.0//EN" location="src/doc/dtd/xhtml-text-1.mod" />
- <entity publicid="-//W3C//ENTITIES Latin 1 for XHTML//EN" location="src/doc/dtd/xhtml-lat1.ent" />
- <entity publicid="-//W3C//ENTITIES Special for XHTML//EN" location="src/doc/dtd/xhtml-special.ent" />
- <entity publicid="-//W3C//ENTITIES Symbols for XHTML//EN" location="src/doc/dtd/xhtml-symbol.ent" />
- <entity publicid="-//W3C//ENTITIES XHTML 1.1 Document Model 1.0//EN" location="src/doc/dtd/xhtml11-model-1.mod" />
- <entity publicid="-//W3C//ENTITIES XHTML 1.1 Modular Framework 1.0//EN" location="src/doc/dtd/template.dtd" />
- <entity publicid="-//W3C//ENTITIES XHTML Character Entities 1.0//EN" location="src/doc/dtd/xhtml-charent-1.mod" />
- <entity publicid="-//W3C//ENTITIES XHTML Common Attributes 1.0//EN" location="src/doc/dtd/xhtml-attribs-1.mod" />
- <entity publicid="-//W3C//ENTITIES XHTML Datatypes 1.0//EN" location="src/doc/dtd/xhtml-datatypes-1.mod" />
- <entity publicid="-//W3C//ENTITIES XHTML Inline Style 1.0//EN" location="src/doc/dtd/xhtml-inlstyle-1.mod" />
- <entity publicid="-//W3C//ENTITIES XHTML Intrinsic Events 1.0//EN" location="src/doc/dtd/xhtml-events-1.mod" />
- <entity publicid="-//W3C//ENTITIES XHTML Modular Framework 1.0//EN" location="src/doc/dtd/xhtml-framework-1.mod" />
- <entity publicid="-//W3C//ENTITIES XHTML Qualified Names 1.0//EN" location="src/doc/dtd/xhtml-qname-1.mod" />
- <entity publicid="-//W3C//NOTATIONS XHTML Notations 1.0//EN" location="src/doc/dtd/xhtml-notations-1.mod" />
+ <entity publicid="-//W3C//DTD XHTML 1.1//EN" location="dtd/xhtml11.dtd" />
+ <entity publicid="-//W3C//ELEMENTS XHTML Base Architecture 1.0//EN" location="dtd/xhtml-arch-1.mod" />
+ <entity publicid="-//W3C//ELEMENTS XHTML Base Element 1.0//EN" location="dtd/xhtml-base-1.mod" />
+ <entity publicid="-//W3C//ELEMENTS XHTML Basic Forms 1.0//EN" location="dtd/xhtml-basic-form-1.mod" />
+ <entity publicid="-//W3C//ELEMENTS XHTML Basic Tables 1.0//EN" location="dtd/xhtml-basic-table-1.mod" />
+ <entity publicid="-//W3C//ELEMENTS XHTML BDO Element 1.0//EN" location="dtd/xhtml-bdo-1.mod" />
+ <entity publicid="-//W3C//ELEMENTS XHTML BIDI Override Element 1.0//EN" location="dtd/xhtml-bdo-1.mod" />
+ <entity publicid="-//W3C//ELEMENTS XHTML Block Phrasal 1.0//EN" location="dtd/xhtml-blkphras-1.mod" />
+ <entity publicid="-//W3C//ELEMENTS XHTML Block Presentation 1.0//EN" location="dtd/xhtml-blkpres-1.mod" />
+ <entity publicid="-//W3C//ELEMENTS XHTML Block Structural 1.0//EN" location="dtd/xhtml-blkstruct-1.mod" />
+ <entity publicid="-//W3C//ELEMENTS XHTML Client-side Image Maps 1.0//EN" location="dtd/xhtml-csismap-1.mod" />
+ <entity publicid="-//W3C//ELEMENTS XHTML Document Structure 1.0//EN" location="dtd/xhtml-struct-1.mod" />
+ <entity publicid="-//W3C//ELEMENTS XHTML Editing Elements 1.0//EN" location="dtd/xhtml-edit-1.mod" />
+ <entity publicid="-//W3C//ELEMENTS XHTML Editing Markup 1.0//EN" location="dtd/xhtml-edit-1.mod" />
+ <entity publicid="-//W3C//ELEMENTS XHTML Embedded Object 1.0//EN" location="dtd/xhtml-object-1.mod" />
+ <entity publicid="-//W3C//ELEMENTS XHTML Forms 1.0//EN" location="dtd/xhtml-form-1.mod" />
+ <entity publicid="-//W3C//ELEMENTS XHTML Frames 1.0//EN" location="dtd/xhtml-frames-1.mod" />
+ <entity publicid="-//W3C//ELEMENTS XHTML Hypertext 1.0//EN" location="dtd/xhtml-hypertext-1.mod" />
+ <entity publicid="-//W3C//ELEMENTS XHTML Images 1.0//EN" location="dtd/xhtml-image-1.mod" />
+ <entity publicid="-//W3C//ELEMENTS XHTML Inline Frame Element 1.0//EN" location="dtd/xhtml-iframe-1.mod" />
+ <entity publicid="-//W3C//ELEMENTS XHTML Inline Phrasal 1.0//EN" location="dtd/xhtml-inlphras-1.mod" />
+ <entity publicid="-//W3C//ELEMENTS XHTML Inline Presentation 1.0//EN" location="dtd/xhtml-inlpres-1.mod" />
+ <entity publicid="-//W3C//ELEMENTS XHTML Inline Structural 1.0//EN" location="dtd/xhtml-inlstruct-1.mod" />
+ <entity publicid="-//W3C//ELEMENTS XHTML Inline Style 1.0//EN" location="dtd/xhtml-inlstyle-1.mod" />
+ <entity publicid="-//W3C//ELEMENTS XHTML Java Applets 1.0//EN" location="dtd/xhtml-applet-1.mod" />
+ <entity publicid="-//W3C//ELEMENTS XHTML Legacy Markup 1.0//EN" location="dtd/xhtml-legacy-1.mod" />
+ <entity publicid="-//W3C//ELEMENTS XHTML Link Element 1.0//EN" location="dtd/xhtml-link-1.mod" />
+ <entity publicid="-//W3C//ELEMENTS XHTML Lists 1.0//EN" location="dtd/xhtml-list-1.mod" />
+ <entity publicid="-//W3C//ELEMENTS XHTML Metainformation 1.0//EN" location="dtd/xhtml-meta-1.mod" />
+ <entity publicid="-//W3C//ELEMENTS XHTML Name Identifier 1.0//EN" location="dtd/xhtml-nameident-1.mod" />
+ <entity publicid="-//W3C//ELEMENTS XHTML Param Element 1.0//EN" location="dtd/xhtml-param-1.mod" />
+ <entity publicid="-//W3C//ELEMENTS XHTML Presentation 1.0//EN" location="dtd/xhtml-pres-1.mod" />
+ <entity publicid="-//W3C//ELEMENTS XHTML Ruby 1.0//EN" location="dtd/xhtml-ruby-1.mod"/>
+ <entity publicid="-//W3C//ELEMENTS XHTML Scripting 1.0//EN" location="dtd/xhtml-script-1.mod" />
+ <entity publicid="-//W3C//ELEMENTS XHTML Server-side Image Maps 1.0//EN" location="dtd/xhtml-ssismap-1.mod" />
+ <entity publicid="-//W3C//ELEMENTS XHTML Style Sheets 1.0//EN" location="dtd/xhtml-style-1.mod" />
+ <entity publicid="-//W3C//ELEMENTS XHTML Tables 1.0//EN" location="dtd/xhtml-table-1.mod" />
+ <entity publicid="-//W3C//ELEMENTS XHTML Target 1.0//EN" location="dtd/xhtml-target-1.mod" />
+ <entity publicid="-//W3C//ELEMENTS XHTML Text 1.0//EN" location="dtd/xhtml-text-1.mod" />
+ <entity publicid="-//W3C//ENTITIES Latin 1 for XHTML//EN" location="dtd/xhtml-lat1.ent" />
+ <entity publicid="-//W3C//ENTITIES Special for XHTML//EN" location="dtd/xhtml-special.ent" />
+ <entity publicid="-//W3C//ENTITIES Symbols for XHTML//EN" location="dtd/xhtml-symbol.ent" />
+ <entity publicid="-//W3C//ENTITIES XHTML 1.1 Document Model 1.0//EN" location="dtd/xhtml11-model-1.mod" />
+ <entity publicid="-//W3C//ENTITIES XHTML 1.1 Modular Framework 1.0//EN" location="dtd/template.dtd" />
+ <entity publicid="-//W3C//ENTITIES XHTML Character Entities 1.0//EN" location="dtd/xhtml-charent-1.mod" />
+ <entity publicid="-//W3C//ENTITIES XHTML Common Attributes 1.0//EN" location="dtd/xhtml-attribs-1.mod" />
+ <entity publicid="-//W3C//ENTITIES XHTML Datatypes 1.0//EN" location="dtd/xhtml-datatypes-1.mod" />
+ <entity publicid="-//W3C//ENTITIES XHTML Inline Style 1.0//EN" location="dtd/xhtml-inlstyle-1.mod" />
+ <entity publicid="-//W3C//ENTITIES XHTML Intrinsic Events 1.0//EN" location="dtd/xhtml-events-1.mod" />
+ <entity publicid="-//W3C//ENTITIES XHTML Modular Framework 1.0//EN" location="dtd/xhtml-framework-1.mod" />
+ <entity publicid="-//W3C//ENTITIES XHTML Qualified Names 1.0//EN" location="dtd/xhtml-qname-1.mod" />
+ <entity publicid="-//W3C//NOTATIONS XHTML Notations 1.0//EN" location="dtd/xhtml-notations-1.mod" />
</xmlcatalog>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2009-08-21 19:53:56
|
Revision: 534
http://aceunit.svn.sourceforge.net/aceunit/?rev=534&view=rev
Author: christianhujer
Date: 2009-08-21 19:53:47 +0000 (Fri, 21 Aug 2009)
Log Message:
-----------
Updated history. (Note: Not really uptodate, recent versions still missing.)
Modified Paths:
--------------
trunk/src/doc/history.xhtml
Modified: trunk/src/doc/history.xhtml
===================================================================
--- trunk/src/doc/history.xhtml 2009-08-21 19:53:15 UTC (rev 533)
+++ trunk/src/doc/history.xhtml 2009-08-21 19:53:47 UTC (rev 534)
@@ -13,6 +13,36 @@
This is a documentation of the past releases and their changes.
</p>
<dl>
+ <dt>AceUnit 0.6.1</dt>
+ <dd>
+ Fix for [ 1879533 ] missing EOL at EOF makes Generator run out of heap space
+ </dd>
+ <dt>AceUnit 0.5.2</dt>
+ <dd>
+ Fix for [ 1879533 ] missing EOL at EOF makes Generator run out of heap space
+ </dd>
+ <dt>AceUnit 0.5.1</dt>
+ <dd>
+ Minor internal improvements
+ </dd>
+ <dt>AceUnit 0.4</dt>
+ <dd>
+ Made
+ </dd>
+ <dt>AceUnit 0.3.2</dt>
+ <dd>
+ Fixed compiler warnings / lint issues.
+ Fixed typo in generated define name.
+ </dd>
+ <dt>AceUnit 0.3.1</dt>
+ <dd>
+ Fixed compiler warnings / lint issues.
+ </dd>
+ <dt>AceUnit 0.3</dt>
+ <dd>
+ Major improvements in the design of the generator.
+ Higher configurability of assertions.
+ </dd>
<dt>AceUnit 0.2</dt>
<dd>
The embedded part is now running.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
