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...> - 2009-09-02 12:54:39
|
Revision: 58
http://staticwiki.svn.sourceforge.net/staticwiki/?rev=58&view=rev
Author: triathlon98
Date: 2009-09-02 12:54:30 +0000 (Wed, 02 Sep 2009)
Log Message:
-----------
switch to 0.9.2-SNAPSHOT
Modified Paths:
--------------
trunk/staticwiki-editor/pom.xml
Modified: trunk/staticwiki-editor/pom.xml
===================================================================
--- trunk/staticwiki-editor/pom.xml 2009-09-02 12:50:41 UTC (rev 57)
+++ trunk/staticwiki-editor/pom.xml 2009-09-02 12:54:30 UTC (rev 58)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.staticwiki</groupId>
<artifactId>staticwiki</artifactId>
- <version>0.9.1</version>
+ <version>0.9.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.staticwiki</groupId>
<artifactId>staticwiki-editor</artifactId>
<packaging>jar</packaging>
- <version>0.9.1</version>
+ <version>0.9.2-SNAPSHOT</version>
<name>staticwiki-editor</name>
<description>
Simple Swing gui to allow editing wiki markup and seeing a preview of the rendered result.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-09-02 12:50:47
|
Revision: 57
http://staticwiki.svn.sourceforge.net/staticwiki/?rev=57&view=rev
Author: triathlon98
Date: 2009-09-02 12:50:41 +0000 (Wed, 02 Sep 2009)
Log Message:
-----------
switch to 0.9.2-SNAPSHOT
Modified Paths:
--------------
trunk/pom.xml
trunk/staticwiki-renderer/pom.xml
trunk/staticwiki-servlet/pom.xml
trunk/staticwiki-site-plugin/pom.xml
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2009-09-02 12:42:20 UTC (rev 56)
+++ trunk/pom.xml 2009-09-02 12:50:41 UTC (rev 57)
@@ -5,7 +5,7 @@
<artifactId>staticwiki</artifactId>
<packaging>pom</packaging>
- <version>0.9.1</version>
+ <version>0.9.2-SNAPSHOT</version>
<name>staticwiki</name>
<description>
@@ -27,9 +27,9 @@
<url>http://sourceforge.net/tracker/?group_id=196967</url>
</issueManagement>
<scm>
- <connection>scm:svn:https://staticwiki.svn.sourceforge.net/svnroot/staticwiki/tags/staticwiki-0.9.1</connection>
- <developerConnection>scm:svn:https://staticwiki.svn.sourceforge.net/svnroot/staticwiki/tags/staticwiki-0.9.1</developerConnection>
- <url>http://staticwiki.svn.sourceforge.net/viewvc/staticwiki/tags/staticwiki-0.9.1</url>
+ <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>
<ciManagement>
<system>hudson</system>
Modified: trunk/staticwiki-renderer/pom.xml
===================================================================
--- trunk/staticwiki-renderer/pom.xml 2009-09-02 12:42:20 UTC (rev 56)
+++ trunk/staticwiki-renderer/pom.xml 2009-09-02 12:50:41 UTC (rev 57)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.staticwiki</groupId>
<artifactId>staticwiki</artifactId>
- <version>0.9.1</version>
+ <version>0.9.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.staticwiki</groupId>
<artifactId>staticwiki-renderer</artifactId>
<packaging>jar</packaging>
- <version>0.9.1</version>
+ <version>0.9.2-SNAPSHOT</version>
<name>staticwiki-renderer</name>
<description>
General wiki rendering code, the defaults render wiki content with markup similar to Confluence.
Modified: trunk/staticwiki-servlet/pom.xml
===================================================================
--- trunk/staticwiki-servlet/pom.xml 2009-09-02 12:42:20 UTC (rev 56)
+++ trunk/staticwiki-servlet/pom.xml 2009-09-02 12:50:41 UTC (rev 57)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.staticwiki</groupId>
<artifactId>staticwiki</artifactId>
- <version>0.9.1</version>
+ <version>0.9.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.staticwiki</groupId>
<artifactId>staticwiki-servlet</artifactId>
<packaging>war</packaging>
- <version>0.9.1</version>
+ <version>0.9.2-SNAPSHOT</version>
<name>staticwiki-servlet</name>
<description>
Create a dynamic wiki based on the staticwiki renderer.
Modified: trunk/staticwiki-site-plugin/pom.xml
===================================================================
--- trunk/staticwiki-site-plugin/pom.xml 2009-09-02 12:42:20 UTC (rev 56)
+++ trunk/staticwiki-site-plugin/pom.xml 2009-09-02 12:50:41 UTC (rev 57)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.staticwiki</groupId>
<artifactId>staticwiki</artifactId>
- <version>0.9.1</version>
+ <version>0.9.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.staticwiki</groupId>
<artifactId>staticwiki-site-plugin</artifactId>
<packaging>maven-plugin</packaging>
- <version>0.9.1</version>
+ <version>0.9.2-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...> - 2009-09-02 12:42:35
|
Revision: 55
http://staticwiki.svn.sourceforge.net/staticwiki/?rev=55&view=rev
Author: triathlon98
Date: 2009-09-02 12:34:37 +0000 (Wed, 02 Sep 2009)
Log Message:
-----------
[maven-release-plugin] prepare release staticwiki-0.9.1
Modified Paths:
--------------
trunk/pom.xml
trunk/staticwiki-editor/pom.xml
trunk/staticwiki-renderer/pom.xml
trunk/staticwiki-servlet/pom.xml
trunk/staticwiki-site-plugin/pom.xml
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2009-09-02 08:44:40 UTC (rev 54)
+++ trunk/pom.xml 2009-09-02 12:34:37 UTC (rev 55)
@@ -5,7 +5,7 @@
<artifactId>staticwiki</artifactId>
<packaging>pom</packaging>
- <version>0.9.1-SNAPSHOT</version>
+ <version>0.9.1</version>
<name>staticwiki</name>
<description>
@@ -27,9 +27,9 @@
<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>
+ <connection>scm:svn:https://staticwiki.svn.sourceforge.net/svnroot/staticwiki/tags/staticwiki-0.9.1</connection>
+ <developerConnection>scm:svn:https://staticwiki.svn.sourceforge.net/svnroot/staticwiki/tags/staticwiki-0.9.1</developerConnection>
+ <url>http://staticwiki.svn.sourceforge.net/viewvc/staticwiki/tags/staticwiki-0.9.1</url>
</scm>
<ciManagement>
<system>hudson</system>
Modified: trunk/staticwiki-editor/pom.xml
===================================================================
--- trunk/staticwiki-editor/pom.xml 2009-09-02 08:44:40 UTC (rev 54)
+++ trunk/staticwiki-editor/pom.xml 2009-09-02 12:34:37 UTC (rev 55)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.staticwiki</groupId>
<artifactId>staticwiki</artifactId>
- <version>0.9.1-SNAPSHOT</version>
+ <version>0.9.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.staticwiki</groupId>
<artifactId>staticwiki-editor</artifactId>
<packaging>jar</packaging>
- <version>0.9.1-SNAPSHOT</version>
+ <version>0.9.1</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 2009-09-02 08:44:40 UTC (rev 54)
+++ trunk/staticwiki-renderer/pom.xml 2009-09-02 12:34:37 UTC (rev 55)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.staticwiki</groupId>
<artifactId>staticwiki</artifactId>
- <version>0.9.1-SNAPSHOT</version>
+ <version>0.9.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.staticwiki</groupId>
<artifactId>staticwiki-renderer</artifactId>
<packaging>jar</packaging>
- <version>0.9.1-SNAPSHOT</version>
+ <version>0.9.1</version>
<name>staticwiki-renderer</name>
<description>
General wiki rendering code, the defaults render wiki content with markup similar to Confluence.
Modified: trunk/staticwiki-servlet/pom.xml
===================================================================
--- trunk/staticwiki-servlet/pom.xml 2009-09-02 08:44:40 UTC (rev 54)
+++ trunk/staticwiki-servlet/pom.xml 2009-09-02 12:34:37 UTC (rev 55)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.staticwiki</groupId>
<artifactId>staticwiki</artifactId>
- <version>0.9.1-SNAPSHOT</version>
+ <version>0.9.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.staticwiki</groupId>
<artifactId>staticwiki-servlet</artifactId>
<packaging>war</packaging>
- <version>0.9.1-SNAPSHOT</version>
+ <version>0.9.1</version>
<name>staticwiki-servlet</name>
<description>
Create a dynamic wiki based on the staticwiki renderer.
Modified: trunk/staticwiki-site-plugin/pom.xml
===================================================================
--- trunk/staticwiki-site-plugin/pom.xml 2009-09-02 08:44:40 UTC (rev 54)
+++ trunk/staticwiki-site-plugin/pom.xml 2009-09-02 12:34:37 UTC (rev 55)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.staticwiki</groupId>
<artifactId>staticwiki</artifactId>
- <version>0.9.1-SNAPSHOT</version>
+ <version>0.9.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.staticwiki</groupId>
<artifactId>staticwiki-site-plugin</artifactId>
<packaging>maven-plugin</packaging>
- <version>0.9.1-SNAPSHOT</version>
+ <version>0.9.1</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...> - 2009-09-02 12:42:27
|
Revision: 56
http://staticwiki.svn.sourceforge.net/staticwiki/?rev=56&view=rev
Author: triathlon98
Date: 2009-09-02 12:42:20 +0000 (Wed, 02 Sep 2009)
Log Message:
-----------
release 0.9.1
Added Paths:
-----------
tags/staticwiki-0.9.1/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-09-02 08:44:55
|
Revision: 54
http://staticwiki.svn.sourceforge.net/staticwiki/?rev=54&view=rev
Author: triathlon98
Date: 2009-09-02 08:44:40 +0000 (Wed, 02 Sep 2009)
Log Message:
-----------
fix for maven 2.2.1
Modified Paths:
--------------
trunk/staticwiki-servlet/pom.xml
Modified: trunk/staticwiki-servlet/pom.xml
===================================================================
--- trunk/staticwiki-servlet/pom.xml 2009-04-01 15:19:46 UTC (rev 53)
+++ trunk/staticwiki-servlet/pom.xml 2009-09-02 08:44:40 UTC (rev 54)
@@ -32,6 +32,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
+ <version>2.1-beta-1</version>
<configuration>
<!--<archiveClasses>true</archiveClasses>-->
<dependentWarExcludes>WEB-INF/web.xml,index.*</dependentWarExcludes>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-04-01 15:20:10
|
Revision: 53
http://staticwiki.svn.sourceforge.net/staticwiki/?rev=53&view=rev
Author: triathlon98
Date: 2009-04-01 15:19:46 +0000 (Wed, 01 Apr 2009)
Log Message:
-----------
SW-14 don't require .meta files
Modified Paths:
--------------
trunk/staticwiki-servlet/src/main/java/org/staticwiki/servlet/WikiServlet.java
Modified: trunk/staticwiki-servlet/src/main/java/org/staticwiki/servlet/WikiServlet.java
===================================================================
--- trunk/staticwiki-servlet/src/main/java/org/staticwiki/servlet/WikiServlet.java 2009-01-09 11:01:59 UTC (rev 52)
+++ trunk/staticwiki-servlet/src/main/java/org/staticwiki/servlet/WikiServlet.java 2009-04-01 15:19:46 UTC (rev 53)
@@ -53,16 +53,18 @@
// quick error checking, the meta stuff should not be directly accessible
if ( fname.contains( META ) )
{
+ System.out.println( "should not directly access meta info " + fname );
response.sendError( HttpServletResponse.SC_NOT_FOUND );
return;
}
String fnameOriginal = fname;
+ if ( fname.endsWith( "/" ) ) fname += "index"; // @todo index page should be configurable
if ( fname.endsWith( ".html" ) ) fname = fname.substring( 0, fname.length() - 5 );
File meta = new File( root, fname + ".meta" );
- if ( meta.exists() )
+ File wiki = new File( root, fname + ".wiki" );
+ if ( meta.exists() || wiki.exists() )
{
- File wiki = new File( root, fname + ".wiki" );
try
{
DefaultWikiContext context = new DefaultWikiContext();
@@ -75,7 +77,7 @@
}
catch ( WikiException we )
{
- log.error( "wiki render error" + we.toString(), we );
+ log.error( "wiki render error " + we.toString(), we );
response.sendError( HttpServletResponse.SC_INTERNAL_SERVER_ERROR );
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-01-09 11:02:03
|
Revision: 52
http://staticwiki.svn.sourceforge.net/staticwiki/?rev=52&view=rev
Author: triathlon98
Date: 2009-01-09 11:01:59 +0000 (Fri, 09 Jan 2009)
Log Message:
-----------
SW-16 assure velocity always uses UTF-8 templates
Modified Paths:
--------------
trunk/staticwiki-renderer/src/main/java/org/staticwiki/wiki/DefaultWikiContext.java
Modified: trunk/staticwiki-renderer/src/main/java/org/staticwiki/wiki/DefaultWikiContext.java
===================================================================
--- trunk/staticwiki-renderer/src/main/java/org/staticwiki/wiki/DefaultWikiContext.java 2008-09-18 17:47:00 UTC (rev 51)
+++ trunk/staticwiki-renderer/src/main/java/org/staticwiki/wiki/DefaultWikiContext.java 2009-01-09 11:01:59 UTC (rev 52)
@@ -47,6 +47,7 @@
velocityContext = new VelocityContext();
try
{
+ Velocity.setProperty( "input.encoding", "UTF-8" );
Velocity.init();
}
catch ( Exception ex )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2008-07-24 11:35:19
|
Revision: 50
http://staticwiki.svn.sourceforge.net/staticwiki/?rev=50&view=rev
Author: triathlon98
Date: 2008-07-24 11:35:14 +0000 (Thu, 24 Jul 2008)
Log Message:
-----------
SW-14 allow use of jetty:run
Modified Paths:
--------------
trunk/staticwiki-servlet/pom.xml
Modified: trunk/staticwiki-servlet/pom.xml
===================================================================
--- trunk/staticwiki-servlet/pom.xml 2008-07-24 11:01:51 UTC (rev 49)
+++ trunk/staticwiki-servlet/pom.xml 2008-07-24 11:35:14 UTC (rev 50)
@@ -15,7 +15,21 @@
</description>
<build>
<plugins>
+ <!-- Run the application using "mvn jetty:run" -->
<plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
+ <configuration>
+ <!-- Log to the console. -->
+ <requestLog implementation="org.mortbay.jetty.NCSARequestLog">
+ <!-- This doesn't do anything for Jetty, but is a workaround for a Maven bug
+ that prevents the requestLog from being set. -->
+ <append>true</append>
+ </requestLog>
+ </configuration>
+ </plugin>
+
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<configuration>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2008-07-24 11:01:55
|
Revision: 49
http://staticwiki.svn.sourceforge.net/staticwiki/?rev=49&view=rev
Author: triathlon98
Date: 2008-07-24 11:01:51 +0000 (Thu, 24 Jul 2008)
Log Message:
-----------
SW-14 start servlet for (dynamic view) on wiki
Modified Paths:
--------------
trunk/pom.xml
trunk/staticwiki-renderer/src/main/java/org/staticwiki/wiki/DefaultTemplateLoader.java
trunk/staticwiki-renderer/src/main/java/org/staticwiki/wiki/WikiFactory.java
Added Paths:
-----------
trunk/staticwiki-servlet/
trunk/staticwiki-servlet/pom.xml
trunk/staticwiki-servlet/src/
trunk/staticwiki-servlet/src/main/
trunk/staticwiki-servlet/src/main/java/
trunk/staticwiki-servlet/src/main/java/org/
trunk/staticwiki-servlet/src/main/java/org/staticwiki/
trunk/staticwiki-servlet/src/main/java/org/staticwiki/servlet/
trunk/staticwiki-servlet/src/main/java/org/staticwiki/servlet/ServletMacroLoader.java
trunk/staticwiki-servlet/src/main/java/org/staticwiki/servlet/ServletTemplateLoader.java
trunk/staticwiki-servlet/src/main/java/org/staticwiki/servlet/WikiServlet.java
trunk/staticwiki-servlet/src/main/resources/
trunk/staticwiki-servlet/src/main/resources/wiki/
trunk/staticwiki-servlet/src/main/resources/wiki/sample/
trunk/staticwiki-servlet/src/main/resources/wiki/sample/META-INF/
trunk/staticwiki-servlet/src/main/resources/wiki/sample/META-INF/macro/
trunk/staticwiki-servlet/src/main/resources/wiki/sample/META-INF/resources/
trunk/staticwiki-servlet/src/main/resources/wiki/sample/META-INF/resources/wiki.css
trunk/staticwiki-servlet/src/main/resources/wiki/sample/META-INF/template/
trunk/staticwiki-servlet/src/main/resources/wiki/sample/META-INF/template/WIKI.html
trunk/staticwiki-servlet/src/main/resources/wiki/sample/info.meta
trunk/staticwiki-servlet/src/main/resources/wiki/sample/info.wiki
trunk/staticwiki-servlet/src/main/webapp/
trunk/staticwiki-servlet/src/main/webapp/WEB-INF/
trunk/staticwiki-servlet/src/main/webapp/WEB-INF/jboss-web.xml
trunk/staticwiki-servlet/src/main/webapp/WEB-INF/web.xml
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2008-06-03 18:58:38 UTC (rev 48)
+++ trunk/pom.xml 2008-07-24 11:01:51 UTC (rev 49)
@@ -79,6 +79,7 @@
<modules>
<module>staticwiki-renderer</module>
+ <module>staticwiki-servlet</module>
<module>staticwiki-editor</module>
</modules>
@@ -207,6 +208,11 @@
<artifactId>joda-time</artifactId>
<version>1.4</version>
</dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ </dependency>
</dependencies>
</dependencyManagement>
<repositories>
Modified: trunk/staticwiki-renderer/src/main/java/org/staticwiki/wiki/DefaultTemplateLoader.java
===================================================================
--- trunk/staticwiki-renderer/src/main/java/org/staticwiki/wiki/DefaultTemplateLoader.java 2008-06-03 18:58:38 UTC (rev 48)
+++ trunk/staticwiki-renderer/src/main/java/org/staticwiki/wiki/DefaultTemplateLoader.java 2008-07-24 11:01:51 UTC (rev 49)
@@ -32,7 +32,7 @@
return slurp( stream );
}
- public String slurp( InputStream stream )
+ public static String slurp( InputStream stream )
throws WikiException
{
if ( stream == null ) return "";
@@ -40,11 +40,12 @@
{
BufferedReader br = new BufferedReader( new InputStreamReader( stream, "UTF-8" ) );
TextBuilder sb = TextBuilder.newInstance();
- String line = null;
+ String line;
while ( ( line = br.readLine() ) != null )
{
- sb.append( line + "\n" );
+ sb.append( line );
+ sb.append( "\n" );
}
br.close();
Modified: trunk/staticwiki-renderer/src/main/java/org/staticwiki/wiki/WikiFactory.java
===================================================================
--- trunk/staticwiki-renderer/src/main/java/org/staticwiki/wiki/WikiFactory.java 2008-06-03 18:58:38 UTC (rev 48)
+++ trunk/staticwiki-renderer/src/main/java/org/staticwiki/wiki/WikiFactory.java 2008-07-24 11:01:51 UTC (rev 49)
@@ -25,16 +25,17 @@
*/
public class WikiFactory
{
+ public static final String PIPELINE_DEFINITION = "org/staticwiki/wiki/WikiRenderPipeline.txt";
public static WikiRenderer getWikiRenderer()
throws WikiException
{
- return getWikiRenderer( "org/staticwiki/wiki/WikiRenderPipeline.txt", new ResourceHandlerAdapter() );
+ return getWikiRenderer( PIPELINE_DEFINITION, new ResourceHandlerAdapter() );
}
public static WikiRenderer getWikiRenderer( ResourceHandler resourceHandler )
throws WikiException
{
- return getWikiRenderer( "org/staticwiki/wiki/WikiRenderPipeline.txt", resourceHandler );
+ return getWikiRenderer( PIPELINE_DEFINITION, resourceHandler );
}
public static WikiRenderer getWikiRenderer( String pipelineResource )
@@ -57,7 +58,7 @@
return new DefaultWikiRenderer( context );
}
- private static WikiSubRenderer getRenderPipeline( String pipelineResource )
+ public static WikiSubRenderer getRenderPipeline( String pipelineResource )
throws WikiException
{
InputStream stream = Thread.currentThread().getContextClassLoader().getResourceAsStream( pipelineResource );
Added: trunk/staticwiki-servlet/pom.xml
===================================================================
--- trunk/staticwiki-servlet/pom.xml (rev 0)
+++ trunk/staticwiki-servlet/pom.xml 2008-07-24 11:01:51 UTC (rev 49)
@@ -0,0 +1,46 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.staticwiki</groupId>
+ <artifactId>staticwiki</artifactId>
+ <version>0.9.1-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.staticwiki</groupId>
+ <artifactId>staticwiki-servlet</artifactId>
+ <packaging>war</packaging>
+ <version>0.9.1-SNAPSHOT</version>
+ <name>staticwiki-servlet</name>
+ <description>
+ Create a dynamic wiki based on the staticwiki renderer.
+ </description>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <!--<archiveClasses>true</archiveClasses>-->
+ <dependentWarExcludes>WEB-INF/web.xml,index.*</dependentWarExcludes>
+ <warSourceExcludes>
+ WEB-INF/lib/javassist*.jar,WEB-INF/lib/log4j*.jar,WEB-INF/lib/commons-*.jar
+ </warSourceExcludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.staticwiki</groupId>
+ <artifactId>staticwiki-renderer</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+</project>
Added: trunk/staticwiki-servlet/src/main/java/org/staticwiki/servlet/ServletMacroLoader.java
===================================================================
--- trunk/staticwiki-servlet/src/main/java/org/staticwiki/servlet/ServletMacroLoader.java (rev 0)
+++ trunk/staticwiki-servlet/src/main/java/org/staticwiki/servlet/ServletMacroLoader.java 2008-07-24 11:01:51 UTC (rev 49)
@@ -0,0 +1,66 @@
+/**
+ * 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.servlet;
+
+import org.staticwiki.wiki.macro.DefaultMacroLoader;
+import org.staticwiki.wiki.macro.WikiMacro;
+import org.staticwiki.wiki.macro.DefaultWikiMacro;
+import org.staticwiki.wiki.WikiException;
+
+import java.io.File;
+import java.io.InputStream;
+import java.io.IOException;
+import java.io.FileInputStream;
+import java.util.Properties;
+
+/**
+ * Macro loader which gets the macro definitions from the META-INF/macro directory from the pages metadata container.
+ * So if the metadata for the file was at "blabla/page.md", the macro will be searched in "blabla/META-INF/macro/".
+ *
+ * @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
+ */
+public class ServletMacroLoader
+ extends DefaultMacroLoader
+{
+ File meta;
+
+ public ServletMacroLoader( File meta )
+ {
+ this.meta = new File( meta.getParent(), WikiServlet.MACROS );
+ }
+
+ public WikiMacro load( CharSequence macroName )
+ throws WikiException
+ {
+ File macro = new File( meta, macroName + ".properties" );
+ if ( macro.exists() )
+ {
+ Properties prop = new Properties();
+ try
+ {
+ prop.load( new FileInputStream( macro ) );
+ }
+ catch ( IOException ioe )
+ {
+ throw new WikiException( ioe );
+ }
+ boolean hasBody = "true".equals( prop.get( "hasBody" ) );
+ String template = (String) prop.get( "template" );
+ return new DefaultWikiMacro( macroName.toString(), hasBody, template );
+ }
+ else
+ {
+ return super.load( macroName );
+ }
+ }
+}
Added: trunk/staticwiki-servlet/src/main/java/org/staticwiki/servlet/ServletTemplateLoader.java
===================================================================
--- trunk/staticwiki-servlet/src/main/java/org/staticwiki/servlet/ServletTemplateLoader.java (rev 0)
+++ trunk/staticwiki-servlet/src/main/java/org/staticwiki/servlet/ServletTemplateLoader.java 2008-07-24 11:01:51 UTC (rev 49)
@@ -0,0 +1,64 @@
+/**
+ * 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.servlet;
+
+import org.staticwiki.wiki.DefaultTemplateLoader;
+import org.staticwiki.wiki.WikiException;
+import org.apache.log4j.Logger;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+
+/**
+ * Template loader which gets the macro definitions from the META-INF/template directory from the pages metadata
+ * container. So if the metadata for the file was at "blabla/page.md", the template will be searched in
+ * "blabla/META-INF/template/".
+ *
+ * @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
+ */
+public class ServletTemplateLoader
+ extends DefaultTemplateLoader
+{
+ private static final Logger log = Logger.getLogger( ServletTemplateLoader.class );
+
+ private File meta;
+
+ public ServletTemplateLoader( File meta )
+ {
+ this.meta = new File( meta.getParent(), WikiServlet.TEMPLATES );
+ }
+
+ public CharSequence getTemplate( String templateName )
+ throws WikiException
+ {
+ try
+ {
+ File template = new File( meta, templateName + ".vm" );
+ if ( template.exists() )
+ {
+ return DefaultTemplateLoader.slurp( new FileInputStream( template ) );
+ }
+ else
+ {
+ return super.getTemplate( templateName );
+ }
+
+ }
+ catch ( IOException ioe )
+ {
+ log.error( "problem reading template " + templateName + " from meta " + meta.getAbsoluteFile(), ioe );
+ }
+ return "";
+ }
+}
Added: trunk/staticwiki-servlet/src/main/java/org/staticwiki/servlet/WikiServlet.java
===================================================================
--- trunk/staticwiki-servlet/src/main/java/org/staticwiki/servlet/WikiServlet.java (rev 0)
+++ trunk/staticwiki-servlet/src/main/java/org/staticwiki/servlet/WikiServlet.java 2008-07-24 11:01:51 UTC (rev 49)
@@ -0,0 +1,109 @@
+/**
+ * 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.servlet;
+
+import org.staticwiki.wiki.*;
+import org.apache.log4j.Logger;
+
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.ServletException;
+import java.io.*;
+
+/**
+ * Factory class to get a wiki renderer
+ *
+ * @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
+ */
+public class WikiServlet
+ extends HttpServlet
+{
+ private static final Logger log = Logger.getLogger( WikiServlet.class );
+ private static final String WIKI_ROOT = "wiki-root";
+
+ public static final String META = "META-INF/";
+ public static final String MACROS = META + "macro";
+ public static final String TEMPLATES = META + "template";
+ public static final String RESOURCES = META + "resources";
+
+ protected void doGet( HttpServletRequest request, HttpServletResponse response )
+ throws ServletException, IOException
+ {
+ String root = getServletConfig().getInitParameter( WIKI_ROOT );
+ System.out.println( "root is " + root );
+ System.out.println( "request uri is " + request.getRequestURI() );
+ System.out.println( "servlet path is " + request.getServletPath() );
+ System.out.println( "path info is " + request.getPathInfo() );
+ System.out.println( "path translated is " + request.getPathTranslated() );
+ System.out.println( "context path is " + request.getContextPath() );
+ System.out.println( "remote user " + request.getRemoteUser() );
+
+ String fname = request.getPathInfo();
+ // quick error checking, the meta stuff should not be directly accessible
+ if ( fname.contains( META ) )
+ {
+ response.sendError( HttpServletResponse.SC_NOT_FOUND );
+ return;
+ }
+
+ String fnameOriginal = fname;
+ if ( fname.endsWith( ".html" ) ) fname = fname.substring( 0, fname.length() - 5 );
+ File meta = new File( root, fname + ".meta" );
+ if ( meta.exists() )
+ {
+ File wiki = new File( root, fname + ".wiki" );
+ try
+ {
+ DefaultWikiContext context = new DefaultWikiContext();
+ context.setRenderPipeline( WikiFactory.getRenderPipeline( WikiFactory.PIPELINE_DEFINITION ) );
+ context.setResourceHandler( new AllowAllResourceHandler() );
+ context.setMacroLoader( new ServletMacroLoader( meta ) );
+ context.setTemplateLoader( new ServletTemplateLoader( meta ) );
+ WikiRenderer wikiRenderer = WikiFactory.getWikiRenderer( context );
+ wikiRenderer.render( new FileReader( wiki ), response.getWriter() );
+ }
+ catch ( WikiException we )
+ {
+ log.error( "wiki render error" + we.toString(), we );
+ response.sendError( HttpServletResponse.SC_INTERNAL_SERVER_ERROR );
+ }
+ }
+ else
+ {
+ // @todo file location should be properly defined, it should split between path and filename and insert the "META-INF/resources" instead of prepending
+ File resource = new File( root, RESOURCES + fnameOriginal );
+ if ( resource.exists() )
+ {
+ copyStream( new FileInputStream( resource ), response.getOutputStream() );
+ }
+ else
+ {
+ response.sendError( HttpServletResponse.SC_NOT_FOUND );
+ }
+ }
+ }
+
+ private void copyStream( InputStream in, OutputStream out )
+ {
+ int data;
+ try
+ {
+ while ( ( data = in.read() ) >= 0 ) out.write( data );
+ }
+ catch ( IOException ioe )
+ {
+ log.error( "error while copying resource" + ioe.toString(), ioe );
+ }
+ }
+}
Added: trunk/staticwiki-servlet/src/main/resources/wiki/sample/META-INF/resources/wiki.css
===================================================================
--- trunk/staticwiki-servlet/src/main/resources/wiki/sample/META-INF/resources/wiki.css (rev 0)
+++ trunk/staticwiki-servlet/src/main/resources/wiki/sample/META-INF/resources/wiki.css 2008-07-24 11:01:51 UTC (rev 49)
@@ -0,0 +1,17 @@
+.wikiFootnoteMarker {
+ font-size : 60%;
+ vertical-align : super;
+ cursor : pointer;
+}
+.wikiFootnote {
+ font-size : 80%;
+ border : thin dotted black;
+ background-color : #FFFFCC;
+ margin : 2px 10em 2px 10em;
+}
+
+#toc {
+ float : right;
+ width : 200px;
+ border : thin solid black;
+}
Added: trunk/staticwiki-servlet/src/main/resources/wiki/sample/META-INF/template/WIKI.html
===================================================================
--- trunk/staticwiki-servlet/src/main/resources/wiki/sample/META-INF/template/WIKI.html (rev 0)
+++ trunk/staticwiki-servlet/src/main/resources/wiki/sample/META-INF/template/WIKI.html 2008-07-24 11:01:51 UTC (rev 49)
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://wwww.w3.org/1999/xhtml" xml:lang="en">
+<head>
+ <title>wiki main title</title>
+ <meta http-equiv="content-type" content="text/html;charset=UTF-8"/>
+ <style type="text/css" media="all">
+ @import "wiki.css";
+ </style>
+</head>
+<body>
+ <div class="wiki">$context.render($macro)</div>
+</body>
+</html>
Added: trunk/staticwiki-servlet/src/main/resources/wiki/sample/info.wiki
===================================================================
--- trunk/staticwiki-servlet/src/main/resources/wiki/sample/info.wiki (rev 0)
+++ trunk/staticwiki-servlet/src/main/resources/wiki/sample/info.wiki 2008-07-24 11:01:51 UTC (rev 49)
@@ -0,0 +1,25 @@
+h1. Test wiki file
+
+I Just _need_ some test information to verify that the wiki servlet works.
+
+h2. Metadata
+
+This uses a metadata file which can store extra information about the wiki document. This can be particularly useful for building a [subjectory|http://hoppie.nl/] as this allow having a set of fixed fields which _can_ be added in page and which can be rendered as part of the _skin_.
+
+h2. Content negotiation and skinning
+
+Though at first only intended to render html output, it is intended that different skins can be used based on content negotiation. This could be used to render html, pdf, original wiki source, txf,...
+
+The skin which should be used for each of the ...
+
+h2. Move, rename, recreate pages
+
+When pages are moved or renamed in the wiki, it is intended that the original location is changed to a pointer to the new location. ...
+
+h2. Versioning
+
+This wiki is based on file system only. The versioning should be handled by backing the data by a subversion repository.
+
+h2. Non-wiki content
+
+Each directory can contain a "META-INF" subdirectory. This is not directly rendered, but instead
\ No newline at end of file
Added: trunk/staticwiki-servlet/src/main/webapp/WEB-INF/jboss-web.xml
===================================================================
--- trunk/staticwiki-servlet/src/main/webapp/WEB-INF/jboss-web.xml (rev 0)
+++ trunk/staticwiki-servlet/src/main/webapp/WEB-INF/jboss-web.xml 2008-07-24 11:01:51 UTC (rev 49)
@@ -0,0 +1,7 @@
+<jboss-web>
+ <!-- Uncomment the security-domain to enable security. You will
+ need to edit the htmladaptor login configuration to setup the
+ login modules used to authentication users. -->
+ <!--<security-domain>java:/jaas/wiki</security-domain>-->
+ <context-root>wiki</context-root>
+</jboss-web>
\ No newline at end of file
Added: trunk/staticwiki-servlet/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/staticwiki-servlet/src/main/webapp/WEB-INF/web.xml (rev 0)
+++ trunk/staticwiki-servlet/src/main/webapp/WEB-INF/web.xml 2008-07-24 11:01:51 UTC (rev 49)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE web-app
+ PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd">
+<web-app>
+ <display-name>staticwiki servlet</display-name>
+ <servlet>
+ <servlet-name>wiki</servlet-name>
+ <servlet-class>org.staticwiki.servlet.WikiServlet</servlet-class>
+ <init-param>
+ <param-name>wiki-root</param-name>
+ <param-value>/home/joachim/data/wiki/test</param-value>
+ </init-param>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>wiki</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+</web-app>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2008-06-03 18:58:41
|
Revision: 48
http://staticwiki.svn.sourceforge.net/staticwiki/?rev=48&view=rev
Author: triathlon98
Date: 2008-06-03 11:58:38 -0700 (Tue, 03 Jun 2008)
Log Message:
-----------
SW-5 create table of contents for header lines
Modified Paths:
--------------
trunk/staticwiki-editor/src/site/wiki/index.wiki
trunk/staticwiki-renderer/src/main/java/org/staticwiki/wiki/renderer/line/HeaderLineHandler.java
trunk/staticwiki-renderer/src/main/java/org/staticwiki/wiki/renderer/line/LineRenderer.java
trunk/staticwiki-renderer/src/main/java/org/staticwiki/wiki/renderer/line/WikiLineContext.java
trunk/staticwiki-renderer/src/test/java/org/staticwiki/wiki/WikiFactoryTest.java
Added Paths:
-----------
trunk/staticwiki-renderer/src/main/java/org/staticwiki/wiki/renderer/line/WikiLineFlushHandler.java
Modified: trunk/staticwiki-editor/src/site/wiki/index.wiki
===================================================================
--- trunk/staticwiki-editor/src/site/wiki/index.wiki 2008-05-22 19:25:46 UTC (rev 47)
+++ trunk/staticwiki-editor/src/site/wiki/index.wiki 2008-06-03 18:58:38 UTC (rev 48)
@@ -4,6 +4,6 @@
To run this, just call
{code}
-java -jar staticwiki-editor\target\staticwiki-editor-0.8.jar
+java -jar staticwiki-editor\target\staticwiki-editor-0.9.1.jar
{code}
(this from the project directory after compiling "mvn install").
\ No newline at end of file
Modified: trunk/staticwiki-renderer/src/main/java/org/staticwiki/wiki/renderer/line/HeaderLineHandler.java
===================================================================
--- trunk/staticwiki-renderer/src/main/java/org/staticwiki/wiki/renderer/line/HeaderLineHandler.java 2008-05-22 19:25:46 UTC (rev 47)
+++ trunk/staticwiki-renderer/src/main/java/org/staticwiki/wiki/renderer/line/HeaderLineHandler.java 2008-06-03 18:58:38 UTC (rev 48)
@@ -21,23 +21,95 @@
* @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
*/
public class HeaderLineHandler
- implements WikiLineHandler
+ implements WikiLineHandler
{
+ private static final String CONTEXT = "org.staticwiki.wiki.renderer.line.HeaderLineHandler";
+
public boolean render( TextBuilder result, CharSequence line, WikiSubRenderer subRenderer, WikiLineContext context )
{
if ( line.length() > 4 && 'h' == line.charAt( 0 ) && Character.digit( line.charAt( 1 ), 7 ) > 0 &&
- '.' == line.charAt( 2 ) && ' ' == line.charAt( 3 ) )
+ '.' == line.charAt( 2 ) && ' ' == line.charAt( 3 ) )
{
+ HeaderLineHandlerData data = (HeaderLineHandlerData) context.getContext( CONTEXT );
+ if ( null == data )
+ {
+ data = new HeaderLineHandlerData();
+ data.content.append( "<ul>" );
+ context.addContext( CONTEXT, data );
+ context.addFlushHandler( new HeaderLineFlushHandler() );
+ result.append( "<div id=\"toc\"></div>" );
+ }
context.flush( result );
context.setNewParagraph( true );
- String start = "<h" + line.charAt( 1 ) + ">";
- String end = "</h" + line.charAt( 1 ) + ">";
+ char level = line.charAt( 1 );
+ result.append( "<h" ).append( level ).append( ">" );
+ String end = "</h" + level + ">";
context.setParagraphBreak( end );
context.setParagraphEnd( end );
- result.append( start );
- subRenderer.subRender( result, line.subSequence( 4, line.length() ) );
+ TextBuilder tmp = result;
+ if ( isTocHeader( level ) ) tmp = TextBuilder.newInstance();
+ subRenderer.subRender( tmp, line.subSequence( 4, line.length() ) );
+ if ( isTocHeader( level ) )
+ {
+ result.append( tmp );
+ data.content.append( "<li><span class=\"toc-no\">" );
+ if ( '1' == level )
+ {
+ data.content.append( (char)( '0' + ( ++data.counter[ 0 ] ) ) ).append( '.' );
+ data.counter[ 1 ] = 0;
+ data.counter[ 2 ] = 0;
+ }
+ if ( '2' == level )
+ {
+ data.content.append( (char)( '0' + data.counter[ 0 ] ) ).append( '.' );
+ data.content.append( (char)( '0' + ( ++data.counter[ 1 ] ) ) ).append( '.' );
+ data.counter[ 2 ] = 0;
+ }
+ if ( '3' == level )
+ {
+ data.content.append( (char)( '0' + data.counter[ 0 ] ) ).append( '.' );
+ data.content.append( (char)( '0' + data.counter[ 1 ] ) ).append( '.' );
+ data.content.append( (char)( '0' + ( ++data.counter[ 2 ] ) ) ).append( '.' );
+ }
+ data.content.append( " </span>" );
+ data.content.append( tmp );
+ data.content.append( "</li>" );
+ }
return true;
}
return false;
}
+
+ private boolean isTocHeader( char headerChar )
+ {
+ return '1' == headerChar || '2' == headerChar || '3' == headerChar;
+ }
+
+ class HeaderLineHandlerData
+ {
+ public TextBuilder content = TextBuilder.newInstance();
+ public int[] counter = new int[3];
+ }
+
+ class HeaderLineFlushHandler implements WikiLineFlushHandler
+ {
+ public void render( TextBuilder result, WikiLineContext context )
+ {
+ HeaderLineHandlerData data = (HeaderLineHandlerData) context.getContext( CONTEXT );
+ if ( null != data )
+ {
+ result.append( "<div id=\"toc-content\">" );
+ result.append( data.content );
+ result.append( "</ul></div>" );
+ result.append( "<script type=\"text/javascript\">\n" +
+ "<!--\n" +
+ "// note that the destination should be open+close tag!\n" +
+ "var dest = document.getElementById( \"toc\" );\n" +
+ "var org = document.getElementById( \"toc-content\" );\n" +
+ "dest.appendChild(org);\n" +
+ "// -->\n" +
+ "</script>" );
+ }
+ }
+ }
}
Modified: trunk/staticwiki-renderer/src/main/java/org/staticwiki/wiki/renderer/line/LineRenderer.java
===================================================================
--- trunk/staticwiki-renderer/src/main/java/org/staticwiki/wiki/renderer/line/LineRenderer.java 2008-05-22 19:25:46 UTC (rev 47)
+++ trunk/staticwiki-renderer/src/main/java/org/staticwiki/wiki/renderer/line/LineRenderer.java 2008-06-03 18:58:38 UTC (rev 48)
@@ -69,6 +69,7 @@
{
super.flush( wikiContext, output );
context.flush( output );
+ context.flushFragment( output );
context = (WikiLineContext) wikiContext.getRenderMemory( getClass().getName() );
}
}
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 2008-05-22 19:25:46 UTC (rev 47)
+++ trunk/staticwiki-renderer/src/main/java/org/staticwiki/wiki/renderer/line/WikiLineContext.java 2008-06-03 18:58:38 UTC (rev 48)
@@ -14,6 +14,11 @@
import javolution.lang.TextBuilder;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.ArrayList;
+import java.util.List;
+
/**
* Context for line/paragraph rendering
*
@@ -21,10 +26,12 @@
*/
public class WikiLineContext
{
- String paragraphBreak = "<br />";
- String paragraphEnd;
- boolean newParagraph = true;
- boolean suppressBreak = false;
+ private String paragraphBreak = "<br />";
+ private String paragraphEnd;
+ private boolean newParagraph = true;
+ private boolean suppressBreak = false;
+ private Map<String,Object> map = new HashMap<String, Object>();
+ private List<WikiLineFlushHandler> fragmentFlushers = new ArrayList<WikiLineFlushHandler>();
public boolean isNewParagraph()
{
@@ -71,4 +78,57 @@
if ( paragraphEnd != null ) result.append( paragraphEnd );
paragraphEnd = "";
}
+
+ /**
+ * Add a new value into the context.
+ *
+ * @param name context name
+ * @param value context value
+ * @return previous value
+ */
+ public Object addContext( String name, Object value )
+ {
+ return map.put( name, value );
+ }
+
+ /**
+ * Get the context value for a given name.
+ *
+ * @param name context name
+ * @return context value
+ */
+ public Object getContext( String name )
+ {
+ return map.get( name );
+ }
+
+ /**
+ * Does a context value exist for a given name?
+ *
+ * @param name context name
+ * @return true when there is a value
+ */
+ public boolean hasContext( String name )
+ {
+ return map.containsKey( name );
+ }
+
+ /**
+ * Add a flush handler
+ *
+ * @param handler handler to add
+ */
+ public void addFlushHandler( WikiLineFlushHandler handler )
+ {
+ fragmentFlushers.add( handler );
+ }
+
+ public void flushFragment( TextBuilder output )
+ {
+ for ( int i = fragmentFlushers.size() - 1 ; i >= 0 ; i-- )
+ {
+ fragmentFlushers.get( i ).render( output, this );
+ }
+ fragmentFlushers.clear();
+ }
}
Added: trunk/staticwiki-renderer/src/main/java/org/staticwiki/wiki/renderer/line/WikiLineFlushHandler.java
===================================================================
--- trunk/staticwiki-renderer/src/main/java/org/staticwiki/wiki/renderer/line/WikiLineFlushHandler.java (rev 0)
+++ trunk/staticwiki-renderer/src/main/java/org/staticwiki/wiki/renderer/line/WikiLineFlushHandler.java 2008-06-03 18:58:38 UTC (rev 48)
@@ -0,0 +1,33 @@
+/**
+ * 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;
+
+/**
+ * Wiki line flush renderer, allows injecting code to handle the cleanup at the end of render.
+ * The flushes occur in reverse registrationo order.
+ *
+ * @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
+ */
+public interface WikiLineFlushHandler
+{
+ /**
+ * Try to render the given line. Return true when the line was rendered.
+ * The result and context should not be modified when returning false.
+ *
+ * @param result TextBuilder to build the result in
+ * @param context context for the flush
+ */
+ void render( TextBuilder result, WikiLineContext context );
+}
Modified: trunk/staticwiki-renderer/src/test/java/org/staticwiki/wiki/WikiFactoryTest.java
===================================================================
--- trunk/staticwiki-renderer/src/test/java/org/staticwiki/wiki/WikiFactoryTest.java 2008-05-22 19:25:46 UTC (rev 47)
+++ trunk/staticwiki-renderer/src/test/java/org/staticwiki/wiki/WikiFactoryTest.java 2008-06-03 18:58:38 UTC (rev 48)
@@ -65,14 +65,40 @@
"\n"+
"h6. Smallest header\n"+
"\n"+
- "And some normal content.";
- String result = "<div class=\"wiki\"><h1>Big header</h1>" +
+ "And some normal content.\n" +
+ "h1. Big again\n" +
+ "h3. Medium again\n" +
+ "h2. Small big again\n" +
+ "";
+ String result = "<div class=\"wiki\">" +
+ "<div id=\"toc\"></div>" +
+ "<h1>Big header</h1>" +
"<p>h7. Should be ignored.</p>" +
"<h2>Smaller big header</h2>"+
"<h3>Medium header</h3>"+
"<p>With content</p>"+
"<h6>Smallest header</h6>"+
- "<p>And some normal content.</p></div>";
+ "<p>And some normal content.</p>" +
+ "<h1>Big again</h1>" +
+ "<h3>Medium again</h3>" +
+ "<h2>Small big again</h2>" +
+ "<div id=\"toc-content\"><ul>" +
+ "<li><span class=\"toc-no\">1. </span>Big header</li>" +
+ "<li><span class=\"toc-no\">1.1. </span>Smaller big header</li>" +
+ "<li><span class=\"toc-no\">1.1.1. </span>Medium header</li>" +
+ "<li><span class=\"toc-no\">2. </span>Big again</li>" +
+ "<li><span class=\"toc-no\">2.0.1. </span>Medium again</li>" +
+ "<li><span class=\"toc-no\">2.1. </span>Small big again</li>" +
+ "</ul></div>" +
+ "<script type=\"text/javascript\">\n" +
+ "<!--\n" +
+ "// note that the destination should be open+close tag!\n" +
+ "var dest = document.getElementById( \"toc\" );\n" +
+ "var org = document.getElementById( \"toc-content\" );\n" +
+ "dest.appendChild(org);\n" +
+ "// -->\n" +
+ "</script>" +
+ "</div>";
WikiRenderer wr = WikiFactory.getWikiRenderer();
assertEquals( result, wr.render( test ) );
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2008-05-22 19:25:55
|
Revision: 47
http://staticwiki.svn.sourceforge.net/staticwiki/?rev=47&view=rev
Author: triathlon98
Date: 2008-05-22 12:25:46 -0700 (Thu, 22 May 2008)
Log Message:
-----------
update site skin
Modified Paths:
--------------
trunk/src/site/site.xml
trunk/staticwiki-renderer/src/site/site.xml
Modified: trunk/src/site/site.xml
===================================================================
--- trunk/src/site/site.xml 2008-05-15 10:15:50 UTC (rev 46)
+++ trunk/src/site/site.xml 2008-05-22 19:25:46 UTC (rev 47)
@@ -3,7 +3,7 @@
<skin>
<groupId>be.progs</groupId>
<artifactId>maven-site-skin</artifactId>
- <version>1.0</version>
+ <version>1.1</version>
</skin>
<publishDate format="yyyy-MM-dd"/>
Modified: trunk/staticwiki-renderer/src/site/site.xml
===================================================================
--- trunk/staticwiki-renderer/src/site/site.xml 2008-05-15 10:15:50 UTC (rev 46)
+++ trunk/staticwiki-renderer/src/site/site.xml 2008-05-22 19:25:46 UTC (rev 47)
@@ -3,7 +3,7 @@
<skin>
<groupId>be.progs</groupId>
<artifactId>maven-site-skin</artifactId>
- <version>1.0</version>
+ <version>1.1</version>
</skin>
<publishDate format="yyyy-MM-dd"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2008-05-15 10:15:52
|
Revision: 46
http://staticwiki.svn.sourceforge.net/staticwiki/?rev=46&view=rev
Author: triathlon98
Date: 2008-05-15 03:15:50 -0700 (Thu, 15 May 2008)
Log Message:
-----------
SW-13 footnote docs
Modified Paths:
--------------
trunk/src/site/wiki/markup.wiki
Modified: trunk/src/site/wiki/markup.wiki
===================================================================
--- trunk/src/site/wiki/markup.wiki 2008-05-14 12:51:32 UTC (rev 45)
+++ trunk/src/site/wiki/markup.wiki 2008-05-15 10:15:50 UTC (rev 46)
@@ -88,6 +88,7 @@
{quote}Include some quoted text{quote}
\{code}Include some code\{code}
{panel}A simple panel{panel}
+{footnote}For footnote text which is normally hidden but can be visualized on request{footnote}
{code}
{panel}
@@ -97,4 +98,5 @@
{quote}Include some quoted text{quote}
{code}Include some code{code}
{panel}A simple panel{panel}
+{footnote}For footnote text which is normally hidden but can be visualized on request{footnote}
{panel}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2008-05-14 12:51:36
|
Revision: 45
http://staticwiki.svn.sourceforge.net/staticwiki/?rev=45&view=rev
Author: triathlon98
Date: 2008-05-14 05:51:32 -0700 (Wed, 14 May 2008)
Log Message:
-----------
SW-13 add footnote macro
Added Paths:
-----------
trunk/staticwiki-renderer/src/main/macro/org/staticwiki/wiki/macro/footnote.properties
trunk/staticwiki-renderer/src/main/macro/org/staticwiki/wiki/template/footnote.vm
Added: trunk/staticwiki-renderer/src/main/macro/org/staticwiki/wiki/macro/footnote.properties
===================================================================
--- trunk/staticwiki-renderer/src/main/macro/org/staticwiki/wiki/macro/footnote.properties (rev 0)
+++ trunk/staticwiki-renderer/src/main/macro/org/staticwiki/wiki/macro/footnote.properties 2008-05-14 12:51:32 UTC (rev 45)
@@ -0,0 +1,2 @@
+hasBody=true
+template=footnote
\ No newline at end of file
Added: trunk/staticwiki-renderer/src/main/macro/org/staticwiki/wiki/template/footnote.vm
===================================================================
--- trunk/staticwiki-renderer/src/main/macro/org/staticwiki/wiki/template/footnote.vm (rev 0)
+++ trunk/staticwiki-renderer/src/main/macro/org/staticwiki/wiki/template/footnote.vm 2008-05-14 12:51:32 UTC (rev 45)
@@ -0,0 +1,13 @@
+<span onClick="
+var el;
+el = this.getElementsByTagName('div')[0];
+var cssString;
+cssString = el.style.cssText;
+if ( typeof(cssString) != 'string' ) { cssString = element.getAttribute('style'); }
+if ( cssString.indexOf('block') != -1 ) { cssString = 'display: none;'; } else { cssString = 'display: block;'; }
+el.style.cssText = cssString;
+el.setAttribute('style',cssString);
+">
+<span class="footnoteMarker">[footnote]</span>
+<div style="display:none" class="footnote">$context.render($macro)</div>
+</span>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2008-04-29 20:39:46
|
Revision: 44
http://staticwiki.svn.sourceforge.net/staticwiki/?rev=44&view=rev
Author: triathlon98
Date: 2008-04-29 13:39:41 -0700 (Tue, 29 Apr 2008)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
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 2008-04-29 20:39:34 UTC (rev 43)
+++ trunk/pom.xml 2008-04-29 20:39:41 UTC (rev 44)
@@ -5,7 +5,7 @@
<artifactId>staticwiki</artifactId>
<packaging>pom</packaging>
- <version>0.9</version>
+ <version>0.9.1-SNAPSHOT</version>
<name>staticwiki</name>
<description>
@@ -27,9 +27,9 @@
<url>http://sourceforge.net/tracker/?group_id=196967</url>
</issueManagement>
<scm>
- <connection>scm:svn:https://staticwiki.svn.sourceforge.net/svnroot/staticwiki/tags/staticwiki-0.9</connection>
- <developerConnection>scm:svn:https://staticwiki.svn.sourceforge.net/svnroot/staticwiki/tags/staticwiki-0.9</developerConnection>
- <url>http://staticwiki.svn.sourceforge.net/viewvc/staticwiki/tags/staticwiki-0.9</url>
+ <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>
<ciManagement>
<system>hudson</system>
Modified: trunk/staticwiki-editor/pom.xml
===================================================================
--- trunk/staticwiki-editor/pom.xml 2008-04-29 20:39:34 UTC (rev 43)
+++ trunk/staticwiki-editor/pom.xml 2008-04-29 20:39:41 UTC (rev 44)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.staticwiki</groupId>
<artifactId>staticwiki</artifactId>
- <version>0.9</version>
+ <version>0.9.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.staticwiki</groupId>
<artifactId>staticwiki-editor</artifactId>
<packaging>jar</packaging>
- <version>0.9</version>
+ <version>0.9.1-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 2008-04-29 20:39:34 UTC (rev 43)
+++ trunk/staticwiki-renderer/pom.xml 2008-04-29 20:39:41 UTC (rev 44)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.staticwiki</groupId>
<artifactId>staticwiki</artifactId>
- <version>0.9</version>
+ <version>0.9.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.staticwiki</groupId>
<artifactId>staticwiki-renderer</artifactId>
<packaging>jar</packaging>
- <version>0.9</version>
+ <version>0.9.1-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 2008-04-29 20:39:34 UTC (rev 43)
+++ trunk/staticwiki-site-plugin/pom.xml 2008-04-29 20:39:41 UTC (rev 44)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.staticwiki</groupId>
<artifactId>staticwiki</artifactId>
- <version>0.9</version>
+ <version>0.9.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.staticwiki</groupId>
<artifactId>staticwiki-site-plugin</artifactId>
<packaging>maven-plugin</packaging>
- <version>0.9</version>
+ <version>0.9.1-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...> - 2008-04-29 20:39:37
|
Revision: 43
http://staticwiki.svn.sourceforge.net/staticwiki/?rev=43&view=rev
Author: triathlon98
Date: 2008-04-29 13:39:34 -0700 (Tue, 29 Apr 2008)
Log Message:
-----------
[maven-release-plugin] copy for tag staticwiki-0.9
Added Paths:
-----------
tags/staticwiki-0.9/
tags/staticwiki-0.9/pom.xml
tags/staticwiki-0.9/staticwiki-editor/pom.xml
tags/staticwiki-0.9/staticwiki-renderer/pom.xml
tags/staticwiki-0.9/staticwiki-site-plugin/pom.xml
Removed Paths:
-------------
tags/staticwiki-0.9/pom.xml
tags/staticwiki-0.9/staticwiki-editor/pom.xml
tags/staticwiki-0.9/staticwiki-renderer/pom.xml
tags/staticwiki-0.9/staticwiki-site-plugin/pom.xml
Copied: tags/staticwiki-0.9 (from rev 41, trunk)
Deleted: tags/staticwiki-0.9/pom.xml
===================================================================
--- trunk/pom.xml 2007-12-20 11:44:54 UTC (rev 41)
+++ tags/staticwiki-0.9/pom.xml 2008-04-29 20:39:34 UTC (rev 43)
@@ -1,307 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.staticwiki</groupId>
- <artifactId>staticwiki</artifactId>
- <packaging>pom</packaging>
-
- <version>0.9-SNAPSHOT</version>
-
- <name>staticwiki</name>
- <description>
- staticwiki is an tool to generate a static wiki site.
- </description>
-
- <inceptionYear>2006</inceptionYear>
- <url>http://staticwiki.org</url>
- <licenses>
- <license>
- <name>LGPL</name>
- <url>http://www.gnu.org/licenses/lgpl-2.1.txt</url>
- <distribution>repo</distribution>
- <comments>v2.1 or higher</comments>
- </license>
- </licenses>
- <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>
- <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>
- <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>
- <mailingList>
- <name>staticwiki-user</name>
- <post>mailto:sta...@li...</post>
- <subscribe>https://lists.sourceforge.net/lists/listinfo/staticwiki-user</subscribe>
- <unsubscribe>https://lists.sourceforge.net/lists/listinfo/staticwiki-user</unsubscribe>
- <archive>http://sourceforge.net/mailarchive/forum.php?forum_name=staticwiki-user</archive>
- </mailingList>
- </mailingLists>
- <developers>
- <developer>
- <name>Joachim Van der Auwera</name>
- <id>triathlon98</id>
- <email>tri...@us...</email>
- <timezone>+1</timezone>
- <roles>
- <role>project lead</role>
- <role>architect</role>
- <role>developer</role>
- </roles>
- </developer>
- </developers>
-
- <modules>
- <module>staticwiki-renderer</module>
- <module>staticwiki-editor</module>
- </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-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>clean</id>
- <goals>
- <goal>clean</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <links>
- <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
- </links>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <configuration>
- <configLocation>config/checkstyle.xml</configLocation>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <version>2.2</version>
- <configuration>
- <instrumentation/>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.javolution</groupId>
- <artifactId>javolution</artifactId>
- <version>3.7.10</version>
- </dependency>
- <dependency>
- <groupId>org.staticwiki</groupId>
- <artifactId>staticwiki-renderer</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.staticwiki</groupId>
- <artifactId>staticwiki-editor</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.8</version>
- </dependency>
- <dependency>
- <groupId>velocity</groupId>
- <artifactId>velocity-dep</artifactId>
- <version>1.4</version>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- <version>1.6.5</version>
- </dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.4.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
- <version>2.0.4</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
- <version>2.0.4</version>
- </dependency>
- <dependency>
- <groupId>joda-time</groupId>
- <artifactId>joda-time</artifactId>
- <version>1.4</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
- <repositories>
- <repository>
- <id>progs</id>
- <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>
- <activation>
- <property>
- <name>!site</name>
- </property>
- </activation>
- <modules>
- <module>staticwiki-site-plugin</module>
- </modules>
- </profile>
- <profile>
- <id>site-include-wiki</id>
- <activation>
- <property>
- <name>site</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.staticwiki</groupId>
- <artifactId>staticwiki-site-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>pre-site</goal>
- </goals>
- </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>0.9-SNAPSHOT</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>env-horse</id>
- <activation>
- <property>
- <name>env</name>
- <value>horse</value>
- </property>
- </activation>
- <distributionManagement>
- <repository>
- <id>progsrepo</id>
- <name>PROGS repository</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>
Copied: tags/staticwiki-0.9/pom.xml (from rev 42, trunk/pom.xml)
===================================================================
--- tags/staticwiki-0.9/pom.xml (rev 0)
+++ tags/staticwiki-0.9/pom.xml 2008-04-29 20:39:34 UTC (rev 43)
@@ -0,0 +1,302 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.staticwiki</groupId>
+ <artifactId>staticwiki</artifactId>
+ <packaging>pom</packaging>
+
+ <version>0.9</version>
+
+ <name>staticwiki</name>
+ <description>
+ staticwiki is an tool to generate a static wiki site.
+ </description>
+
+ <inceptionYear>2006</inceptionYear>
+ <url>http://staticwiki.org</url>
+ <licenses>
+ <license>
+ <name>LGPL</name>
+ <url>http://www.gnu.org/licenses/lgpl-2.1.txt</url>
+ <distribution>repo</distribution>
+ <comments>v2.1 or higher</comments>
+ </license>
+ </licenses>
+ <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/tags/staticwiki-0.9</connection>
+ <developerConnection>scm:svn:https://staticwiki.svn.sourceforge.net/svnroot/staticwiki/tags/staticwiki-0.9</developerConnection>
+ <url>http://staticwiki.svn.sourceforge.net/viewvc/staticwiki/tags/staticwiki-0.9</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>
+ <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>
+ <mailingList>
+ <name>staticwiki-user</name>
+ <post>mailto:sta...@li...</post>
+ <subscribe>https://lists.sourceforge.net/lists/listinfo/staticwiki-user</subscribe>
+ <unsubscribe>https://lists.sourceforge.net/lists/listinfo/staticwiki-user</unsubscribe>
+ <archive>http://sourceforge.net/mailarchive/forum.php?forum_name=staticwiki-user</archive>
+ </mailingList>
+ </mailingLists>
+ <developers>
+ <developer>
+ <name>Joachim Van der Auwera</name>
+ <id>triathlon98</id>
+ <email>tri...@us...</email>
+ <timezone>+1</timezone>
+ <roles>
+ <role>project lead</role>
+ <role>architect</role>
+ <role>developer</role>
+ </roles>
+ </developer>
+ </developers>
+
+ <modules>
+ <module>staticwiki-renderer</module>
+ <module>staticwiki-editor</module>
+ </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-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>clean</id>
+ <goals>
+ <goal>clean</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <links>
+ <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
+ </links>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <configuration>
+ <configLocation>config/checkstyle.xml</configLocation>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+ <instrumentation />
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.javolution</groupId>
+ <artifactId>javolution</artifactId>
+ <version>3.7.10</version>
+ </dependency>
+ <dependency>
+ <groupId>org.staticwiki</groupId>
+ <artifactId>staticwiki-renderer</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.staticwiki</groupId>
+ <artifactId>staticwiki-editor</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.8</version>
+ </dependency>
+ <dependency>
+ <groupId>velocity</groupId>
+ <artifactId>velocity-dep</artifactId>
+ <version>1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.6.5</version>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>2.0.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <version>2.0.4</version>
+ </dependency>
+ <dependency>
+ <groupId>joda-time</groupId>
+ <artifactId>joda-time</artifactId>
+ <version>1.4</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ <repositories>
+ <repository>
+ <id>progs</id>
+ <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>
+ <activation>
+ <property>
+ <name>!site</name>
+ </property>
+ </activation>
+ <modules>
+ <module>staticwiki-site-plugin</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>site-include-wiki</id>
+ <activation>
+ <property>
+ <name>site</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.staticwiki</groupId>
+ <artifactId>staticwiki-site-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>pre-site</goal>
+ </goals>
+ </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>0.9-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>env-horse</id>
+ <activation>
+ <property>
+ <name>env</name>
+ <value>horse</value>
+ </property>
+ </activation>
+ <distributionManagement>
+ <repository>
+ <id>progsrepo</id>
+ <name>PROGS repository</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>
Deleted: tags/staticwiki-0.9/staticwiki-editor/pom.xml
===================================================================
--- trunk/staticwiki-editor/pom.xml 2007-12-20 11:44:54 UTC (rev 41)
+++ tags/staticwiki-0.9/staticwiki-editor/pom.xml 2008-04-29 20:39:34 UTC (rev 43)
@@ -1,61 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.staticwiki</groupId>
- <artifactId>staticwiki</artifactId>
- <version>0.9-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.staticwiki</groupId>
- <artifactId>staticwiki-editor</artifactId>
- <packaging>jar</packaging>
- <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.
- </description>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <mainClass>org.staticwiki.editor.Editor</mainClass>
- <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>
- <dependency>
- <groupId>org.staticwiki</groupId>
- <artifactId>staticwiki-renderer</artifactId>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
- </dependencies>
-</project>
Copied: tags/staticwiki-0.9/staticwiki-editor/pom.xml (from rev 42, trunk/staticwiki-editor/pom.xml)
===================================================================
--- tags/staticwiki-0.9/staticwiki-editor/pom.xml (rev 0)
+++ tags/staticwiki-0.9/staticwiki-editor/pom.xml 2008-04-29 20:39:34 UTC (rev 43)
@@ -0,0 +1,60 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.staticwiki</groupId>
+ <artifactId>staticwiki</artifactId>
+ <version>0.9</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.staticwiki</groupId>
+ <artifactId>staticwiki-editor</artifactId>
+ <packaging>jar</packaging>
+ <version>0.9</version>
+ <name>staticwiki-editor</name>
+ <description>
+ Simple Swing gui to allow editing wiki markup and seeing a preview of the rendered result.
+ </description>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <mainClass>org.staticwiki.editor.Editor</mainClass>
+ <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>
+ <dependency>
+ <groupId>org.staticwiki</groupId>
+ <artifactId>staticwiki-renderer</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+ </dependencies>
+</project>
Deleted: tags/staticwiki-0.9/staticwiki-renderer/pom.xml
===================================================================
--- trunk/staticwiki-renderer/pom.xml 2007-12-20 11:44:54 UTC (rev 41)
+++ tags/staticwiki-0.9/staticwiki-renderer/pom.xml 2008-04-29 20:39:34 UTC (rev 43)
@@ -1,56 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.staticwiki</groupId>
- <artifactId>staticwiki</artifactId>
- <version>0.9-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.staticwiki</groupId>
- <artifactId>staticwiki-renderer</artifactId>
- <packaging>jar</packaging>
- <version>0.9-SNAPSHOT</version>
- <name>staticwiki-renderer</name>
- <description>
- General wiki rendering code, the defaults render wiki content with markup similar to Confluence.
- However, the system can be configured at will to render different wiki styles.
- </description>
- <build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- <resource>
- <directory>src/main/macro</directory>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- </testResource>
- <testResource>
- <directory>src/test/macro</directory>
- </testResource>
- </testResources>
- </build>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>velocity</groupId>
- <artifactId>velocity-dep</artifactId>
- </dependency>
- <dependency>
- <groupId>org.javolution</groupId>
- <artifactId>javolution</artifactId>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-</project>
Copied: tags/staticwiki-0.9/staticwiki-renderer/pom.xml (from rev 42, trunk/staticwiki-renderer/pom.xml)
===================================================================
--- tags/staticwiki-0.9/staticwiki-renderer/pom.xml (rev 0)
+++ tags/staticwiki-0.9/staticwiki-renderer/pom.xml 2008-04-29 20:39:34 UTC (rev 43)
@@ -0,0 +1,55 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.staticwiki</groupId>
+ <artifactId>staticwiki</artifactId>
+ <version>0.9</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.staticwiki</groupId>
+ <artifactId>staticwiki-renderer</artifactId>
+ <packaging>jar</packaging>
+ <version>0.9</version>
+ <name>staticwiki-renderer</name>
+ <description>
+ General wiki rendering code, the defaults render wiki content with markup similar to Confluence.
+ However, the system can be configured at will to render different wiki styles.
+ </description>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>src/main/macro</directory>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ </testResource>
+ <testResource>
+ <directory>src/test/macro</directory>
+ </testResource>
+ </testResources>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>velocity</groupId>
+ <artifactId>velocity-dep</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.javolution</groupId>
+ <artifactId>javolution</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+</project>
Deleted: tags/staticwiki-0.9/staticwiki-site-plugin/pom.xml
===================================================================
--- trunk/staticwiki-site-plugin/pom.xml 2007-12-20 11:44:54 UTC (rev 41)
+++ tags/staticwiki-0.9/staticwiki-site-plugin/pom.xml 2008-04-29 20:39:34 UTC (rev 43)
@@ -1,65 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.staticwiki</groupId>
- <artifactId>staticwiki</artifactId>
- <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.9-SNAPSHOT</version>
- <name>staticwiki-site-plugin</name>
- <description>
- Maven plugin to allow generating maven site pages using staticwiki markup.
- </description>
- <inceptionYear>2007</inceptionYear>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-maven-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>descriptor</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.staticwiki</groupId>
- <artifactId>staticwiki-renderer</artifactId>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-core</artifactId>
- <version>1.0-alpha-10</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-sink-api</artifactId>
- <version>1.0-alpha-10</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
- <version>2.0.7</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
- <version>2.0.7</version>
- </dependency>
- </dependencies>
-</project>
Copied: tags/staticwiki-0.9/staticwiki-site-plugin/pom.xml (from rev 42, trunk/staticwiki-site-plugin/pom.xml)
===================================================================
--- tags/staticwiki-0.9/staticwiki-site-plugin/pom.xml (rev 0)
+++ tags/staticwiki-0.9/staticwiki-site-plugin/pom.xml 2008-04-29 20:39:34 UTC (rev 43)
@@ -0,0 +1,64 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.staticwiki</groupId>
+ <artifactId>staticwiki</artifactId>
+ <version>0.9</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.staticwiki</groupId>
+ <artifactId>staticwiki-site-plugin</artifactId>
+ <packaging>maven-plugin</packaging>
+ <version>0.9</version>
+ <name>staticwiki-site-plugin</name>
+ <description>
+ Maven plugin to allow generating maven site pages using staticwiki markup.
+ </description>
+ <inceptionYear>2007</inceptionYear>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>descriptor</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.staticwiki</groupId>
+ <artifactId>staticwiki-renderer</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-core</artifactId>
+ <version>1.0-alpha-10</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-sink-api</artifactId>
+ <version>1.0-alpha-10</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <version>2.0.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>2.0.7</version>
+ </dependency>
+ </dependencies>
+</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2008-04-29 20:39:32
|
Revision: 42
http://staticwiki.svn.sourceforge.net/staticwiki/?rev=42&view=rev
Author: triathlon98
Date: 2008-04-29 13:39:22 -0700 (Tue, 29 Apr 2008)
Log Message:
-----------
[maven-release-plugin] prepare release staticwiki-0.9
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-12-20 11:44:54 UTC (rev 41)
+++ trunk/pom.xml 2008-04-29 20:39:22 UTC (rev 42)
@@ -1,12 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.staticwiki</groupId>
<artifactId>staticwiki</artifactId>
<packaging>pom</packaging>
- <version>0.9-SNAPSHOT</version>
+ <version>0.9</version>
<name>staticwiki</name>
<description>
@@ -28,13 +27,9 @@
<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>
+ <connection>scm:svn:https://staticwiki.svn.sourceforge.net/svnroot/staticwiki/tags/staticwiki-0.9</connection>
+ <developerConnection>scm:svn:https://staticwiki.svn.sourceforge.net/svnroot/staticwiki/tags/staticwiki-0.9</developerConnection>
+ <url>http://staticwiki.svn.sourceforge.net/viewvc/staticwiki/tags/staticwiki-0.9</url>
</scm>
<ciManagement>
<system>hudson</system>
@@ -149,7 +144,7 @@
<artifactId>cobertura-maven-plugin</artifactId>
<version>2.2</version>
<configuration>
- <instrumentation/>
+ <instrumentation />
</configuration>
</plugin>
</plugins>
Modified: trunk/staticwiki-editor/pom.xml
===================================================================
--- trunk/staticwiki-editor/pom.xml 2007-12-20 11:44:54 UTC (rev 41)
+++ trunk/staticwiki-editor/pom.xml 2008-04-29 20:39:22 UTC (rev 42)
@@ -1,15 +1,14 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.staticwiki</groupId>
<artifactId>staticwiki</artifactId>
- <version>0.9-SNAPSHOT</version>
+ <version>0.9</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.staticwiki</groupId>
<artifactId>staticwiki-editor</artifactId>
<packaging>jar</packaging>
- <version>0.9-SNAPSHOT</version>
+ <version>0.9</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-12-20 11:44:54 UTC (rev 41)
+++ trunk/staticwiki-renderer/pom.xml 2008-04-29 20:39:22 UTC (rev 42)
@@ -1,15 +1,14 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.staticwiki</groupId>
<artifactId>staticwiki</artifactId>
- <version>0.9-SNAPSHOT</version>
+ <version>0.9</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.staticwiki</groupId>
<artifactId>staticwiki-renderer</artifactId>
<packaging>jar</packaging>
- <version>0.9-SNAPSHOT</version>
+ <version>0.9</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-12-20 11:44:54 UTC (rev 41)
+++ trunk/staticwiki-site-plugin/pom.xml 2008-04-29 20:39:22 UTC (rev 42)
@@ -1,15 +1,14 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.staticwiki</groupId>
<artifactId>staticwiki</artifactId>
- <version>0.9-SNAPSHOT</version>
+ <version>0.9</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.staticwiki</groupId>
<artifactId>staticwiki-site-plugin</artifactId>
<packaging>maven-plugin</packaging>
- <version>0.9-SNAPSHOT</version>
+ <version>0.9</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-12-20 11:45:03
|
Revision: 41
http://staticwiki.svn.sourceforge.net/staticwiki/?rev=41&view=rev
Author: triathlon98
Date: 2007-12-20 03:44:54 -0800 (Thu, 20 Dec 2007)
Log Message:
-----------
upgrade wobertura plugin, it finally seems to work
Modified Paths:
--------------
trunk/pom.xml
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2007-12-18 07:45:06 UTC (rev 40)
+++ trunk/pom.xml 2007-12-20 11:44:54 UTC (rev 41)
@@ -147,7 +147,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
- <version>2.0</version>
+ <version>2.2</version>
<configuration>
<instrumentation/>
</configuration>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-12-18 07:45:14
|
Revision: 40
http://staticwiki.svn.sourceforge.net/staticwiki/?rev=40&view=rev
Author: triathlon98
Date: 2007-12-17 23:45:06 -0800 (Mon, 17 Dec 2007)
Log Message:
-----------
SW-12 assure maven plugin works again
Modified Paths:
--------------
trunk/src/site/wiki/index.wiki
trunk/staticwiki-site-plugin/pom.xml
trunk/staticwiki-site-plugin/src/main/java/org/staticwiki/siteplugin/doxia/WikiSiteModule.java
Modified: trunk/src/site/wiki/index.wiki
===================================================================
--- trunk/src/site/wiki/index.wiki 2007-12-17 08:16:02 UTC (rev 39)
+++ trunk/src/site/wiki/index.wiki 2007-12-18 07:45:06 UTC (rev 40)
@@ -1,6 +1,6 @@
h1. staticwiki
-staticwiki is a configurable java wiki renderer. he rendering is done in several passes to allow a lot of versatility.
+staticwiki is a configurable java wiki renderer. The 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.
Modified: trunk/staticwiki-site-plugin/pom.xml
===================================================================
--- trunk/staticwiki-site-plugin/pom.xml 2007-12-17 08:16:02 UTC (rev 39)
+++ trunk/staticwiki-site-plugin/pom.xml 2007-12-18 07:45:06 UTC (rev 40)
@@ -44,12 +44,12 @@
<dependency>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-core</artifactId>
- <version>1.0-alpha-8</version>
+ <version>1.0-alpha-10</version>
</dependency>
<dependency>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-sink-api</artifactId>
- <version>1.0-alpha-8</version>
+ <version>1.0-alpha-10</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
Modified: trunk/staticwiki-site-plugin/src/main/java/org/staticwiki/siteplugin/doxia/WikiSiteModule.java
===================================================================
--- trunk/staticwiki-site-plugin/src/main/java/org/staticwiki/siteplugin/doxia/WikiSiteModule.java 2007-12-17 08:16:02 UTC (rev 39)
+++ trunk/staticwiki-site-plugin/src/main/java/org/staticwiki/siteplugin/doxia/WikiSiteModule.java 2007-12-18 07:45:06 UTC (rev 40)
@@ -12,14 +12,13 @@
package org.staticwiki.siteplugin.doxia;
-import org.apache.maven.doxia.site.module.SiteModule;
-import org.staticwiki.siteplugin.SaveException;
+import org.apache.maven.doxia.module.site.SiteModule;
/**
* Connect with the renderer in de Doxia core, defines the parameters for the rendering.
*
* @author Joachim Van der Auwera <jo...@pr...>
- * @plexus.component role="org.apache.maven.doxia.site.module.SiteModule" role-hint="wiki"
+ * @plexus.component role="org.apache.maven.doxia.module.site.SiteModule" role-hint="wiki"
*/
public class WikiSiteModule
implements SiteModule
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-12-17 08:16:07
|
Revision: 39
http://staticwiki.svn.sourceforge.net/staticwiki/?rev=39&view=rev
Author: triathlon98
Date: 2007-12-17 00:16:02 -0800 (Mon, 17 Dec 2007)
Log Message:
-----------
fix the generated markup
Modified Paths:
--------------
trunk/staticwiki-renderer/src/main/java/org/staticwiki/wiki/renderer/line/ListLineHandler.java
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-11-08 21:42:51 UTC (rev 38)
+++ trunk/staticwiki-renderer/src/main/java/org/staticwiki/wiki/renderer/line/ListLineHandler.java 2007-12-17 08:16:02 UTC (rev 39)
@@ -42,8 +42,8 @@
{
context.flush( result );
context.setNewParagraph( true );
- String start = "<ul><li><li>";
- String end = "</li></li></ul>";
+ String start = "<ul><ul><li>";
+ String end = "</li></ul></ul>";
context.setParagraphBreak( end );
context.setParagraphEnd( end );
result.append( start );
@@ -54,8 +54,8 @@
{
context.flush( result );
context.setNewParagraph( true );
- String start = "<ul><li><li><li>";
- String end = "</li></li></li></li></ul>";
+ String start = "<ul><ul><ul><li>";
+ String end = "</li></ul></ul></ul>";
context.setParagraphBreak( end );
context.setParagraphEnd( end );
result.append( start );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-11-08 21:42:59
|
Revision: 38
http://staticwiki.svn.sourceforge.net/staticwiki/?rev=38&view=rev
Author: triathlon98
Date: 2007-11-08 13:42:51 -0800 (Thu, 08 Nov 2007)
Log Message:
-----------
add user mailing list
Modified Paths:
--------------
trunk/pom.xml
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2007-10-26 08:35:38 UTC (rev 37)
+++ trunk/pom.xml 2007-11-08 21:42:51 UTC (rev 38)
@@ -60,6 +60,13 @@
<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>
+ <mailingList>
+ <name>staticwiki-user</name>
+ <post>mailto:sta...@li...</post>
+ <subscribe>https://lists.sourceforge.net/lists/listinfo/staticwiki-user</subscribe>
+ <unsubscribe>https://lists.sourceforge.net/lists/listinfo/staticwiki-user</unsubscribe>
+ <archive>http://sourceforge.net/mailarchive/forum.php?forum_name=staticwiki-user</archive>
+ </mailingList>
</mailingLists>
<developers>
<developer>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-10-26 08:35:41
|
Revision: 37
http://staticwiki.svn.sourceforge.net/staticwiki/?rev=37&view=rev
Author: triathlon98
Date: 2007-10-26 01:35:38 -0700 (Fri, 26 Oct 2007)
Log Message:
-----------
repository also needs to be set
Modified Paths:
--------------
trunk/src/site/wiki/usage.wiki
Modified: trunk/src/site/wiki/usage.wiki
===================================================================
--- trunk/src/site/wiki/usage.wiki 2007-10-22 15:02:53 UTC (rev 36)
+++ trunk/src/site/wiki/usage.wiki 2007-10-26 08:35:38 UTC (rev 37)
@@ -21,9 +21,9 @@
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>
- .....
+ ...
<plugins>
- .....
+ ...
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
@@ -35,10 +35,19 @@
</dependency>
</dependencies>
</plugin>
- .....
+ ...
</plugins>
- .....
+ ...
</build>
+
+ <repositories>
+ ...
+ <repository>
+ <id>progs</id>
+ <url>http://maven.progs.be/m2repo</url>
+ </repository>
+ ...
+ </repositories>
{code}
h2. Using the wiki renderer
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-10-22 15:02:56
|
Revision: 36
http://staticwiki.svn.sourceforge.net/staticwiki/?rev=36&view=rev
Author: triathlon98
Date: 2007-10-22 08:02:53 -0700 (Mon, 22 Oct 2007)
Log Message:
-----------
more documentation
Modified Paths:
--------------
trunk/src/site/wiki/usage.wiki
Modified: trunk/src/site/wiki/usage.wiki
===================================================================
--- trunk/src/site/wiki/usage.wiki 2007-10-22 15:01:46 UTC (rev 35)
+++ trunk/src/site/wiki/usage.wiki 2007-10-22 15:02:53 UTC (rev 36)
@@ -46,7 +46,7 @@
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 );
+ String res = wikiRenderer.render( wikiText );
{code}
In many cases, it is important to change how links and resources are handled. In that case you should get the wiki renderer with a proper {code}ResourceHandler{code} implementation.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-10-22 15:01:52
|
Revision: 35
http://staticwiki.svn.sourceforge.net/staticwiki/?rev=35&view=rev
Author: triathlon98
Date: 2007-10-22 08:01:46 -0700 (Mon, 22 Oct 2007)
Log Message:
-----------
more documentation
Modified Paths:
--------------
trunk/staticwiki-renderer/src/main/macro/org/staticwiki/wiki/macro/panel.properties
trunk/staticwiki-renderer/src/site/wiki/architecture.wiki
Added Paths:
-----------
trunk/staticwiki-renderer/src/site/site.xml
Modified: trunk/staticwiki-renderer/src/main/macro/org/staticwiki/wiki/macro/panel.properties
===================================================================
--- trunk/staticwiki-renderer/src/main/macro/org/staticwiki/wiki/macro/panel.properties 2007-10-19 14:13:28 UTC (rev 34)
+++ trunk/staticwiki-renderer/src/main/macro/org/staticwiki/wiki/macro/panel.properties 2007-10-22 15:01:46 UTC (rev 35)
@@ -1,2 +1,2 @@
hasBody=true
-template=quote
+template=panel
Added: trunk/staticwiki-renderer/src/site/site.xml
===================================================================
--- trunk/staticwiki-renderer/src/site/site.xml (rev 0)
+++ trunk/staticwiki-renderer/src/site/site.xml 2007-10-22 15:01:46 UTC (rev 35)
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="staticwiki">
+ <skin>
+ <groupId>be.progs</groupId>
+ <artifactId>maven-site-skin</artifactId>
+ <version>1.0</version>
+ </skin>
+
+ <publishDate format="yyyy-MM-dd"/>
+
+ <bannerLeft>
+ <name>staticwiki</name>
+ <src>http://www.staticwiki.org/images/logo.png</src>
+ <href>http://www.staticwiki.org/</href>
+ </bannerLeft>
+
+ <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="Architecture" href="architecture.html"/>
+ </menu>
+
+ <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
Modified: trunk/staticwiki-renderer/src/site/wiki/architecture.wiki
===================================================================
--- trunk/staticwiki-renderer/src/site/wiki/architecture.wiki 2007-10-19 14:13:28 UTC (rev 34)
+++ trunk/staticwiki-renderer/src/site/wiki/architecture.wiki 2007-10-22 15:01:46 UTC (rev 35)
@@ -1,14 +1,19 @@
h1. Wiki Rendering
-The wiki rendering Is basically done in two distinct steps
+The wiki rendering is basically done in two distinct steps
* macro handling, splitting the wiki up in macros and handling those
-This is mainly done because macros can choose whether or not they want their content to have wiki rendering applied to them or not (for example, code macros typically do not want this).
* normal wiki markup processing
+This is mainly done because macros can choose whether or not they want their content to have wiki rendering applied to them or not (for example, code macros typically do not want this).
+
+
h2. Macro rendering
+The context is split in stuff between the macros and the macros themselves. The entire wiki is considered as being inside a "WIKI" macro. It is preceded by the rendered result of the "WIKI-PREFIX" macro, and at the end the "WIKI-SUFFIX" macro is rendered. This allows flexible handling of headers and/or footers in the rendered wiki.
+
The MacroLoader is used try to load the macro definition. The DefaultMacroLoader loads the definitions from the classpath (org.staticwiki.wiki.macro._macroname_.properties).
At this moment all macros are actually implemented as velocity templates. The template name is part of the macro definition, and the TemplateLoader actually loads the template. The DefaultTemplateLoader loads the templates from the classpath (org.staticwiki.wiki.macro._templatename_.vm).
+Macro names are case dependen, but note that the default wiki handling uses the convention that builtin macros (like "ERROR") have a capitalized name.
The macro has the following structure
{code}
@@ -19,4 +24,38 @@
* _hasBody_ : indicates whether the macro has a body or not (that is, whether a closing tag is required or not).
* _template_ : name of the template, as passed the the TemplateLoader.
-h2. Wiki markup processing
\ No newline at end of file
+The macro itself is a velocity template, and the user can choose whether to use wiki rendering for the content or not.
+For example the _quote_ macro uses wiki rendering
+{code}
+<blockquote>$context.render($macro)</blockquote>
+{code}
+While the _code_ macro does not.
+{code}
+<pre>$macro</pre>
+{code}
+
+h2. Wiki markup processing
+
+The standard wiki processing is configured using the org.staticwiki.wiki.WikiRenderPipeline.txt, which has content like the following.
+{code}
+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.ListLineHandler
+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|+|<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>
+org.staticwiki.wiki.renderer.simple.ImageRenderer
+org.staticwiki.wiki.renderer.simple.LinkRenderer
+org.staticwiki.wiki.renderer.simple.EscapeUnescapeRenderer
+{code}
+The renderers are put in the wiki rendering pipeline.
+The list can contain both WikiSubRenderer or WikiLineHandler implementations. In the latter case, they are added in the previous WikiLineHandlerContainer in the pipeline.
+Note that the order is (very) important. For example the EscapeUnescapeRenderer has to be at the end as this assures no html code can be directly inserted in the wiki content.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-10-19 14:13:31
|
Revision: 34
http://staticwiki.svn.sourceforge.net/staticwiki/?rev=34&view=rev
Author: triathlon98
Date: 2007-10-19 07:13:28 -0700 (Fri, 19 Oct 2007)
Log Message:
-----------
documentation
Modified Paths:
--------------
trunk/src/site/site.xml
trunk/src/site/wiki/developers.wiki
trunk/src/site/wiki/index.wiki
trunk/src/site/wiki/markup.wiki
trunk/src/site/wiki/usage.wiki
Added Paths:
-----------
trunk/src/site/resources/images/smiley.gif
trunk/src/site/wiki/roadmap.wiki
trunk/staticwiki-renderer/src/main/macro/org/staticwiki/wiki/macro/panel.properties
trunk/staticwiki-renderer/src/main/macro/org/staticwiki/wiki/template/panel.vm
Added: trunk/src/site/resources/images/smiley.gif
===================================================================
(Binary files differ)
Property changes on: trunk/src/site/resources/images/smiley.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/src/site/site.xml
===================================================================
--- trunk/src/site/site.xml 2007-10-19 13:48:52 UTC (rev 33)
+++ trunk/src/site/site.xml 2007-10-19 14:13:28 UTC (rev 34)
@@ -24,6 +24,8 @@
<item name="Introduction" href="index.html"/>
<item name="Usage" href="usage.html"/>
<item name="Markup" href="markup.html"/>
+ <item name="Development" href="developers.html"/>
+ <item name="Roadmap" href="roadmap.html"/>
</menu>
<menu ref="modules"/>
Modified: trunk/src/site/wiki/developers.wiki
===================================================================
--- trunk/src/site/wiki/developers.wiki 2007-10-19 13:48:52 UTC (rev 33)
+++ trunk/src/site/wiki/developers.wiki 2007-10-19 14:13:28 UTC (rev 34)
@@ -10,4 +10,57 @@
{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
+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.
+
+h2. Coding style
+
+In staticwiki we use a coding style which prefers easy reading above displaying a lot of information. Most of the features should be clear in the following piece of code.
+{code}
+@Annotation( param1 = "value1", param2 = "value2" )
+public class Foo
+{
+ int[] X = new int[] { 1, 3, 5, 6, 7, 87, 1213, 2 };
+
+ public void foo( int x, int y )
+ {
+ for ( int i = 0; i < x ; i++ )
+ {
+ y += ( y ^ 0x123 ) << 2;
+ }
+ do
+ {
+ try
+ {
+ if ( 0 < x && x < 10 )
+ {
+ while ( x != y )
+ {
+ x = f( x * 3 + 5 );
+ }
+ }
+ else
+ {
+ synchronized ( this )
+ {
+ switch ( e.getCode() )
+ {
+ //...
+ }
+ }
+ }
+ }
+ catch ( MyException e )
+ {}
+ finally
+ {
+ int[] arr = (int[]) g( y );
+ x = y >= 0 ? arr[ y ] : -1;
+ }
+ }
+ while ( true );
+ }
+}
+{code}
+The code is written with the right margin at 120 characters and lines should not be longer than that if possible.
+An indentation is 4 spaces, tabs should not be used.
+Class, method and variable names should follow the standard java naming convention.
Modified: trunk/src/site/wiki/index.wiki
===================================================================
--- trunk/src/site/wiki/index.wiki 2007-10-19 13:48:52 UTC (rev 33)
+++ trunk/src/site/wiki/index.wiki 2007-10-19 14:13:28 UTC (rev 34)
@@ -1,7 +1,3 @@
-----
-*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
staticwiki is a configurable java wiki renderer. he rendering is done in several passes to allow a lot of versatility.
Modified: trunk/src/site/wiki/markup.wiki
===================================================================
--- trunk/src/site/wiki/markup.wiki 2007-10-19 13:48:52 UTC (rev 33)
+++ trunk/src/site/wiki/markup.wiki 2007-10-19 14:13:28 UTC (rev 34)
@@ -1,3 +1,100 @@
h1. staticwiki default markup
-
\ No newline at end of file
+The basis is normal text can be displayed with simple markup. It should be really straightforward for the user to include simple markup.
+You can just type all the data you want to include, and the content will be split up in paragraphs automatically.
+The basic method for this, is that an empty line is used as paragraph seperator. A newline is interpreted as a line break.
+
+Some emphasis can be given to words to surrounding the words using certain characters.
+TO make this work, the begin and end markup should be on the same line, there should be a character or digit next to the begin and just before the end markup, and no character or digit before the begin markup and after the end markup.
+
+{code}
+Use _ to _put and excerpt_ in italics (emphasis).
+Use * to *make an excerpt* bold.
+Use ?? to ??make an excerpt?? a citation.
+Use - to -display an excerpt- with strikethrough.
+Use + to +make an excerpt+ underlined.
+Use ^ to ^display an excerpt^ in superscript.
+Use ~ to ~display an excerpt~ in subscript.
+Use % to *make an excerpt* bold.
+{code}
+
+Which should display as
+
+{panel}
+Use _ to _put and excerpt_ in italics (emphasis).
+Use * to *make an excerpt* bold.
+Use ?? to ??make an excerpt?? a citation.
+Use - to -display an excerpt- with strikethrough.
+Use + to +make an excerpt+ underlined.
+Use ^ to ^display an excerpt^ in superscript.
+Use ~ to ~display an excerpt~ in subscript.
+Use % to *make an excerpt* bold.
+{panel}
+
+Headers can easily be handled by adding the "h1. ", "h2. " etc (up to "h6. ") at the beginning of the line.
+
+{code}
+h1. Big header
+It is easy to add several header types
+h2. Smaller header
+Like the two above.
+{code}
+
+{panel}
+h1. Big header
+It is easy to add several header types
+h2. Smaller header
+Like the two above.
+{panel}
+
+You can also have lists of items, a quoted line or a rule.
+
+{code}
+List are also possible
+- Bulleted item
+-- with indentation
+- or not
+-----
+bq. And a quote below the rule
+{code}
+
+{panel}
+List are also possible
+- Bulleted item
+-- with indentation
+- or not
+-----
+bq. And a quote below the rule
+{panel}
+
+You can also include links and images, and of course the system assures you can not emit invalid html. To assure some character sequences are not interpreterd as markup, you can escape stuff.
+
+{code}
+Links need to be [enclosed in brackets|http://www.equanda.org/] to be clickable. You can also include media using exclamation marks !smiley.gif!, possibly with alternate description !flying smiley|smiley.gif!.
+You cannot include a <img src="images/smiley.gif"> directly, as this is \*not\* allowed in html.
+{code}
+
+{panel}
+Links need to be [enclosed in brackets|http://www.equanda.org/] to be clickable. You can also include media using exclamation marks !images/smiley.gif!, possibly with alternate description !flying smiley|images/smiley.gif!.
+You cannot include a <img src="images/smiley.gif"> directly, as this is \*not\* allowed in html.
+{panel}
+
+There is also a list of macro's which can be used. Macro's have a name and can include parameters. The use the \{name:par1=val1|par2=val2\} syntax.
+
+{code}
+The available macro's are
+{private}To hide some content from the output.{private}
+{nowiki}Have some stuff which is not wiki rendered{nowiki}
+{quote}Include some quoted text{quote}
+\{code}Include some code\{code}
+{panel}A simple panel{panel}
+{code}
+
+{panel}
+The available macro's are
+{private}To hide some content from the output.{private}
+{nowiki}Have some stuff which is not wiki rendered{nowiki}
+{quote}Include some quoted text{quote}
+{code}Include some code{code}
+{panel}A simple panel{panel}
+{panel}
Added: trunk/src/site/wiki/roadmap.wiki
===================================================================
--- trunk/src/site/wiki/roadmap.wiki (rev 0)
+++ trunk/src/site/wiki/roadmap.wiki 2007-10-19 14:13:28 UTC (rev 34)
@@ -0,0 +1,22 @@
+h1. Roadmap
+
+staticwiki is realeased at version 0.8 because we wanted to have a useable version easily available (without need to compile source code or dependecies on snapshots).
+However, we are still missing some things we need to add before we can call it version 1.0
+- Improve markup (make it more complete)
+-- headers should emit the content table at the end. This can then either be hiiden, or moved to the top in CSS.
+-- bullet handling is very bad, it is just a temporary solution and needs work
+-- need counted list bullets (using #) and star bullets (using *)
+-- table support (simple using "|" and full using macro's)
+-- improve panel macro to allow a title etc.
+-- add many more macro's, like color, panel, comment, font etc
+-- support for emoticons, simple arrows
+-- auto recognize some markup (like anything starting with "http://", "www.", "email:") and convert to better info.
+- Improve the site plugin
+-- The links handling should be improved, there should be no need to have explicit links in all cases.
+- Improve the editor
+-- allow load/save
+-- allow save as PDF
+-- maybe some project support to automatically handle the links
+
+Other features/improvements may also be included.
+For details and the current status, check the [staticwiki JIRA pages|http://jira.equanda.org/browse/SW/].
\ No newline at end of file
Modified: trunk/src/site/wiki/usage.wiki
===================================================================
--- trunk/src/site/wiki/usage.wiki 2007-10-19 13:48:52 UTC (rev 33)
+++ trunk/src/site/wiki/usage.wiki 2007-10-19 14:13:28 UTC (rev 34)
@@ -47,4 +47,8 @@
{code}
WikiRenderer wikiRenderer = WikiFactory.getWikiRenderer( new AllowAllResourceHandler() );
wikiRenderer.render( wikiText );
-{code}
\ No newline at end of file
+{code}
+
+In many cases, it is important to change how links and resources are handled. In that case you should get the wiki renderer with a proper {code}ResourceHandler{code} implementation.
+
+h2. Customizing the output
\ No newline at end of file
Added: trunk/staticwiki-renderer/src/main/macro/org/staticwiki/wiki/macro/panel.properties
===================================================================
--- trunk/staticwiki-renderer/src/main/macro/org/staticwiki/wiki/macro/panel.properties (rev 0)
+++ trunk/staticwiki-renderer/src/main/macro/org/staticwiki/wiki/macro/panel.properties 2007-10-19 14:13:28 UTC (rev 34)
@@ -0,0 +1,2 @@
+hasBody=true
+template=quote
Added: trunk/staticwiki-renderer/src/main/macro/org/staticwiki/wiki/template/panel.vm
===================================================================
--- trunk/staticwiki-renderer/src/main/macro/org/staticwiki/wiki/template/panel.vm (rev 0)
+++ trunk/staticwiki-renderer/src/main/macro/org/staticwiki/wiki/template/panel.vm 2007-10-19 14:13:28 UTC (rev 34)
@@ -0,0 +1 @@
+<div class="panel">$context.render($macro)</div>
\ 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-19 13:48:57
|
Revision: 33
http://staticwiki.svn.sourceforge.net/staticwiki/?rev=33&view=rev
Author: triathlon98
Date: 2007-10-19 06:48:52 -0700 (Fri, 19 Oct 2007)
Log Message:
-----------
SW-4 fix surroundmarkup renderer
Modified Paths:
--------------
trunk/staticwiki-renderer/src/main/java/org/staticwiki/wiki/renderer/simple/SurroundMarkupRenderer.java
trunk/staticwiki-renderer/src/test/java/org/staticwiki/wiki/renderer/simple/SurroundMarkupRendererTest.java
Modified: trunk/staticwiki-renderer/src/main/java/org/staticwiki/wiki/renderer/simple/SurroundMarkupRenderer.java
===================================================================
--- trunk/staticwiki-renderer/src/main/java/org/staticwiki/wiki/renderer/simple/SurroundMarkupRenderer.java 2007-10-15 09:04:54 UTC (rev 32)
+++ trunk/staticwiki-renderer/src/main/java/org/staticwiki/wiki/renderer/simple/SurroundMarkupRenderer.java 2007-10-19 13:48:52 UTC (rev 33)
@@ -25,6 +25,7 @@
public class SurroundMarkupRenderer
extends WikiSubRendererAdapter
{
+ private static final char ESCAPE = '\\';
private Text markup;
private char markupStart;
private int markupLen;
@@ -56,14 +57,17 @@
int startpos = 0;
boolean inside = false;
int inputLen = input.length();
- for ( int i = 0; i < inputLen; i++ )
+ for ( int i = 0; i < inputLen ; i++ )
{
if ( input.charAt( i ) == markupStart )
{
if ( inside )
{
- if ( i + markupLen == inputLen ||
- ( i + markupLen < inputLen && !Character.isLetterOrDigit( input.charAt( i + markupLen ) ) ) )
+ char prev = 'x';
+ char next = ' ';
+ if ( i > 0 ) prev = input.charAt( i - 1 );
+ if ( i + markupLen < inputLen ) next = input.charAt( i + markupLen );
+ if ( ESCAPE != prev && Character.isLetterOrDigit( prev ) && !Character.isLetterOrDigit( next ) )
{
if ( markupLen == 1 || startsWith( input, i, markup, markupLen ) )
{
@@ -78,10 +82,13 @@
}
else
{
- if ( i == 0 || !Character.isLetterOrDigit( input.charAt( i - 1 ) ) )
+ char prev = ' ';
+ char next = 'x';
+ if ( i > 0 ) prev = input.charAt( i - 1 );
+ if ( i + markupLen < inputLen ) next = input.charAt( i + markupLen );
+ if ( ESCAPE != prev && !Character.isLetterOrDigit( prev ) && Character.isLetterOrDigit( next ) )
{
- if ( markupLen == 1 ||
- ( i + markupLen <= inputLen && startsWith( input, i, markup, markupLen ) ) )
+ if ( markupLen == 1 || startsWith( input, i, markup, markupLen ) )
{
subRender( result, input.subSequence( startpos, i ) );
startpos = i;
@@ -96,7 +103,8 @@
private boolean startsWith( CharSequence input, int offset, Text markup, int markupLen )
{
- for ( int i = 0; i < markupLen; i++ )
+ if ( offset + markupLen > input.length() ) return false;
+ for ( int i = 0; i < markupLen ; i++ )
{
if ( markup.charAt( i ) != input.charAt( offset + i ) ) return false;
}
Modified: trunk/staticwiki-renderer/src/test/java/org/staticwiki/wiki/renderer/simple/SurroundMarkupRendererTest.java
===================================================================
--- trunk/staticwiki-renderer/src/test/java/org/staticwiki/wiki/renderer/simple/SurroundMarkupRendererTest.java 2007-10-15 09:04:54 UTC (rev 32)
+++ trunk/staticwiki-renderer/src/test/java/org/staticwiki/wiki/renderer/simple/SurroundMarkupRendererTest.java 2007-10-19 13:48:52 UTC (rev 33)
@@ -177,4 +177,37 @@
smr.render( tb, test );
assertEquals( "nothing <b>to ch??nge</b>", tb.toString() );
}
+ public void testCorrectStartEnd()
+ {
+ SurroundMarkupRenderer smr = new SurroundMarkupRenderer( "*|<b>|</b>" );
+ TextBuilder tb = TextBuilder.newInstance();
+ String test;
+
+ tb.setLength( 0 );
+ test = "Use * to *make an excerpt* bold.";
+ smr.render( tb, test );
+ assertEquals( "Use * to <b>make an excerpt</b> bold.", tb.toString() );
+
+ tb.setLength( 0 );
+ test = "To *make an excerpt* in * bold.";
+ smr.render( tb, test );
+ assertEquals( "To <b>make an excerpt</b> in * bold.", tb.toString() );
+
+ tb.setLength( 0 );
+ test = "Use *to make * an excerpt* bold.";
+ smr.render( tb, test );
+ assertEquals( "Use <b>to make * an excerpt</b> bold.", tb.toString() );
+ }
+
+ public void testEscape()
+ {
+ SurroundMarkupRenderer smr = new SurroundMarkupRenderer( "*|<b>|</b>" );
+ TextBuilder tb = TextBuilder.newInstance();
+ String test;
+
+ tb.setLength( 0 );
+ test = "this is \\*not\\* new";
+ smr.render( tb, test );
+ assertEquals( test, tb.toString() );
+ }
}
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}