You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ks...@apache.org on 2015/10/29 21:35:17 UTC

[12/13] servicemix-maven-plugins git commit: Deprecated plugins removed

http://git-wip-us.apache.org/repos/asf/servicemix-maven-plugins/blob/681882ee/docs-maven-plugin/src/main/java/org/apache/servicemix/docs/confluence/ConfluenceLanguage.java
----------------------------------------------------------------------
diff --git a/docs-maven-plugin/src/main/java/org/apache/servicemix/docs/confluence/ConfluenceLanguage.java b/docs-maven-plugin/src/main/java/org/apache/servicemix/docs/confluence/ConfluenceLanguage.java
deleted file mode 100644
index 7a2dfc2..0000000
--- a/docs-maven-plugin/src/main/java/org/apache/servicemix/docs/confluence/ConfluenceLanguage.java
+++ /dev/null
@@ -1,451 +0,0 @@
-/*
- * Copyright 2001-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.servicemix.docs.confluence;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.eclipse.mylyn.internal.wikitext.confluence.core.block.AbstractConfluenceDelimitedBlock;
-import org.eclipse.mylyn.internal.wikitext.confluence.core.block.ColorBlock;
-import org.eclipse.mylyn.internal.wikitext.confluence.core.block.ExtendedPreformattedBlock;
-import org.eclipse.mylyn.internal.wikitext.confluence.core.block.ExtendedQuoteBlock;
-import org.eclipse.mylyn.internal.wikitext.confluence.core.block.HeadingBlock;
-import org.eclipse.mylyn.internal.wikitext.confluence.core.block.ListBlock;
-import org.eclipse.mylyn.internal.wikitext.confluence.core.block.QuoteBlock;
-import org.eclipse.mylyn.internal.wikitext.confluence.core.block.TableOfContentsBlock;
-import org.eclipse.mylyn.internal.wikitext.confluence.core.block.TextBoxBlock;
-import org.eclipse.mylyn.internal.wikitext.confluence.core.phrase.ConfluenceWrappedPhraseModifier;
-import org.eclipse.mylyn.internal.wikitext.confluence.core.phrase.EmphasisPhraseModifier;
-import org.eclipse.mylyn.internal.wikitext.confluence.core.phrase.ImagePhraseModifier;
-import org.eclipse.mylyn.internal.wikitext.confluence.core.phrase.SimplePhraseModifier;
-import org.eclipse.mylyn.internal.wikitext.confluence.core.phrase.SimpleWrappedPhraseModifier;
-import org.eclipse.mylyn.internal.wikitext.confluence.core.token.EscapedCharacterReplacementToken;
-import org.eclipse.mylyn.wikitext.core.parser.Attributes;
-import org.eclipse.mylyn.wikitext.core.parser.DocumentBuilder;
-import org.eclipse.mylyn.wikitext.core.parser.DocumentBuilder.BlockType;
-import org.eclipse.mylyn.wikitext.core.parser.DocumentBuilder.SpanType;
-import org.eclipse.mylyn.wikitext.core.parser.LinkAttributes;
-import org.eclipse.mylyn.wikitext.core.parser.markup.Block;
-import org.eclipse.mylyn.wikitext.core.parser.markup.ContentState;
-import org.eclipse.mylyn.wikitext.core.parser.markup.PatternBasedElement;
-import org.eclipse.mylyn.wikitext.core.parser.markup.PatternBasedElementProcessor;
-import org.eclipse.mylyn.wikitext.core.parser.markup.token.EntityReferenceReplacementToken;
-import org.eclipse.mylyn.wikitext.core.parser.markup.token.ImpliedHyperlinkReplacementToken;
-import org.eclipse.mylyn.wikitext.core.parser.markup.token.PatternEntityReferenceReplacementToken;
-import org.eclipse.mylyn.wikitext.core.parser.markup.token.PatternLineBreakReplacementToken;
-import org.eclipse.mylyn.wikitext.core.parser.markup.token.PatternLiteralReplacementToken;
-
-
-public class ConfluenceLanguage extends org.eclipse.mylyn.wikitext.confluence.core.ConfluenceLanguage {
-
-    private final List<Block> nestedBlocks = new ArrayList<Block>();
-
-    private final ContentState contentState = new ContentState();
-
-    @Override
-    protected void clearLanguageSyntax() {
-        super.clearLanguageSyntax();
-        nestedBlocks.clear();
-    }
-
-    public List<Block> getNestedBlocks() {
-        return nestedBlocks;
-    }
-
-    @Override
-    protected void addStandardBlocks(List<Block> blocks, List<Block> paragraphBreakingBlocks) {
-        // IMPORTANT NOTE: Most items below have order dependencies.  DO NOT REORDER ITEMS BELOW!!
-
-        HeadingBlock headingBlock = new HeadingBlock();
-        blocks.add(headingBlock);
-        paragraphBreakingBlocks.add(headingBlock);
-        nestedBlocks.add(headingBlock);
-        ConfluenceGlossaryBlock glossaryBlock = new ConfluenceGlossaryBlock();
-        blocks.add(glossaryBlock);
-        paragraphBreakingBlocks.add(glossaryBlock);
-        nestedBlocks.add(glossaryBlock);
-        ListBlock listBlock = new ListBlock();
-        blocks.add(listBlock);
-        paragraphBreakingBlocks.add(listBlock);
-        nestedBlocks.add(listBlock);
-        blocks.add(new QuoteBlock());
-        TableBlock tableBlock = new TableBlock();
-        blocks.add(tableBlock);
-        paragraphBreakingBlocks.add(tableBlock);
-        nestedBlocks.add(tableBlock);
-        ExtendedQuoteBlock quoteBlock = new ExtendedQuoteBlock();
-        blocks.add(quoteBlock);
-        paragraphBreakingBlocks.add(quoteBlock);
-        ExtendedPreformattedBlock noformatBlock = new ExtendedPreformattedBlock();
-        blocks.add(noformatBlock);
-        paragraphBreakingBlocks.add(noformatBlock);
-
-        blocks.add(new TextBoxBlock(BlockType.PANEL, "panel")); //$NON-NLS-1$
-        blocks.add(new TextBoxBlock(BlockType.NOTE, "note")); //$NON-NLS-1$
-        blocks.add(new TextBoxBlock(BlockType.INFORMATION, "info")); //$NON-NLS-1$
-        blocks.add(new TextBoxBlock(BlockType.WARNING, "warning")); //$NON-NLS-1$
-        blocks.add(new TextBoxBlock(BlockType.TIP, "tip")); //$NON-NLS-1$
-        CodeBlock codeBlock = new CodeBlock();
-        blocks.add(codeBlock);
-        paragraphBreakingBlocks.add(codeBlock);
-        blocks.add(new TableOfContentsBlock());
-        ColorBlock colorBlock = new ColorBlock();
-        blocks.add(colorBlock);
-        paragraphBreakingBlocks.add(colorBlock);
-    }
-
-    @Override
-    protected void addStandardPhraseModifiers(PatternBasedSyntax phraseModifierSyntax) {
-        phraseModifierSyntax.beginGroup("(?:(?<=[\\s\\.,\\\"'?!;:\\)\\(\\[\\]])|^)(?:", 0); //$NON-NLS-1$
-        phraseModifierSyntax.add(new HyperlinkPhraseModifier());
-        phraseModifierSyntax.add(new SimplePhraseModifier("*", SpanType.STRONG, true)); //$NON-NLS-1$
-        phraseModifierSyntax.add(new EmphasisPhraseModifier());
-        phraseModifierSyntax.add(new SimplePhraseModifier("??", SpanType.CITATION, true)); //$NON-NLS-1$
-        phraseModifierSyntax.add(new SimplePhraseModifier("-", SpanType.DELETED, true)); //$NON-NLS-1$
-        phraseModifierSyntax.add(new SimplePhraseModifier("+", SpanType.UNDERLINED, true)); //$NON-NLS-1$
-        phraseModifierSyntax.add(new SimplePhraseModifier("^", SpanType.SUPERSCRIPT, false)); //$NON-NLS-1$
-        phraseModifierSyntax.add(new SimplePhraseModifier("~", SpanType.SUBSCRIPT, false)); //$NON-NLS-1$
-        phraseModifierSyntax.add(new SimpleWrappedPhraseModifier("{{", "}}", DocumentBuilder.SpanType.MONOSPACE, false)); //$NON-NLS-1$ //$NON-NLS-2$
-        phraseModifierSyntax.add(new ConfluenceWrappedPhraseModifier("{quote}", DocumentBuilder.SpanType.QUOTE, true)); //$NON-NLS-1$
-        phraseModifierSyntax.add(new ImagePhraseModifier());
-        phraseModifierSyntax.endGroup(")(?=\\W|$)", 0); //$NON-NLS-1$
-    }
-
-    @Override
-    protected void addStandardTokens(PatternBasedSyntax tokenSyntax) {
-        tokenSyntax.add(new PatternLineBreakReplacementToken("(\\\\\\\\)")); // line break //$NON-NLS-1$
-        tokenSyntax.add(new EscapedCharacterReplacementToken()); // ORDER DEPENDENCY must come after line break
-        tokenSyntax.add(new EntityReferenceReplacementToken("(tm)", "#8482")); //$NON-NLS-1$ //$NON-NLS-2$
-        tokenSyntax.add(new EntityReferenceReplacementToken("(TM)", "#8482")); //$NON-NLS-1$ //$NON-NLS-2$
-        tokenSyntax.add(new EntityReferenceReplacementToken("(c)", "#169")); //$NON-NLS-1$ //$NON-NLS-2$
-        tokenSyntax.add(new EntityReferenceReplacementToken("(C)", "#169")); //$NON-NLS-1$ //$NON-NLS-2$
-        tokenSyntax.add(new EntityReferenceReplacementToken("(r)", "#174")); //$NON-NLS-1$ //$NON-NLS-2$
-        tokenSyntax.add(new EntityReferenceReplacementToken("(R)", "#174")); //$NON-NLS-1$ //$NON-NLS-2$
-        tokenSyntax.add(new PatternEntityReferenceReplacementToken("(?:(?<=\\w\\s)(---)(?=\\s\\w))", "#8212")); // emdash //$NON-NLS-1$ //$NON-NLS-2$
-        tokenSyntax.add(new PatternEntityReferenceReplacementToken("(?:(?<=\\w\\s)(--)(?=\\s\\w))", "#8211")); // endash //$NON-NLS-1$ //$NON-NLS-2$
-        tokenSyntax.add(new PatternLiteralReplacementToken("(----)", "<hr/>")); // horizontal rule //$NON-NLS-1$ //$NON-NLS-2$
-        tokenSyntax.add(new ImpliedHyperlinkReplacementToken());
-        tokenSyntax.add(new AnchorReplacementToken());
-    }
-
-    @Override
-    protected ContentState createState() {
-        return contentState;
-    }
-
-    public static class CodeBlock extends AbstractConfluenceDelimitedBlock {
-
-        private String title;
-
-        private String language;
-
-        public CodeBlock() {
-            super("code"); //$NON-NLS-1$
-        }
-
-        @Override
-        protected void beginBlock() {
-            if (title != null) {
-                Attributes attributes = new Attributes();
-                attributes.setTitle(title);
-                builder.beginBlock(DocumentBuilder.BlockType.PANEL, attributes);
-            }
-            Attributes attributes = new Attributes();
-            Attributes preAttributes = new Attributes();
-            if (language != null) {
-                attributes.setLanguage(language); //$NON-NLS-1$
-            }
-//		builder.beginBlock(DocumentBuilder.BlockType.PREFORMATTED, preAttributes);
-            builder.beginBlock(DocumentBuilder.BlockType.CODE, attributes);
-            builder.charactersUnescaped("<![CDATA[");
-        }
-
-        @Override
-        protected void handleBlockContent(String content) {
-            builder.charactersUnescaped(content);
-            builder.charactersUnescaped("\n"); //$NON-NLS-1$
-        }
-
-        @Override
-        protected void endBlock() {
-            builder.charactersUnescaped("]]>");
-            if (title != null) {
-                builder.endBlock(); // panel
-            }
-            builder.endBlock(); // code
-//		builder.endBlock(); // pre
-        }
-
-        @Override
-        protected void resetState() {
-            super.resetState();
-            title = null;
-        }
-
-        @Override
-        protected void setOption(String key, String value) {
-            if (key.equals("title")) { //$NON-NLS-1$
-                title = value;
-            } else if (key.equals("lang")) {
-                language = value;
-            }
-        }
-
-        @Override
-        protected void setOption(String option) {
-            language = option.toLowerCase();
-        }
-    }
-
-    public static class ConfluenceGlossaryBlock extends Block {
-
-        static final Pattern startPattern = Pattern.compile("\\s*-\\s*+(.*?)\\s*+::\\s*+(.*?)\\s*+"); //$NON-NLS-1$
-
-        private Matcher matcher;
-        private int blockLineCount = 0;
-
-        @Override
-        public int processLineContent(String line, int offset) {
-            if (blockLineCount == 0) {
-                builder.beginBlock(BlockType.DEFINITION_LIST, new Attributes());
-            } else {
-                matcher = startPattern.matcher(line);
-                if (!matcher.matches()) {
-                    setClosed(true);
-                    return 0;
-                }
-            }
-            ++blockLineCount;
-            String key = matcher.group(1);
-            String val = matcher.group(2);
-            builder.beginBlock(BlockType.DEFINITION_TERM, new Attributes());
-            markupLanguage.emitMarkupLine(getParser(), state, key, 0);
-            builder.endBlock();
-            builder.beginBlock(BlockType.DEFINITION_ITEM, new Attributes());
-            markupLanguage.emitMarkupLine(getParser(), state, val, 0);
-            builder.endBlock();
-            return -1;
-        }
-
-        @Override
-        public boolean canStart(String line, int lineOffset) {
-            if (lineOffset == 0 && !markupLanguage.isFilterGenerativeContents()) {
-                matcher = startPattern.matcher(line);
-                return matcher.matches();
-            } else {
-                matcher = null;
-                return false;
-            }
-        }
-
-        @Override
-        public void setClosed(boolean closed) {
-            if (closed && !isClosed()) {
-                builder.endBlock();
-            }
-            super.setClosed(closed);
-        }
-    }
-
-
-    public static class TableBlock extends Block {
-
-        static final Pattern startPattern = Pattern.compile("(\\|(.*)?(\\|\\s*$))"); //$NON-NLS-1$
-
-        static final Pattern TABLE_ROW_PATTERN = Pattern.compile("\\|(\\|)?" + "((?:(?:[^\\|\\[]*)(?:\\[[^\\]]*\\])?)*)" //$NON-NLS-1$ //$NON-NLS-2$
-                + "(\\|\\|?\\s*$)?"); //$NON-NLS-1$
-
-        private int blockLineCount = 0;
-
-        private Matcher matcher;
-
-        public TableBlock() {
-        }
-
-        @Override
-        public int processLineContent(String line, int offset) {
-            if (blockLineCount == 0) {
-                Attributes attributes = new Attributes();
-                builder.beginBlock(BlockType.TABLE, attributes);
-            } else if (markupLanguage.isEmptyLine(line)) {
-                setClosed(true);
-                return 0;
-            }
-            ++blockLineCount;
-
-            if (offset == line.length()) {
-                return -1;
-            }
-
-            String textileLine = offset == 0 ? line : line.substring(offset);
-            Matcher rowMatcher = TABLE_ROW_PATTERN.matcher(textileLine);
-            if (!rowMatcher.find()) {
-                setClosed(true);
-                return 0;
-            }
-
-            builder.beginBlock(BlockType.TABLE_ROW, new Attributes());
-
-            do {
-                int start = rowMatcher.start();
-                if (start == textileLine.length() - 1) {
-                    break;
-                }
-
-                String headerIndicator = rowMatcher.group(1);
-                String text = rowMatcher.group(2).trim(); // MODIFIED: added trim()
-                int lineOffset = offset + rowMatcher.start(2);
-
-                boolean header = headerIndicator != null && "|".equals(headerIndicator); //$NON-NLS-1$
-
-                Attributes attributes = new Attributes();
-                builder.beginBlock(header ? BlockType.TABLE_CELL_HEADER : BlockType.TABLE_CELL_NORMAL, attributes);
-
-                markupLanguage.emitMarkupLine(getParser(), state, lineOffset, text, 0);
-
-                builder.endBlock(); // table cell
-            } while (rowMatcher.find());
-
-            builder.endBlock(); // table row
-
-            return -1;
-        }
-
-        @Override
-        public boolean canStart(String line, int lineOffset) {
-            blockLineCount = 0;
-            if (lineOffset == 0) {
-                matcher = startPattern.matcher(line);
-                return matcher.matches();
-            } else {
-                matcher = null;
-                return false;
-            }
-        }
-
-        @Override
-        public void setClosed(boolean closed) {
-            if (closed && !isClosed()) {
-                builder.endBlock();
-            }
-            super.setClosed(closed);
-        }
-
-    }
-
-    public static class HyperlinkPhraseModifier extends PatternBasedElement {
-
-        @Override
-        protected String getPattern(int groupOffset) {
-            return "\\[(?:\\s*([^\\]\\|]+)\\|)?([^\\]]+)\\]"; //$NON-NLS-1$
-        }
-
-        @Override
-        protected int getPatternGroupCount() {
-            return 2;
-        }
-
-        @Override
-        protected PatternBasedElementProcessor newProcessor() {
-            return new HyperlinkPhraseModifierProcessor();
-        }
-
-        private static class HyperlinkPhraseModifierProcessor extends PatternBasedElementProcessor {
-            @Override
-            public void emit() {
-                String text = group(1);
-                String linkComposite = group(2);
-                String[] parts = linkComposite.split("\\s*\\|\\s*"); //$NON-NLS-1$
-                if (parts.length == 0) {
-                    // can happen if linkComposite is ' |', see bug 290434
-                } else {
-                    if (text != null) {
-                        text = text.trim();
-                    }
-                    String href = parts[0];
-                    if (href != null) {
-                        href = href.trim();
-                    }
-                    if (href.charAt(0) == '#') {
-
-                    }
-                    String tip = parts.length > 1 ? parts[1] : null;
-                    if (tip != null) {
-                        tip = tip.trim();
-                    }
-                    if (text == null || text.length() == 0) {
-                        text = href;
-                        if (text.length() > 0 && text.charAt(0) == '#') {
-                            text = text.substring(1);
-                        }
-                        if (href.charAt(0) == '#') {
-                            href = "#" + state.getIdGenerator().getGenerationStrategy().generateId(href.substring(1));
-                        }
-                        Attributes attributes = new LinkAttributes();
-                        attributes.setTitle(tip);
-                        getBuilder().link(attributes, href, text);
-                    } else {
-                        if (href.charAt(0) == '#') {
-                            href = "#" + state.getIdGenerator().getGenerationStrategy().generateId(href.substring(1));
-                        }
-                        LinkAttributes attributes = new LinkAttributes();
-                        attributes.setTitle(tip);
-                        attributes.setHref(href);
-                        getBuilder().beginSpan(SpanType.LINK, attributes);
-
-                        getMarkupLanguage().emitMarkupLine(parser, state, start(1), text, 0);
-
-                        getBuilder().endSpan();
-                    }
-                }
-            }
-        }
-    }
-
-    public static class AnchorReplacementToken extends PatternBasedElement {
-
-        @Override
-        protected String getPattern(int groupOffset) {
-            return "\\{anchor:([^\\}]+)\\}"; //$NON-NLS-1$
-        }
-
-        @Override
-        protected int getPatternGroupCount() {
-            return 1;
-        }
-
-        @Override
-        protected PatternBasedElementProcessor newProcessor() {
-            return new AnchorReplacementTokenProcessor();
-        }
-
-        private static class AnchorReplacementTokenProcessor extends PatternBasedElementProcessor {
-            @Override
-            public void emit() {
-                String name = group(1);
-                name = state.getIdGenerator().getGenerationStrategy().generateId(name);
-                Attributes attributes = new Attributes();
-                attributes.setId(name);
-                getBuilder().beginSpan(SpanType.SPAN, attributes);
-                getBuilder().endSpan();
-            }
-
-        }
-
-    }
- }

http://git-wip-us.apache.org/repos/asf/servicemix-maven-plugins/blob/681882ee/docs-maven-plugin/src/main/java/org/apache/servicemix/docs/confluence/DocBookDocumentBuilder.java
----------------------------------------------------------------------
diff --git a/docs-maven-plugin/src/main/java/org/apache/servicemix/docs/confluence/DocBookDocumentBuilder.java b/docs-maven-plugin/src/main/java/org/apache/servicemix/docs/confluence/DocBookDocumentBuilder.java
deleted file mode 100644
index 67b3f00..0000000
--- a/docs-maven-plugin/src/main/java/org/apache/servicemix/docs/confluence/DocBookDocumentBuilder.java
+++ /dev/null
@@ -1,645 +0,0 @@
-/*
- * Copyright 2001-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.servicemix.docs.confluence;
-
-import java.io.Writer;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-import java.util.Stack;
-import java.util.TreeMap;
-import java.util.logging.Logger;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.eclipse.mylyn.internal.wikitext.core.util.css.CssParser;
-import org.eclipse.mylyn.internal.wikitext.core.util.css.CssRule;
-import org.eclipse.mylyn.wikitext.core.parser.Attributes;
-import org.eclipse.mylyn.wikitext.core.parser.DocumentBuilder;
-import org.eclipse.mylyn.wikitext.core.parser.LinkAttributes;
-import org.eclipse.mylyn.wikitext.core.parser.builder.AbstractXmlDocumentBuilder;
-import org.eclipse.mylyn.wikitext.core.util.FormattingXMLStreamWriter;
-import org.eclipse.mylyn.wikitext.core.util.XmlStreamWriter;
-
-/**
- * A builder that can emit <a href="http://www.docbook.org/">Docbook</a>
- *
- */
-public class DocBookDocumentBuilder extends AbstractXmlDocumentBuilder {
-
-	private static final Pattern PERCENTAGE = Pattern.compile("(\\d+)%"); //$NON-NLS-1$
-
-	private static final Pattern CSS_CLASS_INLINE = Pattern.compile("(^|\\s+)inline(\\s+|$)"); //$NON-NLS-1$
-
-	private static Set<Integer> entityReferenceToUnicode = new HashSet<Integer>();
-	static {
-		entityReferenceToUnicode.add(215);
-		entityReferenceToUnicode.add(8211);
-		entityReferenceToUnicode.add(8212);
-		entityReferenceToUnicode.add(8220);
-		entityReferenceToUnicode.add(8221);
-		entityReferenceToUnicode.add(8216);
-		entityReferenceToUnicode.add(8217);
-
-	}
-
-//	private String bookTitle;
-
-	private String namespace = "http://docbook.org/ns/docbook"; //$NON-NLS-1$
-
-	private final Map<String, String> acronyms = new HashMap<String, String>();
-
-	private int headingLevel = 0;
-
-	private final Stack<BlockDescription> blockDescriptions = new Stack<BlockDescription>();
-
-    private final Stack<HeadingDescription> headingDescriptions = new Stack<HeadingDescription>();
-
-	private boolean automaticGlossary = true;
-
-    public DocBookDocumentBuilder(Writer out) {
-		super(out);
-	}
-
-	public DocBookDocumentBuilder(XmlStreamWriter writer) {
-		super(writer);
-	}
-
-	protected XmlStreamWriter createXmlStreamWriter(Writer out) {
-		XmlStreamWriter writer = super.createXmlStreamWriter(out);
-		return new FormattingXMLStreamWriter(writer) {
-			@Override
-			protected boolean preserveWhitespace(String elementName) {
-				return elementName.equals("programlisting") || elementName.equals("code") || elementName.startsWith("literal"); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-		};
-	}
-
-	public String getNamespace() {
-		return namespace;
-	}
-
-	public void setNamespace(String namespace) {
-		this.namespace = namespace;
-	}
-
-	@Override
-	public void acronym(String text, String definition) {
-		String previousDef = acronyms.put(text, definition);
-		if (previousDef != null && previousDef.length() > definition.length()) {
-			acronyms.put(text, previousDef);
-		}
-		writer.writeStartElement("glossterm"); //$NON-NLS-1$
-		characters(text);
-		writer.writeEndElement();
-	}
-
-	@Override
-	public void link(Attributes attributes, String href, final String text) {
-		link(attributes, href, new ContentEmitter() {
-			public void emit() {
-				writer.writeCharacters(text);
-			}
-		});
-	}
-
-	private void link(Attributes attributes, String href, ContentEmitter emitter) {
-		ensureBlockElementsOpen();
-		if (href.startsWith("#")) { //$NON-NLS-1$
-			if (href.length() > 1) {
-				writer.writeStartElement("link"); //$NON-NLS-1$
-				writer.writeAttribute("linkend", href.substring(1)); //$NON-NLS-1$
-				emitter.emit();
-				writer.writeEndElement(); // link
-			} else {
-				emitter.emit();
-			}
-		} else {
-			writer.writeStartElement("ulink"); //$NON-NLS-1$
-			writer.writeAttribute("url", href); //$NON-NLS-1$
-			emitter.emit();
-			writer.writeEndElement(); // ulink
-		}
-	}
-
-    private void transformId(String id) {
-        
-    }
-
-    private interface ContentEmitter {
-		public void emit();
-	}
-
-	@Override
-	public void beginBlock(BlockType type, Attributes attributes) {
-		if (headingLevel == 0) {
-			beginHeading(1, new Attributes());
-			endHeading();
-		}
-
-		String elementName;
-		String[] elementNames = null;
-		boolean allowTitle = false;
-		boolean closeElementsOnBlockStart = false;
-        BlockDescription previousBlock = null;
-		if (!blockDescriptions.isEmpty()) {
-			previousBlock = blockDescriptions.peek();
-		}
-
-		switch (type) {
-		case BULLETED_LIST:
-			elementName = "itemizedlist"; //$NON-NLS-1$
-			break;
-		case NUMERIC_LIST:
-			elementName = "orderedlist"; //$NON-NLS-1$
-			break;
-		case DEFINITION_LIST:
-			elementName = "variablelist"; //$NON-NLS-1$
-
-			//			variablelist
-			//				varlistentry+
-			//					term+
-			//					listitem
-			//
-			break;
-		case DEFINITION_TERM:
-
-			BlockDescription blockDescription = findBlockDescription(BlockType.DEFINITION_LIST);
-			if (blockDescription.entrySize > 0) {
-				endBlockEntry(blockDescription);
-			}
-			openBlockEntry(blockDescription, new String[] { "varlistentry" }); //$NON-NLS-1$
-
-			elementName = "term"; //$NON-NLS-1$
-			break;
-		case DEFINITION_ITEM:
-			elementName = "listitem"; //$NON-NLS-1$
-			elementNames = new String[] { "para" }; //$NON-NLS-1$
-			closeElementsOnBlockStart = true;
-			break;
-		case FOOTNOTE:
-		case PARAGRAPH:
-			elementName = "para"; //$NON-NLS-1$
-			break;
-		case CODE:
-			elementName = "programlisting"; //$NON-NLS-1$
-			break;
-		case PREFORMATTED:
-			elementName = "literallayout"; //$NON-NLS-1$
-			break;
-		case QUOTE:
-			elementName = "blockquote"; //$NON-NLS-1$
-			break;
-		case LIST_ITEM:
-			elementName = "listitem"; //$NON-NLS-1$
-			elementNames = new String[] { "para" }; //$NON-NLS-1$
-			closeElementsOnBlockStart = true;
-			break;
-		case TABLE:
-			elementName = "informaltable"; //$NON-NLS-1$
-			break;
-		case TABLE_CELL_HEADER:
-			elementName = "th"; //$NON-NLS-1$
-			break;
-		case TABLE_CELL_NORMAL:
-			elementName = "td"; //$NON-NLS-1$
-			break;
-		case TABLE_ROW:
-			elementName = "tr"; //$NON-NLS-1$
-			break;
-		case INFORMATION:
-			elementName = "important"; //$NON-NLS-1$
-			allowTitle = true;
-			break;
-		case NOTE:
-			elementName = "note"; //$NON-NLS-1$
-			allowTitle = true;
-			break;
-		case WARNING:
-			elementName = "warning"; //$NON-NLS-1$
-			allowTitle = true;
-			break;
-		case TIP:
-			elementName = "tip"; //$NON-NLS-1$
-			allowTitle = true;
-			break;
-		case PANEL:
-			elementName = "note"; // docbook has nothing better for 'note' //$NON-NLS-1$
-			allowTitle = true;
-			break;
-		case DIV:
-			elementName = null;
-			break;
-		default:
-			throw new IllegalStateException(type.name());
-		}
-
-		int blockSize;
-		if (elementName != null) {
-			blockSize = 1;
-
-			if (previousBlock != null && previousBlock.closeElementsOnBlockStart) {
-				endBlockEntry(previousBlock);
-			}
-
-			writer.writeStartElement(elementName);
-			applyAttributes(attributes);
-
-			if (elementNames != null) {
-				for (String name : elementNames) {
-					writer.writeStartElement(name);
-				}
-			}
-
-			if (allowTitle && attributes.getTitle() != null) {
-				writer.writeStartElement("title"); //$NON-NLS-1$
-				writer.writeCharacters(attributes.getTitle());
-				writer.writeEndElement();
-			}
-		} else {
-			blockSize = 0;
-		}
-		blockDescriptions.push(new BlockDescription(type, blockSize, elementNames, closeElementsOnBlockStart));
-	}
-
-	@Override
-	public void endBlock() {
-		final BlockDescription blockDescription = blockDescriptions.pop();
-		int size = blockDescription.size + blockDescription.entrySize;
-		for (int x = 0; x < size; ++x) {
-			writer.writeEndElement();
-		}
-	}
-
-	private void endBlockEntry(BlockDescription blockDescription) {
-		for (int x = 0; x < blockDescription.entrySize; ++x) {
-			writer.writeEndElement();
-		}
-		blockDescription.entrySize = 0;
-	}
-
-	private void openBlockEntry(BlockDescription blockDescription, String[] entry) {
-		for (String ent : entry) {
-			writer.writeStartElement(ent);
-		}
-		blockDescription.entrySize += entry.length;
-	}
-
-	@Override
-	public void beginHeading(int level, Attributes attributes) {
-		closeSections(Math.max(level - 1, 0));
-
-		while (headingLevel < level) {
-			headingLevel++;
-
-            if (headingLevel == 1) {
-                writer.writeStartElement("chapter"); //$NON-NLS-1$
-                writer.writeNamespace("", namespace);
-
-            } else {
-                writer.writeStartElement("section"); //$NON-NLS-1$
-            }
-			if (attributes != null) {
-				applyAttributes(attributes);
-				attributes = null;
-			}
-
-            headingDescriptions.push(new HeadingDescription(level, attributes));
-		}
-
-		writer.writeStartElement("title"); //$NON-NLS-1$
-	}
-
-	@Override
-	public void endHeading() {
-		writer.writeEndElement(); // title
-	}
-
-	@Override
-	public void beginDocument() {
-		baseInHead = false;
-	}
-
-	@Override
-	public void beginSpan(SpanType type, Attributes attributes) {
-		ensureBlockElementsOpen();
-		switch (type) {
-		case BOLD:
-		case STRONG:
-			writer.writeStartElement("emphasis"); //$NON-NLS-1$
-			writer.writeAttribute("role", "bold"); //$NON-NLS-1$ //$NON-NLS-2$
-			break;
-		case CITATION:
-			writer.writeStartElement("citation"); //$NON-NLS-1$
-			break;
-		case CODE:
-			writer.writeStartElement("code"); //$NON-NLS-1$
-			break;
-		case DELETED:
-			writer.writeStartElement("emphasis"); //$NON-NLS-1$
-			writer.writeAttribute("role", "del"); //$NON-NLS-1$ //$NON-NLS-2$
-			break;
-		case EMPHASIS:
-			writer.writeStartElement("emphasis"); //$NON-NLS-1$
-			break;
-		case INSERTED:
-			writer.writeStartElement("emphasis"); //$NON-NLS-1$
-			writer.writeAttribute("role", "ins"); //$NON-NLS-1$ //$NON-NLS-2$
-			break;
-		case UNDERLINED:
-			writer.writeStartElement("emphasis"); //$NON-NLS-1$
-			writer.writeAttribute("role", "underline"); //$NON-NLS-1$ //$NON-NLS-2$
-			break;
-		case ITALIC:
-			writer.writeStartElement("emphasis"); //$NON-NLS-1$
-			writer.writeAttribute("role", "italic"); //$NON-NLS-1$ //$NON-NLS-2$
-			break;
-		case QUOTE:
-			writer.writeStartElement("quote"); //$NON-NLS-1$
-			break;
-		case SPAN:
-			writer.writeStartElement("phrase"); //$NON-NLS-1$
-			break;
-		case SUBSCRIPT:
-			writer.writeStartElement("subscript"); //$NON-NLS-1$
-			break;
-		case SUPERSCRIPT:
-			writer.writeStartElement("superscript"); //$NON-NLS-1$
-			break;
-		case MONOSPACE:
-			writer.writeStartElement("literal"); //$NON-NLS-1$
-			break;
-		case LINK: {
-			LinkAttributes linkAttributes = (LinkAttributes) attributes;
-			String href = linkAttributes.getHref();
-			if (href.startsWith("#")) { //$NON-NLS-1$
-				writer.writeStartElement("link"); //$NON-NLS-1$
-				if (href.length() > 1) {
-					writer.writeAttribute("linkend", href.substring(1)); //$NON-NLS-1$
-				}
-			} else {
-				writer.writeStartElement("ulink"); //$NON-NLS-1$
-				writer.writeAttribute("url", href); //$NON-NLS-1$
-			}
-		}
-			break;
-		default:
-			Logger.getLogger(DocBookDocumentBuilder.class.getName()).warning("No docbook mapping for " + type); //$NON-NLS-1$
-			writer.writeStartElement("phrase"); //$NON-NLS-1$
-			break;
-		}
-		applyAttributes(attributes);
-	}
-
-	private void applyAttributes(Attributes attributes) {
-        if (attributes.getId() != null) {
-            writer.writeAttribute("id", attributes.getId()); //$NON-NLS-1$
-        }
-        if (attributes.getLanguage() != null) {
-            writer.writeAttribute("language", attributes.getLanguage()); //$NON-NLS-1$
-        }
-	}
-
-	@Override
-	public void endDocument() {
-		closeSections(0);
-
-		writeGlossaryAppendix();
-
-//		writer.writeEndElement(); // book
-		writer.writeEndDocument();
-
-		acronyms.clear();
-	}
-
-	private void closeSections(int toLevel) {
-		if (toLevel < 0) {
-			toLevel = 0;
-		}
-		while (headingLevel > toLevel) {
-			writer.writeEndElement();
-			--headingLevel;
-            headingDescriptions.pop();
-		}
-	}
-
-	private void writeGlossaryAppendix() {
-		if (!acronyms.isEmpty() && automaticGlossary) {
-			writer.writeStartElement("appendix"); //$NON-NLS-1$
-			writer.writeAttribute("id", "glossary"); //$NON-NLS-1$ //$NON-NLS-2$
-			writer.writeStartElement("title"); //$NON-NLS-1$
-			writer.writeAttribute("id", "glossary-end"); //$NON-NLS-1$ //$NON-NLS-2$
-			writer.writeCharacters("Glossary"); //$NON-NLS-1$
-			writer.writeEndElement(); // title
-			writer.writeStartElement("glosslist"); //$NON-NLS-1$
-
-			for (Map.Entry<String, String> glossEntry : new TreeMap<String, String>(acronyms).entrySet()) {
-
-				writer.writeStartElement("glossentry"); //$NON-NLS-1$
-
-				writer.writeStartElement("glossterm"); //$NON-NLS-1$
-				writer.writeCharacters(glossEntry.getKey());
-				writer.writeEndElement(); // glossterm
-
-				writer.writeStartElement("glossdef"); //$NON-NLS-1$
-				writer.writeStartElement("para"); //$NON-NLS-1$
-				writer.writeCharacters(glossEntry.getValue());
-				writer.writeEndElement(); // para
-				writer.writeEndElement(); // glossdef
-
-				writer.writeEndElement(); // glossentry
-			}
-			writer.writeEndElement(); // glosslist
-			writer.writeEndElement(); // appendix
-		}
-	}
-
-	@Override
-	public void endSpan() {
-		writer.writeEndElement();
-	}
-
-	@Override
-	public void characters(String text) {
-		ensureBlockElementsOpen();
-		super.characters(text);
-	}
-
-	@Override
-	public void charactersUnescaped(String literal) {
-		ensureBlockElementsOpen();
-		// note: this *may* have HTML tags in it
-		writer.writeLiteral(literal);
-		//		Logger.getLogger(DocBookDocumentBuilder.class.getName()).warning("HTML literal not supported in DocBook");
-	}
-
-	private void ensureBlockElementsOpen() {
-		if (!blockDescriptions.isEmpty()) {
-			BlockDescription blockDescription = blockDescriptions.peek();
-			if (blockDescription.entrySize == 0 && blockDescription.nestedElementNames != null) {
-				openBlockEntry(blockDescription, blockDescription.nestedElementNames);
-			}
-		}
-	}
-
-	@Override
-	public void entityReference(String entity) {
-		ensureBlockElementsOpen();
-		if (entity.startsWith("#")) { //$NON-NLS-1$
-			String numeric = entity.substring(1);
-			int base = 10;
-			if (numeric.startsWith("x")) { //$NON-NLS-1$
-				numeric = entity.substring(1);
-				base = 16;
-			}
-			int unicodeValue = Integer.parseInt(numeric, base);
-			if (entityReferenceToUnicode.contains(unicodeValue)) {
-				writer.writeCharacters("" + ((char) unicodeValue)); //$NON-NLS-1$
-				return;
-			}
-		}
-		writer.writeEntityRef(entity);
-	}
-
-	@Override
-	public void image(Attributes attributes, String url) {
-		ensureBlockElementsOpen();
-		String cssClass = attributes.getCssClass();
-		boolean inlined = false;
-		if (cssClass != null && CSS_CLASS_INLINE.matcher(cssClass).find()) {
-			inlined = true;
-		}
-		emitImage(attributes, url, inlined);
-	}
-
-	private void emitImage(Attributes attributes, String url, boolean inline) {
-		// see http://www.docbook.org/tdg/en/html/imagedata-x.html
-		ensureBlockElementsOpen();
-		writer.writeStartElement(inline ? "inlinemediaobject" : "mediaobject"); //$NON-NLS-1$ //$NON-NLS-2$
-		applyAttributes(attributes);
-		writer.writeStartElement("imageobject"); //$NON-NLS-1$
-		writer.writeEmptyElement("imagedata"); //$NON-NLS-1$
-		writer.writeAttribute("fileref", makeUrlAbsolute(url)); //$NON-NLS-1$
-		String cssStyle = attributes.getCssStyle();
-		if (cssStyle != null) {
-			String width = null;
-			String depth = null;
-			Iterator<CssRule> ruleIterator = new CssParser().createRuleIterator(cssStyle);
-			while (ruleIterator.hasNext()) {
-				CssRule rule = ruleIterator.next();
-				if ("width".equals(rule.name)) { //$NON-NLS-1$
-					width = rule.value;
-				} else if ("height".equals(rule.name)) { //$NON-NLS-1$
-					depth = rule.value;
-				}
-			}
-			if (width != null) {
-				Matcher matcher = PERCENTAGE.matcher(width);
-				if (matcher.matches()) {
-					writer.writeAttribute("scale", matcher.group(1)); //$NON-NLS-1$
-				} else {
-					writer.writeAttribute("width", width); //$NON-NLS-1$
-					if (depth != null) {
-						writer.writeAttribute("depth", depth); //$NON-NLS-1$
-					}
-				}
-			}
-		}
-		writer.writeEndElement(); // imageobject
-		writer.writeEndElement(); // inlinemediaobject or mediaobject
-	}
-
-	@Override
-	public void imageLink(Attributes linkAttributes, final Attributes imageAttributes, String href,
-			final String imageUrl) {
-		link(linkAttributes, href, new ContentEmitter() {
-			public void emit() {
-				emitImage(imageAttributes, imageUrl, true);
-			}
-		});
-	}
-
-	@Override
-	public void lineBreak() {
-		ensureBlockElementsOpen();
-		// no equivalent in DocBook.
-		characters("\n"); //$NON-NLS-1$
-	}
-
-	private BlockDescription findBlockDescription(BlockType type) {
-		for (int x = blockDescriptions.size() - 1; x >= 0; --x) {
-			BlockDescription blockDescription = blockDescriptions.get(x);
-			if (blockDescription.type == type) {
-				return blockDescription;
-			}
-		}
-		return null;
-	}
-
-    private static class BlockDescription {
-        BlockType type;
-
-        int size;
-
-        int entrySize; // the size of an entry, if it is open, otherwise 0
-
-        final String[] nestedElementNames;
-
-        final boolean closeElementsOnBlockStart;
-
-        public BlockDescription(DocumentBuilder.BlockType type, int size, String[] nestedElementNames, boolean closeElementsOnBlockStart) {
-            this.size = size;
-            this.entrySize = nestedElementNames == null ? 0 : nestedElementNames.length;
-            this.type = type;
-            this.nestedElementNames = nestedElementNames;
-            this.closeElementsOnBlockStart = closeElementsOnBlockStart;
-        }
-    }
-
-    private static class HeadingDescription {
-
-        int level;
-        Attributes attributes;
-
-        private HeadingDescription(int level, Attributes attributes) {
-            this.level = level;
-            this.attributes = attributes;
-        }
-    }
-
-	/**
-	 * Indicate if this builder should generate an automatic glossary if acronyms are used. When the automatic glossary
-	 * is enabled and acronyms are used in the document, then an <code>appendix</code> with title 'Glossary' is added to
-	 * the document, with a <code>glosslist</code> generated for all of the acronyms that appear in the document. The
-	 * default is true.
-	 */
-	public boolean isAutomaticGlossary() {
-		return automaticGlossary;
-	}
-
-	/**
-	 * Indicate if this builder should generate an automatic glossary if acronyms are used. When the automatic glossary
-	 * is enabled and acronyms are used in the document, then an <code>appendix</code> with title 'Glossary' is added to
-	 * the document, with a <code>glosslist</code> generated for all of the acronyms that appear in the document. The
-	 * default is true.
-	 */
-	public void setAutomaticGlossary(boolean automaticGlossary) {
-		this.automaticGlossary = automaticGlossary;
-	}
-
-}

http://git-wip-us.apache.org/repos/asf/servicemix-maven-plugins/blob/681882ee/docs-maven-plugin/src/main/java/org/apache/servicemix/docs/snippet/SnippetHandler.java
----------------------------------------------------------------------
diff --git a/docs-maven-plugin/src/main/java/org/apache/servicemix/docs/snippet/SnippetHandler.java b/docs-maven-plugin/src/main/java/org/apache/servicemix/docs/snippet/SnippetHandler.java
deleted file mode 100644
index 3a87f8d..0000000
--- a/docs-maven-plugin/src/main/java/org/apache/servicemix/docs/snippet/SnippetHandler.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
- * Copyright 2001-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.servicemix.docs.snippet;
-
-import java.io.*;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.net.URLStreamHandler;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.commons.io.FilenameUtils;
-import org.apache.maven.plugin.AbstractMojo;
-
-/**
- * URLStreamHandler implementation for handling snippet:// URL
- */
-public class SnippetHandler extends URLStreamHandler {
-
-    private static final String PROTOCOL = "snippet";
-    private static final String PREFIX = PROTOCOL + "://";
-
-    private AbstractMojo mojo;
-    private File cache;
-    private URL base;
-
-    public SnippetHandler(AbstractMojo mojo, File cache, URL base) {
-        super();
-        this.mojo = mojo;
-        this.cache = cache;
-        this.base = base;
-    }
-
-
-    @Override
-    protected URLConnection openConnection(final URL url) throws IOException {
-        if (!cache.exists()) {
-            mojo.getLog().debug("Creating cache directory " + cache);
-            cache.mkdirs();
-        }
-
-        final String name = getFileName(url);
-
-        final File cached = new File(cache, name);
-        if (!cached.exists()) {
-            cache(name);
-        } else {
-            mojo.getLog().debug("Using cached file " + cached.getAbsolutePath() + " for " + url.toExternalForm());
-        }
-
-        return new URLConnection(url) {
-
-            @Override
-            public void connect() throws IOException {
-                // graciously do nothing
-            }
-
-            @Override
-            public InputStream getInputStream() {
-                ByteArrayOutputStream bos = new ByteArrayOutputStream();
-                PrintWriter out = new PrintWriter(bos);
-                out.printf("<programlisting language=\"%s\"><![CDATA[%n", FilenameUtils.getExtension(name));
-
-                String id = getQuery(url, "id");
-                try {
-                    BufferedReader in = new BufferedReader(new FileReader(cached));
-                    if (id == null) {
-                        copy(in, out);
-                    } else {
-                        copy(in, out, id);
-                    }
-                } catch (IOException e) {
-                    out.println("missing snippet: " + url);
-
-                    // summary warning message and full detail debug logging
-                    mojo.getLog().warn("Unable to include snippet " + url.toExternalForm());
-                    mojo.getLog().debug("Unable to include snippet " + url.toExternalForm(), e);
-                }
-
-                out.println("]]></programlisting>");
-                out.flush();
-                out.close();
-    
-                return new ByteArrayInputStream(bos.toByteArray());       
-            }
-        };
-    }
-
-    private static final String getQuery(URL url, String key) {
-        return getQueryMap(url).get(key);
-    }
-
-    private static final Map<String, String> getQueryMap(URL url) {
-        Map<String, String> query = new HashMap<String, String>();
-
-        if (url.getQuery() != null) {
-            for (String param : url.getQuery().split("&")) {
-                String[] pair = param.split("=");
-                query.put(pair[0], pair[1]);
-            }
-        }
-
-        return query;
-    }
-
-    private String getFileName(URL url) {
-        String result = url.toExternalForm().substring(PREFIX.length());
-        if (url.getQuery() != null) {
-            result = result.replace("?" + url.getQuery(), "");
-        }
-        return result;
-    }
-
-    private void cache(String name) throws IOException {
-        URL source = getSourceUrl(name);
-
-        File target = new File(cache, name);
-
-        BufferedReader in = null;
-        PrintWriter out = null;
-        try {
-            if (!target.getParentFile().isDirectory()) {
-                target.getParentFile().mkdirs();
-            }
-
-            mojo.getLog().debug("Caching " + source.toExternalForm() + " in " + target.getAbsolutePath());
-
-            in =new BufferedReader(
-                        new InputStreamReader(source.openConnection().getInputStream()));
-            out = new PrintWriter(new FileWriter(target));
-
-            copy(in, out);
-            out.flush();
-        } catch (IOException e) {
-            // summary warning message and full detail debug message
-            mojo.getLog().warn("Unable to cache data for " + name + " : " + e.getMessage());
-            mojo.getLog().debug("Unable to cache data for " + name + " : " + e.getMessage(), e);
-        } finally {
-            if (in != null) {
-                in.close();
-            }
-            if (out != null) {
-                out.close();
-            }
-        }
-
-    }
-
-
-    private URL getSourceUrl(String name) throws MalformedURLException {
-        URL source;
-        if (base.toExternalForm().endsWith("/")) {
-            source = new URL(base.toExternalForm() + name);
-        } else {
-            source = new URL(base.toExternalForm() + "/" + name);
-        }
-        return source;
-    }
-
-    private void copy(BufferedReader in, PrintWriter out) throws IOException {
-
-        String inputLine;
-
-        while ((inputLine = in.readLine()) != null) {
-            out.println(inputLine);
-        }
-
-    }
-
-    private void copy(BufferedReader in, PrintWriter out, String id) throws IOException {
-        String line = in.readLine();
-        boolean snippet = false;
-
-        while (line != null) {
-            if (snippet) {
-                if (line.contains("END SNIPPET: " + id)) {
-                    break;
-                } else {
-                    out.println(line);
-                }
-            } else {
-                if (line.contains("START SNIPPET: " + id)) {
-                    snippet = true;
-                }
-            }
-            
-            line = in.readLine();
-        }
-
-    }    
-}

http://git-wip-us.apache.org/repos/asf/servicemix-maven-plugins/blob/681882ee/docs-maven-plugin/src/test/java/org/apache/servicemix/docs/SnippetMojoTest.java
----------------------------------------------------------------------
diff --git a/docs-maven-plugin/src/test/java/org/apache/servicemix/docs/SnippetMojoTest.java b/docs-maven-plugin/src/test/java/org/apache/servicemix/docs/SnippetMojoTest.java
deleted file mode 100644
index 7a4e703..0000000
--- a/docs-maven-plugin/src/test/java/org/apache/servicemix/docs/SnippetMojoTest.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright 2001-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.servicemix.docs;
-
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.apache.maven.plugin.MojoExecutionException;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-/**
- * Test cases for {@link org.apache.servicemix.docs.SnippetMojo} and {@link org.apache.servicemix.docs.snippet.SnippetHandler}
- */
-public class SnippetMojoTest {
-
-    private static SnippetMojo mojo;
-
-    @BeforeClass
-    public static void setUp() throws MojoExecutionException, MalformedURLException {
-        mojo = new SnippetMojo();
-        mojo.snippetCache = new File("target/tests/snippets-" + System.currentTimeMillis()); 
-        mojo.snippetBase = new File("src/test/resources").toURI().toURL();
-        mojo.execute();
-    }
-
-    @Test
-    public void getFullSource() throws IOException {
-        URL url = new URL("snippet://Test.java");
-        String content = read(url).trim();
-        
-        assertTrue(content.startsWith("<programlisting language=\"java\"><![CDATA["));
-        assertTrue(content.contains("public class Test {"));
-        assertTrue(content.endsWith("]]></programlisting>"));
-    }
-
-    @Test
-    public void getFullFromXmlFile() throws IOException {
-        URL url = new URL("snippet://Test.xml");
-        String content = read(url).trim();
-
-        assertTrue(content.startsWith("<programlisting language=\"xml\"><![CDATA["));
-        assertTrue(content.contains("<test/>"));
-        assertTrue(content.endsWith("]]></programlisting>"));
-    }
-
-    @Test
-    public void getSnippetFromSource() throws IOException {
-        URL url = new URL("snippet://Test.java?id=doSomething");
-        String content = read(url).trim();
-
-        assertTrue(content.startsWith("<programlisting language=\"java\"><![CDATA["));
-        assertFalse(content.contains("public class Test {"));
-        assertTrue(content.contains("public void doSomething() {"));
-        assertTrue(content.endsWith("]]></programlisting>"));
-        
-        assertFalse(content.contains("<!-- BEGIN SNIPPET"));
-        assertFalse(content.contains("<!-- END SNIPPET"));
-    }
-
-    private String read(URL url) throws IOException {
-        InputStream is = null;
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-
-        try {
-            is = url.openStream();
-            byte[] data = new byte[4096];
-            int read = is.read(data);
-            while (read > 0) {
-                bos.write(data, 0, read);
-                read = is.read(data);
-            }
-            bos.flush();
-            bos.close();
-            return new String(bos.toByteArray());
-        } finally {
-            if (is != null) {
-                is.close();
-            }
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/servicemix-maven-plugins/blob/681882ee/docs-maven-plugin/src/test/java/org/apache/servicemix/docs/confluence/ConfluenceDocumentTest.java
----------------------------------------------------------------------
diff --git a/docs-maven-plugin/src/test/java/org/apache/servicemix/docs/confluence/ConfluenceDocumentTest.java b/docs-maven-plugin/src/test/java/org/apache/servicemix/docs/confluence/ConfluenceDocumentTest.java
deleted file mode 100644
index 0eb35e0..0000000
--- a/docs-maven-plugin/src/test/java/org/apache/servicemix/docs/confluence/ConfluenceDocumentTest.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright 2001-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.servicemix.docs.confluence;
-
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.StringWriter;
-import java.util.List;
-
-import org.apache.commons.io.IOUtils;
-
-import static junit.framework.Assert.assertEquals;
-
-/**
- * Test cases for {@link ConfluenceConverter}
- */
-public class ConfluenceDocumentTest {
-
-    @org.junit.Test
-    public void generateChapterAndSections() throws Exception {
-        assertDocBook("document1");
-    }
-
-    @org.junit.Test
-    public void generateChapterSectionsAndParagraphs() throws Exception {
-        assertDocBook("document2");
-    }
-
-    @org.junit.Test
-    public void generateProgramListingBlock() throws Exception {
-        assertDocBook("code-blocks");
-    }
-
-    @org.junit.Test
-    public void generateImageObject() throws Exception {
-        assertDocBook("images");
-    }
-
-    @org.junit.Test
-    public void generateLists() throws Exception {
-        assertDocBook("lists");
-    }
-
-    @org.junit.Test
-    public void generateLinks() throws Exception {
-        assertDocBook("links");
-    }
-
-
-    @org.junit.Test
-    public void generateTables() throws Exception {
-        assertDocBook("tables");
-    }
-
-    private void assertDocBook(String name) throws IOException {
-        StringWriter writer = new StringWriter();
-
-        List<String> expected = IOUtils.readLines(getClass().getResourceAsStream(name + ".xml"));
-
-        ConfluenceConverter document = new ConfluenceConverter();
-
-        document.convert(new InputStreamReader(getClass().getResourceAsStream(name + ".wiki")),
-                         writer);
-        writer.flush();
-        writer.close();
-
-//        System.err.println(writer.toString());
-
-        String[] results = writer.toString().split("\\r?\\n\\r?");
-        int i = 0;
-
-        for (String result : results) {
-            System.out.println(result);
-            if (result.trim().length() > 0) {
-
-                assertEquals("Line " + (i +1) + " should match the expected DocBook XML output",
-                             expected.get(i).trim(), result.trim());
-                i++;
-            }
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/servicemix-maven-plugins/blob/681882ee/docs-maven-plugin/src/test/resources/Test.java
----------------------------------------------------------------------
diff --git a/docs-maven-plugin/src/test/resources/Test.java b/docs-maven-plugin/src/test/resources/Test.java
deleted file mode 100644
index 664e6e3..0000000
--- a/docs-maven-plugin/src/test/resources/Test.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2001-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * A simple Test class
- */
-public class Test {
-
-    // START SNIPPET: doSomething
-    public void doSomething() {
-        // does something very interesting
-    }
-    // END SNIPPET: doSomething
-
-    public void doSomethingElse() {
-        // does something else, even more interesting
-    }
-    
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/servicemix-maven-plugins/blob/681882ee/docs-maven-plugin/src/test/resources/Test.xml
----------------------------------------------------------------------
diff --git a/docs-maven-plugin/src/test/resources/Test.xml b/docs-maven-plugin/src/test/resources/Test.xml
deleted file mode 100644
index b285379..0000000
--- a/docs-maven-plugin/src/test/resources/Test.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/*
- * Copyright 2001-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-<test/>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/servicemix-maven-plugins/blob/681882ee/docs-maven-plugin/src/test/resources/org/apache/servicemix/docs/confluence/code-blocks.wiki
----------------------------------------------------------------------
diff --git a/docs-maven-plugin/src/test/resources/org/apache/servicemix/docs/confluence/code-blocks.wiki b/docs-maven-plugin/src/test/resources/org/apache/servicemix/docs/confluence/code-blocks.wiki
deleted file mode 100644
index 9ddc032..0000000
--- a/docs-maven-plugin/src/test/resources/org/apache/servicemix/docs/confluence/code-blocks.wiki
+++ /dev/null
@@ -1,23 +0,0 @@
-h1. Chapter
-
-h2. Section 1
-This section contains a piece of {{code text}}.
-
-{code}
-<?xml version="1.0"?>
-<hello>
-  <world/>
-</hello>
-{code}
-
-h2. Section 2
-The next one specifies the language for the code block.
-
-{code:lang=xml}
-<?xml version="1.0"?>
-<hello>
-  <world/>
-</hello>
-{code}
-
-h2. Section with {{code text}}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/servicemix-maven-plugins/blob/681882ee/docs-maven-plugin/src/test/resources/org/apache/servicemix/docs/confluence/code-blocks.xml
----------------------------------------------------------------------
diff --git a/docs-maven-plugin/src/test/resources/org/apache/servicemix/docs/confluence/code-blocks.xml b/docs-maven-plugin/src/test/resources/org/apache/servicemix/docs/confluence/code-blocks.xml
deleted file mode 100644
index 803b022..0000000
--- a/docs-maven-plugin/src/test/resources/org/apache/servicemix/docs/confluence/code-blocks.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<chapter xmlns="http://docbook.org/ns/docbook" id="Chapter">
-  <title>Chapter</title>
-  <section id="Section1">
-    <title>Section 1</title>
-    <para>This section contains a piece of
-      <literal>code text</literal>.
-    </para>
-    <programlisting><![CDATA[
-    <?xml version="1.0"?>
-    <hello>
-      <world/>
-    </hello>
-    ]]></programlisting>
-  </section>
-  <section id="Section2">
-    <title>Section 2</title>
-    <para>The next one specifies the language for the code block.</para>
-    <programlisting language="xml"><![CDATA[
-    <?xml version="1.0"?>
-    <hello>
-      <world/>
-    </hello>
-    ]]></programlisting>
-  </section>
-  <section id="Sectionwithcodetext">
-    <title>Section with
-      <literal>code text</literal>
-    </title>
-  </section>
-</chapter>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/servicemix-maven-plugins/blob/681882ee/docs-maven-plugin/src/test/resources/org/apache/servicemix/docs/confluence/document1.wiki
----------------------------------------------------------------------
diff --git a/docs-maven-plugin/src/test/resources/org/apache/servicemix/docs/confluence/document1.wiki b/docs-maven-plugin/src/test/resources/org/apache/servicemix/docs/confluence/document1.wiki
deleted file mode 100644
index c7245a9..0000000
--- a/docs-maven-plugin/src/test/resources/org/apache/servicemix/docs/confluence/document1.wiki
+++ /dev/null
@@ -1,7 +0,0 @@
-h1. Chapter
-
-h2. Section 1
-
-h3. Section 1.1
-
-h2. Section 2
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/servicemix-maven-plugins/blob/681882ee/docs-maven-plugin/src/test/resources/org/apache/servicemix/docs/confluence/document1.xml
----------------------------------------------------------------------
diff --git a/docs-maven-plugin/src/test/resources/org/apache/servicemix/docs/confluence/document1.xml b/docs-maven-plugin/src/test/resources/org/apache/servicemix/docs/confluence/document1.xml
deleted file mode 100644
index 124f81e..0000000
--- a/docs-maven-plugin/src/test/resources/org/apache/servicemix/docs/confluence/document1.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<chapter xmlns="http://docbook.org/ns/docbook" id="Chapter">
-  <title>Chapter</title>
-  <section id="Section1">
-    <title>Section 1</title>
-    <section id="Section1.1">
-      <title>Section 1.1</title>
-    </section>
-  </section>
-  <section id="Section2">
-    <title>Section 2</title>
-  </section>
-</chapter>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/servicemix-maven-plugins/blob/681882ee/docs-maven-plugin/src/test/resources/org/apache/servicemix/docs/confluence/document2.wiki
----------------------------------------------------------------------
diff --git a/docs-maven-plugin/src/test/resources/org/apache/servicemix/docs/confluence/document2.wiki b/docs-maven-plugin/src/test/resources/org/apache/servicemix/docs/confluence/document2.wiki
deleted file mode 100644
index 976cf38..0000000
--- a/docs-maven-plugin/src/test/resources/org/apache/servicemix/docs/confluence/document2.wiki
+++ /dev/null
@@ -1,9 +0,0 @@
-h1. Chapter
-
-h2. Section 1
-Paragraph 1 starts here...
-
-Paragraph 2 starts here...
-
-h3. Section 1.1
-And one more paragraph
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/servicemix-maven-plugins/blob/681882ee/docs-maven-plugin/src/test/resources/org/apache/servicemix/docs/confluence/document2.xml
----------------------------------------------------------------------
diff --git a/docs-maven-plugin/src/test/resources/org/apache/servicemix/docs/confluence/document2.xml b/docs-maven-plugin/src/test/resources/org/apache/servicemix/docs/confluence/document2.xml
deleted file mode 100644
index 2436c0a..0000000
--- a/docs-maven-plugin/src/test/resources/org/apache/servicemix/docs/confluence/document2.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<chapter xmlns="http://docbook.org/ns/docbook" id="Chapter">
-  <title>Chapter</title>
-  <section id="Section1">
-    <title>Section 1</title>
-    <para>Paragraph 1 starts here...</para>
-    <para>Paragraph 2 starts here...</para>
-    <section id="Section1.1">
-      <title>Section 1.1</title>
-      <para>And one more paragraph</para>
-    </section>
-  </section>
-</chapter>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/servicemix-maven-plugins/blob/681882ee/docs-maven-plugin/src/test/resources/org/apache/servicemix/docs/confluence/images.wiki
----------------------------------------------------------------------
diff --git a/docs-maven-plugin/src/test/resources/org/apache/servicemix/docs/confluence/images.wiki b/docs-maven-plugin/src/test/resources/org/apache/servicemix/docs/confluence/images.wiki
deleted file mode 100644
index 6e15094..0000000
--- a/docs-maven-plugin/src/test/resources/org/apache/servicemix/docs/confluence/images.wiki
+++ /dev/null
@@ -1,6 +0,0 @@
-h1. Chapter
-
-h2. Section 1
-This section contains an image
-
-!image.png!
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/servicemix-maven-plugins/blob/681882ee/docs-maven-plugin/src/test/resources/org/apache/servicemix/docs/confluence/images.xml
----------------------------------------------------------------------
diff --git a/docs-maven-plugin/src/test/resources/org/apache/servicemix/docs/confluence/images.xml b/docs-maven-plugin/src/test/resources/org/apache/servicemix/docs/confluence/images.xml
deleted file mode 100644
index 39e49c1..0000000
--- a/docs-maven-plugin/src/test/resources/org/apache/servicemix/docs/confluence/images.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<chapter xmlns="http://docbook.org/ns/docbook" id="Chapter">
-  <title>Chapter</title>
-  <section id="Section1">
-    <title>Section 1</title>
-    <para>This section contains an image</para>
-    <para>
-      <mediaobject>
-        <imageobject>
-          <imagedata fileref="image.png"/>
-        </imageobject>
-      </mediaobject>
-    </para>
-  </section>
-</chapter>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/servicemix-maven-plugins/blob/681882ee/docs-maven-plugin/src/test/resources/org/apache/servicemix/docs/confluence/links.wiki
----------------------------------------------------------------------
diff --git a/docs-maven-plugin/src/test/resources/org/apache/servicemix/docs/confluence/links.wiki b/docs-maven-plugin/src/test/resources/org/apache/servicemix/docs/confluence/links.wiki
deleted file mode 100644
index 46cfdbd..0000000
--- a/docs-maven-plugin/src/test/resources/org/apache/servicemix/docs/confluence/links.wiki
+++ /dev/null
@@ -1,26 +0,0 @@
-h1. Chapter
-
-{anchor:My Anchor}
-
-h2. Section 1
-This section contains a simple link to [http://www.google.be]
-
-h2. Section 2
-Click [here|http://www.google.be] to follow the link with text
-
-h2. Section 3
-Links in a variable list
-- search provider :: [Google|http://www.google.be] is often used for searching the web
-
-h2. Section 4
-[Google|http://www.google.be]
-
-h2. Section 5
-[http://www.google.be]
-
-h2. Section 6
-[#Section 5]
-
-h2. Section 7
-[#My Anchor]
-

http://git-wip-us.apache.org/repos/asf/servicemix-maven-plugins/blob/681882ee/docs-maven-plugin/src/test/resources/org/apache/servicemix/docs/confluence/links.xml
----------------------------------------------------------------------
diff --git a/docs-maven-plugin/src/test/resources/org/apache/servicemix/docs/confluence/links.xml b/docs-maven-plugin/src/test/resources/org/apache/servicemix/docs/confluence/links.xml
deleted file mode 100644
index 2237ea6..0000000
--- a/docs-maven-plugin/src/test/resources/org/apache/servicemix/docs/confluence/links.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<chapter xmlns="http://docbook.org/ns/docbook" id="Chapter">
-  <title>Chapter</title>
-  <para>
-      <phrase id="MyAnchor"></phrase>
-  </para>
-  <section id="Section1">
-    <title>Section 1</title>
-    <para>This section contains a simple link to
-        <ulink url="http://www.google.be">http://www.google.be</ulink>
-    </para>
-  </section>
-  <section id="Section2">
-    <title>Section 2</title>
-    <para>Click
-        <ulink url="http://www.google.be">here</ulink> to follow the link with text
-    </para>
-  </section>
-  <section id="Section3">
-    <title>Section 3</title>
-    <para>Links in a variable list</para>
-      <variablelist>
-        <varlistentry>
-          <term>search provider</term>
-          <listitem>
-            <para>
-              <ulink url="http://www.google.be">Google</ulink> is often used for searching the web
-            </para>
-          </listitem>
-        </varlistentry>
-      </variablelist>
-  </section>    
-    <section id="Section4">
-      <title>Section 4</title>
-      <para>
-        <ulink url="http://www.google.be">Google</ulink>
-      </para>
-    </section>
-    <section id="Section5">
-      <title>Section 5</title>
-      <para>
-        <ulink url="http://www.google.be">http://www.google.be</ulink>
-      </para>
-    </section>
-    <section id="Section6">
-        <title>Section 6</title>
-        <para>
-            <link linkend="Section5">Section 5</link>
-        </para>
-    </section>
-    <section id="Section7">
-        <title>Section 7</title>
-        <para>
-            <link linkend="MyAnchor">My Anchor</link>
-        </para>
-    </section>
-</chapter>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/servicemix-maven-plugins/blob/681882ee/docs-maven-plugin/src/test/resources/org/apache/servicemix/docs/confluence/lists.wiki
----------------------------------------------------------------------
diff --git a/docs-maven-plugin/src/test/resources/org/apache/servicemix/docs/confluence/lists.wiki b/docs-maven-plugin/src/test/resources/org/apache/servicemix/docs/confluence/lists.wiki
deleted file mode 100644
index eaed557..0000000
--- a/docs-maven-plugin/src/test/resources/org/apache/servicemix/docs/confluence/lists.wiki
+++ /dev/null
@@ -1,20 +0,0 @@
-h1. Chapter
-
-h2. Section 1
-This section contains a bulleted list:
-* item 1
-* {{item 2}}
-* item 3
-
-h2. Section 2
-This section contains a numbered list:
-# item 1
-# {{item 2}}
-# item 3
-
-h2. Variable list
-This section contains a variable list:
-- term1 :: Definition for term1
-- {{term2}} :: Definition for term2 (including {{code text}})
-- term3 :: Definition for term3
-

http://git-wip-us.apache.org/repos/asf/servicemix-maven-plugins/blob/681882ee/docs-maven-plugin/src/test/resources/org/apache/servicemix/docs/confluence/lists.xml
----------------------------------------------------------------------
diff --git a/docs-maven-plugin/src/test/resources/org/apache/servicemix/docs/confluence/lists.xml b/docs-maven-plugin/src/test/resources/org/apache/servicemix/docs/confluence/lists.xml
deleted file mode 100644
index c9017cf..0000000
--- a/docs-maven-plugin/src/test/resources/org/apache/servicemix/docs/confluence/lists.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<chapter xmlns="http://docbook.org/ns/docbook" id="Chapter">
-  <title>Chapter</title>
-  <section id="Section1">
-    <title>Section 1</title>
-    <para>This section contains a bulleted list:</para>
-      <itemizedlist>
-        <listitem>
-          <para>item 1</para>
-        </listitem>
-        <listitem>
-          <para>
-              <literal>item 2</literal>
-          </para>
-        </listitem>
-        <listitem>
-          <para>item 3</para>
-        </listitem>
-      </itemizedlist>
-  </section>
-  <section id="Section2">
-    <title>Section 2</title>
-    <para>This section contains a numbered list:</para>
-      <orderedlist>
-        <listitem>
-          <para>item 1</para>
-        </listitem>
-        <listitem>
-          <para>
-              <literal>item 2</literal>
-          </para>
-        </listitem>
-        <listitem>
-          <para>item 3</para>
-        </listitem>
-      </orderedlist>
-  </section>
-  <section id="Variablelist">
-    <title>Variable list</title>
-    <para>This section contains a variable list:</para>
-      <variablelist>
-        <varlistentry>
-          <term>term1</term>
-          <listitem>
-            <para>Definition for term1</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>
-            <literal>term2</literal>
-          </term>
-          <listitem>
-            <para>Definition for term2 (including
-              <literal>code text</literal>)
-            </para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>term3</term>
-          <listitem>
-            <para>Definition for term3</para>
-          </listitem>
-        </varlistentry>
-      </variablelist>
-  </section>
-</chapter>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/servicemix-maven-plugins/blob/681882ee/docs-maven-plugin/src/test/resources/org/apache/servicemix/docs/confluence/tables.wiki
----------------------------------------------------------------------
diff --git a/docs-maven-plugin/src/test/resources/org/apache/servicemix/docs/confluence/tables.wiki b/docs-maven-plugin/src/test/resources/org/apache/servicemix/docs/confluence/tables.wiki
deleted file mode 100644
index 6b6fd53..0000000
--- a/docs-maven-plugin/src/test/resources/org/apache/servicemix/docs/confluence/tables.wiki
+++ /dev/null
@@ -1,7 +0,0 @@
-h1. Chapter
-
-h2. An informal table
-This section contains an informal table:
-|| Header 1 || Header 2 || Header 3 ||
-| Val 1.1 | Val 1.2 | {{Val 1.3}} |
-| Val 2.1 | Val 2.2 | {{Val 2.3}} |

http://git-wip-us.apache.org/repos/asf/servicemix-maven-plugins/blob/681882ee/docs-maven-plugin/src/test/resources/org/apache/servicemix/docs/confluence/tables.xml
----------------------------------------------------------------------
diff --git a/docs-maven-plugin/src/test/resources/org/apache/servicemix/docs/confluence/tables.xml b/docs-maven-plugin/src/test/resources/org/apache/servicemix/docs/confluence/tables.xml
deleted file mode 100644
index e0078bb..0000000
--- a/docs-maven-plugin/src/test/resources/org/apache/servicemix/docs/confluence/tables.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<chapter xmlns="http://docbook.org/ns/docbook" id="Chapter">
-  <title>Chapter</title>
-  <section id="Aninformaltable">
-    <title>An informal table</title>
-    <para>This section contains an informal table:</para>
-      <informaltable>
-          <tr>
-            <th>Header 1</th>
-            <th>Header 2</th>
-            <th>Header 3</th>
-          </tr>
-          <tr>
-            <td>Val 1.1</td>
-            <td>Val 1.2</td>
-            <td>
-                <literal>Val 1.3</literal>
-            </td>
-          </tr>
-          <tr>
-            <td>Val 2.1</td>
-            <td>Val 2.2</td>
-            <td>
-                <literal>Val 2.3</literal>
-            </td>
-          </tr>
-      </informaltable>
-  </section>
-</chapter>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/servicemix-maven-plugins/blob/681882ee/features-maven-plugin/LICENSE
----------------------------------------------------------------------
diff --git a/features-maven-plugin/LICENSE b/features-maven-plugin/LICENSE
deleted file mode 100644
index 6b0b127..0000000
--- a/features-maven-plugin/LICENSE
+++ /dev/null
@@ -1,203 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-

http://git-wip-us.apache.org/repos/asf/servicemix-maven-plugins/blob/681882ee/features-maven-plugin/NOTICE
----------------------------------------------------------------------
diff --git a/features-maven-plugin/NOTICE b/features-maven-plugin/NOTICE
deleted file mode 100644
index b6212c4..0000000
--- a/features-maven-plugin/NOTICE
+++ /dev/null
@@ -1,9 +0,0 @@
-   =========================================================================
-   ==  NOTICE file for use with the Apache License, Version 2.0,          ==
-   ==  in this case for the Apache ServiceMix distribution.               ==
-   =========================================================================
-
-   This product contains software developed by
-   The Apache Software Foundation (http://www.apache.org/).
-
-