Menu
▾
▴
staticwiki-svn-commit — svn commits for staticwiki
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(2) |
Jul
(2) |
Aug
(16) |
Sep
(3) |
Oct
(14) |
Nov
(1) |
Dec
(3) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
(3) |
May
(3) |
Jun
(1) |
Jul
(2) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
(1) |
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
(5) |
Oct
|
Nov
|
Dec
|
|
From: <tri...@us...> - 2007-10-15 09:04:55
|
Revision: 32
http://staticwiki.svn.sourceforge.net/staticwiki/?rev=32&view=rev
Author: triathlon98
Date: 2007-10-15 02:04:54 -0700 (Mon, 15 Oct 2007)
Log Message:
-----------
switch to next version
Modified Paths:
--------------
trunk/pom.xml
trunk/staticwiki-editor/pom.xml
trunk/staticwiki-renderer/pom.xml
trunk/staticwiki-site-plugin/pom.xml
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2007-10-15 08:59:34 UTC (rev 31)
+++ trunk/pom.xml 2007-10-15 09:04:54 UTC (rev 32)
@@ -6,7 +6,7 @@
<artifactId>staticwiki</artifactId>
<packaging>pom</packaging>
- <version>0.8-SNAPSHOT</version>
+ <version>0.9-SNAPSHOT</version>
<name>staticwiki</name>
<description>
@@ -268,7 +268,7 @@
<dependency>
<groupId>org.staticwiki</groupId>
<artifactId>staticwiki-site-plugin</artifactId>
- <version>0.8-SNAPSHOT</version>
+ <version>0.9-SNAPSHOT</version>
</dependency>
</dependencies>
</plugin>
Modified: trunk/staticwiki-editor/pom.xml
===================================================================
--- trunk/staticwiki-editor/pom.xml 2007-10-15 08:59:34 UTC (rev 31)
+++ trunk/staticwiki-editor/pom.xml 2007-10-15 09:04:54 UTC (rev 32)
@@ -3,13 +3,13 @@
<parent>
<groupId>org.staticwiki</groupId>
<artifactId>staticwiki</artifactId>
- <version>0.8-SNAPSHOT</version>
+ <version>0.9-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.staticwiki</groupId>
<artifactId>staticwiki-editor</artifactId>
<packaging>jar</packaging>
- <version>0.8-SNAPSHOT</version>
+ <version>0.9-SNAPSHOT</version>
<name>staticwiki-editor</name>
<description>
Simple Swing gui to allow editing wiki markup and seeing a preview of the rendered result.
Modified: trunk/staticwiki-renderer/pom.xml
===================================================================
--- trunk/staticwiki-renderer/pom.xml 2007-10-15 08:59:34 UTC (rev 31)
+++ trunk/staticwiki-renderer/pom.xml 2007-10-15 09:04:54 UTC (rev 32)
@@ -3,13 +3,13 @@
<parent>
<groupId>org.staticwiki</groupId>
<artifactId>staticwiki</artifactId>
- <version>0.8-SNAPSHOT</version>
+ <version>0.9-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.staticwiki</groupId>
<artifactId>staticwiki-renderer</artifactId>
<packaging>jar</packaging>
- <version>0.8-SNAPSHOT</version>
+ <version>0.9-SNAPSHOT</version>
<name>staticwiki-renderer</name>
<description>
General wiki rendering code, the defaults render wiki content with markup similar to Confluence.
Modified: trunk/staticwiki-site-plugin/pom.xml
===================================================================
--- trunk/staticwiki-site-plugin/pom.xml 2007-10-15 08:59:34 UTC (rev 31)
+++ trunk/staticwiki-site-plugin/pom.xml 2007-10-15 09:04:54 UTC (rev 32)
@@ -3,13 +3,13 @@
<parent>
<groupId>org.staticwiki</groupId>
<artifactId>staticwiki</artifactId>
- <version>0.8-SNAPSHOT</version>
+ <version>0.9-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.staticwiki</groupId>
<artifactId>staticwiki-site-plugin</artifactId>
<packaging>maven-plugin</packaging>
- <version>0.8-SNAPSHOT</version>
+ <version>0.9-SNAPSHOT</version>
<name>staticwiki-site-plugin</name>
<description>
Maven plugin to allow generating maven site pages using staticwiki markup.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-10-15 08:59:35
|
Revision: 31
http://staticwiki.svn.sourceforge.net/staticwiki/?rev=31&view=rev
Author: triathlon98
Date: 2007-10-15 01:59:34 -0700 (Mon, 15 Oct 2007)
Log Message:
-----------
tag for 0.8
Added Paths:
-----------
tags/0.8/
Copied: tags/0.8 (from rev 30, trunk)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-10-15 08:59:00
|
Revision: 30
http://staticwiki.svn.sourceforge.net/staticwiki/?rev=30&view=rev
Author: triathlon98
Date: 2007-10-15 01:58:59 -0700 (Mon, 15 Oct 2007)
Log Message:
-----------
branches folder
Added Paths:
-----------
branches/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-10-15 08:58:40
|
Revision: 29
http://staticwiki.svn.sourceforge.net/staticwiki/?rev=29&view=rev
Author: triathlon98
Date: 2007-10-15 01:58:39 -0700 (Mon, 15 Oct 2007)
Log Message:
-----------
create tags folder
Added Paths:
-----------
tags/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-10-15 08:50:43
|
Revision: 28
http://staticwiki.svn.sourceforge.net/staticwiki/?rev=28&view=rev
Author: triathlon98
Date: 2007-10-15 01:50:41 -0700 (Mon, 15 Oct 2007)
Log Message:
-----------
fix versions (will call first release 0.8 as more features should be added before 1.0
Modified Paths:
--------------
trunk/pom.xml
trunk/src/site/wiki/usage.wiki
trunk/staticwiki-editor/pom.xml
trunk/staticwiki-editor/src/site/wiki/index.wiki
trunk/staticwiki-renderer/pom.xml
trunk/staticwiki-site-plugin/pom.xml
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2007-10-03 11:09:10 UTC (rev 27)
+++ trunk/pom.xml 2007-10-15 08:50:41 UTC (rev 28)
@@ -6,7 +6,7 @@
<artifactId>staticwiki</artifactId>
<packaging>pom</packaging>
- <version>1.0-SNAPSHOT</version>
+ <version>0.8-SNAPSHOT</version>
<name>staticwiki</name>
<description>
@@ -268,7 +268,7 @@
<dependency>
<groupId>org.staticwiki</groupId>
<artifactId>staticwiki-site-plugin</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>0.8-SNAPSHOT</version>
</dependency>
</dependencies>
</plugin>
@@ -285,8 +285,8 @@
</activation>
<distributionManagement>
<repository>
- <id>snapshotrepo</id>
- <name>Repository Name</name>
+ <id>progsrepo</id>
+ <name>PROGS repository</name>
<url>file:///home/joachim/sites/maven.progs.be/m2repo</url>
</repository>
<site>
Modified: trunk/src/site/wiki/usage.wiki
===================================================================
--- trunk/src/site/wiki/usage.wiki 2007-10-03 11:09:10 UTC (rev 27)
+++ trunk/src/site/wiki/usage.wiki 2007-10-15 08:50:41 UTC (rev 28)
@@ -31,7 +31,7 @@
<dependency>
<groupId>org.staticwiki</groupId>
<artifactId>staticwiki-site-plugin</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>0.8</version>
</dependency>
</dependencies>
</plugin>
Modified: trunk/staticwiki-editor/pom.xml
===================================================================
--- trunk/staticwiki-editor/pom.xml 2007-10-03 11:09:10 UTC (rev 27)
+++ trunk/staticwiki-editor/pom.xml 2007-10-15 08:50:41 UTC (rev 28)
@@ -3,13 +3,13 @@
<parent>
<groupId>org.staticwiki</groupId>
<artifactId>staticwiki</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>0.8-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.staticwiki</groupId>
<artifactId>staticwiki-editor</artifactId>
<packaging>jar</packaging>
- <version>1.0-SNAPSHOT</version>
+ <version>0.8-SNAPSHOT</version>
<name>staticwiki-editor</name>
<description>
Simple Swing gui to allow editing wiki markup and seeing a preview of the rendered result.
Modified: trunk/staticwiki-editor/src/site/wiki/index.wiki
===================================================================
--- trunk/staticwiki-editor/src/site/wiki/index.wiki 2007-10-03 11:09:10 UTC (rev 27)
+++ trunk/staticwiki-editor/src/site/wiki/index.wiki 2007-10-15 08:50:41 UTC (rev 28)
@@ -4,6 +4,6 @@
To run this, just call
{code}
-java -jar staticwiki-editor\target\staticwiki-editor-1.0-SNAPSHOT.jar
--SNAPSHOT.jar{code}
+java -jar staticwiki-editor\target\staticwiki-editor-0.8.jar
+{code}
(this from the project directory after compiling "mvn install").
\ No newline at end of file
Modified: trunk/staticwiki-renderer/pom.xml
===================================================================
--- trunk/staticwiki-renderer/pom.xml 2007-10-03 11:09:10 UTC (rev 27)
+++ trunk/staticwiki-renderer/pom.xml 2007-10-15 08:50:41 UTC (rev 28)
@@ -3,13 +3,13 @@
<parent>
<groupId>org.staticwiki</groupId>
<artifactId>staticwiki</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>0.8-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.staticwiki</groupId>
<artifactId>staticwiki-renderer</artifactId>
<packaging>jar</packaging>
- <version>1.0-SNAPSHOT</version>
+ <version>0.8-SNAPSHOT</version>
<name>staticwiki-renderer</name>
<description>
General wiki rendering code, the defaults render wiki content with markup similar to Confluence.
@@ -47,10 +47,10 @@
<groupId>org.javolution</groupId>
<artifactId>javolution</artifactId>
</dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>provided</scope>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>provided</scope>
</dependency>
</dependencies>
</project>
Modified: trunk/staticwiki-site-plugin/pom.xml
===================================================================
--- trunk/staticwiki-site-plugin/pom.xml 2007-10-03 11:09:10 UTC (rev 27)
+++ trunk/staticwiki-site-plugin/pom.xml 2007-10-15 08:50:41 UTC (rev 28)
@@ -3,13 +3,13 @@
<parent>
<groupId>org.staticwiki</groupId>
<artifactId>staticwiki</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>0.8-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.staticwiki</groupId>
<artifactId>staticwiki-site-plugin</artifactId>
<packaging>maven-plugin</packaging>
- <version>1.0-SNAPSHOT</version>
+ <version>0.8-SNAPSHOT</version>
<name>staticwiki-site-plugin</name>
<description>
Maven plugin to allow generating maven site pages using staticwiki markup.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-10-03 11:09:14
|
Revision: 27
http://staticwiki.svn.sourceforge.net/staticwiki/?rev=27&view=rev
Author: triathlon98
Date: 2007-10-03 04:09:10 -0700 (Wed, 03 Oct 2007)
Log Message:
-----------
small improvements
Modified Paths:
--------------
trunk/config/checkstyle.xml
trunk/src/site/wiki/usage.wiki
Modified: trunk/config/checkstyle.xml
===================================================================
--- trunk/config/checkstyle.xml 2007-10-03 06:14:47 UTC (rev 26)
+++ trunk/config/checkstyle.xml 2007-10-03 11:09:10 UTC (rev 27)
@@ -91,6 +91,7 @@
<module name="RedundantImport"/>
<module name="UnusedImports"/>
<module name="ImportOrder">
+ <property name="groups" value="be,org"/>
<property name="severity" value="info"/>
</module>
<!--<module name="ImportControl"/>-->
Modified: trunk/src/site/wiki/usage.wiki
===================================================================
--- trunk/src/site/wiki/usage.wiki 2007-10-03 06:14:47 UTC (rev 26)
+++ trunk/src/site/wiki/usage.wiki 2007-10-03 11:09:10 UTC (rev 27)
@@ -22,14 +22,6 @@
{code}
<build>
.....
- <extensions>
- <extension>
- <groupId>org.staticwiki</groupId>
- <artifactId>staticwiki-site-plugin</artifactId>
- <version>1.0-SNAPSHOT</version>
- </extension>
- </extensions>
- .....
<plugins>
.....
<plugin>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-10-03 06:15:19
|
Revision: 26
http://staticwiki.svn.sourceforge.net/staticwiki/?rev=26&view=rev
Author: triathlon98
Date: 2007-10-02 23:14:47 -0700 (Tue, 02 Oct 2007)
Log Message:
-----------
improve checkstyle configuration, more documentation
Modified Paths:
--------------
trunk/config/checkstyle.xml
trunk/src/site/wiki/usage.wiki
Modified: trunk/config/checkstyle.xml
===================================================================
--- trunk/config/checkstyle.xml 2007-10-02 23:10:09 UTC (rev 25)
+++ trunk/config/checkstyle.xml 2007-10-03 06:14:47 UTC (rev 26)
@@ -81,7 +81,7 @@
<!-- to have access to ANT properties. In this case it uses -->
<!-- the ${basedir} property to allow Checkstyle to be run -->
<!-- from any directory within a project. -->
- <property name="headerFile" value="config/equanda-header.txt"/>
+ <property name="headerFile" value="config/staticwiki-header.txt"/>
</module>
<!-- imports, see http://checkstyle.sourceforge.net/config_imports.html -->
Modified: trunk/src/site/wiki/usage.wiki
===================================================================
--- trunk/src/site/wiki/usage.wiki 2007-10-02 23:10:09 UTC (rev 25)
+++ trunk/src/site/wiki/usage.wiki 2007-10-03 06:14:47 UTC (rev 26)
@@ -1 +1,58 @@
-h1. How to use staticwiki
\ No newline at end of file
+h1. How to use staticwiki
+
+h2. Using the maven plugin
+
+One of the uses of staticwiki is as maven plugin. When maven generates the site, the staticwiki engine can be used to generate the pages.
+For this you need to create the following data structure
+{code}
+module-home
+ src
+ site
+ wiki
+ page1.wiki
+ page2.wiki
+ site.xml
+ pom.xml
+{code}
+
+The wiki pages contain the staticwiki [markup|markup.html].
+The site.xml file has the [normal structure|http://maven.apache.org/plugins/maven-site-plugin/examples/sitedescriptor.html].
+
+In the pom you need to include the staticwiki plugin to assure the site plugin known how to handle the wiki files. This can be done using the following excerpt.
+{code}
+ <build>
+ .....
+ <extensions>
+ <extension>
+ <groupId>org.staticwiki</groupId>
+ <artifactId>staticwiki-site-plugin</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </extension>
+ </extensions>
+ .....
+ <plugins>
+ .....
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.staticwiki</groupId>
+ <artifactId>staticwiki-site-plugin</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ .....
+ </plugins>
+ .....
+ </build>
+{code}
+
+h2. Using the wiki renderer
+
+Of course the staticwiki renderer can also be used in code. The easiest way to to use the default markup. In that case, the following code can be used.
+{code}
+ WikiRenderer wikiRenderer = WikiFactory.getWikiRenderer( new AllowAllResourceHandler() );
+ wikiRenderer.render( wikiText );
+{code}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-10-02 23:10:16
|
Revision: 25
http://staticwiki.svn.sourceforge.net/staticwiki/?rev=25&view=rev
Author: triathlon98
Date: 2007-10-02 16:10:09 -0700 (Tue, 02 Oct 2007)
Log Message:
-----------
improve checkstyle configuration
Modified Paths:
--------------
trunk/config/checkstyle.xml
Modified: trunk/config/checkstyle.xml
===================================================================
--- trunk/config/checkstyle.xml 2007-10-02 21:06:31 UTC (rev 24)
+++ trunk/config/checkstyle.xml 2007-10-02 23:10:09 UTC (rev 25)
@@ -12,11 +12,13 @@
<!-- Checks that a package.html file exists for each package. -->
<!-- See http://checkstyle.sf.net/config_javadoc.html#PackageHtml -->
- <module name="PackageHtml"/>
+ <!--<module name="PackageHtml"/>-->
<!-- Checks whether files end with a new line. -->
<!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
- <module name="NewlineAtEndOfFile"/>
+ <module name="NewlineAtEndOfFile">
+ <property name="severity" value="info"/>
+ </module>
<!-- Checks that property files contain the same keys. -->
<!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
@@ -34,21 +36,23 @@
<!-- Block checks, see http://checkstyle.sourceforge.net/config_blocks.html -->
<module name="LeftCurly">
+ <property name="severity" value="info"/>
<property name="option" value="nl"/>
</module>
<module name="RightCurly">
+ <property name="severity" value="info"/>
<property name="option" value="alone"/>
</module>
<!--<module name="EmptyBlock"/>-->
<module name="AvoidNestedBlocks"/>
- <module name="NeedBraces"/>
+ <!--<module name="NeedBraces"/> no braces is allowed when on same line -->
<!-- Javadoc comments checks, see http://checkstyle.sourceforge.net/config_javadoc.html -->
<module name="JavadocMethod">
<property name="excludeScope" value="private"/>
</module>
- <module name="JavadocType"/>
+ <!--<module name="JavadocType"/>-->
<!--<module name="JavadocVariable"/>-->
<!--<module name="JavadocStyle"/>-->
@@ -65,7 +69,9 @@
<module name="MethodName"/>
<module name="PackageName"/>
<module name="ParameterName"/>
- <module name="StaticVariableName"/>
+ <module name="StaticVariableName">
+ <property name="format" value="^([A-Z][A-Z0-9]*(_[A-Z0-9]+)*)$"/>
+ </module>
<module name="TypeName"/>
<!-- header, see http://checkstyle.sourceforge.net/config_header.html -->
@@ -84,17 +90,26 @@
<module name="IllegalImport"/>
<module name="RedundantImport"/>
<module name="UnusedImports"/>
- <module name="ImportOrder"/>
+ <module name="ImportOrder">
+ <property name="severity" value="info"/>
+ </module>
<!--<module name="ImportControl"/>-->
<!-- size violations, see http://checkstyle.sourceforge.net/config_sizes.html -->
<module name="LineLength">
+ <property name="severity" value="info"/>
<property name="max" value="120"/>
</module>
- <module name="FileLength"/>
- <module name="MethodLength"/>
- <module name="ParameterNumber"/>
+ <module name="FileLength">
+ <property name="severity" value="info"/>
+ </module>
+ <module name="MethodLength">
+ <property name="severity" value="info"/>
+ </module>
+ <module name="ParameterNumber">
+ <property name="severity" value="info"/>
+ </module>
<!-- whitespace, see http://checkstyle.sourceforge.net/config_whitespace.html -->
@@ -106,49 +121,58 @@
</module>
<module name="MethodParamPad"/>
<module name="NoWhitespaceAfter">
+ <property name="severity" value="info"/>
<!-- Default tokens and additional GENERIC_START -->
<property name="tokens" value="BNOT, DEC, DOT, INC, LNOT, UNARY_MINUS, UNARY_PLUS, GENERIC_START"/>
</module>
<module name="NoWhitespaceBefore">
+ <property name="severity" value="info"/>
<!-- Default tokens and additional GENERIC_START and GENERIC_END -->
- <property name="tokens" value="SEMI, POST_DEC, POST_INC, GENERIC_START, GENERIC_END"/>
+ <property name="tokens" value="POST_DEC, POST_INC, GENERIC_START, GENERIC_END"/>
</module>
- <module name="OperatorWrap"/>
+ <!--<module name="OperatorWrap"/>-->
<module name="ParenPad">
<property name="option" value="space"/>
</module>
<module name="TypecastParenPad"/>
<module name="TabCharacter"/>
<module name="WhitespaceAfter">
+ <property name="severity" value="info"/>
<!-- Default tokens and additional GENERIC_END -->
<property name="tokens" value="COMMA, SEMI, TYPECAST, GENERIC_END"/>
</module>
<module name="WhitespaceAround">
+ <property name="severity" value="info"/>
<!-- Default tokens without GENERIC_START and GENERIC_END -->
- <property name="tokens" value="ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, EQUAL, GE, GT, LAND, LCURLY, LE, LITERAL_ASSERT, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_RETURN, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, RCURLY, SL, SLIST, SL_ASSIGN, SR, SR_ASSIGN, STAR, STAR_ASSIGN, TYPE_EXTENSION_AND, WILDCARD_TYPE"/>
- </module>
- <module name="TabCharacter"/>
- <module name="WhitespaceAfter"/>
- <module name="WhitespaceAround">
+ <property name="tokens"
+ value="ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, EQUAL, GE, GT, LAND, LCURLY, LE, LITERAL_ASSERT, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_RETURN, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, RCURLY, SL, SLIST, SL_ASSIGN, SR, SR_ASSIGN, STAR, STAR_ASSIGN, TYPE_EXTENSION_AND, WILDCARD_TYPE"/>
<property name="allowEmptyConstructors" value="true"/>
<property name="allowEmptyMethods" value="true"/>
</module>
+ <module name="TabCharacter">
+ <property name="severity" value="info"/>
+ </module>
<!-- modifiers, see http://checkstyle.sourceforge.net/config_modifier.html -->
- <module name="ModifierOrder"/>
- <module name="RedundantModifier"/>
+ <!--<module name="ModifierOrder"/>-->
+ <module name="RedundantModifier">
+ <property name="severity" value="info"/>
+ </module>
<!-- coding , see http://checkstyle.sourceforge.net/config_coding.html -->
- <module name="ArrayTrailingComma"/>
+ <module name="ArrayTrailingComma">
+ <property name="severity" value="info"/>
+ </module>
<!--<module name="AvoidInlineConditionals"/>-->
<module name="CovariantEquals"/>
<module name="DoubleCheckedLocking"/>
<module name="EmptyStatement"/>
<module name="EqualsHashCode"/>
- <module name="FinalLocalVariable"/>
+ <!--<module name="FinalLocalVariable"/>-->
<module name="HiddenField">
+ <property name="severity" value="info"/>
<property name="ignoreConstructorParameter" value="true"/>
<property name="ignoreSetter" value="true"/>
</module>
@@ -159,11 +183,13 @@
<property name="tokens" value="LITERAL_NATIVE"/>
</module>
<module name="IllegalTokenText"/>
- <module name="InnerAssignment"/>
- <module name="MagicNumber"/>
+ <module name="InnerAssignment">
+ <property name="severity" value="warning"/>
+ </module>
+ <!--<module name="MagicNumber"/>-->
<module name="MissingSwitchDefault"/>
<module name="ModifiedControlVariable"/>
- <module name="RedundantThrows"/>
+ <!--<module name="RedundantThrows"/>-->
<module name="SimplifyBooleanExpression"/>
<module name="SimplifyBooleanReturn"/>
<module name="StringLiteralEquality"/>
@@ -175,15 +201,17 @@
<!--<module name="IllegalThrows"/>-->
<module name="PackageDeclaration"/>
<module name="JUnitTestCase"/>
- <module name="ReturnCount"/>
- <module name="IllegalType"/>
- <module name="DeclarationOrder"/>
+ <!--<module name="ReturnCount"/>-->
+ <!--<module name="IllegalType"/>-->
+ <!--<module name="DeclarationOrder"/>-->
<module name="ParameterAssignment"/>
- <module name="ExplicitInitialization"/>
+ <module name="ExplicitInitialization">
+ <property name="severity" value="info"/>
+ </module>
<module name="DefaultComesLast"/>
<!--<module name="MissingCtor"/>-->
<module name="FallThrough"/>
- <module name="MultipleStringLiterals"/>
+ <!--<module name="MultipleStringLiterals"/>-->
<!--<module name="MultipleVariableDeclarations"/>-->
<!--<module name="RequireThis"/>-->
<!--<module name="UnnecessaryParentheses"/>-->
@@ -191,6 +219,7 @@
<!-- class design, see http://checkstyle.sourceforge.net/config_design.html -->
<module name="VisibilityModifier">
+ <property name="severity" value="info"/>
<property name="protectedAllowed" value="true"/>
</module>
<module name="FinalClass"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-10-02 21:06:33
|
Revision: 24
http://staticwiki.svn.sourceforge.net/staticwiki/?rev=24&view=rev
Author: triathlon98
Date: 2007-10-02 14:06:31 -0700 (Tue, 02 Oct 2007)
Log Message:
-----------
improve checkstyle configuration
Modified Paths:
--------------
trunk/config/checkstyle.xml
trunk/config/staticwiki-header.txt
Modified: trunk/config/checkstyle.xml
===================================================================
--- trunk/config/checkstyle.xml 2007-09-26 08:17:22 UTC (rev 23)
+++ trunk/config/checkstyle.xml 2007-10-02 21:06:31 UTC (rev 24)
@@ -1,52 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
<!DOCTYPE module PUBLIC
"-//Puppy Crawl//DTD Check Configuration 1.1//EN"
"http://www.puppycrawl.com/dtds/configuration_1_1.dtd">
<!--
-
- Checkstyle configuration that checks the sun coding conventions from:
-
- - the Java Language Specification at
- http://java.sun.com/docs/books/jls/second_edition/html/index.html
-
- - the Sun Code Conventions at http://java.sun.com/docs/codeconv/
-
- - the Javadoc guidelines at
- http://java.sun.com/j2se/javadoc/writingdoccomments/index.html
-
- - the JDK Api documentation http://java.sun.com/j2se/docs/api/index.html
-
- - some best practices
-
Checkstyle is very configurable. Be sure to read the documentation at
http://checkstyle.sf.net (or in your downloaded distribution).
-
- Most Checks are configurable, be sure to consult the documentation.
-
- To completely disable a check, just comment it out or delete it from the file.
-
- Finally, it is worth reading the documentation.
-
-->
<module name="Checker">
@@ -61,148 +20,202 @@
<!-- Checks that property files contain the same keys. -->
<!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
- <module name="Translation"/>
+ <!--<module name="Translation"/>-->
+ <!-- duplicate code, see http://checkstyle.sourceforge.net/config_duplicates.html -->
+ <!--<module name="StrictDuplicateCode"/>-->
+
<module name="TreeWalker">
<property name="cacheFile" value="${checkstyle.cache.file}"/>
+ <property name="tabWidth" value="4"/>
+ <property name="charset" value="UTF-8"/>
- <!-- ************************************************************** -->
- <!-- Checks that are different from the sun coding conventions ones -->
- <!-- ************************************************************** -->
- <property name="tabWidth" value="4"/>
+ <!-- Block checks, see http://checkstyle.sourceforge.net/config_blocks.html -->
+
<module name="LeftCurly">
- <property name="option" value="nl"/>
+ <property name="option" value="nl"/>
</module>
<module name="RightCurly">
- <property name="option" value="alone"/>
+ <property name="option" value="alone"/>
</module>
- <module name="LineLength">
- <property name="ignorePattern" value="@version"/>
- <property name="max" value="132"/>
- </module>
- <module name="MemberName">
- <property name="format" value="^[a-z]+_*[a-zA-Z0-9]*$"/>
- </module>
- <module name="StaticVariableName">
- <property name="format" value="^[a-z]+_*[a-zA-Z0-9]*$"/>
- </module>
- <module name="ConstantName">
- <property name="format" value="^(([A-Z][A-Z0-9]*(_[A-Z0-9]+)*)|log)$"/>
- </module>
- <module name="ParameterName">
- <property name="format" value="^[a-z]+_*[a-zA-Z0-9]*$"/>
- </module>
+ <!--<module name="EmptyBlock"/>-->
+ <module name="AvoidNestedBlocks"/>
+ <module name="NeedBraces"/>
- <!-- ************************************************************** -->
- <!-- Default Sun coding conventions checks -->
- <!-- ************************************************************** -->
+ <!-- Javadoc comments checks, see http://checkstyle.sourceforge.net/config_javadoc.html -->
- <!-- Checks for Javadoc comments. -->
- <!-- See http://checkstyle.sf.net/config_javadoc.html -->
<module name="JavadocMethod">
- <property name="excludeScope" value="private"/>
+ <property name="excludeScope" value="private"/>
</module>
<module name="JavadocType"/>
- <module name="JavadocVariable"/>
+ <!--<module name="JavadocVariable"/>-->
+ <!--<module name="JavadocStyle"/>-->
+ <!-- Naming conventions, see http://checkstyle.sourceforge.net/config_naming.html -->
- <!-- Checks for Naming Conventions. -->
- <!-- See http://checkstyle.sf.net/config_naming.html -->
+ <!--<module name="AbstractClassName"/>-->
+ <!--<module name="LocalFinalVariableName"/>-->
+ <module name="ConstantName">
+ <property name="format" value="^(([A-Z][A-Z0-9]*(_[A-Z0-9]+)*)|log)$"/>
+ </module>
<module name="LocalFinalVariableName"/>
<module name="LocalVariableName"/>
+ <module name="MemberName"/>
<module name="MethodName"/>
<module name="PackageName"/>
+ <module name="ParameterName"/>
+ <module name="StaticVariableName"/>
<module name="TypeName"/>
+ <!-- header, see http://checkstyle.sourceforge.net/config_header.html -->
- <!-- Checks for Headers -->
- <!-- See http://checkstyle.sf.net/config_header.html -->
- <module name="RegexpHeader">
+ <module name="Header">
<!-- The follow property value demonstrates the ability -->
<!-- to have access to ANT properties. In this case it uses -->
<!-- the ${basedir} property to allow Checkstyle to be run -->
<!-- from any directory within a project. -->
- <property name="headerFile" value="config/staticwiki-header.txt"/>
+ <property name="headerFile" value="config/equanda-header.txt"/>
</module>
- <!-- Following interprets the header file as regular expressions. -->
- <!-- <module name="RegexpHeader"/> -->
+ <!-- imports, see http://checkstyle.sourceforge.net/config_imports.html -->
-
- <!-- Checks for imports -->
- <!-- See http://checkstyle.sf.net/config_import.html -->
- <module name="AvoidStarImport"/>
- <module name="IllegalImport"/> <!-- defaults to sun.* packages -->
+ <!--<module name="AvoidStarImport"/>-->
+ <module name="IllegalImport"/>
<module name="RedundantImport"/>
<module name="UnusedImports"/>
+ <module name="ImportOrder"/>
+ <!--<module name="ImportControl"/>-->
+ <!-- size violations, see http://checkstyle.sourceforge.net/config_sizes.html -->
- <!-- Checks for Size Violations. -->
- <!-- See http://checkstyle.sf.net/config_sizes.html -->
+ <module name="LineLength">
+ <property name="max" value="120"/>
+ </module>
<module name="FileLength"/>
<module name="MethodLength"/>
<module name="ParameterNumber"/>
+ <!-- whitespace, see http://checkstyle.sourceforge.net/config_whitespace.html -->
- <!-- Checks for whitespace -->
- <!-- See http://checkstyle.sf.net/config_whitespace.html -->
- <module name="EmptyForIteratorPad"/>
- <module name="NoWhitespaceAfter"/>
- <module name="NoWhitespaceBefore"/>
+ <module name="EmptyForInitializerPad">
+ <property name="option" value="space"/>
+ </module>
+ <module name="EmptyForIteratorPad">
+ <property name="option" value="space"/>
+ </module>
+ <module name="MethodParamPad"/>
+ <module name="NoWhitespaceAfter">
+ <!-- Default tokens and additional GENERIC_START -->
+ <property name="tokens" value="BNOT, DEC, DOT, INC, LNOT, UNARY_MINUS, UNARY_PLUS, GENERIC_START"/>
+ </module>
+ <module name="NoWhitespaceBefore">
+ <!-- Default tokens and additional GENERIC_START and GENERIC_END -->
+ <property name="tokens" value="SEMI, POST_DEC, POST_INC, GENERIC_START, GENERIC_END"/>
+ </module>
<module name="OperatorWrap"/>
- <module name="ParenPad"/>
+ <module name="ParenPad">
+ <property name="option" value="space"/>
+ </module>
+ <module name="TypecastParenPad"/>
<module name="TabCharacter"/>
+ <module name="WhitespaceAfter">
+ <!-- Default tokens and additional GENERIC_END -->
+ <property name="tokens" value="COMMA, SEMI, TYPECAST, GENERIC_END"/>
+ </module>
+ <module name="WhitespaceAround">
+ <!-- Default tokens without GENERIC_START and GENERIC_END -->
+ <property name="tokens" value="ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, EQUAL, GE, GT, LAND, LCURLY, LE, LITERAL_ASSERT, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_RETURN, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, RCURLY, SL, SLIST, SL_ASSIGN, SR, SR_ASSIGN, STAR, STAR_ASSIGN, TYPE_EXTENSION_AND, WILDCARD_TYPE"/>
+ </module>
+ <module name="TabCharacter"/>
<module name="WhitespaceAfter"/>
- <module name="WhitespaceAround"/>
+ <module name="WhitespaceAround">
+ <property name="allowEmptyConstructors" value="true"/>
+ <property name="allowEmptyMethods" value="true"/>
+ </module>
+ <!-- modifiers, see http://checkstyle.sourceforge.net/config_modifier.html -->
- <!-- Modifier Checks -->
- <!-- See http://checkstyle.sf.net/config_modifiers.html -->
<module name="ModifierOrder"/>
<module name="RedundantModifier"/>
- <module name="EmptyBlock"/>
- <module name="NeedBraces"/>
+ <!-- coding , see http://checkstyle.sourceforge.net/config_coding.html -->
- <!-- Checks for common coding problems -->
- <!-- See http://checkstyle.sf.net/config_coding.html -->
- <module name="DoubleCheckedLocking"/> <!-- MY FAVOURITE -->
+ <module name="ArrayTrailingComma"/>
+ <!--<module name="AvoidInlineConditionals"/>-->
+ <module name="CovariantEquals"/>
+ <module name="DoubleCheckedLocking"/>
<module name="EmptyStatement"/>
<module name="EqualsHashCode"/>
- <module name="FallThrough"/>
+ <module name="FinalLocalVariable"/>
<module name="HiddenField">
- <property name="ignoreConstructorParameter" value="true"/>
- <property name="ignoreSetter" value="true"/>
+ <property name="ignoreConstructorParameter" value="true"/>
+ <property name="ignoreSetter" value="true"/>
</module>
- <module name="IllegalInstantiation"/>
+ <module name="IllegalInstantiation">
+ <property name="classes" value="java.lang.Boolean"/>
+ </module>
+ <module name="IllegalToken">
+ <property name="tokens" value="LITERAL_NATIVE"/>
+ </module>
+ <module name="IllegalTokenText"/>
<module name="InnerAssignment"/>
<module name="MagicNumber"/>
<module name="MissingSwitchDefault"/>
-<!-- <module name="OneMethodPrivateField" /> -->
+ <module name="ModifiedControlVariable"/>
<module name="RedundantThrows"/>
<module name="SimplifyBooleanExpression"/>
<module name="SimplifyBooleanReturn"/>
+ <module name="StringLiteralEquality"/>
+ <!--<module name="NestedIfDepth"/>-->
+ <!--<module name="NestedTryDepth"/>-->
+ <module name="SuperClone"/>
+ <module name="SuperFinalize"/>
+ <!--<module name="IllegalCatch"/>-->
+ <!--<module name="IllegalThrows"/>-->
+ <module name="PackageDeclaration"/>
+ <module name="JUnitTestCase"/>
+ <module name="ReturnCount"/>
+ <module name="IllegalType"/>
+ <module name="DeclarationOrder"/>
+ <module name="ParameterAssignment"/>
+ <module name="ExplicitInitialization"/>
+ <module name="DefaultComesLast"/>
+ <!--<module name="MissingCtor"/>-->
+ <module name="FallThrough"/>
+ <module name="MultipleStringLiterals"/>
+ <!--<module name="MultipleVariableDeclarations"/>-->
+ <!--<module name="RequireThis"/>-->
+ <!--<module name="UnnecessaryParentheses"/>-->
- <!-- Checks for class design -->
- <!-- See http://checkstyle.sf.net/config_design.html -->
+ <!-- class design, see http://checkstyle.sourceforge.net/config_design.html -->
+
+ <module name="VisibilityModifier">
+ <property name="protectedAllowed" value="true"/>
+ </module>
<module name="FinalClass"/>
+ <module name="InterfaceIsType"/>
<module name="HideUtilityClassConstructor"/>
- <module name="VisibilityModifier">
- <module name="MissingSwitchDefault"/>
- <property name="protectedAllowed" value="true"/>
- </module>
+ <!--<module name="DesignForExtension"/>-->
+ <!--<module name="MutableException"/>-->
+ <!--<module name="ThrowsCount"/>-->
+ <!-- misc, see http://checkstyle.sourceforge.net/config_misc.html -->
- <!-- Miscellaneous other checks. -->
- <!-- See http://checkstyle.sf.net/config_misc.html -->
- <module name="ArrayTypeStyle"/>
-<!-- <module name="FinalParameters"/> -->
<module name="GenericIllegalRegexp">
<property name="format" value="\s+$"/>
<property name="message" value="Line has trailing spaces."/>
</module>
+ <!--<module name="TodoComment"/>-->
+ <!--<module name="UncommentedMain"/>-->
<module name="UpperEll"/>
+ <module name="ArrayTypeStyle"/>
+ <!--<module name="FinalParameters"/>-->
+ <!--<module name="DescendantToken"/>-->
+ <!--<module name="Indentation"/>-->
+ <!--<module name="TrailingComment"/>-->
+ <!--<module name="RequiredRegexp"/>-->
+ <!--<module name="Regexp"/>-->
</module>
Modified: trunk/config/staticwiki-header.txt
===================================================================
--- trunk/config/staticwiki-header.txt 2007-09-26 08:17:22 UTC (rev 23)
+++ trunk/config/staticwiki-header.txt 2007-10-02 21:06:31 UTC (rev 24)
@@ -1,11 +1,11 @@
-^/\*\**\s*$
-^ \* This file is part of the staticwiki project.*\s*$
-^ \**\s*$
-^ \* The contents of this file are subject to the GNU Lesser General Public License Version 2.1 or later (the "LGPL")*\s*$
-^ \* (the "License"); you may not use this file except in compliance with the License.*\s*$
-^ \* You may obtain a copy of the License at http://www.fsf.org/licenses/lgpl.html*\s*$
-^ \**\s*$
-^ \* Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF*\s*$
-^ \* ANY KIND, either express or implied. See the License for the specific language governing rights and*\s*$
-^ \* limitations under the License.*\s*$
-^ \*/*\s*$
\ No newline at end of file
+/**
+ * This file is part of the staticwiki project.
+ *
+ * The contents of this file are subject to the GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ * (the "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.fsf.org/licenses/lgpl.html
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
+ * ANY KIND, either express or implied. See the License for the specific language governing rights and
+ * limitations under the License.
+ */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-09-26 08:17:29
|
Revision: 23
http://staticwiki.svn.sourceforge.net/staticwiki/?rev=23&view=rev
Author: triathlon98
Date: 2007-09-26 01:17:22 -0700 (Wed, 26 Sep 2007)
Log Message:
-----------
add ci info
Modified Paths:
--------------
trunk/pom.xml
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2007-09-14 13:16:30 UTC (rev 22)
+++ trunk/pom.xml 2007-09-26 08:17:22 UTC (rev 23)
@@ -36,6 +36,22 @@
</developerConnection>
<url>http://staticwiki.svn.sourceforge.net/viewvc/staticwiki/</url>
</scm>
+ <ciManagement>
+ <system>hudson</system>
+ <url>http://hudson.equanda.org/job/staticwiki</url>
+ <notifiers>
+ <notifier>
+ <type>mail</type>
+ <sendOnError>true</sendOnError>
+ <sendOnFailure>true</sendOnFailure>
+ <sendOnSuccess>true</sendOnSuccess>
+ <sendOnWarning>true</sendOnWarning>
+ <configuration>
+ <address>sta...@li...</address>
+ </configuration>
+ </notifier>
+ </notifiers>
+ </ciManagement>
<mailingLists>
<mailingList>
<name>staticwiki-svn-commit</name>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-09-14 13:16:40
|
Revision: 22
http://staticwiki.svn.sourceforge.net/staticwiki/?rev=22&view=rev
Author: triathlon98
Date: 2007-09-14 06:16:30 -0700 (Fri, 14 Sep 2007)
Log Message:
-----------
small site fixes
Modified Paths:
--------------
trunk/src/site/site.xml
trunk/staticwiki-editor/src/site/site.xml
Removed Paths:
-------------
trunk/src/site/resources/css/
Modified: trunk/src/site/site.xml
===================================================================
--- trunk/src/site/site.xml 2007-09-13 11:58:50 UTC (rev 21)
+++ trunk/src/site/site.xml 2007-09-14 13:16:30 UTC (rev 22)
@@ -10,7 +10,7 @@
<bannerLeft>
<name>staticwiki</name>
- <src>/images/logo.png</src>
+ <src>http://www.staticwiki.org/images/logo.png</src>
<href>http://www.staticwiki.org/</href>
</bannerLeft>
Modified: trunk/staticwiki-editor/src/site/site.xml
===================================================================
--- trunk/staticwiki-editor/src/site/site.xml 2007-09-13 11:58:50 UTC (rev 21)
+++ trunk/staticwiki-editor/src/site/site.xml 2007-09-14 13:16:30 UTC (rev 22)
@@ -6,7 +6,7 @@
<item name="equanda" href="http://www.equanda.org/"/>
</links>
- <menu name="staticwiki">
+ <menu name="editor">
<item name="Introduction" href="index.html"/>
</menu>
</body>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-09-13 11:59:02
|
Revision: 21
http://staticwiki.svn.sourceforge.net/staticwiki/?rev=21&view=rev
Author: triathlon98
Date: 2007-09-13 04:58:50 -0700 (Thu, 13 Sep 2007)
Log Message:
-----------
site add sourceforge "poweredby"
Modified Paths:
--------------
trunk/src/site/site.xml
Modified: trunk/src/site/site.xml
===================================================================
--- trunk/src/site/site.xml 2007-08-24 12:13:07 UTC (rev 20)
+++ trunk/src/site/site.xml 2007-09-13 11:58:50 UTC (rev 21)
@@ -7,7 +7,7 @@
</skin>
<publishDate format="yyyy-MM-dd"/>
-
+
<bannerLeft>
<name>staticwiki</name>
<src>/images/logo.png</src>
@@ -28,5 +28,14 @@
<menu ref="modules"/>
<menu ref="reports"/>
+
</body>
+
+ <poweredBy>
+ <logo name="maven" href="http://maven.apache.org/"
+ img="http://maven.apache.org/images/logos/maven-feather.png"/>
+ <logo name="sourceforge" href="http://sf.net/projects/staticwiki/"
+ img="http://sourceforge.net/sflogo.php?group_id=staticwiki&type=1"/>
+ </poweredBy>
+
</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-08-24 12:13:09
|
Revision: 20
http://staticwiki.svn.sourceforge.net/staticwiki/?rev=20&view=rev
Author: triathlon98
Date: 2007-08-24 05:13:07 -0700 (Fri, 24 Aug 2007)
Log Message:
-----------
fix error macro (caused infinite loop), add code/private macros
Modified Paths:
--------------
trunk/staticwiki-renderer/src/main/macro/org/staticwiki/wiki/template/ERROR.vm
Added Paths:
-----------
trunk/staticwiki-renderer/src/main/macro/org/staticwiki/wiki/macro/code.properties
trunk/staticwiki-renderer/src/main/macro/org/staticwiki/wiki/macro/private.properties
trunk/staticwiki-renderer/src/main/macro/org/staticwiki/wiki/template/code.vm
trunk/staticwiki-renderer/src/main/macro/org/staticwiki/wiki/template/private.vm
Added: trunk/staticwiki-renderer/src/main/macro/org/staticwiki/wiki/macro/code.properties
===================================================================
--- trunk/staticwiki-renderer/src/main/macro/org/staticwiki/wiki/macro/code.properties (rev 0)
+++ trunk/staticwiki-renderer/src/main/macro/org/staticwiki/wiki/macro/code.properties 2007-08-24 12:13:07 UTC (rev 20)
@@ -0,0 +1,2 @@
+hasBody=true
+template=code
\ No newline at end of file
Added: trunk/staticwiki-renderer/src/main/macro/org/staticwiki/wiki/macro/private.properties
===================================================================
--- trunk/staticwiki-renderer/src/main/macro/org/staticwiki/wiki/macro/private.properties (rev 0)
+++ trunk/staticwiki-renderer/src/main/macro/org/staticwiki/wiki/macro/private.properties 2007-08-24 12:13:07 UTC (rev 20)
@@ -0,0 +1,2 @@
+hasBody=true
+template=private
\ No newline at end of file
Modified: trunk/staticwiki-renderer/src/main/macro/org/staticwiki/wiki/template/ERROR.vm
===================================================================
--- trunk/staticwiki-renderer/src/main/macro/org/staticwiki/wiki/template/ERROR.vm 2007-08-23 11:27:00 UTC (rev 19)
+++ trunk/staticwiki-renderer/src/main/macro/org/staticwiki/wiki/template/ERROR.vm 2007-08-24 12:13:07 UTC (rev 20)
@@ -1 +1 @@
-<span class="wikiError><p>$context.render($macro)</p></span>
\ No newline at end of file
+<span class="wikiError">$macro</span>
\ No newline at end of file
Added: trunk/staticwiki-renderer/src/main/macro/org/staticwiki/wiki/template/code.vm
===================================================================
--- trunk/staticwiki-renderer/src/main/macro/org/staticwiki/wiki/template/code.vm (rev 0)
+++ trunk/staticwiki-renderer/src/main/macro/org/staticwiki/wiki/template/code.vm 2007-08-24 12:13:07 UTC (rev 20)
@@ -0,0 +1 @@
+<pre>$macro</pre>
\ No newline at end of file
Added: trunk/staticwiki-renderer/src/main/macro/org/staticwiki/wiki/template/private.vm
===================================================================
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-08-23 11:27:02
|
Revision: 19
http://staticwiki.svn.sourceforge.net/staticwiki/?rev=19&view=rev
Author: triathlon98
Date: 2007-08-23 04:27:00 -0700 (Thu, 23 Aug 2007)
Log Message:
-----------
temporary list implementation (only - -- --- for now)
Modified Paths:
--------------
trunk/staticwiki-renderer/src/main/java/org/staticwiki/wiki/renderer/line/ListLineHandler.java
trunk/staticwiki-renderer/src/main/macro/org/staticwiki/wiki/WikiRenderPipeline.txt
Modified: trunk/staticwiki-renderer/src/main/java/org/staticwiki/wiki/renderer/line/ListLineHandler.java
===================================================================
--- trunk/staticwiki-renderer/src/main/java/org/staticwiki/wiki/renderer/line/ListLineHandler.java 2007-08-22 15:12:17 UTC (rev 18)
+++ trunk/staticwiki-renderer/src/main/java/org/staticwiki/wiki/renderer/line/ListLineHandler.java 2007-08-23 11:27:00 UTC (rev 19)
@@ -12,11 +12,57 @@
package org.staticwiki.wiki.renderer.line;
+import javolution.lang.TextBuilder;
+import org.staticwiki.wiki.renderer.WikiSubRenderer;
+
/**
- * ...
+ * Handle list items
*
* @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
*/
public class ListLineHandler
+ implements WikiLineHandler
{
+ public boolean render( TextBuilder result, CharSequence line, WikiSubRenderer subRenderer, WikiLineContext context )
+ {
+ // @todo very temporary implementation
+ if ( line.length() > 2 && '-' == line.charAt( 0 ) && ' ' == line.charAt( 1 ))
+ {
+ context.flush( result );
+ context.setNewParagraph( true );
+ String start = "<ul><li>";
+ String end = "</li></ul>";
+ context.setParagraphBreak( end );
+ context.setParagraphEnd( end );
+ result.append( start );
+ subRenderer.subRender( result, line.subSequence( 2, line.length() ) );
+ return true;
+ }
+ if ( line.length() > 3 && '-' == line.charAt( 0 ) && '-' == line.charAt( 1 ) && ' ' == line.charAt( 2 ))
+ {
+ context.flush( result );
+ context.setNewParagraph( true );
+ String start = "<ul><li><li>";
+ String end = "</li></li></ul>";
+ context.setParagraphBreak( end );
+ context.setParagraphEnd( end );
+ result.append( start );
+ subRenderer.subRender( result, line.subSequence( 3, line.length() ) );
+ return true;
+ }
+ if ( line.length() > 4 && '-' == line.charAt( 0 ) &&'-' == line.charAt( 1 ) &&'-' == line.charAt( 2 ) && ' ' == line.charAt( 3 ))
+ {
+ context.flush( result );
+ context.setNewParagraph( true );
+ String start = "<ul><li><li><li>";
+ String end = "</li></li></li></li></ul>";
+ context.setParagraphBreak( end );
+ context.setParagraphEnd( end );
+ result.append( start );
+ subRenderer.subRender( result, line.subSequence( 4, line.length() ) );
+ return true;
+ }
+ return false;
+ }
+
}
Modified: trunk/staticwiki-renderer/src/main/macro/org/staticwiki/wiki/WikiRenderPipeline.txt
===================================================================
--- trunk/staticwiki-renderer/src/main/macro/org/staticwiki/wiki/WikiRenderPipeline.txt 2007-08-22 15:12:17 UTC (rev 18)
+++ trunk/staticwiki-renderer/src/main/macro/org/staticwiki/wiki/WikiRenderPipeline.txt 2007-08-23 11:27:00 UTC (rev 19)
@@ -2,6 +2,7 @@
org.staticwiki.wiki.renderer.line.HeaderLineHandler
org.staticwiki.wiki.renderer.line.QuoteLineHandler
org.staticwiki.wiki.renderer.line.RuleLineHandler
+org.staticwiki.wiki.renderer.line.ListLineHandler
org.staticwiki.wiki.renderer.line.ParagraphLineHandler
org.staticwiki.wiki.renderer.simple.SurroundMarkupRenderer|*|<b>|</b>
org.staticwiki.wiki.renderer.simple.SurroundMarkupRenderer|_|<em>|</em>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-08-22 15:12:22
|
Revision: 18
http://staticwiki.svn.sourceforge.net/staticwiki/?rev=18&view=rev
Author: triathlon98
Date: 2007-08-22 08:12:17 -0700 (Wed, 22 Aug 2007)
Log Message:
-----------
add logos
Added Paths:
-----------
trunk/src/site/resources/images/
trunk/src/site/resources/images/logo.png
trunk/src/site/resources/images/logo.svg
trunk/src/site/resources/images/sourceforge.png
Added: trunk/src/site/resources/images/logo.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/site/resources/images/logo.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/src/site/resources/images/logo.svg
===================================================================
--- trunk/src/site/resources/images/logo.svg (rev 0)
+++ trunk/src/site/resources/images/logo.svg 2007-08-22 15:12:17 UTC (rev 18)
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.45pre1"
+ width="210mm"
+ height="297mm"
+ sodipodi:docbase="C:\apps\java\staticwiki\src\site\resources\images"
+ sodipodi:docname="logo.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ inkscape:export-filename="C:\apps\java\staticwiki\src\site\resources\images\logo.png"
+ inkscape:export-xdpi="553.95715"
+ inkscape:export-ydpi="553.95715"
+ sodipodi:modified="TRUE">
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs5" />
+ <sodipodi:namedview
+ inkscape:window-height="641"
+ inkscape:window-width="1038"
+ inkscape:pageshadow="2"
+ inkscape:pageopacity="0.0"
+ guidetolerance="10.0"
+ gridtolerance="10.0"
+ objecttolerance="10.0"
+ borderopacity="1.0"
+ bordercolor="#666666"
+ pagecolor="#ffffff"
+ id="base"
+ inkscape:zoom="14.445264"
+ inkscape:cx="64.498761"
+ inkscape:cy="1033.2967"
+ inkscape:window-x="88"
+ inkscape:window-y="116"
+ inkscape:current-layer="svg2" />
+ <path
+ style="font-size:12px;font-style:normal;font-weight:normal;fill:none;fill-opacity:1;stroke:#00ff00;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Maiandra GD"
+ d="M 42.453218,15.59986 C 42.593842,15.67408 42.728608,15.728767 42.857515,15.763923 C 42.98642,15.79908 43.11142,15.816658 43.232515,15.816657 C 43.513763,15.816658 43.740325,15.749275 43.912202,15.614509 C 44.084075,15.479744 44.170012,15.302987 44.170015,15.084235 C 44.170012,14.912362 44.123137,14.752206 44.02939,14.603767 C 43.935638,14.455331 43.759857,14.275644 43.502046,14.064704 C 43.459076,14.033457 43.400482,13.986582 43.326265,13.924079 C 42.666108,13.377207 42.33603,12.892833 42.336031,12.470954 C 42.33603,12.299083 42.369233,12.127209 42.43564,11.955329 C 42.502045,11.783459 42.599701,11.619397 42.728609,11.463142 C 42.974701,11.170178 43.262787,10.946546 43.592866,10.792243 C 43.922942,10.637952 44.279387,10.560804 44.662202,10.560798 C 44.849699,10.560804 44.992277,10.596937 45.089937,10.669196 C 45.187589,10.741468 45.236418,10.84596 45.236421,10.982673 C 45.236418,11.049085 45.218839,11.128186 45.183687,11.219978 C 45.148527,11.31178 45.089933,11.42799 45.007906,11.56861 C 44.902434,11.525647 44.802824,11.49342 44.709077,11.471931 C 44.615324,11.450451 44.523528,11.439709 44.433687,11.439704 C 44.109466,11.439709 43.846771,11.518811 43.645601,11.677009 C 43.444427,11.835217 43.343841,12.039318 43.343843,12.289313 C 43.343841,12.562755 43.615325,12.931895 44.158296,13.396735 C 44.295012,13.513926 44.398528,13.605723 44.468843,13.672126 C 44.699309,13.875254 44.86923,14.075449 44.978609,14.272712 C 45.08798,14.46998 45.142668,14.672128 45.142671,14.879157 C 45.142668,15.36744 44.926848,15.788338 44.49521,16.141853 C 44.063567,16.495368 43.539154,16.672126 42.921968,16.672126 C 42.707123,16.672126 42.542084,16.629157 42.426851,16.54322 C 42.311616,16.457282 42.253999,16.336189 42.253999,16.179938 C 42.253999,16.10572 42.269624,16.023689 42.300874,15.933845 C 42.332124,15.844002 42.382905,15.732674 42.453218,15.59986 L 42.453218,15.59986 z M 46.953218,11.838142 C 46.886811,11.838146 46.795014,11.841076 46.677827,11.846931 C 46.560639,11.852795 46.484467,11.855724 46.449312,11.85572 C 46.289155,11.855724 46.17685,11.833263 46.112398,11.788337 C 46.047944,11.74342 46.015718,11.666271 46.015718,11.556892 C 46.015718,11.506115 46.024507,11.446545 46.042085,11.378181 C 46.059663,11.309827 46.087983,11.232678 46.127046,11.146735 C 46.158296,11.146741 46.21103,11.148694 46.285249,11.152595 C 46.359467,11.156506 46.418061,11.158459 46.461031,11.158454 C 46.562592,11.158459 46.724701,11.1526 46.947359,11.140876 C 46.974701,11.140881 46.996186,11.138928 47.011812,11.135017 C 47.011811,11.092053 47.013764,11.0276 47.017671,10.941657 C 47.021576,10.855725 47.023529,10.793225 47.023531,10.754157 C 47.023529,10.449476 47.003998,10.180921 46.964937,9.9484935 C 46.925873,9.7160785 46.865326,9.5119775 46.783296,9.3361895 C 46.951264,9.2541655 47.101654,9.1916655 47.234468,9.1486895 C 47.367279,9.1057275 47.48056,9.0842435 47.574312,9.0842355 C 47.734466,9.0842435 47.850677,9.1340475 47.922945,9.2336495 C 47.995208,9.3332665 48.031341,9.4963525 48.031343,9.7229075 C 48.031341,9.8205705 48.013763,10.127211 47.978609,10.642829 C 47.966888,10.834241 47.957122,10.986585 47.949312,11.09986 C 48.175872,11.068616 48.379973,11.045178 48.561616,11.029548 C 48.743254,11.013928 48.90634,11.006116 49.050874,11.00611 C 49.179777,11.006116 49.27255,11.029553 49.329195,11.076423 C 49.385832,11.123303 49.414152,11.199475 49.414156,11.304938 C 49.414152,11.363537 49.396574,11.43678 49.361421,11.524665 C 49.326261,11.612561 49.27548,11.711193 49.209077,11.820563 C 49.107512,11.797131 49.00009,11.779553 48.886812,11.767829 C 48.773528,11.756115 48.636809,11.750256 48.476656,11.750251 C 48.449309,11.750256 48.367278,11.753185 48.230562,11.75904 C 48.093841,11.764904 47.976653,11.769787 47.878999,11.773688 C 47.843841,12.383068 47.81845,12.88502 47.802827,13.279548 C 47.7872,13.674082 47.779388,13.996347 47.77939,14.246345 C 47.779388,14.789315 47.827239,15.169198 47.922945,15.385993 C 48.018645,15.602791 48.179778,15.711189 48.406343,15.711188 C 48.46884,15.711189 48.53427,15.699471 48.602632,15.676032 C 48.670989,15.652596 48.740324,15.615486 48.81064,15.564704 C 48.845793,15.64283 48.871184,15.711189 48.886812,15.769782 C 48.902434,15.828377 48.910246,15.881111 48.910249,15.927985 C 48.910246,16.119392 48.831145,16.276618 48.672945,16.399665 C 48.514739,16.522712 48.308684,16.584235 48.054781,16.584235 C 47.632904,16.584235 47.319427,16.444587 47.114351,16.16529 C 46.909272,15.885994 46.806733,15.457283 46.806734,14.879157 C 46.806733,14.715097 46.826264,14.280527 46.865327,13.575446 C 46.904389,12.870372 46.933686,12.291271 46.953218,11.838142 L 46.953218,11.838142 z M 55.162202,16.226813 C 55.009853,16.32447 54.871182,16.398689 54.746187,16.44947 C 54.621182,16.500251 54.511807,16.525642 54.418062,16.525642 C 54.250089,16.525642 54.128018,16.473884 54.051851,16.370368 C 53.975675,16.266853 53.931729,16.099861 53.920015,15.869392 C 53.627042,16.119392 53.337003,16.304939 53.049898,16.426032 C 52.762785,16.547126 52.470793,16.607673 52.173921,16.607673 C 51.587982,16.607673 51.115326,16.44361 50.755952,16.115485 C 50.396577,15.787361 50.216889,15.355721 50.21689,14.820563 C 50.216889,14.215097 50.463959,13.729746 50.958101,13.364509 C 51.45224,12.999278 52.117278,12.816661 52.953218,12.816657 C 53.089933,12.816661 53.235441,12.821544 53.389741,12.831306 C 53.544035,12.841075 53.709073,12.855723 53.884859,12.875251 C 53.892667,12.840098 53.89755,12.803966 53.899507,12.766853 C 53.901456,12.729747 53.902433,12.685802 53.902437,12.635017 C 53.902433,12.228771 53.788175,11.919201 53.559663,11.706306 C 53.331144,11.49342 53.00009,11.386975 52.566499,11.38697 C 52.207122,11.386975 51.911224,11.446545 51.678804,11.565681 C 51.44638,11.684826 51.257904,11.869396 51.113374,12.119392 C 50.972748,12.08424 50.866303,12.023693 50.794038,11.937751 C 50.721772,11.851818 50.685639,11.74049 50.68564,11.603767 C 50.685639,11.318616 50.866303,11.083264 51.227632,10.897712 C 51.588958,10.712171 52.060638,10.619398 52.642671,10.619392 C 53.357511,10.619398 53.893644,10.792249 54.25107,11.137946 C 54.608487,11.483654 54.787197,12.000256 54.787202,12.687751 C 54.787197,12.816661 54.781338,13.04127 54.769624,13.361579 C 54.757901,13.681894 54.752041,13.939707 54.752046,14.135017 C 54.752041,14.674081 54.784268,15.107674 54.848726,15.435798 C 54.913174,15.763924 55.017666,16.027595 55.162202,16.226813 L 55.162202,16.226813 z M 53.87314,13.619392 C 53.693448,13.592051 53.532316,13.571543 53.389741,13.557868 C 53.24716,13.544199 53.12509,13.537363 53.023531,13.53736 C 52.418059,13.537363 51.961028,13.637949 51.652437,13.839118 C 51.343841,14.040293 51.189545,14.340097 51.189546,14.738532 C 51.189545,15.058846 51.296966,15.310799 51.511812,15.494392 C 51.726654,15.677986 52.023528,15.769783 52.402437,15.769782 C 52.68759,15.769783 52.954191,15.716072 53.202241,15.608649 C 53.450285,15.501229 53.677823,15.340096 53.884859,15.125251 C 53.877042,14.92994 53.872159,14.770761 53.87021,14.647712 C 53.868253,14.524667 53.867276,14.406503 53.867281,14.29322 C 53.867276,14.22291 53.86923,14.112558 53.87314,13.962165 C 53.877042,13.811777 53.877042,13.697519 53.87314,13.619392 L 53.87314,13.619392 z M 56.914156,11.838142 C 56.847748,11.838146 56.755951,11.841076 56.638765,11.846931 C 56.521577,11.852795 56.445405,11.855724 56.410249,11.85572 C 56.250092,11.855724 56.137788,11.833263 56.073335,11.788337 C 56.008882,11.74342 55.976655,11.666271 55.976656,11.556892 C 55.976655,11.506115 55.985444,11.446545 56.003023,11.378181 C 56.020601,11.309827 56.048921,11.232678 56.087984,11.146735 C 56.119233,11.146741 56.171968,11.148694 56.246187,11.152595 C 56.320405,11.156506 56.378999,11.158459 56.421968,11.158454 C 56.52353,11.158459 56.685639,11.1526 56.908296,11.140876 C 56.935639,11.140881 56.957123,11.138928 56.972749,11.135017 C 56.972748,11.092053 56.974701,11.0276 56.978609,10.941657 C 56.982514,10.855725 56.984467,10.793225 56.984468,10.754157 C 56.984467,10.449476 56.964936,10.180921 56.925874,9.9484935 C 56.886811,9.7160785 56.826264,9.5119775 56.744234,9.3361895 C 56.912201,9.2541655 57.062592,9.1916655 57.195406,9.1486895 C 57.328216,9.1057275 57.441498,9.0842435 57.535249,9.0842355 C 57.695404,9.0842435 57.811614,9.1340475 57.883882,9.2336495 C 57.956145,9.3332665 57.992278,9.4963525 57.992281,9.7229075 C 57.992278,9.8205705 57.9747,10.127211 57.939546,10.642829 C 57.927825,10.834241 57.91806,10.986585 57.910249,11.09986 C 58.136809,11.068616 58.340911,11.045178 58.522554,11.029548 C 58.704192,11.013928 58.867277,11.006116 59.011812,11.00611 C 59.140715,11.006116 59.233488,11.029553 59.290132,11.076423 C 59.346769,11.123303 59.375089,11.199475 59.375093,11.304938 C 59.375089,11.363537 59.357511,11.43678 59.322359,11.524665 C 59.287199,11.612561 59.236418,11.711193 59.170015,11.820563 C 59.068449,11.797131 58.961027,11.779553 58.847749,11.767829 C 58.734465,11.756115 58.597746,11.750256 58.437593,11.750251 C 58.410247,11.750256 58.328215,11.753185 58.191499,11.75904 C 58.054778,11.764904 57.937591,11.769787 57.839937,11.773688 C 57.804778,12.383068 57.779388,12.88502 57.763765,13.279548 C 57.748138,13.674082 57.740325,13.996347 57.740327,14.246345 C 57.740325,14.789315 57.788177,15.169198 57.883882,15.385993 C 57.979583,15.602791 58.140716,15.711189 58.367281,15.711188 C 58.429778,15.711189 58.495207,15.699471 58.56357,15.676032 C 58.631926,15.652596 58.701262,15.615486 58.771577,15.564704 C 58.806731,15.64283 58.832121,15.711189 58.847749,15.769782 C 58.863371,15.828377 58.871184,15.881111 58.871187,15.927985 C 58.871184,16.119392 58.792082,16.276618 58.633882,16.399665 C 58.475676,16.522712 58.269622,16.584235 58.015718,16.584235 C 57.593841,16.584235 57.280365,16.444587 57.075288,16.16529 C 56.870209,15.885994 56.76767,15.457283 56.767671,14.879157 C 56.76767,14.715097 56.787201,14.280527 56.826265,13.575446 C 56.865326,12.870372 56.894623,12.291271 56.914156,11.838142 L 56.914156,11.838142 z M 61.976656,16.273688 C 61.812591,16.363532 61.656341,16.429939 61.507906,16.472907 C 61.359466,16.515876 61.216888,16.53736 61.080171,16.53736 C 60.888764,16.53736 60.758881,16.485603 60.690523,16.382087 C 60.622162,16.278572 60.587983,16.070564 60.587984,15.758063 C 60.587983,15.578377 60.605561,15.176034 60.640718,14.551032 C 60.675873,13.926035 60.693451,13.388926 60.693452,12.939704 C 60.693451,12.451427 60.670014,12.054943 60.62314,11.750251 C 60.576264,11.445569 60.500092,11.185803 60.394624,10.970954 C 60.539155,10.885022 60.687592,10.819593 60.839937,10.774665 C 60.992279,10.729749 61.14267,10.707288 61.291109,10.707282 C 61.470794,10.707288 61.593841,10.751233 61.660249,10.839118 C 61.726654,10.927014 61.759857,11.0901 61.759859,11.328376 C 61.759857,11.390881 61.742278,11.732678 61.707124,12.353767 C 61.671966,12.974864 61.654388,13.564707 61.65439,14.123298 C 61.654388,14.646737 61.680755,15.080331 61.733491,15.424079 C 61.786224,15.76783 61.867278,16.051033 61.976656,16.273688 L 61.976656,16.273688 z M 61.929781,8.9201735 C 61.929778,9.1428375 61.851653,9.3283835 61.695406,9.4768145 C 61.539154,9.6252585 61.341888,9.6994775 61.103609,9.6994705 C 60.896576,9.6994775 60.732514,9.6408835 60.611421,9.5236895 C 60.490327,9.4065085 60.42978,9.2483055 60.429781,9.0490795 C 60.42978,8.8303375 60.507905,8.6438145 60.664156,8.4895095 C 60.820404,8.3352205 61.009857,8.2580725 61.232515,8.2580645 C 61.435638,8.2580725 61.60263,8.3205725 61.733491,8.4455645 C 61.864349,8.5705715 61.929778,8.7287745 61.929781,8.9201735 L 61.929781,8.9201735 z M 67.173921,11.808845 C 67.021573,11.7151 66.873136,11.647717 66.728609,11.606696 C 66.584074,11.565686 66.423917,11.545178 66.24814,11.545173 C 65.654387,11.545178 65.160247,11.758068 64.765718,12.183845 C 64.371185,12.60963 64.17392,13.148692 64.173921,13.801032 C 64.17392,14.390878 64.348724,14.858651 64.698335,15.204353 C 65.047942,15.550057 65.521575,15.722908 66.119234,15.722907 C 66.377043,15.722908 66.611417,15.687752 66.822359,15.617438 C 67.033292,15.547127 67.230557,15.437752 67.414156,15.289313 C 67.484463,15.386971 67.538174,15.480721 67.575288,15.570563 C 67.612393,15.660408 67.630947,15.746346 67.630952,15.828376 C 67.630947,16.07447 67.48837,16.269782 67.203218,16.414313 C 66.918058,16.558845 66.531339,16.63111 66.043062,16.63111 C 65.187591,16.63111 64.492279,16.385993 63.957124,15.895759 C 63.421967,15.405526 63.154389,14.767831 63.15439,13.982673 C 63.154389,13.029551 63.478608,12.228771 64.127046,11.580329 C 64.775482,10.931897 65.56259,10.607679 66.488374,10.607673 C 66.828214,10.607679 67.081143,10.656507 67.247163,10.754157 C 67.413174,10.851819 67.496182,11.000257 67.496187,11.19947 C 67.496182,11.301037 67.470791,11.39967 67.420015,11.495368 C 67.369229,11.591076 67.287198,11.695568 67.173921,11.808845 L 67.173921,11.808845 z M 67.84189,11.234626 C 67.974702,11.054944 68.110444,10.916272 68.249116,10.81861 C 68.387788,10.72096 68.515717,10.672132 68.632906,10.672126 C 68.882904,10.672132 69.128998,11.099866 69.371187,11.955329 C 69.468841,12.283458 69.546966,12.54713 69.605562,12.746345 C 69.85556,13.543223 70.081145,14.1858 70.28232,14.674079 C 70.483489,15.162362 70.623137,15.406502 70.701265,15.406501 C 70.779387,15.406502 70.964934,15.115487 71.257906,14.533454 C 71.550871,13.951425 71.796964,13.295176 71.996187,12.564704 C 72.058683,12.338146 72.125089,12.045177 72.195406,11.685798 C 72.316495,11.072522 72.505948,10.765882 72.763765,10.765876 C 73.009853,10.765882 73.216884,11.156506 73.384859,11.937751 C 73.435634,12.17213 73.47665,12.357677 73.507906,12.494392 C 73.691493,13.283457 73.896571,13.966074 74.12314,14.542243 C 74.349696,15.118416 74.507899,15.406502 74.597749,15.406501 C 74.628992,15.406502 74.699305,15.33033 74.808687,15.177985 C 74.918055,15.025643 75.041101,14.830331 75.177827,14.592048 C 75.533288,13.959238 75.797937,13.384043 75.971773,12.866462 C 76.145593,12.348888 76.232506,11.877209 76.232515,11.451423 C 76.232506,11.322522 76.221764,11.202405 76.200288,11.091071 C 76.178796,10.979749 76.144616,10.867444 76.097749,10.754157 C 76.211022,10.722913 76.307702,10.701429 76.387788,10.689704 C 76.467858,10.677991 76.543053,10.672132 76.613374,10.672126 C 76.836022,10.672132 77.00399,10.727796 77.117281,10.839118 C 77.230552,10.950452 77.287193,11.113538 77.287202,11.328376 C 77.287193,11.754162 77.136802,12.327404 76.836031,13.048103 C 76.535241,13.768808 76.117272,14.539315 75.582124,15.359626 C 75.324304,15.758064 75.093836,16.061775 74.890718,16.270759 C 74.687586,16.479743 74.521571,16.584235 74.392671,16.584235 C 74.15829,16.584235 73.906337,16.271736 73.636812,15.646735 C 73.367275,15.021737 73.056728,14.025644 72.705171,12.658454 C 72.32626,13.842051 71.938565,14.792245 71.542085,15.50904 C 71.145598,16.225837 70.820403,16.584235 70.566499,16.584235 C 70.449309,16.584235 70.295012,16.437751 70.103609,16.144782 C 69.9122,15.851814 69.69931,15.42994 69.464937,14.879157 C 69.269623,14.426034 69.029389,13.826426 68.744234,13.080329 C 68.345796,12.029552 68.045015,11.414319 67.84189,11.234626 L 67.84189,11.234626 z M 79.953218,16.273688 C 79.789153,16.363532 79.632904,16.429939 79.484468,16.472907 C 79.336029,16.515876 79.193451,16.53736 79.056734,16.53736 C 78.865326,16.53736 78.735444,16.485603 78.667085,16.382087 C 78.598725,16.278572 78.564545,16.070564 78.564546,15.758063 C 78.564545,15.578377 78.582123,15.176034 78.617281,14.551032 C 78.652436,13.926035 78.670014,13.388926 78.670015,12.939704 C 78.670014,12.451427 78.646576,12.054943 78.599702,11.750251 C 78.552827,11.445569 78.476655,11.185803 78.371187,10.970954 C 78.515717,10.885022 78.664155,10.819593 78.816499,10.774665 C 78.968842,10.729749 79.119232,10.707288 79.267671,10.707282 C 79.447357,10.707288 79.570404,10.751233 79.636812,10.839118 C 79.703216,10.927014 79.736419,11.0901 79.736421,11.328376 C 79.736419,11.390881 79.718841,11.732678 79.683687,12.353767 C 79.648529,12.974864 79.63095,13.564707 79.630952,14.123298 C 79.63095,14.646737 79.657318,15.080331 79.710054,15.424079 C 79.762786,15.76783 79.843841,16.051033 79.953218,16.273688 L 79.953218,16.273688 z M 79.906343,8.9201735 C 79.906341,9.1428375 79.828216,9.3283835 79.671968,9.4768145 C 79.515716,9.6252585 79.318451,9.6994775 79.080171,9.6994705 C 78.873139,9.6994775 78.709076,9.6408835 78.587984,9.5236895 C 78.466889,9.4065085 78.406342,9.2483055 78.406343,9.0490795 C 78.406342,8.8303375 78.484467,8.6438145 78.640718,8.4895095 C 78.796967,8.3352205 78.98642,8.2580725 79.209077,8.2580645 C 79.412201,8.2580725 79.579193,8.3205725 79.710054,8.4455645 C 79.840911,8.5705715 79.906341,8.7287745 79.906343,8.9201735 L 79.906343,8.9201735 z M 82.824312,16.285407 C 82.660247,16.371345 82.509857,16.434821 82.37314,16.475837 C 82.23642,16.516853 82.101654,16.53736 81.968843,16.53736 C 81.800873,16.53736 81.680756,16.481696 81.608491,16.370368 C 81.536225,16.25904 81.500092,16.062751 81.500093,15.781501 C 81.500092,15.687752 81.526459,15.107674 81.579195,14.041267 C 81.631928,12.974864 81.658295,11.955334 81.658296,10.982673 C 81.658295,10.021742 81.636811,9.3615865 81.593843,9.0022045 C 81.550873,8.6428375 81.476655,8.3674475 81.371187,8.1760325 C 81.539155,8.0901035 81.692475,8.0266275 81.831148,7.9856035 C 81.969818,7.9445965 82.095795,7.9240885 82.209077,7.9240795 C 82.392669,7.9240885 82.518646,7.9758465 82.587007,8.0793535 C 82.655365,8.1828775 82.689544,8.3869785 82.689546,8.6916575 C 82.689544,8.7619785 82.679779,8.9592435 82.660249,9.2834545 C 82.57431,10.685804 82.531341,12.043224 82.531343,13.35572 C 83.355559,12.687755 83.988371,12.135021 84.429781,11.697517 C 84.871183,11.260022 85.162198,10.900647 85.302827,10.619392 C 85.572354,10.717054 85.761807,10.812757 85.871187,10.906501 C 85.980557,11.000257 86.035244,11.109631 86.035249,11.234626 C 86.035244,11.4026 85.539151,11.873303 84.546968,12.646735 C 84.105558,12.990489 83.753996,13.267832 83.492281,13.478767 C 83.566496,13.549082 83.673918,13.648691 83.814546,13.777595 C 85.345792,15.226815 86.242275,15.951423 86.503999,15.951423 L 86.527437,15.951423 C 86.492275,16.185798 86.423915,16.364509 86.322359,16.487556 C 86.220791,16.610602 86.089931,16.672126 85.929781,16.672126 C 85.668057,16.672126 85.109464,16.236579 84.253999,15.365485 C 83.570403,14.670175 82.992278,14.109628 82.519624,13.683845 L 82.519624,13.947517 C 82.519622,14.580331 82.544037,15.080331 82.592866,15.447517 C 82.641693,15.814705 82.718841,16.094001 82.824312,16.285407 L 82.824312,16.285407 z M 89.000093,16.273688 C 88.836028,16.363532 88.679779,16.429939 88.531343,16.472907 C 88.382904,16.515876 88.240326,16.53736 88.103609,16.53736 C 87.912201,16.53736 87.782319,16.485603 87.71396,16.382087 C 87.6456,16.278572 87.61142,16.070564 87.611421,15.758063 C 87.61142,15.578377 87.628998,15.176034 87.664156,14.551032 C 87.699311,13.926035 87.716889,13.388926 87.71689,12.939704 C 87.716889,12.451427 87.693451,12.054943 87.646577,11.750251 C 87.599702,11.445569 87.52353,11.185803 87.418062,10.970954 C 87.562592,10.885022 87.71103,10.819593 87.863374,10.774665 C 88.015717,10.729749 88.166107,10.707288 88.314546,10.707282 C 88.494232,10.707288 88.617279,10.751233 88.683687,10.839118 C 88.750091,10.927014 88.783294,11.0901 88.783296,11.328376 C 88.783294,11.390881 88.765716,11.732678 88.730562,12.353767 C 88.695404,12.974864 88.677825,13.564707 88.677827,14.123298 C 88.677825,14.646737 88.704193,15.080331 88.756929,15.424079 C 88.809661,15.76783 88.890716,16.051033 89.000093,16.273688 L 89.000093,16.273688 z M 88.953218,8.9201735 C 88.953216,9.1428375 88.875091,9.3283835 88.718843,9.4768145 C 88.562591,9.6252585 88.365326,9.6994775 88.127046,9.6994705 C 87.920014,9.6994775 87.755951,9.6408835 87.634859,9.5236895 C 87.513764,9.4065085 87.453217,9.2483055 87.453218,9.0490795 C 87.453217,8.8303375 87.531342,8.6438145 87.687593,8.4895095 C 87.843842,8.3352205 88.033295,8.2580725 88.255952,8.2580645 C 88.459076,8.2580725 88.626068,8.3205725 88.756929,8.4455645 C 88.887786,8.5705715 88.953216,8.7287745 88.953218,8.9201735 L 88.953218,8.9201735 z "
+ id="path2163" />
+ <path
+ style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Maiandra GD"
+ d="M 42.443222,15.652681 C 42.583846,15.726901 42.718612,15.781588 42.847519,15.816744 C 42.976424,15.851901 43.101424,15.869479 43.222519,15.869478 C 43.503767,15.869479 43.730329,15.802096 43.902206,15.66733 C 44.074079,15.532565 44.160016,15.355808 44.160019,15.137056 C 44.160016,14.965183 44.113141,14.805027 44.019394,14.656588 C 43.925642,14.508152 43.749861,14.328465 43.49205,14.117525 C 43.44908,14.086278 43.390486,14.039403 43.316269,13.9769 C 42.656112,13.430028 42.326034,12.945654 42.326035,12.523775 C 42.326034,12.351904 42.359237,12.18003 42.425644,12.00815 C 42.492049,11.83628 42.589705,11.672218 42.718613,11.515963 C 42.964705,11.222999 43.252791,10.999367 43.58287,10.845064 C 43.912946,10.690773 44.269391,10.613625 44.652206,10.613619 C 44.839703,10.613625 44.982281,10.649758 45.079941,10.722017 C 45.177593,10.794289 45.226422,10.898781 45.226425,11.035494 C 45.226422,11.101906 45.208843,11.181007 45.173691,11.272799 C 45.138531,11.364601 45.079937,11.480811 44.99791,11.621431 C 44.892438,11.578468 44.792828,11.546241 44.699081,11.524752 C 44.605328,11.503272 44.513532,11.49253 44.423691,11.492525 C 44.09947,11.49253 43.836775,11.571632 43.635605,11.72983 C 43.434431,11.888038 43.333845,12.092139 43.333847,12.342134 C 43.333845,12.615576 43.605329,12.984716 44.1483,13.449556 C 44.285016,13.566747 44.388532,13.658544 44.458847,13.724947 C 44.689313,13.928075 44.859234,14.12827 44.968613,14.325533 C 45.077984,14.522801 45.132672,14.724949 45.132675,14.931978 C 45.132672,15.420261 44.916852,15.841159 44.485214,16.194674 C 44.053571,16.548189 43.529158,16.724947 42.911972,16.724947 C 42.697127,16.724947 42.532088,16.681978 42.416855,16.596041 C 42.30162,16.510103 42.244003,16.38901 42.244003,16.232759 C 42.244003,16.158541 42.259628,16.07651 42.290878,15.986666 C 42.322128,15.896823 42.372909,15.785495 42.443222,15.652681 L 42.443222,15.652681 z M 46.943222,11.890963 C 46.876815,11.890967 46.785018,11.893897 46.667831,11.899752 C 46.550643,11.905616 46.474471,11.908545 46.439316,11.908541 C 46.279159,11.908545 46.166854,11.886084 46.102402,11.841158 C 46.037948,11.796241 46.005722,11.719092 46.005722,11.609713 C 46.005722,11.558936 46.014511,11.499366 46.032089,11.431002 C 46.049667,11.362648 46.077987,11.285499 46.11705,11.199556 C 46.1483,11.199562 46.201034,11.201515 46.275253,11.205416 C 46.349471,11.209327 46.408065,11.21128 46.451035,11.211275 C 46.552596,11.21128 46.714705,11.205421 46.937363,11.193697 C 46.964705,11.193702 46.98619,11.191749 47.001816,11.187838 C 47.001815,11.144874 47.003768,11.080421 47.007675,10.994478 C 47.01158,10.908546 47.013533,10.846046 47.013535,10.806978 C 47.013533,10.502297 46.994002,10.233742 46.954941,10.001314 C 46.915877,9.7688991 46.85533,9.5647978 46.7733,9.3890095 C 46.941268,9.3069855 47.091658,9.2444856 47.224472,9.2015095 C 47.357283,9.1585482 47.470564,9.1370638 47.564316,9.1370564 C 47.72447,9.1370638 47.840681,9.1868684 47.912949,9.2864704 C 47.985212,9.386087 48.021345,9.5491728 48.021347,9.7757282 C 48.021345,9.8733912 48.003767,10.180032 47.968613,10.69565 C 47.956892,10.887062 47.947126,11.039406 47.939316,11.152681 C 48.165876,11.121437 48.369977,11.097999 48.55162,11.082369 C 48.733258,11.066749 48.896344,11.058937 49.040878,11.058931 C 49.169781,11.058937 49.262554,11.082374 49.319199,11.129244 C 49.375836,11.176124 49.404156,11.252296 49.40416,11.357759 C 49.404156,11.416358 49.386578,11.489601 49.351425,11.577486 C 49.316265,11.665382 49.265484,11.764014 49.199081,11.873384 C 49.097516,11.849952 48.990094,11.832374 48.876816,11.82065 C 48.763532,11.808936 48.626813,11.803077 48.46666,11.803072 C 48.439313,11.803077 48.357282,11.806006 48.220566,11.811861 C 48.083845,11.817725 47.966657,11.822608 47.869003,11.826509 C 47.833845,12.435889 47.808454,12.937841 47.792831,13.332369 C 47.777204,13.726903 47.769392,14.049168 47.769394,14.299166 C 47.769392,14.842136 47.817243,15.222019 47.912949,15.438814 C 48.008649,15.655612 48.169782,15.76401 48.396347,15.764009 C 48.458844,15.76401 48.524274,15.752292 48.592636,15.728853 C 48.660993,15.705417 48.730328,15.668307 48.800644,15.617525 C 48.835797,15.695651 48.861188,15.76401 48.876816,15.822603 C 48.892438,15.881198 48.90025,15.933932 48.900253,15.980806 C 48.90025,16.172213 48.821149,16.329439 48.662949,16.452486 C 48.504743,16.575533 48.298688,16.637056 48.044785,16.637056 C 47.622908,16.637056 47.309431,16.497408 47.104355,16.218111 C 46.899276,15.938815 46.796737,15.510104 46.796738,14.931978 C 46.796737,14.767918 46.816268,14.333348 46.855331,13.628267 C 46.894393,12.923193 46.92369,12.344092 46.943222,11.890963 L 46.943222,11.890963 z M 55.152206,16.279634 C 54.999857,16.377291 54.861186,16.45151 54.736191,16.502291 C 54.611186,16.553072 54.501811,16.578463 54.408066,16.578463 C 54.240093,16.578463 54.118022,16.526705 54.041855,16.423189 C 53.965679,16.319674 53.921733,16.152682 53.910019,15.922213 C 53.617046,16.172213 53.327007,16.35776 53.039902,16.478853 C 52.752789,16.599947 52.460797,16.660494 52.163925,16.660494 C 51.577986,16.660494 51.10533,16.496431 50.745956,16.168306 C 50.386581,15.840182 50.206893,15.408542 50.206894,14.873384 C 50.206893,14.267918 50.453963,13.782567 50.948105,13.41733 C 51.442244,13.052099 52.107282,12.869482 52.943222,12.869478 C 53.079937,12.869482 53.225445,12.874365 53.379745,12.884127 C 53.534039,12.893896 53.699077,12.908544 53.874863,12.928072 C 53.882671,12.892919 53.887554,12.856787 53.889511,12.819674 C 53.89146,12.782568 53.892437,12.738623 53.892441,12.687838 C 53.892437,12.281592 53.778179,11.972022 53.549667,11.759127 C 53.321148,11.546241 52.990094,11.439796 52.556503,11.439791 C 52.197126,11.439796 51.901228,11.499366 51.668808,11.618502 C 51.436384,11.737647 51.247908,11.922217 51.103378,12.172213 C 50.962752,12.137061 50.856307,12.076514 50.784042,11.990572 C 50.711776,11.904639 50.675643,11.793311 50.675644,11.656588 C 50.675643,11.371437 50.856307,11.136085 51.217636,10.950533 C 51.578962,10.764992 52.050642,10.672219 52.632675,10.672213 C 53.347515,10.672219 53.883648,10.84507 54.241074,11.190767 C 54.598491,11.536475 54.777201,12.053077 54.777206,12.740572 C 54.777201,12.869482 54.771342,13.094091 54.759628,13.4144 C 54.747905,13.734715 54.742045,13.992528 54.74205,14.187838 C 54.742045,14.726902 54.774272,15.160495 54.83873,15.488619 C 54.903178,15.816745 55.00767,16.080416 55.152206,16.279634 L 55.152206,16.279634 z M 53.863144,13.672213 C 53.683452,13.644872 53.52232,13.624364 53.379745,13.610689 C 53.237164,13.59702 53.115094,13.590184 53.013535,13.590181 C 52.408063,13.590184 51.951032,13.69077 51.642441,13.891939 C 51.333845,14.093114 51.179549,14.392918 51.17955,14.791353 C 51.179549,15.111667 51.28697,15.36362 51.501816,15.547213 C 51.716658,15.730807 52.013532,15.822604 52.392441,15.822603 C 52.677594,15.822604 52.944195,15.768893 53.192245,15.66147 C 53.440289,15.55405 53.667827,15.392917 53.874863,15.178072 C 53.867046,14.982761 53.862163,14.823582 53.860214,14.700533 C 53.858257,14.577488 53.85728,14.459324 53.857285,14.346041 C 53.85728,14.275731 53.859234,14.165379 53.863144,14.014986 C 53.867046,13.864598 53.867046,13.75034 53.863144,13.672213 L 53.863144,13.672213 z M 56.90416,11.890963 C 56.837752,11.890967 56.745955,11.893897 56.628769,11.899752 C 56.511581,11.905616 56.435409,11.908545 56.400253,11.908541 C 56.240096,11.908545 56.127792,11.886084 56.063339,11.841158 C 55.998886,11.796241 55.966659,11.719092 55.96666,11.609713 C 55.966659,11.558936 55.975448,11.499366 55.993027,11.431002 C 56.010605,11.362648 56.038925,11.285499 56.077988,11.199556 C 56.109237,11.199562 56.161972,11.201515 56.236191,11.205416 C 56.310409,11.209327 56.369003,11.21128 56.411972,11.211275 C 56.513534,11.21128 56.675643,11.205421 56.8983,11.193697 C 56.925643,11.193702 56.947127,11.191749 56.962753,11.187838 C 56.962752,11.144874 56.964705,11.080421 56.968613,10.994478 C 56.972518,10.908546 56.974471,10.846046 56.974472,10.806978 C 56.974471,10.502297 56.95494,10.233742 56.915878,10.001314 C 56.876815,9.7688991 56.816268,9.5647978 56.734238,9.3890095 C 56.902205,9.3069855 57.052596,9.2444856 57.18541,9.2015095 C 57.31822,9.1585482 57.431502,9.1370638 57.525253,9.1370564 C 57.685408,9.1370638 57.801618,9.1868684 57.873886,9.2864704 C 57.946149,9.386087 57.982282,9.5491728 57.982285,9.7757282 C 57.982282,9.8733912 57.964704,10.180032 57.92955,10.69565 C 57.917829,10.887062 57.908064,11.039406 57.900253,11.152681 C 58.126813,11.121437 58.330915,11.097999 58.512558,11.082369 C 58.694196,11.066749 58.857281,11.058937 59.001816,11.058931 C 59.130719,11.058937 59.223492,11.082374 59.280136,11.129244 C 59.336773,11.176124 59.365093,11.252296 59.365097,11.357759 C 59.365093,11.416358 59.347515,11.489601 59.312363,11.577486 C 59.277203,11.665382 59.226422,11.764014 59.160019,11.873384 C 59.058453,11.849952 58.951031,11.832374 58.837753,11.82065 C 58.724469,11.808936 58.58775,11.803077 58.427597,11.803072 C 58.400251,11.803077 58.318219,11.806006 58.181503,11.811861 C 58.044782,11.817725 57.927595,11.822608 57.829941,11.826509 C 57.794782,12.435889 57.769392,12.937841 57.753769,13.332369 C 57.738142,13.726903 57.730329,14.049168 57.730331,14.299166 C 57.730329,14.842136 57.778181,15.222019 57.873886,15.438814 C 57.969587,15.655612 58.13072,15.76401 58.357285,15.764009 C 58.419782,15.76401 58.485211,15.752292 58.553574,15.728853 C 58.62193,15.705417 58.691266,15.668307 58.761581,15.617525 C 58.796735,15.695651 58.822125,15.76401 58.837753,15.822603 C 58.853375,15.881198 58.861188,15.933932 58.861191,15.980806 C 58.861188,16.172213 58.782086,16.329439 58.623886,16.452486 C 58.46568,16.575533 58.259626,16.637056 58.005722,16.637056 C 57.583845,16.637056 57.270369,16.497408 57.065292,16.218111 C 56.860213,15.938815 56.757674,15.510104 56.757675,14.931978 C 56.757674,14.767918 56.777205,14.333348 56.816269,13.628267 C 56.85533,12.923193 56.884627,12.344092 56.90416,11.890963 L 56.90416,11.890963 z M 61.96666,16.326509 C 61.802595,16.416353 61.646345,16.48276 61.49791,16.525728 C 61.34947,16.568697 61.206892,16.590181 61.070175,16.590181 C 60.878768,16.590181 60.748885,16.538424 60.680527,16.434908 C 60.612166,16.331393 60.577987,16.123385 60.577988,15.810884 C 60.577987,15.631198 60.595565,15.228855 60.630722,14.603853 C 60.665877,13.978856 60.683455,13.441747 60.683456,12.992525 C 60.683455,12.504248 60.660018,12.107764 60.613144,11.803072 C 60.566268,11.49839 60.490096,11.238624 60.384628,11.023775 C 60.529159,10.937843 60.677596,10.872414 60.829941,10.827486 C 60.982283,10.78257 61.132674,10.760109 61.281113,10.760103 C 61.460798,10.760109 61.583845,10.804054 61.650253,10.891939 C 61.716658,10.979835 61.749861,11.142921 61.749863,11.381197 C 61.749861,11.443702 61.732282,11.785499 61.697128,12.406588 C 61.66197,13.027685 61.644392,13.617528 61.644394,14.176119 C 61.644392,14.699558 61.670759,15.133152 61.723495,15.4769 C 61.776228,15.820651 61.857282,16.103854 61.96666,16.326509 L 61.96666,16.326509 z M 61.919785,8.9729939 C 61.919782,9.1956575 61.841657,9.3812042 61.68541,9.5296345 C 61.529158,9.6780789 61.331892,9.7522976 61.093613,9.7522907 C 60.88658,9.7522976 60.722518,9.6937039 60.601425,9.5765095 C 60.480331,9.4593291 60.419784,9.3011261 60.419785,9.1019001 C 60.419784,8.8831578 60.497909,8.6966346 60.65416,8.5423298 C 60.810408,8.3880411 60.999861,8.3108928 61.222519,8.3108845 C 61.425642,8.3108928 61.592634,8.3733927 61.723495,8.4983845 C 61.854353,8.6233924 61.919782,8.7815954 61.919785,8.9729939 L 61.919785,8.9729939 z M 67.163925,11.861666 C 67.011577,11.767921 66.86314,11.700538 66.718613,11.659517 C 66.574078,11.618507 66.413921,11.597999 66.238144,11.597994 C 65.644391,11.597999 65.150251,11.810889 64.755722,12.236666 C 64.361189,12.662451 64.163924,13.201513 64.163925,13.853853 C 64.163924,14.443699 64.338728,14.911472 64.688339,15.257174 C 65.037946,15.602878 65.511579,15.775729 66.109238,15.775728 C 66.367047,15.775729 66.601421,15.740573 66.812363,15.670259 C 67.023296,15.599948 67.220561,15.490573 67.40416,15.342134 C 67.474467,15.439792 67.528178,15.533542 67.565292,15.623384 C 67.602397,15.713229 67.620951,15.799167 67.620956,15.881197 C 67.620951,16.127291 67.478374,16.322603 67.193222,16.467134 C 66.908062,16.611666 66.521343,16.683931 66.033066,16.683931 C 65.177595,16.683931 64.482283,16.438814 63.947128,15.94858 C 63.411971,15.458347 63.144393,14.820652 63.144394,14.035494 C 63.144393,13.082372 63.468612,12.281592 64.11705,11.63315 C 64.765486,10.984718 65.552594,10.6605 66.478378,10.660494 C 66.818218,10.6605 67.071147,10.709328 67.237167,10.806978 C 67.403178,10.90464 67.486186,11.053078 67.486191,11.252291 C 67.486186,11.353858 67.460795,11.452491 67.410019,11.548189 C 67.359233,11.643897 67.277202,11.748389 67.163925,11.861666 L 67.163925,11.861666 z M 67.831894,11.287447 C 67.964706,11.107765 68.100448,10.969093 68.23912,10.871431 C 68.377792,10.773781 68.505721,10.724953 68.62291,10.724947 C 68.872908,10.724953 69.119002,11.152687 69.361191,12.00815 C 69.458845,12.336279 69.53697,12.599951 69.595566,12.799166 C 69.845564,13.596044 70.071149,14.238621 70.272324,14.7269 C 70.473493,15.215183 70.613141,15.459323 70.691269,15.459322 C 70.769391,15.459323 70.954938,15.168308 71.24791,14.586275 C 71.540875,14.004246 71.786968,13.347997 71.986191,12.617525 C 72.048687,12.390967 72.115093,12.097998 72.18541,11.738619 C 72.306499,11.125343 72.495952,10.818703 72.753769,10.818697 C 72.999857,10.818703 73.206888,11.209327 73.374863,11.990572 C 73.425638,12.224951 73.466654,12.410498 73.49791,12.547213 C 73.681497,13.336278 73.886575,14.018895 74.113144,14.595064 C 74.3397,15.171237 74.497903,15.459323 74.587753,15.459322 C 74.618996,15.459323 74.689309,15.383151 74.798691,15.230806 C 74.908059,15.078464 75.031105,14.883152 75.167831,14.644869 C 75.523292,14.012059 75.787941,13.436864 75.961777,12.919283 C 76.135597,12.401709 76.22251,11.93003 76.222519,11.504244 C 76.22251,11.375343 76.211768,11.255226 76.190292,11.143892 C 76.1688,11.03257 76.13462,10.920265 76.087753,10.806978 C 76.201026,10.775734 76.297706,10.75425 76.377792,10.742525 C 76.457862,10.730812 76.533057,10.724953 76.603378,10.724947 C 76.826026,10.724953 76.993994,10.780617 77.107285,10.891939 C 77.220556,11.003273 77.277197,11.166359 77.277206,11.381197 C 77.277197,11.806983 77.126806,12.380225 76.826035,13.100924 C 76.525245,13.821629 76.107276,14.592136 75.572128,15.412447 C 75.314308,15.810885 75.08384,16.114596 74.880722,16.32358 C 74.67759,16.532564 74.511575,16.637056 74.382675,16.637056 C 74.148294,16.637056 73.896341,16.324557 73.626816,15.699556 C 73.357279,15.074558 73.046732,14.078465 72.695175,12.711275 C 72.316264,13.894872 71.928569,14.845066 71.532089,15.561861 C 71.135602,16.278658 70.810407,16.637056 70.556503,16.637056 C 70.439313,16.637056 70.285016,16.490572 70.093613,16.197603 C 69.902204,15.904635 69.689314,15.482761 69.454941,14.931978 C 69.259627,14.478855 69.019393,13.879247 68.734238,13.13315 C 68.3358,12.082373 68.035019,11.46714 67.831894,11.287447 L 67.831894,11.287447 z M 79.943222,16.326509 C 79.779157,16.416353 79.622908,16.48276 79.474472,16.525728 C 79.326033,16.568697 79.183455,16.590181 79.046738,16.590181 C 78.85533,16.590181 78.725448,16.538424 78.657089,16.434908 C 78.588729,16.331393 78.554549,16.123385 78.55455,15.810884 C 78.554549,15.631198 78.572127,15.228855 78.607285,14.603853 C 78.64244,13.978856 78.660018,13.441747 78.660019,12.992525 C 78.660018,12.504248 78.63658,12.107764 78.589706,11.803072 C 78.542831,11.49839 78.466659,11.238624 78.361191,11.023775 C 78.505721,10.937843 78.654159,10.872414 78.806503,10.827486 C 78.958846,10.78257 79.109236,10.760109 79.257675,10.760103 C 79.437361,10.760109 79.560408,10.804054 79.626816,10.891939 C 79.69322,10.979835 79.726423,11.142921 79.726425,11.381197 C 79.726423,11.443702 79.708845,11.785499 79.673691,12.406588 C 79.638533,13.027685 79.620954,13.617528 79.620956,14.176119 C 79.620954,14.699558 79.647322,15.133152 79.700058,15.4769 C 79.75279,15.820651 79.833845,16.103854 79.943222,16.326509 L 79.943222,16.326509 z M 79.896347,8.9729939 C 79.896345,9.1956575 79.81822,9.3812042 79.661972,9.5296345 C 79.50572,9.6780789 79.308455,9.7522976 79.070175,9.7522907 C 78.863143,9.7522976 78.69908,9.6937039 78.577988,9.5765095 C 78.456893,9.4593291 78.396346,9.3011261 78.396347,9.1019001 C 78.396346,8.8831578 78.474471,8.6966346 78.630722,8.5423298 C 78.786971,8.3880411 78.976424,8.3108928 79.199081,8.3108845 C 79.402205,8.3108928 79.569197,8.3733927 79.700058,8.4983845 C 79.830915,8.6233924 79.896345,8.7815954 79.896347,8.9729939 L 79.896347,8.9729939 z M 82.814316,16.338228 C 82.650251,16.424166 82.499861,16.487642 82.363144,16.528658 C 82.226424,16.569674 82.091658,16.590181 81.958847,16.590181 C 81.790877,16.590181 81.67076,16.534517 81.598495,16.423189 C 81.526229,16.311861 81.490096,16.115572 81.490097,15.834322 C 81.490096,15.740573 81.516463,15.160495 81.569199,14.094088 C 81.621932,13.027685 81.648299,12.008155 81.6483,11.035494 C 81.648299,10.074563 81.626815,9.4144073 81.583847,9.0550251 C 81.540877,8.695658 81.466659,8.4202676 81.361191,8.2288532 C 81.529159,8.1429242 81.682479,8.0794477 81.821152,8.0384235 C 81.959822,7.9974165 82.085799,7.9769087 82.199081,7.9769001 C 82.382673,7.9769087 82.50865,8.0286665 82.577011,8.1321735 C 82.645369,8.2356975 82.679548,8.4397989 82.67955,8.7444782 C 82.679548,8.8147985 82.669783,9.0120639 82.650253,9.3362751 C 82.564314,10.738625 82.521345,12.096045 82.521347,13.408541 C 83.345563,12.740576 83.978375,12.187842 84.419785,11.750338 C 84.861187,11.312843 85.152202,10.953468 85.292831,10.672213 C 85.562358,10.769875 85.751811,10.865578 85.861191,10.959322 C 85.970561,11.053078 86.025248,11.162452 86.025253,11.287447 C 86.025248,11.455421 85.529155,11.926124 84.536972,12.699556 C 84.095562,13.04331 83.744,13.320653 83.482285,13.531588 C 83.5565,13.601903 83.663922,13.701512 83.80455,13.830416 C 85.335796,15.279636 86.232279,16.004244 86.494003,16.004244 L 86.517441,16.004244 C 86.482279,16.238619 86.413919,16.41733 86.312363,16.540377 C 86.210795,16.663423 86.079935,16.724947 85.919785,16.724947 C 85.658061,16.724947 85.099468,16.2894 84.244003,15.418306 C 83.560407,14.722996 82.982282,14.162449 82.509628,13.736666 L 82.509628,14.000338 C 82.509626,14.633152 82.534041,15.133152 82.58287,15.500338 C 82.631697,15.867526 82.708845,16.146822 82.814316,16.338228 L 82.814316,16.338228 z M 88.990097,16.326509 C 88.826032,16.416353 88.669783,16.48276 88.521347,16.525728 C 88.372908,16.568697 88.23033,16.590181 88.093613,16.590181 C 87.902205,16.590181 87.772323,16.538424 87.703964,16.434908 C 87.635604,16.331393 87.601424,16.123385 87.601425,15.810884 C 87.601424,15.631198 87.619002,15.228855 87.65416,14.603853 C 87.689315,13.978856 87.706893,13.441747 87.706894,12.992525 C 87.706893,12.504248 87.683455,12.107764 87.636581,11.803072 C 87.589706,11.49839 87.513534,11.238624 87.408066,11.023775 C 87.552596,10.937843 87.701034,10.872414 87.853378,10.827486 C 88.005721,10.78257 88.156111,10.760109 88.30455,10.760103 C 88.484236,10.760109 88.607283,10.804054 88.673691,10.891939 C 88.740095,10.979835 88.773298,11.142921 88.7733,11.381197 C 88.773298,11.443702 88.75572,11.785499 88.720566,12.406588 C 88.685408,13.027685 88.667829,13.617528 88.667831,14.176119 C 88.667829,14.699558 88.694197,15.133152 88.746933,15.4769 C 88.799665,15.820651 88.88072,16.103854 88.990097,16.326509 L 88.990097,16.326509 z M 88.943222,8.9729939 C 88.94322,9.1956575 88.865095,9.3812042 88.708847,9.5296345 C 88.552595,9.6780789 88.35533,9.7522976 88.11705,9.7522907 C 87.910018,9.7522976 87.745955,9.6937039 87.624863,9.5765095 C 87.503768,9.4593291 87.443221,9.3011261 87.443222,9.1019001 C 87.443221,8.8831578 87.521346,8.6966346 87.677597,8.5423298 C 87.833846,8.3880411 88.023299,8.3108928 88.245956,8.3108845 C 88.44908,8.3108928 88.616072,8.3733927 88.746933,8.4983845 C 88.87779,8.6233924 88.94322,8.7815954 88.943222,8.9729939 L 88.943222,8.9729939 z "
+ id="text2158" />
+</svg>
Added: trunk/src/site/resources/images/sourceforge.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/site/resources/images/sourceforge.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-08-22 14:55:44
|
Revision: 17
http://staticwiki.svn.sourceforge.net/staticwiki/?rev=17&view=rev
Author: triathlon98
Date: 2007-08-22 07:55:43 -0700 (Wed, 22 Aug 2007)
Log Message:
-----------
move site stuff
Added Paths:
-----------
trunk/staticwiki-editor/src/site/
Removed Paths:
-------------
trunk/staticwiki-editor/src/main/site/
Copied: trunk/staticwiki-editor/src/site (from rev 16, trunk/staticwiki-editor/src/main/site)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-08-22 14:43:31
|
Revision: 16
http://staticwiki.svn.sourceforge.net/staticwiki/?rev=16&view=rev
Author: triathlon98
Date: 2007-08-22 07:43:27 -0700 (Wed, 22 Aug 2007)
Log Message:
-----------
assure resources can be found
Modified Paths:
--------------
trunk/staticwiki-editor/src/main/java/org/staticwiki/editor/Editor.java
trunk/staticwiki-site-plugin/src/main/java/org/staticwiki/siteplugin/doxia/StaticwikiParser.java
Added Paths:
-----------
trunk/staticwiki-editor/src/main/site/
trunk/staticwiki-editor/src/main/site/site.xml
trunk/staticwiki-editor/src/main/site/wiki/
trunk/staticwiki-editor/src/main/site/wiki/index.wiki
trunk/staticwiki-renderer/src/main/java/org/staticwiki/wiki/AllowAllResourceHandler.java
Modified: trunk/staticwiki-editor/src/main/java/org/staticwiki/editor/Editor.java
===================================================================
--- trunk/staticwiki-editor/src/main/java/org/staticwiki/editor/Editor.java 2007-08-22 14:38:00 UTC (rev 15)
+++ trunk/staticwiki-editor/src/main/java/org/staticwiki/editor/Editor.java 2007-08-22 14:43:27 UTC (rev 16)
@@ -15,6 +15,7 @@
import org.staticwiki.wiki.WikiRenderer;
import org.staticwiki.wiki.WikiFactory;
import org.staticwiki.wiki.WikiException;
+import org.staticwiki.wiki.AllowAllResourceHandler;
import javax.swing.*;
import javax.swing.event.ChangeListener;
@@ -208,7 +209,7 @@
try
{
- wikiRenderer = WikiFactory.getWikiRenderer();
+ wikiRenderer = WikiFactory.getWikiRenderer( new AllowAllResourceHandler() );
}
catch ( WikiException we )
{
Added: trunk/staticwiki-editor/src/main/site/site.xml
===================================================================
--- trunk/staticwiki-editor/src/main/site/site.xml (rev 0)
+++ trunk/staticwiki-editor/src/main/site/site.xml 2007-08-22 14:43:27 UTC (rev 16)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="staticwiki">
+ <body>
+ <links>
+ <item name="staticwiki" href="http://www.staticwiki.org/"/>
+ <item name="equanda" href="http://www.equanda.org/"/>
+ </links>
+
+ <menu name="staticwiki">
+ <item name="Introduction" href="index.html"/>
+ </menu>
+ </body>
+</project>
\ No newline at end of file
Added: trunk/staticwiki-editor/src/main/site/wiki/index.wiki
===================================================================
--- trunk/staticwiki-editor/src/main/site/wiki/index.wiki (rev 0)
+++ trunk/staticwiki-editor/src/main/site/wiki/index.wiki 2007-08-22 14:43:27 UTC (rev 16)
@@ -0,0 +1,9 @@
+h1. staticwiki editor
+
+Though this module still needs to be extended, the initial goal is to have a simple editor in which you can type the wiki content, and where you can switch between edit and preview mode.
+
+To run this, just call
+{code}
+java -jar staticwiki-editor\target\staticwiki-editor-1.0-SNAPSHOT.jar
+-SNAPSHOT.jar{code}
+(this from the project directory after compiling "mvn install").
\ No newline at end of file
Added: trunk/staticwiki-renderer/src/main/java/org/staticwiki/wiki/AllowAllResourceHandler.java
===================================================================
--- trunk/staticwiki-renderer/src/main/java/org/staticwiki/wiki/AllowAllResourceHandler.java (rev 0)
+++ trunk/staticwiki-renderer/src/main/java/org/staticwiki/wiki/AllowAllResourceHandler.java 2007-08-22 14:43:27 UTC (rev 16)
@@ -0,0 +1,42 @@
+/**
+ * This file is part of the staticwiki project.
+ *
+ * The contents of this file are subject to the GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ * (the "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.fsf.org/licenses/lgpl.html
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
+ * ANY KIND, either express or implied. See the License for the specific language governing rights and
+ * limitations under the License.
+ */
+
+package org.staticwiki.wiki;
+
+/**
+ * Simple resource handler which accepts everything and does not convert URL's.
+ *
+ * @author Joachim Van der Auwera <jo...@pr...>
+ */
+public class AllowAllResourceHandler
+ extends ResourceHandlerAdapter
+{
+ public boolean resourceExists( String resource )
+ {
+ return true;
+ }
+
+ public String getResourceURL( String resource )
+ {
+ return resource;
+ }
+
+ public boolean linkExists( String link )
+ {
+ return true;
+ }
+
+ public String getLinkURL( String link )
+ {
+ return link;
+ }
+}
\ No newline at end of file
Modified: trunk/staticwiki-site-plugin/src/main/java/org/staticwiki/siteplugin/doxia/StaticwikiParser.java
===================================================================
--- trunk/staticwiki-site-plugin/src/main/java/org/staticwiki/siteplugin/doxia/StaticwikiParser.java 2007-08-22 14:38:00 UTC (rev 15)
+++ trunk/staticwiki-site-plugin/src/main/java/org/staticwiki/siteplugin/doxia/StaticwikiParser.java 2007-08-22 14:43:27 UTC (rev 16)
@@ -15,10 +15,7 @@
import org.apache.maven.doxia.parser.AbstractParser;
import org.apache.maven.doxia.parser.ParseException;
import org.apache.maven.doxia.sink.Sink;
-import org.staticwiki.wiki.WikiException;
-import org.staticwiki.wiki.WikiFactory;
-import org.staticwiki.wiki.WikiRenderer;
-import org.staticwiki.siteplugin.SaveException;
+import org.staticwiki.wiki.*;
import java.io.IOException;
import java.io.Reader;
@@ -39,7 +36,7 @@
{
try
{
- WikiRenderer wr = WikiFactory.getWikiRenderer();
+ WikiRenderer wr = WikiFactory.getWikiRenderer( new AllowAllResourceHandler() );
StringWriter sw = new StringWriter();
wr.render( reader, sw );
String res = sw.getBuffer().toString();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-08-22 14:38:04
|
Revision: 15
http://staticwiki.svn.sourceforge.net/staticwiki/?rev=15&view=rev
Author: triathlon98
Date: 2007-08-22 07:38:00 -0700 (Wed, 22 Aug 2007)
Log Message:
-----------
fix problems in MarkupSplitter
Modified Paths:
--------------
trunk/staticwiki-renderer/src/main/java/org/staticwiki/wiki/MarkupSplitter.java
trunk/staticwiki-renderer/src/test/java/org/staticwiki/wiki/MarkupSplitterTest.java
Modified: trunk/staticwiki-renderer/src/main/java/org/staticwiki/wiki/MarkupSplitter.java
===================================================================
--- trunk/staticwiki-renderer/src/main/java/org/staticwiki/wiki/MarkupSplitter.java 2007-08-22 10:34:20 UTC (rev 14)
+++ trunk/staticwiki-renderer/src/main/java/org/staticwiki/wiki/MarkupSplitter.java 2007-08-22 14:38:00 UTC (rev 15)
@@ -19,16 +19,18 @@
* Splits a string, providing 2 characters like '!' and '!', '[' and ']' as separators
*
* @author Florin
+ * @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
*/
public class MarkupSplitter
implements Iterator<CharSequence>, Iterable<CharSequence>
{
- CharSequence data;
- CharSequence markup;
- int curPos;
- int nextPos;
- char markupBegin, markupEnd;
- boolean inside;
+ protected CharSequence data;
+ protected char markupBegin, markupEnd;
+ protected int nextPos;
+ protected int foundPart, nextPart;
+ protected int inBegin, inEnd;
+ protected int outBegin, outEnd;
+ protected boolean hasNextCalled;
public MarkupSplitter( CharSequence input, char markupBegin, char markupEnd )
{
@@ -39,43 +41,74 @@
public boolean hasNext()
{
- markup = null;
+ if ( data == null ) return false;
- nextPos = curPos;
- char terminator=(inside)?markupEnd:markupBegin;
+ if ( foundPart > nextPart ) return true; // we already know the answer
- while ( nextPos < data.length() )
+ if ( ( foundPart & 1 ) == 1 )
{
- char c = data.charAt( nextPos );
- if ( c == terminator )
+ // check whether there is an "inside" part
+ if ( inEnd == 0 || inBegin > data.length() ) return false;
+ foundPart++;
+ }
+ else
+ {
+ if ( nextPos >= data.length() ) return false;
+ outBegin = nextPos;
+ while ( nextPos < data.length() )
{
- break;
+ char c = data.charAt( nextPos );
+ if ( c == markupBegin ) break;
+ nextPos++;
}
+ outEnd = nextPos;
nextPos++;
+ inBegin = nextPos;
+ while ( nextPos < data.length() )
+ {
+ char c = data.charAt( nextPos );
+ if ( c == markupEnd ) break;
+ nextPos++;
+ }
+ if ( nextPos == data.length() )
+ {
+ outEnd = nextPos;
+ inBegin = inEnd = 0;
+ }
+ else
+ {
+ inEnd = nextPos;
+ nextPos++;
+ }
+ foundPart++;
}
- if ( nextPos<data.length() || !inside )
- {
- markup = data.subSequence( curPos, nextPos );
- nextPos++;
- return true;
- }
- return false;
+ return true;
}
public boolean isNextInsideMarkup()
{
- return inside;
+ return ( ( nextPart & 1 ) == 1 );
}
public CharSequence next()
{
- if ( markup != null )
+ if ( nextPart == foundPart )
{
- curPos = nextPos;
- inside=!inside;
- return markup;
+ if ( !hasNext() ) throw new NoSuchElementException();
}
- throw new NoSuchElementException();
+ CharSequence res;
+ if ( ( nextPart & 1 ) == 1 )
+ {
+ // inside part
+ res = data.subSequence( inBegin, inEnd );
+ }
+ else
+ {
+ // outside part
+ res = data.subSequence( outBegin, outEnd );
+ }
+ nextPart++;
+ return res;
}
public void remove()
Modified: trunk/staticwiki-renderer/src/test/java/org/staticwiki/wiki/MarkupSplitterTest.java
===================================================================
--- trunk/staticwiki-renderer/src/test/java/org/staticwiki/wiki/MarkupSplitterTest.java 2007-08-22 10:34:20 UTC (rev 14)
+++ trunk/staticwiki-renderer/src/test/java/org/staticwiki/wiki/MarkupSplitterTest.java 2007-08-22 14:38:00 UTC (rev 15)
@@ -16,29 +16,72 @@
import java.util.List;
import java.util.ArrayList;
+import java.util.NoSuchElementException;
/**
* Test for MarkupSplitter
*
* @author Florin
+ * @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
*/
public class MarkupSplitterTest
extends TestCase
{
+ public void testNullHasNext()
+ {
+ MarkupSplitter splitter = new MarkupSplitter( null, 'x', 'y' );
+ assertFalse( splitter.hasNext() );
+ }
+
+ public void testNullNext()
+ {
+ MarkupSplitter splitter = new MarkupSplitter( null, 'x', 'y' );
+ try
+ {
+ splitter.next();
+ fail( "should have failed" );
+ }
+ catch ( NoSuchElementException nse )
+ {/* correct */}
+ }
+
+ public void testMultipleHasNext()
+ {
+ MarkupSplitter splitter = new MarkupSplitter( "aaa", 'x', 'y' );
+ assertTrue( splitter.hasNext() );
+ assertTrue( splitter.hasNext() );
+ assertTrue( splitter.hasNext() );
+ assertEquals( "aaa", splitter.next() );
+ assertFalse( splitter.hasNext() );
+ }
+
+ public void testNextOnly()
+ {
+ MarkupSplitter splitter = new MarkupSplitter( "here is no image", '!', '!' );
+ assertEquals( "here is no image", splitter.next() );
+ try
+ {
+ splitter.next();
+ fail( "should have failed" );
+ }
+ catch ( NoSuchElementException nse )
+ {/* correct */}
+ }
+
public void testDifferentBeginEnd()
{
MarkupSplitter splitter =
- new MarkupSplitter( "here is a link [the link] and another one: [other link]", '[', ']' );
+ new MarkupSplitter( "here is a link [the link] and another [other link] one", '[', ']' );
List<String> itemsToRender = new ArrayList<String>();
List<String> itemsToCopy = new ArrayList<String>();
getItems( splitter, itemsToRender, itemsToCopy );
- assertEquals( itemsToRender.size(), 2 );
- assertEquals( itemsToCopy.size(), 3 );
- assertEquals( itemsToRender.get( 0 ), "the link" );
- assertEquals( itemsToRender.get( 1 ), "other link" );
- assertEquals( itemsToCopy.get( 0 ), "here is a link " );
- assertEquals( itemsToCopy.get( 1 ), " and another one: " );
- assertEquals( itemsToCopy.get( 2 ), "" );
+ assertEquals( 2, itemsToRender.size() );
+ assertEquals( 3, itemsToCopy.size() );
+ assertEquals( "the link", itemsToRender.get( 0 ) );
+ assertEquals( "other link", itemsToRender.get( 1 ) );
+ assertEquals( "here is a link ", itemsToCopy.get( 0 ) );
+ assertEquals( " and another ", itemsToCopy.get( 1 ) );
+ assertEquals( " one", itemsToCopy.get( 2 ) );
}
public void testSameBeginEnd()
@@ -48,57 +91,54 @@
List<String> itemsToRender = new ArrayList<String>();
List<String> itemsToCopy = new ArrayList<String>();
getItems( splitter, itemsToRender, itemsToCopy );
- assertEquals( itemsToRender.size(), 2 );
- assertEquals( itemsToCopy.size(), 3 );
- assertEquals( itemsToRender.get( 0 ), "theimage.jpg" );
- assertEquals( itemsToRender.get( 1 ), "otherimage.jpg" );
- assertEquals( itemsToCopy.get( 0 ), "here is an image " );
- assertEquals( itemsToCopy.get( 1 ), " and another one: " );
- assertEquals( itemsToCopy.get( 2 ), "" );
+ assertEquals( 2, itemsToRender.size() );
+ assertEquals( 2, itemsToCopy.size() );
+ assertEquals( "theimage.jpg", itemsToRender.get( 0 ) );
+ assertEquals( "otherimage.jpg", itemsToRender.get( 1 ) );
+ assertEquals( "here is an image ", itemsToCopy.get( 0 ) );
+ assertEquals( " and another one: ", itemsToCopy.get( 1 ) );
}
public void testDifferentBeginEndMessedUp()
{
MarkupSplitter splitter =
- new MarkupSplitter(
- "[]here is a link [the [link] and another one: [other link[] and another one, not closed [aaa", '[',
- ']' );
+ new MarkupSplitter( "[]here is a link [the [link] another [other link[] and unclosed [aaa", '[', ']' );
List<String> itemsToRender = new ArrayList<String>();
List<String> itemsToCopy = new ArrayList<String>();
getItems( splitter, itemsToRender, itemsToCopy );
- assertEquals( itemsToRender.size(), 3 );
- assertEquals( itemsToCopy.size(), 4 );
+ assertEquals( 3, itemsToRender.size() );
+ assertEquals( 4, itemsToCopy.size() );
- assertEquals( itemsToRender.get( 0 ), "" );
- assertEquals( itemsToRender.get( 1 ), "the [link" );
- assertEquals( itemsToRender.get( 2 ), "other link[" );
+ assertEquals( "", itemsToRender.get( 0 ), "" );
+ assertEquals( "the [link", itemsToRender.get( 1 ) );
+ assertEquals( "other link[", itemsToRender.get( 2 ) );
- assertEquals( itemsToCopy.get( 0 ), "" );
- assertEquals( itemsToCopy.get( 1 ), "here is a link " );
- assertEquals( itemsToCopy.get( 2 ), " and another one: " );
- assertEquals( itemsToCopy.get( 3 ), " and another one, not closed " );
+ assertEquals( "", itemsToCopy.get( 0 ) );
+ assertEquals( "here is a link ", itemsToCopy.get( 1 ) );
+ assertEquals( " another ", itemsToCopy.get( 2 ) );
+ assertEquals( " and unclosed [aaa", itemsToCopy.get( 3 ) );
}
public void testSameBeginEndMessedUp()
{
MarkupSplitter splitter =
- new MarkupSplitter( "!!here is an image !theim!age.jpg! and !another one, not closed: !otherimage.jpg", '!', '!' );
+ new MarkupSplitter( "!!here is an image !theim!age.jpg! and !another unclosed: !otherimage.jpg", '!', '!' );
List<String> itemsToRender = new ArrayList<String>();
List<String> itemsToCopy = new ArrayList<String>();
getItems( splitter, itemsToRender, itemsToCopy );
- assertEquals( itemsToRender.size(), 3 );
- assertEquals( itemsToCopy.size(), 4 );
+ assertEquals( 3, itemsToRender.size() );
+ assertEquals( 4, itemsToCopy.size() );
- assertEquals( itemsToRender.get( 0 ), "" );
- assertEquals( itemsToRender.get( 1 ), "theim" );
- assertEquals( itemsToRender.get( 2 ), " and " );
+ assertEquals( "", itemsToRender.get( 0 ) );
+ assertEquals( "theim", itemsToRender.get( 1 ) );
+ assertEquals( " and ", itemsToRender.get( 2 ) );
- assertEquals( itemsToCopy.get(0), "");
- assertEquals( itemsToCopy.get(1), "here is an image ");
- assertEquals( itemsToCopy.get(2), "age.jpg");
- assertEquals( itemsToCopy.get(3), "another one, not closed: ");
+ assertEquals( "", itemsToCopy.get( 0 ) );
+ assertEquals( "here is an image ", itemsToCopy.get( 1 ) );
+ assertEquals( "age.jpg", itemsToCopy.get( 2 ) );
+ assertEquals( "another unclosed: !otherimage.jpg", itemsToCopy.get( 3 ) );
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-08-22 10:34:22
|
Revision: 14
http://staticwiki.svn.sourceforge.net/staticwiki/?rev=14&view=rev
Author: triathlon98
Date: 2007-08-22 03:34:20 -0700 (Wed, 22 Aug 2007)
Log Message:
-----------
simple editor to allow getting previews of the wiki formatting
Modified Paths:
--------------
trunk/staticwiki-editor/src/main/java/org/staticwiki/editor/Editor.java
Modified: trunk/staticwiki-editor/src/main/java/org/staticwiki/editor/Editor.java
===================================================================
--- trunk/staticwiki-editor/src/main/java/org/staticwiki/editor/Editor.java 2007-08-22 10:34:00 UTC (rev 13)
+++ trunk/staticwiki-editor/src/main/java/org/staticwiki/editor/Editor.java 2007-08-22 10:34:20 UTC (rev 14)
@@ -198,8 +198,6 @@
private JComponent getContentPanel()
{
- ScrollPane sp;
-
tabPanel.addTab( "wiki", new JScrollPane(wiki, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_NEVER ) );
wiki.setLineWrap( true );
wiki.setWrapStyleWord( true );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-08-22 10:34:05
|
Revision: 13
http://staticwiki.svn.sourceforge.net/staticwiki/?rev=13&view=rev
Author: triathlon98
Date: 2007-08-22 03:34:00 -0700 (Wed, 22 Aug 2007)
Log Message:
-----------
simple editor to allow getting previews of the wiki formatting
Modified Paths:
--------------
trunk/staticwiki-editor/pom.xml
trunk/staticwiki-editor/src/main/java/org/staticwiki/editor/Editor.java
Added Paths:
-----------
trunk/staticwiki-editor/src/main/java/org/staticwiki/editor/SaveException.java
Modified: trunk/staticwiki-editor/pom.xml
===================================================================
--- trunk/staticwiki-editor/pom.xml 2007-08-20 09:34:08 UTC (rev 12)
+++ trunk/staticwiki-editor/pom.xml 2007-08-22 10:34:00 UTC (rev 13)
@@ -23,11 +23,29 @@
<archive>
<manifest>
<mainClass>org.staticwiki.editor.Editor</mainClass>
- <addClasspath>true</addClasspath>
+ <addClasspath>false</addClasspath>
</manifest>
</archive>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack-dependencies</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/classes</outputDirectory>
+ <overWriteReleases>false</overWriteReleases>
+ <overWriteSnapshots>true</overWriteSnapshots>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
<dependencies>
Modified: trunk/staticwiki-editor/src/main/java/org/staticwiki/editor/Editor.java
===================================================================
--- trunk/staticwiki-editor/src/main/java/org/staticwiki/editor/Editor.java 2007-08-20 09:34:08 UTC (rev 12)
+++ trunk/staticwiki-editor/src/main/java/org/staticwiki/editor/Editor.java 2007-08-22 10:34:00 UTC (rev 13)
@@ -12,21 +12,241 @@
package org.staticwiki.editor;
-//import org.apache.log4j.Logger;
+import org.staticwiki.wiki.WikiRenderer;
+import org.staticwiki.wiki.WikiFactory;
+import org.staticwiki.wiki.WikiException;
+import javax.swing.*;
+import javax.swing.event.ChangeListener;
+import javax.swing.event.ChangeEvent;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.WindowEvent;
+
/**
- * ...
+ * Simple swing gui for the editing of wiki text and viewing the rendered result.
*
* @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
*/
public class Editor
{
//private static Logger logger = Logger.getLogger( Editor.class );
+ protected JFrame window = new JFrame();
+ protected JTabbedPane tabPanel = new JTabbedPane();
+ protected JTextArea wiki = new JTextArea();
+ protected JEditorPane preview = new JEditorPane();
+ protected WikiRenderer wikiRenderer;
public static void main( String[] args )
{
- //logger.info( "main: in" );
- System.out.println( "Hello World!" );
- //logger.info( "main: out" );
+ Thread.currentThread().setUncaughtExceptionHandler( new Thread.UncaughtExceptionHandler()
+ {
+ public void uncaughtException( Thread thread, Throwable throwable )
+ {
+ SaveException.saveException( throwable );
+ }
+ } );
+
+ // build the window
+ new Editor().buildWindow();
}
+
+ public void buildWindow()
+ {
+ final
+
+ Dimension frameSize = new Dimension( 800, 600 );
+
+ window.setJMenuBar( getMenuBar() );
+ window.add( getContentPanel(), BorderLayout.CENTER );
+
+ window.setSize( frameSize );
+ window.setVisible( true );
+
+ window.setTitle( "staticwiki editor - " + "[unknown file]" );
+
+ window.addWindowListener( new java.awt.event.WindowAdapter()
+ {
+ public void windowClosing( WindowEvent e )
+ {
+ SwingUtilities.invokeLater( new Runnable()
+ {
+ public void run()
+ {
+ int option = JOptionPane.showConfirmDialog( window,
+ "Are you sure you want to exit? Did you save the changes?",
+ "Confirmation",
+ JOptionPane.YES_NO_OPTION,
+ JOptionPane.QUESTION_MESSAGE );
+ if ( option == JOptionPane.OK_OPTION )
+ {
+ System.exit( 0 );
+ }
+ else
+ {
+ SwingUtilities.invokeLater( new Runnable()
+ {
+ public void run()
+ {
+ window.setVisible( true );
+ }
+ } );
+ }
+ }
+ } );
+ }
+ } );
+
+ }
+
+ private JMenuBar getMenuBar()
+ {
+ JMenuBar menuBar = new JMenuBar();
+ JMenu fileMenu = new JMenu( "File" );
+ JMenu editMenu = new JMenu( "Edit" );
+ JMenu aboutMenu = new JMenu( "About" );
+
+ JMenuItem loadItem = new JMenuItem( "Load" );
+ loadItem.addActionListener( new ActionListener()
+ {
+ public void actionPerformed( ActionEvent e )
+ {
+ // @todo
+ showError( "not yet implemented" );
+ }
+ }
+ );
+ JMenuItem saveItem = new JMenuItem( "Save" );
+ saveItem.addActionListener( new ActionListener()
+ {
+ public void actionPerformed( ActionEvent e )
+ {
+ // @todo
+ showError( "not yet implemented" );
+ }
+ }
+ );
+ saveItem.setAccelerator( KeyStroke.getKeyStroke( java.awt.event.KeyEvent.VK_S,
+ java.awt.Event.CTRL_MASK ) );
+
+ JMenuItem saveAsItem = new JMenuItem( "Save As" );
+ saveAsItem.addActionListener( new ActionListener()
+ {
+ public void actionPerformed( ActionEvent e )
+ {
+ // @todo
+ showError( "not yet implemented" );
+ }
+ }
+ );
+
+ JMenuItem exportPdfItem = new JMenuItem( "Export to PDF" );
+ exportPdfItem.addActionListener( new ActionListener()
+ {
+ public void actionPerformed( ActionEvent e )
+ {
+ // @todo
+ showError( "not yet implemented" );
+ }
+ }
+ );
+
+ JMenuItem editItem = new JMenuItem( "Edit" );
+ editItem.addActionListener( new ActionListener()
+ {
+ public void actionPerformed( ActionEvent e )
+ {
+ if ( tabPanel.getSelectedIndex() != 0 )
+ {
+ tabPanel.setSelectedIndex( 0 );
+ }
+ }
+ }
+ );
+ editItem.setAccelerator( KeyStroke.getKeyStroke( java.awt.event.KeyEvent.VK_E,
+ java.awt.Event.CTRL_MASK ) );
+
+ JMenuItem previewItem = new JMenuItem( "Preview" );
+ previewItem.addActionListener( new ActionListener()
+ {
+ public void actionPerformed( ActionEvent e )
+ {
+ if ( tabPanel.getSelectedIndex() != 1 )
+ {
+ tabPanel.setSelectedIndex( 1 );
+ }
+ }
+ }
+ );
+ previewItem.setAccelerator( KeyStroke.getKeyStroke( java.awt.event.KeyEvent.VK_P,
+ java.awt.Event.CTRL_MASK ) );
+
+ fileMenu.add( loadItem );
+ fileMenu.add( saveItem );
+ fileMenu.add( saveAsItem );
+ fileMenu.add( exportPdfItem );
+ editMenu.add( previewItem );
+ editMenu.add( editItem );
+
+ menuBar.add( fileMenu );
+ menuBar.add( editMenu );
+ menuBar.add( aboutMenu );
+
+ return menuBar;
+ }
+
+ private JComponent getContentPanel()
+ {
+ ScrollPane sp;
+
+ tabPanel.addTab( "wiki", new JScrollPane(wiki, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_NEVER ) );
+ wiki.setLineWrap( true );
+ wiki.setWrapStyleWord( true );
+
+ tabPanel.addTab( "preview", new JScrollPane(preview, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_NEVER ) );
+ preview.setEditable( false );
+ preview.setContentType( "text/html" );
+
+ try
+ {
+ wikiRenderer = WikiFactory.getWikiRenderer();
+ }
+ catch ( WikiException we )
+ {
+ showError( we.toString() );
+ SaveException.saveException( we );
+ }
+
+ tabPanel.getModel().addChangeListener( new ChangeListener()
+ {
+ public void stateChanged( ChangeEvent e )
+ {
+ if ( tabPanel.getSelectedIndex() == 1 )
+ {
+ // render it again
+ try
+ {
+ preview.setText( wikiRenderer.render( wiki.getText() ) );
+ }
+ catch ( WikiException we )
+ {
+ showError( we.toString() );
+ SaveException.saveException( we );
+ }
+ }
+ }
+ } );
+
+ return tabPanel;
+ }
+
+ private void showError( String msg )
+ {
+ JOptionPane optionPane = new JOptionPane( msg, JOptionPane.ERROR_MESSAGE, JOptionPane.OK_CANCEL_OPTION );
+ JDialog dialog = optionPane.createDialog( window, "Error message" );
+ dialog.setVisible( true );
+ dialog.dispose();
+ }
+
}
\ No newline at end of file
Added: trunk/staticwiki-editor/src/main/java/org/staticwiki/editor/SaveException.java
===================================================================
--- trunk/staticwiki-editor/src/main/java/org/staticwiki/editor/SaveException.java (rev 0)
+++ trunk/staticwiki-editor/src/main/java/org/staticwiki/editor/SaveException.java 2007-08-22 10:34:00 UTC (rev 13)
@@ -0,0 +1,105 @@
+/**
+ * This file is part of the staticwiki project.
+ *
+ * The contents of this file are subject to the GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ * (the "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.fsf.org/licenses/lgpl.html
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
+ * ANY KIND, either express or implied. See the License for the specific language governing rights and
+ * limitations under the License.
+ */
+
+package org.staticwiki.editor;
+
+import java.io.File;
+import java.io.PrintWriter;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Date;
+
+/**
+ * Save exception details to a file
+ *
+ * @author Joachim Van der Auwera <jo...@pr...>
+ */
+public class SaveException
+{
+ public static void saveException( Throwable exc )
+ {
+ saveException( exc, "" );
+ }
+
+ public static void saveException( Throwable exc, String message )
+ {
+ File errorFile = new File( "errors.txt" );
+ try
+ {
+ PrintWriter out = new PrintWriter( new FileOutputStream( errorFile.getAbsolutePath(), true ) );
+ Date date = new Date( System.currentTimeMillis() );
+ out.println( "----- error on " + date.toString() );
+ String msg = exc.getLocalizedMessage();
+ if ( msg == null ) msg = exc.getMessage();
+ if ( msg == null ) msg = exc.toString();
+ msg += " " + message;
+ out.println( msg );
+ System.err.println( msg );
+ exc.printStackTrace( out );
+ out.println();
+ out.close();
+ }
+ catch ( IOException ioe )
+ {
+ System.err.println( "oops, can't write error message to file" );
+ }
+ }
+
+ public static void saveWarning( Throwable exc )
+ {
+ saveWarning( exc, "" );
+ }
+
+ public static void saveWarning( Throwable exc, String message )
+ {
+ File errorFile = new File( "errors.txt" );
+ try
+ {
+ PrintWriter out = new PrintWriter( new FileOutputStream( errorFile.getAbsolutePath(), true ) );
+ Date date = new Date( System.currentTimeMillis() );
+ out.println( "----- warning on " + date.toString() );
+ String msg = exc.getLocalizedMessage();
+ if ( msg == null ) msg = exc.getMessage();
+ if ( msg == null ) msg = exc.toString();
+ msg += " " + message;
+ out.println( msg );
+ System.err.println( msg );
+ exc.printStackTrace( out );
+ out.println();
+ out.close();
+ }
+ catch ( IOException ioe )
+ {
+ System.err.println( "oops, can't write error message to file" );
+ }
+ }
+
+
+ public static void log( String error )
+ {
+ File errorFile = new File( "errors.txt" );
+ try
+ {
+ PrintWriter out = new PrintWriter( new FileOutputStream( errorFile.getAbsolutePath(), true ) );
+ Date date = new Date( System.currentTimeMillis() );
+ out.println( "----- error on " + date.toString() );
+ out.println( error );
+ System.err.println( error );
+ out.println();
+ out.close();
+ }
+ catch ( IOException ioe )
+ {
+ System.err.println( "oops, can't write error message to file" );
+ }
+ }
+}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-08-20 09:45:36
|
Revision: 12
http://staticwiki.svn.sourceforge.net/staticwiki/?rev=12&view=rev
Author: triathlon98
Date: 2007-08-20 02:34:08 -0700 (Mon, 20 Aug 2007)
Log Message:
-----------
support "----" to include a horizontal rule
Modified Paths:
--------------
trunk/staticwiki-renderer/src/main/java/org/staticwiki/wiki/renderer/line/ParagraphLineHandler.java
trunk/staticwiki-renderer/src/main/java/org/staticwiki/wiki/renderer/line/QuoteLineHandler.java
trunk/staticwiki-renderer/src/main/java/org/staticwiki/wiki/renderer/line/WikiLineContext.java
trunk/staticwiki-renderer/src/main/macro/org/staticwiki/wiki/WikiRenderPipeline.txt
Added Paths:
-----------
trunk/staticwiki-renderer/src/main/java/org/staticwiki/wiki/renderer/line/RuleLineHandler.java
trunk/staticwiki-renderer/src/test/java/org/staticwiki/wiki/renderer/line/RuleLineRendererTest.java
Modified: trunk/staticwiki-renderer/src/main/java/org/staticwiki/wiki/renderer/line/ParagraphLineHandler.java
===================================================================
--- trunk/staticwiki-renderer/src/main/java/org/staticwiki/wiki/renderer/line/ParagraphLineHandler.java 2007-08-17 13:58:17 UTC (rev 11)
+++ trunk/staticwiki-renderer/src/main/java/org/staticwiki/wiki/renderer/line/ParagraphLineHandler.java 2007-08-20 09:34:08 UTC (rev 12)
@@ -45,7 +45,8 @@
}
else
{
- result.append( context.getParagraphBreak() );
+ if ( !context.isSuppressBreak() ) result.append( context.getParagraphBreak() );
+ context.setSuppressBreak( false );
}
subRenderer.subRender( result, line );
}
Modified: trunk/staticwiki-renderer/src/main/java/org/staticwiki/wiki/renderer/line/QuoteLineHandler.java
===================================================================
--- trunk/staticwiki-renderer/src/main/java/org/staticwiki/wiki/renderer/line/QuoteLineHandler.java 2007-08-17 13:58:17 UTC (rev 11)
+++ trunk/staticwiki-renderer/src/main/java/org/staticwiki/wiki/renderer/line/QuoteLineHandler.java 2007-08-20 09:34:08 UTC (rev 12)
@@ -25,6 +25,7 @@
{
private static String BLOCKQUOTE_START = "<blockquote><p>";
private static String BLOCKQUOTE_END = "</p></blockquote>";
+ private static String BLOCKQUOTE_BREAK = "<br />";
public boolean render( TextBuilder result, CharSequence line, WikiSubRenderer subRenderer, WikiLineContext context )
{
@@ -32,7 +33,7 @@
{
context.flush( result );
context.setNewParagraph( true );
- context.setParagraphBreak( BLOCKQUOTE_END );
+ context.setParagraphBreak( BLOCKQUOTE_BREAK );
context.setParagraphEnd( BLOCKQUOTE_END );
result.append( BLOCKQUOTE_START );
subRenderer.subRender( result, line.subSequence( 4, line.length() ) );
Added: trunk/staticwiki-renderer/src/main/java/org/staticwiki/wiki/renderer/line/RuleLineHandler.java
===================================================================
--- trunk/staticwiki-renderer/src/main/java/org/staticwiki/wiki/renderer/line/RuleLineHandler.java (rev 0)
+++ trunk/staticwiki-renderer/src/main/java/org/staticwiki/wiki/renderer/line/RuleLineHandler.java 2007-08-20 09:34:08 UTC (rev 12)
@@ -0,0 +1,49 @@
+/**
+ * This file is part of the staticwiki project.
+ *
+ * The contents of this file are subject to the GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ * (the "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.fsf.org/licenses/lgpl.html
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
+ * ANY KIND, either express or implied. See the License for the specific language governing rights and
+ * limitations under the License.
+ */
+
+package org.staticwiki.wiki.renderer.line;
+
+import javolution.lang.TextBuilder;
+import org.staticwiki.wiki.renderer.WikiSubRenderer;
+
+/**
+ * Render a horizontal rule, triggered by having (four or more) dashes at the beginning of the line.
+ *
+ * @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
+ */
+public class RuleLineHandler
+ implements WikiLineHandler
+{
+ private static String RULE = "<hr />";
+
+ public boolean render( TextBuilder result, CharSequence line, WikiSubRenderer subRenderer, WikiLineContext context )
+ {
+ if ( line.length() >= 4 && '-' == line.charAt( 0 ) && '-' == line.charAt( 1 ) && '-' == line.charAt( 2 ) &&
+ '-' == line.charAt( 3 ) )
+ {
+ int pos = 4;
+ // extra dashes at the start are allowed
+ while ( pos < line.length() && '-' == line.charAt( pos ) ) pos++;
+ // only spaces after that are allowed
+ while ( pos < line.length() && Character.isWhitespace( line.charAt( pos ) ) ) pos++;
+
+ if ( pos >= line.length() )
+ {
+ result.append( RULE );
+ context.setSuppressBreak( true );
+ return true;
+ }
+ }
+ return false;
+ }
+
+}
Modified: trunk/staticwiki-renderer/src/main/java/org/staticwiki/wiki/renderer/line/WikiLineContext.java
===================================================================
--- trunk/staticwiki-renderer/src/main/java/org/staticwiki/wiki/renderer/line/WikiLineContext.java 2007-08-17 13:58:17 UTC (rev 11)
+++ trunk/staticwiki-renderer/src/main/java/org/staticwiki/wiki/renderer/line/WikiLineContext.java 2007-08-20 09:34:08 UTC (rev 12)
@@ -24,6 +24,7 @@
String paragraphBreak = "<br />";
String paragraphEnd;
boolean newParagraph = true;
+ boolean suppressBreak = false;
public boolean isNewParagraph()
{
@@ -55,6 +56,16 @@
this.paragraphEnd = paragraphEnd;
}
+ public boolean isSuppressBreak()
+ {
+ return suppressBreak;
+ }
+
+ public void setSuppressBreak( boolean suppressBreak )
+ {
+ this.suppressBreak = suppressBreak;
+ }
+
public void flush( TextBuilder result )
{
if ( paragraphEnd != null ) result.append( paragraphEnd );
Modified: trunk/staticwiki-renderer/src/main/macro/org/staticwiki/wiki/WikiRenderPipeline.txt
===================================================================
--- trunk/staticwiki-renderer/src/main/macro/org/staticwiki/wiki/WikiRenderPipeline.txt 2007-08-17 13:58:17 UTC (rev 11)
+++ trunk/staticwiki-renderer/src/main/macro/org/staticwiki/wiki/WikiRenderPipeline.txt 2007-08-20 09:34:08 UTC (rev 12)
@@ -1,12 +1,13 @@
org.staticwiki.wiki.renderer.line.LineRenderer
org.staticwiki.wiki.renderer.line.HeaderLineHandler
org.staticwiki.wiki.renderer.line.QuoteLineHandler
+org.staticwiki.wiki.renderer.line.RuleLineHandler
org.staticwiki.wiki.renderer.line.ParagraphLineHandler
org.staticwiki.wiki.renderer.simple.SurroundMarkupRenderer|*|<b>|</b>
org.staticwiki.wiki.renderer.simple.SurroundMarkupRenderer|_|<em>|</em>
org.staticwiki.wiki.renderer.simple.SurroundMarkupRenderer|??|<cite>|</cite>
org.staticwiki.wiki.renderer.simple.SurroundMarkupRenderer|-|<strikethrough>|</strikethrough>
-org.staticwiki.wiki.renderer.simple.SurroundMarkupRenderer|+|<em>|</u>
+org.staticwiki.wiki.renderer.simple.SurroundMarkupRenderer|+|<u>|</u>
org.staticwiki.wiki.renderer.simple.SurroundMarkupRenderer|^|<sup>|</sup>
org.staticwiki.wiki.renderer.simple.SurroundMarkupRenderer|~|<sub>|</sub>
org.staticwiki.wiki.renderer.simple.SurroundMarkupRenderer|%|<tt class="monospaced">|</tt>
Added: trunk/staticwiki-renderer/src/test/java/org/staticwiki/wiki/renderer/line/RuleLineRendererTest.java
===================================================================
--- trunk/staticwiki-renderer/src/test/java/org/staticwiki/wiki/renderer/line/RuleLineRendererTest.java (rev 0)
+++ trunk/staticwiki-renderer/src/test/java/org/staticwiki/wiki/renderer/line/RuleLineRendererTest.java 2007-08-20 09:34:08 UTC (rev 12)
@@ -0,0 +1,67 @@
+/**
+ * This file is part of the staticwiki project.
+ *
+ * The contents of this file are subject to the GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ * (the "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.fsf.org/licenses/lgpl.html
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
+ * ANY KIND, either express or implied. See the License for the specific language governing rights and
+ * limitations under the License.
+ */
+
+package org.staticwiki.wiki.renderer.line;
+
+import javolution.lang.TextBuilder;
+import junit.framework.TestCase;
+import org.staticwiki.wiki.WikiRenderer;
+import org.staticwiki.wiki.WikiFactory;
+
+/**
+ * Some simple tests for the rule line renderer, see whether it renders the rule in the correct cases.
+ *
+ * @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
+ */
+public class RuleLineRendererTest
+ extends TestCase
+{
+ public void testNoRule() throws Exception
+ {
+ RuleLineHandler rlh=new RuleLineHandler();
+ TextBuilder res = TextBuilder.newInstance();
+ WikiLineContext context = new WikiLineContext();
+
+ assertFalse( rlh.render( res, "", null, context) );
+ assertFalse( rlh.render( res, "---", null, context) );
+ assertFalse( rlh.render( res, "---- -", null, context) );
+ assertFalse( rlh.render( res, "----x", null, context) );
+ assertFalse( rlh.render( res, "-----x", null, context) );
+ }
+
+ public void testIsRule() throws Exception
+ {
+ RuleLineHandler rlh=new RuleLineHandler();
+ TextBuilder res = TextBuilder.newInstance();
+ WikiLineContext context = new WikiLineContext();
+
+ assertTrue( rlh.render( res, "----", null, context) );
+ assertTrue( rlh.render( res, "-----", null, context) );
+ assertTrue( rlh.render( res, "------- ", null, context) );
+ assertTrue( rlh.render( res, "-----\t\t ", null, context) );
+ }
+
+ public void testRuleWiki()
+ throws Exception
+ {
+ String test = "I want some simple text to verify\n" +
+ "----\n" +
+ "That including a rule works";
+ String result = "<div class=\"wiki\"><p>I want some simple text to verify" +
+ "<hr />" +
+ "That including a rule works</p></div>";
+ WikiRenderer wr = WikiFactory.getWikiRenderer();
+ String got = wr.render( test );
+ assertEquals( result, got );
+ }
+
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-08-17 13:58:19
|
Revision: 11
http://staticwiki.svn.sourceforge.net/staticwiki/?rev=11&view=rev
Author: triathlon98
Date: 2007-08-17 06:58:17 -0700 (Fri, 17 Aug 2007)
Log Message:
-----------
Some site changes
Modified Paths:
--------------
trunk/pom.xml
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2007-08-16 16:56:25 UTC (rev 10)
+++ trunk/pom.xml 2007-08-17 13:58:17 UTC (rev 11)
@@ -18,7 +18,7 @@
<licenses>
<license>
<name>LGPL</name>
- <url>http://www.gnu.org/licenses/lgpl-3.0.txt</url>
+ <url>http://www.gnu.org/licenses/lgpl-2.1.txt</url>
<distribution>repo</distribution>
<comments>v2.1 or higher</comments>
</license>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-08-16 16:56:30
|
Revision: 10
http://staticwiki.svn.sourceforge.net/staticwiki/?rev=10&view=rev
Author: triathlon98
Date: 2007-08-16 09:56:25 -0700 (Thu, 16 Aug 2007)
Log Message:
-----------
Some site changes
Modified Paths:
--------------
trunk/src/site/site.xml
trunk/src/site/wiki/index.wiki
Added Paths:
-----------
trunk/src/site/wiki/developers.wiki
Removed Paths:
-------------
trunk/src/site/resources/site.vm
Deleted: trunk/src/site/resources/site.vm
===================================================================
--- trunk/src/site/resources/site.vm 2007-08-16 12:16:17 UTC (rev 9)
+++ trunk/src/site/resources/site.vm 2007-08-16 16:56:25 UTC (rev 10)
@@ -1,369 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-#macro ( link $href $name )
- #if ( ( $href.toLowerCase().startsWith("http") || $href.toLowerCase().startsWith("https") ) )
- <a href="$href" class="externalLink">$name</a>
- #else
- <a href="$href">$name</a>
- #end
-#end
-
-#macro ( banner $banner $id )
- #if ( $banner )
- #if( $banner.href )
- <a href="$banner.href" id="$id">
- #else
- <span id="$id">
- #end
-
- #if( $banner.src )
- #set ( $src = $banner.src )
- #if ( ! ( $src.toLowerCase().startsWith("http") || $src.toLowerCase().startsWith("https") ) )
- #set ( $src = $PathTool.calculateLink( $src, $relativePath ) )
- #set ( $src = $src.replaceAll( "\\", "/" ) )
- #end
- #if ( $banner.alt )
- #set ( $alt = $banner.alt )
- #else
- #set ( $alt = "" )
- #end
- <img src="$src" alt="$alt" />
- #else
- $banner.name
- #end
-
- #if( $banner.href )
- </a>
- #else
- </span>
- #end
- #end
-#end
-
-#macro ( links $links )
- #set ( $counter = 0 )
- #foreach( $item in $links )
- #set ( $counter = $counter + 1 )
- #set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) )
- #set ( $currentItemHref = $currentItemHref.replaceAll( "\\", "/" ) )
- #link( $currentItemHref $item.name )
- #if ( $links.size() > $counter )
- |
- #end
- #end
-#end
-
-#macro ( breadcrumbs $breadcrumbs )
- #set ( $counter = 0 )
- #foreach( $item in $breadcrumbs )
- #set ( $counter = $counter + 1 )
- #set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) )
- #set ( $currentItemHref = $currentItemHref.replaceAll( "\\", "/" ) )
-
- #if ( $currentItemHref == $alignedFileName || $currentItemHref == "" )
- $item.name
- #else
- #link( $currentItemHref $item.name )
- #end
- #if ( $breadcrumbs.size() > $counter )
- >
- #end
- #end
-#end
-
-#macro ( displayTree $display $item )
- #if ( $item && $item.items && $item.items.size() > 0 )
- #foreach( $subitem in $item.items )
- #set ( $subitemHref = $PathTool.calculateLink( $subitem.href, $relativePath ) )
- #set ( $subitemHref = $subitemHref.replaceAll( "\\", "/" ) )
-
- #if ( $alignedFileName == $subitemHref )
- #set ( $display = true )
- #end
-
- #displayTree( $display $subitem )
- #end
- #end
-#end
-
-#macro ( menuItem $item )
- #set ( $collapse = "none" )
- #set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) )
- #set ( $currentItemHref = $currentItemHref.replaceAll( "\\", "/" ) )
-
- #if ( $item && $item.items && $item.items.size() > 0 )
- #if ( $item.collapse == false )
- #set ( $collapse = "expanded" )
- #else
- ## By default collapsed
- #set ( $collapse = "collapsed" )
- #end
-
- #set ( $display = false )
- #displayTree( $display $item )
-
- #if ( $alignedFileName == $currentItemHref || $display )
- #set ( $collapse = "expanded" )
- #end
- #end
- <li class="$collapse">
- #if ( $item.img )
- #if ( ! ( $item.img.toLowerCase().startsWith("http") || $item.img.toLowerCase().startsWith("https") ) )
- #set ( $src = $PathTool.calculateLink( $item.img, $relativePath ) )
- #set ( $src = $src.replaceAll( "\\", "/" ) )
- <img src="$src"/>
- #else
- <img src="$item.img" align="absbottom" style="border-width: 0"/>
- #end
- #end
- #if ( $alignedFileName == $currentItemHref )
- <strong>$item.name</strong>
- #else
- #link( $currentItemHref $item.name )
- #end
- #if ( $item && $item.items && $item.items.size() > 0 )
- #if ( $collapse == "expanded" )
- <ul>
- #foreach( $subitem in $item.items )
- #menuItem( $subitem )
- #end
- </ul>
- #end
- #end
- </li>
-#end
-
-#macro ( mainMenu $menus )
- #foreach( $menu in $menus )
- #if ( $menu.name )
- <h5>$menu.name</h5>
- #end
- #if ( $menu.items && $menu.items.size() > 0 )
- <ul>
- #foreach( $item in $menu.items )
- #menuItem( $item )
- #end
- </ul>
- #end
- #end
-#end
-
-#macro ( copyright )
- #if ( $project )
- #set ( $currentYear = ${currentDate.year} + 1900 )
-
- #if ( ${project.inceptionYear} && ( ${project.inceptionYear} != ${currentYear.toString()} ) )
- ${project.inceptionYear}-${currentYear}
- #else
- ${currentYear}
- #end
-
- #if ( ${project.organization} && ${project.organization.name} )
- ${project.organization.name}
- #end
- #end
-#end
-
-#macro ( publishDate $position $publishDate $version )
- #if ( $publishDate && $publishDate.format )
- #set ( $format = $publishDate.format )
- #else
- #set ( $format = "yyyy-MM-dd" )
- #end
-
- $dateFormat.applyPattern( $format )
-
- #set ( $dateToday = $dateFormat.format( $currentDate ) )
-
- #if ( $publishDate && $publishDate.position )
- #set ( $datePosition = $publishDate.position )
- #else
- #set ( $datePosition = "left" )
- #end
-
- #if ( $version )
- #if ( $version.position )
- #set ( $versionPosition = $version.position )
- #else
- #set ( $versionPosition = "left" )
- #end
- #end
-
- #set ( $breadcrumbs = $decoration.body.breadcrumbs )
- #set ( $links = $decoration.body.links )
-
- #if ( $datePosition.equalsIgnoreCase( "right" ) && $links && $links.size() > 0 )
- #set ( $prefix = " |" )
- #else
- #set ( $prefix = "" )
- #end
-
- #if ( $datePosition.equalsIgnoreCase( $position ) )
- #if ( ( $datePosition.equalsIgnoreCase( "right" ) ) || ( $datePosition.equalsIgnoreCase( "bottom" ) ) )
- $prefix $i18n.getString( "site-renderer", $locale, "template.lastpublished" ): $dateToday
- #if ( $versionPosition.equalsIgnoreCase( $position ) )
- | $i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}
- #end
- #elseif ( ( $datePosition.equalsIgnoreCase( "navigation-bottom" ) ) || ( $datePosition.equalsIgnoreCase( "navigation-top" ) ) )
- <div id="lastPublished">
- $i18n.getString( "site-renderer", $locale, "template.lastpublished" ): $dateToday
- #if ( $versionPosition.equalsIgnoreCase( $position ) )
- | $i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}
- #end
- </div>
- #elseif ( $datePosition.equalsIgnoreCase("left") )
- <div class="xleft">
- $i18n.getString( "site-renderer", $locale, "template.lastpublished" ): $dateToday
- #if ( $versionPosition.equalsIgnoreCase( $position ) )
- | $i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}
- #end
- #if ( $breadcrumbs && $breadcrumbs.size() > 0 )
- | #breadcrumbs( $breadcrumbs )
- #end
- </div>
- #end
- #elseif ( $versionPosition.equalsIgnoreCase( $position ) )
- #if ( ( $versionPosition.equalsIgnoreCase( "right" ) ) || ( $versionPosition.equalsIgnoreCase( "bottom" ) ) )
- $prefix $i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}
- #elseif ( ( $versionPosition.equalsIgnoreCase( "navigation-bottom" ) ) || ( $versionPosition.equalsIgnoreCase( "navigation-top" ) ) )
- <div id="lastPublished">
- $i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}
- </div>
- #elseif ( $versionPosition.equalsIgnoreCase("left") )
- <div class="xleft">
- $i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}
- #if ( $breadcrumbs && $breadcrumbs.size() > 0 )
- | #breadcrumbs( $breadcrumbs )
- #end
- </div>
- #end
- #elseif ( $position.equalsIgnoreCase( "left" ) )
- #if ( $breadcrumbs && $breadcrumbs.size() > 0 )
- <div class="xleft">
- #breadcrumbs( $breadcrumbs )
- </div>
- #end
- #end
-#end
-
-#macro ( poweredByLogo $poweredBy )
- #if( $poweredBy )
- #foreach ($item in $poweredBy)
- #if( $item.href )
- #set ( $href = $PathTool.calculateLink( $item.href, $relativePath ) )
- #set ( $href = $href.replaceAll( "\\", "/" ) )
- #else
- #set ( $href="http://maven.apache.org/" )
- #end
-
- #if( $item.name )
- #set ( $name = $item.name )
- #else
- #set ( $name = $i18n.getString( "site-renderer", $locale, "template.builtby" ) )
- #set ( $name = "${name} Maven" )
- #end
-
- #if( $item.img )
- #set ( $img = $item.img )
- #else
- #set ( $img = "images/logos/maven-feather.png" )
- #end
-
- <a href="$href" title="$name" class="poweredBy">
- #set ( $img = $PathTool.calculateLink( $img, $relativePath ) )
- #set ( $img = $img.replaceAll( "\\", "/" ) )
- <img alt="$name" src="$img" />
- </a>
- #end
- #if( $poweredBy.isEmpty() )
- <a href="http://maven.apache.org/" title="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven" class="poweredBy">
- <img alt="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven" src="$relativePath/images/logos/maven-feather.png"></img>
- </a>
- #end
- #else
- <a href="http://maven.apache.org/" title="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven" class="poweredBy">
- <img alt="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven" src="$relativePath/images/logos/maven-feather.png"></img>
- </a>
- #end
-#end
-
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <title>$title</title>
- <style type="text/css" media="all">
- @import url("$relativePath/css/maven-base.css");
- @import url("$relativePath/css/maven-theme.css");
- @import url("$relativePath/css/site.css");
- </style>
- <link rel="stylesheet" href="$relativePath/css/print.css" type="text/css" media="print" />
- #foreach( $author in $authors )
- <meta name="author" content="$author" />
- #end
- <meta http-equiv="Content-Type" content="text/html; charset=${outputEncoding}" />
- #if ( $decoration.body.head )
- #foreach( $item in $decoration.body.head.getChildren() )
- #if ( $item.name == "script" )
- $item.toUnescapedString()
- #else
- $item.toString()
- #end
- #end
- #end
- </head>
- <body class="composite">
- <div id="banner">
- #banner( $decoration.bannerLeft "bannerLeft" )
- #banner( $decoration.bannerRight "bannerRight" )
- <div class="clear">
- <hr/>
- </div>
- </div>
- <div id="breadcrumbs">
- #publishDate( "left" $decoration.publishDate $decoration.version )
- <div class="xright">#links( $decoration.body.links )#publishDate( "right" $decoration.publishDate $decoration.version )</div>
- <div class="clear">
- <hr/>
- </div>
- </div>
- <div id="leftColumn">
- <div id="navcolumn">
- #publishDate( "navigation-top" $decoration.publishDate $decoration.version )
- #mainMenu( $decoration.body.menus )
- #poweredByLogo( $decoration.poweredBy )
- #publishDate( "navigation-bottom" $decoration.publishDate $decoration.version )
- </div>
- </div>
- <div id="bodyColumn">
-<div class="advert">
-<script type="text/javascript"><!--
-google_ad_client = "pub-3075143938601956";
-google_ad_width = 728;
-google_ad_height = 90;
-google_ad_format = "728x90_as";
-google_ad_type = "text_image";
-google_ad_channel ="";
-google_color_border = "6699CC";
-google_color_bg = "003366";
-google_color_link = "FFFFFF";
-google_color_text = "AECCEB";
-google_color_url = "AECCEB";
-//--></script>
-<script type="text/javascript"
- src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-</div>
- <div id="contentBox">
- $bodyContent
- </div>
- </div>
- <div class="clear">
- <hr/>
- </div>
- <div id="footer">
- <div class="xright">©#copyright()#publishDate( "bottom" $decoration.publishDate $decoration.version )</div>
- <div class="clear">
- <hr/>
- </div>
- </div>
- </body>
-</html>
\ No newline at end of file
Modified: trunk/src/site/site.xml
===================================================================
--- trunk/src/site/site.xml 2007-08-16 12:16:17 UTC (rev 9)
+++ trunk/src/site/site.xml 2007-08-16 16:56:25 UTC (rev 10)
@@ -3,16 +3,17 @@
<skin>
<groupId>be.progs</groupId>
<artifactId>maven-site-skin</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
</skin>
+
+ <publishDate format="yyyy-MM-dd"/>
+
<bannerLeft>
<name>staticwiki</name>
<src>/images/logo.png</src>
<href>http://www.staticwiki.org/</href>
</bannerLeft>
- <publishDate position="navigation-bottom" format="yyyy-MM-dd"/>
-
<body>
<links>
<item name="staticwiki" href="http://www.staticwiki.org/"/>
Added: trunk/src/site/wiki/developers.wiki
===================================================================
--- trunk/src/site/wiki/developers.wiki (rev 0)
+++ trunk/src/site/wiki/developers.wiki 2007-08-16 16:56:25 UTC (rev 10)
@@ -0,0 +1,13 @@
+h1. Developers information
+
+h2. maven targets, profiles, variables
+
+As the staticwiki site already uses staticwiki to generate its contents, some tricks have been applied to assure it all works.
+To build the site, you have to use the following commands
+{code}
+mvn install
+mvn -Dsite site
+{code}
+
+The first (install) will build all modules, including the staticwiki-site-plugin.
+The second target disables the staticwiki-site-plugin as module, but enables it as library for the [maven-site-plugin|http://maven.apache.org/plugins/maven-site-plugin/]. This way, circular dependencies are avoided.
\ No newline at end of file
Modified: trunk/src/site/wiki/index.wiki
===================================================================
--- trunk/src/site/wiki/index.wiki 2007-08-16 12:16:17 UTC (rev 9)
+++ trunk/src/site/wiki/index.wiki 2007-08-16 16:56:25 UTC (rev 10)
@@ -1,9 +1,9 @@
+----
+*warning* this is highly preliminary information, the project (and especially the documentation) is in a very preliminary fase and will be improved soon. So do have a browse around, but definitely come back later to see how things evolve.
+----
+
h1. staticwiki
----
-*warning* this is highly preliminary information, the prject (and especially the documentation) is in a very preliminary fase wand will be improved soon. So do have a browse around, but definitely come back later to see how things evolve.
----
-
staticwiki is a configurable java wiki renderer. he rendering is done in several passes to allow a lot of versatility.
One of the features (hence the name) is that it can be combined with maven to generate a static site using wiki context.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-08-16 12:16:21
|
Revision: 9
http://staticwiki.svn.sourceforge.net/staticwiki/?rev=9&view=rev
Author: triathlon98
Date: 2007-08-16 05:16:17 -0700 (Thu, 16 Aug 2007)
Log Message:
-----------
various site improvements
Modified Paths:
--------------
trunk/pom.xml
Added Paths:
-----------
trunk/src/site/resources/
trunk/src/site/resources/css/
trunk/src/site/resources/css/site.css
trunk/src/site/resources/site.vm
trunk/src/site/site.xml
trunk/src/site/wiki/index.wiki
trunk/src/site/wiki/markup.wiki
trunk/src/site/wiki/usage.wiki
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2007-08-11 00:24:46 UTC (rev 8)
+++ trunk/pom.xml 2007-08-16 12:16:17 UTC (rev 9)
@@ -65,25 +65,16 @@
</modules>
<build>
+ <extensions>
+ <extension>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-webdav</artifactId>
+ <version>1.0-beta-2</version>
+ </extension>
+ </extensions>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <dependencies>
- <!--
- fortunately these dependencies is not checked about being cyclic, though you probably need
- to compile a second time to make sure the wiki stuff is part of the site
- -->
- <dependency>
- <groupId>org.staticwiki</groupId>
- <artifactId>staticwiki-site-plugin</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.5</source>
@@ -206,6 +197,18 @@
<url>http://maven.progs.be/m2repo</url>
</repository>
</repositories>
+ <distributionManagement>
+ <repository>
+ <id>progs-repo</id>
+ <name>PROGS maven repository</name>
+ <url>dav:http://maven.progs.be/m2repo</url>
+ </repository>
+ <site>
+ <id>staticwiki-site</id>
+ <name>staticwiki website</name>
+ <url>dav:http://www.staticwiki.org</url>
+ </site>
+ </distributionManagement>
<profiles>
<profile>
<id>include-compile-plugin</id>
@@ -238,6 +241,21 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <dependencies>
+ <!--
+ fortunately these dependencies is not checked about being cyclic, though you probably need
+ to compile a second time to make sure the wiki stuff is part of the site
+ -->
+ <dependency>
+ <groupId>org.staticwiki</groupId>
+ <artifactId>staticwiki-site-plugin</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+ </plugin>
</plugins>
</build>
</profile>
Added: trunk/src/site/resources/css/site.css
===================================================================
--- trunk/src/site/resources/css/site.css (rev 0)
+++ trunk/src/site/resources/css/site.css 2007-08-16 12:16:17 UTC (rev 9)
@@ -0,0 +1,10 @@
+#navcolumn h5 {
+ font-size: smaller;
+ border: 1px solid #aaaaaa;
+ background-color: #bbb;
+ margin-top: 7px;
+ margin-bottom: 2px;
+ padding-top: 2px;
+ padding-left: 2px;
+ color: #000;
+}
\ No newline at end of file
Added: trunk/src/site/resources/site.vm
===================================================================
--- trunk/src/site/resources/site.vm (rev 0)
+++ trunk/src/site/resources/site.vm 2007-08-16 12:16:17 UTC (rev 9)
@@ -0,0 +1,369 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+#macro ( link $href $name )
+ #if ( ( $href.toLowerCase().startsWith("http") || $href.toLowerCase().startsWith("https") ) )
+ <a href="$href" class="externalLink">$name</a>
+ #else
+ <a href="$href">$name</a>
+ #end
+#end
+
+#macro ( banner $banner $id )
+ #if ( $banner )
+ #if( $banner.href )
+ <a href="$banner.href" id="$id">
+ #else
+ <span id="$id">
+ #end
+
+ #if( $banner.src )
+ #set ( $src = $banner.src )
+ #if ( ! ( $src.toLowerCase().startsWith("http") || $src.toLowerCase().startsWith("https") ) )
+ #set ( $src = $PathTool.calculateLink( $src, $relativePath ) )
+ #set ( $src = $src.replaceAll( "\\", "/" ) )
+ #end
+ #if ( $banner.alt )
+ #set ( $alt = $banner.alt )
+ #else
+ #set ( $alt = "" )
+ #end
+ <img src="$src" alt="$alt" />
+ #else
+ $banner.name
+ #end
+
+ #if( $banner.href )
+ </a>
+ #else
+ </span>
+ #end
+ #end
+#end
+
+#macro ( links $links )
+ #set ( $counter = 0 )
+ #foreach( $item in $links )
+ #set ( $counter = $counter + 1 )
+ #set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) )
+ #set ( $currentItemHref = $currentItemHref.replaceAll( "\\", "/" ) )
+ #link( $currentItemHref $item.name )
+ #if ( $links.size() > $counter )
+ |
+ #end
+ #end
+#end
+
+#macro ( breadcrumbs $breadcrumbs )
+ #set ( $counter = 0 )
+ #foreach( $item in $breadcrumbs )
+ #set ( $counter = $counter + 1 )
+ #set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) )
+ #set ( $currentItemHref = $currentItemHref.replaceAll( "\\", "/" ) )
+
+ #if ( $currentItemHref == $alignedFileName || $currentItemHref == "" )
+ $item.name
+ #else
+ #link( $currentItemHref $item.name )
+ #end
+ #if ( $breadcrumbs.size() > $counter )
+ >
+ #end
+ #end
+#end
+
+#macro ( displayTree $display $item )
+ #if ( $item && $item.items && $item.items.size() > 0 )
+ #foreach( $subitem in $item.items )
+ #set ( $subitemHref = $PathTool.calculateLink( $subitem.href, $relativePath ) )
+ #set ( $subitemHref = $subitemHref.replaceAll( "\\", "/" ) )
+
+ #if ( $alignedFileName == $subitemHref )
+ #set ( $display = true )
+ #end
+
+ #displayTree( $display $subitem )
+ #end
+ #end
+#end
+
+#macro ( menuItem $item )
+ #set ( $collapse = "none" )
+ #set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) )
+ #set ( $currentItemHref = $currentItemHref.replaceAll( "\\", "/" ) )
+
+ #if ( $item && $item.items && $item.items.size() > 0 )
+ #if ( $item.collapse == false )
+ #set ( $collapse = "expanded" )
+ #else
+ ## By default collapsed
+ #set ( $collapse = "collapsed" )
+ #end
+
+ #set ( $display = false )
+ #displayTree( $display $item )
+
+ #if ( $alignedFileName == $currentItemHref || $display )
+ #set ( $collapse = "expanded" )
+ #end
+ #end
+ <li class="$collapse">
+ #if ( $item.img )
+ #if ( ! ( $item.img.toLowerCase().startsWith("http") || $item.img.toLowerCase().startsWith("https") ) )
+ #set ( $src = $PathTool.calculateLink( $item.img, $relativePath ) )
+ #set ( $src = $src.replaceAll( "\\", "/" ) )
+ <img src="$src"/>
+ #else
+ <img src="$item.img" align="absbottom" style="border-width: 0"/>
+ #end
+ #end
+ #if ( $alignedFileName == $currentItemHref )
+ <strong>$item.name</strong>
+ #else
+ #link( $currentItemHref $item.name )
+ #end
+ #if ( $item && $item.items && $item.items.size() > 0 )
+ #if ( $collapse == "expanded" )
+ <ul>
+ #foreach( $subitem in $item.items )
+ #menuItem( $subitem )
+ #end
+ </ul>
+ #end
+ #end
+ </li>
+#end
+
+#macro ( mainMenu $menus )
+ #foreach( $menu in $menus )
+ #if ( $menu.name )
+ <h5>$menu.name</h5>
+ #end
+ #if ( $menu.items && $menu.items.size() > 0 )
+ <ul>
+ #foreach( $item in $menu.items )
+ #menuItem( $item )
+ #end
+ </ul>
+ #end
+ #end
+#end
+
+#macro ( copyright )
+ #if ( $project )
+ #set ( $currentYear = ${currentDate.year} + 1900 )
+
+ #if ( ${project.inceptionYear} && ( ${project.inceptionYear} != ${currentYear.toString()} ) )
+ ${project.inceptionYear}-${currentYear}
+ #else
+ ${currentYear}
+ #end
+
+ #if ( ${project.organization} && ${project.organization.name} )
+ ${project.organization.name}
+ #end
+ #end
+#end
+
+#macro ( publishDate $position $publishDate $version )
+ #if ( $publishDate && $publishDate.format )
+ #set ( $format = $publishDate.format )
+ #else
+ #set ( $format = "yyyy-MM-dd" )
+ #end
+
+ $dateFormat.applyPattern( $format )
+
+ #set ( $dateToday = $dateFormat.format( $currentDate ) )
+
+ #if ( $publishDate && $publishDate.position )
+ #set ( $datePosition = $publishDate.position )
+ #else
+ #set ( $datePosition = "left" )
+ #end
+
+ #if ( $version )
+ #if ( $version.position )
+ #set ( $versionPosition = $version.position )
+ #else
+ #set ( $versionPosition = "left" )
+ #end
+ #end
+
+ #set ( $breadcrumbs = $decoration.body.breadcrumbs )
+ #set ( $links = $decoration.body.links )
+
+ #if ( $datePosition.equalsIgnoreCase( "right" ) && $links && $links.size() > 0 )
+ #set ( $prefix = " |" )
+ #else
+ #set ( $prefix = "" )
+ #end
+
+ #if ( $datePosition.equalsIgnoreCase( $position ) )
+ #if ( ( $datePosition.equalsIgnoreCase( "right" ) ) || ( $datePosition.equalsIgnoreCase( "bottom" ) ) )
+ $prefix $i18n.getString( "site-renderer", $locale, "template.lastpublished" ): $dateToday
+ #if ( $versionPosition.equalsIgnoreCase( $position ) )
+ | $i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}
+ #end
+ #elseif ( ( $datePosition.equalsIgnoreCase( "navigation-bottom" ) ) || ( $datePosition.equalsIgnoreCase( "navigation-top" ) ) )
+ <div id="lastPublished">
+ $i18n.getString( "site-renderer", $locale, "template.lastpublished" ): $dateToday
+ #if ( $versionPosition.equalsIgnoreCase( $position ) )
+ | $i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}
+ #end
+ </div>
+ #elseif ( $datePosition.equalsIgnoreCase("left") )
+ <div class="xleft">
+ $i18n.getString( "site-renderer", $locale, "template.lastpublished" ): $dateToday
+ #if ( $versionPosition.equalsIgnoreCase( $position ) )
+ | $i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}
+ #end
+ #if ( $breadcrumbs && $breadcrumbs.size() > 0 )
+ | #breadcrumbs( $breadcrumbs )
+ #end
+ </div>
+ #end
+ #elseif ( $versionPosition.equalsIgnoreCase( $position ) )
+ #if ( ( $versionPosition.equalsIgnoreCase( "right" ) ) || ( $versionPosition.equalsIgnoreCase( "bottom" ) ) )
+ $prefix $i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}
+ #elseif ( ( $versionPosition.equalsIgnoreCase( "navigation-bottom" ) ) || ( $versionPosition.equalsIgnoreCase( "navigation-top" ) ) )
+ <div id="lastPublished">
+ $i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}
+ </div>
+ #elseif ( $versionPosition.equalsIgnoreCase("left") )
+ <div class="xleft">
+ $i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}
+ #if ( $breadcrumbs && $breadcrumbs.size() > 0 )
+ | #breadcrumbs( $breadcrumbs )
+ #end
+ </div>
+ #end
+ #elseif ( $position.equalsIgnoreCase( "left" ) )
+ #if ( $breadcrumbs && $breadcrumbs.size() > 0 )
+ <div class="xleft">
+ #breadcrumbs( $breadcrumbs )
+ </div>
+ #end
+ #end
+#end
+
+#macro ( poweredByLogo $poweredBy )
+ #if( $poweredBy )
+ #foreach ($item in $poweredBy)
+ #if( $item.href )
+ #set ( $href = $PathTool.calculateLink( $item.href, $relativePath ) )
+ #set ( $href = $href.replaceAll( "\\", "/" ) )
+ #else
+ #set ( $href="http://maven.apache.org/" )
+ #end
+
+ #if( $item.name )
+ #set ( $name = $item.name )
+ #else
+ #set ( $name = $i18n.getString( "site-renderer", $locale, "template.builtby" ) )
+ #set ( $name = "${name} Maven" )
+ #end
+
+ #if( $item.img )
+ #set ( $img = $item.img )
+ #else
+ #set ( $img = "images/logos/maven-feather.png" )
+ #end
+
+ <a href="$href" title="$name" class="poweredBy">
+ #set ( $img = $PathTool.calculateLink( $img, $relativePath ) )
+ #set ( $img = $img.replaceAll( "\\", "/" ) )
+ <img alt="$name" src="$img" />
+ </a>
+ #end
+ #if( $poweredBy.isEmpty() )
+ <a href="http://maven.apache.org/" title="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven" class="poweredBy">
+ <img alt="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven" src="$relativePath/images/logos/maven-feather.png"></img>
+ </a>
+ #end
+ #else
+ <a href="http://maven.apache.org/" title="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven" class="poweredBy">
+ <img alt="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven" src="$relativePath/images/logos/maven-feather.png"></img>
+ </a>
+ #end
+#end
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <title>$title</title>
+ <style type="text/css" media="all">
+ @import url("$relativePath/css/maven-base.css");
+ @import url("$relativePath/css/maven-theme.css");
+ @import url("$relativePath/css/site.css");
+ </style>
+ <link rel="stylesheet" href="$relativePath/css/print.css" type="text/css" media="print" />
+ #foreach( $author in $authors )
+ <meta name="author" content="$author" />
+ #end
+ <meta http-equiv="Content-Type" content="text/html; charset=${outputEncoding}" />
+ #if ( $decoration.body.head )
+ #foreach( $item in $decoration.body.head.getChildren() )
+ #if ( $item.name == "script" )
+ $item.toUnescapedString()
+ #else
+ $item.toString()
+ #end
+ #end
+ #end
+ </head>
+ <body class="composite">
+ <div id="banner">
+ #banner( $decoration.bannerLeft "bannerLeft" )
+ #banner( $decoration.bannerRight "bannerRight" )
+ <div class="clear">
+ <hr/>
+ </div>
+ </div>
+ <div id="breadcrumbs">
+ #publishDate( "left" $decoration.publishDate $decoration.version )
+ <div class="xright">#links( $decoration.body.links )#publishDate( "right" $decoration.publishDate $decoration.version )</div>
+ <div class="clear">
+ <hr/>
+ </div>
+ </div>
+ <div id="leftColumn">
+ <div id="navcolumn">
+ #publishDate( "navigation-top" $decoration.publishDate $decoration.version )
+ #mainMenu( $decoration.body.menus )
+ #poweredByLogo( $decoration.poweredBy )
+ #publishDate( "navigation-bottom" $decoration.publishDate $decoration.version )
+ </div>
+ </div>
+ <div id="bodyColumn">
+<div class="advert">
+<script type="text/javascript"><!--
+google_ad_client = "pub-3075143938601956";
+google_ad_width = 728;
+google_ad_height = 90;
+google_ad_format = "728x90_as";
+google_ad_type = "text_image";
+google_ad_channel ="";
+google_color_border = "6699CC";
+google_color_bg = "003366";
+google_color_link = "FFFFFF";
+google_color_text = "AECCEB";
+google_color_url = "AECCEB";
+//--></script>
+<script type="text/javascript"
+ src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
+</script>
+</div>
+ <div id="contentBox">
+ $bodyContent
+ </div>
+ </div>
+ <div class="clear">
+ <hr/>
+ </div>
+ <div id="footer">
+ <div class="xright">©#copyright()#publishDate( "bottom" $decoration.publishDate $decoration.version )</div>
+ <div class="clear">
+ <hr/>
+ </div>
+ </div>
+ </body>
+</html>
\ No newline at end of file
Added: trunk/src/site/site.xml
===================================================================
--- trunk/src/site/site.xml (rev 0)
+++ trunk/src/site/site.xml 2007-08-16 12:16:17 UTC (rev 9)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="staticwiki">
+ <skin>
+ <groupId>be.progs</groupId>
+ <artifactId>maven-site-skin</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </skin>
+ <bannerLeft>
+ <name>staticwiki</name>
+ <src>/images/logo.png</src>
+ <href>http://www.staticwiki.org/</href>
+ </bannerLeft>
+
+ <publishDate position="navigation-bottom" format="yyyy-MM-dd"/>
+
+ <body>
+ <links>
+ <item name="staticwiki" href="http://www.staticwiki.org/"/>
+ <item name="equanda" href="http://www.equanda.org/"/>
+ </links>
+
+ <menu name="staticwiki">
+ <item name="Introduction" href="index.html"/>
+ <item name="Usage" href="usage.html"/>
+ <item name="Markup" href="markup.html"/>
+ </menu>
+
+ <menu ref="modules"/>
+ <menu ref="reports"/>
+ </body>
+</project>
\ No newline at end of file
Added: trunk/src/site/wiki/index.wiki
===================================================================
--- trunk/src/site/wiki/index.wiki (rev 0)
+++ trunk/src/site/wiki/index.wiki 2007-08-16 12:16:17 UTC (rev 9)
@@ -0,0 +1,13 @@
+h1. staticwiki
+
+---
+*warning* this is highly preliminary information, the prject (and especially the documentation) is in a very preliminary fase wand will be improved soon. So do have a browse around, but definitely come back later to see how things evolve.
+---
+
+staticwiki is a configurable java wiki renderer. he rendering is done in several passes to allow a lot of versatility.
+
+One of the features (hence the name) is that it can be combined with maven to generate a static site using wiki context.
+
+However the renderer itself could easily be used in on the fly wiki rendering. In fact the rendering should be pretty fast as it does not use regex matching.
+
+Though the [markup|markup.html] could be configured, the default wiki dialect which is used is similar to the markup used in [Confluence|http://www.atlassian.com/software/confluence/].
\ No newline at end of file
Added: trunk/src/site/wiki/markup.wiki
===================================================================
--- trunk/src/site/wiki/markup.wiki (rev 0)
+++ trunk/src/site/wiki/markup.wiki 2007-08-16 12:16:17 UTC (rev 9)
@@ -0,0 +1,3 @@
+h1. staticwiki default markup
+
+
\ No newline at end of file
Added: trunk/src/site/wiki/usage.wiki
===================================================================
--- trunk/src/site/wiki/usage.wiki (rev 0)
+++ trunk/src/site/wiki/usage.wiki 2007-08-16 12:16:17 UTC (rev 9)
@@ -0,0 +1 @@
+h1. How to use staticwiki
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-08-11 00:24:50
|
Revision: 8
http://staticwiki.svn.sourceforge.net/staticwiki/?rev=8&view=rev
Author: triathlon98
Date: 2007-08-10 17:24:46 -0700 (Fri, 10 Aug 2007)
Log Message:
-----------
make project site more complete
Modified Paths:
--------------
trunk/pom.xml
trunk/staticwiki-site-plugin/pom.xml
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2007-08-09 18:11:33 UTC (rev 7)
+++ trunk/pom.xml 2007-08-11 00:24:46 UTC (rev 8)
@@ -12,19 +12,39 @@
<description>
staticwiki is an tool to generate a static wiki site.
</description>
- <modules>
- <module>staticwiki-renderer</module>
- <module>staticwiki-editor</module>
- </modules>
+
+ <inceptionYear>2006</inceptionYear>
+ <url>http://staticwiki.org</url>
<licenses>
<license>
<name>LGPL</name>
- <url>http://www.fsf.org/licenses/lgpl.html</url>
+ <url>http://www.gnu.org/licenses/lgpl-3.0.txt</url>
+ <distribution>repo</distribution>
<comments>v2.1 or higher</comments>
</license>
</licenses>
- <url>http://staticwiki.org</url>
-
+ <issueManagement>
+ <system>sourceforge trackers</system>
+ <url>http://sourceforge.net/tracker/?group_id=196967</url>
+ </issueManagement>
+ <scm>
+ <connection>
+ scm:svn:https://staticwiki.svn.sourceforge.net/svnroot/staticwiki/trunk
+ </connection>
+ <developerConnection>
+ scm:svn:https://staticwiki.svn.sourceforge.net/svnroot/staticwiki/trunk
+ </developerConnection>
+ <url>http://staticwiki.svn.sourceforge.net/viewvc/staticwiki/</url>
+ </scm>
+ <mailingLists>
+ <mailingList>
+ <name>staticwiki-svn-commit</name>
+ <post>mailto:sta...@li...</post>
+ <subscribe>https://lists.sourceforge.net/lists/listinfo/staticwiki-svn-commit</subscribe>
+ <unsubscribe>https://lists.sourceforge.net/lists/listinfo/staticwiki-svn-commit</unsubscribe>
+ <archive>http://sourceforge.net/mailarchive/forum.php?forum_name=staticwiki-svn-commit</archive>
+ </mailingList>
+ </mailingLists>
<developers>
<developer>
<name>Joachim Van der Auwera</name>
@@ -39,6 +59,11 @@
</developer>
</developers>
+ <modules>
+ <module>staticwiki-renderer</module>
+ <module>staticwiki-editor</module>
+ </modules>
+
<build>
<plugins>
<plugin>
@@ -181,18 +206,6 @@
<url>http://maven.progs.be/m2repo</url>
</repository>
</repositories>
- <distributionManagement>
- <snapshotRepository>
- <id>snapshotrepo</id>
- <name>Repository Name</name>
- <url>scp://shell.sf.net/home/groups/s/st/staticwiki/htdocs/m2repo</url>
- </snapshotRepository>
- <site>
- <id>website</id>
- <url>scp://shell.sf.net/home/groups/s/st/staticwiki/htdocs/</url>
- </site>
- </distributionManagement>
-
<profiles>
<profile>
<id>include-compile-plugin</id>
@@ -228,6 +241,26 @@
</plugins>
</build>
</profile>
-
+ <profile>
+ <id>env-horse</id>
+ <activation>
+ <property>
+ <name>env</name>
+ <value>horse</value>
+ </property>
+ </activation>
+ <distributionManagement>
+ <repository>
+ <id>snapshotrepo</id>
+ <name>Repository Name</name>
+ <url>file:///home/joachim/sites/maven.progs.be/m2repo</url>
+ </repository>
+ <site>
+ <id>staticwiki-site</id>
+ <name>staticwiki website</name>
+ <url>file:///home/joachim/sites/staticwiki</url>
+ </site>
+ </distributionManagement>
+ </profile>
</profiles>
</project>
Modified: trunk/staticwiki-site-plugin/pom.xml
===================================================================
--- trunk/staticwiki-site-plugin/pom.xml 2007-08-09 18:11:33 UTC (rev 7)
+++ trunk/staticwiki-site-plugin/pom.xml 2007-08-11 00:24:46 UTC (rev 8)
@@ -14,6 +14,7 @@
<description>
Maven plugin to allow generating maven site pages using staticwiki markup.
</description>
+ <inceptionYear>2007</inceptionYear>
<build>
<plugins>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
![http://maven.apache.org/images/logos/maven-feather.png"/>](http://maven.apache.org/images/logos/maven-feather.png"/>){kind=link}