You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by gn...@apache.org on 2009/10/13 11:19:06 UTC
svn commit: r824650 - /felix/sandbox/filippo/karaf-manual/pom.xml
Author: gnodet
Date: Tue Oct 13 09:19:05 2009
New Revision: 824650
URL: http://svn.apache.org/viewvc?rev=824650&view=rev
Log:
Fix some broken links within the documents using regular expressions
Modified:
felix/sandbox/filippo/karaf-manual/pom.xml
Modified: felix/sandbox/filippo/karaf-manual/pom.xml
URL: http://svn.apache.org/viewvc/felix/sandbox/filippo/karaf-manual/pom.xml?rev=824650&r1=824649&r2=824650&view=diff
==============================================================================
--- felix/sandbox/filippo/karaf-manual/pom.xml (original)
+++ felix/sandbox/filippo/karaf-manual/pom.xml Tue Oct 13 09:19:05 2009
@@ -35,6 +35,59 @@
<build>
<plugins>
+
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.2</version>
+ <executions>
+ <execution>
+ <configuration>
+ <tasks>
+ <taskdef name="for" classname="net.sf.antcontrib.logic.ForTask" classpathref="maven.plugin.classpath"/>
+ <property name="ant.regexp.regexpimpl" value="org.apache.tools.ant.util.regexp.Jdk14RegexpRegexp" />
+ <mkdir dir="target/site/manual"/>
+ <get src="http://cwiki.apache.org/confluence/display/FELIX/Karaf+Users%27+Guide+in+one+page"
+ dest="target/site/manual/manual.html" />
+ <for list="1,2,3,4,5,6,7,8,9,10" param="letter">
+ <sequential>
+ <replaceregexp
+ file="target/site/manual/manual.html"
+ flags="g"
+ match='"/confluence/display/FELIX/([^"]*)\+([^"+]*)"'
+ replace='"/confluence/display/FELIX/\1\2"' />
+ </sequential>
+ </for>
+ <replaceregexp
+ file="target/site/manual/manual.html"
+ flags="g"
+ match='"/confluence/display/FELIX/([^"]*)"'
+ replace='"#KarafUsers%27Guideinonepage-\1"' />
+ <replaceregexp
+ file="target/site/manual/manual.html"
+ flags="g"
+ match='"/confluence/([^"]*)"'
+ replace='"http://cwiki.apache.org/confluence/\1"' />
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <phase>generate-resources</phase>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>ant-contrib</groupId>
+ <artifactId>ant-contrib</artifactId>
+ <version>1.0b3</version>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-optional</artifactId>
+ <version>1.5.3-1</version>
+ </dependency>
+ </dependencies>
+ </plugin>
<plugin>
<groupId>org.apache.camel</groupId>
@@ -49,7 +102,7 @@
</execution>
</executions>
<configuration>
- <page>http://cwiki.apache.org/confluence/display/FELIX/Karaf+Users%27+Guide+in+one+page</page>
+ <page>file://${basedir}/target/site/manual/manual.html</page>
<head><![CDATA[
<link href="file:${basedir}/src/styles/print.css" rel="stylesheet" type="text/css" />
<style type="text/css">
Re: svn commit: r824650 - /felix/sandbox/filippo/karaf-manual/pom.xml
Posted by Guillaume Nodet <gn...@gmail.com>.
Well, I think it should also be at the following page:
http://camel.apache.org/manual.html
On Tue, Oct 13, 2009 at 14:19, Filippo Diotalevi
<fi...@gmail.com> wrote:
> On Tue, Oct 13, 2009 at 2:14 PM, Guillaume Nodet <gn...@gmail.com> wrote:
>> I think you should do both.
>> We need to make sure the licensing is clean before releasing but it's
>> not a big deal to put it in trunk fow now i think, and i'm quite
>> confident on the issue. The only thing might be to add the
>> attribution on the website if we add a direct download to the manual.
>
> Ok, I'll do both.
> Just noticed that Apache Camel has the attribution on the website at:
> http://camel.apache.org/pdf-documentation-guide.html
>
>
> --
> Filippo Diotalevi
>
--
Cheers,
Guillaume Nodet
------------------------
Blog: http://gnodet.blogspot.com/
------------------------
Open Source SOA
http://fusesource.com
Re: svn commit: r824650 - /felix/sandbox/filippo/karaf-manual/pom.xml
Posted by Filippo Diotalevi <fi...@gmail.com>.
On Tue, Oct 13, 2009 at 2:14 PM, Guillaume Nodet <gn...@gmail.com> wrote:
> I think you should do both.
> We need to make sure the licensing is clean before releasing but it's
> not a big deal to put it in trunk fow now i think, and i'm quite
> confident on the issue. The only thing might be to add the
> attribution on the website if we add a direct download to the manual.
Ok, I'll do both.
Just noticed that Apache Camel has the attribution on the website at:
http://camel.apache.org/pdf-documentation-guide.html
--
Filippo Diotalevi
Re: svn commit: r824650 - /felix/sandbox/filippo/karaf-manual/pom.xml
Posted by Guillaume Nodet <gn...@gmail.com>.
I think you should do both.
We need to make sure the licensing is clean before releasing but it's
not a big deal to put it in trunk fow now i think, and i'm quite
confident on the issue. The only thing might be to add the
attribution on the website if we add a direct download to the manual.
On Tue, Oct 13, 2009 at 14:07, Filippo Diotalevi
<fi...@gmail.com> wrote:
> On Tue, Oct 13, 2009 at 11:22 AM, Guillaume Nodet <gn...@apache.org> wrote:
>> I've slightly enhanced the generation to fix some links that were
>> pointing to the karaf online user doc.
>> Hope you don't mind ...
>
> Not at all!
> How do we proceed? Can I commit on karaf trunk or should I sent an
> email to legal@apache for clarifications on the usage of prince?
>
> --
> Filippo Diotalevi
>
--
Cheers,
Guillaume Nodet
------------------------
Blog: http://gnodet.blogspot.com/
------------------------
Open Source SOA
http://fusesource.com
Re: svn commit: r824650 - /felix/sandbox/filippo/karaf-manual/pom.xml
Posted by Filippo Diotalevi <fi...@gmail.com>.
On Tue, Oct 13, 2009 at 11:22 AM, Guillaume Nodet <gn...@apache.org> wrote:
> I've slightly enhanced the generation to fix some links that were
> pointing to the karaf online user doc.
> Hope you don't mind ...
Not at all!
How do we proceed? Can I commit on karaf trunk or should I sent an
email to legal@apache for clarifications on the usage of prince?
--
Filippo Diotalevi
Re: svn commit: r824650 - /felix/sandbox/filippo/karaf-manual/pom.xml
Posted by Guillaume Nodet <gn...@apache.org>.
I've slightly enhanced the generation to fix some links that were
pointing to the karaf online user doc.
Hope you don't mind ...
On Tue, Oct 13, 2009 at 11:19, <gn...@apache.org> wrote:
> Author: gnodet
> Date: Tue Oct 13 09:19:05 2009
> New Revision: 824650
>
> URL: http://svn.apache.org/viewvc?rev=824650&view=rev
> Log:
> Fix some broken links within the documents using regular expressions
>
> Modified:
> felix/sandbox/filippo/karaf-manual/pom.xml
>
> Modified: felix/sandbox/filippo/karaf-manual/pom.xml
> URL: http://svn.apache.org/viewvc/felix/sandbox/filippo/karaf-manual/pom.xml?rev=824650&r1=824649&r2=824650&view=diff
> ==============================================================================
> --- felix/sandbox/filippo/karaf-manual/pom.xml (original)
> +++ felix/sandbox/filippo/karaf-manual/pom.xml Tue Oct 13 09:19:05 2009
> @@ -35,6 +35,59 @@
>
> <build>
> <plugins>
> +
> + <plugin>
> + <artifactId>maven-antrun-plugin</artifactId>
> + <version>1.2</version>
> + <executions>
> + <execution>
> + <configuration>
> + <tasks>
> + <taskdef name="for" classname="net.sf.antcontrib.logic.ForTask" classpathref="maven.plugin.classpath"/>
> + <property name="ant.regexp.regexpimpl" value="org.apache.tools.ant.util.regexp.Jdk14RegexpRegexp" />
> + <mkdir dir="target/site/manual"/>
> + <get src="http://cwiki.apache.org/confluence/display/FELIX/Karaf+Users%27+Guide+in+one+page"
> + dest="target/site/manual/manual.html" />
> + <for list="1,2,3,4,5,6,7,8,9,10" param="letter">
> + <sequential>
> + <replaceregexp
> + file="target/site/manual/manual.html"
> + flags="g"
> + match='"/confluence/display/FELIX/([^"]*)\+([^"+]*)"'
> + replace='"/confluence/display/FELIX/\1\2"' />
> + </sequential>
> + </for>
> + <replaceregexp
> + file="target/site/manual/manual.html"
> + flags="g"
> + match='"/confluence/display/FELIX/([^"]*)"'
> + replace='"#KarafUsers%27Guideinonepage-\1"' />
> + <replaceregexp
> + file="target/site/manual/manual.html"
> + flags="g"
> + match='"/confluence/([^"]*)"'
> + replace='"http://cwiki.apache.org/confluence/\1"' />
> + </tasks>
> + </configuration>
> + <goals>
> + <goal>run</goal>
> + </goals>
> + <phase>generate-resources</phase>
> + </execution>
> + </executions>
> + <dependencies>
> + <dependency>
> + <groupId>ant-contrib</groupId>
> + <artifactId>ant-contrib</artifactId>
> + <version>1.0b3</version>
> + </dependency>
> + <dependency>
> + <groupId>ant</groupId>
> + <artifactId>ant-optional</artifactId>
> + <version>1.5.3-1</version>
> + </dependency>
> + </dependencies>
> + </plugin>
>
> <plugin>
> <groupId>org.apache.camel</groupId>
> @@ -49,7 +102,7 @@
> </execution>
> </executions>
> <configuration>
> - <page>http://cwiki.apache.org/confluence/display/FELIX/Karaf+Users%27+Guide+in+one+page</page>
> + <page>file://${basedir}/target/site/manual/manual.html</page>
> <head><![CDATA[
> <link href="file:${basedir}/src/styles/print.css" rel="stylesheet" type="text/css" />
> <style type="text/css">
>
>
>
--
Cheers,
Guillaume Nodet
------------------------
Blog: http://gnodet.blogspot.com/
------------------------
Open Source SOA
http://fusesource.com